2 files changed, 14 insertions, 20 deletions
diff --git a/source/ja/officecfg/registry/data/org/openoffice/Office.po b/source/ja/officecfg/registry/data/org/openoffice/Office.po
index 05ef4fb0b7e..698fc17c99e 100644
--- a/source/ja/officecfg/registry/data/org/openoffice/Office.po
+++ b/source/ja/officecfg/registry/data/org/openoffice/Office.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2016-11-09 14:10+0100\n"
-"PO-Revision-Date: 2016-12-12 01:42+0000\n"
-"Last-Translator: baffclan <baffclan@yahoo.co.jp>\n"
+"PO-Revision-Date: 2017-01-14 06:57+0000\n"
+"Last-Translator: Naruhiko Ogasawara <naruoga@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -13,8 +13,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
-"X-POOTLE-MTIME: 1481506929.000000\n"
+"X-Generator: Pootle 2.8\n"
+"X-POOTLE-MTIME: 1484377028.000000\n"
 
 #: Addons.xcu
 msgctxt ""
@@ -1295,14 +1295,13 @@ msgid "Delete %SLIDES slides."
 msgstr "%SLIDES スライドを削除します。"
 
 #: PresentationMinimizer.xcu
-#, fuzzy
 msgctxt ""
 "PresentationMinimizer.xcu\n"
 "..PresentationMinimizer.Strings\n"
 "STR_OPTIMIZE_IMAGES\n"
 "value.text"
 msgid "Optimize %IMAGES images to %QUALITY% JPEG quality at %RESOLUTION DPI."
-msgstr "%IMAGES の図を、%RESOLUTION DPIの%QUALITY% JPEG 品質に最適化します。"
+msgstr "%IMAGES の図を品質 %QUALITY %、解像度 %RESOLUTION DPI の JPEG へ変換します。"
 
 #: PresentationMinimizer.xcu
 msgctxt ""
diff --git a/source/ja/officecfg/registry/data/org/openoffice/Office/UI.po b/source/ja/officecfg/registry/data/org/openoffice/Office/UI.po
index 87c4fa4b0b6..28aac83df6f 100644
--- a/source/ja/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ja/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
 "POT-Creation-Date: 2016-12-27 21:51+0100\n"
-"PO-Revision-Date: 2017-01-10 14:30+0000\n"
-"Last-Translator: Ikuya Awashiro <ikuya@fruitsbasket.info>\n"
+"PO-Revision-Date: 2017-01-14 08:12+0000\n"
+"Last-Translator: Naruhiko Ogasawara <naruoga@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -14,7 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Accelerator-Marker: ~\n"
 "X-Generator: Pootle 2.8\n"
-"X-POOTLE-MTIME: 1484058659.000000\n"
+"X-POOTLE-MTIME: 1484381523.000000\n"
 
 #: BaseWindowState.xcu
 msgctxt ""
@@ -2726,7 +2726,6 @@ msgid "Standard Text Attributes"
 msgstr "標準テキスト属性の設定"
 
 #: CalcCommands.xcu
-#, fuzzy
 msgctxt ""
 "CalcCommands.xcu\n"
 "..CalcCommands.UserInterface.Commands..uno:StandardTextAttributes\n"
@@ -5535,14 +5534,13 @@ msgid "Shape"
 msgstr "シェイプ"
 
 #: ChartWindowState.xcu
-#, fuzzy
 msgctxt ""
 "ChartWindowState.xcu\n"
 "..ChartWindowState.UIElements.States.private:resource/popupmenu/drawtext\n"
 "UIName\n"
 "value.text"
 msgid "Shape Text"
-msgstr "テキストのスケール"
+msgstr "テキストのシェイプ"
 
 #: ChartWindowState.xcu
 msgctxt ""
@@ -7531,7 +7529,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "New Page"
-msgstr "次のページ"
+msgstr "新しいページ"
 
 #: DrawImpressCommands.xcu
 msgctxt ""
@@ -9775,14 +9773,13 @@ msgid "Shape"
 msgstr "シェイプ"
 
 #: DrawWindowState.xcu
-#, fuzzy
 msgctxt ""
 "DrawWindowState.xcu\n"
 "..DrawWindowState.UIElements.States.private:resource/popupmenu/drawtext\n"
 "UIName\n"
 "value.text"
 msgid "Shape Text"
-msgstr "テキストのスケール"
+msgstr "テキストのシェイプ"
 
 #: DrawWindowState.xcu
 msgctxt ""
@@ -17320,7 +17317,6 @@ msgid "Demote"
 msgstr "レベルを下げる"
 
 #: GenericCommands.xcu
