“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 a1297fc2df.

Change-Id: I29232c7a8384c3fa501c61aab26e061ebcb1a0d8
This commit is contained in:
Adolfo Jayme Barrientos
2017-03-23 00:40:28 -06:00
parent 254c13265f
commit b66b3050c4
23 changed files with 40 additions and 40 deletions

View File

@@ -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

View File

@@ -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">

View File

@@ -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>

View File

@@ -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>

View File

@@ -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

View File

@@ -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">

View File

@@ -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">

View File

@@ -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>

View File

@@ -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">

View File

@@ -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

View File

@@ -4155,7 +4155,7 @@ StringArray SC_OPCODE_HYPERLINK+RID_SC_FUNC_DESCRIPTIONS_START
{
ItemList [ en-US ] =
{
< "Link." ; >;
< "Hyperlink." ; >;
< "URL " ; >;
< "URL"; >;
< "CellText " ; >;

View File

@@ -767,7 +767,7 @@ String STR_HTMLATTR_TEXT
String STR_HTMLATTR_LINK
{
Text [ en-US ] = "Link";
Text [ en-US ] = "Hyperlink";
};
String STR_HTMLATTR_VLINK

View File

@@ -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>

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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
{

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>