From 40e56fe83f5a05f8c87821d0c30ef1585b601fc8 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 27 May 2013 10:37:03 +0200 Subject: Compendium Conflicts should be fuzzy Change-Id: Idd4cab6eb5c5c2f642f68bde298949d390b5fb59 --- source/nr/swext/mediawiki/help.po | 10 +++++++--- .../src/registry/data/org/openoffice/Office/Custom.po | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) (limited to 'source/nr/swext/mediawiki') diff --git a/source/nr/swext/mediawiki/help.po b/source/nr/swext/mediawiki/help.po index 27f3c1fc2c7..ed456c9ede3 100644 --- a/source/nr/swext/mediawiki/help.po +++ b/source/nr/swext/mediawiki/help.po @@ -1,4 +1,4 @@ -#. extracted from swext/mediawiki/help +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7,12 +7,12 @@ msgstr "" "PO-Revision-Date: 2011-04-06 01:09+0200\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" -"Language: nr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"Language: nr\n" "X-Accelerator-Marker: ~\n" +"X-Generator: LibreOffice\n" #: help.tree msgctxt "" @@ -455,6 +455,7 @@ msgid "Lists can reliably be exported when the whole list uses a consistent list msgstr "" #: wikiformats.xhp +#, fuzzy msgctxt "" "wikiformats.xhp\n" "hd_id7026886\n" @@ -463,6 +464,7 @@ msgid "Paragraphs" msgstr "#-#-#-#-# undo.po (PACKAGE VERSION) #-#-#-#-#\\nAmapharagrafu\\n#-#-#-#-# fldui.po (PACKAGE VERSION) #-#-#-#-#\\nAmapharagrafu\\n#-#-#-#-# res.po (PACKAGE VERSION) #-#-#-#-#\\nIindima" #: wikiformats.xhp +#, fuzzy msgctxt "" "wikiformats.xhp\n" "hd_id4436475\n" @@ -511,6 +513,7 @@ msgid "Character styles modify the appearance of parts of a paragraph. The trans msgstr "" #: wikiformats.xhp +#, fuzzy msgctxt "" "wikiformats.xhp\n" "hd_id5152745\n" @@ -543,6 +546,7 @@ msgid "Images cannot be exported by a transformation producing a single file of msgstr "" #: wikiformats.xhp +#, fuzzy msgctxt "" "wikiformats.xhp\n" "hd_id2162236\n" diff --git a/source/nr/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po b/source/nr/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po index 0804bcfaf1e..6cece7ce4a1 100644 --- a/source/nr/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po +++ b/source/nr/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po @@ -1,4 +1,4 @@ -#. extracted from swext/mediawiki/src/registry/data/org/openoffice/Office/Custom +# msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" @@ -7,12 +7,12 @@ msgstr "" "PO-Revision-Date: 2011-04-06 01:09+0200\n" "Last-Translator: Anonymous Pootle User\n" "Language-Team: LANGUAGE \n" -"Language: nr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"Language: nr\n" "X-Accelerator-Marker: ~\n" +"X-Generator: LibreOffice\n" #: WikiExtension.xcu msgctxt "" @@ -96,6 +96,7 @@ msgid "~Username" msgstr "~Ibizo lomsebenzisi" #: WikiExtension.xcu +#, fuzzy msgctxt "" "WikiExtension.xcu\n" ".WikiExtension.Strings\n" @@ -146,6 +147,7 @@ msgid "No" msgstr "Awa" #: WikiExtension.xcu +#, fuzzy msgctxt "" "WikiExtension.xcu\n" ".WikiExtension.Strings\n" @@ -172,6 +174,7 @@ msgid "Yes" msgstr "Iye" #: WikiExtension.xcu +#, fuzzy msgctxt "" "WikiExtension.xcu\n" ".WikiExtension.Strings\n" @@ -193,6 +196,7 @@ msgstr "" "~Ngezelela..." #: WikiExtension.xcu +#, fuzzy msgctxt "" "WikiExtension.xcu\n" ".WikiExtension.Strings\n" @@ -252,6 +256,7 @@ msgid "Media~Wiki Server" msgstr "" #: WikiExtension.xcu +#, fuzzy msgctxt "" "WikiExtension.xcu\n" ".WikiExtension.Strings\n" -- cgit 4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-10-31tdf#162666 Make SfxStateCache handle Items correctlyArmin Le Grand (allotropia)
SfxStateCache had problems processing the extra Item states disabled/invalid. Note that due to not using a Pool here it is not possible to use an ItemSet or an ItemHolder, those would automatically handle these cases correctly. In this cache, this currently needs to be done handish. Also note that because of that this may break again when changes in the Item/ItemSet/ItemHolder mechanism may be done. Change-Id: I007bc25c727e6432062fa0d2af8215a912cb2fff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175871 Reviewed-by: Armin Le Grand <Armin.Le.Grand@me.com> Tested-by: Jenkins
2022-07-14clang-tidy modernize-pass-by-value in sfx2Noel Grandin
Change-Id: I7984f0b52809091511dc01005fdbfeafd521b4bf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137048 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2021-06-25loplugin:finalclasses in sfx2Noel Grandin
Change-Id: I8125d5447e13a6dadfde9c19c8cab6004693589a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117789 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-04-06lok: introduce QueryControlState functionHenry Castro
The sidebar usually executes UNO commands to the core framework, however the controls already have formatted the text that is useful in Online client side. For example the units conversion. The QueryControlState method will retrieve the current formatted text of the sidebar control to be used in Client Side. Change-Id: I0b3e3a1462d4391ac911352f35808a5e5d9f9ffb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91237 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Henry Castro <hcastro@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91577 Tested-by: Jenkins
2020-03-12Revert "loplugin:constfields in sfx2"Noel Grandin
This reverts commit 8411b80d46765f1ddd4e37aa634ec963dcf4b04f. Change-Id: Ibf3aa3ce4bfedf9d47001ad824db7c48ff093a21 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90416 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2019-08-20Fix typosAndrea Gelmini
Change-Id: I77393d6329ef6f2cfc38825791b44d23e8c3af3e Reviewed-on: https://gerrit.libreoffice.org/77764 Reviewed-by: Julien Nabet <serval2412@yahoo.fr> Tested-by: Julien Nabet <serval2412@yahoo.fr>
2019-03-25tdf#42949 Fix IWYU warnings in include/sfx2/[a-D]*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I444cb71bc3d045072a4b1f9eed279ed7e425a0d4 Reviewed-on: https://gerrit.libreoffice.org/69481 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-01-07tdf#42949 Fix IWYU warnings in include/vcl/[v-x]*Gabor Kelemen
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I98f49765c6b74808dcbd692e0f375dd2848fcfd4 Reviewed-on: https://gerrit.libreoffice.org/65614 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2018-10-09loplugin:constfields in sfx2Noel Grandin
and we find that bSplitable in SfxDockingWindow is always true, ever since commit 4bd28a2fee0d36c67911019eeb7d934838e27cad Date: Tue Jan 29 15:27:40 2008 +0000 INTEGRATION: CWS fwk82_SRC680 (1.45.138); FILE MERGED so we can remove all of the non-splittable code there. ` Change-Id: Ia7fe607ed02d1a7c69a92bab57e220b19f0e6e87 Reviewed-on: https://gerrit.libreoffice.org/61550 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-02-08tdf#115430 BindDispatch_Impl needs a disposal methodMaxim Monastirsky
The dtor will never be called otherwise, because the dispatcher is holding a reference to us, so removeStatusListener is needed first. Regression of a5dbe5a8a9e98f2d79f2c535182fc557b561ed0f ("use rtl::Reference in svl,sfx2") Change-Id: I52da6152f0ddb0030d7354f7201e969d5a1f11cf Reviewed-on: https://gerrit.libreoffice.org/49423 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
2017-10-06use rtl::Reference in svl,sfx2Noel Grandin
instead of manual ref-counting Change-Id: Icb6472ffadfb57c9723b26f6f247e78fff45e528 Reviewed-on: https://gerrit.libreoffice.org/43193 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-08-17Fix typosAndrea Gelmini
Change-Id: Iaa9c0aea3ea1a239e378bd714ba335f91bb1faf3 Reviewed-on: https://gerrit.libreoffice.org/41194 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-06-12cleanup unused css/frame/* includesJochen Nitschke
Change-Id: I173a29fd1ee889127369d2bc2fce8e010b89ca65 Reviewed-on: https://gerrit.libreoffice.org/38633 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-04-29tdf#39468: Translate some German comments and termsJens Carl
Change-Id: I5f33f24aa6fd1685e32c9df11855a26ad891eb5b Reviewed-on: https://gerrit.libreoffice.org/37096 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Björn Michaelsen <bjoern.michaelsen@libreoffice.org>
2017-01-26Remove dynamic exception specificationsStephan Bergmann
...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at <https://lists.freedesktop.org/archives/libreoffice/2017-January/076665.html> "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-08-05loplugin:countusersofdefaultparams in sfx2..svgioNoel Grandin
Change-Id: Ia01f3a9aa21c88df5fe5242ad4a3c0acbe68fda0 Reviewed-on: https://gerrit.libreoffice.org/27903 Reviewed-by: Noel Grandin <noelgrandin@gmail.com> Tested-by: Noel Grandin <noelgrandin@gmail.com>
2016-08-02loplugin:countusersofdefaultparams in sfx2Noel Grandin
Change-Id: I0a21e2f8069bc698700e97e7c5e4ae508240ff98 Reviewed-on: https://gerrit.libreoffice.org/27761 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-08tdf#99815 use XNotifyingDispatch in sfx2Juergen Funk
- move DispatchHelper somewhere public - use it from generic dispatcher call sites in sfx2 - return result of dispatcher calls (conveyed via XDispatchResultListener) to calling code, instead of faking it Change-Id: Ie8041133e99dd99e45819f98798829b96532b9e6 Reviewed-on: https://gerrit.libreoffice.org/24953 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>