Index: /CKEditor/trunk/CHANGES.html =================================================================== --- /CKEditor/trunk/CHANGES.html (revision 4184) +++ /CKEditor/trunk/CHANGES.html (revision 4185) @@ -63,4 +63,5 @@
  • #4048 : Context submenu was lacking uiColor.
  • #3568 : Dialogs now select all text when tabbing to text inputs.
    • +
  • #3727 : Cell Properties dialog was missing color selection option.

    • Index: /CKEditor/trunk/_source/core/config.js =================================================================== --- /CKEditor/trunk/_source/core/config.js (revision 4184) +++ /CKEditor/trunk/_source/core/config.js (revision 4185) @@ -197,5 +197,5 @@ * @example */ - plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc', + plugins : 'about,basicstyles,blockquote,button,clipboard,colorbutton,colordialog,contextmenu,elementspath,enterkey,entities,filebrowser,find,flash,font,format,forms,horizontalrule,htmldataprocessor,image,indent,justify,keystrokes,link,list,maximize,newpage,pagebreak,pastefromword,pastetext,popup,preview,print,removeformat,resize,save,scayt,smiley,showblocks,sourcearea,stylescombo,table,tabletools,specialchar,tab,templates,toolbar,undo,wysiwygarea,wsc', /** Index: /CKEditor/trunk/_source/lang/_translationstatus.txt =================================================================== --- /CKEditor/trunk/_source/lang/_translationstatus.txt (revision 4184) +++ /CKEditor/trunk/_source/lang/_translationstatus.txt (revision 4185) @@ -2,58 +2,58 @@ For licensing, see LICENSE.html or http://ckeditor.com/license -af.js Found: 312 Missing: 125 -ar.js Found: 329 Missing: 108 -bg.js Found: 305 Missing: 132 -bn.js Found: 307 Missing: 130 -bs.js Found: 210 Missing: 227 -ca.js Found: 435 Missing: 2 -cs.js Found: 327 Missing: 110 -da.js Found: 326 Missing: 111 -de.js Found: 435 Missing: 2 -el.js Found: 311 Missing: 126 -en-au.js Found: 395 Missing: 42 -en-ca.js Found: 395 Missing: 42 -en-uk.js Found: 395 Missing: 42 -eo.js Found: 282 Missing: 155 -es.js Found: 435 Missing: 2 -et.js Found: 326 Missing: 111 -eu.js Found: 435 Missing: 2 -fa.js Found: 327 Missing: 110 -fi.js Found: 325 Missing: 112 -fo.js Found: 326 Missing: 111 -fr-ca.js Found: 327 Missing: 110 -fr.js Found: 434 Missing: 3 -gl.js Found: 308 Missing: 129 -gu.js Found: 326 Missing: 111 -he.js Found: 332 Missing: 105 -hi.js Found: 327 Missing: 110 -hr.js Found: 435 Missing: 2 -hu.js Found: 326 Missing: 111 -is.js Found: 332 Missing: 105 -it.js Found: 434 Missing: 3 -ja.js Found: 434 Missing: 3 -km.js Found: 299 Missing: 138 -ko.js Found: 318 Missing: 119 -lt.js Found: 331 Missing: 106 -lv.js Found: 308 Missing: 129 -mn.js Found: 326 Missing: 111 -ms.js Found: 287 Missing: 150 -nb.js Found: 325 Missing: 112 -nl.js Found: 327 Missing: 110 -no.js Found: 325 Missing: 112 -pl.js Found: 435 Missing: 2 -pt-br.js Found: 434 Missing: 3 -pt.js Found: 307 Missing: 130 -ro.js Found: 326 Missing: 111 -ru.js Found: 332 Missing: 105 -sk.js Found: 327 Missing: 110 -sl.js Found: 325 Missing: 112 -sr-latn.js Found: 301 Missing: 136 -sr.js Found: 301 Missing: 136 -sv.js Found: 324 Missing: 113 -th.js Found: 312 Missing: 125 -tr.js Found: 332 Missing: 105 -uk.js Found: 435 Missing: 2 -vi.js Found: 435 Missing: 2 -zh-cn.js Found: 435 Missing: 2 -zh.js Found: 435 Missing: 2 +af.js Found: 312 Missing: 130 +ar.js Found: 329 Missing: 113 +bg.js Found: 305 Missing: 137 +bn.js Found: 307 Missing: 135 +bs.js Found: 210 Missing: 232 +ca.js Found: 435 Missing: 7 +cs.js Found: 327 Missing: 115 +da.js Found: 326 Missing: 116 +de.js Found: 435 Missing: 7 +el.js Found: 311 Missing: 131 +en-au.js Found: 395 Missing: 47 +en-ca.js Found: 395 Missing: 47 +en-uk.js Found: 395 Missing: 47 +eo.js Found: 282 Missing: 160 +es.js Found: 435 Missing: 7 +et.js Found: 326 Missing: 116 +eu.js Found: 435 Missing: 7 +fa.js Found: 327 Missing: 115 +fi.js Found: 325 Missing: 117 +fo.js Found: 326 Missing: 116 +fr-ca.js Found: 327 Missing: 115 +fr.js Found: 434 Missing: 8 +gl.js Found: 308 Missing: 134 +gu.js Found: 326 Missing: 116 +he.js Found: 332 Missing: 110 +hi.js Found: 327 Missing: 115 +hr.js Found: 435 Missing: 7 +hu.js Found: 326 Missing: 116 +is.js Found: 332 Missing: 110 +it.js Found: 434 Missing: 8 +ja.js Found: 434 Missing: 8 +km.js Found: 299 Missing: 143 +ko.js Found: 318 Missing: 124 +lt.js Found: 331 Missing: 111 +lv.js Found: 308 Missing: 134 +mn.js Found: 326 Missing: 116 +ms.js Found: 287 Missing: 155 +nb.js Found: 325 Missing: 117 +nl.js Found: 327 Missing: 115 +no.js Found: 325 Missing: 117 +pl.js Found: 435 Missing: 7 +pt-br.js Found: 434 Missing: 8 +pt.js Found: 307 Missing: 135 +ro.js Found: 326 Missing: 116 +ru.js Found: 332 Missing: 110 +sk.js Found: 327 Missing: 115 +sl.js Found: 325 Missing: 117 +sr-latn.js Found: 301 Missing: 141 +sr.js Found: 301 Missing: 141 +sv.js Found: 324 Missing: 118 +th.js Found: 312 Missing: 130 +tr.js Found: 332 Missing: 110 +uk.js Found: 435 Missing: 7 +vi.js Found: 435 Missing: 7 +zh-cn.js Found: 435 Missing: 7 +zh.js Found: 435 Missing: 7 Index: /CKEditor/trunk/_source/lang/af.js =================================================================== --- /CKEditor/trunk/_source/lang/af.js (revision 4184) +++ /CKEditor/trunk/_source/lang/af.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ar.js =================================================================== --- /CKEditor/trunk/_source/lang/ar.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ar.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/bg.js =================================================================== --- /CKEditor/trunk/_source/lang/bg.js (revision 4184) +++ /CKEditor/trunk/_source/lang/bg.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/bn.js =================================================================== --- /CKEditor/trunk/_source/lang/bn.js (revision 4184) +++ /CKEditor/trunk/_source/lang/bn.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/bs.js =================================================================== --- /CKEditor/trunk/_source/lang/bs.js (revision 4184) +++ /CKEditor/trunk/_source/lang/bs.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ca.js =================================================================== --- /CKEditor/trunk/_source/lang/ca.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ca.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'L\'alçada de cel·la ha de ser un nombre.', invalidRowSpan : 'L\'expansió de files ha de ser un nombre enter.', - invalidColSpan : 'L\'expansió de columnes ha de ser un nombre enter.' + invalidColSpan : 'L\'expansió de columnes ha de ser un nombre enter.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Arrossegueu per redimensionar' + resize : 'Arrossegueu per redimensionar', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/cs.js =================================================================== --- /CKEditor/trunk/_source/lang/cs.js (revision 4184) +++ /CKEditor/trunk/_source/lang/cs.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/da.js =================================================================== --- /CKEditor/trunk/_source/lang/da.js (revision 4184) +++ /CKEditor/trunk/_source/lang/da.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/de.js =================================================================== --- /CKEditor/trunk/_source/lang/de.js (revision 4184) +++ /CKEditor/trunk/_source/lang/de.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Zellenhöhe muß eine Zahl sein.', invalidRowSpan : '"Anzahl Zeilen verbinden" muss eine Ganzzahl sein.', - invalidColSpan : '"Anzahl Spalten verbinden" muss eine Ganzzahl sein.' + invalidColSpan : '"Anzahl Spalten verbinden" muss eine Ganzzahl sein.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Zum Vergrößern ziehen' + resize : 'Zum Vergrößern ziehen', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/el.js =================================================================== --- /CKEditor/trunk/_source/lang/el.js (revision 4184) +++ /CKEditor/trunk/_source/lang/el.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/en-au.js =================================================================== --- /CKEditor/trunk/_source/lang/en-au.js (revision 4184) +++ /CKEditor/trunk/_source/lang/en-au.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', invalidRowSpan : 'Rows span must be a whole number.', - invalidColSpan : 'Columns span must be a whole number.' + invalidColSpan : 'Columns span must be a whole number.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/en-ca.js =================================================================== --- /CKEditor/trunk/_source/lang/en-ca.js (revision 4184) +++ /CKEditor/trunk/_source/lang/en-ca.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', invalidRowSpan : 'Rows span must be a whole number.', - invalidColSpan : 'Columns span must be a whole number.' + invalidColSpan : 'Columns span must be a whole number.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/en-uk.js =================================================================== --- /CKEditor/trunk/_source/lang/en-uk.js (revision 4184) +++ /CKEditor/trunk/_source/lang/en-uk.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', invalidRowSpan : 'Rows span must be a whole number.', - invalidColSpan : 'Columns span must be a whole number.' + invalidColSpan : 'Columns span must be a whole number.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/en.js =================================================================== --- /CKEditor/trunk/_source/lang/en.js (revision 4184) +++ /CKEditor/trunk/_source/lang/en.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', invalidRowSpan : 'Rows span must be a whole number.', - invalidColSpan : 'Columns span must be a whole number.' + invalidColSpan : 'Columns span must be a whole number.', + chooseColor : 'Choose' }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' + resize : 'Drag to resize', + + colordialog : + { + title : 'Select color', + highlight : 'Highlight', + selected : 'Selected', + clear : 'Clear' + } }; Index: /CKEditor/trunk/_source/lang/eo.js =================================================================== --- /CKEditor/trunk/_source/lang/eo.js (revision 4184) +++ /CKEditor/trunk/_source/lang/eo.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/es.js =================================================================== --- /CKEditor/trunk/_source/lang/es.js (revision 4184) +++ /CKEditor/trunk/_source/lang/es.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'La altura de celda debe ser un número.', invalidRowSpan : 'La expansión de filas debe ser un número entero.', - invalidColSpan : 'La expansión de columnas debe ser un número entero.' + invalidColSpan : 'La expansión de columnas debe ser un número entero.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Arrastre para redimensionar' + resize : 'Arrastre para redimensionar', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/et.js =================================================================== --- /CKEditor/trunk/_source/lang/et.js (revision 4184) +++ /CKEditor/trunk/_source/lang/et.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/eu.js =================================================================== --- /CKEditor/trunk/_source/lang/eu.js (revision 4184) +++ /CKEditor/trunk/_source/lang/eu.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Gelaxkaren altuera zenbaki bat izan behar da.', invalidRowSpan : 'Lerroen hedapena zenbaki osoa izan behar da.', - invalidColSpan : 'Zutabeen hedapena zenbaki osoa izan behar da.' + invalidColSpan : 'Zutabeen hedapena zenbaki osoa izan behar da.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Arrastatu tamaina aldatzeko' + resize : 'Arrastatu tamaina aldatzeko', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/fa.js =================================================================== --- /CKEditor/trunk/_source/lang/fa.js (revision 4184) +++ /CKEditor/trunk/_source/lang/fa.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/fi.js =================================================================== --- /CKEditor/trunk/_source/lang/fi.js (revision 4184) +++ /CKEditor/trunk/_source/lang/fi.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/fo.js =================================================================== --- /CKEditor/trunk/_source/lang/fo.js (revision 4184) +++ /CKEditor/trunk/_source/lang/fo.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/fr-ca.js =================================================================== --- /CKEditor/trunk/_source/lang/fr-ca.js (revision 4184) +++ /CKEditor/trunk/_source/lang/fr-ca.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/fr.js =================================================================== --- /CKEditor/trunk/_source/lang/fr.js (revision 4184) +++ /CKEditor/trunk/_source/lang/fr.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'La Hauteur de Cellule doit être un nombre.', invalidRowSpan : 'La fusion de lignes doit être un nombre entier.', - invalidColSpan : 'La fusion de colonnes doit être un nombre entier.' + invalidColSpan : 'La fusion de colonnes doit être un nombre entier.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Glisser pour modifier la taille' + resize : 'Glisser pour modifier la taille', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/gl.js =================================================================== --- /CKEditor/trunk/_source/lang/gl.js (revision 4184) +++ /CKEditor/trunk/_source/lang/gl.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/gu.js =================================================================== --- /CKEditor/trunk/_source/lang/gu.js (revision 4184) +++ /CKEditor/trunk/_source/lang/gu.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/he.js =================================================================== --- /CKEditor/trunk/_source/lang/he.js (revision 4184) +++ /CKEditor/trunk/_source/lang/he.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/hi.js =================================================================== --- /CKEditor/trunk/_source/lang/hi.js (revision 4184) +++ /CKEditor/trunk/_source/lang/hi.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/hr.js =================================================================== --- /CKEditor/trunk/_source/lang/hr.js (revision 4184) +++ /CKEditor/trunk/_source/lang/hr.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Visina ćelije mora biti broj.', invalidRowSpan : 'Rows span mora biti cijeli broj.', - invalidColSpan : 'Columns span mora biti cijeli broj.' + invalidColSpan : 'Columns span mora biti cijeli broj.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Povuci za promjenu veličine' + resize : 'Povuci za promjenu veličine', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/hu.js =================================================================== --- /CKEditor/trunk/_source/lang/hu.js (revision 4184) +++ /CKEditor/trunk/_source/lang/hu.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/is.js =================================================================== --- /CKEditor/trunk/_source/lang/is.js (revision 4184) +++ /CKEditor/trunk/_source/lang/is.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/it.js =================================================================== --- /CKEditor/trunk/_source/lang/it.js (revision 4184) +++ /CKEditor/trunk/_source/lang/it.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'L\'altezza della cella dev\'essere un numero.', invalidRowSpan : 'Il numero di righe dev\'essere un numero intero.', - invalidColSpan : 'Il numero di colonne dev\'essere un numero intero.' + invalidColSpan : 'Il numero di colonne dev\'essere un numero intero.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Trascina per ridimensionare' + resize : 'Trascina per ridimensionare', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ja.js =================================================================== --- /CKEditor/trunk/_source/lang/ja.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ja.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'セル高さは数値で入力してください。', invalidRowSpan : '縦幅(行数)は数値で入力してください。', - invalidColSpan : '横幅(列数)は数値で入力してください。' + invalidColSpan : '横幅(列数)は数値で入力してください。', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'ドラックしてリサイズ' + resize : 'ドラックしてリサイズ', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/km.js =================================================================== --- /CKEditor/trunk/_source/lang/km.js (revision 4184) +++ /CKEditor/trunk/_source/lang/km.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ko.js =================================================================== --- /CKEditor/trunk/_source/lang/ko.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ko.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/lt.js =================================================================== --- /CKEditor/trunk/_source/lang/lt.js (revision 4184) +++ /CKEditor/trunk/_source/lang/lt.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/lv.js =================================================================== --- /CKEditor/trunk/_source/lang/lv.js (revision 4184) +++ /CKEditor/trunk/_source/lang/lv.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/mn.js =================================================================== --- /CKEditor/trunk/_source/lang/mn.js (revision 4184) +++ /CKEditor/trunk/_source/lang/mn.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ms.js =================================================================== --- /CKEditor/trunk/_source/lang/ms.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ms.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/nb.js =================================================================== --- /CKEditor/trunk/_source/lang/nb.js (revision 4184) +++ /CKEditor/trunk/_source/lang/nb.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/nl.js =================================================================== --- /CKEditor/trunk/_source/lang/nl.js (revision 4184) +++ /CKEditor/trunk/_source/lang/nl.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/no.js =================================================================== --- /CKEditor/trunk/_source/lang/no.js (revision 4184) +++ /CKEditor/trunk/_source/lang/no.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/pl.js =================================================================== --- /CKEditor/trunk/_source/lang/pl.js (revision 4184) +++ /CKEditor/trunk/_source/lang/pl.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Wysokość komórki musi być liczbą.', invalidRowSpan : 'Scalenie wierszy musi być liczbą całkowitą.', - invalidColSpan : 'Scalenie komórek musi być liczbą całkowitą.' + invalidColSpan : 'Scalenie komórek musi być liczbą całkowitą.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Przeciągnij, aby zmienić rozmiar' + resize : 'Przeciągnij, aby zmienić rozmiar', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/pt-br.js =================================================================== --- /CKEditor/trunk/_source/lang/pt-br.js (revision 4184) +++ /CKEditor/trunk/_source/lang/pt-br.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'A altura da célula tem que ser um número.', invalidRowSpan : '"Linhas cobertas" tem que ser um número inteiro.', - invalidColSpan : '"Colunas cobertas" tem que ser um número inteiro.' + invalidColSpan : '"Colunas cobertas" tem que ser um número inteiro.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Arraste para redimensionar' + resize : 'Arraste para redimensionar', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/pt.js =================================================================== --- /CKEditor/trunk/_source/lang/pt.js (revision 4184) +++ /CKEditor/trunk/_source/lang/pt.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ro.js =================================================================== --- /CKEditor/trunk/_source/lang/ro.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ro.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/ru.js =================================================================== --- /CKEditor/trunk/_source/lang/ru.js (revision 4184) +++ /CKEditor/trunk/_source/lang/ru.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/sk.js =================================================================== --- /CKEditor/trunk/_source/lang/sk.js (revision 4184) +++ /CKEditor/trunk/_source/lang/sk.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/sl.js =================================================================== --- /CKEditor/trunk/_source/lang/sl.js (revision 4184) +++ /CKEditor/trunk/_source/lang/sl.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/sr-latn.js =================================================================== --- /CKEditor/trunk/_source/lang/sr-latn.js (revision 4184) +++ /CKEditor/trunk/_source/lang/sr-latn.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/sr.js =================================================================== --- /CKEditor/trunk/_source/lang/sr.js (revision 4184) +++ /CKEditor/trunk/_source/lang/sr.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/sv.js =================================================================== --- /CKEditor/trunk/_source/lang/sv.js (revision 4184) +++ /CKEditor/trunk/_source/lang/sv.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/th.js =================================================================== --- /CKEditor/trunk/_source/lang/th.js (revision 4184) +++ /CKEditor/trunk/_source/lang/th.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/tr.js =================================================================== --- /CKEditor/trunk/_source/lang/tr.js (revision 4184) +++ /CKEditor/trunk/_source/lang/tr.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Cell height must be a number.', // MISSING invalidRowSpan : 'Rows span must be a whole number.', // MISSING - invalidColSpan : 'Columns span must be a whole number.' // MISSING + invalidColSpan : 'Columns span must be a whole number.', // MISSING + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Drag to resize' // MISSING + resize : 'Drag to resize', // MISSING + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/uk.js =================================================================== --- /CKEditor/trunk/_source/lang/uk.js (revision 4184) +++ /CKEditor/trunk/_source/lang/uk.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Висота комірки повинна бути числом.', invalidRowSpan : 'Кількість обєднуваних рядків повинна бути цілим числом.', - invalidColSpan : 'Кількість обєднуваних стовпчиків повинна бути цілим числом.' + invalidColSpan : 'Кількість обєднуваних стовпчиків повинна бути цілим числом.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Пересувайте для зміни розміру' + resize : 'Пересувайте для зміни розміру', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/vi.js =================================================================== --- /CKEditor/trunk/_source/lang/vi.js (revision 4184) +++ /CKEditor/trunk/_source/lang/vi.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : 'Chiều cao của Ô phải là một số nguyên.', invalidRowSpan : 'Số hàng kết hợp phải là một số nguyên.', - invalidColSpan : 'Số cột kết hợp phải là một số nguyên.' + invalidColSpan : 'Số cột kết hợp phải là một số nguyên.', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : 'Kéo rê để thay đổi kích cỡ' + resize : 'Kéo rê để thay đổi kích cỡ', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/zh-cn.js =================================================================== --- /CKEditor/trunk/_source/lang/zh-cn.js (revision 4184) +++ /CKEditor/trunk/_source/lang/zh-cn.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : '单元格高度必须为数字格式', invalidRowSpan : '行跨度必须为整数格式', - invalidColSpan : '列跨度必须为整数格式' + invalidColSpan : '列跨度必须为整数格式', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : '拖拽以改变尺寸' + resize : '拖拽以改变尺寸', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/lang/zh.js =================================================================== --- /CKEditor/trunk/_source/lang/zh.js (revision 4184) +++ /CKEditor/trunk/_source/lang/zh.js (revision 4185) @@ -260,5 +260,6 @@ invalidHeight : '儲存格高度必須為數字格式', invalidRowSpan : '儲存格列數必須為整數格式', - invalidColSpan : '儲存格欄數度必須為整數格式' + invalidColSpan : '儲存格欄數度必須為整數格式', + chooseColor : 'Choose' // MISSING }, @@ -673,4 +674,12 @@ }, - resize : '拖拽改變大小' + resize : '拖拽改變大小', + + colordialog : + { + title : 'Select color', // MISSING + highlight : 'Highlight', // MISSING + selected : 'Selected', // MISSING + clear : 'Clear' // MISSING + } }; Index: /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js =================================================================== --- /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js (revision 4185) +++ /CKEditor/trunk/_source/plugins/colordialog/dialogs/colordialog.js (revision 4185) @@ -0,0 +1,191 @@ +/* +Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved. +For licensing, see LICENSE.html or http://ckeditor.com/license +*/ + +CKEDITOR.dialog.add( 'colordialog', function( editor ) + { + // Define some shorthands. + var $el = CKEDITOR.dom.element, + $doc = CKEDITOR.document, + $tools = CKEDITOR.tools, + lang = editor.lang.colordialog; + + // Reference the dialog. + var dialog; + + function spacer() + { + return { + type : 'html', + html : ' ' + }; + } + + var table = new $el( 'table' ); + createColorTable(); + + var cellMouseover = function( event ) + { + var color = new $el( event.data.getTarget() ).getAttribute( 'title' ); + $doc.getById( 'hicolor' ).setStyle( 'background-color', color ); + $doc.getById( 'hicolortext' ).setHtml( color ); + }; + + var cellClick = function( event ) + { + var color = new $el( event.data.getTarget() ).getAttribute( 'title' ); + dialog.getContentElement( 'picker', 'selectedColor' ).setValue( color ); + }; + + function createColorTable() + { + // Create the base colors array. + var aColors = ['00','33','66','99','cc','ff']; + + // This function combines two ranges of three values from the color array into a row. + function appendColorRow( rangeA, rangeB ) + { + for ( var i = rangeA ; i < rangeA + 3 ; i++ ) + { + var row = table.$.insertRow(-1); + + for ( var j = rangeB ; j < rangeB + 3 ; j++ ) + { + for ( var n = 0 ; n < 6 ; n++ ) + { + appendColorCell( row, '#' + aColors[j] + aColors[n] + aColors[i] ); + } + } + } + } + + // This function create a single color cell in the color table. + function appendColorCell( targetRow, color ) + { + var cell = new $el( targetRow.insertCell( -1 ) ); + cell.setAttribute( 'class', 'ColorCell' ); + cell.setStyle( 'background-color', color ); + + cell.setStyle( 'width', '15px' ); + cell.setStyle( 'height', '15px' ); + + // Pass unparsed color value in some markup-degradable form. + cell.setAttribute( 'title', color ); + } + + appendColorRow( 0, 0 ); + appendColorRow( 3, 0 ); + appendColorRow( 0, 3 ); + appendColorRow( 3, 3 ); + + // Create the last row. + var oRow = table.$.insertRow(-1) ; + + // Create the gray scale colors cells. + for ( var n = 0 ; n < 6 ; n++ ) + { + appendColorCell( oRow, '#' + aColors[n] + aColors[n] + aColors[n] ) ; + } + + // Fill the row with black cells. + for ( var i = 0 ; i < 12 ; i++ ) + { + appendColorCell( oRow, '#000000' ) ; + } + } + + function clear() + { + $doc.getById( 'selhicolor' ).removeStyle( 'background-color' ); + dialog.getContentElement( 'picker', 'selectedColor' ).setValue( '' ); + } + + var clearActual = $tools.addFunction( function() + { + $doc.getById( 'hicolor' ).removeStyle( 'background-color' ); + $doc.getById( 'hicolortext' ).setHtml( ' ' ); + } ); + + return { + title : lang.title, + minWidth : 360, + minHeight : 220, + onLoad : function() + { + // Update reference. + dialog = this; + }, + contents : [ + { + id : 'picker', + label : lang.title, + accessKey : 'I', + elements : + [ + { + type : 'hbox', + padding : 0, + widths : [ '70%', '10%', '30%' ], + children : + [ + { + type : 'html', + html : '' + table.getHtml() + '
    ', + onLoad : function() + { + var table = CKEDITOR.document.getById( this.domId ); + table.on( 'mouseover', cellMouseover ); + table.on( 'click', cellClick ); + } + }, + spacer(), + { + type : 'vbox', + padding : 0, + widths : [ '70%', '5%', '25%' ], + children : + [ + { + type : 'html', + html : '' + lang.highlight +'\ +
    \ +
     
    \ + ' + lang.selected +'\ +
    ' + }, + { + type : 'text', + id : 'selectedColor', + style : 'width: 74px', + onChange : function() + { + // Try to update color preview with new value. If fails, then set it no none. + try + { + $doc.getById( 'selhicolor' ).setStyle( 'background-color', this.getValue() ); + } + catch ( e ) + { + clear(); + } + } + }, + spacer(), + { + type : 'button', + id : 'clear', + style : 'margin-top: 5px', + label : lang.clear, + onClick : clear + } + ] + } + ] + } + ] + } + ] + }; + } + ); Index: /CKEditor/trunk/_source/plugins/colordialog/plugin.js =================================================================== --- /CKEditor/trunk/_source/plugins/colordialog/plugin.js (revision 4185) +++ /CKEditor/trunk/_source/plugins/colordialog/plugin.js (revision 4185) @@ -0,0 +1,13 @@ +( function() +{ + CKEDITOR.plugins.colordialog = + { + init : function( editor ) + { + editor.addCommand( 'colordialog', new CKEDITOR.dialogCommand( 'colordialog' ) ); + CKEDITOR.dialog.add( 'colordialog', this.path + 'dialogs/colordialog.js' ); + } + }; + + CKEDITOR.plugins.add( 'colordialog', CKEDITOR.plugins.colordialog ); +} )(); Index: /CKEditor/trunk/_source/plugins/tabletools/dialogs/tableCell.js =================================================================== --- /CKEditor/trunk/_source/plugins/tabletools/dialogs/tableCell.js (revision 4184) +++ /CKEditor/trunk/_source/plugins/tabletools/dialogs/tableCell.js (revision 4185) @@ -19,8 +19,61 @@ } + /** + * + * @param dialogName + * @param callback [ childDialog ] + */ + function getDialogValue( dialogName, callback ) + { + var onOk = function() + { + releaseHandlers( this ); + callback( this ); + }; + var onCancel = function() + { + releaseHandlers( this ); + }; + var bindToDialog = function( dialog ) + { + dialog.on( 'ok', onOk ); + dialog.on( 'cancel', onCancel ); + }; + var releaseHandlers = function( dialog ) + { + dialog.removeListener( 'ok', onOk ); + dialog.removeListener( 'cancel', onCancel ); + }; + editor.execCommand( dialogName ); + if ( editor._.storedDialogs.colordialog ) + bindToDialog( editor._.storedDialogs.colordialog ); + else + { + CKEDITOR.on( 'dialogDefinition', function( e ) + { + if ( e.data.name != dialogName ) + return; + + var definition = e.data.definition; + + e.removeListener(); + definition.onLoad = CKEDITOR.tools.override( definition.onLoad, function( orginal ) + { + return function() + { + bindToDialog( this ); + definition.onLoad = orginal; + if ( typeof orginal == 'function' ) + orginal.call( this ); + }; + } ); + }); + } + }; + return { title : langCell.title, - minWidth : 480, - minHeight : 140, + minWidth : CKEDITOR.env.ie && CKEDITOR.env.quirks ? 550 : 480, + minHeight : CKEDITOR.env.ie ? ( CKEDITOR.env.quirks ? 180 : 150 ) : 140, contents : [ { @@ -32,5 +85,5 @@ { type : 'hbox', - widths : [ '45%', '10%', '45%' ], + widths : [ '40%', '5%', '40%' ], children : [ @@ -269,40 +322,89 @@ spacer(), { - type : 'text', - id : 'bgColor', - label : langCell.bgColor, - labelLayout : 'horizontal', - widths : [ '50%', '50%' ], - 'default' : '', - setup : function( selectedCell ) - { - this.setValue( selectedCell.getAttribute( 'bgColor' ) || '' ); - }, - commit : function( selectedCell ) - { - if ( this.getValue() ) - selectedCell.setAttribute( 'bgColor', this.getValue() ); - else - selectedCell.removeAttribute( 'bgColor' ); - } - }, - { - type : 'text', - id : 'borderColor', - label : langCell.borderColor, - labelLayout : 'horizontal', - widths : [ '50%', '50%' ], - 'default' : '', - setup : function( selectedCell ) - { - this.setValue( selectedCell.getAttribute( 'borderColor' ) || '' ); - }, - commit : function( selectedCell ) - { - if ( this.getValue() ) - selectedCell.setAttribute( 'borderColor', this.getValue() ); - else - selectedCell.removeAttribute( 'borderColor' ); - } + type : 'hbox', + padding : 0, + widths : [ '80%', '20%' ], + children : + [ + { + type : 'text', + id : 'bgColor', + label : langCell.bgColor, + labelLayout : 'horizontal', + widths : [ '70%', '30%' ], + 'default' : '', + setup : function( selectedCell ) + { + this.setValue( selectedCell.getAttribute( 'bgColor' ) || '' ); + }, + commit : function( selectedCell ) + { + if ( this.getValue() ) + selectedCell.setAttribute( 'bgColor', this.getValue() ); + else + selectedCell.removeAttribute( 'bgColor' ); + } + }, + { + type : 'button', + id : 'bgColorChoose', + label : langCell.chooseColor, + style : 'margin-left: 10px', + onClick : function() + { + var self = this; + getDialogValue( 'colordialog', function( colorDialog ) + { + self.getDialog().getContentElement( 'info', 'bgColor' ).setValue( + colorDialog.getContentElement( 'picker', 'selectedColor' ).getValue() + ); + } ); + } + } + ] + }, + spacer(), + { + type : 'hbox', + padding : 0, + widths : [ '80%', '20%' ], + children : + [ + { + type : 'text', + id : 'borderColor', + label : langCell.borderColor, + labelLayout : 'horizontal', + widths : [ '70%', '30%' ], + 'default' : '', + setup : function( selectedCell ) + { + this.setValue( selectedCell.getAttribute( 'borderColor' ) || '' ); + }, + commit : function( selectedCell ) + { + if ( this.getValue() ) + selectedCell.setAttribute( 'borderColor', this.getValue() ); + else + selectedCell.removeAttribute( 'borderColor' ); + } + }, + { + type : 'button', + id : 'borderColorChoose', + label : langCell.chooseColor, + style : 'margin-left: 10px', + onClick : function() + { + var self = this; + getDialogValue( 'colordialog', function( colorDialog ) + { + self.getDialog().getContentElement( 'info', 'borderColor' ).setValue( + colorDialog.getContentElement( 'picker', 'selectedColor' ).getValue() + ); + } ); + } + } + ] } ]