muck-contents 0.2.22 → 0.2.23

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/js/cell.js

@@ -11,7 +11,7 @@ function init() {
 	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
 
 	var inst = ed;
-	var tdElm = ed.dom.getParent(ed.selection.getNode(), "td,th");
+	var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");
 	var formObj = document.forms[0];
 	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
 
@@ -34,38 +34,55 @@ function init() {
 	addClassesToList('class', 'table_cell_styles');
 	TinyMCE_EditableSelects.init();
 
-	formObj.bordercolor.value = bordercolor;
-	formObj.bgcolor.value = bgcolor;
-	formObj.backgroundimage.value = backgroundimage;
-	formObj.width.value = width;
-	formObj.height.value = height;
-	formObj.id.value = id;
-	formObj.lang.value = lang;
-	formObj.style.value = ed.dom.serializeStyle(st);
-	selectByValue(formObj, 'align', align);
-	selectByValue(formObj, 'valign', valign);
-	selectByValue(formObj, 'class', className, true, true);
-	selectByValue(formObj, 'celltype', celltype);
-	selectByValue(formObj, 'dir', dir);
-	selectByValue(formObj, 'scope', scope);
-
-	// Resize some elements
-	if (isVisible('backgroundimagebrowser'))
-		document.getElementById('backgroundimage').style.width = '180px';
-
-	updateColor('bordercolor_pick', 'bordercolor');
-	updateColor('bgcolor_pick', 'bgcolor');
+	if (!ed.dom.hasClass(tdElm, 'mceSelected')) {
+		formObj.bordercolor.value = bordercolor;
+		formObj.bgcolor.value = bgcolor;
+		formObj.backgroundimage.value = backgroundimage;
+		formObj.width.value = width;
+		formObj.height.value = height;
+		formObj.id.value = id;
+		formObj.lang.value = lang;
+		formObj.style.value = ed.dom.serializeStyle(st);
+		selectByValue(formObj, 'align', align);
+		selectByValue(formObj, 'valign', valign);
+		selectByValue(formObj, 'class', className, true, true);
+		selectByValue(formObj, 'celltype', celltype);
+		selectByValue(formObj, 'dir', dir);
+		selectByValue(formObj, 'scope', scope);
+
+		// Resize some elements
+		if (isVisible('backgroundimagebrowser'))
+			document.getElementById('backgroundimage').style.width = '180px';
+
+		updateColor('bordercolor_pick', 'bordercolor');
+		updateColor('bgcolor_pick', 'bgcolor');
+	} else
+		tinyMCEPopup.dom.hide('action');
 }
 
 function updateAction() {
 	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
 
 	tinyMCEPopup.restoreSelection();
-	el = ed.selection.getNode();
+	el = ed.selection.getStart();
 	tdElm = ed.dom.getParent(el, "td,th");
 	trElm = ed.dom.getParent(el, "tr");
 	tableElm = ed.dom.getParent(el, "table");
 
+	// Cell is selected
+	if (ed.dom.hasClass(tdElm, 'mceSelected')) {
+		// Update all selected sells
+		tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {
+			updateCell(td);
+		});
+
+		ed.addVisual();
+		ed.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+		tinyMCEPopup.close();
+		return;
+	}
+
 	ed.execCommand('mceBeginUndoLevel');
 
 	switch (getSelectValue(formObj, 'action')) {

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/js/merge_cells.js

@@ -1,29 +1,27 @@
 tinyMCEPopup.requireLangPack();
 
-function init() {
-	var f = document.forms[0], v;
+var MergeCellsDialog = {
+	init : function() {
+		var f = document.forms[0];
 
-	tinyMCEPopup.resizeToInnerSize();
+		f.numcols.value = tinyMCEPopup.getWindowArg('cols', 1);
+		f.numrows.value = tinyMCEPopup.getWindowArg('rows', 1);
+	},
 
-	f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);
-	f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);
-}
+	merge : function() {
+		var func, f = document.forms[0];
 
-function mergeCells() {
-	var args = [], f = document.forms[0];
+		tinyMCEPopup.restoreSelection();
 
-	tinyMCEPopup.restoreSelection();
+		func = tinyMCEPopup.getWindowArg('onaction');
 
-	if (!AutoValidator.validate(f)) {
-		tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));
-		return false;
-	}
-
-	args["numcols"] = f.numcols.value;
-	args["numrows"] = f.numrows.value;
+		func({
+			cols : f.numcols.value,
+			rows : f.numrows.value
+		});
 
-	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);
-	tinyMCEPopup.close();
-}
+		tinyMCEPopup.close();
+	}
+};
 
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.onInit.add(MergeCellsDialog.init, MergeCellsDialog);

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/js/row.js