-#, fuzzy
 msgctxt ""
 "GenericCommands.xcu\n"
 "..GenericCommands.UserInterface.Commands..uno:OutlineFormat\n"
@@ -22559,14 +22555,13 @@ msgid "Shape"
 msgstr "シェイプ"
 
 #: ImpressWindowState.xcu
-#, fuzzy
 msgctxt ""
 "ImpressWindowState.xcu\n"
 "..ImpressWindowState.UIElements.States.private:resource/popupmenu/drawtext\n"
 "UIName\n"
 "value.text"
 msgid "Shape Text"
-msgstr "テキストのスケール"
+msgstr "テキストのシェイプ"
 
 #: ImpressWindowState.xcu
 msgctxt ""
@@ -25887,7 +25882,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Save Merged Documents"
-msgstr ""
+msgstr "結合ドキュメントを保存"
 
 #: WriterCommands.xcu
 msgctxt ""
@@ -25896,7 +25891,7 @@ msgctxt ""
 "Label\n"
 "value.text"
 msgid "Print Merged Documents"
-msgstr ""
+msgstr "結合ドキュメントを印刷"
 
 #: WriterCommands.xcu
 msgctxt ""
Age	Commit message (Collapse)	Author
2020-07-19	compact namespace: svx	Noel Grandin
	Change-Id: I15c64c6cc0ae2a0f1fb9a3e1651dda1d6ced7585 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99008 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-03-13	Revert "loplugin:constfields in svx"	Noel Grandin
	This reverts commit 1a6397030381a45f27ab7a2a02e6e6d0f9987c84. Change-Id: Iaa706bb4ea3144ef57ab359b982400abc589b97e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90454 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2020-02-02	tdf#128302: Split SVXCORE_DLLPUBLIC from SVX_DLLPUBLIC	Stephan Bergmann
	Using SVX_DLLPUBLIC for both Library_svxcore and Library_svx had started to cause failures with clang-cl on Windows now, presumably due to devirtualization: > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::DataChanged(class DataChangedEvent const &)" (?DataChanged@SvxMetricField@@MEAAXAEBVDataChangedEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::PreNotify(class NotifyEvent &)" (?PreNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual bool __cdecl SvxMetricField::EventNotify(class NotifyEvent &)" (?EventNotify@SvxMetricField@@MEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "protected: virtual void __cdecl SvxMetricField::Modify(void)" (?Modify@SvxMetricField@@MEAAXXZ) > linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::PreNotify(class NotifyEvent &)" (?PreNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z) > linectrl.o : error LNK2001: unresolved external symbol "private: virtual bool __cdecl SvxFillAttrBox::EventNotify(class NotifyEvent &)" (?EventNotify@SvxFillAttrBox@@EEAA_NAEAVNotifyEvent@@@Z) > C:\lo-clang\core\instdir\program\svxcorelo.dll : fatal error LNK1120: 6 unresolved externals Replacing certain uses of SVX_DLLPUBLIC with the newly introduced SVXCORE_DLLPUBLIC (include/svx/svxdllapi.h) has been done on Linux as follows: > git grep -w --line-number -e SVX_DLLPUBLIC --and --not -e '#define SVX_DLLPUBLIC' >LINES to produce a file LINES containing all 640 uses. (Conveniently, all uses happen to be on different lines.) Manually create a file TOKENS with 640 corresponding lines, each containing the (class or function) name that is made SVX_DLLPUBLIC by in the corresponding line in LINES. Then > nm -D --def instdir/program/libsvxcorelo.so \| grep -ivw '[vw]' \| c++filt >SVXCORESYMS > nm -D --def instdir/program/libsvxlo.so \| grep -ivw '[vw]' \| c++filt >SVXSYMS > n=$(cat TOKENS \| wc -l) > for ((i=1;i<="$n";++i)); do > tok=$(head -n "$i" TOKENS \| tail -1) > printf @ > grep -Fw "$tok" SVXCORESYMS >/dev/null && printf svxcore > printf @ > grep -Fw "$tok" SVXSYMS >/dev/null && printf svx > printf '@ ' > head -n "$i" LINES \| tail -1 > done to generate 640 output lines detailing for each SVX_DLLPUBLIC name occurrene whether it is mentioned in exports from neither (@@@), only from svx (@@svx@), only from svxcore (@svxcore@@), or from both libraries (@svxcore@svx@). The numbers that gives is 10 @@@ 180 @@svx@ 424 @svxcore@@ 26 @svxcore@svx@ The 10 @@@ ask for follow-up clean up, but most of them are just left as SVX_DLLPUBLIC for now. The exceptions are sxv::ITextProvider (include/svx/itextprovider.hxx) and SdrCustomShapeGeometryItem::PropertyPairHash (include/svx/sdasitm.hxx, where PropertyPairHash is a member struct of SVXCORE_DLLPUBLIC SdrCustomShapeGeometryItem). Keeping them as SVX_DLLPUBLIC would cause "unresolved externals" errors when linking Library_svxcore on Windows. The 180 @@svx@ are fine to keep as-is, and the 424 @svxcore@@ need rewriting. The 26 @svxcore@svx@ needed manual inspection to decide (in some cases, the chosen name in TOKENS was a too generic function name like Fill, in other cases it was the name of a class exported from one library but also mentioned in the arguments of a function exported from the other). And for sdr::table::SdrTableObj the class itself is defined in svxcore while the static member functions ExportAsRTF and ImportAsRTF are defined in svx. But MSVC does not allow to mark the class as SVXCORE_DLLPUBLIC and the two static member functions as SVX_DLLPLUBIC, so move the two functions out of the class. (There appears to be no real necessity that they were static member functions in the first place; they don't even need to be friends of the class. Nevertheless, this mixture of functionality from svxcore and svx in include/svx/svdotable.hxx may ask for follow-up clean up, one way or another.) All the output lines that need rewriting (all the @svxcore@@ ones, and the manually picked subset of @@@ and @svxcore@svx@ ones) are copied into a new file CHANGE (containing 451 lines). Then > sed -E -e 's\|^@.@.@ ([^:]+):([0-9]+):.*$\|sed -i -e "\2 s/SVX_DLLPUBLIC/SVXCORE_DLLPUBLIC/" \1\|' <CHANGE >COMMANDS > . COMMANDS to do the changes. Change-Id: If9b6dd1c9e9ba2eb883dbdac4385d28c6fc8a203 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87794 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2019-12-14	loplugin:expandablemethods	Noel Grandin
	Change-Id: Ia8192e03feda9e8ae70e29d8dc98d995f015f9ce Reviewed-on: https://gerrit.libreoffice.org/85135 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2018-10-08	loplugin:constfields in svx	Noel Grandin
	Change-Id: I643e8686e015ca85dd96221f1c93038f4fddf27b Reviewed-on: https://gerrit.libreoffice.org/61182 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2017-10-24	loplugin:finalclasses in svx	Noel Grandin
	Change-Id: I74296e2185902498cd569ecde83905f718a41e84 Reviewed-on: https://gerrit.libreoffice.org/43715 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-11-16	loplugin:countusersofdefaultparams in include/svx..unotools	Noel Grandin
	Change-Id: I02e933da66241e99e3b81d90d679f1502bab3fef Reviewed-on: https://gerrit.libreoffice.org/30866 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
2016-09-13	loplugin:override: No more need for the "MSVC dtor override" workaround	Stephan Bergmann
	The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark overriding destructors as 'virtual'" appears to no longer be a problem with MSVC 2013. (The little change in the rewriting code of compilerplugins/clang/override.cxx was necessary to prevent an endless loop when adding "override" to OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager(); in chart2/source/inc/LifeTime.hxx, getting stuck in the leading OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.) Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
2016-09-13	Remove nonsense comments: // bitfield	Tor Lillqvist
	Surely the actual bitfield syntax is enough to tell the code reader that it is a bitfield. Change-Id: Ic9552e01b19c8b34b2a17db56b9ff63e7c7de926
2016-02-09	Remove excess newlines	Chris Sherlock
	A ridiculously fast way of doing this is: for i in $(pcregrep -l -M -r --include='.*[hc]xx$' \ --exclude-dir=workdir --exclude-dir=instdir '^ {3,}' .) do perl -0777 -i -pe 's/^ {3,}/ /gm' $i done Change-Id: Iebb93eccbee9e4fc5c4380474ba595858a27ac2c Reviewed-on: https://gerrit.libreoffice.org/22224 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
2015-12-11	tdf#69977: uno::Sequence is expensive	Noel Grandin
	when used as a mutable data-structure. Plain std::vector halves the time taken to display the chart dialog Create a class to represent the std::vector we are going to be passing around, and move some of the utility methods into it to make the code prettier. Also create an optimised append(&&) method for the common case of appending small temporaries. Change-Id: I7f5b43fb4a8a84e40e6a52fcb7e9f974091b4485
2015-10-12	Replace "SAL_OVERRIDE" with "override" in LIBO_INTERNAL_ONLY code	Stephan Bergmann
	Change-Id: I2ea407acd763ef2d7dae2d3b8f32525523ac8274