From d89cf737aee0dff64f4a7b0656a71deeef418005 Mon Sep 17 00:00:00 2001 From: cmeh Date: Mon, 16 Feb 2015 09:59:41 +0100 Subject: [PATCH 1/4] Message clean-up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit *Changes:* * "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up"). * "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59. * Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components. * "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]). * Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either". --- core/js/setupchecks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index db5365c124d..bdcea7956c7 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -21,7 +21,7 @@ var messages = []; if (xhr.status !== 207 && xhr.status !== 401) { messages.push( - t('core', 'Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken.') + t('core', 'Your web server is not yet set up properly to allow file synchronization because the WebDAV interface seems to be broken.') ); } deferred.resolve(messages); @@ -51,12 +51,12 @@ if (xhr.status === 200 && data) { if (!data.serverHasInternetConnection) { messages.push( - t('core', 'This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.') + t('core', 'This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps won\'t work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features.') ); } if(!data.dataDirectoryProtected) { messages.push( - t('core', 'Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.') + t('core', 'Your data directory and your files are probably accessible from the Internet. The .htaccess file is not working. We strongly suggest that you configure your web server in a way that the data directory is no longer accessible or you move the data directory outside the web server document root.') ); } } else { From 09a0bf22dfcee88722fce8d34002bee96a82a834 Mon Sep 17 00:00:00 2001 From: cmeh Date: Mon, 16 Feb 2015 10:25:01 +0100 Subject: [PATCH 2/4] Update setupchecks.js Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975). --- core/js/setupchecks.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/js/setupchecks.js b/core/js/setupchecks.js index bdcea7956c7..00e73162c55 100644 --- a/core/js/setupchecks.js +++ b/core/js/setupchecks.js @@ -51,7 +51,7 @@ if (xhr.status === 200 && data) { if (!data.serverHasInternetConnection) { messages.push( - t('core', 'This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps won\'t work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features.') + t('core', 'This server has no working Internet connection. This means that some of the features like mounting external storage, notifications about updates or installation of third-party apps will not work. Accessing files remotely and sending of notification emails might not work, either. We suggest to enable Internet connection for this server if you want to have all features.') ); } if(!data.dataDirectoryProtected) { From 46c34d68679c77826488d7a2fe79cea0982b8319 Mon Sep 17 00:00:00 2001 From: cmeh Date: Wed, 18 Feb 2015 12:26:42 +0100 Subject: [PATCH 3/4] Cleaning-up messages **Changes:** * In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud". * A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB"). --- core/setup/controller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/setup/controller.php b/core/setup/controller.php index 854c30ac769..1028a49d0e2 100644 --- a/core/setup/controller.php +++ b/core/setup/controller.php @@ -100,7 +100,7 @@ class Controller { public function loadAutoConfig($post) { if( file_exists($this->autoConfigFile)) { - \OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO); + \OC_Log::write('core', 'Autoconfig file found, setting up ownCloud…', \OC_Log::INFO); $AUTOCONFIG = array(); include $this->autoConfigFile; $post = array_merge ($post, $AUTOCONFIG); @@ -174,7 +174,7 @@ class Controller { $errors[] = array( 'error' => $this->l10n->t( 'It seems that this %s instance is running on a 32-bit PHP environment and the open_basedir has been configured in php.ini. ' . - 'This will lead to problems with files over 4GB and is highly discouraged.', + 'This will lead to problems with files over 4 GB and is highly discouraged.', $this->defaults->getName() ), 'hint' => $this->l10n->t('Please remove the open_basedir setting within your php.ini or switch to 64-bit PHP.') @@ -184,7 +184,7 @@ class Controller { $errors[] = array( 'error' => $this->l10n->t( 'It seems that this %s instance is running on a 32-bit PHP environment and cURL is not installed. ' . - 'This will lead to problems with files over 4GB and is highly discouraged.', + 'This will lead to problems with files over 4 GB and is highly discouraged.', $this->defaults->getName() ), 'hint' => $this->l10n->t('Please install the cURL extension and restart your webserver.') From 649a1ba2550afb12a0cfbadfdd5fec03001fc0e9 Mon Sep 17 00:00:00 2001 From: cmeh Date: Tue, 24 Feb 2015 10:15:56 +0100 Subject: [PATCH 4/4] Typo: Missing "n" A missing "n" was added in line 63. --- apps/user_ldap/templates/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 811deada944..6aa2183726b 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -60,7 +60,7 @@

t('Username-LDAP User Mapping'));?>

-

t('Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?>

+

t('Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have an internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage.'));?>