summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStanislav Horacek <stanislav.horacek@gmail.com>2013-10-18 20:06:41 +0200
committerCaolán McNamara <caolanm@redhat.com>2013-10-23 10:17:28 +0000
commit8fcc6911b8df398f174ac564569c7bbc107f8dfc (patch)
treebaf410b731771a9e48ca0cbddb0d2d9a87202525
parent865be6c72e883d71ed9c62d956e838eb9d86aea6 (diff)
fdo#36964 change "Remove Filter" to "Reset Filter"
Change-Id: I92a3883dcafa360f3fe2ec2b065c878f39ad7e11 Reviewed-on: https://gerrit.libreoffice.org/6323 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--source/text/scalc/00/00000412.xhp6
-rw-r--r--source/text/scalc/01/12040400.xhp4
-rw-r--r--source/text/scalc/guide/database_filter.xhp2
-rw-r--r--source/text/scalc/guide/filters.xhp2
-rw-r--r--source/text/shared/01/02250000.xhp2
-rw-r--r--source/text/shared/02/01170101.xhp2
-rw-r--r--source/text/shared/02/12030000.xhp2
-rw-r--r--source/text/shared/02/12040000.xhp6
-rw-r--r--source/text/shared/02/12090000.xhp2
-rw-r--r--source/text/shared/02/12100100.xhp2
-rw-r--r--source/text/shared/guide/data_search2.xhp2
11 files changed, 16 insertions, 16 deletions
diff --git a/source/text/scalc/00/00000412.xhp b/source/text/scalc/00/00000412.xhp
index 73d03d4626..62e21708ca 100644
--- a/source/text/scalc/00/00000412.xhp
+++ b/source/text/scalc/00/00000412.xhp
@@ -96,9 +96,9 @@
<paragraph role="paragraph" id="par_id3155444" xml-lang="en-US" l10n="U" oldref="19">Choose <emph>Data - Filter - Advanced Filter - More&gt;&gt;</emph> button</paragraph>
</section>
<section id="dnfief">
-<paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Data - Filter - Remove Filter</emph>
+<paragraph role="paragraph" id="par_id3156382" xml-lang="en-US" l10n="U" oldref="20">Choose <emph>Data - Filter - Reset Filter</emph>
</paragraph>
-<paragraph role="paragraph" id="par_id3155961" xml-lang="en-US" l10n="CHG" oldref="48">On Table Data bar, click <emph>Remove Filter/Sort</emph>
+<paragraph role="paragraph" id="par_id3155961" xml-lang="en-US" l10n="CHG" oldref="48">On Table Data bar, click <emph>Reset Filter/Sort</emph>
</paragraph>
<table id="tbl_id3146919">
<tablerow>
@@ -108,7 +108,7 @@
</image></paragraph>
</tablecell>
<tablecell colspan="" rowspan="">
-<paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="49">Remove Filter/Sort</paragraph>
+<paragraph role="paragraph" id="par_id3149207" xml-lang="en-US" l10n="U" oldref="49">Reset Filter/Sort</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/source/text/scalc/01/12040400.xhp b/source/text/scalc/01/12040400.xhp
index eea7bc4655..006db25227 100644
--- a/source/text/scalc/01/12040400.xhp
+++ b/source/text/scalc/01/12040400.xhp
@@ -24,14 +24,14 @@
<helpdocument version="1.0">
<meta>
<topic id="textscalc0112040400xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Remove Filter</title>
+<title id="tit" xml-lang="en-US">Reset Filter</title>
<filename>/text/scalc/01/12040400.xhp</filename>
</topic>
</meta>
<body>
<section id="filterentfernen">
<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterRemoveFilter" id="bm_id2352791" localize="false"/>
-<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterRemoveFilter" id="bm_id3151384" localize="false"/><paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040400.xhp" name="Remove Filter">Remove Filter</link></paragraph>
+<bookmark xml-lang="en-US" branch="hid/.uno:DataFilterRemoveFilter" id="bm_id3151384" localize="false"/><paragraph role="heading" id="hd_id3153087" xml-lang="en-US" level="1" l10n="U" oldref="1"><link href="text/scalc/01/12040400.xhp" name="Remove Filter">Reset Filter</link></paragraph>
<paragraph role="paragraph" id="par_id3154760" xml-lang="en-US" l10n="CHG" oldref="2"><ahelp hid=".uno:DataFilterRemoveFilter">Removes the filter from the selected cell range. To enable this command, click inside the cell area where the filter was applied.</ahelp></paragraph>
</section>
<section id="howtoget">
diff --git a/source/text/scalc/guide/database_filter.xhp b/source/text/scalc/guide/database_filter.xhp
index 33c38a2b93..137528cf57 100644
--- a/source/text/scalc/guide/database_filter.xhp
+++ b/source/text/scalc/guide/database_filter.xhp
@@ -77,7 +77,7 @@
<paragraph xml-lang="en-US" id="par_idN1075C" role="paragraph" l10n="CHG">Click in a filtered cell range.</paragraph>
</listitem>
<listitem>
- <paragraph xml-lang="en-US" id="par_idN106EC" role="paragraph" l10n="NEW">Choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN106EC" role="paragraph" l10n="NEW">Choose <item type="menuitem">Data - Filter - Reset Filter</item>.</paragraph>
</listitem>
</list>
<section id="relatedtopics">
diff --git a/source/text/scalc/guide/filters.xhp b/source/text/scalc/guide/filters.xhp
index 00c7341286..e4f6a12f38 100644
--- a/source/text/scalc/guide/filters.xhp
+++ b/source/text/scalc/guide/filters.xhp
@@ -46,7 +46,7 @@
<paragraph xml-lang="en-US" id="par_id3150010" role="listitem" l10n="U" oldref="5">The <emph>Advanced filter</emph> allows up to a total of eight filter conditions. With advanced filters you enter the conditions directly into the sheet.</paragraph>
</listitem>
</list>
- <paragraph xml-lang="en-US" id="par_id9384746" role="tip" l10n="NEW">To remove a filter, so that you see all cells again, click inside the area where the filter was applied, then choose <item type="menuitem">Data - Filter - Remove Filter</item>.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id9384746" role="tip" l10n="NEW">To remove a filter, so that you see all cells again, click inside the area where the filter was applied, then choose <item type="menuitem">Data - Filter - Reset Filter</item>.</paragraph>
<paragraph xml-lang="en-US" id="par_idN10663" role="note" l10n="NEW">When you select multiple rows from an area where a filter was applied, then this selection can include rows that are visible and rows that are hidden by the filter. If you then apply formatting, or delete the selected rows, this action then applies only to the visible rows. The hidden rows are not affected. </paragraph>
<paragraph xml-lang="en-US" id="par_id218817" role="note" l10n="NEW">This is the opposite to rows that you have hidden manually by the <emph>Format - Rows - Hide Rows</emph> command. Manually hidden rows are deleted when you delete a selection that contains them.</paragraph>
<section id="relatedtopics">
diff --git a/source/text/shared/01/02250000.xhp b/source/text/shared/01/02250000.xhp
index cf9d26b66d..31e845bb86 100644
--- a/source/text/shared/01/02250000.xhp
+++ b/source/text/shared/01/02250000.xhp
@@ -100,7 +100,7 @@
<paragraph xml-lang="en-US" id="par_id3145590" role="paragraph" l10n="U" oldref="30"><ahelp hid=".">Use the <emph>Standard Filter</emph> to refine and to combine <emph>AutoFilter </emph>search options.</ahelp></paragraph>
<embed href="text/shared/02/12090000.xhp#filterdialog"/>
<bookmark xml-lang="en-US" branch="hid/.uno:Bib/removeFilter" id="bm_id8467360" localize="false"/>
-<paragraph xml-lang="en-US" id="par_id3155311" role="paragraph" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Remove Filter</emph> icon.</ahelp></paragraph>
+<paragraph xml-lang="en-US" id="par_id3155311" role="paragraph" l10n="U" oldref="16"><ahelp hid=".">To display all of the records in a table, click the <emph>Reset Filter</emph> icon.</ahelp></paragraph>
<bookmark xml-lang="en-US" branch="hid/SVX_HID_FM_DELETEROWS" id="bm_id3153954" localize="false"/>
<paragraph xml-lang="en-US" id="hd_id3147580" role="heading" level="2" l10n="U"
oldref="17">Deleting a Record</paragraph>
diff --git a/source/text/shared/02/01170101.xhp b/source/text/shared/02/01170101.xhp
index 00815ed988..e00238e0ef 100644
--- a/source/text/shared/02/01170101.xhp
+++ b/source/text/shared/02/01170101.xhp
@@ -851,7 +851,7 @@
<section id="Section75">
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_SHOW_FILTERSORT" id="bm_id7137363" localize="false"/>
<paragraph xml-lang="en-US" id="par_idN12156" role="heading" level="2" l10n="NEW">Filtering / Sorting</paragraph>
- <paragraph xml-lang="en-US" id="par_idN1215A" role="paragraph" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Remove filter/sort.</paragraph>
+ <paragraph xml-lang="en-US" id="par_idN1215A" role="paragraph" l10n="NEW"><ahelp hid="37931">Specifies to show or hide the filtering and sorting items in a selected Navigation Bar control.</ahelp> Filtering and sorting items are the following: Sort ascending, Sort descending, Sort, Automatic filter, Default filter, Apply filter, Reset filter/sort.</paragraph>
</section>
<section id="Section76">
<bookmark xml-lang="en-US" branch="hid/EXTENSIONS_HID_PROP_ICONSIZE" id="bm_id7815790" localize="false"/>
diff --git a/source/text/shared/02/12030000.xhp b/source/text/shared/02/12030000.xhp
index 36ce007917..b390b01442 100644
--- a/source/text/shared/02/12030000.xhp
+++ b/source/text/shared/02/12030000.xhp
@@ -50,7 +50,7 @@
</section>
<paragraph role="paragraph" id="par_id3155355" xml-lang="en-US" l10n="U" oldref="4">Place the cursor in a field name whose content you want to filter and then click the <emph>AutoFilter</emph> icon. Only those records with content identical to the selected field name are visible.</paragraph>
<paragraph role="paragraph" id="par_id3159234" xml-lang="en-US" l10n="U" oldref="5">For example, to view all the customers from New York, click a field name with the entry "New York". AutoFilter then filters all customers from New York from the database.</paragraph>
-<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="6">You can remove the current AutoFilter with the <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting">Remove Filter/Sorting</link> icon or with <emph>Data - Filter - Remove Filter</emph>.</paragraph>
+<paragraph role="paragraph" id="par_id3153577" xml-lang="en-US" l10n="U" oldref="6">You can remove the current AutoFilter with the <link href="text/shared/02/12040000.xhp" name="Reset Filter/Sorting">Reset Filter/Sorting</link> icon or with <emph>Data - Filter - Reset Filter</emph>.</paragraph>
<paragraph role="paragraph" id="par_id3145345" xml-lang="en-US" l10n="U" oldref="7">To filter with several field names simultaneously, click the <emph>Default Filter </emph>icon. The <link href="text/shared/02/12090000.xhp" name="Default Filter dialog">Default Filter</link> dialog appears, in which you can combine several filter criteria.</paragraph>
</body>
</helpdocument>
diff --git a/source/text/shared/02/12040000.xhp b/source/text/shared/02/12040000.xhp
index b49053a8a8..a06865cda2 100644
--- a/source/text/shared/02/12040000.xhp
+++ b/source/text/shared/02/12040000.xhp
@@ -22,7 +22,7 @@
<helpdocument version="1.0">
<meta>
<topic id="textshared0212040000xml" indexer="include" status="PUBLISH">
-<title xml-lang="en-US" id="tit">Remove Filter/Sorting</title>
+<title xml-lang="en-US" id="tit">Reset Filter/Sorting</title>
<filename>/text/shared/02/12040000.xhp</filename>
</topic>
<history>
@@ -35,7 +35,7 @@
<section id="filterentfernen">
<bookmark xml-lang="en-US" branch="hid/.uno:RemoveFilterSort" id="bm_id7746846" localize="false"/><!-- HID added by script -->
-<bookmark branch="hid/.uno:RemoveFilterSort" xml-lang="en-US" id="bm_id3144740" localize="false"/><paragraph id="hd_id3155069" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting">Remove Filter/Sorting</link></paragraph>
+<bookmark branch="hid/.uno:RemoveFilterSort" xml-lang="en-US" id="bm_id3144740" localize="false"/><paragraph id="hd_id3155069" role="heading" level="1" oldref="1" l10n="U" xml-lang="en-US"><link href="text/shared/02/12040000.xhp" name="Reset Filter/Sorting">Reset Filter/Sorting</link></paragraph>
<paragraph l10n="U" role="paragraph" id="par_id3154094" xml-lang="en-US" oldref="2"><ahelp hid=".uno:RemoveFilterSort" visibility="visible">Cancels the filter settings and displays all of the records in the current table.</ahelp></paragraph>
</section>
<section id="syfilterentfernen">
@@ -48,7 +48,7 @@
<paragraph l10n="E" role="paragraph" id="par_id3146130" xml-lang="en-US" oldref=""><image src="cmd/sc_removefilter.png" id="img_id3151315"><alt xml-lang="en-US" id="alt_id3151315">Icon</alt></image></paragraph>
</tablecell>
<tablecell>
- <paragraph role="paragraph" id="par_id3153750" l10n="U" xml-lang="en-US" oldref="3">Remove Filter/Sorting</paragraph>
+ <paragraph role="paragraph" id="par_id3153750" l10n="U" xml-lang="en-US" oldref="3">Reset Filter/Sorting</paragraph>
</tablecell>
</tablerow>
diff --git a/source/text/shared/02/12090000.xhp b/source/text/shared/02/12090000.xhp
index 16f5e84666..e3cfe88ec7 100644
--- a/source/text/shared/02/12090000.xhp
+++ b/source/text/shared/02/12090000.xhp
@@ -59,7 +59,7 @@
<section id="filterdialog">
<paragraph xml-lang="en-US" id="par_id3143267" role="paragraph" l10n="U" oldref="6">$[officename] saves the current filter settings for the next time that you open this dialog.</paragraph>
</section>
- <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
+ <paragraph xml-lang="en-US" id="par_id3156410" role="paragraph" l10n="CHG" oldref="7">To remove the current filter, click <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Reset Filter/Sorting</emph></link> icon.</paragraph>
<section id="relatedtopics">
<paragraph xml-lang="en-US" id="par_id3152996" role="paragraph" l10n="C"><link href="text/shared/02/12030000.xhp" name="AutoFilter">AutoFilter</link></paragraph>
</section>
diff --git a/source/text/shared/02/12100100.xhp b/source/text/shared/02/12100100.xhp
index 39c73a53af..557671d7c9 100644
--- a/source/text/shared/02/12100100.xhp
+++ b/source/text/shared/02/12100100.xhp
@@ -43,7 +43,7 @@
<embed href="text/shared/00/00000450.xhp#sortieren"/>
</section>
<paragraph role="paragraph" id="par_id3149549" xml-lang="en-US" l10n="U" oldref="12">While the functions <link href="text/shared/02/12010000.xhp" name="Sort in Ascending Order"><emph>Sort in Ascending Order</emph></link> and <link href="text/shared/02/12020000.xhp" name="Sort in Descending Order"><emph>Sort in Descending Order</emph></link> sort by one criterion only, you can combine several criteria in the<emph> Sort Order </emph>dialog.</paragraph>
-<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="13">You can remove a sorting that has been performed with the <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sorting"><emph>Remove Filter/Sorting</emph></link> icon.</paragraph>
+<paragraph role="paragraph" id="par_id3145136" xml-lang="en-US" l10n="U" oldref="13">You can remove a sorting that has been performed with the <link href="text/shared/02/12040000.xhp" name="Reset Filter/Sorting"><emph>Reset Filter/Sorting</emph></link> icon.</paragraph>
<paragraph role="heading" id="hd_id3148548" xml-lang="en-US" level="2" l10n="U" oldref="4">Sorting</paragraph>
<paragraph role="paragraph" id="par_id3155941" xml-lang="en-US" l10n="U" oldref="5">Use this area to enter sorting criteria. If you enter additional sorting criteria under <emph>and then</emph>, the data matching the content of the higher-order criterion is ordered according to the next criterion.</paragraph>
<paragraph role="paragraph" id="par_id3148620" xml-lang="en-US" l10n="U" oldref="14">If you sort the field name "First name" in ascending order and the field name "last name" in descending order, all records will be sorted in ascending order by first name, and then within the first names, in descending order by last name.</paragraph>
diff --git a/source/text/shared/guide/data_search2.xhp b/source/text/shared/guide/data_search2.xhp
index 2c4936e496..9f5c59953b 100644
--- a/source/text/shared/guide/data_search2.xhp
+++ b/source/text/shared/guide/data_search2.xhp
@@ -66,7 +66,7 @@
<paragraph role="paragraph" id="par_id3150114" xml-lang="en-US" l10n="CHG" oldref="11">Click the <link href="text/shared/02/12120000.xhp" name="Apply Filter"><emph>Apply Filter</emph></link> icon
<image id="img_id3144764" src="cmd/sc_datafilterstandardfilter.png" width="0.222inch" height="0.222inch"><alt id="alt_id3144764" xml-lang="en-US">Icon</alt>
</image> on the <emph>Form Navigation</emph> toolbar to change to the filtered view.</paragraph>
-<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="12">The filter that has been set can be removed by clicking <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sort"><emph>Remove Filter/Sort</emph></link> icon
+<paragraph role="paragraph" id="par_id3146898" xml-lang="en-US" l10n="U" oldref="12">The filter that has been set can be removed by clicking <link href="text/shared/02/12040000.xhp" name="Remove Filter/Sort"><emph>Reset Filter/Sort</emph></link> icon
<image id="img_id3151318" src="cmd/sc_removefiltersort.png" width="0.222inch" height="0.222inch"><alt id="alt_id3151318" xml-lang="en-US">Icon</alt>
</image>.</paragraph>
<embed href="text/shared/00/00000004.xhp#related"/>