@@ -8,7 +8,7 @@ function init() {
 
 	var inst = tinyMCEPopup.editor;
 	var dom = inst.dom;
-	var trElm = dom.getParent(inst.selection.getNode(), "tr");
+	var trElm = dom.getParent(inst.selection.getStart(), "tr");
 	var formObj = document.forms[0];
 	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));
 
@@ -24,27 +24,32 @@ function init() {
 	var lang = dom.getAttrib(trElm, 'lang');
 	var dir = dom.getAttrib(trElm, 'dir');
 
-	// Setup form
-	addClassesToList('class', 'table_row_styles');
-	TinyMCE_EditableSelects.init();
-
-	formObj.bgcolor.value = bgcolor;
-	formObj.backgroundimage.value = backgroundimage;
-	formObj.height.value = height;
-	formObj.id.value = id;
-	formObj.lang.value = lang;
-	formObj.style.value = dom.serializeStyle(st);
-	selectByValue(formObj, 'align', align);
-	selectByValue(formObj, 'valign', valign);
-	selectByValue(formObj, 'class', className, true, true);
 	selectByValue(formObj, 'rowtype', rowtype);
-	selectByValue(formObj, 'dir', dir);
-
-	// Resize some elements
-	if (isVisible('backgroundimagebrowser'))
-		document.getElementById('backgroundimage').style.width = '180px';
 
-	updateColor('bgcolor_pick', 'bgcolor');
+	// Any cells selected
+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {
+		// Setup form
+		addClassesToList('class', 'table_row_styles');
+		TinyMCE_EditableSelects.init();
+
+		formObj.bgcolor.value = bgcolor;
+		formObj.backgroundimage.value = backgroundimage;
+		formObj.height.value = height;
+		formObj.id.value = id;
+		formObj.lang.value = lang;
+		formObj.style.value = dom.serializeStyle(st);
+		selectByValue(formObj, 'align', align);
+		selectByValue(formObj, 'valign', valign);
+		selectByValue(formObj, 'class', className, true, true);
+		selectByValue(formObj, 'dir', dir);
+
+		// Resize some elements
+		if (isVisible('backgroundimagebrowser'))
+			document.getElementById('backgroundimage').style.width = '180px';
+
+		updateColor('bgcolor_pick', 'bgcolor');
+	} else
+		tinyMCEPopup.dom.hide('action');
 }
 
 function updateAction() {
@@ -52,8 +57,28 @@ function updateAction() {
 	var action = getSelectValue(formObj, 'action');
 
 	tinyMCEPopup.restoreSelection();
-	trElm = dom.getParent(inst.selection.getNode(), "tr");
-	tableElm = dom.getParent(inst.selection.getNode(), "table");
+	trElm = dom.getParent(inst.selection.getStart(), "tr");
+	tableElm = dom.getParent(inst.selection.getStart(), "table");
+
+	// Update all selected rows
+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length > 0) {
+		tinymce.each(tableElm.rows, function(tr) {
+			var i;
+
+			for (i = 0; i < tr.cells.length; i++) {
+				if (dom.hasClass(tr.cells[i], 'mceSelected')) {
+					updateRow(tr, true);
+					return;
+				}
+			}
+		});
+
+		inst.addVisual();
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+		tinyMCEPopup.close();
+		return;
+	}
 
 	inst.execCommand('mceBeginUndoLevel');
 

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/js/table.js

@@ -82,7 +82,7 @@ function insertTable() {
 			capEl = elm.ownerDocument.createElement('caption');
 
 			if (!tinymce.isIE)
-				capEl.innerHTML = '<br mce_bogus="1"/>';
+				capEl.innerHTML = '<br _mce_bogus="1"/>';
 
 			elm.insertBefore(capEl, elm.firstChild);
 		}
@@ -151,6 +151,7 @@ function insertTable() {
 	html += makeAttrib('border', border);
 	html += makeAttrib('cellpadding', cellpadding);
 	html += makeAttrib('cellspacing', cellspacing);
+	html += makeAttrib('_mce_new', '1');
 
 	if (width && inst.settings.inline_styles) {
 		if (style)
@@ -186,7 +187,7 @@ function insertTable() {
 
 	if (caption) {
 		if (!tinymce.isIE)
-			html += '<caption><br mce_bogus="1"/></caption>';
+			html += '<caption><br _mce_bogus="1"/></caption>';
 		else
 			html += '<caption></caption>';
 	}
@@ -196,7 +197,7 @@ function insertTable() {
 
 		for (var x=0; x<cols; x++) {
 			if (!tinymce.isIE)
-				html += '<td><br mce_bogus="1"/></td>';
+				html += '<td><br _mce_bogus="1"/></td>';
 			else
 				html += '<td></td>';
 		}
@@ -210,9 +211,10 @@ function insertTable() {
 
 	// Move table
 	if (inst.settings.fix_table_elements) {
-		var bm = inst.selection.getBookmark(), patt = '';
+		var patt = '';
 
-		inst.execCommand('mceInsertContent', false, '<br class="_mce_marker" />');
+		inst.focus();
+		inst.selection.setContent('<br class="_mce_marker" />');
 
 		tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {
 			if (patt)
@@ -225,12 +227,19 @@ function insertTable() {
 			inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);
 		});
 
-		dom.setOuterHTML(dom.select('._mce_marker')[0], html);
-
-		inst.selection.moveToBookmark(bm);
+		dom.setOuterHTML(dom.select('br._mce_marker')[0], html);
 	} else
 		inst.execCommand('mceInsertContent', false, html);
 
+	tinymce.each(dom.select('table[_mce_new]'), function(node) {
+		var td = dom.select('td', node);
+
+		inst.selection.select(td[0], true);
+		inst.selection.collapse();
+
+		dom.setAttrib(node, '_mce_new', '');
+	});
+
 	inst.addVisual();
 	inst.execCommand('mceEndUndoLevel');
 

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/langs/ar_dlg.js

@@ -1,74 +1,74 @@
 tinyMCE.addI18n('ar.table_dlg',{
-general_tab:"\u0639\u0627\u0645",
-advanced_tab:"\u0645\u062A\u0642\u062F\u0645",
-general_props:"\u062E\u0635\u0627\u0626\u0635 \u0639\u0627\u0645\u0629",
-advanced_props:"\u062E\u0635\u0627\u0626\u0635 \u0645\u062A\u0642\u062F\u0645\u0629",
-rowtype:"\u0627\u0644\u0645\u0642\u0637\u0639 \u0635\u0641 \u0641\u064A \u062C\u062F\u0648\u0644",
-title:"\u0625\u062F\u0631\u0627\u062C/\u062A\u0639\u062F\u064A\u0644 \u062C\u062F\u0648\u0644",
-width:"\u0627\u0644\u0639\u0631\u0636",
-height:"\u0627\u0644\u0625\u0631\u062A\u0641\u0627\u0639",
-cols:"\u0627\u0639\u0645\u062F\u0629",
-rows:"\u0623\u0633\u0637\u0631",
-cellspacing:"\u0627\u0644\u0645\u0633\u0627\u0641\u0629 \u0628\u064A\u0646 \u0627\u0644\u062E\u0644\u0627\u064A\u0627",
-cellpadding:"\u062D\u062C\u0645 \u0627\u0644\u062E\u0644\u064A\u0629",
-border:"\u0627\u0644\u062D\u062F\u0648\u062F",
-align:"\u0645\u062D\u0627\u0630\u0627\u0629",
-align_default:"\u0627\u0644\u0627\u0641\u062A\u0631\u0627\u0636\u064A",
-align_left:"\u064A\u0633\u0627\u0631",
-align_right:"\u064A\u0645\u064A\u0646",
-align_middle:"\u0648\u0633\u0637",
-row_title:"\u062E\u0635\u0627\u0626\u0635 \u0623\u0633\u0637\u0631 \u0627\u0644\u062C\u062F\u0648\u0644",
-cell_title:"\u062E\u0635\u0627\u0626\u0635 \u0623\u0639\u0645\u062F\u0629 \u0627\u0644\u062C\u062F\u0648\u0644",
-cell_type:"\u0646\u0648\u0639 \u0627\u0644\u062E\u064A\u0629",
-valign:"\u0627\u0644\u0645\u062D\u0627\u0630\u0627\u0629 \u0627\u0644\u0639\u0645\u0648\u062F\u064A\u0629",
-align_top:"\u0623\u0639\u0644\u0649",
-align_bottom:"\u0623\u0633\u0641\u0644",
-bordercolor:"\u0644\u0648\u0646 \u0627\u0644\u062D\u062F\u0648\u062F",
-bgcolor:"\u0644\u0648\u0646 \u0627\u0644\u062E\u0644\u0641\u064A\u0629",
-merge_cells_title:"\u062F\u0645\u062C \u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u062C\u062F\u0648\u0644",
+general_tab:"General",
+advanced_tab:"Advanced",
+general_props:"General properties",
+advanced_props:"Advanced properties",
+rowtype:"Row in table part",
+title:"Insert/Modify table",
+width:"Width",
+height:"Height",
+cols:"Cols",
+rows:"Rows",
+cellspacing:"Cellspacing",
+cellpadding:"Cellpadding",
+border:"Border",
+align:"Alignment",
+align_default:"Default",
+align_left:"Left",
+align_right:"Right",
+align_middle:"Center",
+row_title:"Table row properties",
+cell_title:"Table cell properties",
+cell_type:"Cell type",
+valign:"Vertical alignment",
+align_top:"Top",
+align_bottom:"Bottom",
+bordercolor:"Border color",
+bgcolor:"Background color",
+merge_cells_title:"Merge table cells",
 id:"Id",
-style:"\u0646\u0633\u0642",
-langdir:"\u0627\u062A\u062C\u0627\u0647 \u0627\u0644\u0644\u063A\u0629",
-langcode:"\u0634\u0641\u0631\u0629 \u0627\u0644\u0644\u063A\u0629",
-mime:"\u0627\u0644\u0645\u0633\u0627\u0631 MIME type",
-ltr:"\u064A\u0633\u0627\u0631 to \u064A\u0645\u064A\u0646",
-rtl:"\u064A\u0645\u064A\u0646 to \u064A\u0633\u0627\u0631",
-bgimage:"\u0635\u0648\u0631\u0629 \u0627\u0644\u062E\u0644\u0641\u064A\u0629",
-summary:"\u0645\u0648\u062C\u0632",
-td:"\u0627\u0644\u0645\u062D\u062A\u0648\u0649",
-th:"\u0627\u0644\u0639\u0646\u0648\u0627\u0646",
-cell_cell:"\u062A\u062D\u062F\u064A\u062B \u0627\u0644\u062E\u0644\u064A\u0629 \u0627\u0644\u062D\u0627\u0644\u064A\u0629",
-cell_row:"\u062A\u062D\u062F\u064A\u062B \u062C\u0645\u064A\u0639 \u0627\u0644\u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u0645\u0648\u062D\u0648\u062F\u0629 \u0641\u064A \u0627\u0644\u0633\u0637\u0631",
-cell_all:"\u062A\u062D\u062F\u064A\u062B \u062C\u0645\u064A\u0639 \u0627\u0644\u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u0645\u0648\u062C\u0648\u062F\u0629 \u0641\u064A \u0627\u0644\u062C\u062F\u0648\u0644",
-row_row:"\u062A\u062D\u062F\u064A\u062B \u0627\u0644\u0633\u0637\u0631 \u0627\u0644\u062D\u0627\u0644\u064A",
-row_odd:"\u062A\u062D\u062F\u064A\u062B \u0627\u0644\u0623\u0633\u0637\u0631 \u0627\u0644\u0641\u0631\u062F\u064A\u0629",
-row_even:"\u062A\u062D\u062F\u064A \u0627\u0644\u0623\u0633\u0637\u0631 \u0627\u0644\u0632\u0648\u062C\u064A\u0629",
-row_all:"\u062A\u062D\u062F\u064A\u062B \u062C\u0645\u064A\u0639 \u0627\u0644\u0623\u0633\u0637\u0631",
-thead:"\u0631\u0623\u0633 \u0627\u0644\u062C\u062F\u0648\u0644",
-tbody:"\u062C\u0633\u0645 \u0627\u0644\u062C\u062F\u0648\u0644",
-tfoot:"\u0642\u062F\u0645 \u0627\u0644\u062C\u062F\u0648\u0644",
-scope:"\u0627\u0644\u0645\u062F\u0649",
-rowgroup:"\u0645\u062C\u0645\u0648\u0639\u0629 \u0623\u0633\u0637\u0631",
-colgroup:"\u0645\u062C\u0645\u0648\u0639\u0629 \u062E\u0644\u0627\u064A\u0627",
-col_limit:"\u0644\u0642\u062F \u062A\u0639\u062F\u064A\u062A \u0627\u0644\u0639\u062F\u062F \u0627\u0644\u0623\u0642\u0635\u0649 \u0627\u0644\u0645\u0633\u0645\u0648\u062D \u0628\u0647 \u0644\u0644\u0623\u0639\u0645\u062F\u0629 \u0627\u0644\u062E\u0627\u0635 \u0628\u0640{$cols}.",
-row_limit:"\u0644\u0642\u062F \u062A\u0639\u062F\u064A\u062A \u0627\u0644\u0639\u062F\u062F \u0627\u0644\u0623\u0642\u0635\u0649 \u0627\u0644\u0645\u0633\u0645\u0648\u062D \u0628\u0647 \u0644\u0644\u0623\u0633\u0637\u0631 \u0627\u0644\u062E\u0627\u0635 \u0628\u0640{$rows}.",
-cell_limit:"\u0644\u0642\u062F \u062A\u0639\u062F\u064A\u062A \u0627\u0644\u0639\u062F\u062F \u0627\u0644\u0623\u0642\u0635\u0649 \u0627\u0644\u0645\u0633\u0645\u0648\u062D \u0628\u0647 \u0644\u0644\u062E\u0644\u0627\u064A\u0627 \u0627\u0644\u062E\u0627\u0635 \u0628\u0640{$cells}.",
-missing_scope:"\u0647\u0644 \u062A\u0631\u064A\u062F \u062D\u0642\u0627 \u0623\u0646 \u062A\u0648\u0627\u0635\u0644 \u0628\u062F\u0648\u0646 \u062A\u062D\u062F\u064A\u062F \u0627\u0644\u0645\u062F\u0649 \u0627\u0644\u062E\u0627\u0635 \u0628\u062E\u0644\u064A\u0629 \u0627\u0644\u062A\u0631\u0648\u064A\u0633\u0629 \u0647\u0630\u0647. \u0645\u0646 \u062F\u0648\u0646\u0647\u060C \u0633\u064A\u0643\u0648\u0646 \u0645\u0646 \u0627\u0644\u0635\u0639\u0628 \u0639\u0644\u0649 \u0627\u0644\u0632\u0627\u0626\u0631 \u0641\u0647\u0645 \u0645\u062D\u062A\u0648\u064A\u0627\u062A \u0627\u0644\u062C\u062F\u0648\u0644",
-caption:"\u0639\u0646\u0648\u0627\u0646 \u0627\u0644\u062C\u062F\u0648\u0644",
-frame:"\u0627\u0644\u0627\u0637\u0627\u0631",
-frame_none:"\u0641\u0627\u0631\u063A",
-frame_groups:"\u0627\u0644\u0645\u062C\u0645\u0648\u0639\u0627\u062A",
-frame_rows:"\u0627\u0644\u0623\u0633\u0637\u0631",
-frame_cols:"\u0627\u0644\u0623\u0639\u0645\u062F\u0629",
-frame_all:"\u0627\u0644\u0643\u0644",
-rules:"\u0627\u0644\u0642\u0648\u0627\u0639\u062F",
+style:"Style",
+langdir:"Language direction",
+langcode:"Language code",
+mime:"Target MIME type",
+ltr:"Left to right",
+rtl:"Right to left",
+bgimage:"Background image",
+summary:"Summary",
+td:"Data",
+th:"Header",
+cell_cell:"Update current cell",
+cell_row:"Update all cells in row",
+cell_all:"Update all cells in table",
+row_row:"Update current row",
+row_odd:"Update odd rows in table",
+row_even:"Update even rows in table",
+row_all:"Update all rows in table",
+thead:"Table Head",
+tbody:"Table Body",
+tfoot:"Table Foot",
+scope:"Scope",
+rowgroup:"Row Group",
+colgroup:"Col Group",
+col_limit:"You've exceeded the maximum number of columns of {$cols}.",
+row_limit:"You've exceeded the maximum number of rows of {$rows}.",
+cell_limit:"You've exceeded the maximum number of cells of {$cells}.",
+missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.",
+caption:"Table caption",
+frame:"Frame",
+frame_none:"none",
+frame_groups:"groups",
+frame_rows:"rows",
+frame_cols:"cols",
+frame_all:"all",
+rules:"Rules",
 rules_void:"void",
-rules_above:"\u0623\u0639\u0644\u0649",
-rules_below:"\u0623\u0633\u0641\u0644",
-rules_hsides:"\u0627\u0644\u062C\u0648\u0627\u0646\u0628 \u0627\u0644\u0623\u0641\u0642\u064A\u0629",
-rules_lhs:"\u0627\u0644\u062C\u0627\u0646\u0628 \u0627\u0644\u0623\u0641\u0642\u064A \u0627\u0644\u0623\u064A\u0633\u0631",
-rules_rhs:"\u0627\u0644\u062C\u0627\u0646\u0628 \u0627\u0644\u0623\u0641\u0642\u064A \u0627\u0644\u0623\u064A\u0645\u0646",
-rules_vsides:"\u0627\u0644\u062C\u0648\u0627\u0646\u0628 \u0627\u0644\u0639\u0645\u0648\u062F\u064A\u0629",
-rules_box:"\u0635\u0646\u062F\u0648\u0642",
-rules_border:"\u0627\u0644\u062D\u062F\u0648\u062F"
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
 });

data/test/rails_root/public/javascripts/tiny_mce/plugins/table/langs/ca_dlg.js

@@ -3,72 +3,72 @@ general_tab:"General",
 advanced_tab:"Avan\u00E7at",
 general_props:"Propietats generals",
 advanced_props:"Propietats avan\u00E7ades",
-rowtype:"Part de la taula on \u00E9s la fila",
+rowtype:"Fila",
 title:"Insereix/Modifica taula",
 width:"Amplada",
 height:"Al\u00E7ada",
 cols:"Columnes",
 rows:"Files",
-cellspacing:"Espai de Cel.la",
-cellpadding:"Espai de marge",
+cellspacing:"Espaiat de cel\u00B7la",
+cellpadding:"Separaci\u00F3 de cel\u00B7la",
 border:"Vora",
 align:"Alineaci\u00F3",
 align_default:"Per defecte",
 align_left:"Esquerra",
 align_right:"Dreta",
-align_middle:"Centrat",
-row_title:"Propietats de la fila de la taula",
-cell_title:"Propietats de la cel\u00B7la de la taula",
+align_middle:"Centre",
+row_title:"Propietats de fila",
+cell_title:"Propietats de cel\u00B7la",
 cell_type:"Tipus de cel\u00B7la",
 valign:"Alineaci\u00F3 vertical",
-align_top:"Dalt",
-align_bottom:"Baix",
-bordercolor:"Color de la vora",
-bgcolor:"Color del fons",
-merge_cells_title:"Refon les cel\u00B7les de la taula",
+align_top:"A dalt",
+align_bottom:"A baix",
+bordercolor:"Color de vora",
+bgcolor:"Color de fons",
+merge_cells_title:"Fusiona cel\u00B7les",
 id:"Id",
 style:"Estil",
-langdir:"Direcci\u00F3 de l'Idioma",
-langcode:"Codi de l'idioma",
-mime:"Tipus MIME de l'objectiu",
-ltr:"D'esquerra a dreta",
+langdir:"Direcci\u00F3 de l\'idioma",
+langcode:"Codi de l\'idioma",
+mime:"Tipus MIME",
+ltr:"D\'esquerra a dreta",
 rtl:"De dreta a esquerra",
 bgimage:"Imatge de fons",
 summary:"Resum",
 td:"Dades",
 th:"Cap\u00E7alera",
-cell_cell:"Actualitza la cel\u00B7la actual",
+cell_cell:"Actualitza la cel\u00B7la",
 cell_row:"Actualitza totes les cel\u00B7les de la fila",
 cell_all:"Actualitza totes les cel\u00B7les de la taula",
-row_row:"Actualitza la fila actual",
-row_odd:"Actualitza les files senars de la taula",
-row_even:"Actualitza les files parelles de la taula",
-row_all:"Actualitza les files de la taula",
-thead:"Cap\u00E7alera de la Taula",
-tbody:"Cos de la Taula",
-tfoot:"Peu de la Taula",
+row_row:"Actualitza la fila",
+row_odd:"Actualitza les files senars",
+row_even:"Actualitza les files parells",
+row_all:"Actualitza totes les files",
+thead:"Cap\u00E7alera de la taula",
+tbody:"Cos de la taula",
+tfoot:"Peu de la taula",
 scope:"Abast",
-rowgroup:"Grup de Files",
-colgroup:"Grup de Columnes",
-col_limit:"Has excedit el nombre m\u00E0xim de columnes de {$cols}.",
-row_limit:"Has excedit el nombre m\u00E0xim de files de {$rows}.",
-cell_limit:"Has excedit el nombre m\u00E0xim de cel\u00B7les de {$cells}.",
-missing_scope:"Segur que vols continuar sense especificar un abast per a les cel\u00B7les de cap\u00E7alera d'aquesta taula? Sense aix\u00F2, alguns usuaris/es amb discapacitats tindran dificultats per entendre el contingut o les dades mostrades a la taula.",
+rowgroup:"Grup de files",
+colgroup:"Grup de columnes",
+col_limit:"Heu superat el nombre m\u00E0xim de columnes de {$cols}.",
+row_limit:"Heu superat el nombre m\u00E0xim de files de {$rows}.",
+cell_limit:"Heu superat el nombre m\u00E0xim de cel\u00B7les de {$cells}..",
+missing_scope:"Esteu segur que voleu continuar sense indicar un abast per a aquesta cel\u00B7la de cap\u00E7alera. Pot ser dif\u00EDcil per a alguns usuaris amb discapacitats entendre el contingut o les dades mostrades a la taula.",
 caption:"T\u00EDtol de la taula",
 frame:"Marc",
 frame_none:"cap",
 frame_groups:"grups",
 frame_rows:"files",
 frame_cols:"columnes",
-frame_all:"totes",
+frame_all:"tot",
 rules:"Regles",
-rules_void:"salta regles",
-rules_above:"sobre",
-rules_below:"sota",
-rules_hsides:"banda horitzontal",
+rules_void:"buit",
+rules_above:"per damunt de",
+rules_below:"per sota de",
+rules_hsides:"hsides",
 rules_lhs:"lhs",
 rules_rhs:"rhs",
-rules_vsides:"banda vertical",
-rules_box:"caixa",
+rules_vsides:"vsides",
+rules_box:"quadre",
 rules_border:"vora"
 });