Merge branch 'master' into 'stable-3.1'

Marius Burkard · Marius Burkard · commit 03d03093c9ca · 2016-05-03T14:39:10.000+02:00
Master



See merge request !333
diff --git a/interface/web/dashboard/dashlets/templates/modules.htm b/interface/web/dashboard/dashlets/templates/modules.htm
@@ -9,8 +9,8 @@ <h2>{tmpl_var name='available_modules_txt'}</h2>
 				<div class='title'>{tmpl_var name='modules_title'}</div>
 			  </div>
 			</div>
-			<a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>Go to {tmpl_var name='modules_title'}</a>
+			<a href='#' class='btn btn-default button' data-capp='{tmpl_var name="modules_name"}'>{tmpl_var name='go_to_txt'} {tmpl_var name='modules_title'}</a>
 		</li>
 	</tmpl_loop>
 	</ul>
-	</div>
+	</div>
diff --git a/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ar_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng b/interface/web/dashboard/lib/lang/bg_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Налични Модули';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/br_dashlet_modules.lng b/interface/web/dashboard/lib/lang/br_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Módulos Disponíveis';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ca_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng b/interface/web/dashboard/lib/lang/cz_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupné moduly';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/de_dashlet_modules.lng b/interface/web/dashboard/lib/lang/de_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Verfügbare Module';
+$wb['go_to_txt'] = 'Gehe zu';
 ?>
diff --git a/interface/web/dashboard/lib/lang/el_dashlet_modules.lng b/interface/web/dashboard/lib/lang/el_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Διαθέσιμα αρθρώματα';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/en_dashlet_modules.lng b/interface/web/dashboard/lib/lang/en_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = "Available Modules";
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/es_dashlet_modules.lng b/interface/web/dashboard/lib/lang/es_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Módulos disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fi_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/fr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modules disponibles';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostupni moduli';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng b/interface/web/dashboard/lib/lang/hu_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Elérhető Modulok';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/id_dashlet_modules.lng b/interface/web/dashboard/lib/lang/id_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Modul yang tersedia';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/it_dashlet_modules.lng b/interface/web/dashboard/lib/lang/it_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Moduli disponibili';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ja_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/nl_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Beschikbare modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pl_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Dostępne moduły';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng b/interface/web/dashboard/lib/lang/pt_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ro_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng b/interface/web/dashboard/lib/lang/ru_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Доступные модули';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/se_dashlet_modules.lng b/interface/web/dashboard/lib/lang/se_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Tillgängliga moduler';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng b/interface/web/dashboard/lib/lang/sk_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng b/interface/web/dashboard/lib/lang/tr_dashlet_modules.lng
@@ -1,3 +1,4 @@
 <?php
 $wb['available_modules_txt'] = 'Kullanılabilecek Modüller';
+$wb['go_to_txt'] = 'Go to';
 ?>
diff --git a/interface/web/dns/form/dns_alias.tform.php b/interface/web/dns/form/dns_alias.tform.php
@@ -88,7 +88,7 @@
 			'validators' => array (  0 => array ( 'type' => 'NOTEMPTY',
 					'errmsg'=> 'name_error_empty'),
 				1 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-]{1,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\_]{1,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 <?php
 $wb['available_modules_txt'] = 'Available Modules';
 +$wb['go_to_txt'] = 'Go to';
 ?>