diff --git a/install/core/i18n/de_DE/install.json b/install/core/i18n/de_DE/install.json index a7228c520b..43b9917dba 100644 --- a/install/core/i18n/de_DE/install.json +++ b/install/core/i18n/de_DE/install.json @@ -27,7 +27,7 @@ "Test settings": "Test Connection" }, "fields": { - "Choose your language:": "Choose your language:", + "Choose your language": "Choose your language", "Database Name": "Database Name", "Host Name": "Host Name", "Port": "Port", @@ -58,13 +58,13 @@ "smtpPassword": "Password" }, "messages": { - "Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}<\/b><\/pre>\n\tOperation not permitted? Try this one: {CSU}",
+		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}
\n\tOperation not permitted? Try this one: {CSU}",
 		"Some errors occurred!": "Some errors occurred!",
 		"Supported php version >=": "Supported php version >=",
-		"The PHP extension was not found...": "The {extName}<\/b> PHP extension was not found...",
+		"The PHP extension was not found...": "The {extName} PHP extension was not found...",
 		"All Settings correct": "All Settings are correct",
 		"Failed to connect to database": "Failed to connect to database",
-		"PHP version:": "PHP version:",
+		"PHP version": "PHP version",
 		"You must agree to the license agreement": "You must agree to the license agreement",
 		"Passwords do not match": "Passwords do not match",
 		"Enable mod_rewrite in Apache server": "Enable mod_rewrite in Apache server",
@@ -76,7 +76,7 @@
 		"Ajax failed": "Ajax failed",
 		"Cannot create user": "Cannot create user",
 		"Permission denied": "Permission denied",
-		"permissionInstruction": "
Run this in Terminal
\"{C}\"<\/b><\/pre>",
+		"permissionInstruction": "
Run this in Terminal
\"{C}\"
",
 		"operationNotPermitted" : "Operation not permitted? Try this: 
{CSU}",
 		"Permission denied to": "Permission denied",
 		"Can not save settings": "Can not save settings",
@@ -93,8 +93,8 @@
 		},
 		"modRewriteInstruction": {
 			"apache": {
-				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory \/PATH_TO_ESPO\/>\n AllowOverride All<\/b>\n<\/Directory><\/pre>\n Afterwards run this command in a Terminal:
service apache2 restart<\/b><\/pre>
To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart<\/b><\/pre>",
-				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules\/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n<\/pre>"
+				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory /PATH_TO_ESPO/>\n AllowOverride All\n</Directory>
\n Afterwards run this command in a Terminal:
service apache2 restart

To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart
",
+				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n
"
 			},
 			"microsoft-iis": {
 				"windows": ""
@@ -102,7 +102,7 @@
 		},
 		"modRewriteHelp": {
 			"apache": "API Error: EspoCRM API unavailable.
 Possible problems: disabled \"mod_rewrite\" in Apache server or .htaccess support.",
-			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation \/api\/v1\/ {\n    if (!-e $request_filename){\n        rewrite ^\/api\/v1\/(.*)$ \/api\/v1\/index.php last; break;\n    }\n}\n\nlocation \/ {\n    rewrite reset\/?$ reset.html break;\n}<\/pre>",
+			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation /api/v1/ {\n    if (!-e $request_filename){\n        rewrite ^/api/v1/(.*)$ /api/v1/index.php last; break;\n    }\n}\n\nlocation / {\n    rewrite reset/?$ reset.html break;\n}
",
 			"microsoft-iis": "API Error: EspoCRM API unavailable.
 Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
 			"default": "API Error: EspoCRM API unavailable.
 Possible problem: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
 		}
diff --git a/install/core/i18n/en_US/install.json b/install/core/i18n/en_US/install.json
index 8579d433cf..43b9917dba 100644
--- a/install/core/i18n/en_US/install.json
+++ b/install/core/i18n/en_US/install.json
@@ -58,10 +58,10 @@
 		"smtpPassword": "Password"
 	},
 	"messages": {
-		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}<\/b><\/pre>\n\tOperation not permitted? Try this one: {CSU}",
+		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}
\n\tOperation not permitted? Try this one: {CSU}",
 		"Some errors occurred!": "Some errors occurred!",
 		"Supported php version >=": "Supported php version >=",
