[Libreoffice-commits] core.git: 2 commits - extensions/uiconfig officecfg/registry readlicense_oo/docs wizards/source
Adolfo Jayme Barrientos (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 30 03:07:27 UTC 2020
extensions/uiconfig/sabpilot/ui/fieldassignpage.ui | 2 +-
officecfg/registry/data/org/openoffice/Office/DataAccess.xcu | 4 ++--
officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu | 2 +-
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 4 ++--
readlicense_oo/docs/readme.xrm | 4 ++--
wizards/source/resources/resources_en_US.properties | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 28ed472e4e15348cb9a7ee9b43a22b1c92836471
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
AuthorDate: Tue Sep 29 22:06:44 2020 -0500
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Sep 29 22:06:44 2020 -0500
Fix clunky grammar
Change-Id: Ib253466a346bea05fd1c268f6e55df6cf6ef26a2
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index 12ff372f8b08..1db69656b248 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -43,7 +43,7 @@
<node oor:name="InspectorDeck" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string">
- <value xml:lang="en-US">Styles Inspector</value>
+ <value xml:lang="en-US">Style Inspector</value>
</prop>
<prop oor:name="Id" oor:type="xs:string">
<value>InspectorDeck</value>
@@ -397,7 +397,7 @@
<node oor:name="InspectorTextPanel" oor:op="replace">
<prop oor:name="Title" oor:type="xs:string">
- <value xml:lang="en-US">Styles Inspector</value>
+ <value xml:lang="en-US">Style Inspector</value>
</prop>
<prop oor:name="TitleBarIsOptional" oor:type="xs:boolean">
<value>true</value>
commit 9141c300771825db5136cb6591e83dc4b541be08
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
AuthorDate: Tue Jul 28 21:33:42 2020 -0500
Commit: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Tue Sep 29 22:04:47 2020 -0500
More “e-mail” → “email”
Follow-up for commits 8b57d07a64e03db32b5383f58a40c1509392cd24
and 5f665a855ef26faea4dfa2ac427685b60545e8b8
Change-Id: I8f0f9a7a81636623df766f9d4ea414bde9d408bc
diff --git a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
index f853db20c23d..ac120cc839a1 100644
--- a/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
+++ b/extensions/uiconfig/sabpilot/ui/fieldassignpage.ui
@@ -13,7 +13,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="fieldassignpage|label2">To incorporate the address data in your templates, %PRODUCTNAME has to know which fields contain which data.
-For instance, you could have stored the e-mail addresses in a field named "email", or "E-mail" or "EM" - or something completely different.
+For instance, you could have stored the email addresses in a field named "email", or "E-mail" or "EM" - or something completely different.
Click the button below to open another dialog where you can enter the settings for your data source.</property>
<property name="wrap">True</property>
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index edba2a2020be..f29aba2a8ed1 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -465,10 +465,10 @@
<value xml:lang="en-US">Nickname</value>
</prop>
<prop oor:name="PrimaryEmail">
- <value xml:lang="en-US">E-mail</value>
+ <value xml:lang="en-US">Email</value>
</prop>
<prop oor:name="SecondEmail">
- <value xml:lang="en-US">E-mail (2)</value>
+ <value xml:lang="en-US">Email (2)</value>
</prop>
<prop oor:name="PreferMailFormat">
<value xml:lang="en-US">Mail Format</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
index 3a6148b85c1e..a50b315c28c4 100644
--- a/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresentationMinimizer.xcu
@@ -254,7 +254,7 @@ The current presentation contains no OLE objects.</value>
<node oor:name="Templates">
<node oor:name="template1" oor:op="replace">
<prop oor:name="Name">
- <value xml:lang="en-US">E-mail (96 DPI): minimize document size for sharing</value>
+ <value xml:lang="en-US">Email (96 DPI): minimize document size for sharing</value>
</prop>
<prop oor:name="JPEGCompression">
<value>true</value>
diff --git a/readlicense_oo/docs/readme.xrm b/readlicense_oo/docs/readme.xrm
index 7331787f2293..332241fad31c 100644
--- a/readlicense_oo/docs/readme.xrm
+++ b/readlicense_oo/docs/readme.xrm
@@ -160,8 +160,8 @@
</div>
<div class="WIN" id="Mapi">
- <h2 id="gfh6w1" xml:lang="en-US">Problems When Sending Documents as E-mails From ${PRODUCTNAME}</h2>
- <p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file "Mapi" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href="https://www.microsoft.com">https://www.microsoft.com</a> to search the Microsoft Knowledge Base for "mapi dll".</p>
+ <h2 id="gfh6w1" xml:lang="en-US">Problems When Sending Documents as Emails From ${PRODUCTNAME}</h2>
+ <p id="pji76w1" xml:lang="en-US">When sending a document via 'File - Send - Document as Email' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file "Mapi" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit <a href="https://www.microsoft.com">https://www.microsoft.com</a> to search the Microsoft Knowledge Base for "mapi dll".</p>
</div>
<div id="A11y">
diff --git a/wizards/source/resources/resources_en_US.properties b/wizards/source/resources/resources_en_US.properties
index b87e6aaa7d27..32f9104e97e0 100644
--- a/wizards/source/resources/resources_en_US.properties
+++ b/wizards/source/resources/resources_en_US.properties
@@ -497,7 +497,7 @@ CorrespondenceFields_13=Salutation
CorrespondenceFields_14=Home Phone
CorrespondenceFields_15=Work Phone
CorrespondenceFields_16=Fax
-CorrespondenceFields_17=E-Mail
+CorrespondenceFields_17=Email
CorrespondenceFields_18=URL
CorrespondenceFields_19=Notes
CorrespondenceFields_20=Alt. Field 1
More information about the Libreoffice-commits
mailing list