Skip to content

[4.0] incorrect terminology #19728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 7, 2018
Merged

[4.0] incorrect terminology #19728

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fbcca33
incorrect terminology
brianteeman Feb 18, 2018
e52d749
Merge branch '4.0-dev' into installation
brianteeman Feb 18, 2018
35219ec
Update en-GB.ini
brianteeman Feb 19, 2018
0f78eda
Merge branch '4.0-dev' into installation
brianteeman Feb 20, 2018
76f7846
Merge branch '4.0-dev' into installation
brianteeman Mar 25, 2018
453bd20
Merge branch '4.0-dev' into installation
zero-24 Apr 7, 2018
7f83eb1
Merge branch '4.0-dev' into installation
laoneo Apr 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions installation/language/en-GB/en-GB.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ INSTL_PRECHECK_ACTUAL="Actual"
; Database view
INSTL_DATABASE="Database Configuration"
INSTL_DATABASE_ERROR_POSTGRESQL_QUERY="PostgreSQL database query failed."
INSTL_DATABASE_HOST_DESC="Specify the Host Name, usually \"localhost\" or a name provided by your host."
INSTL_DATABASE_HOST_DESC="Enter the Host Name, usually \"localhost\" or a name provided by your host."
Copy link
Contributor

@Quy Quy Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lower case Host Name? This is the case with database name below.

Copy link
Contributor Author

@brianteeman brianteeman Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no it needs to be caps to differentiate from "name provided by your host"

INSTL_DATABASE_HOST_LABEL="Host Name"
INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_CREATE_FILE="We were not able to create the file. Please manually create a file named "%1$s" and upload it to the "%2$s" folder of your Joomla site."
INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_DELETE_FILE="In order to confirm that you are the owner of this website please delete the file named "%1$s" we have created in the "%2$s" folder of your Joomla site."
INSTL_DATABASE_HOST_IS_NOT_LOCALHOST_GENERAL_MESSAGE="You are trying to use a database host which is not on your local server. For security reasons, you need to verify the ownership of your web hosting account. <a href="_QQ_"%s"_QQ_">Please read the documentation</a> for more information."
INSTL_DATABASE_NAME_DESC="Specify the database table name. Use table prefix to distinct Joomla sites."
INSTL_DATABASE_NAME_DESC="Enter the database table name."
Copy link
Contributor

@Quy Quy Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

database name

Copy link
Contributor Author

@brianteeman brianteeman Feb 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

less haste more speed

INSTL_DATABASE_NAME_LABEL="Database Name"
INSTL_DATABASE_NO_SCHEMA="No database schema exists for this database type."
INSTL_DATABASE_PASSWORD_DESC="Either a password you created or a password provided by your host."
INSTL_DATABASE_PREFIX_DESC="Specify a table prefix or use the randomly generated one."
INSTL_DATABASE_PREFIX_DESC="Enter a table prefix or use the randomly generated one."
INSTL_DATABASE_TYPE_DESC="Select the database type."
INSTL_DATABASE_USER_DESC="Either a username you created or a username provided by your host."
INSTL_INSTALL_JOOMLA="Install Joomla"
Expand Down