[Web-erp-svn] SF.net SVN: web-erp:[6475] trunk

[<rc...@us...>]

Revision: 6475
          http://sourceforge.net/p/web-erp/reponame/6475
Author:   rchacon
Date:     2013-12-04 17:56:10 +0000 (Wed, 04 Dec 2013)
Log Message:
-----------
Includes the observation that the default language is not included in the drop-down menu list of "Languages to Maintain Translations for Item Descriptions". Uniforming Login.php.

Modified Paths:
--------------
    trunk/SystemParameters.php
    trunk/includes/Login.php
    trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
    trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po

Modified: trunk/SystemParameters.php
===================================================================
--- trunk/SystemParameters.php	2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/SystemParameters.php	2013-12-04 17:56:10 UTC (rev 6475)
@@ -475,11 +475,9 @@
 	}
 }
 echo '</select></td>
-		<td>' . _('Select all the languages for which item description translations are to be maintained.') . '</td>
+		<td>' . _('Select the languages ​​in which translations of the item description will be maintained. The default language is excluded.') . '</td>
 	</tr>';
 
-
-
 //'RequirePickingNote'
 echo '<tr style="outline: 1px solid"><td>' . _('A picking note must be produced before an order can be delivered') . ':</td>
 	<td><select name="X_RequirePickingNote">

Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php	2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/includes/Login.php	2013-12-04 17:56:10 UTC (rev 6475)
@@ -53,7 +53,7 @@
 		        echo '<input type="hidden" name="CompanyNameField"  value="' .  $CompanyNameField . '" />';
 		    } else {
                 // Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
-                echo _('Company:') . '<br />';
+                echo _('Company') . ':<br />';
                 echo '<select name="CompanyNameField">';
                 foreach ($CompanyList as $key => $CompanyEntry){
                     if (is_dir('companies/' . $CompanyEntry['database']) ){
@@ -76,7 +76,7 @@
 			    echo _('Company') . '<input type="text" name="CompanyNameField"  autofocus="autofocus" required="required" value="' . $DefaultCompany . '" />';
 		    } else {
       			// Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
-    			echo _('Company:') . '<br />';
+    			echo _('Company') . ':<br />';
 	    		echo '<select name="CompanyNameField">';
 	    		$Companies = scandir('companies/', 0);
 			    foreach ($Companies as $CompanyEntry){
@@ -97,7 +97,7 @@
 	<span><?php echo _('User name'); ?>:</span><br />
 	<input type="text" name="UserNameEntryField" required="required" autofocus="autofocus" maxlength="20" placeholder="<?php echo _('User name'); ?>" /><br />
 	<span><?php echo _('Password'); ?>:</span><br />
-	<input type="password" required="required" name="Password" placeholder="<?php echo _('password'); ?>" /><br />
+	<input type="password" required="required" name="Password" placeholder="<?php echo _('Password'); ?>" /><br />
 	<div id="demo_text">
 	<?php
 	if (isset($demo_text)){

Modified: trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot
===================================================================
--- trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot	2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/locale/en_GB.utf8/LC_MESSAGES/messages.pot	2013-12-04 17:56:10 UTC (rev 6475)
@@ -29967,7 +29967,7 @@
 msgstr ""
 
 #: SystemParameters.php:478
-msgid "Select all the languages for which item description translations are to be maintained."
+msgid "Select the languages ​​in which translations of the item description will be maintained. The default language is excluded."
 msgstr ""
 
 #: SystemParameters.php:484

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.mo
===================================================================
(Binary files differ)

Modified: trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po
===================================================================
--- trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2013-12-04 15:48:08 UTC (rev 6474)
+++ trunk/locale/es_ES.utf8/LC_MESSAGES/messages.po	2013-12-04 17:56:10 UTC (rev 6475)
@@ -8,7 +8,7 @@
 "Project-Id-Version: WebERP 4.081\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-12-01 20:34+1300\n"
-"PO-Revision-Date: 2013-12-04 09:45-0600\n"
+"PO-Revision-Date: 2013-12-04 11:50-0600\n"
 "Last-Translator: Rafael Chacon <raf...@gm...>\n"
 "Language-Team: TecnoSoluciones.com <web...@te...>\n"
 "Language: es_ES\n"
@@ -34556,11 +34556,11 @@
 
 #: SystemParameters.php:478
 msgid ""
-"Select all the languages for which item description translations are to be "
-"maintained."
+"Select the languages ​​in which translations of the item description will be "
+"maintained. The default language is excluded."
 msgstr ""
-"Seleccionar todos los idiomas en los cuales se mantendrán las descripciones "
-"de artículos."
+"Seleccione los idiomas en los cuales se mantendrá traducciones de las "
+"descripciones de los artículos. Se excluye el idioma predeterminado."
 
 #: SystemParameters.php:484
 msgid "A picking note must be produced before an order can be delivered"
@@ -43332,9 +43332,8 @@
 msgstr "Compañía"
 
 #: includes/Login.php:56 includes/Login.php:79
-#, fuzzy
 msgid "Company:"
-msgstr "Compañía"
+msgstr "Compañía:"
 
 #: includes/Login.php:100
 #, fuzzy