diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index ae60706f523..944f364ee4b 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -3333,7 +3333,7 @@ class Form
                 if (strval($set_time) != '' && $set_time != -1)
                 {
                     //$formated_date=dol_print_date($set_time,$conf->format_date_short);
-                    $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShort"));  // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript
+                    $formated_date=dol_print_date($set_time,$langs->trans("FormatDateShortInput"));  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
                 }
 
                 // Calendrier popup version eldy
@@ -3342,7 +3342,7 @@ class Form
                     // Zone de saisie manuelle de la date
                     $retstring.='<input id="'.$prefix.'" name="'.$prefix.'" type="text" size="9" maxlength="11" value="'.$formated_date.'"';
                     $retstring.=($disabled?' disabled="disabled"':'');
-                    $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\'); "';  // FormatDateShort for dol_print_date/FormatDateShortJava that is same for javascript
+                    $retstring.=' onChange="dpChangeDay(\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\'); "';  // FormatDateShortInput for dol_print_date / FormatDateShortJavaInput that is same for javascript
                     $retstring.='>';
 
                     // Icone calendrier
@@ -3350,7 +3350,7 @@ class Form
                     {
                         $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons"';
                         $base=DOL_URL_ROOT.'/core/';
-                        $retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
+                        $retstring.=' onClick="showDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');">'.img_object($langs->trans("SelectDate"),'calendarday','class="datecallink"').'</button>';
                     }
                     else $retstring.='<button id="'.$prefix.'Button" type="button" class="dpInvisibleButtons">'.img_object($langs->trans("Disabled"),'calendarday','class="datecallink"').'</button>';
 
@@ -3359,7 +3359,7 @@ class Form
                     $retstring.='<input type="hidden" id="'.$prefix.'year"  name="'.$prefix.'year"  value="'.$syear.'">'."\n";
                 }
                 else
-              {
+                {
                     print "Bad value of MAIN_POPUP_CALENDAR";
                 }
             }
@@ -3453,7 +3453,7 @@ class Form
             if ($usecalendar == "eldy")
             {
                 $base=DOL_URL_ROOT.'/core/';
-                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJava").'\',\''.$langs->defaultlang.'\');';
+                $reset_scripts .= 'resetDP(\''.$base.'\',\''.$prefix.'\',\''.$langs->trans("FormatDateShortJavaInput").'\',\''.$langs->defaultlang.'\');';
             }
             else
             {
diff --git a/htdocs/core/datepicker.php b/htdocs/core/datepicker.php
index 76b8dbb4b79..a976eb83f01 100644
--- a/htdocs/core/datepicker.php
+++ b/htdocs/core/datepicker.php
@@ -224,16 +224,16 @@ function displayBox($selectedDate,$month,$year)
 		if($thedate==$selDate) $dayclass="dpSelected";
 		elseif($thedate==$today) $dayclass="dpToday";
 
-		if ($langs->trans("FormatDateShortJava")=="FormatDateShortJava")
+		if ($langs->trans("FormatDateShortJavaInput")=="FormatDateShortJavaInput")
 		{
-		    print "ERROR FormatDateShortJava not defined for language ".$langs->defaultlang;
+		    print "ERROR FormatDateShortJavaInput not defined for language ".$langs->defaultlang;
 		    exit;
 		}
 
 		// Sur click dans calendrier, appelle fonction dpClickDay
 		echo "<TD class=\"".$dayclass."\"";
 		echo " onMouseOver=\"dpHighlightDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",tradMonths)\"";
-		echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJava")."')\"";
+		echo " onClick=\"dpClickDay(".$mydate["year"].",parseInt('".dol_print_date($thedate,"%m")."',10),".$mydate["mday"].",'".$langs->trans("FormatDateShortJavaInput")."')\"";
 		echo ">".sprintf("%02s",$mydate["mday"])."</TD>";
 		$cols++;
 
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index f273f913d04..93e44d0cf43 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -15,7 +15,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
 FormatDateShort=%d/%m/%Y
