cws tl74: merge with DEV300_m81

1 files changed, 9 insertions, 9 deletions

diff --git a/helpcontent2/source/text/shared/optionen/01020100.xhp b/helpcontent2/source/text/shared/optionen/01020100.xhp
index 3405f64a6b..331d2aa45c 100644
--- a/helpcontent2/source/text/shared/optionen/01020100.xhp
+++ b/helpcontent2/source/text/shared/optionen/01020100.xhp
@@ -52,7 +52,7 @@
 </section>
 <paragraph role="heading" id="hd_id3147577" xml-lang="en-US" level="2" l10n="U" oldref="3">Settings</paragraph>
 <paragraph role="paragraph" id="par_id3153748" xml-lang="en-US" l10n="U" oldref="4">Defines the settings for the <link href="text/shared/00/00000002.xhp#proxy" name="proxy server">proxy server</link>.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE" id="bm_id3156347" localize="false"/><paragraph role="heading" id="hd_id3151110" xml-lang="en-US" level="3" l10n="U" oldref="8">Proxy server</paragraph>
 <paragraph role="paragraph" id="par_id3147275" xml-lang="en-US" l10n="U" oldref="9"><ahelp hid="SVX:LISTBOX:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE">Specifies the type of proxy definition.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id3147574" xml-lang="en-US" level="4" l10n="U" oldref="10">None</paragraph>
 <paragraph role="paragraph" id="par_id3148685" xml-lang="en-US" l10n="U" oldref="11">Accesses the Internet without a proxy server. Allows you to set up a connection directly on your computer to an Internet provider that does not use a proxy.</paragraph>
@@ -61,19 +61,19 @@
 <paragraph role="tip" id="par_id3148943" xml-lang="en-US" l10n="U" oldref="29">Type server names without the protocol prefix. For example, type www.example.com, not http://www.example.com.</paragraph>
 <paragraph role="heading" id="par_idN10684" xml-lang="en-US" level="4" l10n="NEW">System</paragraph>
 <paragraph role="paragraph" id="par_idN10688" xml-lang="en-US" l10n="NEW">On Windows or UNIX systems using GNOME or KDE, this option tells %PRODUCTNAME to use the system settings. You must restart %PRODUCTNAME to initiate this setting.<comment>UFI: see spec "System-Settings"</comment></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY" id="bm_id3154346" localize="false"/><paragraph role="heading" id="hd_id3148948" xml-lang="en-US" level="3" l10n="U" oldref="16">HTTP proxy</paragraph>
 <paragraph role="paragraph" id="par_id3154923" xml-lang="en-US" l10n="U" oldref="17"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#http" name="HTTP">HTTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY" id="bm_id431531" localize="false"/><paragraph role="heading" id="hd_id9971922" xml-lang="en-US" level="3" l10n="NEW">HTTPS proxy</paragraph>
 <paragraph role="paragraph" id="par_id5319071" xml-lang="en-US" l10n="NEW"><ahelp hid=".">Type the name of the proxy server for HTTPS. Type the port in the right-hand field.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY" id="bm_id3153360" localize="false"/><paragraph role="heading" id="hd_id3150543" xml-lang="en-US" level="3" l10n="U" oldref="33">FTP proxy</paragraph>
 <paragraph role="paragraph" id="par_id3154138" xml-lang="en-US" l10n="U" oldref="34"><ahelp hid="SVX_EDIT_RID_SVXPAGE_INET_PROXY_ED_FTP_PROXY">Type the name of the proxy server for <link href="text/shared/00/00000002.xhp#ftp" name="FTP">FTP</link>.</ahelp> Type the port in the right-hand field.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR" id="bm_id3154908" localize="false"/><paragraph role="heading" id="hd_id3125863" xml-lang="en-US" level="3" l10n="U" oldref="24">No proxy for</paragraph>
 <paragraph role="paragraph" id="par_id3151178" xml-lang="en-US" l10n="U" oldref="25"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR">Specifies the names of the servers that do not require any proxy servers, separated by semicolons.</ahelp> These are servers addressed in your local network, and servers used for video and audio streaming, for example.</paragraph>
 <paragraph role="paragraph" id="par_id3145171" xml-lang="en-US" l10n="U" oldref="26">You can also use placeholders for the names of hosts and domains. For example, type *.sun.com to address all the hosts in the sun.com domain without proxy.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/svx_Edit_RID_SVXPAGE_INET_PROXY_ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT" id="bm_id3152920" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT" id="bm_id3139439" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT" id="bm_id3147229" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT" id="bm_id3148674" localize="false"/><paragraph role="heading" id="hd_id3149808" xml-lang="en-US" level="3" l10n="U" oldref="27">Port</paragraph>
 <paragraph role="paragraph" id="par_id3153666" xml-lang="en-US" l10n="U" oldref="28"><ahelp hid="SVX:EDIT:RID_SVXPAGE_INET_PROXY:ED_SOCKS_PORT">Type the port for the corresponding proxy server.</ahelp> The maximum value of a port number is fixed at 65535.</paragraph>
 </body>
 </helpdocument>