summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Balland-Poirier <laurent.balland-poirier@laposte.net>2015-05-06 23:39:13 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-05-14 22:03:38 +0000
commit3668b09b960f69d1ad1589d5b526b108577f5887 (patch)
tree17798180f3c21874a5fb9e13a169ed97001237df
parent9094a1a35592418eb8b527a37a1d7d3f85fd4f96 (diff)
Update for number format: engineering notation, and some morelibreoffice-5-0-branch-point
Add help for engineering notation in scientific format and few other corrections. Update: increase IDs by 1 Conflicts: source/text/shared/01/05020300.xhp Change-Id: I78ec9deddb49d7038d9bd42be86ad561b108af33 Reviewed-on: https://gerrit.libreoffice.org/15656 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--source/text/shared/01/05020300.xhp6
-rw-r--r--source/text/shared/01/05020301.xhp6
-rw-r--r--source/text/shared/01/05030300.xhp2
3 files changed, 9 insertions, 5 deletions
diff --git a/source/text/shared/01/05020300.xhp b/source/text/shared/01/05020300.xhp
index 066cf467b2..aba7ece133 100644
--- a/source/text/shared/01/05020300.xhp
+++ b/source/text/shared/01/05020300.xhp
@@ -78,7 +78,7 @@
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/languagelb" id="bm_id3148797" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3154071" role="heading" level="2" l10n="U" oldref="23">Language</paragraph>
<paragraph xml-lang="en-US" id="par_id3154138" role="paragraph" l10n="U" oldref="24"><ahelp hid="cui/ui/numberingformatpage/languagelb">Specifies the language setting for the selected <switchinline select="appl"><caseinline select="CALC">cells </caseinline><defaultinline>fields</defaultinline></switchinline>. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected <switchinline select="appl"><caseinline select="CALC">cells </caseinline><defaultinline>fields</defaultinline></switchinline>.</ahelp></paragraph>
- <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="102">The language setting ensures that date and currency formats are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3157320" role="paragraph" l10n="U" oldref="102">The language setting ensures that date and currency formats, as well as decimal and thousands separators, are preserved even when the document is opened in an operating system that uses a different default language setting.</paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/sourceformat" id="bm_id3145747" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3155995" role="heading" level="2" l10n="U" oldref="104">Source format</paragraph>
@@ -102,6 +102,10 @@
<paragraph xml-lang="en-US" id="hd_id3147434" role="heading" level="3" l10n="U" oldref="15">Use thousands separator</paragraph>
<paragraph xml-lang="en-US" id="par_id3146148" role="paragraph" l10n="U" oldref="16"><ahelp hid="cui/ui/numberingformatpage/thousands">Inserts a separator between thousands. The type of separator that is used depends on your language settings.</ahelp></paragraph>
+<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/engineering" id="bm_id3148646" localize="false"/>
+ <paragraph xml-lang="en-US" id="hd_id3147435" role="heading" level="3" l10n="U" oldref="106">Engineering notation</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3146149" role="paragraph" l10n="U" oldref="107"><ahelp hid="cui/ui/numberingformatpage/engineering">With scientific format, Engineering notation ensures that exponent is a multiple of 3.</ahelp></paragraph>
+
<bookmark xml-lang="en-US" branch="hid/cui/ui/numberingformatpage/formated" id="bm_id3150961" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3150103" role="heading" level="2" l10n="U" oldref="17">Format code</paragraph>
<paragraph xml-lang="en-US" id="par_id3159156" role="paragraph" l10n="U" oldref="18"><ahelp hid="cui/ui/numberingformatpage/formated">Displays the number format code for the selected format. You can also enter a custom format.</ahelp> The following options are only available for user-defined number formats.</paragraph>
diff --git a/source/text/shared/01/05020301.xhp b/source/text/shared/01/05020301.xhp
index d7c8497ff9..7ff73d1b96 100644
--- a/source/text/shared/01/05020301.xhp
+++ b/source/text/shared/01/05020301.xhp
@@ -137,7 +137,7 @@
</table>
<paragraph role="heading" id="hd_id3149276" xml-lang="en-US" level="3" l10n="U" oldref="230">Thousands Separator</paragraph>
-<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="21">Depending on your language setting, you can use a comma or a period as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
+<paragraph role="paragraph" id="par_id3154380" xml-lang="en-US" l10n="U" oldref="21">Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000.</paragraph>
<table id="tbl_id3150244">
<tablerow>
<tablecell>
@@ -223,7 +223,7 @@
<paragraph role="heading" id="hd_id3147218" xml-lang="en-US" level="3" l10n="U" oldref="237">Percentages</paragraph>
<paragraph role="paragraph" id="par_id3151168" xml-lang="en-US" l10n="CHG" oldref="84">To display numbers as percentages, add the percent sign (%) to the number format.</paragraph>
<paragraph role="heading" id="hd_id3156005" xml-lang="en-US" level="3" l10n="U" oldref="89">Scientific Notation</paragraph>
-<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="85">Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. <comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment>In <item type="productname">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+.</paragraph>
+<paragraph role="paragraph" id="par_id3146923" xml-lang="en-US" l10n="U" oldref="85">Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. <comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment>In <item type="productname">%PRODUCTNAME</item>, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part.For instance: ###.##E+00</paragraph>
<paragraph role="heading" id="hd_id3159080" xml-lang="en-US" level="2" l10n="U" oldref="98">Number Format Codes of Currency Formats</paragraph>
<paragraph role="paragraph" id="par_id3147318" xml-lang="en-US" l10n="CHG" oldref="99">The default currency format for the cells in your spreadsheet is determined by the regional setting of your operating system. If you want, you can apply a custom currency symbol to a cell. For example, enter #,##0.00 € to display 4.50 € (Euros).<comment>Translators: use the decimal delimiter of your language (period or comma) for all number format codes in Calc.</comment></paragraph>
<paragraph role="paragraph" id="par_id3150032" xml-lang="en-US" l10n="U" oldref="167">You can also specify the locale setting for the currency by entering the locale code for the country after the symbol. For example, [$€-407] represents Euros in Germany. To view the locale code for a country, select the country in the <emph>Language</emph> list on the <emph>Numbers</emph> tab of the <emph>Format Cells</emph> dialog.</paragraph>
@@ -455,7 +455,7 @@
<paragraph role="tablecontent" id="par_id1002200811563472" xml-lang="en-US" l10n="NEW">H</paragraph>
</tablecell>
<tablecell>
-<paragraph role="tablecontent" id="par_id1002200811563430" xml-lang="en-US" l10n="NEW">A</paragraph>
+<paragraph role="tablecontent" id="par_id1002200811563430" xml-lang="en-US" l10n="NEW">N</paragraph>
</tablecell>
<tablecell>
<paragraph role="tablecontent" id="par_id1002200811563488" xml-lang="en-US" l10n="NEW">G</paragraph>
diff --git a/source/text/shared/01/05030300.xhp b/source/text/shared/01/05030300.xhp
index 999baef744..652058c239 100644
--- a/source/text/shared/01/05030300.xhp
+++ b/source/text/shared/01/05030300.xhp
@@ -60,7 +60,7 @@
<paragraph role="paragraph" id="par_id3154347" xml-lang="en-US" l10n="U" oldref="16"><ahelp hid="cui/ui/paratabspage/radiobuttonBTN_TABTYPE_CENTER">Aligns the center of the text to the tab stop.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/paratabspage/radiobuttonBTN_TABTYPE_DECIMAL" id="bm_id3149295" localize="false"/>
<paragraph role="heading" id="hd_id3148552" xml-lang="en-US" level="3" l10n="U" oldref="17">Decimal</paragraph>
-<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="cui/ui/paratabspage/radiobuttonBTN_TABTYPE_DECIMAL">Aligns the decimal point of a number to the center of the tab stop and text to the left of the tab.</ahelp></paragraph>
+<paragraph role="paragraph" id="par_id3144422" xml-lang="en-US" l10n="U" oldref="18"><ahelp hid="cui/ui/paratabspage/radiobuttonBTN_TABTYPE_DECIMAL">Aligns the decimal separator of a number to the center of the tab stop and text to the left of the tab.</ahelp></paragraph>
<paragraph role="paragraph" id="par_id3154388" xml-lang="en-US" l10n="U" oldref="19"><switchinline select="sys"><caseinline select="WIN">The character that is used as a decimal separator depends on the regional setting of your operating system.
</caseinline></switchinline></paragraph>
<bookmark xml-lang="en-US" branch="hid/cui/ui/paratabspage/entryED_TABTYPE_DECCHAR" id="bm_id3150791" localize="false"/>