Merge branch 'master' of https://github.com/joomla/joomla-cms

# By Jean-Marie Simonet (3) and others
# Via Jean-Marie Simonet
* 'master' of https://github.com/joomla/joomla-cms:
  changelog
  +$ Adding installation languages: ja-JP, ko-KR, nl-NL
  #$ Wrong lang constant and missing strings in hathor
  # [#29288] Joomla update doesnt purge correctly. Thanks Janich
  # [#29287] String Global Configuration appears as title of every component Options. Thanks Michael

administrator/components/com_config/views/component/view.html.php

@@ -63,7 +63,7 @@ public function display($tpl = null)
 	 */
 	protected function addToolbar()
 	{
-		JToolbarHelper::title(JText::_('COM_CONFIG_GLOBAL_CONFIGURATION'), 'config.png');
+		JToolbarHelper::title(JText::_($this->component->option . '_configuration'), 'config.png');
 		JToolbarHelper::apply('component.apply');
 		JToolbarHelper::save('component.save');
 		JToolbarHelper::divider();

administrator/components/com_joomlaupdate/views/default/tmpl/default.php

@@ -13,6 +13,8 @@
 
 ?>
 
+<form action="index.php" method="post" id="adminForm">
+
 <?php if (is_null($this->updateInfo['object'])): ?>
 
 <fieldset>
@@ -26,10 +28,6 @@
 
 <?php else: ?>
 
-<form action="index.php" method="post" id="adminForm">
-<input type="hidden" name="option" value="com_joomlaupdate" />
-<input type="hidden" name="task" value="update.download" />
-
 <fieldset>
 	<legend>
 		<?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_UPDATEFOUND') ?>
@@ -127,9 +125,13 @@
 	</table>
 </fieldset>
 
-</form>
 <?php endif; ?>
 
+<?php echo JHtml::_('form.token'); ?>
+<input type="hidden" name="task" value="" />
+<input type="hidden" name="option" value="com_joomlaupdate" />
+</form>
+
 <div class="download_message" style="display: none">
 	<p></p>
 	<p class="nowarning"> <?php echo JText::_('COM_JOOMLAUPDATE_VIEW_DEFAULT_DOWNLOAD_IN_PROGRESS'); ?></p>

administrator/language/en-GB/en-GB.tpl_hathor.ini

@@ -8,19 +8,21 @@ TPL_HATHOR_ALTERNATE_MENU_DESC="Use the alternative menu which integrates mouse
 TPL_HATHOR_ALTERNATE_MENU_LABEL="Alternative Menu"
 TPL_HATHOR_BOLD_TEXT_DESC="Use bold text"
 TPL_HATHOR_BOLD_TEXT_LABEL="Bold Text"
+TPL_HATHOR_CHECKMARK_ALL="Checkmark All"
 TPL_HATHOR_COLOUR_CHOICE_DESC="Select the colour palette to use with the template. You can use this option to select a high contrast version or use it to create custom branding."
 TPL_HATHOR_COLOUR_CHOICE_LABEL="Select Colour"
 TPL_HATHOR_COLOUR_CHOICE_STANDARD="Standard"
 TPL_HATHOR_COLOUR_CHOICE_HIGH_CONTRAST="High Contrast"
 TPL_HATHOR_COLOUR_CHOICE_BROWN="Brown"
-TPL_HATHOR_COLOUR_CHOICE_BLUE="Blue"
 TPL_HATHOR_COM_MENUS_MENU="Menu"
 TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL="Select"
 TPL_HATHOR_CPANEL_LINK_TEXT="Return to Control Panel"
 TPL_HATHOR_GO="Go"
+TPL_HATHOR_LOGO_DESC="Upload a custom logo for the admin template."
+TPL_HATHOR_LOGO_LABEL="Logo"
 TPL_HATHOR_MAIN_MENU="Main Menu"
 TPL_HATHOR_SHOW_SITE_NAME_DESC="Show the site name in the template header"
 TPL_HATHOR_SHOW_SITE_NAME_LABEL="Show Site Name"
 TPL_HATHOR_SKIP_TO_MAIN_CONTENT="Skip to Main Content"
 TPL_HATHOR_SUB_MENU="Sub Menu"
-TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible administrator template for Joomla!. The Colour CSS files can also be used for custom colour branding."
+TPL_HATHOR_XML_DESCRIPTION="Hathor is an accessible administrator template for Joomla!. The Colour CSS files can also be used for custom colour branding."

administrator/templates/hathor/language/en-GB/en-GB.tpl_hathor.ini

@@ -18,6 +18,8 @@ TPL_HATHOR_COM_MENUS_MENU="Menu"
 TPL_HATHOR_COM_MODULES_CUSTOM_POSITION_LABEL="Select"
 TPL_HATHOR_CPANEL_LINK_TEXT="Return to Control Panel"
 TPL_HATHOR_GO="Go"
+TPL_HATHOR_LOGO_DESC="Upload a custom logo for the admin template."
+TPL_HATHOR_LOGO_LABEL="Logo"
 TPL_HATHOR_MAIN_MENU="Main Menu"
 TPL_HATHOR_SHOW_SITE_NAME_DESC="Show the site name in the template header"
 TPL_HATHOR_SHOW_SITE_NAME_LABEL="Show Site Name"

administrator/templates/hathor/templateDetails.xml

@@ -54,8 +54,8 @@
 					<option value="1">JYES</option>
 				</field>
 				<field name="logoFile" class="" type="media" default=""
-					label="TPL_ISIS_LOGO_LABEL"
-					description="TPL_ISIS_LOGO_DESC" />
+					label="TPL_HATHOR_LOGO_LABEL"
+					description="TPL_HATHOR_LOGO_DESC" />
 
 				<field name="colourChoice" type="list" default="0" label="TPL_HATHOR_COLOUR_CHOICE_LABEL" description="TPL_HATHOR_COLOUR_CHOICE_DESC"  filter="word">
 					<option value="">TPL_HATHOR_COLOUR_CHOICE_STANDARD</option>

installation/CHANGELOG

@@ -26,6 +26,12 @@ $ -> Language fix or change
 - -> Removed
 ! -> Note
 
+24-Sep-2012 Jean-Marie Simonet
+ # [#29287] String Global Configuration appears as title of every component Options. Thanks Michael
+ # [#29288] Joomla update doesnt purge correctly. Thanks Janich
+ #$ Wrong lang constant and missing strings in hathor
+ +$ Adding installation languages: ja-JP, ko-KR, nl-NL
+
 23-Sep-2012 Jean-Marie Simonet
  $ Improving ta-IN installation ini
  # [#29285] String Last Updated appears twice in frontend. Thanks Stella.
@@ -44,7 +50,7 @@ $ -> Language fix or change
  # Correcting double translation
  $ Correcting lang string typo
  # [#29050] Page Navigation in Extension Manager not working. Thanks Yannick
- #[#29274] Fix code style and unclear doc blocks from 29050. Thanks Michael
+ # [#29274] Fix code style and unclear doc blocks from 29050. Thanks Michael
 
 21-Sep-2012 Jean-Marie Simonet
  +$ Adding installation languages: km-KH, sv-SE

installation/language/ja-JP/index.html

@@ -0,0 +1 @@
+<!DOCTYPE html><title></title>