-		"The PHP extension was not found...": "The {extName}<\/b> PHP extension was not found...",
+		"The PHP extension was not found...": "The {extName} PHP extension was not found...",
 		"All Settings correct": "All Settings are correct",
 		"Failed to connect to database": "Failed to connect to database",
 		"PHP version": "PHP version",
@@ -76,7 +76,7 @@
 		"Ajax failed": "Ajax failed",
 		"Cannot create user": "Cannot create user",
 		"Permission denied": "Permission denied",
-		"permissionInstruction": "
Run this in Terminal
\"{C}\"<\/b><\/pre>",
+		"permissionInstruction": "
Run this in Terminal
\"{C}\"
",
 		"operationNotPermitted" : "Operation not permitted? Try this: 
{CSU}",
 		"Permission denied to": "Permission denied",
 		"Can not save settings": "Can not save settings",
@@ -93,8 +93,8 @@
 		},
 		"modRewriteInstruction": {
 			"apache": {
-				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory \/PATH_TO_ESPO\/>\n AllowOverride All<\/b>\n<\/Directory><\/pre>\n Afterwards run this command in a Terminal:
service apache2 restart<\/b><\/pre>
To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart<\/b><\/pre>",
-				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules\/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n<\/pre>"
+				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory /PATH_TO_ESPO/>\n AllowOverride All\n</Directory>
\n Afterwards run this command in a Terminal:
service apache2 restart

To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart
",
+				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n
"
 			},
 			"microsoft-iis": {
 				"windows": ""
@@ -102,7 +102,7 @@
 		},
 		"modRewriteHelp": {
 			"apache": "API Error: EspoCRM API unavailable.
 Possible problems: disabled \"mod_rewrite\" in Apache server or .htaccess support.",
-			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation \/api\/v1\/ {\n    if (!-e $request_filename){\n        rewrite ^\/api\/v1\/(.*)$ \/api\/v1\/index.php last; break;\n    }\n}\n\nlocation \/ {\n    rewrite reset\/?$ reset.html break;\n}<\/pre>",
+			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation /api/v1/ {\n    if (!-e $request_filename){\n        rewrite ^/api/v1/(.*)$ /api/v1/index.php last; break;\n    }\n}\n\nlocation / {\n    rewrite reset/?$ reset.html break;\n}
",
 			"microsoft-iis": "API Error: EspoCRM API unavailable.
 Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
 			"default": "API Error: EspoCRM API unavailable.
 Possible problem: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
 		}
diff --git a/install/core/i18n/es_ES/install.json b/install/core/i18n/es_ES/install.json
index 0b85071213..b78d192ab3 100644
--- a/install/core/i18n/es_ES/install.json
+++ b/install/core/i18n/es_ES/install.json
@@ -26,7 +26,7 @@
 		"Test settings": "Test de conexión"
 	},
 	"fields": {
-		"Choose your language:": "Seleccione un lenguaje:",
+		"Choose your language": "Seleccione un lenguaje",
 		"Database Name": "Nombre de la Base de Datos",
 		"Host Name": "Hostname usualmente(localhost)",
 		"Port": "Puerto",
@@ -57,13 +57,13 @@
 		"smtpPassword": "Contraseña"
 	},
 	"messages": {
-		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}<\/b><\/pre>\n\tOperation not permitted? Try this one: {CSU}",
+		"Bad init Permission": "Permission denied for \"{*}\" directory. Please set 775 for \"{*}\" or just execute this command in the terminal 
{C}
\n\tOperation not permitted? Try this one: {CSU}",
 		"Some errors occurred!": "Some errors occurred!",
 		"Supported php version >=": "Supported php version >=",
