Improved the import feature to insure that we don't have language conflicts with multiple strings for one language.

2017-04-08 14:44:41 +01:00
parent 1cf259a54d
commit 6bba258fec
203 changed files with 226 additions and 225 deletions
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviewfolderlist.php
--- a/admin/models/fields/adminviews.php
+++ b/admin/models/fields/adminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		adminviews.php
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		articles.php
--- a/admin/models/fields/component.php
+++ b/admin/models/fields/component.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		component.php
--- a/admin/models/fields/components.php
+++ b/admin/models/fields/components.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		components.php
--- a/admin/models/fields/customadminviews.php
+++ b/admin/models/fields/customadminviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customadminviews.php
--- a/admin/models/fields/customfilelist.php
+++ b/admin/models/fields/customfilelist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfilelist.php
--- a/admin/models/fields/customfolderlist.php
+++ b/admin/models/fields/customfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customfolderlist.php
--- a/admin/models/fields/customgets.php
+++ b/admin/models/fields/customgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		customgets.php
--- a/admin/models/fields/dbtables.php
+++ b/admin/models/fields/dbtables.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dbtables.php
--- a/admin/models/fields/dynamicget.php
+++ b/admin/models/fields/dynamicget.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicget.php
--- a/admin/models/fields/dynamicgets.php
+++ b/admin/models/fields/dynamicgets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		dynamicgets.php
--- a/admin/models/fields/fields.php
+++ b/admin/models/fields/fields.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fields.php
--- a/admin/models/fields/fieldsmulti.php
+++ b/admin/models/fields/fieldsmulti.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldsmulti.php
--- a/admin/models/fields/fieldtypes.php
+++ b/admin/models/fields/fieldtypes.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		fieldtypes.php
--- a/admin/models/fields/lang.php
+++ b/admin/models/fields/lang.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		lang.php
--- a/admin/models/fields/maingets.php
+++ b/admin/models/fields/maingets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		maingets.php
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviewfolderlist.php
--- a/admin/models/fields/siteviews.php
+++ b/admin/models/fields/siteviews.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		siteviews.php
--- a/admin/models/fields/snippets.php
+++ b/admin/models/fields/snippets.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/

 	@version		2.4.2
-	@build			7th April, 2017
+	@build			8th April, 2017
 	@created		30th April, 2015
 	@package		Component Builder
 	@subpackage		snippets.php