summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2019-05-09 16:34:33 +0100
committerCaolán McNamara <caolanm@redhat.com>2019-05-10 10:01:13 +0200
commit1156f981ac4557737dd915e89e11abaa61e29f14 (patch)
tree86e847ba365f478bb74d3fc4e3785689d8b45c6f /desktop
parent0dc47739176493ded49b665c5fdfe0fe8fff39c1 (diff)
an is used before a vowel sound
not before vowels with a consonant sound so its a url not an url Change-Id: Ic27ff3bee67469284d460c31ced6f63cb3633db2 Reviewed-on: https://gerrit.libreoffice.org/72062 Reviewed-by: Jens Carl <j.carl43@gmx.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/inc/dp_misc.h2
-rw-r--r--desktop/source/deployment/inc/dp_descriptioninfoset.hxx2
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx2
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--desktop/test/deployment/update/default_url/readme.txt2
-rw-r--r--desktop/test/deployment/update/publisher/readme.txt6
-rw-r--r--desktop/test/deployment/update/readme.txt2
-rw-r--r--desktop/test/deployment/update/website_update/readme.txt4
8 files changed, 11 insertions, 11 deletions
diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h
index 54db1ee31f0a..236a9ee18f2c 100644
--- a/desktop/inc/dp_misc.h
+++ b/desktop/inc/dp_misc.h
@@ -70,7 +70,7 @@ OUString expandUnoRcUrl( OUString const & url );
/** appends a relative path to a url.
- The relative path must already be correctly encoded for use in an URL.
+ The relative path must already be correctly encoded for use in a URL.
If the URL starts with vnd.sun.star.expand then the relative path will
be again encoded for use in an "expand" URL.
*/
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index 4fd3af92fae9..9608a75215a7 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -153,7 +153,7 @@ public:
was a value provided or not. This is necessary to flag the extension in the update dialog
properly as "browser based update". The return value will only then not be initialized
if there is no <code>&lt;update-website&gt;</code>. If the element exists, then it must
- have at least one child element containing an URL.
+ have at least one child element containing a URL.
The <code>&lt;update-website&gt;</code> and <code>&lt;update-download&gt;</code>
elements are mutually exclusive.
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index 85003e0bb7da..606479447c2a 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -457,7 +457,7 @@ void BackendDb::writeSimpleElement(
}
-/// The key elements have an url attribute and are always children of the root element.
+/// The key elements have a url attribute and are always children of the root element.
Reference<css::xml::dom::XNode> BackendDb::writeKeyElement(
OUString const & url)
{
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 6c96b7ab9afc..339bda480f5f 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -253,7 +253,7 @@ static OUString getUString(const char* pString)
return OStringToOUString(sString, RTL_TEXTENCODING_UTF8);
}
-/// Try to convert a relative URL to an absolute one, unless it already looks like an URL.
+/// Try to convert a relative URL to an absolute one, unless it already looks like a URL.
static OUString getAbsoluteURL(const char* pURL)
{
OUString aURL(getUString(pURL));
diff --git a/desktop/test/deployment/update/default_url/readme.txt b/desktop/test/deployment/update/default_url/readme.txt
index 4ae7936bfc18..a34c77cea827 100644
--- a/desktop/test/deployment/update/default_url/readme.txt
+++ b/desktop/test/deployment/update/default_url/readme.txt
@@ -1,6 +1,6 @@
Tests for using the default URL for update information. This URL is currently contained in
the version.ini (ExtensionUpdateURL) and is used to obtain update information for extensions which do not provide
-an URL themselves.
+a URL themselves.
The extensions default1.oxt and default2.oxt do not have a URL for update information.
diff --git a/desktop/test/deployment/update/publisher/readme.txt b/desktop/test/deployment/update/publisher/readme.txt
index 92875e03f13b..9bae3e067f2b 100644
--- a/desktop/test/deployment/update/publisher/readme.txt
+++ b/desktop/test/deployment/update/publisher/readme.txt
@@ -77,7 +77,7 @@ Result:
The Update Dialog should show the publisher name as provided in the description.xml. For example,
when lang=en-US was selected: My OpenOffice en-US
-A release notes link is displayed with an URL to the release notes as provided in
+A release notes link is displayed with a URL to the release notes as provided in
the description.xml. For example, when lang=en-US was selected:
"http://extensions.openoffice.org/testarea/desktop/publisher/publisher_en-US.html
@@ -124,7 +124,7 @@ Result:
The Update Dialog should show the publisher name as provided in the description.xml. For example,
when lang=en-US was selected: My OpenOffice en-US
-A release notes link is displayed with an URL to the release notes as provided in the release notes
+A release notes link is displayed with a URL to the release notes as provided in the release notes
field on the edit page for the extension in the repository.
================================================================================
@@ -165,7 +165,7 @@ Office:
Result:
The Update Dialog should show the publisher name as provided in the repository.
-A release notes link is displayed with an URL to the release notes as provided in the
+A release notes link is displayed with a URL to the release notes as provided in the
pub10.oxt. For example, when the locale of the office is en-US then this page will be
displayed:
For example,
diff --git a/desktop/test/deployment/update/readme.txt b/desktop/test/deployment/update/readme.txt
index 1ddcdc855307..fa1778308912 100644
--- a/desktop/test/deployment/update/readme.txt
+++ b/desktop/test/deployment/update/readme.txt
@@ -45,7 +45,7 @@ For example
The different test folders for the update are also committed in project extensions/www
-so that the files can be obtain via an URL. The structure and the contents is about the
+so that the files can be obtain via a URL. The structure and the contents is about the
same as the content
of desktop/test/deployment/update
For example in
diff --git a/desktop/test/deployment/update/website_update/readme.txt b/desktop/test/deployment/update/website_update/readme.txt
index 4ae5ddd9182f..dd54207ad981 100644
--- a/desktop/test/deployment/update/website_update/readme.txt
+++ b/desktop/test/deployment/update/website_update/readme.txt
@@ -77,7 +77,7 @@ Result:
The Update Dialog should show the publisher name as provided in "Provider URL" field
of the extension edit page (not release).
-A release notes link is displayed with an URL to the release notes as provided in
+A release notes link is displayed with a URL to the release notes as provided in
the "Provider Title" field of the extension release edit page.
When running the update then the web browser should navigate to
@@ -125,7 +125,7 @@ Result:
The Update Dialog should show the publisher name as provided in the description.xml.
That is: My OpenOffice en-US and NOT "FOO".
-A release notes link is displayed with an URL to the release notes as provided in
+A release notes link is displayed with a URL to the release notes as provided in
the description.xml. That is:
http://extensions.openoffice.org/testarea/desktop/publisher/release-notes_xxx.html