-		"The PHP extension was not found...": "The {extName}<\/b> PHP extension was not found...",
+		"The PHP extension was not found...": "The {extName} PHP extension was not found...",
 		"All Settings correct": "All Settings are correct",
 		"Failed to connect to database": "Failed to connect to database",
-		"PHP version: ": "PHP version:",
+		"PHP version": "PHP version",
 		"You must agree to the license agreement": "Usted debe aceptar el acuerdo de licencia",
 		"Passwords do not match": "Passwords do not match",
 		"Enable mod_rewrite in Apache server": "Enable mod_rewrite in Apache server",
@@ -75,7 +75,7 @@
 		"Ajax failed": "Ajax failed",
 		"Cannot create user": "Cannot create user",
 		"Permission denied": "Permission denied",
-		"permissionInstruction": "
Run this in Terminal
\"{C}\"<\/b><\/pre>",
+		"permissionInstruction": "
Run this in Terminal
\"{C}\"
",
 		"operationNotPermitted" : "Operation not permitted? Try this: 
{CSU}",
 		"Permission denied to": "Permission denied",
 		"Can not save settings": "Can not save settings",
@@ -92,8 +92,8 @@
 		},
 		"modRewriteInstruction": {
 			"apache": {
-				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory \/PATH_TO_ESPO\/>\n AllowOverride All<\/b>\n<\/Directory><\/pre>\n Afterwards run this command in a Terminal:
service apache2 restart<\/b><\/pre>
To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart<\/b><\/pre>",
-				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules\/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n<\/pre>"
+				"linux": "

To enable .htaccess support add/edit the Server configuration settings inside your <VirtualHost> section (httpd.conf):
<Directory /PATH_TO_ESPO/>\n AllowOverride All\n</Directory>
\n Afterwards run this command in a Terminal:
service apache2 restart

To enable \"mod_rewrite\" run those commands in a Terminal:
a2enmod rewrite 
service apache2 restart
",
+				"windows": "
 
1. Find the httpd.conf file (usually you will find it in a folder called conf, config or something along those lines)
\n2. Inside the httpd.conf file uncomment the line LoadModule rewrite_module modules/mod_rewrite.so (remove the pound '#' sign from in front of the line)
\n3. Also find the line ClearModuleList is uncommented then find and make sure that the line AddModule mod_rewrite.c is not commented out.\n
"
 			},
 			"microsoft-iis": {
 				"windows": ""
@@ -101,7 +101,7 @@
 		},
 		"modRewriteHelp": {
 			"apache": "API Error: EspoCRM API unavailable.
 Possible problems: disabled \"mod_rewrite\" in Apache server or .htaccess support.",
-			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation \/api\/v1\/ {\n    if (!-e $request_filename){\n        rewrite ^\/api\/v1\/(.*)$ \/api\/v1\/index.php last; break;\n    }\n}\n\nlocation \/ {\n    rewrite reset\/?$ reset.html break;\n}<\/pre>",
+			"nginx": "API Error: EspoCRM API unavailable.
 Add this code to Nginx Host Config (inside \"server\" block):
\n
\nlocation /api/v1/ {\n    if (!-e $request_filename){\n        rewrite ^/api/v1/(.*)$ /api/v1/index.php last; break;\n    }\n}\n\nlocation / {\n    rewrite reset/?$ reset.html break;\n}
",
 			"microsoft-iis": "API Error: EspoCRM API unavailable.
 Possible problem: disabled \"URL Rewrite\". Please check and enable \"URL Rewrite\" Module in IIS server",
 			"default": "API Error: EspoCRM API unavailable.
 Possible problem: disabled Rewrite Module. Please check and enable Rewrite Module in your server (e.g. mod_rewrite in Apache) and .htaccess support."
 		}
diff --git a/install/core/tpl/main.tpl b/install/core/tpl/main.tpl
index d455ffe7f6..82465b8c48 100644
--- a/install/core/tpl/main.tpl
+++ b/install/core/tpl/main.tpl
@@ -17,7 +17,7 @@