diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:21:56 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:21:56 +0200 |
| commit | 85eb6a0bc0575c687eb43efe61cf206b26b26af8 (patch) | |
| tree | 73ac951fd6373502fd6bfb3b4ba773c463c8004f | |
| parent | 8f5a0ad6f73e7b7757b02c827436384c96069b5a (diff) | |
| download | forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.gz forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.bz2 forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.tar.xz forums-85eb6a0bc0575c687eb43efe61cf206b26b26af8.zip | |
[ticket/14039] Fix language constants and comments
PHPBB3-14039
| -rw-r--r-- | phpBB/language/en/install_new.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/archive_download.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/helper/config.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/language/en/install_new.php b/phpBB/language/en/install_new.php index 6578338fa4..8a9654f471 100644 --- a/phpBB/language/en/install_new.php +++ b/phpBB/language/en/install_new.php @@ -334,7 +334,7 @@ $lang = array_merge($lang, array( 'UPDATE_FILE_METHOD' => 'File updater method', 'UPDATE_FILE_METHOD_DOWNLOAD' => 'Download modified files in an archive', 'UPDATE_FILE_METHOD_FTP' => 'Update files via FTP (Automatic)', - 'UPDATE_FILE_METHOD_FILESYSTEM' => 'Update files via file commands (Automatic)', + 'UPDATE_FILE_METHOD_FILESYSTEM' => 'Update files via direct file access (Automatic)', // File updater archives 'SELECT_DOWNLOAD_FORMAT' => 'Select download archive format', diff --git a/phpBB/phpbb/install/controller/archive_download.php b/phpBB/phpbb/install/controller/archive_download.php index 711e1f2f0c..e1f7634963 100644 --- a/phpBB/phpbb/install/controller/archive_download.php +++ b/phpBB/phpbb/install/controller/archive_download.php @@ -38,7 +38,7 @@ class archive_download /** * Sends response with the merge conflict archive * - * Merge conflicts are always have to be resolved manually, + * Merge conflicts always have to be resolved manually, * so we use a different archive for that. * * @return BinaryFileResponse diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php index e73e07208e..0f0840f470 100644 --- a/phpBB/phpbb/install/helper/config.php +++ b/phpBB/phpbb/install/helper/config.php @@ -262,7 +262,7 @@ class config * * @param string $name Name of the restart point * - * @return bool Returns false if the restart point name is not exist, true otherwise + * @return bool Returns false if the restart point name does not exist, otherwise true */ public function jump_to_restart_point($name) { |