+FormatDateShortInpu=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -600,7 +604,6 @@ Prefix=بادئة
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 15:55:27).
 // Reference language: en_US -> ar_SA
-FormatDateShortJQuery=dd/mm/yy
 AddLink=إضافة وصلة
 Of=من
 SearchOf=البحث
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 51df97caecb..9356eeac9a0 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -10,8 +10,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index 35b4d437e4e..b4689f1537d 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/main.lang
@@ -4,8 +4,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index 7dd615bfa86..128bf629fc7 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -14,7 +14,11 @@ CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -624,7 +628,6 @@ Prefix=Præfiks
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 15:59:19).
 // Reference language: en_US -> da_DK
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Tilføj link
 Of=af
 SearchOf=Søg
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index ed9d7b27ec2..095cf44e5e2 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -10,7 +10,9 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index bac265965cc..88e22f914d8 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/main.lang
@@ -11,8 +11,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=.
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/MM/yy
+FormatDateShortJQueryInput=dd/MM/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index d37b716a9ba..b38a1417ea8 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -7,7 +7,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -592,7 +596,6 @@ ShortSunday=Κ
 
 // START - Lines generated via autotranslator.php tool (2011-06-26 15:35:22).
 // Reference language: en_US -> el_GR
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Προσθήκη συνδέσμου
 Of=του
 AmountByMonth=Ποσό ανά μήνα
diff --git a/htdocs/langs/en_AU/main.lang b/htdocs/langs/en_AU/main.lang
index 02b689c7c47..e1c3f95b5ea 100644
--- a/htdocs/langs/en_AU/main.lang
+++ b/htdocs/langs/en_AU/main.lang
@@ -4,7 +4,11 @@ CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/en_GB/main.lang b/htdocs/langs/en_GB/main.lang
index 8bd3243e226..6ec5c920232 100644
--- a/htdocs/langs/en_GB/main.lang
+++ b/htdocs/langs/en_GB/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/en_IN/main.lang b/htdocs/langs/en_IN/main.lang
index 795d89bce4e..8bf5df955b5 100644
--- a/htdocs/langs/en_IN/main.lang
+++ b/htdocs/langs/en_IN/main.lang
@@ -4,7 +4,11 @@ DIRECTION=ltr
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
diff --git a/htdocs/langs/en_NZ/main.lang b/htdocs/langs/en_NZ/main.lang
index 1e6ca9a9ddc..d3f11199968 100644
--- a/htdocs/langs/en_NZ/main.lang
+++ b/htdocs/langs/en_NZ/main.lang
@@ -4,7 +4,11 @@ CHARSET=UTF-8
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/en_SA/main.lang b/htdocs/langs/en_SA/main.lang
index 146ae3fd85e..cb8e3ba6e6d 100644
--- a/htdocs/langs/en_SA/main.lang
+++ b/htdocs/langs/en_SA/main.lang
@@ -6,8 +6,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 28de6467cbb..3e313654b94 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/main.lang
@@ -4,8 +4,11 @@ DIRECTION=ltr
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index b1c231a4a67..aece1ad9d15 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/main.lang
@@ -4,8 +4,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
index 390b2055e2f..421e7598de5 100644
--- a/htdocs/langs/es_HN/main.lang
+++ b/htdocs/langs/es_HN/main.lang
@@ -3,15 +3,6 @@ CHARSET=UTF-8
 DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
-FormatDateShort=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatHourShort=%H:%M
-FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
 AmountVAT=Importe ISV
 TotalVAT=Total ISV
 IncludedVAT=ISV incluido
diff --git a/htdocs/langs/es_PR/main.lang b/htdocs/langs/es_PR/main.lang
index 401b367ff52..5cb39740ada 100644
--- a/htdocs/langs/es_PR/main.lang
+++ b/htdocs/langs/es_PR/main.lang
@@ -3,15 +3,6 @@ CHARSET=UTF-8
 DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
