Merge "Changed 'column' to 'cell' in dropdown (Bug #1482473)" into 15.10_STABLE

htdocs/js/views.js

@@ -404,7 +404,7 @@
 
         var position = $(this).val().split('-'),
             element = workspace.find('.js-col-row').eq(parseInt(position[0], 10) - 1).find('.column').eq(parseInt(position[1], 10) - 1),
-            options = [get_string('blockordertop')],
+            options = [get_string('blockordertopcell')],
             selectbox = $('#addblock_position');
 
         element.find('.column-content .blockinstance .blockinstance-header').each(function() {

htdocs/lang/en.utf8/view.php

@@ -261,7 +261,7 @@ $string['addblock'] = 'Add block: %s';
 $string['blockcell'] = 'Cell';
 $string['cellposition'] = 'Row %s Column %s';
 $string['blockorder'] = 'Position';
-$string['blockordertop'] = 'Top of column';
+$string['blockordertopcell'] = 'Top of cell';
 $string['blockorderafter'] = 'After "%s"';
 $string['rownr'] = 'Row %s';
 $string['nrrows'] = array(

htdocs/view/blocks.php

@@ -196,7 +196,7 @@ $smarty = smarty($javascript, $stylesheets, array(
     'view' => array(
         'addblock',
         'cellposition',
-        'blockordertop',
+        'blockordertopcell',
         'blockorderafter',
         'moveblock',
     ),