fixed code

9 files changed, 13 insertions, 13 deletions

diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 4ed401e5c5b..cda97887d30 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>dav</id>
 	<name>WebDAV</name>
-	<description>ownCloud WebDAV endpoint</description>
+	<description>WebDAV endpoint</description>
 	<licence>AGPL</licence>
 	<author>owncloud.org</author>
 	<version>0.1.6</version>
diff --git a/apps/encryption/lib/keymanager.php b/apps/encryption/lib/keymanager.php
index 6720d19fe1b..fca10f67350 100644
--- a/apps/encryption/lib/keymanager.php
+++ b/apps/encryption/lib/keymanager.php
@@ -669,7 +669,7 @@ class KeyManager {
 	public function getMasterKeyPassword() {
 		$password = $this->config->getSystemValue('secret');
 		if (empty($password)){
-			throw new \Exception('Can not get secret from ownCloud instance');
+			throw new \Exception('Can not get secret from instance');
 		}
 
 		return $password;
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index d88ea2640e1..9d32db547a0 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
     <id>federatedfilesharing</id>
     <name>Federated File Sharing</name>
-    <description>Provide federated file sharing across ownCloud servers</description>
+    <description>Provide federated file sharing across Nextcloud servers</description>
     <licence>AGPL</licence>
     <author>Bjoern Schiessle, Roeland Jago Douma</author>
     <version>0.1.0</version>
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 1cd4f602075..6b794e1a4a3 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>files_external</id>
 	<name>External storage support</name>
 	<description>
-	This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, which they can access and use like any other ownCloud folder. External Storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
+	This application enables administrators to configure connections to external storage providers, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers, and more. Administrators can choose which types of storage to enable and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root directory, which they can access and use like any other folder. External Storage also allows users to share files stored in these external locations. In these cases, the credentials for the owner of the file are used when the recipient requests the file from external storage, thereby ensuring that the recipient can access the shared file.
 	
 	External Storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the External Storage GUI documentation and the External Storage Configuration File documentation.
 	</description>
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 29ae15e4722..f39a861f213 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -3,8 +3,8 @@
 	<id>files_sharing</id>
 	<name>Share Files</name>
 	<description>
-		This application enables users to share files within ownCloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within ownCloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of ownCloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
-Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the ownCloud Documentation.
+		This application enables users to share files. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of the instance. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
+Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the documentation.
 
 	</description>
 	<licence>AGPL</licence>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index ea200916edb..ffd6b7b615d 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -84,7 +84,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 						?>
 						<span id="save" data-protected="<?php p($_['protected']) ?>"
 							  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
-						<button id="save-button"><?php p($l->t('Add to your ownCloud')) ?></button>
+						<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
 						<form class="save-form hidden" action="#">
 							<input type="text" id="remote_address" placeholder="example.com/owncloud"/>
 							<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index e75f032008c..d5f3fabf7ce 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -4,9 +4,9 @@
 	<name>Provisioning API</name>
 	<description>
 		This application enables a set of APIs that external systems can use to create, edit, delete and query user
-		attributes, query, set and remove groups, set quota and query total storage used in ownCloud. Group admin users
-		can also query ownCloud and perform the same functions as an admin for groups they manage. The API also enables
-		an admin to query for active ownCloud applications, application info, and to enable or disable an app remotely.
+		attributes, query, set and remove groups, set quota and query total storage used in Nextcloud. Group admin users
+		can also query Nextcloud and perform the same functions as an admin for groups they manage. The API also enables
+		an admin to query for active Nextcloud applications, application info, and to enable or disable an app remotely.
 		Once the app is enabled, http requests can be used via a Basic Auth header to perform any of the functions
 		listed above. More information is available in the Provisioning API documentation, including example calls
 		and server responses.
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 2991829e19b..033d2994e16 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -2,7 +2,7 @@
 <info>
 	<id>updatenotification</id>
 	<name>Update notification</name>
-	<description>Displays update notifications for ownCloud and provides the SSO for the updater.</description>
+	<description>Displays update notifications for Nextcloud and provides the SSO for the updater.</description>
 	<licence>AGPL</licence>
 	<author>Lukas Reschke</author>
 	<version>0.1.0</version>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 864eaebe4d0..50fe67c1b87 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,9 +2,9 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>This application enables administrators to connect ownCloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into ownCloud from a directory with the appropriate queries and filters.
+	<description>This application enables administrators to connect Nextcloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into Nextcloud from a directory with the appropriate queries and filters.
 
-A user logs into ownCloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. ownCloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then ownCloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
+A user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
 
 	</description>
 	<licence>AGPL</licence>