summaryrefslogtreecommitdiff
path: root/svx/source/stbctrls/stbctrls.src
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2002-11-27 15:28:13 +0000
committerKurt Zenker <kz@openoffice.org>2002-11-27 15:28:13 +0000
commitc25fd6d7451c38f9dfd5e6a8d26ff93085bfa04f (patch)
treeb0fcc31d602b43d666cc810c48c7088475e4079a /svx/source/stbctrls/stbctrls.src
parentfd6b27fadbd65b65eb7fa44b819e0e2a9a2dd910 (diff)
Merge SRX644: 27.11.02 - 17:24:45
Diffstat (limited to 'svx/source/stbctrls/stbctrls.src')
-rw-r--r--svx/source/stbctrls/stbctrls.src24
1 files changed, 12 insertions, 12 deletions
diff --git a/svx/source/stbctrls/stbctrls.src b/svx/source/stbctrls/stbctrls.src
index db7ef2c75e95..32db05f2499d 100644
--- a/svx/source/stbctrls/stbctrls.src
+++ b/svx/source/stbctrls/stbctrls.src
@@ -2,9 +2,9 @@
*
* $RCSfile: stbctrls.src,v $
*
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: gt $ $Date: 2002-09-02 13:42:30 $
+ * last change: $Author: kz $ $Date: 2002-11-27 16:28:13 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -74,7 +74,7 @@ String RID_SVXSTR_INSERT_TEXT
Text [ italian ] = "INS" ;
Text [ portuguese_brazilian ] = "INSERIR" ;
Text [ portuguese ] = "INSER" ;
- Text [ finnish ] = "INSRT" ;
+ Text [ finnish ] = "LIS" ;
Text [ danish ] = "IND" ;
Text [ french ] = "INS" ;
Text [ swedish ] = "INFGA" ;
@@ -82,7 +82,7 @@ String RID_SVXSTR_INSERT_TEXT
Text [ spanish ] = "INSERT" ;
Text [ english_us ] = "INSRT" ;
Text[ chinese_simplified ] = "插入";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "WSTAW";
Text[ japanese ] = "挿入";
Text[ chinese_traditional ] = "插入";
@@ -105,7 +105,7 @@ String RID_SVXSTR_OVERWRITE_TEXT
Text [ italian ] = "SSC" ;
Text [ portuguese_brazilian ] = "SOBRE" ;
Text [ portuguese ] = "SUB" ;
- Text [ finnish ] = "OVER" ;
+ Text [ finnish ] = "KORV" ;
Text [ danish ] = "OVR" ;
Text [ french ] = "RFP" ;
Text [ swedish ] = "VER" ;
@@ -113,7 +113,7 @@ String RID_SVXSTR_OVERWRITE_TEXT
Text [ spanish ] = "SOBRE" ;
Text [ english_us ] = "OVER" ;
Text[ chinese_simplified ] = "改写";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "KASUJ";
Text[ japanese ] = "上書き";
Text[ chinese_traditional ] = "覆寫";
@@ -142,7 +142,7 @@ String RID_SVXSTR_SELMODE_STD
Text [ french ] = "STD" ;
Text [ dutch ] = "STD" ;
Text[ chinese_simplified ] = "标准";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "STD";
Text[ japanese ] = "標準";
Text[ chinese_traditional ] = "標準";
@@ -154,7 +154,7 @@ String RID_SVXSTR_SELMODE_STD
Text[ turkish ] = "STD";
Text[ language_user1 ] = " ";
Text[ catalan ] = "STD";
- Text[ finnish ] = "STD";
+ Text[ finnish ] = "NOR";
Text[ thai ] = "มาตรฐาน";
};
String RID_SVXSTR_SELMODE_ER
@@ -166,7 +166,7 @@ String RID_SVXSTR_SELMODE_ER
TEXT [ italian ] = "EST" ;
TEXT [ portuguese_brazilian ] = "EXT" ;
TEXT [ portuguese ] = "EXT" ;
- TEXT [ finnish ] = "EXT" ;
+ TEXT [ finnish ] = "LAA" ;
TEXT [ danish ] = "UDV" ;
TEXT [ french ] = "EXT" ;
TEXT [ swedish ] = "UTV" ;
@@ -197,7 +197,7 @@ String RID_SVXSTR_SELMODE_ERG
TEXT [ italian ] = "AGG" ;
TEXT [ portuguese_brazilian ] = "ACR" ;
TEXT [ portuguese ] = "ADI" ;
- TEXT [ finnish ] = "ADD" ;
+ TEXT [ finnish ] = "LIS" ;
TEXT [ danish ] = "TLF" ;
TEXT [ french ] = "AJT" ;
TEXT [ swedish ] = "TLF" ;
@@ -539,7 +539,7 @@ Menu RID_SVXMNU_PSZ_FUNC
Text[ turkish ] = "Toplam";
Text[ language_user1 ] = " ";
Text[ catalan ] = "Suma";
- Text[ finnish ] = "Sum";
+ Text[ finnish ] = "Summa";
Text[ thai ] = "ผลรวม";
};
MenuItem
@@ -558,7 +558,7 @@ Menu RID_SVXMNU_PSZ_FUNC
Text [ portuguese ] = "Nenhuma" ;
Text [ portuguese_brazilian ] = "Keine" ;
Text[ chinese_simplified ] = "无";
- Text[ russian ] = "";
+ Text[ russian ] = "";
Text[ polish ] = "Brak";
Text[ japanese ] = "なし";
Text[ chinese_traditional ] = "無";
*.xml format still supports the <feature> tag, but it is ignored when reading and always written as "0". * There is no trace that "the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY" whose mention gets removed from jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java had ever been supported. (The only mention was 6873b3be47d71f94c38262003101576081acd241 "INTEGRATION: CWS jre5issues (1.3.18); FILE MERGED: 2005/01/18 12:48:48 jl 1.3.18.1: #i40879# in build environment the JRE is not tested for accessibility, because of potential X server problems" introducing that comment.) * The "Features" column is removed from the JRE table on the "LibreOffice - Advance" options page. Change-Id: I332d34b60548e7f2f852241ea8edfbee0ffcf510 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94329 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2020-04-07loplugin:flatten in jvmfwkNoel Grandin Change-Id: Ic58bc539ad6b4e1ef1d8049ec97547d1420be8a4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91817 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2020-04-07new loplugin:unusedvariableplusNoel Grandin a particularly aggressive checker, which is why it is off by default Change-Id: Id5a0faa50b3ecc75e01f4aedc6579c5209e585da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91643 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2020-01-25tdf#130137 Replace remaining uses of WNT define checks with _WIN32A_GAN Change-Id: If95f1ea5a81de62eb4f725e5fcb30ccb8530062a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87372 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> 2019-12-19sal_Char->char in idlc..linguisticNoel Grandin Change-Id: Ib30fe34123ad7e5d892e8db9c742e08c4ca8fcd2 Reviewed-on: https://gerrit.libreoffice.org/85477 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> 2019-12-16unused #includeStephan Bergmann ...after c0ac7ae73480cd2b01f24e88c01bee507e8638f9 "Remove JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY, JFW_PLUGIN_FORCE_ACCESSIBILITY" Change-Id: I359255127782efa061f1daa35e524fb414a0160c Reviewed-on: https://gerrit.libreoffice.org/85202 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> 2019-12-14Remove JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY, JFW_PLUGIN_FORCE_ACCESSIBILITYStephan Bergmann JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is no longer set anywhere since 6dcb3d4ef46312729bb6f16c473b433474863f68 "Related fdo#51252: No more prereg, no more unopkg sync" in 2012. JFW_PLUGIN_FORCE_ACCESSIBILITY had been introduced with 72b954df59d64fa47f6380e4322243401afb683f "Avoid using gconftool. Atk provides a11y not Java on Unix" in 2013, as a means for users on Unix-like systems to still force a JVM with a11y support, even though that should no longer be necessary for LO a11y. Both environment variables were documented as "unofficial", with the warning that the "may be removed in the future." Theoretically, they could still be set by some users, but the likelihood of their relevance today is considered low. Change-Id: Ib718fb275b67a6de7fd7bc88ae428fd60168f4f4 Reviewed-on: https://gerrit.libreoffice.org/85140 Reviewed-by: Michael Meeks <michael.meeks@collabora.com> Tested-by: Jenkins 2019-11-22Extend loplugin:external to warn about classesStephan Bergmann ...following up on 314f15bff08b76bf96acf99141776ef64d2f1355 "Extend loplugin:external to warn about enums". Cases where free functions were moved into an unnamed namespace along with a class, to not break ADL, are in: filter/source/svg/svgexport.cxx sc/source/filter/excel/xelink.cxx sc/source/filter/excel/xilink.cxx svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx All other free functions mentioning moved classes appear to be harmless and not give rise to (silent, even) ADL breakage. (One remaining TODO in compilerplugins/clang/external.cxx is that derived classes are not covered by computeAffectedTypes, even though they could also be affected by ADL-breakage--- but don't seem to be in any acutal case across the code base.) For friend declarations using elaborate type specifiers, like class C1 {}; class C2 { friend class C1; }; * If C2 (but not C1) is moved into an unnamed namespace, the friend declaration must be changed to not use an elaborate type specifier (i.e., "friend C1;"; see C++17 [namespace.memdef]/3: "If the name in a friend declaration is neither qualified nor a template-id and the declaration is a function or an elaborated-type-specifier, the lookup to determine whether the entity has been previously declared shall not consider any scopes outside the innermost enclosing namespace.") * If C1 (but not C2) is moved into an unnamed namespace, the friend declaration must be changed too, see <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71882> "elaborated-type-specifier friend not looked up in unnamed namespace". Apart from that, to keep changes simple and mostly mechanical (which should help avoid regressions), out-of-line definitions of class members have been left in the enclosing (named) namespace. But explicit specializations of class templates had to be moved into the unnamed namespace to appease <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92598> "explicit specialization of template from unnamed namespace using unqualified-id in enclosing namespace". Also, accompanying declarations (of e.g. typedefs or static variables) that could arguably be moved into the unnamed namespace too have been left alone. And in some cases, mention of affected types in blacklists in other loplugins needed to be adapted. And sc/qa/unit/mark_test.cxx uses a hack of including other .cxx, one of which is sc/source/core/data/segmenttree.cxx where e.g. ScFlatUInt16SegmentsImpl is not moved into an unnamed namespace (because it is declared in sc/inc/segmenttree.hxx), but its base ScFlatSegmentsImpl is. GCC warns about such combinations with enabled-by-default -Wsubobject-linkage, but "The compiler doesn’t give this warning for types defined in the main .C file, as those are unlikely to have multiple definitions." (<https://gcc.gnu.org/onlinedocs/gcc-9.2.0/gcc/Warning-Options.html>) The warned-about classes also don't have multiple definitions in the given test, so disable the warning when including the .cxx. Change-Id: Ib694094c0d8168be68f8fe90dfd0acbb66a3f1e4 Reviewed-on: https://gerrit.libreoffice.org/83239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>