[Libreoffice-commits] help.git: helpers/help_hid.lst source/text
Caolán McNamara
caolanm at redhat.com
Fri Sep 27 02:33:24 PDT 2013
helpers/help_hid.lst | 10 --------
source/text/shared/optionen/01150100.xhp | 37 +++++++++++++++----------------
source/text/swriter/01/05060100.xhp | 2 -
3 files changed, 20 insertions(+), 29 deletions(-)
New commits:
commit 73a4731805ca6d8ee9b33f52093e46d8a0703b16
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 27 11:31:22 2013 +0200
update help ids for opt asian page .ui conversion
Change-Id: If84673952a8957ba7f60a40d54b2f434229ba86d
diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cf60941..cd0af01 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2572,7 +2572,6 @@ HID_OLE_TOOLBOX,54831,
HID_OPTCAPTION_CLB,53801,
HID_OPTCAPTION_PAGE,53229,
HID_OPTCREATEFAX,41150,
-HID_OPTIONS_ASIAN_LAYOUT,34183,
HID_OPTIONS_COLOR,33808,
HID_OPTIONS_COLORCONFIG_NAME_SCHEME,39875,
HID_OPTIONS_DICT_EDIT,33815,
@@ -6640,7 +6639,6 @@ svx_CheckBox_RID_SVXDLG_SEARCHFORM_CB_SOUNDSLIKECJK,1368769545,
svx_CheckBox_RID_SVXDLG_SPELLCHECK_CB_CHECK_GRAMMAR,2311849014,
svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_EXPAND,703775795,
svx_CheckBox_RID_SVXPAGE_ALIGN_PARAGRAPH_CB_SNAP,703775782,
-svx_CheckBox_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD,704742409,
svx_CheckBox_RID_SVXPAGE_BACKGROUND_BTN_LINK,700728342,
svx_CheckBox_RID_SVXPAGE_BACKGROUND_BTN_PREVIEW,700728343,
svx_CheckBox_RID_SVXPAGE_BORDER_CB_MERGEADJACENTBORDERS,700793922,
@@ -6713,8 +6711,6 @@ svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_1,2315372558,
svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_2,2315372559,
svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_3,2315372560,
svx_Edit_RID_SVXDLG_RUBY_ED_RIGHT_4,2315372561,
-svx_Edit_RID_SVXPAGE_ASIAN_LAYOUT_ED_END,704743440,
-svx_Edit_RID_SVXPAGE_ASIAN_LAYOUT_ED_START,704743438,
svx_Edit_RID_SVXPAGE_COLOR_EDT_NAME,701696001,
svx_Edit_RID_SVXPAGE_ERR_REP_SEND_ED_ERRSEND_DOCTYPE,700893205,
svx_Edit_RID_SVXPAGE_ERR_REP_SEND_ED_ERRSEND_EMAILADDR,700893212,
@@ -6867,7 +6863,6 @@ svx_ListBox_RID_SVXFLOAT_3D_LB_SHADEMODE,3388493358,
svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_LASTLINE,703778354,
svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_TEXTDIRECTION,703778396,
svx_ListBox_RID_SVXPAGE_ALIGN_PARAGRAPH_LB_VERTALIGN,703778340,
-svx_ListBox_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE,704744972,
svx_ListBox_RID_SVXPAGE_BACKGROUND_LB_PARA_BOX,700730914,
svx_ListBox_RID_SVXPAGE_BACKGROUND_LB_SELECTOR,700730881,
svx_ListBox_RID_SVXPAGE_BACKGROUND_LB_TBL_BOX,700730912,
@@ -7154,11 +7149,6 @@ svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_CENTERALIGN,703775264,
svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_JUSTIFYALIGN,703775265,
svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_LEFTALIGN,703775262,
svx_RadioButton_RID_SVXPAGE_ALIGN_PARAGRAPH_BTN_RIGHTALIGN,703775263,
-svx_RadioButton_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING,704741890,
-svx_RadioButton_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT,704741891,
-svx_RadioButton_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP,704741893,
-svx_RadioButton_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP,704741894,
-svx_RadioButton_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP,704741895,
svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_AREA,700727833,
svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_POSITION,700727835,
svx_RadioButton_RID_SVXPAGE_BACKGROUND_BTN_TILE,700727834,
diff --git a/source/text/shared/optionen/01150100.xhp b/source/text/shared/optionen/01150100.xhp
index 13653e7..642f722 100644
--- a/source/text/shared/optionen/01150100.xhp
+++ b/source/text/shared/optionen/01150100.xhp
@@ -32,6 +32,7 @@
</meta>
<body>
<section id="asialayout">
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/OptAsianPage" id="bm_id3149811" localize="false"/>
<paragraph role="heading" id="hd_id3156414" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/shared/optionen/01150100.xhp" name="Asian Layout">Asian Layout</link></paragraph>
<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="2">Defines the typographic default settings for Asian text.</paragraph>
<embed href="text/shared/00/00000007.xhp#asiahinweis"/>
@@ -43,36 +44,36 @@
</bookmark>
<paragraph role="heading" id="hd_id3143268" xml-lang="en-US" level="2" l10n="U" oldref="3">Kerning</paragraph>
<paragraph role="paragraph" id="par_id3155535" xml-lang="en-US" l10n="U" oldref="4">Defines the default settings for kerning between individual characters.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING" id="bm_id3149811" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/charkerning" id="bm_id3149811" localize="false"/>
<paragraph role="heading" id="hd_id3147275" xml-lang="en-US" level="3" l10n="U" oldref="5">Western characters only</paragraph>
-<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_KERNING">Specifies that kerning is only applied to western text.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT" id="bm_id3157910" localize="false"/>
+<paragraph role="paragraph" id="par_id3149398" xml-lang="en-US" l10n="U" oldref="6"><ahelp hid="cui/ui/optasianpage/charkerning">Specifies that kerning is only applied to western text.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/charpunctkerning" id="bm_id3157910" localize="false"/>
<paragraph role="heading" id="hd_id3148538" xml-lang="en-US" level="3" l10n="U" oldref="7">Western text and Asian punctuation</paragraph>
-<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_CHAR_PUNCT">Specifies that kerning is applied to both western text and Asian punctuation.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3147336" xml-lang="en-US" l10n="U" oldref="8"><ahelp hid="cui/ui/optasianpage/charpunctkerning">Specifies that kerning is applied to both western text and Asian punctuation.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3153088" xml-lang="en-US" level="2" l10n="U" oldref="9">Character spacing</paragraph>
<paragraph role="paragraph" id="par_id3145119" xml-lang="en-US" l10n="U" oldref="10">Defines the default settings for character spacing in Asian texts, cells, and drawing objects.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP" id="bm_id3159158" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/nocompression" id="bm_id3159158" localize="false"/>
<paragraph role="heading" id="hd_id3150669" xml-lang="en-US" level="3" l10n="U" oldref="11">No compression</paragraph>
-<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_NO_COMP">Specifies that no compression at all will occur.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP" id="bm_id3154514" localize="false"/>
+<paragraph role="paragraph" id="par_id3150503" xml-lang="en-US" l10n="U" oldref="12"><ahelp hid="cui/ui/optasianpage/nocompression">Specifies that no compression at all will occur.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/punctcompression" id="bm_id3154514" localize="false"/>
<paragraph role="heading" id="hd_id3155419" xml-lang="en-US" level="3" l10n="U" oldref="13">Compress only punctuation</paragraph>
-<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_COMP">Specifies that only the punctuation is compressed.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP" id="bm_id3148944" localize="false"/>
+<paragraph role="paragraph" id="par_id3145673" xml-lang="en-US" l10n="U" oldref="14"><ahelp hid="cui/ui/optasianpage/punctcompression">Specifies that only the punctuation is compressed.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/punctkanacompression" id="bm_id3148944" localize="false"/>
<paragraph role="heading" id="hd_id3151245" xml-lang="en-US" level="3" l10n="U" oldref="15">Compress punctuation and Japanese Kana</paragraph>
-<paragraph role="paragraph" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="SVX_RADIOBUTTON_RID_SVXPAGE_ASIAN_LAYOUT_RB_PUNCT_KANA_COMP">Specifies that punctuation and Japanese Kana are compressed.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3154346" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="cui/ui/optasianpage/punctkanacompression">Specifies that punctuation and Japanese Kana are compressed.</ahelp></paragraph>
<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="2" l10n="U" oldref="17">First and last characters</paragraph>
<paragraph role="paragraph" id="par_id3149295" xml-lang="en-US" l10n="U" oldref="18">Defines the default settings for 'first' and 'last' characters. In the dialog that appears when you choose <emph>Format -</emph><link href="text/shared/01/05020700.xhp" name="Asian Typography"><emph>Asian Typography</emph></link>, you can specify whether the list of forbidden characters applies to those at the beginning or end of a line in a paragraph.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE" id="bm_id3154138" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/language" id="bm_id3154138" localize="false"/>
<paragraph role="heading" id="hd_id3154071" xml-lang="en-US" level="3" l10n="U" oldref="19">Language</paragraph>
-<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="SVX_LISTBOX_RID_SVXPAGE_ASIAN_LAYOUT_LB_LANGUAGE">Specifies the language for which you want to define first and last characters.</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD" id="bm_id3150767" localize="false"/>
+<paragraph role="paragraph" id="par_id3151210" xml-lang="en-US" l10n="U" oldref="20"><ahelp hid="cui/ui/optasianpage/language">Specifies the language for which you want to define first and last characters.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/standard" id="bm_id3150767" localize="false"/>
<paragraph role="heading" id="hd_id3145606" xml-lang="en-US" level="3" l10n="U" oldref="21">Default</paragraph>
-<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="SVX_CHECKBOX_RID_SVXPAGE_ASIAN_LAYOUT_CB_STANDARD">When you mark<emph> Default</emph>, the following two text boxes are filled with the default characters for the selected language:</ahelp></paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START" id="bm_id3154216" localize="false"/>
+<paragraph role="paragraph" id="par_id3148920" xml-lang="en-US" l10n="U" oldref="22"><ahelp hid="cui/ui/optasianpage/standard">When you mark<emph> Default</emph>, the following two text boxes are filled with the default characters for the selected language:</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/start" id="bm_id3154216" localize="false"/>
<paragraph role="heading" id="hd_id3144761" xml-lang="en-US" level="3" l10n="U" oldref="23">Not at start of line:</paragraph>
-<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_START">Specifies the characters that should not appear alone at the beginning of a line.</ahelp> If a character typed here is positioned at the beginning of a line after a line break, it is automatically moved to the end of the previous line. For example, an exclamation point at the end of a sentence never appears at the start of a line if it is part of the <emph>Not at start of line</emph> list.</paragraph>
-<bookmark xml-lang="en-US" branch="hid/cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END" id="bm_id3149560" localize="false"/>
+<paragraph role="paragraph" id="par_id3156214" xml-lang="en-US" l10n="U" oldref="24"><ahelp hid="cui/ui/optasianpage/start">Specifies the characters that should not appear alone at the beginning of a line.</ahelp> If a character typed here is positioned at the beginning of a line after a line break, it is automatically moved to the end of the previous line. For example, an exclamation point at the end of a sentence never appears at the start of a line if it is part of the <emph>Not at start of line</emph> list.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/optasianpage/end" id="bm_id3149560" localize="false"/>
<paragraph role="heading" id="hd_id3154908" xml-lang="en-US" level="3" l10n="U" oldref="25">Not at end of line:</paragraph>
-<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="SVX_EDIT_RID_SVXPAGE_ASIAN_LAYOUT_ED_END">Specifies the characters that should not appear alone at the end of a line.</ahelp> If a character typed here is positioned at the end of a line due to a line break, it is automatically moved to the beginning of the next line. For example, a currency symbol that appears in front of an amount never appears at the end of a line if it is part of the<emph> Not at end of line</emph> list.</paragraph>
+<paragraph role="paragraph" id="par_id3153367" xml-lang="en-US" l10n="U" oldref="26"><ahelp hid="cui/ui/optasianpage/end">Specifies the characters that should not appear alone at the end of a line.</ahelp> If a character typed here is positioned at the end of a line due to a line break, it is automatically moved to the beginning of the next line. For example, a currency symbol that appears in front of an amount never appears at the end of a line if it is part of the<emph> Not at end of line</emph> list.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/swriter/01/05060100.xhp b/source/text/swriter/01/05060100.xhp
index b3b1c8e..0f6aa31 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -32,7 +32,7 @@
<bookmark_value>aspect ratio;resizing objects</bookmark_value>
</bookmark><comment>UFI: new index entries, see i54237</comment>
<bookmark xml-lang="en-US" branch="hid/modules/swriter/ui/frmtypepage/FrmTypePage" id="bm_id3147406" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/modules/cui/ui/swpossizepage/SwPosSizePage" id="bm_id3147407" localize="false"/>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/swpossizepage/SwPosSizePage" id="bm_id3147407" localize="false"/>
<paragraph role="heading" id="hd_id3151389" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/swriter/01/05060100.xhp" name="Type">Type</link></paragraph>
<paragraph role="paragraph" id="par_id3150568" xml-lang="en-US" l10n="U" oldref="2"><ahelp hid="modules/swriter/ui/frmtypepage/FrmTypePage">Specifies the size and the position of the selected object or frame on a page.</ahelp></paragraph>
</section>
More information about the Libreoffice-commits
mailing list