summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdolfo Jayme Barrientos <fitojb@ubuntu.com>2017-03-23 00:40:28 -0600
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2017-03-23 00:40:28 -0600
commitb66b3050c466de0382c3571909ba0450cdd3fd1d (patch)
tree4e451ca1bf0267b2665798077314fdc56924f3f9
parent254c13265f334be8a52627379bc393ca13fe6298 (diff)
“Hyperlink” is NOT a dated word, it’s just a precise one
We should always be clear and precise, given that LibreOffice handles various kinds of links. Nobody at L10n wanted this change, but they were ignored. This should fix tdf#103093, which was a consequence of the introduced ambiguity. This reverts commit a1297fc2df243d765ffb14f18bbdde158459b9f4. Change-Id: I29232c7a8384c3fa501c61aab26e061ebcb1a0d8
-rw-r--r--cui/source/dialogs/hyperdlg.src8
-rw-r--r--cui/uiconfig/ui/hyperlinkdialog.ui2
-rw-r--r--cui/uiconfig/ui/hyperlinkinternetpage.ui2
-rw-r--r--cui/uiconfig/ui/securityoptionsdialog.ui4
-rw-r--r--forms/source/resource/xforms.src2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu4
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu6
-rw-r--r--officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu12
-rw-r--r--sc/source/ui/src/globstr.src4
-rw-r--r--sc/source/ui/src/scfuncs.src2
-rw-r--r--sd/source/ui/app/strings.src2
-rw-r--r--sd/uiconfig/simpress/ui/publishingdialog.ui2
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/ui/index/cnttab.src4
-rw-r--r--sw/source/ui/utlui/utlui.src6
-rw-r--r--sw/uiconfig/swriter/ui/characterproperties.ui2
-rw-r--r--sw/uiconfig/swriter/ui/charurlpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/framedialog.ui2
-rw-r--r--sw/uiconfig/swriter/ui/notebookbar_groups.ui4
-rw-r--r--sw/uiconfig/swriter/ui/objectdialog.ui2
-rw-r--r--sw/uiconfig/swriter/ui/picturedialog.ui2
-rw-r--r--sw/uiconfig/swriter/ui/tocentriespage.ui2
23 files changed, 40 insertions, 40 deletions
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 42b2d1ee70d3..0641d7c21dba 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -31,7 +31,7 @@ String RID_SVXSTR_HYPDLG_MACROACT1
};
String RID_SVXSTR_HYPDLG_MACROACT2
{
- Text [ en-US ] = "Trigger link" ;
+ Text [ en-US ] = "Trigger hyperlink" ;
};
String RID_SVXSTR_HYPDLG_MACROACT3
{
@@ -49,7 +49,7 @@ String RID_SVXSTR_HYPERDLG_HLINETTP
};
String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
{
- Text [ en-US ] = "This is where you create a link to a Web page or FTP server connection." ;
+ Text [ en-US ] = "This is where you create a hyperlink to a Web page or FTP server connection." ;
};
String RID_SVXSTR_HYPERDLG_HLMAILTP
@@ -58,7 +58,7 @@ String RID_SVXSTR_HYPERDLG_HLMAILTP
};
String RID_SVXSTR_HYPERDLG_HLMAILTP_HELP
{
- Text [ en-US ] = "This is where you create a link to an e-mail address." ;
+ Text [ en-US ] = "This is where you create a hyperlink to an e-mail address." ;
};
String RID_SVXSTR_HYPERDLG_HLDOCTP
@@ -67,7 +67,7 @@ String RID_SVXSTR_HYPERDLG_HLDOCTP
};
String RID_SVXSTR_HYPERDLG_HLDOCTP_HELP
{
- Text [ en-US ] = "This is where you create a link to an existing document or a target within a document." ;
+ Text [ en-US ] = "This is where you create a hyperlink to an existing document or a target within a document." ;
};
String RID_SVXSTR_HYPERDLG_HLDOCNTP
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui
index 0152824c403b..4ebf47e7217d 100644
--- a/cui/uiconfig/ui/hyperlinkdialog.ui
+++ b/cui/uiconfig/ui/hyperlinkdialog.ui
@@ -8,7 +8,7 @@
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property>
- <property name="title" translatable="yes">Link</property>
+ <property name="title" translatable="yes">Hyperlink</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index a185e0b02759..047799f89008 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -189,7 +189,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link Type</property>
+ <property name="label" translatable="yes">Hyperlink Type</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/cui/uiconfig/ui/securityoptionsdialog.ui b/cui/uiconfig/ui/securityoptionsdialog.ui
index 007d075bb4c2..1262e1047eb6 100644
--- a/cui/uiconfig/ui/securityoptionsdialog.ui
+++ b/cui/uiconfig/ui/securityoptionsdialog.ui
@@ -223,8 +223,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes">Warn if document contains recorded changes, versions, hidden information or notes:</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">Warn if document contains recorded changes, versions, hidden information or notes:</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -305,7 +305,7 @@
</child>
<child>
<object class="GtkCheckButton" id="ctrlclick">
- <property name="label" translatable="yes">Ctrl-click required _to follow links</property>
+ <property name="label" translatable="yes">Ctrl-click required _to follow hyperlinks</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/forms/source/resource/xforms.src b/forms/source/resource/xforms.src
index f9debd60201f..8c47e872c49c 100644
--- a/forms/source/resource/xforms.src
+++ b/forms/source/resource/xforms.src
@@ -101,7 +101,7 @@ String RID_STR_DATATYPE_STRING
String RID_STR_DATATYPE_URL
{
- Text [ en-US ] = "Link";
+ Text [ en-US ] = "Hyperlink";
};
String RID_STR_DATATYPE_BOOLEAN
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 5ac0c6cbc821..c26a37e24d93 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -2140,12 +2140,12 @@
</node>
<node oor:name=".uno:EditShapeHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Edit Link</value>
+ <value xml:lang="en-US">Edit Hyperlink</value>
</prop>
</node>
<node oor:name=".uno:DeleteShapeHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Link</value>
+ <value xml:lang="en-US">Remove Hyperlink</value>
</prop>
</node>
<node oor:name=".uno:ColorScaleDialog" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
index f4cca1a9fa87..dd51ad06c15f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu
@@ -610,7 +610,7 @@
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Link...</value>
+ <value xml:lang="en-US">~Hyperlink...</value>
</prop>
</node>
<node oor:name=".uno:HideLastLevel" oor:op="replace">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 59f40a0bcfff..bd3df2c7e0c3 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3169,7 +3169,7 @@
</node>
<node oor:name=".uno:OpenHyperlinkOnCursor" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Open Link</value>
+ <value xml:lang="en-US">Open Hyperlink</value>
</prop>
</node>
<node oor:name=".uno:OpenSmartTagMenuOnCursor" oor:op="replace">
@@ -3832,10 +3832,10 @@
</node>
<node oor:name=".uno:HyperlinkDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Link...</value>
+ <value xml:lang="en-US">~Hyperlink...</value>
</prop>
<prop oor:name="TooltipLabel" oor:type="xs:string">
- <value xml:lang="en-US">Insert Link</value>
+ <value xml:lang="en-US">Insert Hyperlink</value>
</prop>
<prop oor:name="Properties" oor:type="xs:int">
<value>9</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index e38f165de2c9..d9a2c8a9138e 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -375,20 +375,20 @@
</node>
<node oor:name=".uno:EditHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Link</value>
+ <value xml:lang="en-US">~Hyperlink</value>
</prop>
<prop oor:name="PopupLabel" oor:type="xs:string">
- <value xml:lang="en-US">Edit Link...</value>
+ <value xml:lang="en-US">Edit Hyperlink...</value>
</prop>
</node>
<node oor:name=".uno:RemoveHyperlink" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Remove Link</value>
+ <value xml:lang="en-US">Remove Hyperlink</value>
</prop>
</node>
<node oor:name=".uno:CopyHyperlinkLocation" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Copy Link Location</value>
+ <value xml:lang="en-US">Copy Hyperlink Location</value>
</prop>
</node>
<node oor:name=".uno:InsertBookmark" oor:op="replace">
@@ -476,7 +476,7 @@
</node>
<node oor:name=".uno:InsertHyperlinkDlg" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Insert Link</value>
+ <value xml:lang="en-US">Insert Hyperlink</value>
</prop>
</node>
<node oor:name=".uno:InsertLinebreak" oor:op="replace">
@@ -865,7 +865,7 @@
</node>
<node oor:name=".uno:ExecHyperlinks" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Links Active</value>
+ <value xml:lang="en-US">Hyperlinks Active</value>
</prop>
</node>
<node oor:name=".uno:SuperScript" oor:op="replace">
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index 985354ec0f08..0a26724c0a7b 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -1851,11 +1851,11 @@ String STR_COPYERR+RID_GLOBSTR_OFFSET
};
String STR_CTRLCLICKHYPERLINK+RID_GLOBSTR_OFFSET
{
- Text [ en-US ] = "%s-Click to follow link:";
+ Text [ en-US ] = "%s-click to follow hyperlink:";
};
String STR_CLICKHYPERLINK+RID_GLOBSTR_OFFSET
{
- Text [ en-US ] = "click to open link:";
+ Text [ en-US ] = "click to open hyperlink:";
};
String STR_PRINT_PREVIEW_NODATA+RID_GLOBSTR_OFFSET
diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src
index 3eb299efe029..05422b62a4b9 100644
--- a/sc/source/ui/src/scfuncs.src
+++ b/sc/source/ui/src/scfuncs.src
@@ -4155,7 +4155,7 @@ StringArray SC_OPCODE_HYPERLINK+RID_SC_FUNC_DESCRIPTIONS_START
{
ItemList [ en-US ] =
{
- < "Link." ; >;
+ < "Hyperlink." ; >;
< "URL " ; >;
< "URL"; >;
< "CellText " ; >;
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 1ca79ff9c4c2..6545f0b80b92 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -767,7 +767,7 @@ String STR_HTMLATTR_TEXT
String STR_HTMLATTR_LINK
{
- Text [ en-US ] = "Link";
+ Text [ en-US ] = "Hyperlink";
};
String STR_HTMLATTR_VLINK
diff --git a/sd/uiconfig/simpress/ui/publishingdialog.ui b/sd/uiconfig/simpress/ui/publishingdialog.ui
index 28f3a5fa9b7d..849423e03580 100644
--- a/sd/uiconfig/simpress/ui/publishingdialog.ui
+++ b/sd/uiconfig/simpress/ui/publishingdialog.ui
@@ -1478,7 +1478,7 @@
</child>
<child>
<object class="GtkButton" id="linkButton">
- <property name="label" translatable="yes">_Link</property>
+ <property name="label" translatable="yes">Hyper_link</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 8222623596b2..c433878a1fa4 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -404,7 +404,7 @@ String STR_INSERT_URLBTN
};
String STR_INSERT_URLTXT
{
- Text [ en-US ] = "Insert Link";
+ Text [ en-US ] = "Insert Hyperlink";
};
String STR_DELETE_INVISIBLECNTNT
{
diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src
index 1aaff7048ef4..82f561abb841 100644
--- a/sw/source/ui/index/cnttab.src
+++ b/sw/source/ui/index/cnttab.src
@@ -122,11 +122,11 @@ String STR_TOKEN_HELP_CHAPTER_INFO
};
String STR_TOKEN_HELP_LINK_START
{
- Text [ en-US ] = "Link start";
+ Text [ en-US ] = "Hyperlink start";
};
String STR_TOKEN_HELP_LINK_END
{
- Text [ en-US ] = "Link end";
+ Text [ en-US ] = "Hyperlink end";
};
String STR_TOKEN_HELP_AUTHORITY
{
diff --git a/sw/source/ui/utlui/utlui.src b/sw/source/ui/utlui/utlui.src
index c338a64bc128..5b3d08ba0174 100644
--- a/sw/source/ui/utlui/utlui.src
+++ b/sw/source/ui/utlui/utlui.src
@@ -71,7 +71,7 @@ String STR_EVENT_MOUSEOVER_OBJECT
};
String STR_EVENT_MOUSECLICK_OBJECT
{
- Text [ en-US ] = "Trigger Link" ;
+ Text [ en-US ] = "Trigger hyperlink" ;
};
String STR_EVENT_MOUSEOUT_OBJECT
{
@@ -135,7 +135,7 @@ String STR_CONTENT_TYPE_REGION
};
String STR_CONTENT_TYPE_URLFIELD
{
- Text [ en-US ] = "Links" ;
+ Text [ en-US ] = "Hyperlinks" ;
};
String STR_CONTENT_TYPE_REFERENCE
{
@@ -215,7 +215,7 @@ String STR_CONTENT_TYPE_SINGLE_REGION
};
String STR_CONTENT_TYPE_SINGLE_URLFIELD
{
- Text [ en-US ] = "Link" ;
+ Text [ en-US ] = "Hyperlink" ;
};
String STR_CONTENT_TYPE_SINGLE_REFERENCE
{
diff --git a/sw/uiconfig/swriter/ui/characterproperties.ui b/sw/uiconfig/swriter/ui/characterproperties.ui
index f48c7902e3fd..0efad8cc3f91 100644
--- a/sw/uiconfig/swriter/ui/characterproperties.ui
+++ b/sw/uiconfig/swriter/ui/characterproperties.ui
@@ -152,7 +152,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
</object>
<packing>
<property name="position">4</property>
diff --git a/sw/uiconfig/swriter/ui/charurlpage.ui b/sw/uiconfig/swriter/ui/charurlpage.ui
index a5ce97405289..c69e10c31226 100644
--- a/sw/uiconfig/swriter/ui/charurlpage.ui
+++ b/sw/uiconfig/swriter/ui/charurlpage.ui
@@ -185,7 +185,7 @@
<object class="GtkLabel" id="label32">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
diff --git a/sw/uiconfig/swriter/ui/framedialog.ui b/sw/uiconfig/swriter/ui/framedialog.ui
index 8601ef5b7c32..b0d5a6b86e38 100644
--- a/sw/uiconfig/swriter/ui/framedialog.ui
+++ b/sw/uiconfig/swriter/ui/framedialog.ui
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
diff --git a/sw/uiconfig/swriter/ui/notebookbar_groups.ui b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
index 2fc96015068b..72be3000dda3 100644
--- a/sw/uiconfig/swriter/ui/notebookbar_groups.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar_groups.ui
@@ -183,7 +183,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="action_name">.uno:HyperlinkDialog</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
</object>
</child>
<child>
@@ -1546,7 +1546,7 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkButton" id="linksb:linksmenu">
- <property name="label" translatable="yes">References</property>
+ <property name="label" translatable="yes">Links</property>
<property name="height_request">26</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
diff --git a/sw/uiconfig/swriter/ui/objectdialog.ui b/sw/uiconfig/swriter/ui/objectdialog.ui
index 7ab76ff3faff..9da95fabd50f 100644
--- a/sw/uiconfig/swriter/ui/objectdialog.ui
+++ b/sw/uiconfig/swriter/ui/objectdialog.ui
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
diff --git a/sw/uiconfig/swriter/ui/picturedialog.ui b/sw/uiconfig/swriter/ui/picturedialog.ui
index 7a049dd54341..35671391ec8a 100644
--- a/sw/uiconfig/swriter/ui/picturedialog.ui
+++ b/sw/uiconfig/swriter/ui/picturedialog.ui
@@ -138,7 +138,7 @@
<object class="GtkLabel" id="hyperlink">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Link</property>
+ <property name="label" translatable="yes">Hyperlink</property>
</object>
<packing>
<property name="position">3</property>
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index a6e8c20f75f8..e4fa94bd16b4 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -558,7 +558,7 @@
</child>
<child>
<object class="GtkButton" id="hyperlink">
- <property name="label" translatable="yes">L_ink</property>
+ <property name="label" translatable="yes">H_yperlink</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>