-FormatDateShort=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatHourShort=%H:%M
-FormatHourShortDuration=%H:%M
-FormatDateTextShort=%d %b %Y
-FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourTextShort=%d %b %Y %H:%M
-FormatDateHourText=%d %B %Y %H:%M
 AmountVAT=Importe IVU
 TotalVAT=Total IVU
 IncludedVAT=IVU incluido
diff --git a/htdocs/langs/et_EE/main.lang b/htdocs/langs/et_EE/main.lang
index f02122fad5b..086bfe8b5b0 100644
--- a/htdocs/langs/et_EE/main.lang
+++ b/htdocs/langs/et_EE/main.lang
@@ -12,8 +12,11 @@ DIRECTION=ltr
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 4cb4fc7d9f7..6645152d1d2 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -15,7 +15,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=/
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 734a3356dd9..b451e91e115 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -11,7 +11,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H.%M
 FormatDateTextShort=%d. %b %Y
 FormatDateText=%d. %B %Y
@@ -616,7 +620,6 @@ Prefix=Etuliite
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 16:10:23).
 // Reference language: en_US -> fi_FI
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Lisää linkki
 Of=ja
 SearchOf=Etsi
diff --git a/htdocs/langs/fr_BE/main.lang b/htdocs/langs/fr_BE/main.lang
index 3a222bdd6b9..664e394aeba 100644
--- a/htdocs/langs/fr_BE/main.lang
+++ b/htdocs/langs/fr_BE/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/fr_CA/main.lang b/htdocs/langs/fr_CA/main.lang
index 3cd76162e3d..ca4b13b8480 100644
--- a/htdocs/langs/fr_CA/main.lang
+++ b/htdocs/langs/fr_CA/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index dbe4956c684..83cc40057ea 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
 FormatDateShort=%d-%m-%Y
+FormatDateShortInput=%d-%m-%Y
 FormatDateShortJava=dd-MM-yyyy
+FormatDateShortJavaInput=dd-MM-yyyy
+FormatDateShortJQuery=dd-mm-yy
+FormatDateShortJQueryInput=dd-mm-yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index b31b711f3a3..ad25de082f4 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/main.lang
@@ -3,9 +3,12 @@ CHARSET=UTF-8
 DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand= 
-FormatDateShort=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
+FormatDateShort=%d/%m/%y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/he_IL/main.lang b/htdocs/langs/he_IL/main.lang
index 1561f468861..03c0061acf1 100644
--- a/htdocs/langs/he_IL/main.lang
+++ b/htdocs/langs/he_IL/main.lang
@@ -15,8 +15,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
 FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 8ee7c826648..9fb2cf4f61d 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/main.lang
@@ -5,7 +5,11 @@ FONTFORPDF=dejavusans
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
@@ -587,7 +591,6 @@ ShortSunday=V
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 16:13:31).
 // Reference language: en_US -> hu_HU
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Link hozzáadása
 Of=A
 SearchOf=Keresés
diff --git a/htdocs/langs/is_IS/main.lang b/htdocs/langs/is_IS/main.lang
index 619f60994d9..c89746ed401 100644
--- a/htdocs/langs/is_IS/main.lang
+++ b/htdocs/langs/is_IS/main.lang
@@ -12,7 +12,11 @@ DIRECTION=ltr
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -604,7 +608,6 @@ Reason=Ástæða
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 16:26:19).
 // Reference language: en_US -> is_IS
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Bæta við tengli
 Of=á
 SearchOf=Leita
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index 43e9b108b78..78664cd01f8 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/main.lang
@@ -270,15 +270,18 @@ FollowingConstantsWillBeSubstituted			   =Le seguenti costanti saranno sostitute
 ForCustomer						   =Per i clienti
 FormatDateHourShort					   =%d/%m/%Y %H.%M
 FormatDateHourText					   =%d %B %Y %H:%M
-FormatDateHourTextShort					   =%d %b %Y %H.%M
+FormatDateHourTextShort				   =%d %b %Y %H.%M
 FormatDateShort						   =%d/%m/%Y
+FormatDateShortInput				   =%d/%m/%Y
 FormatDateShortJava					   =dd/MM/yyyy
-FormatDateShortJQuery					   =dd/mm/yy
+FormatDateShortJavaInput			   =dd/MM/yyyy
+FormatDateShortJQuery				   =dd/mm/yy
+FormatDateShortJQueryInput			   =dd/mm/yy
 FormatDateText						   =%d %B %Y
 FormatDateTextShort					   =%d %b %Y
-FormatHourShortDuration					   =%H:%M
-FormatHourShort					           =%H.%M
-For							   =Per
+FormatHourShortDuration				   =%H:%M
+FormatHourShort				           =%H.%M
+For								   =Per
 FreeZone						   =Testo libero
 Frequency						   =Frequenza
 FridayMin						   =Ven
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index 6f6201cb7ec..d4c93c068e5 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/main.lang
@@ -9,9 +9,12 @@ FONTSIZEFORPDF=9
 // Reference language: en_US -> ja_JP
 SeparatorDecimal=.
 SeparatorThousand=、
-FormatDateShort=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJQuery=dd/mm/yy
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 203896ba362..123ed5a86ed 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H.%M
 FormatDateTextShort=%d. %b %Y
 FormatDateText=%d. %B %Y
@@ -606,7 +610,6 @@ Day0=Søndag
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:06:43).
 // Reference language: en_US -> nb_NO
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Legg til link
 Of=av
 SearchOf=Søk
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index 3d16e786aed..d4aff86e9c3 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand= 
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 40947ca565f..100bd776c3a 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -4,7 +4,11 @@ DIRECTION = ltr
 SeparatorDecimal = ,
 SeparatorThousand = .
 FormatDateShort = %d-%m-%Y
+FormatDateShortInput = %d-%m-%Y
 FormatDateShortJava = dd-MM-yyyy
+FormatDateShortJavaInput = dd-MM-yyyy
+FormatDateShortJQuery=dd-mm-yy
+FormatDateShortJQueryInput=dd-mm-yy
 FormatHourShort = %H:%M
 FormatHourShortDuration = %H:%M
 FormatDateTextShort = %d %b %Y
@@ -590,7 +594,6 @@ ShortSunday = Zo
 
 // START - Lines generated via autotranslator.php tool (2011-10-10 01:46:39).
 // Reference language: en_US -> nl_NL
-FormatDateShortJQuery=dd/mm/yy
 JanuaryMin=Jan
 FebruaryMin=Februari
 MarchMin=Mar
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 5f725587178..41236b3456a 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -15,7 +15,11 @@ FONTSIZEFORPDF=8
 SeparatorDecimal=,
 SeparatorThousand= 
 FormatDateShort=%d-%m-%Y
+FormatDateShortInput=%d-%m-%Y
 FormatDateShortJava=dd-MM-yyyy
+FormatDateShortJavaInput=dd-MM-yyyy
+FormatDateShortJQuery=dd-mm-yy
+FormatDateShortJQueryInput=dd-mm-yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -620,7 +624,6 @@ Prefix=Przedrostek
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:18:29).
 // Reference language: en_US -> pl_PL
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Dodaj link
 Of=z
 SearchOf=Szukaj
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 86d60b9b037..4df4d1ea5ec 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -3,7 +3,11 @@ CHARSET=UTF-8
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -601,7 +605,6 @@ Prefix=Prefixo
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 15:45:52).
 // Reference language: en_US -> pt_PT
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Adicionar link
 Of=de
 SearchOf=Pesquisar
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index df4536746d8..8b7530a1702 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/main.lang
@@ -13,7 +13,11 @@ FONTSIZEFORPDF=8
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -618,7 +622,6 @@ Prefix=Prefix
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:23:15).
 // Reference language: en_US -> ro_RO
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Adauga link-ul
 Of=de
 SearchOf=Căutare
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index 1d203fb98f0..30be774c29f 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -15,7 +15,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
@@ -628,7 +632,6 @@ Person=Персона
 
 // START - Lines generated via autotranslator.php tool (2011-08-18 23:26:41).
 // Reference language: en_US -> ru_RU
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Добавить ссылку
 Of=из
 AmountByMonth=Сумма за месяц
diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang
index cef3a719ae0..cac36234fbf 100644
--- a/htdocs/langs/ru_UA/main.lang
+++ b/htdocs/langs/ru_UA/main.lang
@@ -10,7 +10,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
 FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
+FormatDateShortJQuery=dd.mm.yy
+FormatDateShortJQueryInput=dd.mm.yy
 FormatHourShort=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
diff --git a/htdocs/langs/sl_SI/main.lang b/htdocs/langs/sl_SI/main.lang
index 793d9498587..c79ca0d5dc5 100644
--- a/htdocs/langs/sl_SI/main.lang
+++ b/htdocs/langs/sl_SI/main.lang
@@ -6,8 +6,11 @@ FONTSIZEFORPDF=8
 SeparatorDecimal = ,
 SeparatorThousand = .
 FormatDateShort = %d/%m/%Y
+FormatDateShortInput = %d/%m/%Y
 FormatDateShortJava = dd/MM/yyyy
+FormatDateShortJavaInput = dd/MM/yyyy
 FormatDateShortJQuery = dd/mm/yy
+FormatDateShortJQueryInput = dd/mm/yy
 FormatHourShort = %I:%M %p
 FormatHourShortDuration = %H:%M
 FormatDateTextShort = %d. %b, %Y
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 55287b657a0..dde9641a208 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -12,7 +12,11 @@ DIRECTION=ltr
 SeparatorDecimal=,
 SeparatorThousand=
 FormatDateShort=%Y-%m-%d
+FormatDateShortInput=%Y-%m-%d
 FormatDateShortJava=yyyy-MM-dd
+FormatDateShortJavaInput=yyyy-MM-dd
+FormatDateShortJQuery=yy-mm-dd
+FormatDateShortJQueryInput=yy-mm-dd
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d %Y
@@ -594,7 +598,6 @@ ShortSunday=S
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:32:03).
 // Reference language: en_US -> sv_SE
-FormatDateShortJQuery=dd/mm/yy
 AddLink=Tillsätt länk
 Of=av
 SearchOf=Sök
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 7f372bf7dd5..8862e8b7635 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -14,8 +14,11 @@ FONTSIZEFORPDF=8
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 04235a1bd69..04c6ee545bd 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -17,7 +17,11 @@ FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=None
 FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
 FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShort=%I:%M %p
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
@@ -604,7 +608,6 @@ Prefix=字首
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
 // Reference language: en_US -> zh_CN
-FormatDateShortJQuery=dd/mm/yy
 AddLink=添加链接
 Of=的
 SearchOf=搜索
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index b853fbb6073..aff84edf1ef 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -13,7 +13,11 @@ FONTFORPDF=msungstdlight
 SeparatorDecimal=.
 SeparatorThousand=None
 FormatDateShort=%Y/%m/%d
+FormatDateShortInput=%Y/%m/%d
 FormatDateShortJava=yyyy/MM/dd
+FormatDateShortJavaInput=yyyy/MM/dd
+FormatDateShortJQuery=yy/mm/dd
+FormatDateShortJQueryInput=yy/mm/dd
 FormatHourShort=%I:%M %p
 FormatDateTextShort=%Y %b %d
 FormatDateText=%Y %B %d
@@ -600,7 +604,6 @@ Prefix=字首
 
 // START - Lines generated via autotranslator.php tool (2012-02-29 17:37:09).
 // Reference language: en_US -> zh_CN
-FormatDateShortJQuery=dd/mm/yy
 AddLink=添加鏈接
 Of=的
 SearchOf=搜尋