diff -Nru libreoffice-6.2.2/chart2/qa/extras/chart2export.cxx libreoffice-6.2.3/chart2/qa/extras/chart2export.cxx --- libreoffice-6.2.2/chart2/qa/extras/chart2export.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/qa/extras/chart2export.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -41,6 +41,7 @@ public: Chart2ExportTest() : ChartTest() {} void testErrorBarXLSX(); + void testErrorBarPropXLSX(); void testTrendline(); void testTrendlineOOXML(); void testTrendlineXLS(); @@ -128,6 +129,7 @@ CPPUNIT_TEST_SUITE(Chart2ExportTest); CPPUNIT_TEST(testErrorBarXLSX); + CPPUNIT_TEST(testErrorBarPropXLSX); CPPUNIT_TEST(testTrendline); CPPUNIT_TEST(testTrendlineOOXML); CPPUNIT_TEST(testTrendlineXLS); @@ -490,6 +492,23 @@ } } +void Chart2ExportTest::testErrorBarPropXLSX() +{ + load("/chart2/qa/extras/data/xlsx/", "testErrorBarProp.xlsx"); + xmlDocPtr pXmlDoc = parseExport("xl/charts/chart","Calc Office Open XML"); + CPPUNIT_ASSERT(pXmlDoc); + + // test y error bars property + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:errDir", "val", "y"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln", "w", "12600"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[1]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "ff0000"); + + // test x error bars property + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:errDir", "val", "x"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln", "w", "9360"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:scatterChart/c:ser/c:errBars[2]/c:spPr/a:ln/a:solidFill/a:srgbClr", "val", "595959"); +} + // This method tests the preservation of properties for trendlines / regression curves // in an export -> import cycle using different file formats - ODS, XLS and XLSX. void Chart2ExportTest::testTrendline() diff -Nru libreoffice-6.2.2/chart2/qa/extras/chart2import.cxx libreoffice-6.2.3/chart2/qa/extras/chart2import.cxx --- libreoffice-6.2.2/chart2/qa/extras/chart2import.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/qa/extras/chart2import.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -106,6 +106,7 @@ void testTdf109858(); // Pie chart label placement settings(XLSX) void testTdf111173(); + void testTdf122226(); void testInternalDataProvider(); @@ -117,6 +118,7 @@ void testTdf121205(); void testTdf114179(); + void testTdf123504(); CPPUNIT_TEST_SUITE(Chart2ImportTest); CPPUNIT_TEST(Fdo60083); @@ -177,6 +179,7 @@ CPPUNIT_TEST(testTdf90510); CPPUNIT_TEST(testTdf109858); CPPUNIT_TEST(testTdf111173); + CPPUNIT_TEST(testTdf122226); CPPUNIT_TEST(testInternalDataProvider); @@ -188,6 +191,7 @@ CPPUNIT_TEST(testTdf121205); CPPUNIT_TEST(testTdf114179); + CPPUNIT_TEST(testTdf123504); CPPUNIT_TEST_SUITE_END(); @@ -1440,6 +1444,24 @@ uno::Reference< chart::XChartDocument > xChart1Doc( getChartCompFromSheet( 0, mxComponent ), UNO_QUERY_THROW ); } +void Chart2ImportTest::testTdf122226() +{ + load( "/chart2/qa/extras/data/docx/", "testTdf122226.docx" ); + uno::Reference< chart2::XChartDocument > xChartDoc ( getChartDocFromWriter(0), uno::UNO_QUERY); + CPPUNIT_ASSERT( xChartDoc.is() ); + + css::uno::Reference xDiagram(xChartDoc->getFirstDiagram(), UNO_QUERY_THROW); + Reference xDataSeries = getDataSeriesFromDoc(xChartDoc, 0); + uno::Reference xPropertySet(xDataSeries->getDataPointByIndex(0), uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xPropertySet.is()); + + uno::Any aAny = xPropertySet->getPropertyValue( "LabelSeparator" ); + CPPUNIT_ASSERT( aAny.hasValue() ); + OUString nLabelSeparator; + CPPUNIT_ASSERT( aAny >>= nLabelSeparator ); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Data labels should be separated into new lines", OUString("\n"), nLabelSeparator ); +} + void Chart2ImportTest::testTdf115107() { load("/chart2/qa/extras/data/pptx/", "tdf115107.pptx"); @@ -1679,6 +1701,37 @@ CPPUNIT_ASSERT( aSize.Height > 0); } +void Chart2ImportTest::testTdf123504() +{ + load("/chart2/qa/extras/data/ods/", "pie_chart_100_and_0.ods"); + Reference xChartDoc(getChartDocFromSheet(0, mxComponent), + UNO_QUERY_THROW); + + Reference xChartDoc2(xChartDoc, UNO_QUERY_THROW); + Reference xChartType(getChartTypeFromDoc(xChartDoc2, 0), UNO_SET_THROW); + auto aDataSeriesYValues = getDataSeriesYValuesFromChartType(xChartType); + CPPUNIT_ASSERT_EQUAL(size_t(1), aDataSeriesYValues.size()); + + Reference xDrawPageSupplier(xChartDoc, UNO_QUERY_THROW); + Reference xDrawPage(xDrawPageSupplier->getDrawPage(), UNO_SET_THROW); + Reference xShapes(xDrawPage->getByIndex(0), UNO_QUERY_THROW); + Reference xSeriesSlices(getShapeByName(xShapes, "CID/D=0:CS=0:CT=0:Series=0"), + UNO_SET_THROW); + + Reference xIndexAccess(xSeriesSlices, UNO_QUERY_THROW); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount()); + Reference xSlice(xIndexAccess->getByIndex(0), UNO_QUERY_THROW); + + // Check size and position of the only slice in the chart (100%) + // In the regressed state, it used to be 0-sized at position 0,0 + awt::Point aSlicePosition = xSlice->getPosition(); + CPPUNIT_ASSERT_GREATER(sal_Int32(3000), aSlicePosition.X); + CPPUNIT_ASSERT_GREATER(sal_Int32(150), aSlicePosition.Y); + awt::Size aSliceSize = xSlice->getSize(); + CPPUNIT_ASSERT_GREATER(sal_Int32(8500), aSliceSize.Height); + CPPUNIT_ASSERT_GREATER(sal_Int32(8500), aSliceSize.Width); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Chart2ImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/chart2/qa/extras/data/docx/testTdf122226.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/chart2/qa/extras/data/docx/testTdf122226.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/chart2/qa/extras/data/ods/pie_chart_100_and_0.ods and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/chart2/qa/extras/data/ods/pie_chart_100_and_0.ods differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/chart2/qa/extras/data/xlsx/testErrorBarProp.xlsx differ diff -Nru libreoffice-6.2.2/chart2/source/controller/dialogs/tp_AxisPositions.cxx libreoffice-6.2.3/chart2/source/controller/dialogs/tp_AxisPositions.cxx --- libreoffice-6.2.2/chart2/source/controller/dialogs/tp_AxisPositions.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/controller/dialogs/tp_AxisPositions.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -62,6 +62,11 @@ { m_xLB_CrossesAt->connect_changed(LINK(this, AxisPositionsTabPage, CrossesAtSelectHdl)); m_xLB_PlaceLabels->connect_changed(LINK(this, AxisPositionsTabPage, PlaceLabelsSelectHdl)); + + const double nMin = static_cast(SAL_MIN_INT64); + const double nMax = static_cast(SAL_MAX_INT64); + m_xED_CrossesAt->set_range(nMin, nMax); + m_xED_LabelDistance->set_range(nMin, nMax); } AxisPositionsTabPage::~AxisPositionsTabPage() diff -Nru libreoffice-6.2.2/chart2/source/controller/main/ChartController.cxx libreoffice-6.2.3/chart2/source/controller/main/ChartController.cxx --- libreoffice-6.2.2/chart2/source/controller/main/ChartController.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/controller/main/ChartController.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1436,7 +1436,7 @@ { const Reference< document::XUndoManagerSupplier > xSuppUndo( getModel(), uno::UNO_QUERY_THROW ); const Reference< document::XUndoManager > xUndoManager( xSuppUndo->getUndoManager(), uno::UNO_QUERY_THROW ); - const Reference< document::XUndoAction > xAction( new impl::ShapeUndoElement( *pUndoAction ) ); + const Reference< document::XUndoAction > xAction( new impl::ShapeUndoElement( std::move(pUndoAction) ) ); xUndoManager->addUndoAction( xAction ); } catch( const uno::Exception& ) diff -Nru libreoffice-6.2.2/chart2/source/controller/main/UndoActions.cxx libreoffice-6.2.3/chart2/source/controller/main/UndoActions.cxx --- libreoffice-6.2.2/chart2/source/controller/main/UndoActions.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/controller/main/UndoActions.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -90,10 +90,10 @@ // = ShapeUndoElement -ShapeUndoElement::ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ) +ShapeUndoElement::ShapeUndoElement( std::unique_ptr xSdrUndoAction ) :ShapeUndoElement_MBase() ,ShapeUndoElement_TBase( m_aMutex ) - ,m_pAction( &i_sdrUndoAction ) + ,m_xAction( std::move(xSdrUndoAction) ) { } @@ -103,23 +103,23 @@ OUString SAL_CALL ShapeUndoElement::getTitle() { - if ( !m_pAction ) + if ( !m_xAction ) throw DisposedException( OUString(), *this ); - return m_pAction->GetComment(); + return m_xAction->GetComment(); } void SAL_CALL ShapeUndoElement::undo( ) { - if ( !m_pAction ) + if ( !m_xAction ) throw DisposedException( OUString(), *this ); - m_pAction->Undo(); + m_xAction->Undo(); } void SAL_CALL ShapeUndoElement::redo( ) { - if ( !m_pAction ) + if ( !m_xAction ) throw DisposedException( OUString(), *this ); - m_pAction->Redo(); + m_xAction->Redo(); } void SAL_CALL ShapeUndoElement::disposing() diff -Nru libreoffice-6.2.2/chart2/source/controller/main/UndoActions.hxx libreoffice-6.2.3/chart2/source/controller/main/UndoActions.hxx --- libreoffice-6.2.2/chart2/source/controller/main/UndoActions.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/controller/main/UndoActions.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -89,7 +89,7 @@ ,public ShapeUndoElement_TBase { public: - explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); + explicit ShapeUndoElement( std::unique_ptr xSdrUndoAction ); // XUndoAction virtual OUString SAL_CALL getTitle() override; @@ -103,7 +103,7 @@ virtual ~ShapeUndoElement() override; private: - SdrUndoAction* m_pAction; + std::unique_ptr m_xAction; }; } // namespace impl diff -Nru libreoffice-6.2.2/chart2/source/view/main/PlottingPositionHelper.cxx libreoffice-6.2.3/chart2/source/view/main/PlottingPositionHelper.cxx --- libreoffice-6.2.2/chart2/source/view/main/PlottingPositionHelper.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/view/main/PlottingPositionHelper.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -35,7 +35,6 @@ #include #include -#include namespace chart { @@ -420,10 +419,11 @@ && !::rtl::math::approxEqual( fStartLogicValueOnAngleAxis, fEndLogicValueOnAngleAxis ) ) fWidthAngleDegree = 360.0; - while(fWidthAngleDegree<0.0) - fWidthAngleDegree+=360.0; - while(fWidthAngleDegree>360.0) - fWidthAngleDegree-=360.0; + // tdf#123504: both 0 and 360 are valid and different values here! + while (fWidthAngleDegree < 0.0) + fWidthAngleDegree += 360.0; + while (fWidthAngleDegree > 360.0) + fWidthAngleDegree -= 360.0; return fWidthAngleDegree; } @@ -476,7 +476,12 @@ fRet = m_fAngleDegreeOffset + fAxisAngleScaleDirection*(fScaledLogicAngleValue-MinAngleValue)*360.0 /fabs(MaxAngleValue-MinAngleValue); - return NormAngle360(fRet); + // tdf#123504: both 0 and 360 are valid and different values here! + while (fRet > 360.0) + fRet -= 360.0; + while (fRet < 0) + fRet += 360.0; + return fRet; } /** diff -Nru libreoffice-6.2.2/chart2/source/view/main/PolarLabelPositionHelper.cxx libreoffice-6.2.3/chart2/source/view/main/PolarLabelPositionHelper.cxx --- libreoffice-6.2.2/chart2/source/view/main/PolarLabelPositionHelper.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/view/main/PolarLabelPositionHelper.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -25,8 +25,6 @@ #include -#include - namespace chart { using namespace ::com::sun::star; @@ -124,7 +122,11 @@ //set LabelAlignment if( !bCenter ) { - fAngleDegree = NormAngle360(fAngleDegree); + // tdf#123504: both 0 and 360 are valid and different values here! + while (fAngleDegree > 360.0) + fAngleDegree -= 360.0; + while (fAngleDegree < 0.0) + fAngleDegree += 360.0; bool bOutside = nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE; diff -Nru libreoffice-6.2.2/chart2/source/view/main/ShapeFactory.cxx libreoffice-6.2.3/chart2/source/view/main/ShapeFactory.cxx --- libreoffice-6.2.2/chart2/source/view/main/ShapeFactory.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/chart2/source/view/main/ShapeFactory.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -877,7 +877,11 @@ if( !xTarget.is() ) return nullptr; - fUnitCircleWidthAngleDegree = NormAngle360(fUnitCircleWidthAngleDegree); + // tdf#123504: both 0 and 360 are valid and different values here! + while (fUnitCircleWidthAngleDegree > 360) + fUnitCircleWidthAngleDegree -= 360.0; + while (fUnitCircleWidthAngleDegree < 0) + fUnitCircleWidthAngleDegree += 360.0; //create shape uno::Reference< drawing::XShape > xShape( @@ -926,9 +930,10 @@ if( !xTarget.is() ) return nullptr; - while(fUnitCircleWidthAngleDegree>360) + // tdf#123504: both 0 and 360 are valid and different values here! + while (fUnitCircleWidthAngleDegree > 360) fUnitCircleWidthAngleDegree -= 360.0; - while(fUnitCircleWidthAngleDegree<0) + while (fUnitCircleWidthAngleDegree < 0) fUnitCircleWidthAngleDegree += 360.0; //create shape diff -Nru libreoffice-6.2.2/configure.ac libreoffice-6.2.3/configure.ac --- libreoffice-6.2.2/configure.ac 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/configure.ac 2019-04-10 10:10:51.000000000 +0000 @@ -9,7 +9,7 @@ # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice],[6.2.2.2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[6.2.3.2],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) @@ -8443,7 +8443,7 @@ SYSTEM_PYTHON= PYTHON_VERSION_MAJOR=3 PYTHON_VERSION_MINOR=5 - PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.6 + PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7 if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in download.lst]) fi @@ -8669,11 +8669,17 @@ done fi AC_PATH_PROG(PGCONFIG, pg_config, ,$PATH$pg_supp_path) - if test -z "$PGCONFIG"; then - AC_MSG_ERROR([pg_config needed; set PGCONFIG if not in PATH]) + if test -n "$PGCONFIG"; then + POSTGRESQL_INC=-I$(${PGCONFIG} --includedir) + POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)" + else + PKG_CHECK_MODULES(POSTGRESQL, libpq, [ + POSTGRESQL_INC=$POSTGRESQL_CFLAGS + POSTGRESQL_LIB=$POSTGRESQL_LIBS + ],[ + AC_MSG_ERROR([pg_config or 'pkg-config libpq' needed; set PGCONFIG if not in PATH]) + ]) fi - POSTGRESQL_INC=-I$(${PGCONFIG} --includedir) - POSTGRESQL_LIB="-L$(${PGCONFIG} --libdir)" FilterLibs "${POSTGRESQL_LIB}" POSTGRESQL_LIB="${filteredlibs}" else diff -Nru libreoffice-6.2.2/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-6.2.3/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu --- libreoffice-6.2.2/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/connectivity/registry/ado/org/openoffice/Office/DataAccess/Drivers.xcu 2019-04-10 10:10:51.000000000 +0000 @@ -97,9 +97,7 @@ - - true - + diff -Nru libreoffice-6.2.2/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-6.2.3/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu --- libreoffice-6.2.2/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/connectivity/registry/jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-04-10 10:10:51.000000000 +0000 @@ -132,9 +132,7 @@ - - true - + diff -Nru libreoffice-6.2.2/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-6.2.3/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu --- libreoffice-6.2.2/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-04-10 10:10:51.000000000 +0000 @@ -51,6 +51,11 @@ true + + + true + + true diff -Nru libreoffice-6.2.2/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-6.2.3/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu --- libreoffice-6.2.2/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-04-10 10:10:51.000000000 +0000 @@ -41,6 +41,11 @@ true + + + true + + @@ -115,6 +120,11 @@ true + + + true + + @@ -193,6 +203,11 @@ true + + + + true + diff -Nru libreoffice-6.2.2/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu libreoffice-6.2.3/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu --- libreoffice-6.2.2/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/connectivity/registry/odbc/org/openoffice/Office/DataAccess/Drivers.xcu 2019-04-10 10:10:51.000000000 +0000 @@ -137,9 +137,7 @@ - - true - + diff -Nru libreoffice-6.2.2/cui/source/dialogs/cuigaldlg.cxx libreoffice-6.2.3/cui/source/dialogs/cuigaldlg.cxx --- libreoffice-6.2.2/cui/source/dialogs/cuigaldlg.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/dialogs/cuigaldlg.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -926,7 +926,7 @@ if (!m_xLbxFound->count_selected_rows() || !bEntriesFound) { - SvxOpenGraphicDialog aDlg("Gallery", GetDialogFrameWeld()); + SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_KEY_GALLERY_DIR), GetDialogFrameWeld()); aDlg.EnableLink(false); aDlg.AsLink(false); diff -Nru libreoffice-6.2.2/cui/source/inc/backgrnd.hxx libreoffice-6.2.3/cui/source/inc/backgrnd.hxx --- libreoffice-6.2.2/cui/source/inc/backgrnd.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/inc/backgrnd.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -160,6 +160,11 @@ bool bHighlighting : 1; bool bCharBackColor : 1; SfxItemSet maSet; + std::unique_ptr m_pResetSet; + + sal_Int32 m_nActPos = -1; + + DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void); public: using SvxAreaTabPage::ActivatePage; using SvxAreaTabPage::DeactivatePage; @@ -173,6 +178,7 @@ virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; virtual void PageCreated( const SfxAllItemSet& aSet ) override; + virtual void Reset( const SfxItemSet * ) override; }; #endif // INCLUDED_CUI_SOURCE_INC_BACKGRND_HXX diff -Nru libreoffice-6.2.2/cui/source/inc/cuitabarea.hxx libreoffice-6.2.3/cui/source/inc/cuitabarea.hxx --- libreoffice-6.2.2/cui/source/inc/cuitabarea.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/inc/cuitabarea.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -242,8 +242,6 @@ SfxItemSet& m_rXFSet; protected: - Size m_aColorSize; - std::unique_ptr m_xFillTab; std::unique_ptr m_xBtnNone; std::unique_ptr m_xBtnColor; @@ -254,6 +252,9 @@ void SetOptimalSize(weld::DialogController* pController); + void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr ); + SfxTabPage* GetFillTabPage() { return m_pFillTabPage; } + private: DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void); @@ -762,6 +763,8 @@ void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; } + void SetCtlPreviewOld( SfxItemSet& rAttrs ) { m_aCtlPreviewOld.SetAttributes( rAttrs ); } + virtual void FillUserData() override; }; diff -Nru libreoffice-6.2.2/cui/source/tabpages/backgrnd.cxx libreoffice-6.2.3/cui/source/tabpages/backgrnd.cxx --- libreoffice-6.2.2/cui/source/tabpages/backgrnd.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/backgrnd.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1345,6 +1345,26 @@ } } +static sal_uInt16 lcl_GetTableDestSlot(sal_Int32 nTblDest) +{ + switch (nTblDest) + { + default: + case TBL_DEST_CELL: + { + return SID_ATTR_BRUSH; + } + case TBL_DEST_ROW: + { + return SID_ATTR_BRUSH_ROW; + } + case TBL_DEST_TBL: + { + return SID_ATTR_BRUSH_TABLE; + } + } +} + SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs) : SvxAreaTabPage(pParent, rInAttrs), bHighlighting(false), @@ -1376,8 +1396,6 @@ SetColorList(pColorTable); SetBitmapList(pBitmapList); - - m_xFillTab->set_size_request(m_aColorSize.Width(), m_aColorSize.Height()); } SvxBkgTabPage::~SvxBkgTabPage() @@ -1407,24 +1425,29 @@ return DeactivateRC::LeavePage; } -bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet ) +void SvxBkgTabPage::Reset( const SfxItemSet* ) { - sal_uInt16 nSlot = SID_ATTR_BRUSH; - if (m_xTblLBox && m_xTblLBox->get_visible()) + maSet.Set( *m_pResetSet.get() ); + if ( m_xTblLBox && m_xTblLBox->get_visible() ) { - switch (m_xTblLBox->get_active()) + m_nActPos = -1; + const SfxPoolItem* pItem; + if ( SfxItemState::SET == m_pResetSet->GetItemState( SID_BACKGRND_DESTINATION, false, &pItem ) ) { - case TBL_DEST_CELL: - nSlot = SID_ATTR_BRUSH; - break; - case TBL_DEST_ROW: - nSlot = SID_ATTR_BRUSH_ROW; - break; - case TBL_DEST_TBL: - nSlot = SID_ATTR_BRUSH_TABLE; - break; + sal_uInt16 nDestValue = static_cast(pItem)->GetValue(); + m_xTblLBox->set_active( nDestValue ); + TblDestinationHdl_Impl( *m_xTblLBox ); } + m_xTblLBox->save_value(); } + SvxAreaTabPage::Reset( &maSet ); +} + +bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet ) +{ + sal_uInt16 nSlot = SID_ATTR_BRUSH; + if (m_xTblLBox && m_xTblLBox->get_visible()) + nSlot = lcl_GetTableDestSlot(m_xTblLBox->get_active()); else if ( bHighlighting ) nSlot = SID_ATTR_BRUSH_CHAR; else if( bCharBackColor ) @@ -1467,7 +1490,7 @@ case drawing::FillStyle_BITMAP: { SvxBrushItem aBrushItem( getSvxBrushItemFromSourceSet( maSet, nWhich ) ); - if ( GraphicType::NONE != aBrushItem.GetGraphicObject()->GetType() ) // no selection so use current + if ( GraphicType::NONE != aBrushItem.GetGraphicObject()->GetType() ) rCoreSet->Put( aBrushItem ); break; } @@ -1475,6 +1498,42 @@ break; } + if (m_xTblLBox && m_xTblLBox->get_visible()) + { + if (nSlot != SID_ATTR_BRUSH) + { + nWhich = maSet.GetPool()->GetWhich(SID_ATTR_BRUSH); + if (SfxItemState::SET == maSet.GetItemState(nWhich)) + { + SvxBrushItem aBrushItem(static_cast(maSet.Get(nWhich))); + rCoreSet->Put(aBrushItem); + } + } + if (nSlot != SID_ATTR_BRUSH_ROW) + { + nWhich = maSet.GetPool()->GetWhich(SID_ATTR_BRUSH_ROW); + if (SfxItemState::SET == maSet.GetItemState(nWhich)) + { + SvxBrushItem aBrushItem(static_cast(maSet.Get(nWhich))); + rCoreSet->Put(aBrushItem); + } + } + if (nSlot != SID_ATTR_BRUSH_TABLE) + { + nWhich = maSet.GetPool()->GetWhich(SID_ATTR_BRUSH_TABLE); + if (SfxItemState::SET == maSet.GetItemState(nWhich)) + { + SvxBrushItem aBrushItem(static_cast(maSet.Get(nWhich))); + rCoreSet->Put(aBrushItem); + } + } + + if (m_xTblLBox->get_value_changed_from_saved()) + { + rCoreSet->Put(SfxUInt16Item(SID_BACKGRND_DESTINATION, m_xTblLBox->get_active())); + } + } + return true; } @@ -1495,7 +1554,7 @@ { m_xBtnBitmap->show(); m_xTblLBox = m_xBuilder->weld_combo_box("tablelb"); - m_xTblLBox->set_active(0); + m_xTblLBox->connect_changed(LINK(this, SvxBkgTabPage, TblDestinationHdl_Impl)); m_xTblLBox->show(); } if ((nFlags & SvxBackgroundTabFlags::SHOW_HIGHLIGHTING) || @@ -1506,6 +1565,7 @@ } if (nFlags & SvxBackgroundTabFlags::SHOW_SELECTOR) m_xBtnBitmap->show(); + SetOptimalSize(GetDialogController()); } if ( bCharBackColor ) @@ -1522,7 +1582,70 @@ setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, maSet); } + m_pResetSet = maSet.Clone(); + SvxAreaTabPage::PageCreated(aSet); } +IMPL_LINK(SvxBkgTabPage, TblDestinationHdl_Impl, weld::ComboBox&, rBox, void) +{ + if (m_nActPos > -1) + { + // fill local item set with XATTR_FILL settings gathered from tab page + // and convert to SvxBrushItem and store in table destination slot Which + SvxAreaTabPage::FillItemSet(&maSet); + maSet.Put(getSvxBrushItemFromSourceSet(maSet, maSet.GetPool()->GetWhich(lcl_GetTableDestSlot(m_nActPos)))); + } + + sal_Int32 nSelPos = rBox.get_active(); + if (m_nActPos != nSelPos) + { + m_nActPos = nSelPos; + + // fill local item set with XATTR_FILL created from SvxBushItem for table destination slot Which + sal_uInt16 nWhich = maSet.GetPool()->GetWhich(lcl_GetTableDestSlot(nSelPos)); + if (SfxItemState::SET == maSet.GetItemState(nWhich)) + { + SvxBrushItem aBrushItem(static_cast(maSet.Get(nWhich))); + setSvxBrushItemAsFillAttributesToTargetSet(aBrushItem, maSet); + } + else + { + SelectFillType(*m_xBtnNone, &maSet); + return; + } + + // show tab page + drawing::FillStyle eXFS = drawing::FillStyle_NONE; + if (maSet.GetItemState(XATTR_FILLSTYLE) != SfxItemState::DONTCARE) + { + XFillStyleItem aFillStyleItem(static_cast(maSet.Get(GetWhich( XATTR_FILLSTYLE)))); + eXFS = aFillStyleItem.GetValue(); + } + switch(eXFS) + { + default: + case drawing::FillStyle_NONE: + { + SelectFillType(*m_xBtnNone, &maSet); + break; + } + case drawing::FillStyle_SOLID: + { + SelectFillType(*m_xBtnColor, &maSet); + // color tab page Active and New preview controls are same after SelectFillType + // hack to restore color tab page Active preview + setSvxBrushItemAsFillAttributesToTargetSet(static_cast(m_pResetSet->Get(nWhich)), *m_pResetSet); + static_cast(GetFillTabPage())->SetCtlPreviewOld(*m_pResetSet); + break; + } + case drawing::FillStyle_BITMAP: + { + SelectFillType(*m_xBtnBitmap, &maSet); + break; + } + } + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/cui/source/tabpages/border.cxx libreoffice-6.2.3/cui/source/tabpages/border.cxx --- libreoffice-6.2.2/cui/source/tabpages/border.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/border.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -549,15 +549,19 @@ if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR)) { sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR); - const SvxLineItem& rLineItem(*static_cast(rSet->GetItem(nBorderDiagId))); - m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, rLineItem.GetLine()); + if (const SvxLineItem* pLineItem = static_cast(rSet->GetItem(nBorderDiagId))) + m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, pLineItem->GetLine()); + else + m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::TLBR); } if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR)) { sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR); - const SvxLineItem& rLineItem(*static_cast(rSet->GetItem(nBorderDiagId))); - m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, rLineItem.GetLine()); + if (const SvxLineItem* pLineItem = static_cast(rSet->GetItem(nBorderDiagId))) + m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, pLineItem->GetLine()); + else + m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::BLTR); } if (m_xShadowControls) diff -Nru libreoffice-6.2.2/cui/source/tabpages/numfmt.cxx libreoffice-6.2.3/cui/source/tabpages/numfmt.cxx --- libreoffice-6.2.2/cui/source/tabpages/numfmt.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/numfmt.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -234,7 +234,7 @@ auto nWidth = approximate_char_width() * 26; m_xLbCategory->set_size_request(nWidth, m_xLbCategory->get_height_rows(7)); m_xLbFormat->set_size_request(nWidth, m_xLbFormat->get_height_rows(5)); - m_xLbCurrency->set_size_request(1, -1); // width of 1, so real width will be that of its LbFormat sibling + m_xLbCurrency->set_size_request(nWidth, -1); // width of 1, so real width will be that of its LbFormat sibling // Initially remove the "Automatically" entry. m_xLbCurrency->set_active(-1); // First ensure that nothing is selected. diff -Nru libreoffice-6.2.2/cui/source/tabpages/page.cxx libreoffice-6.2.3/cui/source/tabpages/page.cxx --- libreoffice-6.2.2/cui/source/tabpages/page.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/page.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -308,7 +308,6 @@ // adjust the handler m_xLayoutBox->connect_changed(LINK(this, SvxPageDescPage, LayoutHdl_Impl)); - m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, PaperBinHdl_Impl)); m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, PaperSizeSelect_Impl)); m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, PaperSizeModify_Impl)); m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, PaperSizeModify_Impl)); @@ -410,6 +409,10 @@ m_xPaperTrayBox->append(OUString::number(nPaperBin), aBinName); m_xPaperTrayBox->set_active_text(aBinName); + // reset focus handler to default first so know none already connected + m_xPaperTrayBox->connect_focus_in(Link()); + // update the list when widget gets focus + m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, PaperBinHdl_Impl)); Size aPaperSize = SvxPaperInfo::GetPaperSize( mpDefPrinter ); pItem = GetItem( *rSet, SID_ATTR_PAGE_SIZE ); @@ -804,9 +807,8 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::Widget&, void) { - if (m_xPaperTrayBox->get_count() > 1) - // already filled - return; + // tdf#124226 disconnect so not called again, unless Reset occurs + m_xPaperTrayBox->connect_focus_in(Link()); OUString aOldName = m_xPaperTrayBox->get_active_text(); m_xPaperTrayBox->freeze(); @@ -826,6 +828,10 @@ } m_xPaperTrayBox->set_active_text(aOldName); m_xPaperTrayBox->thaw(); + + // tdf#123650 explicitly grab-focus after the modification otherwise gtk loses track + // of there the focus should be + m_xPaperTrayBox->grab_focus(); } IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeSelect_Impl, weld::ComboBox&, void) diff -Nru libreoffice-6.2.2/cui/source/tabpages/tparea.cxx libreoffice-6.2.3/cui/source/tabpages/tparea.cxx --- libreoffice-6.2.2/cui/source/tabpages/tparea.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/tparea.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -121,6 +121,8 @@ void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController) { + m_xFillTab->set_size_request(-1, -1); + TabPageParent aFillTab(m_xFillTab.get(), pController); // TEMP if (!aFillTab.pController) @@ -128,8 +130,7 @@ // Calculate optimal size of all pages.. m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, &m_rXFSet)); - m_aColorSize = m_xFillTab->get_preferred_size(); - Size aSize(m_aColorSize); + Size aSize(m_xFillTab->get_preferred_size()); if (m_xBtnGradient->get_visible()) { @@ -369,8 +370,16 @@ IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, weld::ToggleButton&, rButton, void) { + SelectFillType(rButton); +} + +void SvxAreaTabPage::SelectFillType(weld::ToggleButton& rButton, const SfxItemSet* _pSet) +{ + if (_pSet) + m_rXFSet.Set(*_pSet); + sal_Int32 nPos = maBox.GetButtonPos(&rButton); - if(nPos != -1 && nPos != maBox.GetCurrentButtonPos()) + if (nPos != -1 && (_pSet || nPos != maBox.GetCurrentButtonPos())) { maBox.SelectButton(&rButton); FillType eFillType = static_cast(maBox.GetCurrentButtonPos()); diff -Nru libreoffice-6.2.2/cui/source/tabpages/tpbitmap.cxx libreoffice-6.2.3/cui/source/tabpages/tpbitmap.cxx --- libreoffice-6.2.2/cui/source/tabpages/tpbitmap.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/cui/source/tabpages/tpbitmap.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -714,7 +714,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl, weld::Button&, void) { - SvxOpenGraphicDialog aDlg("Import", GetDialogFrameWeld()); + SvxOpenGraphicDialog aDlg(CuiResId(RID_SVXSTR_ADD_IMAGE), GetDialogFrameWeld()); aDlg.EnableLink(false); long nCount = m_pBitmapList->Count(); diff -Nru libreoffice-6.2.2/dbaccess/source/ui/dlg/advancedsettings.cxx libreoffice-6.2.3/dbaccess/source/ui/dlg/advancedsettings.cxx --- libreoffice-6.2.2/dbaccess/source/ui/dlg/advancedsettings.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/dbaccess/source/ui/dlg/advancedsettings.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -73,7 +73,10 @@ const SfxPoolItem& rItem = _rCoreAttrs.Get(nItemId); booleanSetting.bOptionalBool = dynamic_cast(&rItem) != nullptr; booleanSetting.xControl = m_xBuilder->weld_check_button(booleanSetting.sControlId); - booleanSetting.xControl->connect_toggled(LINK(this, SpecialSettingsPage, OnToggleHdl)); + if (booleanSetting.bOptionalBool) + booleanSetting.xControl->connect_toggled(LINK(this, SpecialSettingsPage, OnTriStateToggleHdl)); + else + booleanSetting.xControl->connect_toggled(LINK(this, SpecialSettingsPage, OnToggleHdl)); booleanSetting.xControl->show(); } } @@ -98,6 +101,25 @@ } } + IMPL_LINK(SpecialSettingsPage, OnTriStateToggleHdl, weld::ToggleButton&, rToggle, void) + { + auto eOldState = m_aTriStates[&rToggle]; + switch (eOldState) + { + case TRISTATE_INDET: + rToggle.set_state(TRISTATE_FALSE); + break; + case TRISTATE_TRUE: + rToggle.set_state(TRISTATE_INDET); + break; + case TRISTATE_FALSE: + rToggle.set_state(TRISTATE_TRUE); + break; + } + m_aTriStates[&rToggle] = rToggle.get_state(); + OnToggleHdl(rToggle); + } + IMPL_LINK(SpecialSettingsPage, OnToggleHdl, weld::ToggleButton&, rBtn, void) { if (&rBtn == m_xAppendTableAlias.get() && m_xAsBeforeCorrelationName) @@ -188,14 +210,17 @@ return; } + m_aTriStates.clear(); + // the boolean items for (auto const& booleanSetting : m_aBooleanSettings) { if (!booleanSetting.xControl) continue; - ::boost::optional< bool > aValue(false); - aValue.reset(); + bool bTriState = false; + + boost::optional aValue; const SfxPoolItem* pItem = _rSet.GetItem(booleanSetting.nItemId); if (const SfxBoolItem *pBoolItem = dynamic_cast( pItem) ) @@ -205,6 +230,7 @@ else if (const OptionalBoolItem *pOptionalItem = dynamic_cast( pItem) ) { aValue = pOptionalItem->GetFullValue(); + bTriState = true; } else OSL_FAIL( "SpecialSettingsPage::implInitControls: unknown boolean item type!" ); @@ -220,6 +246,8 @@ bValue = !bValue; booleanSetting.xControl->set_active(bValue); } + if (bTriState) + m_aTriStates[booleanSetting.xControl.get()] = booleanSetting.xControl->get_state(); } // the non-boolean items diff -Nru libreoffice-6.2.2/dbaccess/source/ui/dlg/advancedsettings.hxx libreoffice-6.2.3/dbaccess/source/ui/dlg/advancedsettings.hxx --- libreoffice-6.2.2/dbaccess/source/ui/dlg/advancedsettings.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/dbaccess/source/ui/dlg/advancedsettings.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -62,6 +62,8 @@ std::unique_ptr m_xMaxRowScanLabel; std::unique_ptr m_xMaxRowScan; + std::map m_aTriStates; + BooleanSettingDescs m_aBooleanSettings; bool m_bHasBooleanComparisonMode; @@ -69,6 +71,7 @@ public: DECL_LINK(OnToggleHdl, weld::ToggleButton&, void); + DECL_LINK(OnTriStateToggleHdl, weld::ToggleButton&, void); virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; diff -Nru libreoffice-6.2.2/debian/changelog libreoffice-6.2.3/debian/changelog --- libreoffice-6.2.2/debian/changelog 2019-03-24 21:44:21.000000000 +0000 +++ libreoffice-6.2.3/debian/changelog 2019-05-06 18:02:06.000000000 +0000 @@ -1,3 +1,63 @@ +libreoffice (1:6.2.3-0ubuntu0.19.04.1~lo1) disco; urgency=medium + + * Copied from eoan + + -- Rico Tzschichholz Mon, 06 May 2019 20:02:06 +0200 + +libreoffice (1:6.2.3-0ubuntu1) eoan; urgency=medium + + * New upstream release + + -- Marcus Tomlinson Mon, 29 Apr 2019 09:56:28 +0100 + +libreoffice (1:6.2.3~rc2-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/rules: + - replace various $(findstring for arch checks by $(filter + + -- Rene Engelhard Tue, 16 Apr 2019 22:25:38 +0200 + +libreoffice (1:6.2.3~rc1-1) experimental; urgency=medium + + * New upstream release candidate + + * debian/patches/mention-java-common-package.diff: update message to + reflect current config dir... + * debian/patches/java.vendor-Debian.diff: make jvmfwk recognize "Debian" + as java.vendor as that's what is set in openjdk 11 >= 11.0.3+4-2 + - see #926009 (closes: #926318) + + * debian/rules: + - give up and disable running make check on mips + - bump libxmlsec1 build-dep to >= 1.2.27-3 if building with ICU 64 + - remove i386 special-casing for openjdk-8 and -9 from old "stack clash + fix broken on i386" days preventing removal openjdk-8 + (closes: #926281) + + -- Rene Engelhard Wed, 03 Apr 2019 17:15:13 +0200 + +libreoffice (1:6.2.2-0ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/java.vendor-Ubuntu.patch: update to also recognize + "Private Build" as java.vendor (for custom PPA builds) (LP: #1822839) + + -- Olivier Tilloy Thu, 04 Apr 2019 15:07:17 +0200 + +libreoffice (1:6.2.2-0ubuntu2) disco; urgency=medium + + [ Rene Engelhard ] + * debian/patches/java.vendor-Debian.diff: make jvmfwk recognize "Debian" + as java.vendor as that's what is set in openjdk 11 >= 11.0.3+4-2 + - see #926009 (closes: #926318) + + [ Olivier Tilloy ] + * debian/patches/java.vendor-Ubuntu.patch: also make jvmfwk recognize + "Ubuntu" as java.vendor (LP: #1822839) + + -- Olivier Tilloy Thu, 04 Apr 2019 11:23:38 +0200 + libreoffice (1:6.2.2-0ubuntu1) disco; urgency=medium * New upstream release @@ -10,12 +70,12 @@ libreoffice (1:6.2.2~rc2-1) experimental; urgency=medium - * New upstream release candidate + * New upstream release * debian/control.gtk3.in: - - make libreoffice-gtk3 recommend gstreamer1.0-gtk3 + - make libreoffice-gtk3 recommend gstreamer1.0-gtk3 (see LP: #1820062) - -- Rene Engelhard Tue, 19 Mar 2019 19:42:19 +0100 + -- Rene Engelhard Wed, 03 Apr 2019 13:19:34 +0200 libreoffice (1:6.2.2~rc1-1) experimental; urgency=medium diff -Nru libreoffice-6.2.2/debian/control libreoffice-6.2.3/debian/control --- libreoffice-6.2.2/debian/control 2019-03-24 21:44:21.000000000 +0000 +++ libreoffice-6.2.3/debian/control 2019-04-29 08:56:28.000000000 +0000 @@ -26,22 +26,22 @@ firebird-dev (>= 3.0.0.32483.ds4-4) [!hppa !mips64 !s390 !sparc], firebird3.0-server-core [!hppa !mips64 !s390 !sparc] , flex (>= 2.3.35), - fontconfig [!kfreebsd-amd64 !kfreebsd-i386] , + fontconfig [!kfreebsd-amd64 !kfreebsd-i386 !mips] , fontforge-nox | fontforge, - fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386] , - fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386] , - fonts-liberation2 [!kfreebsd-amd64 !kfreebsd-i386] , + fonts-crosextra-carlito [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + fonts-dejavu [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + fonts-liberation2 [!kfreebsd-amd64 !kfreebsd-i386 !mips] , g++ (>= 4:7) [m68k], gcc (>= 4:7) [m68k], - gdb [!kfreebsd-amd64 !kfreebsd-i386] , - ghostscript [!kfreebsd-amd64 !kfreebsd-i386] , + gdb [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + ghostscript [!kfreebsd-amd64 !kfreebsd-i386 !mips] , gobject-introspection (>= 1.32.0), gperf, gpg , gpg-agent , gpgconf , - hunspell-en-us [!kfreebsd-amd64 !kfreebsd-i386] , - imagemagick [!kfreebsd-amd64 !kfreebsd-i386] , + hunspell-en-us [!kfreebsd-amd64 !kfreebsd-i386 !mips] , + imagemagick [!kfreebsd-amd64 !kfreebsd-i386 !mips] , java-common (>= 0.61), javahelper (>= 0.37~), junit4 (>= 4.8.2-2) [amd64 arm64] , @@ -61,7 +61,7 @@ libclucene-dev (>= 2.3.3.4-4.1), libcmis-dev (>= 0.5.0-3), libcommons-logging-java [!hppa !mips64 !s390 !sparc], - libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386] , + libcppunit-dev (>= 1.14) [!kfreebsd-amd64 !kfreebsd-i386 !mips] , libcups2-dev, libcurl4-gnutls-dev, libdbus-1-dev (>= 0.60), @@ -149,11 +149,11 @@ libxslt1-dev, libxt-dev, libxtst-dev, - locales [!kfreebsd-amd64 !kfreebsd-i386] , + locales [!kfreebsd-amd64 !kfreebsd-i386 !mips] , lp-solve (>= 5.5.0.13-5+b1), maven-repo-helper, pkg-config, - pstoedit [!kfreebsd-amd64 !kfreebsd-i386] , + pstoedit [!kfreebsd-amd64 !kfreebsd-i386 !mips] , python3, python3-dev (>= 3.3) , python3-distutils , diff -Nru libreoffice-6.2.2/debian/patches/disable-some-sc-tests-with-internal-cppunit.diff libreoffice-6.2.3/debian/patches/disable-some-sc-tests-with-internal-cppunit.diff --- libreoffice-6.2.2/debian/patches/disable-some-sc-tests-with-internal-cppunit.diff 2019-01-31 08:55:08.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/disable-some-sc-tests-with-internal-cppunit.diff 2019-04-24 15:14:21.000000000 +0000 @@ -32,9 +32,9 @@ ifneq ($(DISABLE_GUI),TRUE) @@ -59,13 +54,25 @@ endif - $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_cond_format_merge \ CppunitTest_sc_new_cond_format_api \ + CppunitTest_sc_pdf_export \ - CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ CppunitTest_sc_html_export_test \ diff -Nru libreoffice-6.2.2/debian/patches/java.vendor-Debian.diff libreoffice-6.2.3/debian/patches/java.vendor-Debian.diff --- libreoffice-6.2.2/debian/patches/java.vendor-Debian.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/java.vendor-Debian.diff 2019-04-24 15:14:21.000000000 +0000 @@ -0,0 +1,39 @@ +diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +index b008bb1fc0f7..ea0ddc4e7c91 100644 +--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml ++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +@@ -25,6 +25,9 @@ + + 1.6.0 + ++ ++ 1.6.0 ++ + + 1.5.0 + +diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +index 5cb85ad39a1c..c6757c6fb5eb 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +@@ -42,6 +42,7 @@ BEGIN_VENDOR_MAP() + #endif + VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) ++ VENDOR_MAP_ENTRY("Debian", SunInfo) + VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo) + VENDOR_MAP_ENTRY("Amazon.com Inc.", SunInfo) + #ifndef MACOSX +diff --git a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +index 67ace100fb5f..46cdb32fd276 100644 +--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java ++++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +@@ -250,7 +250,7 @@ public class LocalOfficeWindow + if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW ) + { + String vendor = System.getProperty("java.vendor"); +- if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation")) ++ if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian")) + && Boolean.getBoolean("sun.awt.xembedserver")) + { + xembed = new NamedValue( diff -Nru libreoffice-6.2.2/debian/patches/java.vendor-Ubuntu.patch libreoffice-6.2.3/debian/patches/java.vendor-Ubuntu.patch --- libreoffice-6.2.2/debian/patches/java.vendor-Ubuntu.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/java.vendor-Ubuntu.patch 2019-04-24 17:40:35.000000000 +0000 @@ -0,0 +1,42 @@ +Description: Add "Ubuntu" and "Private Build" as recognized Java vendors +Author: Olivier Tilloy +Bug: https://bugs.documentfoundation.org/show_bug.cgi?id=124503 +Bug-Ubuntu: https://launchpad.net/bugs/1822839 + +--- a/bean/com/sun/star/comp/beans/LocalOfficeWindow.java ++++ b/bean/com/sun/star/comp/beans/LocalOfficeWindow.java +@@ -250,7 +250,7 @@ public class LocalOfficeWindow + if (getNativeWindowSystemType() == SystemDependent.SYSTEM_XWINDOW ) + { + String vendor = System.getProperty("java.vendor"); +- if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian")) ++ if ((vendor.equals("Sun Microsystems Inc.") || vendor.equals("Oracle Corporation") || vendor.equals("Debian") || vendor.equals("Ubuntu") || vendor.equals("Private Build")) + && Boolean.getBoolean("sun.awt.xembedserver")) + { + xembed = new NamedValue( +--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml ++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml +@@ -28,6 +28,12 @@ + + 1.6.0 + ++ ++ 1.6.0 ++ ++ ++ 1.6.0 ++ + + 1.5.0 + +--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx +@@ -43,6 +43,8 @@ BEGIN_VENDOR_MAP() + VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) + VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) + VENDOR_MAP_ENTRY("Debian", SunInfo) ++ VENDOR_MAP_ENTRY("Ubuntu", SunInfo) ++ VENDOR_MAP_ENTRY("Private Build", SunInfo) + VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo) + VENDOR_MAP_ENTRY("Amazon.com Inc.", SunInfo) + #ifndef MACOSX diff -Nru libreoffice-6.2.2/debian/patches/make-package-modules-not-suck.diff libreoffice-6.2.3/debian/patches/make-package-modules-not-suck.diff --- libreoffice-6.2.2/debian/patches/make-package-modules-not-suck.diff 2019-01-31 08:55:08.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/make-package-modules-not-suck.diff 2019-04-24 15:14:21.000000000 +0000 @@ -63,7 +63,7 @@ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ + $(if $(ENABLE_JAVA),jdbc) \ + $(if $(ENABLE_JAVA),mysql_jdbc) \ -+ $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ ++ $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ + odbc \ +)) + @@ -140,7 +140,7 @@ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ - $(if $(ENABLE_JAVA),mysql_jdbc) \ -- $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ +- $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ numbertext \ - odbc \ odfflatxml \ diff -Nru libreoffice-6.2.2/debian/patches/mention-java-common-package.diff libreoffice-6.2.3/debian/patches/mention-java-common-package.diff --- libreoffice-6.2.2/debian/patches/mention-java-common-package.diff 2019-01-31 08:32:30.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/mention-java-common-package.diff 2019-04-24 15:14:21.000000000 +0000 @@ -8,7 +8,7 @@ fprintf(stderr,"javaldx: Could not find a Java Runtime Environment!\n"); + fprintf(stderr,"Please ensure that a JVM and the package libreoffice-java-common\n"); + fprintf(stderr,"is installed.\n"); -+ fprintf(stderr,"If it is already installed then try removing ~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n"); ++ fprintf(stderr,"If it is already installed then try removing ~/.config/libreoffice/4/user/config/javasettings_Linux_*.xml\n"); return false; } else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE) diff -Nru libreoffice-6.2.2/debian/patches/series libreoffice-6.2.3/debian/patches/series --- libreoffice-6.2.2/debian/patches/series 2019-03-21 10:07:38.000000000 +0000 +++ libreoffice-6.2.3/debian/patches/series 2019-04-24 15:01:27.000000000 +0000 @@ -35,8 +35,10 @@ use-mariadb-java-instead-of-mysql-java.diff m68k-fix-parameter-type.patch emfio-HAVE_MORE_FONTS.diff +java.vendor-Debian.diff #lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff #integraltrans.diff +java.vendor-Ubuntu.patch hide-startcenter-desktop-file.patch mysql-80-compatibility.patch fix-uicheck-tests-on-i386.patch diff -Nru libreoffice-6.2.2/debian/rules libreoffice-6.2.3/debian/rules --- libreoffice-6.2.2/debian/rules 2019-03-24 21:43:28.000000000 +0000 +++ libreoffice-6.2.3/debian/rules 2019-04-25 07:48:54.000000000 +0000 @@ -63,16 +63,16 @@ TARFILE_LOCATION=$(CURDIR)/tarballs export TARFILE_LOCATION USE_SOURCE_TARBALLS=n -USE_GIT_TARBALLS=n +USE_GIT_TARBALLS=y ifeq "$(USE_GIT_TARBALLS)" "y" GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice # bootstraping this from the source tree is breaking get-orig-source #lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,') -lo_sources_ver=6.2.2.2 +lo_sources_ver=6.2.3.2 # NOT in proper libreoffice-3-6 branch # use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1 GIT_TAG=libreoffice-$(lo_sources_ver) -GIT_BRANCH=libreoffice-6-2-2 +GIT_BRANCH=libreoffice-6-2-3 endif ifeq "$(USE_SOURCE_TARBALLS)" "y" lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2) @@ -356,7 +356,7 @@ # kfreebsd runs into SIZE_MAX problems, and the rest might # get OOM (mips(el)...) so enable mergelibs only for 64bit # archs (exception: i386) -ifeq (,$(findstring kfreebsd,$(DEB_HOST_ARCH))) +ifeq (,$(filter kfreebsd,$(DEB_HOST_ARCH))) ifeq "$(DEB_HOST_ARCH_BITS)" "64" ENABLE_MERGELIBS=y else @@ -468,7 +468,7 @@ # let's do this only on archs where we have chromium, which is supposedly even only the archs # where alsp pdfium is supported. OOO_PDFIUM_ARCHS := i386 amd64 armhf arm64 -ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_PDFIUM_ARCHS))) ENABLE_PDFIUM=y else ENABLE_PDFIUM=n @@ -480,7 +480,7 @@ OOO_LE_ARCHS = $(filter-out $(OOO_BE_ARCHS),$(OOO_ARCHS)) $(eval $(call gen_no_archs,OOO_LE_ARCHS)) -OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64,$(OOO_ARCHS)) +OOO_CHECK_ARCHS := $(filter-out kfreebsd-i386 kfreebsd-amd64 mips,$(OOO_ARCHS)) $(eval $(call gen_no_archs,OOO_CHECK_ARCHS)) #OOO_JUNIT_ARCHS := i386 amd64 armhf arm64 OOO_JUNIT_ARCHS := amd64 arm64 @@ -488,17 +488,18 @@ #OOO_CHECK_FATAL_ARCHS := i386 amd64 armhf arm64 OOO_CHECK_FATAL_ARCHS := amd64 arm64 +RUN_MAKE_CHECK=n ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_CHECK_ARCHS))) + ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_CHECK_ARCHS))) RUN_MAKE_CHECK=y endif ifeq "$(ENABLE_JAVA)" "y" - ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JUNIT_ARCHS))) + ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_JUNIT_ARCHS))) ENABLE_JUNIT4=y endif endif IGNORE_MAKE_CHECK_FAILURES=- - ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_CHECK_FATAL_ARCHS))) + ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_CHECK_FATAL_ARCHS))) IGNORE_MAKE_CHECK_FAILURES:= endif endif @@ -521,8 +522,8 @@ OOO_FIREBIRD_ARCHS := $(OOO_BASE_ARCHS) $(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS)) -ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) - ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) + ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_BASE_ARCHS))) PACKAGE_BASE=n ENABLE_SDBC_POSTGRESQL=n ENABLE_EVO2=n @@ -536,10 +537,10 @@ endif endif -ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS))) DEBHELPER_OPTIONS += -Nlibreoffice-presentation-minimizer endif -ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) ENABLE_MEDIAWIKI=n ENABLE_REPORTBUILDER=n ENABLE_NLPSOLVER=n @@ -734,7 +735,11 @@ CONFIGURE_FLAGS += --without-system-libxml endif ifneq (,$(filter xmlsec, $(SYSTEM_STUFF))) + ifeq "$(shell dpkg --compare-versions `pkg-config --modversion icu-i18n` ge 64 && echo true)" "true" + BUILD_DEPS += , libxmlsec1-dev (>= 1.2.27-3) + else BUILD_DEPS += , libxmlsec1-dev (>= 1.2.24) + endif endif ifneq (,$(filter expat, $(SYSTEM_STUFF))) BUILD_DEPS += , libexpat1-dev @@ -765,10 +770,10 @@ endif endif -ifneq (,$(findstring i386,$(DEB_HOST_ARCH))) +ifneq (,$(filter i386,$(DEB_HOST_ARCH))) SMALL_SYMBOLS = n else - ifneq (,$(findstring amd64,$(DEB_HOST_ARCH))) + ifneq (,$(filter amd64,$(DEB_HOST_ARCH))) SMALL_SYMBOLS = n endif endif @@ -922,16 +927,16 @@ BUILD_DEPS += , java-common (>= 0.61) DEFAULT_JDK := $(call java_dependency, default-jdk) BUILD_DEPS += , $(shell echo $(DEFAULT_JDK) | sed -e 's/default-jdk/default-jdk (>= 1:1.6)/' | sed -e "s/\]/ !i386]/") - ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS))) + ifeq (i386,$(filter i386,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , default-jdk (>= 2:1.9) [i386] endif - ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS))) + ifneq (,$(filter ia64,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64] endif ifneq (,$(findstring kfreebsd,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , default-jdk (>= 2:1.7-52.1) [kfreebsd-any] endif - ifneq (,$(findstring sparc64,$(OOO_JAVA_ARCHS))) + ifneq (,$(filter sparc64,$(OOO_JAVA_ARCHS))) BUILD_DEPS += , default-jdk (>= 2:1.8-55) [sparc64] endif endif @@ -1855,10 +1860,10 @@ check: ifeq "$(RUN_MAKE_CHECK)" "y" -ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) patch -p1 < $(CURDIR)/debian/tests/patches/disable-db-tests.diff endif -ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) cd $(SOURCE_TREE)/smoketest && \ patch -p1 < $(CURDIR)/debian/tests/patches/smoketest-disable-extension-tests.diff endif @@ -1894,10 +1899,10 @@ if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \ $(MAKE) -k check || PARALLELISM=1 $(MAKE) check && \ rm -rf $$t -ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) +ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS))) patch -p1 -R < $(CURDIR)/debian/tests/patches/disable-db-tests.diff endif -ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) +ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS))) cd $(SOURCE_TREE)/smoketest && \ patch -p1 -R < $(CURDIR)/debian/tests/patches/smoketest-disable-extension-tests.diff endif @@ -3193,7 +3198,7 @@ binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep $(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts -ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS))) +ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS))) echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" echo "For uploads with binary-all packages, please use arches where Java is enabled" echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" diff -Nru libreoffice-6.2.2/download.lst libreoffice-6.2.3/download.lst --- libreoffice-6.2.2/download.lst 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/download.lst 2019-04-10 10:10:51.000000000 +0000 @@ -206,12 +206,12 @@ export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz export LIBPNG_SHA256SUM := 2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6 export LIBPNG_TARBALL := libpng-1.6.34.tar.xz -export POPPLER_SHA256SUM := e44b5543903128884ba4538c2a97d3bcc8889e97ffacc4636112101f0238db03 -export POPPLER_TARBALL := poppler-0.73.0.tar.xz +export POPPLER_SHA256SUM := 92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f +export POPPLER_TARBALL := poppler-0.74.0.tar.xz export POSTGRESQL_SHA256SUM := a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2 -export PYTHON_SHA256SUM := f55cde04f521f273c7cba08912921cc5642cfc15ca7b22d5829f0aff4371155f -export PYTHON_TARBALL := Python-3.5.6.tar.xz +export PYTHON_SHA256SUM := 285892899bf4d5737fd08482aa6171c6b2564a45b9102dfacfb72826aebdc7dc +export PYTHON_TARBALL := Python-3.5.7.tar.xz export QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c export QXP_TARBALL := libqxp-0.0.2.tar.xz export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed diff -Nru libreoffice-6.2.2/editeng/source/misc/svxacorr.cxx libreoffice-6.2.3/editeng/source/misc/svxacorr.cxx --- libreoffice-6.2.2/editeng/source/misc/svxacorr.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/editeng/source/misc/svxacorr.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -543,7 +543,8 @@ sal_Unicode cCh = rTxt[ nSttPos ]; if( '-' == cCh ) { - if( ' ' == rTxt[ nSttPos-1 ] && + if( 1 < nEndPos - nSttPos && + ' ' == rTxt[ nSttPos-1 ] && '-' == rTxt[ nSttPos+1 ]) { sal_Int32 n; diff -Nru libreoffice-6.2.2/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 libreoffice-6.2.3/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 --- libreoffice-6.2.2/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,27 @@ +From f4136a6353162db249f63ddb0f20611622ab61b4 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Wed, 27 Feb 2019 19:43:22 +0100 +Subject: [PATCH] ImageStream::getLine: fix crash on broken files + +Fixes #728 +--- + poppler/Stream.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/poppler/Stream.cc b/poppler/Stream.cc +index 33537b0e..a41435ab 100644 +--- a/poppler/Stream.cc ++++ b/poppler/Stream.cc +@@ -496,6 +496,9 @@ unsigned char *ImageStream::getLine() { + } + + int readChars = str->doGetChars(inputLineSize, inputLine); ++ if (unlikely(readChars == -1)) { ++ readChars = 0; ++ } + for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF; + if (nBits == 1) { + unsigned char *p = inputLine; +-- +2.20.1 + diff -Nru libreoffice-6.2.2/external/poppler/poppler-config.patch.1 libreoffice-6.2.3/external/poppler/poppler-config.patch.1 --- libreoffice-6.2.2/external/poppler/poppler-config.patch.1 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/external/poppler/poppler-config.patch.1 2019-04-10 10:10:51.000000000 +0000 @@ -195,7 +195,7 @@ +#define PACKAGE_NAME "poppler" + +/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "poppler 0.73.0" ++#define PACKAGE_STRING "poppler 0.74.0" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "poppler" @@ -204,7 +204,7 @@ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.73.0" ++#define PACKAGE_VERSION "0.74.0" + +/* Poppler data dir */ +#define POPPLER_DATADIR "/usr/local/share/poppler" @@ -228,7 +228,7 @@ +/* #undef USE_FLOAT */ + +/* Version number of package */ -+#define VERSION "0.73.0" ++#define VERSION "0.74.0" + +#if defined(__APPLE__) +#elif defined (_WIN32) @@ -304,7 +304,7 @@ + +/* Defines the poppler version. */ +#ifndef POPPLER_VERSION -+#define POPPLER_VERSION "0.73.0" ++#define POPPLER_VERSION "0.74.0" +#endif + +/* Enable multithreading support. */ @@ -466,9 +466,9 @@ + +#include "poppler-global.h" + -+#define POPPLER_VERSION "0.73.0" ++#define POPPLER_VERSION "0.74.0" +#define POPPLER_VERSION_MAJOR 0 -+#define POPPLER_VERSION_MINOR 73 ++#define POPPLER_VERSION_MINOR 74 +#define POPPLER_VERSION_MICRO 0 + +namespace poppler diff -Nru libreoffice-6.2.2/external/poppler/UnpackedTarball_poppler.mk libreoffice-6.2.3/external/poppler/UnpackedTarball_poppler.mk --- libreoffice-6.2.2/external/poppler/UnpackedTarball_poppler.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/external/poppler/UnpackedTarball_poppler.mk 2019-04-10 10:10:51.000000000 +0000 @@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,poppler,\ external/poppler/poppler-config.patch.1 \ external/poppler/poppler-c++11.patch.1 \ + external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 \ )) # std::make_unique is only available in C++14 diff -Nru libreoffice-6.2.2/external/python3/python-3.5.7-c99.patch.1 libreoffice-6.2.3/external/python3/python-3.5.7-c99.patch.1 --- libreoffice-6.2.2/external/python3/python-3.5.7-c99.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/external/python3/python-3.5.7-c99.patch.1 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,62 @@ +remove C99 which isn't suppored by all compilers yet + +--- python3/Modules/_pickle.c.orig 2019-04-03 16:34:01.380124314 +0200 ++++ python3/Modules/_pickle.c 2019-04-03 16:35:18.579005171 +0200 +@@ -674,9 +674,12 @@ + PyErr_NoMemory(); + return NULL; + } +- for (size_t i = 0; i < self->mt_allocated; i++) { ++ { ++ size_t i; ++ for (i = 0; i < self->mt_allocated; i++) { + Py_XINCREF(self->mt_table[i].me_key); + } ++ } + memcpy(new->mt_table, self->mt_table, + sizeof(PyMemoEntry) * self->mt_allocated); + +@@ -4204,7 +4207,9 @@ + return NULL; + + memo = self->pickler->memo; +- for (size_t i = 0; i < memo->mt_allocated; ++i) { ++ { ++ size_t i; ++ for (i = 0; i < memo->mt_allocated; ++i) { + PyMemoEntry entry = memo->mt_table[i]; + if (entry.me_key != NULL) { + int status; +@@ -4225,6 +4230,7 @@ + goto error; + } + } ++ } + return new_memo; + + error: +@@ -6791,10 +6797,13 @@ + if (new_memo == NULL) + return -1; + +- for (size_t i = 0; i < new_memo_size; i++) { ++ { ++ size_t i; ++ for (i = 0; i < new_memo_size; i++) { + Py_XINCREF(unpickler->memo[i]); + new_memo[i] = unpickler->memo[i]; + } ++ } + } + else if (PyDict_Check(obj)) { + Py_ssize_t i = 0; +@@ -6839,7 +6848,8 @@ + + error: + if (new_memo_size) { +- for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) { ++ size_t i; ++ for (i = new_memo_size - 1; i != SIZE_MAX; i--) { + Py_XDECREF(new_memo[i]); + } + PyMem_FREE(new_memo); diff -Nru libreoffice-6.2.2/external/python3/UnpackedTarball_python3.mk libreoffice-6.2.3/external/python3/UnpackedTarball_python3.mk --- libreoffice-6.2.2/external/python3/UnpackedTarball_python3.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/external/python3/UnpackedTarball_python3.mk 2019-04-10 10:10:51.000000000 +0000 @@ -27,6 +27,7 @@ external/python3/ubsan.patch.0 \ external/python3/python-3.5.tweak.strip.soabi.patch \ external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1 \ + external/python3/python-3.5.7-c99.patch.1 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff -Nru libreoffice-6.2.2/filter/source/svg/svgexport.cxx libreoffice-6.2.3/filter/source/svg/svgexport.cxx --- libreoffice-6.2.2/filter/source/svg/svgexport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/filter/source/svg/svgexport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include @@ -1813,13 +1814,18 @@ if( !aBookmark.isEmpty() ) { - mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xlink:href", aBookmark); - SvXMLElementExport alinkA( *mpSVGExport, XML_NAMESPACE_NONE, "a", true, true ); - mpSVGWriter->WriteMetaFile( aTopLeft, aSize, rMtf, - 0xffffffff, - pElementId, - &rxShape, - pEmbeddedBitmapsMtf ); + INetURLObject aINetURLObject(aBookmark); + if (!aINetURLObject.HasError() + && aINetURLObject.GetProtocol() != INetProtocol::Javascript) + { + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xlink:href", aBookmark); + SvXMLElementExport alinkA( *mpSVGExport, XML_NAMESPACE_NONE, "a", true, true ); + mpSVGWriter->WriteMetaFile( aTopLeft, aSize, rMtf, + 0xffffffff, + pElementId, + &rxShape, + pEmbeddedBitmapsMtf ); + } } else { diff -Nru libreoffice-6.2.2/fpicker/source/win32/asyncrequests.cxx libreoffice-6.2.3/fpicker/source/win32/asyncrequests.cxx --- libreoffice-6.2.2/fpicker/source/win32/asyncrequests.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/fpicker/source/win32/asyncrequests.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -80,6 +80,11 @@ // the already destructed SolarMutex, which would crash LO on exit. if (isRunning()) { + // tdf#123502: make sure we actually hold the mutex before releasing it + // UNO directly destroys the VistaFilePicker object, so we need GUI protection in there. + // But since we redirect GUI stuff to the async thread we also have to release it, so we + // can join it, if the thread currently blocks on the SolarMutex. + SolarMutexGuard aGuard; SolarMutexReleaser aReleaser; join(); } diff -Nru libreoffice-6.2.2/.gitreview libreoffice-6.2.3/.gitreview --- libreoffice-6.2.2/.gitreview 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/.gitreview 2019-04-10 10:10:51.000000000 +0000 @@ -3,5 +3,5 @@ port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-6-2-2 +defaultbranch=libreoffice-6-2-3 diff -Nru libreoffice-6.2.2/helpcontent2/AllLangPackage_html_media_lang.mk libreoffice-6.2.3/helpcontent2/AllLangPackage_html_media_lang.mk --- libreoffice-6.2.2/helpcontent2/AllLangPackage_html_media_lang.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/AllLangPackage_html_media_lang.mk 2019-04-10 10:10:51.000000000 +0000 @@ -241,7 +241,6 @@ screenshots/modules/smath/ui/fonttypedialog/$(lang)/FontsDialog.png \ screenshots/modules/smath/ui/savedefaultsdialog/$(lang)/SaveDefaultsDialog.png \ screenshots/modules/smath/ui/spacingdialog/$(lang)/SpacingDialog.png \ - screenshots/modules/smath/ui/symdefinedialog/$(lang)/EditSymbols.png \ screenshots/svx/ui/compressgraphicdialog/$(lang)/CompressGraphicDialog.png \ ))) #TODO: Find a clever way to pick en-US files (default) when localized files are missing diff -Nru libreoffice-6.2.2/helpcontent2/help3xsl/default.css libreoffice-6.2.3/helpcontent2/help3xsl/default.css --- libreoffice-6.2.2/helpcontent2/help3xsl/default.css 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/help3xsl/default.css 2019-04-10 10:10:51.000000000 +0000 @@ -39,14 +39,15 @@ h6, .listitem, .listitemintable, -.tablecontent, -.input { +.tablecontent { font-family: -apple-system, system-ui, "Segoe UI", Roboto, Ubuntu, Cantarell, "Noto Sans", "DejaVu Sans", "Lucida Grande", "Helvetica Neue", Helvetica, Arial, sans-serif, FreeSerif, NanumGothic, "Noto Sans Tibetan", Taprom; } .input { + background-color: rgba(0,0,0,0.04); transition-property: background-color; transition-duration: 150ms; border-bottom: 1px dashed rgba(0,0,0,0.1); + font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; } [data-tooltip]{ position:relative; @@ -85,7 +86,7 @@ pointer-events: auto; } body { - background-color: #F4F7F7; + background-color: #F7F8F7; margin: 0; line-height: normal; } @@ -94,11 +95,11 @@ } a { text-decoration: none; - color: #0369AE; + color: #0379BC; } a:hover { text-decoration: underline; - color: #1C99E0; + color: #0499EE; } pre, .code, @@ -115,6 +116,11 @@ padding: 1px 3px; font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; } +.smathcode { + border-radius: 2px; + padding: 1px 3px; + font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; +} .acronym { font-weight: bold; } @@ -124,10 +130,23 @@ border-top: 1px solid black; } .emph, -.menuitem, -.keycode { +.menuitem { font-weight: bold; } +.keycode { + /*font-weight: bold;*/ + font-family: Menlo, Consolas, "DejaVu Sans Mono", "Nimbus Mono L", "Lucida Sans Typewriter", "Courier New", Courier, Monaco, monospace; +} +.widget{ + padding: 1px 10px; + background: #f0f0f0; + background: linear-gradient(to bottom,#f0f0f0,#fcfcfc); + border-radius: 3px; + color: #303030; + border: 1px solid #a0a0a0; + border-bottom-width: 2px; + white-space: nowrap; +} /* div's for warning, tip and note */ .note, .tip, @@ -140,25 +159,18 @@ margin-top: 15px; } .note { - border-left: 4px solid #FFDE09; - background-color: #FFF4D0; + border-left: 4px solid #61897C; + background-color: #D9E7E2; } .tip { - border-left: 4px solid #38618C; - background-color: #DAE2EA; + border-left: 4px solid #4866AD; + background-color: #CDD5E8; } .warning { - border-left: 4px solid #FF5964; - background-color: #FFE0E2; -} -.noteicon { - padding:0.3em; - transition: transform .2s; /* Animation */ + border-left: 4px solid #D5B177; + background-color: #F9EEDC; } -.noteicon:hover { - transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} -.notetext { +.noteicon, .notetext { padding:0.3em; } @@ -177,17 +189,13 @@ .iconcell { padding:0.3em; } -.imageicon { - transition: transform .2s; /* Animation */ -} -.imageicon:hover{ - transform: scale(2.0); /* (200% zoom - Note: if the zoom is too large, it will go outside of the viewport) */ -} table { - box-shadow: rgba(0,0,0,0.1) 0px 1px 3px 0px; + background: #FEFEFE; + box-shadow: rgba(0,0,0,0.08) 0 1px 5px 0; border-collapse: collapse; - background: #fefefe; + margin-left: auto; + margin-right: auto; } table, th, td { border-top: 0; @@ -220,13 +228,13 @@ ol, td { font-size: 1.17rem; - margin: 2px 2px 2px 2px; + margin: 2px 0 2px 0; } h1 { font-size: 1.83rem; font-weight: 300; border-bottom: 2px solid #148603; - padding-bottom: 6px; + margin-bottom: 1.67rem; } h1 a { text-decoration: none; @@ -242,20 +250,12 @@ h6 { font-size: 1.17rem; } -.avis { - /* background-color: #EEEEEE;*/ -} .relatedtopics { font-weight: normal; } -.relatedbody { - margin-top: 2px; - margin-bottom: 2px; - margin-left: 5px; -} .howtoget { - background: #CCF4C6; - border-left: 4px solid #148603; + background: #EBE7E9; + border-left: 4px solid #4E4B55; border-radius: 0 4px 4px 0; box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); padding: 0.3em; @@ -268,9 +268,10 @@ box-shadow: 0 2px 2px -2px rgba(0,0,0,0.2); display: inline-block; font-weight: bold; - padding: 0.3em; + padding: 0.1em 0.3em; } .howtogetbody { + padding: 0 0.3em; } .samplefilesection{ } @@ -292,46 +293,12 @@ color: red; text-align: left; } -.donation { - padding: 0 0 10px 0; - margin-bottom: 1em; - border-bottom: 1px dashed rgba(0,0,0,0.1); -} -.donation p{ - font-size:1.2rem; -} + .bascode { - background-color: #fafafa; - margin-left: 30px; - margin-right: 30px; -} -.bascodepar { - font-family: monospace; + margin-top:15px; + margin-bottom: 15px; } -/* Basic code syntax highlight */ - -.identifier, -.unknown { - color: green; -} -.keyword { - color: blue; -} -.comment { - color: gray; -} -.number, -.string { - color: red; -} -.operator, -.parameter { - color: black; -} -.hotlink { - color: blue; -} .infopage { color: green; font-size: 1.33rem; @@ -346,7 +313,7 @@ #DisplayArea { background-color: #FCFCFC; overflow: auto; - padding: 10px; + padding: 10px 10px 40px 10px; grid-area: main; } #DisplayArea > p { @@ -377,9 +344,12 @@ .embedded {} .header-extrawurst { grid-area: header; -} -header { + position: sticky; + top: 0px; background-color: #18A303; + z-index: 1000; +} +header { color: #fff; height: 64px; padding: 8px 8px 8px 16px; @@ -414,7 +384,6 @@ overflow-y: hidden; /* make it smooth on iOS */ -webkit-overflow-scrolling: touch; - text-align: center; } .lang nav a, .modules nav a { color: #fff; @@ -429,9 +398,9 @@ white-space: nowrap; } footer { - border-top: 2px solid #148603; - padding: 15px 10px 0 10px; - margin: 40px 0; + padding: 40px 10px 40px 10px; + background-color: #FCFCFC; + box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); } footer p { font-size: 0.98rem; @@ -480,7 +449,6 @@ } .index a { font-size: 16px; - margin-bottom: 5px; } #Bookmarks { padding: 0 20px; @@ -553,12 +521,13 @@ font-weight: bold; color: #148603; } -.pagination { - padding: 0; +.pagination-container { + text-align: center; + margin-left: -40px; /* The normalizer fails to account for this */ } .pagination li { display: inline-block; - padding: 4px; + padding: 0 5px; } .pagination a { text-decoration: none; @@ -570,34 +539,78 @@ display: none; } li.active { - background-color: #0369A3; + background-color: #0379BC; } li.active a { color: #fff; } li.disabled a { - color: #90C0E6; + opacity: 0.4; + pointer-events: none; } #search-bar { + border: 1px solid #CCC; + box-shadow: inset 0 1px 1px rgba(0,0,0,0.1); + box-sizing: border-box; + line-height: 1.5em; margin-top: 10px; + outline: none; + padding: 0 .25em; + transition: all 0.30s ease-in-out; width: 100%; - caret-color: #148603; +} +#search-bar:focus { + border: 1px solid #0EA5FB; } #search-bar::placeholder { font-style: italic; } +.google-donation { + border-top: 2px solid #148603; + background-color: #FCFCFC; + box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); +} +.donation { + background: #0379BC; + background-image: linear-gradient(to bottom, #3498db, #2980b9); + border-radius: 8px; + padding: 5px 10px 5px 10px; + margin: 20px auto 0 auto; + max-width: 200px; + color: #ffffff; + text-decoration: none; +} +.donation a { + color: white; +} +.donation a:hover { + color: white; + text-decoration: none; +} +.donation:hover{ + background: #0379BC; + background-image: linear-gradient(to bottom, #3cb0fd, #3498db); +} +.donation p { + font-size:1.2rem; + text-align: center; +} .google-search { max-width: 300px; - margin: 0 auto; + margin: 40px auto 0 auto; } .modules { border-bottom: 2px solid #f3f3f3; + background-color: #233336; } .modules label:after, .lang label:after { font-size: 30px; color: #fff; content:"⌄"; } +.lang { + background-color: #233336; +} .lang label, .modules label { display: none; } @@ -660,9 +673,12 @@ } .contents-treeview a, .index a { text-decoration: none; + line-height: 1.4; } .contents-treeview a:hover, .index a:hover { - text-decoration: underline; + border-left: 2px solid rgba(0,0,0,0.05); + margin-left: -12px; + padding-left: 10px; } .contents-treeview input + label + ul { margin: 0 0 0 22px; @@ -685,8 +701,7 @@ .contents-treeview label, .contents-treeview a, .contents-treeview label::before { - height: 16px; - line-height: 16px; + display: block; vertical-align: middle; } .contents-treeview label:before { @@ -700,12 +715,11 @@ content: "⊟"; } .contents-current { - background-color: #0369A3; - color: #FFF; - padding-right: 1px; -} -.contents-current:hover { - color: #FFF; + background: rgba(0,0,0,0.05); + border-left: 2px solid #0379BC; + font-weight: 600; + margin-left: -12px; + padding-left: 10px; } /* webkit adjacent element selector bugfix */ @@ -764,7 +778,6 @@ font-size: 19px; } aside { - background-color: #F4F7F7; float: left; width: 320px; } @@ -774,16 +787,24 @@ .rightside { grid-area: rightside; } - .google-search { - margin: 0; - position: absolute; - top: 19px; - left: 860px; + .google-donation { + grid-area: google; + position: sticky; + top: 0px; + background-color: #FCFCFC; + box-shadow: none; + } + .donation { + max-width: 400px; + } + footer { + grid-area: footer; } .lang { position: absolute; top: 0; left: 200px; + background-color: transparent; } .modules { width: 120px; @@ -791,12 +812,11 @@ top: 0; left: 80px; border: none; + background-color: transparent; } #DisplayArea { - background-color: #FCFCFC; box-shadow: 0 2px 8px 0 rgba(0,0,0,.05); - padding: 10px 50px; - width: 800px; + padding: 10px 50px 40px 50px; } } @media screen and (min-width: 1440px) { @@ -817,24 +837,43 @@ content: ""; } } +/* Use @supports to sneak these rules past IE */ @supports (grid-area: auto) { @media screen and (min-width: 960px) { + .google-donation { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #18A303; + border-top: none; + } + .google-search { + margin: 0; + } + .donation { + margin: 0 auto; + } + footer { + border-top: 2px solid #148603; + } body { display: grid; - grid-template-columns: 320px 1fr; - grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr; - grid-template-areas: "header header" - "rightside main" - "leftside main" + grid-template-columns: 320px 80px 1fr; + grid-template-rows: minmax(1em, auto) minmax(1em, auto) 1fr minmax(1em, auto); + grid-template-areas: "header header google" + "rightside main main" + "leftside main main" + ". footer footer" } } @media screen and (min-width: 1440px) { body { display: grid; - grid-template-columns: 320px 900px 1fr; - grid-template-rows: 1fr minmax(1em, auto); - grid-template-areas: "header header header" - "leftside main rightside" + grid-template-columns: 320px 450px 450px 1fr; + grid-template-rows: 1fr minmax(1em, auto) minmax(1em, auto); + grid-template-areas: "header header google google" + "leftside main main rightside" + ". footer footer ." } .rightside { width: auto; diff -Nru libreoffice-6.2.2/helpcontent2/help3xsl/help2.js libreoffice-6.2.3/helpcontent2/help3xsl/help2.js --- libreoffice-6.2.2/helpcontent2/help3xsl/help2.js 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/help3xsl/help2.js 2019-04-10 10:10:51.000000000 +0000 @@ -65,6 +65,20 @@ } } } +// Find spans that need the switch treatment and give it to them +var spans = document.querySelectorAll("[class^=switch]"); +var n = spans.length; +for (z = 0; z < n; z++) { + var id = spans[z].getAttribute("id"); + if (id === null) { + continue; + } + else if (id.startsWith("swlnsys")) { + setSystemSpan(id); + } else { + setApplSpan(id); + } +} /* add &DbPAR= and &System= to the links in DisplayArea div */ /* skip for object files */ function fixURL(module, system) { @@ -75,7 +89,7 @@ for (var i = 0; i < n; i++) { if (itemlink[i].getAttribute("class") != "objectfiles"){ setURLParam(itemlink[i], pSystem, pAppl); - }; + } } } //Set the params inside URL @@ -159,11 +173,49 @@ var langNav = document.getElementById('langs-nav'); if (!langNav.classList.contains('loaded')) { var html = ''; - languagesSet.forEach(lang => { + languagesSet.forEach(function(lang) { html += '' + ((lang in languageNames)? languageNames[lang]: lang) + ''; }); langNav.innerHTML = html; langNav.classList.add('loaded'); } } + +// Test, if we are online +if (document.body.getElementsByTagName('meta')) { + var _paq = _paq || []; + /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ + _paq.push(['disableCookies']); + _paq.push(['trackPageView']); + _paq.push(['enableLinkTracking']); + (function() { + var u="//piwik.documentfoundation.org/"; + _paq.push(['setTrackerUrl', u+'piwik.php']); + _paq.push(['setSiteId', '68']); + var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; + g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); + })(); + var system = getParameterByName("System"); +} else { + var system = getSystem(); +} + +var module = getParameterByName("DbPAR"); +var helpID = getParameterByName("HID"); +fixURL(module,system); +var dbg = getParameterByName("Debug"); +if (dbg == null) { dbg=0; } +document.getElementById("DEBUG").style.display = (dbg == 0) ? "none":"block"; +document.getElementById("bm_module").innerHTML ="Module is: "+module; +document.getElementById("bm_system").innerHTML ="System is: "+system; +document.getElementById("bm_HID").innerHTML ="HID is: "+helpID; + +// Mobile devices need the modules and langs on page load +if (Math.max(document.documentElement.clientWidth, window.innerWidth || 0) < 960) { + var e = new Event('change'); + var modules = document.getElementById('modules'); + var langs = document.getElementById('langs'); + modules.dispatchEvent(e); + langs.dispatchEvent(e); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff -Nru libreoffice-6.2.2/helpcontent2/help3xsl/online_transform.xsl libreoffice-6.2.3/helpcontent2/help3xsl/online_transform.xsl --- libreoffice-6.2.2/helpcontent2/help3xsl/online_transform.xsl 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/help3xsl/online_transform.xsl 2019-04-10 10:10:51.000000000 +0000 @@ -68,11 +68,6 @@ - - - - - @@ -99,9 +94,10 @@ - - - + + + + @@ -149,18 +145,24 @@ <xsl:value-of select="$titleL10N"/> - - - - - - - - + + + + + - <gcse:search></gcse:search> - - - -
-

- -

-
-

Impressum (Legal Info) | Privacy Policy | Statutes (non-binding English translation) - Satzung (binding German version) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Mozilla Public License v2.0. “LibreOffice” and “The Document Foundation” are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy. LibreOffice was based on OpenOffice.org.

- -
-

Help content debug info:

-

This page is:

-

Title is:

-

-

-

+
+
+ +
+ + <gcse:search></gcse:search> +
+
+

+ +

- +
- - - - - - - - - - - + @@ -476,35 +423,35 @@ - - -
    - - - - -
- - -
- - + + +
    + + + + +
+ + +
+ + - - -
    - - - - -
- - -
- - + + +
    + + + + +
+ + +
+ + @@ -522,12 +469,12 @@ - + - + @@ -541,7 +488,7 @@ - + @@ -551,8 +498,12 @@ - - + + + + + +

@@ -582,7 +533,7 @@ - + @@ -592,6 +543,17 @@ + + + + + +

+ + + + + @@ -654,94 +616,82 @@ - - - - - - - - + + + + - - - + + + + + - - - + + + +

Unsupported switch condition.

+ + - - - - + + + + - - - - - - - - - - - + + + + + + + + + +

Unsupported switch condition.

+ + - - - - + + + + - - - + + + + + - - - - - - - + + + +

Unsupported switch condition.

+ + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +

Unsupported switch condition.

+ + @@ -800,6 +750,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
{local-name()}
+

+
+
+ + + + + + + + + +
+
{local-name()}
+

+
+
+ + @@ -866,7 +875,6 @@ - @@ -883,15 +891,17 @@ -
+
-
+
- - -

+ +
+ + +
@@ -964,7 +974,7 @@
-
{$alt}
+
{$alt}


@@ -996,10 +1006,10 @@ - + - + @@ -1125,11 +1135,7 @@ - {$alt} - - - - + {$alt} diff -Nru libreoffice-6.2.2/helpcontent2/Package_html_media.mk libreoffice-6.2.3/helpcontent2/Package_html_media.mk --- libreoffice-6.2.2/helpcontent2/Package_html_media.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/Package_html_media.mk 2019-04-10 10:10:51.000000000 +0000 @@ -325,7 +325,6 @@ screenshots/modules/smath/ui/fonttypedialog/FontsDialog.png \ screenshots/modules/smath/ui/savedefaultsdialog/SaveDefaultsDialog.png \ screenshots/modules/smath/ui/spacingdialog/SpacingDialog.png \ - screenshots/modules/smath/ui/symdefinedialog/EditSymbols.png \ screenshots/modules/swriter/ui/watermarkdialog/WatermarkDialog.png \ screenshots/svx/ui/compressgraphicdialog/CompressGraphicDialog.png \ )) Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/af/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/af/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/am/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/am/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ar/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ar/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/as/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/as/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ast/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ast/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/be/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/be/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bg/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bg/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bn-IN/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bn-IN/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bo/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bo/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/br/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/br/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/brx/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/brx/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bs/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/bs/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ca/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ca/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ca-valencia/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ca-valencia/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/cs/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/cs/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/cy/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/cy/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/da/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/da/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/de/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/de/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/dgo/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/dgo/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/dz/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/dz/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/el/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/el/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/en-GB/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/en-GB/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/en-ZA/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/en-ZA/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/eo/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/eo/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/es/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/es/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/et/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/et/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/eu/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/eu/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fa/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fa/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fi/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fi/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/fr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ga/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ga/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gd/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gd/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gl/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gl/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gu/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gu/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gug/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/gug/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/he/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/he/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hi/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hi/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hsb/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hsb/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hu/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/hu/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/id/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/id/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/is/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/is/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/it/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/it/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ja/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ja/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ka/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ka/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kk/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kk/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/km/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/km/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kmr-Latn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kmr-Latn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ko/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ko/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kok/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/kok/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ks/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ks/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lb/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lb/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lo/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lo/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lt/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lt/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lv/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/lv/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mai/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mai/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mk/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mk/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ml/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ml/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mni/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mni/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/mr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/my/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/my/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nb/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nb/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ne/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ne/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nl/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nl/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nso/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/nso/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/oc/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/oc/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/om/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/om/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/or/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/or/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pa-IN/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pa-IN/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pl/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pl/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pt/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pt/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pt-BR/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/pt-BR/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/qtz/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/qtz/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ro/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ro/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ru/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ru/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/rw/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/rw/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sa-IN/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sa-IN/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sat/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sat/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sd/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sd/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/si/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/si/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sid/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sid/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sk/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sk/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sl/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sl/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sq/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sq/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sr-Latn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sr-Latn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ss/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ss/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/st/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/st/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sv/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sv/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sw-TZ/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/sw-TZ/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ta/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ta/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/te/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/te/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tg/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tg/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/th/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/th/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tn/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tn/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tr/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tr/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ts/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ts/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tt/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/tt/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ug/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ug/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/uk/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/uk/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/uz/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/uz/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ve/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/ve/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/vec/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/vec/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/vi/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/vi/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/xh/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/xh/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zh-CN/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zh-CN/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zh-TW/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zh-TW/EditSymbols.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zu/EditSymbols.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/helpcontent2/source/media/screenshots/modules/smath/ui/symdefinedialog/zu/EditSymbols.png differ diff -Nru libreoffice-6.2.2/helpcontent2/source/text/smath/01/06010100.xhp libreoffice-6.2.3/helpcontent2/source/text/smath/01/06010100.xhp --- libreoffice-6.2.2/helpcontent2/source/text/smath/01/06010100.xhp 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/source/text/smath/01/06010100.xhp 2019-04-10 10:10:51.000000000 +0000 @@ -40,7 +40,6 @@
- Old Symbol Select the name of the current symbol. The symbol, the name of the symbol, and the set that the symbol belongs to are displayed in the left preview pane at the bottom of the dialog box. diff -Nru libreoffice-6.2.2/helpcontent2/source/text/smath/06/screenshots.xhp libreoffice-6.2.3/helpcontent2/source/text/smath/06/screenshots.xhp --- libreoffice-6.2.2/helpcontent2/source/text/smath/06/screenshots.xhp 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/helpcontent2/source/text/smath/06/screenshots.xhp 2019-04-10 10:10:51.000000000 +0000 @@ -46,10 +46,5 @@ Spacing Dialog -
- - Edit Symbols - -
diff -Nru libreoffice-6.2.2/i18npool/source/calendar/calendar_gregorian.cxx libreoffice-6.2.3/i18npool/source/calendar/calendar_gregorian.cxx --- libreoffice-6.2.2/i18npool/source/calendar/calendar_gregorian.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/i18npool/source/calendar/calendar_gregorian.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -209,7 +209,7 @@ {1912, 7, 30, 0}, // Taisho {1926, 12, 25, 0}, // Showa {1989, 1, 8, 0}, // Heisei - {2019, 5, 1, 0}, //(Naruhito) (TODO: real era name not known yet (2018-07-26)) + {2019, 5, 1, 0}, // Reiwa {0, 0, 0, 0} }; Calendar_gengou::Calendar_gengou() : Calendar_gregorian(gengou_eraArray) diff -Nru libreoffice-6.2.2/i18npool/source/localedata/data/ja_JP.xml libreoffice-6.2.3/i18npool/source/localedata/data/ja_JP.xml --- libreoffice-6.2.2/i18npool/source/localedata/data/ja_JP.xml 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/i18npool/source/localedata/data/ja_JP.xml 2019-04-10 10:10:51.000000000 +0000 @@ -481,11 +481,9 @@ 平成 - - Naruhito - Na - Naruhito + Reiwa + 令 + 令和 diff -Nru libreoffice-6.2.2/i18npool/source/localedata/data/kmr_Latn_TR.xml libreoffice-6.2.3/i18npool/source/localedata/data/kmr_Latn_TR.xml --- libreoffice-6.2.2/i18npool/source/localedata/data/kmr_Latn_TR.xml 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/i18npool/source/localedata/data/kmr_Latn_TR.xml 2019-04-10 10:10:51.000000000 +0000 @@ -52,7 +52,7 @@ PN US - + M/D General @@ -335,14 +335,21 @@ - + + TRY + ₺ + TRY + Türk Lirası + 2 + + TRY YTL TRY Yeni Türk Lirası 2 - + TRL TL TRL Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_actionmode.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_actionmode.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_autopilotmenu.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_autopilotmenu.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_basicshapes.block-arc.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_basicshapes.block-arc.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_bezieredge.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_bezieredge.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_break.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_break.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_changecasetolower.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_changecasetolower.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_changecasetoupper.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_changecasetoupper.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_charmapcontrol.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_charmapcontrol.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_connectorcircles.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_connectorcircles.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_connectorcurvecircles.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_connectorcurvecircles.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_connect.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_connect.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_deletecomment.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_deletecomment.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_dsbrowserexplorer.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_dsbrowserexplorer.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_editannotation.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_editannotation.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_footnotedialog.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_footnotedialog.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_insertcolumnsbefore.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_insertcolumnsbefore.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_insertrowsbefore.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_insertrowsbefore.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_insobjctrl.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_insobjctrl.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_menubar.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_menubar.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_movepagedown.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_movepagedown.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_movepageup.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_movepageup.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_numberformatdate.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_numberformatdate.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_replycomment.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_replycomment.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_runmacro.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_runmacro.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_setborderstyle.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_setborderstyle.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_showallnotes.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_showallnotes.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_sidebar.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_sidebar.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_textattributes.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_textattributes.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_toolsmacroedit.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_toolsmacroedit.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/lc_wordcountdialog.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/lc_wordcountdialog.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_about.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_about.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_actionmode.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_actionmode.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_autopilotmenu.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_autopilotmenu.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_basicshapes.block-arc.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_basicshapes.block-arc.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_bezieredge.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_bezieredge.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_break.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_break.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_charmapcontrol.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_charmapcontrol.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_connect.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_connect.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_deletecomment.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_deletecomment.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_dsbrowserexplorer.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_dsbrowserexplorer.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_insertcolumnsbefore.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_insertcolumnsbefore.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_insertexternaldatasource.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_insertexternaldatasource.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_insertrowsbefore.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_insertrowsbefore.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_insobjctrl.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_insobjctrl.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_movepagedown.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_movepagedown.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_movepageup.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_movepageup.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_numberformatdate.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_numberformatdate.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_outputqualitygrayscale.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_outputqualitygrayscale.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_pasteonlyformula.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_pasteonlyformula.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_pasteonlytext.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_pasteonlytext.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_pasteonlyvalue.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_pasteonlyvalue.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_pastespecial.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_pastespecial.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_pasteunformatted.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_pasteunformatted.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_presentation.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_presentation.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_runmacro.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_runmacro.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_sendfeedback.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_sendfeedback.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_setborderstyle.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_setborderstyle.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_showallnotes.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_showallnotes.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_shownote.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_shownote.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_textattributes.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_textattributes.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_toolsmacroedit.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_toolsmacroedit.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_viewrowcolumnheaders.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_viewrowcolumnheaders.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/cmd/sc_wordcountdialog.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/cmd/sc_wordcountdialog.png differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/icon-themes/breeze_dark/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/icon-themes/breeze_dark/sw/res/sidebar/pageproppanel/format_L_copy_24x24.png differ diff -Nru libreoffice-6.2.2/include/oox/drawingml/drawingmltypes.hxx libreoffice-6.2.3/include/oox/drawingml/drawingmltypes.hxx --- libreoffice-6.2.2/include/oox/drawingml/drawingmltypes.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/include/oox/drawingml/drawingmltypes.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -190,6 +190,13 @@ return static_cast(nValue) / EMU_PER_PT; } +/** Converts the passed double value from points to mm. */ +inline double convertPointToMms(double fValue) +{ + constexpr double fFactor = static_cast(EMU_PER_PT) / (EMU_PER_HMM * 100); + return fValue * fFactor; +} + /** A structure for a point with 64-bit integer components. */ struct EmuPoint { diff -Nru libreoffice-6.2.2/include/oox/drawingml/shape.hxx libreoffice-6.2.3/include/oox/drawingml/shape.hxx --- libreoffice-6.2.2/include/oox/drawingml/shape.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/include/oox/drawingml/shape.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -218,6 +218,13 @@ sal_Int32 getDataNodeType() const { return mnDataNodeType; } + void setAspectRatio(double fAspectRatio) { mfAspectRatio = fAspectRatio; } + + double getAspectRatio() const { return mfAspectRatio; } + + /// Changes reference semantics to value semantics for fill properties. + void cloneFillProperties(); + protected: css::uno::Reference< css::drawing::XShape > const & @@ -340,6 +347,9 @@ /// Type of data node for an in-diagram shape. sal_Int32 mnDataNodeType = 0; + + /// Aspect ratio for an in-diagram shape. + double mfAspectRatio = 0; }; } } diff -Nru libreoffice-6.2.2/include/sfx2/DocumentMetadataAccess.hxx libreoffice-6.2.3/include/sfx2/DocumentMetadataAccess.hxx --- libreoffice-6.2.2/include/sfx2/DocumentMetadataAccess.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/include/sfx2/DocumentMetadataAccess.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -44,6 +44,9 @@ namespace com { namespace sun { namespace star { namespace embed { class XStorage; } } } } +namespace com { namespace sun { namespace star { namespace frame { + class XModel; +} } } } class SfxObjectShell; namespace sfx2 { @@ -52,7 +55,7 @@ /** create a base URI for loading metadata from an ODF (sub)document. @param i_xContext component context - @param i_xStorage storage for the document; FileSystemStorage is allowed + @param i_xModel model of the document (required if no URI is provided) @param i_rPkgURI the URI for the package @param i_rSubDocument (optional) path of the subdocument in package @@ -60,8 +63,8 @@ */ css::uno::Reference< css::rdf::XURI> SFX2_DLLPUBLIC createBaseURI( - css::uno::Reference< css::uno::XComponentContext> const & i_xContext, - css::uno::Reference< css::embed::XStorage> const & i_xStorage, + css::uno::Reference const & i_xContext, + css::uno::Reference const & i_xModel, OUString const & i_rPkgURI, OUString const & i_rSubDocument = OUString()); diff -Nru libreoffice-6.2.2/include/svl/sigstruct.hxx libreoffice-6.2.3/include/svl/sigstruct.hxx --- libreoffice-6.2.2/include/svl/sigstruct.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/include/svl/sigstruct.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -48,6 +48,8 @@ // For ODF: XAdES digests (SHA256) or the old SHA1, from css::xml::crypto::DigestID sal_Int32 nDigestID; OUString ouDigestValue; + /// Type of the reference: an URI (newer idSignedProperties references) or empty. + OUString ouType; SignatureReferenceInformation() : nType(SignatureReferenceType::SAMEDOCUMENT), @@ -57,12 +59,13 @@ { } - SignatureReferenceInformation( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri ) : + SignatureReferenceInformation( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri, const OUString& rType ) : SignatureReferenceInformation() { nType = type; nDigestID = digestID; ouURI = uri; + ouType = rType; } }; diff -Nru libreoffice-6.2.2/include/svx/frmdirlbox.hxx libreoffice-6.2.3/include/svx/frmdirlbox.hxx --- libreoffice-6.2.2/include/svx/frmdirlbox.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/include/svx/frmdirlbox.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -45,7 +45,12 @@ bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); } SvxFrameDirection get_active_id() const { return static_cast(m_xControl->get_active_id().toUInt32()); } void set_active_id(SvxFrameDirection eDir) { m_xControl->set_active_id(OUString::number(static_cast(eDir))); } - void remove_id(SvxFrameDirection eDir) { m_xControl->remove_id(OUString::number(static_cast(eDir))); } + void remove_id(SvxFrameDirection eDir) + { + int nPos = m_xControl->find_id(OUString::number(static_cast(eDir))); + if (nPos != -1) + m_xControl->remove(nPos); + } void set_active(int pos) { m_xControl->set_active(pos); } int get_active() const { return m_xControl->get_active(); } void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); } diff -Nru libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml --- libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 2019-04-10 10:10:51.000000000 +0000 @@ -43,5 +43,8 @@ 1.8.0 + + 1.8.0 + diff -Nru libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml --- libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 2019-04-10 10:10:51.000000000 +0000 @@ -34,5 +34,8 @@ 1.8.0 + + 1.8.0 + diff -Nru libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml --- libreoffice-6.2.2/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 2019-04-10 10:10:51.000000000 +0000 @@ -34,5 +34,8 @@ 1.8.0 + + 1.8.0 + diff -Nru libreoffice-6.2.2/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx libreoffice-6.2.3/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx --- libreoffice-6.2.2/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -43,6 +43,7 @@ VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo) VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo) VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo) + VENDOR_MAP_ENTRY("Amazon.com Inc.", SunInfo) #ifndef MACOSX VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo) VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo) diff -Nru libreoffice-6.2.2/librelogo/source/LibreLogo/LibreLogo.py libreoffice-6.2.3/librelogo/source/LibreLogo/LibreLogo.py --- libreoffice-6.2.2/librelogo/source/LibreLogo/LibreLogo.py 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/librelogo/source/LibreLogo/LibreLogo.py 2019-04-10 10:10:51.000000000 +0000 @@ -1903,7 +1903,7 @@ # compile to Python subroutines = re.compile(r"(?iu)(?]|//|==|<=|>=|<>|!=)[ ]*|[ ]*-[ ]+|(?GetNamedObjects(), diff -Nru libreoffice-6.2.2/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentIdentifierFactory.idl libreoffice-6.2.3/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentIdentifierFactory.idl --- libreoffice-6.2.2/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentIdentifierFactory.idl 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/offapi/com/sun/star/frame/XTransientDocumentsDocumentContentIdentifierFactory.idl 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + */ +#ifndef __com_sun_star_frame_XTransientDocumentsDocumentContentIdentifierFactory_idl__ +#define __com_sun_star_frame_XTransientDocumentsDocumentContentIdentifierFactory_idl__ + +#include +#include +#include +#include + + +module com { module sun { module star { module frame { + +/** a factory for identifiers of + com::sun::star::ucb::TransientDocumentsDocumentContents. + + @see com::sun::star::document::OfficeDocument + @see com::sun::star::ucb::XContentIdentifier + + @since LibreOffice 6.3 +*/ +interface XTransientDocumentsDocumentContentIdentifierFactory + : com::sun::star::uno::XInterface +{ + /** creates a com::sun::star::ucb::XContentIdentifier + based on a given com::sun::star::document::OfficeDocument. + + @param Model + the document model for which a + com::sun::star::ucb::XContentIdentifier + is requested. The model must be an implementation of service + com::sun::star::document::OfficeDocument. + + @returns + a content identifier based on the given document model. + + @throws com::sun::star::lang::IllegalArgumentException + if the document model cannot be associated with content for any reason. + */ + com::sun::star::ucb::XContentIdentifier + createDocumentContentIdentifier( + [in] com::sun::star::frame::XModel Model ) + raises ( com::sun::star::lang::IllegalArgumentException ); + +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/offapi/UnoApi_offapi.mk libreoffice-6.2.3/offapi/UnoApi_offapi.mk --- libreoffice-6.2.2/offapi/UnoApi_offapi.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/offapi/UnoApi_offapi.mk 2019-04-10 10:10:51.000000000 +0000 @@ -2656,6 +2656,7 @@ XToolbarController \ XToolbarControllerListener \ XTransientDocumentsDocumentContentFactory \ + XTransientDocumentsDocumentContentIdentifierFactory \ XUIControllerFactory \ XUIControllerRegistration \ XUntitledNumbers \ diff -Nru libreoffice-6.2.2/oox/source/drawingml/chart/seriesconverter.cxx libreoffice-6.2.3/oox/source/drawingml/chart/seriesconverter.cxx --- libreoffice-6.2.2/oox/source/drawingml/chart/seriesconverter.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/chart/seriesconverter.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -182,7 +182,11 @@ convertTextProperty(rPropSet, rFormatter, rDataLabel.mxTextProp); // data label separator (do not overwrite series separator, if no explicit point separator is present) - if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) + // Set the data label separator to "new line" if the value is shown as percentage with a category name, + // just like in MS-Office. In any other case the default separator will be a semicolon. + if( bShowPercent && !bShowValue && ( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) ) + rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "\n" ) ); + else if( bDataSeriesLabel || rDataLabel.moaSeparator.has() ) rPropSet.setProperty( PROP_LabelSeparator, rDataLabel.moaSeparator.get( "; " ) ); // data label placement (do not overwrite series placement, if no explicit point placement is present) diff -Nru libreoffice-6.2.2/oox/source/drawingml/diagram/diagramlayoutatoms.cxx libreoffice-6.2.3/oox/source/drawingml/diagram/diagramlayoutatoms.cxx --- libreoffice-6.2.2/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -66,6 +66,24 @@ return nUnit == oox::XML_primFontSz || nUnit == oox::XML_secFontSz; } +/// Determines which UNO property should be set for a given constraint type. +sal_Int32 getPropertyFromConstraint(sal_Int32 nConstraint) +{ + switch (nConstraint) + { + case oox::XML_lMarg: + return oox::PROP_TextLeftDistance; + case oox::XML_rMarg: + return oox::PROP_TextRightDistance; + case oox::XML_tMarg: + return oox::PROP_TextUpperDistance; + case oox::XML_bMarg: + return oox::PROP_TextLowerDistance; + } + + return 0; +} + /// Determines the connector shape type from a linear alg. sal_Int32 getConnectorType(const oox::drawingml::LayoutNode* pNode) { @@ -247,7 +265,7 @@ pAtom->dump(level + 1); } -ForEachAtom::ForEachAtom(const LayoutNode& rLayoutNode, const Reference< XFastAttributeList >& xAttributes) : +ForEachAtom::ForEachAtom(LayoutNode& rLayoutNode, const Reference< XFastAttributeList >& xAttributes) : LayoutAtom(rLayoutNode) { maIter.loadFromXAttr(xAttributes); @@ -274,7 +292,7 @@ return maEmptyChildren; } -ConditionAtom::ConditionAtom(const LayoutNode& rLayoutNode, bool isElse, const Reference< XFastAttributeList >& xAttributes) : +ConditionAtom::ConditionAtom(LayoutNode& rLayoutNode, bool isElse, const Reference< XFastAttributeList >& xAttributes) : LayoutAtom(rLayoutNode), mIsElse(isElse) { @@ -448,6 +466,21 @@ void ConstraintAtom::parseConstraint(std::vector& rConstraints, bool bRequireForName) const { + // Whitelist for cases where empty forName is handled. + if (bRequireForName) + { + switch (maConstraint.mnType) + { + case XML_sp: + case XML_lMarg: + case XML_rMarg: + case XML_tMarg: + case XML_bMarg: + bRequireForName = false; + break; + } + } + if (bRequireForName && maConstraint.msForName.isEmpty()) return; @@ -465,7 +498,7 @@ } void AlgAtom::layoutShape( const ShapePtr& rShape, - const std::vector& rOwnConstraints ) const + const std::vector& rOwnConstraints ) { // Algorithm result may depend on the parent constraints as well. std::vector aMergedConstraints; @@ -892,6 +925,18 @@ if (rShape->getChildren().empty() || rShape->getSize().Width == 0 || rShape->getSize().Height == 0) break; + // Parse constraints, only self spacing from height as a start. + double fSpaceFromConstraint = 0; + for (const auto& rConstr : rConstraints) + { + if (rConstr.mnRefType == XML_h) + { + if (rConstr.mnType == XML_sp && rConstr.msForName.isEmpty()) + fSpaceFromConstraint = rConstr.mfFactor; + } + } + bool bSpaceFromConstraints = fSpaceFromConstraint != 0; + const sal_Int32 nDir = maMap.count(XML_grDir) ? maMap.find(XML_grDir)->second : XML_tL; sal_Int32 nIncX = 1; sal_Int32 nIncY = 1; @@ -903,38 +948,67 @@ case XML_bR: nIncX = -1; nIncY = -1; break; } - // TODO: get values from constraints sal_Int32 nCount = rShape->getChildren().size(); - double fSpace = 0.3; + // Defaults in case not provided by constraints. + double fSpace = bSpaceFromConstraints ? fSpaceFromConstraint : 0.3; double fAspectRatio = 0.54; // diagram should not spill outside, earlier it was 0.6 sal_Int32 nCol = 1; sal_Int32 nRow = 1; - for ( ; nRowgetChildren()[0]->getAspectRatio(); + if (nCount <= fChildAspectRatio) + // Child aspect ratio request (width/height) is N, and we have at most N shapes. + // This means we don't need multiple columns. + nRow = nCount; + else { - nCol = (nCount+nRow-1) / nRow; - const double fShapeHeight = rShape->getSize().Height; - const double fShapeWidth = rShape->getSize().Width; - if ((fShapeHeight / nCol) / (fShapeWidth / nRow) >= fAspectRatio) - break; + for ( ; nRowgetSize().Height; + const double fShapeWidth = rShape->getSize().Width; + if ((fShapeHeight / nCol) / (fShapeWidth / nRow) >= fAspectRatio) + break; + } } SAL_INFO("oox.drawingml", "Snake layout grid: " << nCol << "x" << nRow); sal_Int32 nWidth = rShape->getSize().Width / (nCol + (nCol-1)*fSpace); - const awt::Size aChildSize(nWidth, nWidth * fAspectRatio); + awt::Size aChildSize(nWidth, nWidth * fAspectRatio); + if (nCol == 1 && nRow > 1) + { + // We have a single column, so count the height based on the parent height, not + // based on width. + // Space occurs inside children; also double amount of space is needed outside (on + // both sides), if the factor comes from a constraint. + sal_Int32 nNumSpaces = -1; + if (bSpaceFromConstraints) + nNumSpaces += 4; + sal_Int32 nHeight + = rShape->getSize().Height / (nRow + (nRow + nNumSpaces) * fSpace); + + if (fChildAspectRatio > 1) + { + // Shrink width if the aspect ratio requires it. + nWidth = std::min(rShape->getSize().Width, + static_cast(nHeight * fChildAspectRatio)); + aChildSize = awt::Size(nWidth, nHeight); + } + } awt::Point aCurrPos(0, 0); if (nIncX == -1) aCurrPos.X = rShape->getSize().Width - aChildSize.Width; if (nIncY == -1) aCurrPos.Y = rShape->getSize().Height - aChildSize.Height; + else if (bSpaceFromConstraints) + // Initial vertical offset to have upper spacing (outside, so double amount). + aCurrPos.Y = aChildSize.Height * fSpace * 2; sal_Int32 nStartX = aCurrPos.X; sal_Int32 nColIdx = 0,index = 0; - sal_Int32 num = rShape->getChildren().size(); - const sal_Int32 aContDir = maMap.count(XML_contDir) ? maMap.find(XML_contDir)->second : XML_sameDir; switch(aContDir) @@ -954,7 +1028,7 @@ if(++nColIdx == nCol) // condition for next row { // if last row, then position children according to number of shapes. - if((index+1)%nCol!=0 && (index+1)>=3 && ((index+1)/nCol+1)==nRow && num!=nRow*nCol) + if((index+1)%nCol!=0 && (index+1)>=3 && ((index+1)/nCol+1)==nRow && nCount!=nRow*nCol) // position first child of last row aCurrPos.X = nStartX + (nIncX * (aChildSize.Width + fSpace*aChildSize.Width))/2; else @@ -993,10 +1067,10 @@ if(++nColIdx == nCol) // condition for next row { // if last row, then position children according to number of shapes. - if((index+1)%nCol!=0 && (index+1)>=4 && ((index+1)/nCol+1)==nRow && num!=nRow*nCol && ((index/nCol)+1)%2==0) + if((index+1)%nCol!=0 && (index+1)>=4 && ((index+1)/nCol+1)==nRow && nCount!=nRow*nCol && ((index/nCol)+1)%2==0) // position first child of last row aCurrPos.X -= aChildSize.Width*3/2; - else if((index+1)%nCol!=0 && (index+1)>=4 && ((index+1)/nCol+1)==nRow && num!=nRow*nCol && ((index/nCol)+1)%2!=0) + else if((index+1)%nCol!=0 && (index+1)>=4 && ((index+1)/nCol+1)==nRow && nCount!=nRow*nCol && ((index/nCol)+1)%2!=0) aCurrPos.X = nStartX + (nIncX * (aChildSize.Width + fSpace*aChildSize.Width))/2; else if(((index/nCol)+1)%2!=0) aCurrPos.X = nStartX; @@ -1029,6 +1103,29 @@ case XML_tx: { // adjust text alignment + + // Parse constraints, only self margins as a start. + for (const auto& rConstr : rConstraints) + { + if (rConstr.mnRefType == XML_w) + { + if (!rConstr.msForName.isEmpty()) + continue; + + sal_Int32 nProperty = getPropertyFromConstraint(rConstr.mnType); + if (!nProperty) + continue; + + // PowerPoint takes size as points, but gives margin as MMs. + double fFactor = convertPointToMms(rConstr.mfFactor); + + // DrawingML works in EMUs, UNO API works in MM100s. + sal_Int32 nValue = rShape->getSize().Width * fFactor / EMU_PER_HMM; + + rShape->getShapeProperties().setProperty(nProperty, nValue); + } + } + // TODO: adjust text size to fit shape TextBodyPtr pTextBody = rShape->getTextBody(); if (!pTextBody || @@ -1252,6 +1349,8 @@ " processing shape type " << rShape->getCustomShapeProperties()->getShapePresetType() << " for layout node named \"" << msName << "\""); + if (pPresNode->mpShape) + rShape->getFillProperties().assignUsed(pPresNode->mpShape->getFillProperties()); } // TODO(Q1): apply styling & coloring - take presentation diff -Nru libreoffice-6.2.2/oox/source/drawingml/diagram/diagramlayoutatoms.hxx libreoffice-6.2.3/oox/source/drawingml/diagram/diagramlayoutatoms.hxx --- libreoffice-6.2.2/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -91,10 +91,10 @@ class LayoutAtom { public: - LayoutAtom(const LayoutNode& rLayoutNode) : mrLayoutNode(rLayoutNode) {} + LayoutAtom(LayoutNode& rLayoutNode) : mrLayoutNode(rLayoutNode) {} virtual ~LayoutAtom() { } - const LayoutNode& getLayoutNode() const + LayoutNode& getLayoutNode() { return mrLayoutNode; } /** visitor acceptance @@ -127,7 +127,7 @@ void dump(int level = 0); protected: - const LayoutNode& mrLayoutNode; + LayoutNode& mrLayoutNode; std::vector< LayoutAtomPtr > mpChildNodes; std::weak_ptr mpParent; OUString msName; @@ -137,7 +137,7 @@ : public LayoutAtom { public: - ConstraintAtom(const LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode) {} + ConstraintAtom(LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode) {} virtual void accept( LayoutAtomVisitor& ) override; Constraint& getConstraint() { return maConstraint; } @@ -150,7 +150,7 @@ : public LayoutAtom { public: - AlgAtom(const LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode), mnType(0), maMap() {} + AlgAtom(LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode), mnType(0), maMap() {} typedef std::map ParamMap; @@ -161,7 +161,7 @@ void addParam( sal_Int32 nType, sal_Int32 nVal ) { maMap[nType]=nVal; } void layoutShape( const ShapePtr& rShape, - const std::vector& rConstraints ) const; + const std::vector& rConstraints ); /// Gives access to . sal_Int32 getType() const { return mnType; } @@ -171,6 +171,8 @@ void setAspectRatio(double fAspectRatio) { mfAspectRatio = fAspectRatio; } + double getAspectRatio() const { return mfAspectRatio; } + private: sal_Int32 mnType; ParamMap maMap; @@ -184,7 +186,7 @@ : public LayoutAtom { public: - explicit ForEachAtom(const LayoutNode& rLayoutNode, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); + explicit ForEachAtom(LayoutNode& rLayoutNode, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); IteratorAttr & iterator() { return maIter; } @@ -200,7 +202,7 @@ : public LayoutAtom { public: - explicit ConditionAtom(const LayoutNode& rLayoutNode, bool isElse, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); + explicit ConditionAtom(LayoutNode& rLayoutNode, bool isElse, const css::uno::Reference< css::xml::sax::XFastAttributeList >& xAttributes); virtual void accept( LayoutAtomVisitor& ) override; bool getDecision() const; private: @@ -220,7 +222,7 @@ : public LayoutAtom { public: - ChooseAtom(const LayoutNode& rLayoutNode) + ChooseAtom(LayoutNode& rLayoutNode) : LayoutAtom(rLayoutNode) #if defined __clang__ && __clang_major__ == 3 && __clang_minor__ == 8 , maEmptyChildren() @@ -264,6 +266,10 @@ const LayoutNode* getParentLayoutNode() const; + void setAlgAtom(AlgAtomPtr pAlgAtom) { mpAlgAtom = pAlgAtom; } + + AlgAtomPtr getAlgAtom() const { return mpAlgAtom.lock(); } + private: const Diagram& mrDgm; VarMap mVariables; @@ -272,6 +278,7 @@ ShapePtr mpExistingShape; std::vector mpNodeShapes; sal_Int32 mnChildOrder; + std::weak_ptr mpAlgAtom; }; typedef std::shared_ptr< LayoutNode > LayoutNodePtr; @@ -280,7 +287,7 @@ : public LayoutAtom { public: - ShapeAtom(const LayoutNode& rLayoutNode, const ShapePtr& pShape) : LayoutAtom(rLayoutNode), mpShapeTemplate(pShape) {} + ShapeAtom(LayoutNode& rLayoutNode, const ShapePtr& pShape) : LayoutAtom(rLayoutNode), mpShapeTemplate(pShape) {} virtual void accept( LayoutAtomVisitor& ) override; const ShapePtr& getShapeTemplate() const { return mpShapeTemplate; } diff -Nru libreoffice-6.2.2/oox/source/drawingml/diagram/layoutatomvisitors.cxx libreoffice-6.2.3/oox/source/drawingml/diagram/layoutatomvisitors.cxx --- libreoffice-6.2.2/oox/source/drawingml/diagram/layoutatomvisitors.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/diagram/layoutatomvisitors.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -133,6 +133,8 @@ if (rAtom.setupShape(pShape, pNewNode)) { pShape->setInternalName(rAtom.getName()); + if (AlgAtomPtr pAlgAtom = rAtom.getAlgAtom()) + pShape->setAspectRatio(pAlgAtom->getAspectRatio()); rAtom.addNodeShape(pShape); } } @@ -153,6 +155,8 @@ if (rAtom.setupShape(pShape, pNewNode)) { pShape->setInternalName(rAtom.getName()); + if (AlgAtomPtr pAlgAtom = rAtom.getAlgAtom()) + pShape->setAspectRatio(pAlgAtom->getAspectRatio()); pCurrParent->addChild(pShape); pCurrParent = pShape; rAtom.addNodeShape(pShape); @@ -272,6 +276,9 @@ // TODO(F3): cloned shape shares all properties by reference, // don't change them! mpShape.reset(new Shape(pCurrShape)); + // Fill properties have to be changed as sometimes only the presentation node contains the blip + // fill, unshare those. + mpShape->cloneFillProperties(); } void ShapeLayoutingVisitor::defaultVisit(LayoutAtom const & rAtom) diff -Nru libreoffice-6.2.2/oox/source/drawingml/diagram/layoutnodecontext.cxx libreoffice-6.2.3/oox/source/drawingml/diagram/layoutnodecontext.cxx --- libreoffice-6.2.2/oox/source/drawingml/diagram/layoutnodecontext.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/diagram/layoutnodecontext.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -231,6 +231,7 @@ // CT_Algorithm AlgAtomPtr pAtom( new AlgAtom(mpNode->getLayoutNode()) ); LayoutAtom::connect(mpNode, pAtom); + mpNode->getLayoutNode().setAlgAtom(pAtom); return new AlgorithmContext( *this, rAttribs, pAtom ); } case DGM_TOKEN( choose ): diff -Nru libreoffice-6.2.2/oox/source/drawingml/shape.cxx libreoffice-6.2.3/oox/source/drawingml/shape.cxx --- libreoffice-6.2.2/oox/source/drawingml/shape.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/drawingml/shape.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -178,6 +178,7 @@ , mnZOrder(pSourceShape->mnZOrder) , mnZOrderOff(pSourceShape->mnZOrderOff) , mnDataNodeType(pSourceShape->mnDataNodeType) +, mfAspectRatio(pSourceShape->mfAspectRatio) {} Shape::~Shape() @@ -1788,6 +1789,12 @@ return xRelListTemp; } +void Shape::cloneFillProperties() +{ + auto pFillProperties = std::make_shared(); + pFillProperties->assignUsed(*mpFillPropertiesPtr); + mpFillPropertiesPtr = pFillProperties; +} } } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/oox/source/export/chartexport.cxx libreoffice-6.2.3/oox/source/export/chartexport.cxx --- libreoffice-6.2.2/oox/source/export/chartexport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/oox/source/export/chartexport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -3868,6 +3868,8 @@ FSEND ); } + exportShapeProps( xErrorBarProps ); + pFS->endElement( FSNS( XML_c, XML_errBars) ); } diff -Nru libreoffice-6.2.2/qadevOOo/runner/util/DesktopTools.java libreoffice-6.2.3/qadevOOo/runner/util/DesktopTools.java --- libreoffice-6.2.2/qadevOOo/runner/util/DesktopTools.java 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/qadevOOo/runner/util/DesktopTools.java 2019-04-10 10:10:51.000000000 +0000 @@ -19,6 +19,10 @@ import helper.ConfigHelper; +import java.io.BufferedInputStream; +import java.io.ByteArrayOutputStream; +import java.io.FileInputStream; +import java.io.InputStream; import java.util.ArrayList; import lib.StatusException; @@ -35,9 +39,11 @@ import com.sun.star.frame.XDesktop; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; +import com.sun.star.io.XInputStream; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiServiceFactory; import com.sun.star.lang.XServiceInfo; +import com.sun.star.lib.uno.adapter.ByteArrayToXInputStreamAdapter; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XInterface; import com.sun.star.util.XCloseable; @@ -252,6 +258,48 @@ return oDoc; } + /** + * loads a document of from a given path using an input stream + * + * @param xMSF the MultiServiceFactory + * @param filePath the path of the document to load. + * @return the XComponent Interface of the document + */ + public static XComponent loadDocUsingStream(XMultiServiceFactory xMSF, String filePath) + { + XInputStream inputStream = null; + try { + final InputStream inputFile = new BufferedInputStream( + new FileInputStream(filePath)); + final ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + final byte[] byteBuffer = new byte[4096]; + int byteBufferLength = 0; + while ((byteBufferLength = inputFile.read(byteBuffer)) > 0) + bytes.write(byteBuffer, 0, byteBufferLength); + inputFile.close(); + inputStream = new ByteArrayToXInputStreamAdapter( + bytes.toByteArray()); + } catch (java.io.IOException e) { + e.printStackTrace(); + } + + PropertyValue[] loadProps = new PropertyValue[1]; + loadProps[0] = new PropertyValue(); + loadProps[0].Name = "InputStream"; + loadProps[0].Value = inputStream; + + XComponent oDoc = null; + try + { + oDoc = getCLoader(xMSF).loadComponentFromURL("private:stream", "_blank", 0, loadProps); + } + catch (com.sun.star.uno.Exception e) + { + throw new IllegalArgumentException("Document could not be loaded", e); + } + return oDoc; + } + /** * closes a given document * @param DocumentToClose the document to close diff -Nru libreoffice-6.2.2/readlicense_oo/license/CREDITS.fodt libreoffice-6.2.3/readlicense_oo/license/CREDITS.fodt --- libreoffice-6.2.2/readlicense_oo/license/CREDITS.fodt 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/readlicense_oo/license/CREDITS.fodt 2019-04-10 10:10:51.000000000 +0000 @@ -1,24 +1,24 @@ - Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.2.0.3$Linux_X86_64 LibreOffice_project/98c6a8a1c6c7b144ce3cc729e34964b47ce25d622012-02-20T22:17:18.060000000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA + Credits » LibreOfficeCreditscontributorscodersdevelopersCredits for the LibreOffice development/coding.LibreOffice/6.2.2.2$Linux_X86_64 LibreOffice_project/2b840030fec2aae0fd2658d8d4f9548af4e3518d2012-02-20T22:17:18.060000000PT14M12S3JUebjoxEpqXoQcpltWRTwzBZEEHtch3wApdhgiQPFiA - 515 + 540 501 - 32440 - 18126 + 21068 + 26450 true true view2 - 3649 - 3471 + 3577 + 3434 501 - 515 - 32939 - 18639 + 540 + 21567 + 26988 0 0 false @@ -114,7 +114,7 @@ true false true - 8416145 + 8497088 false false false @@ -325,61 +325,58 @@ - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + @@ -388,16 +385,19 @@ - + - + - + - + + + + @@ -406,24 +406,24 @@ - + - + - + - + - + - + @@ -1059,7 +1059,7 @@ Credits - 1408 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-02-26 10:59:27. + 1422 individuals contributed to OpenOffice.org (and whose contributions were imported into LibreOffice) or LibreOffice until 2019-04-07 12:25:13. * marks developers whose first contributions happened after 2010-09-28. Developers committing code since 2010-09-28 @@ -1083,16 +1083,16 @@ - Caolán McNamaraCommits: 25655Joined: 2000-10-10 + Caolán McNamaraCommits: 25868Joined: 2000-10-10 Vladimir GlazunovCommits: 25434Joined: 2000-12-04 - Stephan BergmannCommits: 16817Joined: 2000-10-04 + Stephan BergmannCommits: 16896Joined: 2000-10-04 - *Noel GrandinCommits: 11078Joined: 2011-12-12 + *Noel GrandinCommits: 11177Joined: 2011-12-12 @@ -1100,10 +1100,10 @@ Ivo HinkelmannCommits: 9480Joined: 2002-09-09 - Tor LillqvistCommits: 8518Joined: 2010-03-23 + Tor LillqvistCommits: 8557Joined: 2010-03-23 - Miklos VajnaCommits: 7324Joined: 2010-07-29 + Miklos VajnaCommits: 7380Joined: 2010-07-29 Michael StahlCommits: 6418Joined: 2008-06-16 @@ -1120,7 +1120,7 @@ Frank Schoenheit [fs]Commits: 5008Joined: 2000-09-19 - Eike RathkeCommits: 4611Joined: 2000-10-11 + Eike RathkeCommits: 4631Joined: 2000-10-11 @@ -1134,26 +1134,26 @@ Ocke Janssen [oj]Commits: 2850Joined: 2000-09-20 - Mathias BauerCommits: 2580Joined: 2000-09-20 + Jan HolesovskyCommits: 2583Joined: 2009-06-23 - Jan HolesovskyCommits: 2577Joined: 2009-06-23 + *Julien NabetCommits: 2582Joined: 2010-11-04 - *Julien NabetCommits: 2567Joined: 2010-11-04 + Mathias BauerCommits: 2580Joined: 2000-09-20 Oliver SpechtCommits: 2549Joined: 2000-09-21 - Michael MeeksCommits: 2312Joined: 2004-08-05 + Michael MeeksCommits: 2316Joined: 2004-08-05 - Bjoern MichaelsenCommits: 2270Joined: 2009-10-14 + Bjoern MichaelsenCommits: 2282Joined: 2009-10-14 *Norbert ThiebaudCommits: 2176Joined: 2010-09-29 @@ -1162,15 +1162,15 @@ *Thomas ArnholdCommits: 2176Joined: 2011-01-16 - Philipp Lohmann [pl]Commits: 2089Joined: 2000-09-21 + *Tomaž VajngerlCommits: 2097Joined: 2012-06-02 - *Tomaž VajngerlCommits: 1996Joined: 2012-06-02 + Philipp Lohmann [pl]Commits: 2089Joined: 2000-09-21 - *Andras TimarCommits: 1814Joined: 2010-10-02 + *Andras TimarCommits: 1884Joined: 2010-10-02 Christian LippkaCommits: 1805Joined: 2000-09-25 @@ -1181,21 +1181,21 @@ - Luboš LuňákCommits: 1661Joined: 2010-09-21 + Luboš LuňákCommits: 1691Joined: 2010-09-21 - *Takeshi AbeCommits: 1475Joined: 2010-11-08 + *Takeshi AbeCommits: 1479Joined: 2010-11-08 - Armin Le GrandCommits: 1449Joined: 2000-09-25 + *Matteo CasalinCommits: 1476Joined: 2011-11-13 - *Matteo CasalinCommits: 1444Joined: 2011-11-13 + Armin Le GrandCommits: 1451Joined: 2000-09-25 - Thorsten BehrensCommits: 1382Joined: 2001-04-25 + Thorsten BehrensCommits: 1389Joined: 2001-04-25 Fridrich ŠtrbaCommits: 1338Joined: 2007-02-22 @@ -1215,15 +1215,15 @@ *Chris SherlockCommits: 1204Joined: 2013-02-25 - *Lionel Elie MamaneCommits: 1033Joined: 2011-01-15 + *Andrea GelminiCommits: 1105Joined: 2014-10-30 - *Tamás ZolnaiCommits: 1021Joined: 2012-08-06 + *Tamás ZolnaiCommits: 1046Joined: 2012-08-06 - *Andrea GelminiCommits: 1015Joined: 2014-10-30 + *Lionel Elie MamaneCommits: 1033Joined: 2011-01-15 Petr MladekCommits: 958Joined: 2006-10-03 @@ -1243,24 +1243,24 @@ Cédric BosdonnatCommits: 882Joined: 2009-11-16 - Malte Timmermann [mt]Commits: 864Joined: 2000-10-10 + *Mike KaganskiCommits: 879Joined: 2015-04-26 - Sven JacobiCommits: 850Joined: 2000-09-21 + Malte Timmermann [mt]Commits: 864Joined: 2000-10-10 - Herbert DürrCommits: 827Joined: 2000-10-17 + Sven JacobiCommits: 850Joined: 2000-09-21 - Martin GallweyCommits: 827Joined: 2000-11-08 + *Olivier HallotCommits: 832Joined: 2010-10-25 - *Mike KaganskiCommits: 823Joined: 2015-04-26 + Herbert DürrCommits: 827Joined: 2000-10-17 - *Olivier HallotCommits: 818Joined: 2010-10-25 + Martin GallweyCommits: 827Joined: 2000-11-08 @@ -1268,38 +1268,38 @@ Mikhail VoytenkoCommits: 793Joined: 2001-01-16 - Carsten DriesnerCommits: 748Joined: 2000-10-06 + *andreas kainzCommits: 788Joined: 2015-03-18 - Joachim LingnerCommits: 745Joined: 2000-10-05 + Carsten DriesnerCommits: 748Joined: 2000-10-06 - Christian LohmaierCommits: 738Joined: 2008-06-01 + *Samuel MehrbrodtCommits: 747Joined: 2011-06-08 - *Andrzej HuntCommits: 733Joined: 2012-03-27 + Joachim LingnerCommits: 745Joined: 2000-10-05 - Andre FischerCommits: 730Joined: 2001-02-06 + Christian LohmaierCommits: 739Joined: 2008-06-01 - Release EngineeringCommits: 728Joined: 2008-10-02 + *Andrzej HuntCommits: 733Joined: 2012-03-27 - *Samuel MehrbrodtCommits: 715Joined: 2011-06-08 + Andre FischerCommits: 730Joined: 2001-02-06 - *Maxim MonastirskyCommits: 714Joined: 2013-10-27 + Release EngineeringCommits: 728Joined: 2008-10-02 - *andreas kainzCommits: 711Joined: 2015-03-18 + *Maxim MonastirskyCommits: 714Joined: 2013-10-27 - *Katarina BehrensCommits: 689Joined: 2010-10-13 + *Katarina BehrensCommits: 704Joined: 2010-10-13 Joerg Skottke [jsk]Commits: 678Joined: 2008-06-17 @@ -1307,16 +1307,16 @@ - *Zdeněk CrhonekCommits: 668Joined: 2016-05-19 + *Michael StahlCommits: 678Joined: 2018-04-03 - *Joseph PowersCommits: 658Joined: 2010-10-15 + *Zdeněk CrhonekCommits: 676Joined: 2016-05-19 - Kai SommerfeldCommits: 651Joined: 2000-10-10 + *Joseph PowersCommits: 658Joined: 2010-10-15 - *Michael StahlCommits: 650Joined: 2018-04-03 + Kai SommerfeldCommits: 651Joined: 2000-10-10 @@ -1324,7 +1324,7 @@ Ingrid HalamaCommits: 639Joined: 2001-01-19 - *Gabor KelemenCommits: 624Joined: 2013-06-18 + *Gabor KelemenCommits: 625Joined: 2013-06-18 *Rafael DominguezCommits: 606Joined: 2011-02-13 @@ -1335,21 +1335,24 @@ + *Jens CarlCommits: 581Joined: 2014-05-28 + + *Yousuf PhilipsCommits: 569Joined: 2014-09-21 - *Jan-Marek GlogowskiCommits: 552Joined: 2013-11-14 + *Jan-Marek GlogowskiCommits: 563Joined: 2013-11-14 Thomas Benisch [tbe]Commits: 551Joined: 2000-10-23 + + *Xisco FauliCommits: 546Joined: 2011-02-06 - - - *Khaled HosnyCommits: 526Joined: 2011-01-28 + *Khaled HosnyCommits: 531Joined: 2011-01-28 Jürgen SchmidtCommits: 512Joined: 2000-10-09 @@ -1357,13 +1360,10 @@ Rene EngelhardCommits: 506Joined: 2005-03-14 - - *Szymon KłosCommits: 495Joined: 2014-03-22 - - *Jens CarlCommits: 491Joined: 2014-05-28 + *Szymon KłosCommits: 495Joined: 2014-03-22 *Peter FoleyCommits: 489Joined: 2011-09-04 @@ -1377,13 +1377,13 @@ - *Adolfo Jayme BarrientosCommits: 408Joined: 2013-06-21 + *Adolfo Jayme BarrientosCommits: 411Joined: 2013-06-21 - Dirk VoelzkeCommits: 392Joined: 2000-11-27 + *Justin LuthCommits: 395Joined: 2014-09-30 - *Justin LuthCommits: 390Joined: 2014-09-30 + Dirk VoelzkeCommits: 392Joined: 2000-11-27 *Ivan TimofeevCommits: 380Joined: 2011-09-16 @@ -1400,12 +1400,12 @@ *Pranav KantCommits: 366Joined: 2015-03-01 - Matthias Huetsch [mhu]Commits: 360Joined: 2000-09-28 + *László NémethCommits: 361Joined: 2010-09-29 - *László NémethCommits: 353Joined: 2010-09-29 + Matthias Huetsch [mhu]Commits: 360Joined: 2000-09-28 Patrick LubyCommits: 335Joined: 2000-09-21 @@ -1433,13 +1433,13 @@ - Lars LanghansCommits: 260Joined: 2000-09-22 + *Ashod NakashianCommits: 263Joined: 2015-01-07 - *Ashod NakashianCommits: 260Joined: 2015-01-07 + Lars LanghansCommits: 260Joined: 2000-09-22 - *Marco CecchettiCommits: 254Joined: 2011-04-14 + *Marco CecchettiCommits: 255Joined: 2011-04-14 Muthu SubramanianCommits: 250Joined: 2010-08-25 @@ -1450,13 +1450,13 @@ *Robert Antoni Buj GelonchCommits: 247Joined: 2014-06-11 - *Laurent BPCommits: 243Joined: 2011-08-31 + *Laurent BPCommits: 244Joined: 2011-08-31 - *Arnaud VersiniCommits: 238Joined: 2010-10-05 + *Mark HungCommits: 241Joined: 2014-11-04 - *Mark HungCommits: 236Joined: 2014-11-04 + *Arnaud VersiniCommits: 238Joined: 2010-10-05 @@ -1464,7 +1464,7 @@ *Stanislav HoracekCommits: 219Joined: 2012-12-09 - *Winfried DonkersCommits: 207Joined: 2011-11-11 + *Winfried DonkersCommits: 208Joined: 2011-11-11 Ingo SchmidtCommits: 202Joined: 2004-02-05 @@ -1484,7 +1484,7 @@ *Muhammet KaraCommits: 188Joined: 2016-03-20 - *Johnny_MCommits: 180Joined: 2016-05-12 + *Johnny_MCommits: 186Joined: 2016-05-12 @@ -1492,13 +1492,13 @@ *François TigeotCommits: 176Joined: 2011-01-31 - Bartosz KosiorekCommits: 172Joined: 2010-09-17 + Bartosz KosiorekCommits: 174Joined: 2010-09-17 - *Philipp RiemerCommits: 171Joined: 2012-05-25 + *Tamas BunthCommits: 171Joined: 2016-03-08 - *Tamas BunthCommits: 170Joined: 2016-03-08 + *Philipp RiemerCommits: 171Joined: 2012-05-25 @@ -1512,49 +1512,49 @@ *Gert FallerCommits: 151Joined: 2010-10-25 - *Alexander WilmsCommits: 151Joined: 2012-05-26 + *Henry CastroCommits: 151Joined: 2015-01-09 - *heiko tietzeCommits: 147Joined: 2016-10-06 + *Alexander WilmsCommits: 151Joined: 2012-05-26 - *Henry CastroCommits: 146Joined: 2015-01-09 + *heiko tietzeCommits: 150Joined: 2016-10-06 Gregor HartmannCommits: 141Joined: 2000-10-12 - *Matthias FreundCommits: 139Joined: 2013-02-08 + *Jim RaykowskiCommits: 141Joined: 2017-04-16 - Giuseppe CastagnoCommits: 138Joined: 2007-12-09 + *Matthias FreundCommits: 139Joined: 2013-02-08 - *Jim RaykowskiCommits: 137Joined: 2017-04-16 + Giuseppe CastagnoCommits: 138Joined: 2007-12-09 *Artur DryomovCommits: 137Joined: 2013-03-14 - *Jesús CorriusCommits: 130Joined: 2010-10-07 + *Tomáš ChvátalCommits: 134Joined: 2011-07-27 - *Tomáš ChvátalCommits: 129Joined: 2011-07-27 + *Jesús CorriusCommits: 130Joined: 2010-10-07 *Philipp WeissenbacherCommits: 129Joined: 2011-10-28 - *Jean-Pierre LedureCommits: 128Joined: 2013-10-12 + *Michael WeghornCommits: 128Joined: 2014-09-10 - *Michael WeghornCommits: 126Joined: 2014-09-10 + *Jean-Pierre LedureCommits: 128Joined: 2013-10-12 @@ -1596,7 +1596,7 @@ *Dennis FrancisCommits: 109Joined: 2015-04-15 - *Vasily MelenchukCommits: 104Joined: 2015-01-27 + *Vasily MelenchukCommits: 106Joined: 2015-01-27 @@ -1615,6 +1615,9 @@ + *Arkadiy IllarionovCommits: 95Joined: 2017-01-15 + + *Laurent GodardCommits: 93Joined: 2011-05-06 @@ -1623,11 +1626,11 @@ *Varun DhallCommits: 91Joined: 2015-03-07 + + *Krisztian PinterCommits: 90Joined: 2013-02-18 - - *Albert ThuswaldnerCommits: 89Joined: 2011-01-26 @@ -1637,25 +1640,25 @@ *Tim RetoutCommits: 88Joined: 2012-02-14 + + *Korrawit PruegsanusakCommits: 87Joined: 2011-05-28 - - *Adam CoCommits: 86Joined: 2013-04-28 - Mihaela KedikovaCommits: 85Joined: 2009-10-30 + *Serge KrotCommits: 86Joined: 2015-10-25 - *Arkadiy IllarionovCommits: 84Joined: 2017-01-15 + Mihaela KedikovaCommits: 85Joined: 2009-10-30 + + *Javier FernandezCommits: 84Joined: 2013-03-06 - - Tobias KrauseCommits: 83Joined: 2007-10-02 @@ -1665,33 +1668,30 @@ *Ricardo MontaniaCommits: 82Joined: 2012-08-18 - - *Serge KrotCommits: 80Joined: 2015-10-25 - - *Tobias MadlCommits: 74Joined: 2014-09-15 + *Xisco FauliCommits: 77Joined: 2018-02-01 - *Justin LuthCommits: 73Joined: 2018-04-21 + *Justin LuthCommits: 74Joined: 2018-04-21 - *Gergo MocsiCommits: 72Joined: 2013-02-14 + *Tobias MadlCommits: 74Joined: 2014-09-15 - *Xisco FauliCommits: 72Joined: 2018-02-01 + *Regina HenschelCommits: 73Joined: 2010-11-04 - *weigaoCommits: 72Joined: 2014-05-07 + *Gergo MocsiCommits: 72Joined: 2013-02-14 - Thorsten BosbachCommits: 70Joined: 2008-06-18 + *weigaoCommits: 72Joined: 2014-05-07 - *Regina HenschelCommits: 68Joined: 2010-11-04 + Thorsten BosbachCommits: 70Joined: 2008-06-18 *Michaël LefèvreCommits: 68Joined: 2011-02-22 @@ -1713,62 +1713,65 @@ - *Rohan KumarCommits: 65Joined: 2016-02-23 + *Rizal MuttaqinCommits: 66Joined: 2018-05-21 - *Juergen FunkCommits: 63Joined: 2014-09-17 + *Rohan KumarCommits: 65Joined: 2016-02-23 - *Mohammed Abdul AzeemCommits: 63Joined: 2016-02-08 + *Juergen FunkCommits: 64Joined: 2014-09-17 - *Rosemary SebastianCommits: 62Joined: 2015-06-23 + *Mohammed Abdul AzeemCommits: 63Joined: 2016-02-08 - *Pierre-Eric Pelloux-PrayerCommits: 61Joined: 2012-06-20 + *Rosemary SebastianCommits: 62Joined: 2015-06-23 - *Rizal MuttaqinCommits: 61Joined: 2018-05-21 + *Gabor KelemenCommits: 61Joined: 2019-01-12 - Wolfram Garten [wg]Commits: 61Joined: 2009-10-23 + *Pierre-Eric Pelloux-PrayerCommits: 61Joined: 2012-06-20 - Oliver Craemer [oc]Commits: 60Joined: 2009-10-23 + Wolfram Garten [wg]Commits: 61Joined: 2009-10-23 - *Jaskaran SinghCommits: 60Joined: 2016-02-18 + *Martin HoskenCommits: 60Joined: 2011-02-25 - *Simon SteinbeissCommits: 59Joined: 2015-06-01 + Oliver Craemer [oc]Commits: 60Joined: 2009-10-23 - Marc Neumann [msc]Commits: 59Joined: 2008-06-20 + *Jaskaran SinghCommits: 60Joined: 2016-02-18 - *Martin HoskenCommits: 59Joined: 2011-02-25 + *Simon SteinbeissCommits: 59Joined: 2015-06-01 - *shiming zhangCommits: 59Joined: 2013-11-04 + Marc Neumann [msc]Commits: 59Joined: 2008-06-20 - *tageziCommits: 58Joined: 2015-09-16 + *shiming zhangCommits: 59Joined: 2013-11-04 - *Aron BudeaCommits: 57Joined: 2014-12-22 + *Aron BudeaCommits: 58Joined: 2014-12-22 - *yiming juCommits: 57Joined: 2013-11-01 + *tageziCommits: 58Joined: 2015-09-16 + *yiming juCommits: 57Joined: 2013-11-01 + + *matteocamCommits: 56Joined: 2014-02-25 @@ -1777,11 +1780,11 @@ *Niklas JohanssonCommits: 55Joined: 2011-11-07 + + Nikolai PretzellCommits: 54Joined: 2001-03-09 - - *Mihály PalenikCommits: 54Joined: 2013-07-11 @@ -1791,40 +1794,40 @@ *Martin KepplingerCommits: 53Joined: 2011-02-18 + + *Rob SneldersCommits: 53Joined: 2011-02-08 - - + + *Lior KaplanCommits: 52Joined: 2010-10-05 + *Efe Gürkan YALAMANCommits: 52Joined: 2012-08-01 *Gulsah KoseCommits: 52Joined: 2015-03-14 + + *Will ThompsonCommits: 51Joined: 2012-03-21 *Faisal M. Al-OtaibiCommits: 51Joined: 2012-06-25 - - *Rachit GuptaCommits: 51Joined: 2014-01-18 *Cao Cuong NgoCommits: 51Joined: 2013-03-04 + + *Ptyl DragonCommits: 50Joined: 2013-05-09 - *Lior KaplanCommits: 49Joined: 2010-10-05 - - - - *Urs FässlerCommits: 48Joined: 2013-02-14 @@ -1833,11 +1836,11 @@ *Emmanuel Gil PeyrotCommits: 48Joined: 2015-11-19 + + *mingli juCommits: 48Joined: 2013-11-05 - - *Samuel ThibaultCommits: 48Joined: 2018-02-15 @@ -1845,84 +1848,84 @@ *J. Graeme LingardCommits: 47Joined: 2010-09-29 + *Ilmari LauhakangasCommits: 46Joined: 2017-04-15 + + + + *Alexandre VicenziCommits: 46Joined: 2014-01-15 *hongyu zhongCommits: 46Joined: 2013-11-04 - - *Mihai VargaCommits: 46Joined: 2014-02-27 *Susobhan GhoshCommits: 45Joined: 2016-01-03 + + mb93783Commits: 45Joined: 2009-07-15 *Eilidh McAdamCommits: 45Joined: 2011-03-10 - - *Daniel RobertsonCommits: 44Joined: 2015-06-27 Volker Ahrendt [va]Commits: 44Joined: 2002-04-15 + + *Luc CastermansCommits: 43Joined: 2011-11-13 *Philippe JungCommits: 43Joined: 2015-05-01 - - *Peter JentschCommits: 42Joined: 2011-01-07 *Mark WielaardCommits: 42Joined: 2013-05-13 + + *Sébastien Le RayCommits: 41Joined: 2011-02-10 *Christian M. HellerCommits: 41Joined: 2013-02-24 - - *Luke DellerCommits: 41Joined: 2012-11-26 *Tsutomu UchinoCommits: 41Joined: 2014-01-08 + + *Francisco SaitoCommits: 40Joined: 2011-03-21 *Mert TumerCommits: 40Joined: 2016-04-30 - - *Kayo HamidCommits: 39Joined: 2010-10-09 *minwangCommits: 39Joined: 2013-11-04 + + *Marc-André LaverdièreCommits: 39Joined: 2011-06-21 - *Ilmari LauhakangasCommits: 38Joined: 2017-04-15 - - - - *Damjan JovanovicCommits: 38Joined: 2015-08-26 @@ -1931,39 +1934,39 @@ *abdulmajeed ahmedCommits: 37Joined: 2012-07-07 + + + + *Christophe JAILLETCommits: 37Joined: 2012-06-14 + *Iain BillettCommits: 37Joined: 2012-04-11 - - *Jennifer LiebelCommits: 37Joined: 2014-08-29 *Vinaya MandkeCommits: 36Joined: 2013-02-08 + + *Radu IoanCommits: 36Joined: 2012-08-17 *Csikós TamásCommits: 36Joined: 2013-07-01 - - *Guillaume PousselCommits: 36Joined: 2010-12-22 *Priyanka GaikwadCommits: 36Joined: 2013-11-12 - - *Christophe JAILLETCommits: 36Joined: 2012-06-14 - + + *Santiago MartinezCommits: 35Joined: 2012-01-20 - - *Łukasz HryniukCommits: 35Joined: 2015-01-02 @@ -1973,11 +1976,11 @@ *Laurent CharrièreCommits: 35Joined: 2010-10-14 + + *Tobias LippertCommits: 35Joined: 2014-01-02 - - *Mark PageCommits: 35Joined: 2016-04-29 @@ -1987,11 +1990,11 @@ *Rodolfo Ribeiro GomesCommits: 34Joined: 2012-12-19 + + *Steve YinCommits: 34Joined: 2013-11-14 - - *Dennis RoczekCommits: 33Joined: 2015-06-09 @@ -2001,11 +2004,11 @@ *Yogesh BharateCommits: 33Joined: 2013-10-11 + + *Andreas MantkeCommits: 33Joined: 2010-09-29 - - *Laurent AlonsoCommits: 33Joined: 2011-10-23 @@ -2015,98 +2018,106 @@ *Dmitriy ShilinCommits: 32Joined: 2018-11-30 + + *Vishv BrahmbhattCommits: 32Joined: 2013-01-28 - - *Arnold DumasCommits: 32Joined: 2016-02-14 + *Aleksei NikiforovCommits: 32Joined: 2018-10-31 + + *Gautam PrajapatiCommits: 31Joined: 2017-02-06 + + *Sushil ShindeCommits: 31Joined: 2013-10-21 - *fengzengCommits: 31Joined: 2013-11-04 + *Aurimas FišerasCommits: 31Joined: 2010-10-11 - - - *Gabor KelemenCommits: 30Joined: 2019-01-12 + *fengzengCommits: 31Joined: 2013-11-04 *muleiCommits: 30Joined: 2013-11-01 + + *Kenneth VenkenCommits: 30Joined: 2010-10-15 *keremCommits: 30Joined: 2015-10-12 - - *Wols ListsCommits: 30Joined: 2010-11-07 *Jakub TrzebiatowskiCommits: 30Joined: 2016-03-07 + + *Christoph HerzogCommits: 30Joined: 2011-01-07 *Manal AlhassounCommits: 30Joined: 2012-09-10 - - *Bryan QuigleyCommits: 30Joined: 2012-12-12 *Isamu MogiCommits: 30Joined: 2013-04-27 + + *Daniel SilvaCommits: 29Joined: 2017-09-24 *Elton ChungCommits: 29Joined: 2012-01-31 - - *xinjiangCommits: 29Joined: 2013-11-04 *Harri PitkänenCommits: 29Joined: 2010-10-04 + + *Yeliz TaneroğluCommits: 28Joined: 2015-10-03 *Pallavi JadhavCommits: 28Joined: 2013-02-08 - - *Szabolcs DezsiCommits: 28Joined: 2012-02-16 *Jack LeighCommits: 28Joined: 2012-10-03 + + - *Aurimas FišerasCommits: 28Joined: 2010-10-11 + *Patrick JaapCommits: 28Joined: 2017-08-01 *Paul TrojahnCommits: 28Joined: 2017-05-27 - - + + *Balazs VargaCommits: 28Joined: 2018-07-05 + Andre Fischer<andre.f.fischerCommits: 28Joined: 2010-07-21 + + *Joel MaderoCommits: 27Joined: 2012-06-15 @@ -2116,11 +2127,11 @@ *Gökçen EraslanCommits: 27Joined: 2012-04-15 - - *Dipangar NiranjarCommits: 27Joined: 2016-01-03 + + *Ximeng ZuCommits: 27Joined: 2017-03-17 @@ -2130,11 +2141,11 @@ *Jorenz ParagasCommits: 27Joined: 2015-06-23 - - *Grzegorz AraminowiczCommits: 27Joined: 2017-04-01 + + *Akash JainCommits: 26Joined: 2016-03-25 @@ -2144,6 +2155,9 @@ *Nicolas ChristenerCommits: 26Joined: 2011-03-10 + + *Muhammet KaraCommits: 26Joined: 2018-12-06 + @@ -2153,16 +2167,13 @@ *Maxime de RoucyCommits: 26Joined: 2012-03-08 - *Aleksei NikiforovCommits: 26Joined: 2018-10-31 - - *Matthias SeidelCommits: 26Joined: 2017-02-18 - - *VortCommits: 25Joined: 2014-01-21 + + *aleksandar-stefanovicCommits: 25Joined: 2016-12-29 @@ -2170,25 +2181,17 @@ *Prashant PandeyCommits: 25Joined: 2013-02-20 - *Balazs VargaCommits: 25Joined: 2018-07-05 - - - - *Kurosawa TakeshiCommits: 25Joined: 2011-01-04 *Uray M. JánosCommits: 24Joined: 2012-07-17 - - *Baptiste DaroussinCommits: 24Joined: 2011-01-31 - - - *Patrick JaapCommits: 24Joined: 2017-08-01 - + *Baptiste DaroussinCommits: 24Joined: 2011-01-31 + + *Tomofumi YagiCommits: 24Joined: 2011-10-20 @@ -2197,11 +2200,11 @@ *Tomoyuki KubotaCommits: 24Joined: 2018-03-11 + + *Felix ZhangCommits: 23Joined: 2011-10-19 - - *Julien ChaffraixCommits: 23Joined: 2011-04-12 @@ -2209,42 +2212,42 @@ *ekuiitrCommits: 23Joined: 2017-10-13 + *Dennis FrancisCommits: 23Joined: 2018-11-15 + + + + *Marco A.G.PintoCommits: 23Joined: 2016-02-02 *Lucas BaudinCommits: 23Joined: 2011-01-25 - - *Robert RothCommits: 23Joined: 2010-10-31 *Christian DywanCommits: 23Joined: 2011-04-14 + + *Sören MöllerCommits: 23Joined: 2011-01-03 *Mario J. RugieroCommits: 23Joined: 2015-10-11 - - *zhenyu yuanCommits: 22Joined: 2013-11-06 *Jian Fang ZhangCommits: 22Joined: 2012-06-18 + + *Jacek WolszczakCommits: 22Joined: 2010-10-07 - *Muhammet KaraCommits: 22Joined: 2018-12-06 - - - - *Ruslan KabatsayevCommits: 22Joined: 2012-05-11 @@ -2253,154 +2256,162 @@ *Saurav ChiraniaCommits: 22Joined: 2018-01-14 + + + + *Roman KuznetsovCommits: 22Joined: 2018-10-23 + *Júlio HoffimannCommits: 22Joined: 2010-10-18 - - *Vitaliy AndersonCommits: 21Joined: 2016-12-09 *Bernhard WidlCommits: 21Joined: 2017-03-27 + + *Rohit DeshmukhCommits: 21Joined: 2013-09-30 *Tushar BendeCommits: 20Joined: 2013-09-27 - - *Andy HolderCommits: 20Joined: 2010-12-06 *Brad SowdenCommits: 20Joined: 2011-12-27 + + Eric BachardCommits: 20Joined: 2005-10-19 *Petr VorelCommits: 20Joined: 2012-02-17 - - *Peilin XiaoCommits: 19Joined: 2013-12-09 - *Lennard WasserthalCommits: 19Joined: 2012-08-11 + *krishna keshavCommits: 19Joined: 2016-05-05 + + - *krishna keshavCommits: 19Joined: 2016-05-05 + *Lennard WasserthalCommits: 19Joined: 2012-08-11 *Aleksas PantechovskisCommits: 19Joined: 2016-03-03 - - *AndrewCommits: 19Joined: 2014-02-26 *Sven WehnerCommits: 19Joined: 2014-01-11 + + *Ravindra VidhateCommits: 19Joined: 2014-01-30 Xiaofei ZhangCommits: 19Joined: 2010-06-28 - - *Abdulelah AlarifiCommits: 18Joined: 2012-12-12 *Joost WezenbeekCommits: 18Joined: 2010-10-24 + + Hanno Meyer-ThurowCommits: 18Joined: 2010-09-16 *Mert TümerCommits: 18Joined: 2018-01-08 - - *Richard PALOCommits: 18Joined: 2014-11-09 *Federico BassiniCommits: 18Joined: 2016-10-06 + + *Boris DušekCommits: 18Joined: 2013-07-21 *Zdibák ZoltánCommits: 18Joined: 2018-10-13 - - *Alain RomedenneCommits: 17Joined: 2018-12-19 *Alfonso EusebioCommits: 17Joined: 2011-01-16 + + *Vikas MahatoCommits: 17Joined: 2017-12-31 *Thomas BeckCommits: 17Joined: 2017-03-27 - - *Jian Hong ChengCommits: 17Joined: 2012-06-26 *Kshitij PathaniaCommits: 17Joined: 2017-09-28 + + *Bálint DózsaCommits: 17Joined: 2011-02-10 *melikeyurtogluCommits: 17Joined: 2015-10-09 - - *Francisco Adrián SánchezCommits: 17Joined: 2016-10-07 *Umesh KadamCommits: 17Joined: 2014-01-10 + + *navin patidarCommits: 17Joined: 2013-01-06 *Jean-Noël RouvignacCommits: 16Joined: 2013-01-09 - - *tsahi glikCommits: 16Joined: 2013-06-04 *Jordan AyersCommits: 16Joined: 2010-11-04 + + *Niko RönkköCommits: 16Joined: 2010-10-31 *Anders JonssonCommits: 16Joined: 2010-12-11 - - + + *Ilhan YesilCommits: 16Joined: 2018-04-11 + *Chris LaplanteCommits: 16Joined: 2014-04-07 + + Florian ReuterCommits: 16Joined: 2010-09-14 @@ -2410,36 +2421,28 @@ *Maciej RumianowskiCommits: 16Joined: 2011-07-19 - - *Luke DixonCommits: 16Joined: 2010-10-26 - - *Roman KuznetsovCommits: 16Joined: 2018-10-23 - + + *Lei De BinCommits: 16Joined: 2012-07-04 *Nikhil WalvekarCommits: 15Joined: 2013-11-01 - - *Catalin IacobCommits: 15Joined: 2012-02-10 *Luke SymesCommits: 15Joined: 2010-10-01 - - *Ilhan YesilCommits: 15Joined: 2018-04-11 - + + *Andreas BrandnerCommits: 15Joined: 2017-09-04 - - *Joachim TremourouxCommits: 15Joined: 2010-11-19 @@ -2449,11 +2452,11 @@ *Armin Le GrandCommits: 15Joined: 2018-02-15 + + *Yifan JCommits: 15Joined: 2010-12-16 - - *Alexander BergmannCommits: 15Joined: 2012-01-13 @@ -2463,11 +2466,11 @@ *Cosimo CecchiCommits: 15Joined: 2011-11-02 + + *Heena GuptaCommits: 15Joined: 2014-06-17 - - *Nickson ThandaCommits: 14Joined: 2018-03-25 @@ -2477,11 +2480,11 @@ *Zhe WangCommits: 14Joined: 2012-06-20 + + *Sun YingCommits: 14Joined: 2012-08-16 - - *Björgvin RagnarssonCommits: 14Joined: 2012-02-13 @@ -2491,11 +2494,11 @@ *Tim HardeckCommits: 14Joined: 2011-11-03 + + *Gökhan GurbetoğluCommits: 14Joined: 2016-06-06 - - *Zsolt BölönyCommits: 14Joined: 2015-01-10 @@ -2505,11 +2508,11 @@ *sabri unalCommits: 13Joined: 2018-11-20 + + *gerhard oettlCommits: 13Joined: 2012-08-27 - - *Prashant ShahCommits: 13Joined: 2010-10-10 @@ -2519,11 +2522,11 @@ *Muhammad HaggagCommits: 13Joined: 2012-02-01 + + *Alia AlmusaireaeCommits: 13Joined: 2012-11-05 - - *Manfred BlumeCommits: 13Joined: 2017-03-27 @@ -2533,11 +2536,11 @@ *kadertarlanCommits: 12Joined: 2015-12-14 + + *Gábor StefanikCommits: 12Joined: 2012-04-07 - - *Mariusz DykierekCommits: 12Joined: 2012-01-16 @@ -2547,9 +2550,6 @@ *Greg Kroah-HartmanCommits: 12Joined: 2012-02-06 - - *Dennis FrancisCommits: 12Joined: 2018-11-15 - @@ -2646,11 +2646,14 @@ *Charu TyagiCommits: 11Joined: 2014-06-25 - *René KjellerupCommits: 11Joined: 2010-10-14 + *Martin van ZijlCommits: 11Joined: 2018-02-26 + *René KjellerupCommits: 11Joined: 2010-10-14 + + *Jianyuan LiCommits: 10Joined: 2012-08-16 @@ -2659,11 +2662,11 @@ *Kristian RietveldCommits: 10Joined: 2011-10-15 + + *Chirag ManwaniCommits: 10Joined: 2016-02-16 - - *Troy RolloCommits: 10Joined: 2011-07-11 @@ -2671,69 +2674,69 @@ *Theo van KlaverenCommits: 10Joined: 2011-03-10 + *Mark RobbinsonCommits: 10Joined: 2019-01-02 + + + + *Dilek UzulmezCommits: 10Joined: 2016-10-15 *Luke PetrolekasCommits: 10Joined: 2011-02-12 - - *Stefan WeibergCommits: 10Joined: 2014-08-28 *Arul MichaelCommits: 10Joined: 2016-01-05 + + - *Martin van ZijlCommits: 10Joined: 2018-02-26 + *David VogtCommits: 10Joined: 2012-02-05 *Rahul GurungCommits: 10Joined: 2018-08-26 - - *Timo HeinoCommits: 10Joined: 2010-11-22 *Martin SrebotnjakCommits: 9Joined: 2010-12-19 + + *Dinesh PatilCommits: 9Joined: 2014-03-12 *Steven ButlerCommits: 9Joined: 2011-01-07 - - *skswalesCommits: 9Joined: 2016-05-06 *Robinson TryonCommits: 9Joined: 2012-06-21 + + *Michael DunphyCommits: 9Joined: 2013-04-18 *Ryan McCoskrieCommits: 9Joined: 2014-09-14 - - *Matthew PottageCommits: 9Joined: 2014-07-26 - *Mark RobbinsonCommits: 9Joined: 2019-01-02 - - *Aybuke OzdemirCommits: 9Joined: 2015-10-07 + + *pv2kCommits: 9Joined: 2016-11-28 - - *Surendran MahendranCommits: 9Joined: 2010-11-05 @@ -2741,16 +2744,24 @@ *Mattias JohnssonCommits: 9Joined: 2010-10-18 - *David VogtCommits: 9Joined: 2012-02-05 + *Marco A.G.PintoCommits: 8Joined: 2018-07-16 + + *Sean DavisCommits: 8Joined: 2015-06-01 - - + + *Gülşah KöseCommits: 8Joined: 2019-01-17 + + + *Shubham GoyalCommits: 8Joined: 2019-02-26 + *Norah A. AbanumayCommits: 8Joined: 2012-07-30 + + *Matus UzakCommits: 8Joined: 2016-02-22 @@ -2760,11 +2771,11 @@ *Michael CallahanCommits: 8Joined: 2010-12-06 - - *Jenei GáborCommits: 8Joined: 2011-07-29 + + *Robert DargaudCommits: 8Joined: 2011-04-12 @@ -2774,11 +2785,11 @@ *Alain RomedenneCommits: 8Joined: 2018-11-29 - - *ShinnokCommits: 8Joined: 2017-09-06 + + *Ursache VladimirCommits: 8Joined: 2015-02-10 @@ -2788,11 +2799,11 @@ Fong LinCommits: 8Joined: 2010-09-14 - - *Keith CurtisCommits: 8Joined: 2013-12-20 + + *RajashriCommits: 8Joined: 2013-12-06 @@ -2802,11 +2813,11 @@ *Jean-Tiare Le BigotCommits: 8Joined: 2012-08-08 - - *HeiherCommits: 8Joined: 2015-07-07 + + *Timothy PearsonCommits: 8Joined: 2012-08-18 @@ -2816,11 +2827,11 @@ *karthCommits: 8Joined: 2013-01-07 - - *Nathan YeeCommits: 8Joined: 2015-01-01 + + *Jonathan AdamsCommits: 8Joined: 2012-03-16 @@ -2830,11 +2841,11 @@ *Ahmad H. Al HarthiCommits: 8Joined: 2012-12-31 - - *IanCommits: 8Joined: 2015-08-06 + + *Adam KovacsCommits: 7Joined: 2018-08-16 @@ -2844,38 +2855,41 @@ *RaalCommits: 7Joined: 2014-12-31 - - - - *Marco A.G.PintoCommits: 7Joined: 2018-07-16 - *Tiago SantosCommits: 7Joined: 2016-08-12 + + *David DelmaCommits: 7Joined: 2014-05-13 *Roi IllouzCommits: 7Joined: 2013-10-20 - - *Gert van ValkenhoefCommits: 7Joined: 2012-02-14 *Thies PierdolaCommits: 7Joined: 2011-01-28 + + *Mathias MichelCommits: 7Joined: 2012-11-19 + *LibreOfficiantCommits: 7Joined: 2019-02-25 + + *Giuseppe BilottaCommits: 7Joined: 2014-09-09 + + *iremCommits: 7Joined: 2015-10-11 + - *iremCommits: 7Joined: 2015-10-11 + *Hamish McIntyre-BhattyCommits: 7Joined: 2018-10-10 *apurvapriyadarshiCommits: 7Joined: 2016-05-27 @@ -2976,7 +2990,7 @@ *abdulwdCommits: 6Joined: 2016-12-22 - *Gülşah KöseCommits: 6Joined: 2019-01-17 + *AdityaCommits: 6Joined: 2019-01-04 *Phil BordelonCommits: 6Joined: 2010-09-30 @@ -3001,9 +3015,6 @@ - *Hamish McIntyre-BhattyCommits: 6Joined: 2018-10-10 - - *David VerrierCommits: 6Joined: 2013-02-26 @@ -3012,11 +3023,11 @@ *Anurag KanungoCommits: 6Joined: 2013-04-19 - - *Jeroen NijhofCommits: 6Joined: 2014-05-01 + + *Gian Domenico CeccariniCommits: 6Joined: 2017-01-13 @@ -3026,11 +3037,11 @@ *udareechkCommits: 6Joined: 2017-09-20 - - *Fabio BusoCommits: 6Joined: 2015-11-01 + + *Daniel Di MarcoCommits: 6Joined: 2010-11-15 @@ -3040,11 +3051,11 @@ *giaccoCommits: 6Joined: 2016-10-11 - - *Sedat AkCommits: 6Joined: 2015-11-08 + + *Steven GuoCommits: 6Joined: 2016-03-02 @@ -3054,11 +3065,11 @@ *Alexander O. AnisimovCommits: 6Joined: 2010-11-06 - - *Werner KoernerCommits: 5Joined: 2012-12-11 + + *Antoine ProulxCommits: 5Joined: 2011-01-30 @@ -3068,11 +3079,11 @@ *ericb2Commits: 5Joined: 2011-10-30 - - *Ciorba EdmondCommits: 5Joined: 2013-06-11 + + *Wei Ming KhooCommits: 5Joined: 2012-02-17 @@ -3082,11 +3093,11 @@ *Matthias HofmannCommits: 5Joined: 2013-03-08 - - *Bernhard RosenkraenzerCommits: 5Joined: 2010-11-01 + + *Miguel GomezCommits: 5Joined: 2013-04-02 @@ -3096,10 +3107,13 @@ *Ricardo PalomaresCommits: 5Joined: 2016-01-16 + + *pje335_NLCommits: 5Joined: 2013-05-10 + - *pje335_NLCommits: 5Joined: 2013-05-10 + *Thomas ViehmannCommits: 5Joined: 2014-08-15 *Pavel JaníkCommits: 5Joined: 2012-11-29 @@ -3197,9 +3211,6 @@ - *AdityaCommits: 4Joined: 2019-01-04 - - *Elie RouxCommits: 4Joined: 2013-05-29 @@ -3208,90 +3219,93 @@ *Simon DannerCommits: 4Joined: 2014-08-02 - - - - *Thomas ViehmannCommits: 4Joined: 2014-08-15 - *Mihkel TõnnovCommits: 4Joined: 2012-07-02 + + *Olivier TilloyCommits: 4Joined: 2018-01-08 *Fyodor YemelyanenkoCommits: 4Joined: 2017-08-21 - - *pasqual milvaquesCommits: 4Joined: 2015-12-02 *Alex HenrieCommits: 4Joined: 2014-03-05 + + *Derrick RochaCommits: 4Joined: 2015-08-26 *Maja DjordjevicCommits: 4Joined: 2011-01-06 - - *Michael MuenchCommits: 4Joined: 2011-02-13 *Andrea PescettiCommits: 4Joined: 2013-10-07 + + *Ulrich KitzingerCommits: 4Joined: 2013-11-30 *Sameer DeshmukhCommits: 4Joined: 2013-04-20 - - *Patrick JaapCommits: 4Joined: 2017-01-30 *Burcin AkalinCommits: 4Joined: 2015-12-18 - + + + *XiaoliCommits: 4Joined: 2013-03-23 *Fabio BiocchettiCommits: 4Joined: 2016-10-21 - - *Mariana MarasoiuCommits: 4Joined: 2012-03-14 *coypuCommits: 4Joined: 2016-02-03 + + *Kumar ThangavelCommits: 4Joined: 2016-01-04 *Nicholas ShanksCommits: 4Joined: 2012-09-04 - - *Samuel ThibaultCommits: 4Joined: 2018-09-05 *Gaurav DhingraCommits: 4Joined: 2016-12-03 + + *Sahasranaman M SCommits: 4Joined: 2015-10-04 *Aleksandr AndreevCommits: 4Joined: 2015-04-20 + + *Grzegorz AraminowiczCommits: 4Joined: 2019-03-08 + + + *Rasmus JonssonCommits: 4Joined: 2019-03-20 + @@ -3318,11 +3332,14 @@ *aqcoderCommits: 4Joined: 2015-12-13 - *Andrew C. E. DentCommits: 4Joined: 2010-10-24 + *Pantelis KoukousoulasCommits: 4Joined: 2011-03-14 + *Andrew C. E. DentCommits: 4Joined: 2010-10-24 + + *Florian BircherCommits: 4Joined: 2010-10-16 @@ -3331,11 +3348,11 @@ *tinoCommits: 4Joined: 2012-12-03 + + *Piotr DrągCommits: 4Joined: 2017-03-05 - - *GurkaranCommits: 4Joined: 2016-03-17 @@ -3345,13 +3362,13 @@ *Nourah.AlShoeibiCommits: 4Joined: 2013-07-07 + + *Yong Lin MaCommits: 4Joined: 2012-06-07 - - - *Pantelis KoukousoulasCommits: 4Joined: 2011-03-14 + *Roland BaudinCommits: 4Joined: 2011-05-16 *Andreas BeckerCommits: 4Joined: 2011-04-04 @@ -3359,11 +3376,11 @@ *Sumit ChauhanCommits: 4Joined: 2018-12-04 + + *Florian ReisingerCommits: 4Joined: 2012-06-22 - - *Zheng FanCommits: 4Joined: 2013-04-22 @@ -3373,11 +3390,11 @@ *erdemdemirkapiCommits: 4Joined: 2016-01-30 + + *Raimundo MouraCommits: 4Joined: 2012-06-16 - - *Honza HavlíčekCommits: 4Joined: 2013-07-27 @@ -3387,11 +3404,11 @@ *bansan85Commits: 3Joined: 2016-12-21 + + *Alan DuCommits: 3Joined: 2010-10-12 - - *Stefan SchickCommits: 3Joined: 2013-02-18 @@ -3401,11 +3418,11 @@ *Gioele BarabucciCommits: 3Joined: 2010-11-18 + + *Simon LongCommits: 3Joined: 2015-07-08 - - *Giovanni CaligarisCommits: 3Joined: 2015-11-30 @@ -3415,11 +3432,11 @@ *Markus MaierCommits: 3Joined: 2012-11-25 + + *Gabriele BulfonCommits: 3Joined: 2013-07-05 - - *Michael KochCommits: 3Joined: 2011-01-21 @@ -3429,11 +3446,11 @@ *vjinochCommits: 3Joined: 2013-04-09 + + *Bán RóbertCommits: 3Joined: 2017-10-25 - - *Stefan HeinemannCommits: 3Joined: 2012-02-16 @@ -3443,11 +3460,11 @@ *Michael BauerCommits: 3Joined: 2011-11-23 + + *Ivan SafonovCommits: 3Joined: 2017-07-13 - - *Popa Adrian MariusCommits: 3Joined: 2015-03-23 @@ -3457,11 +3474,11 @@ *Matthew NichollsCommits: 3Joined: 2015-04-01 + + *Florian Allmann-RahnCommits: 3Joined: 2011-08-22 - - *n.r.pearsonCommits: 3Joined: 2015-09-09 @@ -3471,11 +3488,11 @@ *Peter BaumgartenCommits: 3Joined: 2012-11-24 + + *Dimitri DucCommits: 3Joined: 2011-04-19 - - *Peter Senna TschudinCommits: 3Joined: 2014-05-26 @@ -3483,9 +3500,6 @@ *Marek DoleželCommits: 3Joined: 2015-07-06 - *LibreOfficiantCommits: 3Joined: 2019-02-25 - - *Mayank GuptaCommits: 3Joined: 2016-03-11 @@ -3511,14 +3525,17 @@ *liongoldCommits: 3Joined: 2016-11-21 - *Tom ThorogoodCommits: 3Joined: 2012-02-28 + *Tünde TóthCommits: 3Joined: 2019-03-14 - *Chris Carpenter(mordocai)Commits: 3Joined: 2011-02-02 + *Tom ThorogoodCommits: 3Joined: 2012-02-28 + *Chris Carpenter(mordocai)Commits: 3Joined: 2011-02-02 + + *Bertrand LorentzCommits: 3Joined: 2012-08-03 @@ -3527,11 +3544,11 @@ *Bartosz KosiorekCommits: 3Joined: 2018-02-07 + + *Tobias MuellerCommits: 3Joined: 2014-02-10 - - *Haidong LianCommits: 3Joined: 2013-07-24 @@ -3541,11 +3558,11 @@ *Robert M CampbellCommits: 3Joined: 2013-11-13 + + *Renato FerreiraCommits: 3Joined: 2014-11-15 - - *Pascal UllrichCommits: 3Joined: 2010-12-28 @@ -3555,11 +3572,11 @@ *Istvan TuriCommits: 3Joined: 2012-08-16 + + *Johannes BergCommits: 3Joined: 2016-08-03 - - *Omer Fatih CelikCommits: 3Joined: 2019-02-10 @@ -3567,53 +3584,50 @@ *Laurent GodardCommits: 3Joined: 2018-04-24 + *TelestoCommits: 3Joined: 2018-01-22 + + + + *Lucas SatabinCommits: 3Joined: 2015-08-25 Keith StribleyCommits: 3Joined: 2010-06-29 - - *Mike EberdtCommits: 3Joined: 2011-07-12 *Joan MontaneCommits: 3Joined: 2013-02-22 + + *Stephan van den AkkerCommits: 3Joined: 2012-06-07 *baltasarqCommits: 3Joined: 2016-02-24 - - *Benjamin DrungCommits: 3Joined: 2012-06-08 *Jason HulmeCommits: 3Joined: 2013-06-05 + + *Jozsef SzakacsCommits: 3Joined: 2018-11-07 *Oliver GüntherCommits: 3Joined: 2012-08-09 - - - - *TelestoCommits: 3Joined: 2018-01-22 - *drazilCommits: 3Joined: 2016-08-27 *Guto MaiaCommits: 3Joined: 2011-03-18 - - *Roland BaudinCommits: 3Joined: 2011-05-16 - @@ -3760,16 +3774,19 @@ *Flex LiuCommits: 2Joined: 2012-09-04 + *Andrés MaldonadoCommits: 2Joined: 2019-02-21 + + *mmeof2Commits: 2Joined: 2013-05-03 *Akash ShetyeCommits: 2Joined: 2013-03-23 + + *Michal KubecekCommits: 2Joined: 2016-06-02 - - *G_ZoltanCommits: 2Joined: 2016-12-27 @@ -3779,15 +3796,23 @@ *Michal SvecCommits: 2Joined: 2011-07-12 + + *Adam MrózCommits: 2Joined: 2013-02-24 - - + + *Mert TumerCommits: 2Joined: 2019-01-17 + *Ed DeanCommits: 2Joined: 2011-01-14 + *Jaromir WysogladCommits: 2Joined: 2019-03-27 + + + + *Jean Charles PapinCommits: 2Joined: 2011-02-11 @@ -3796,11 +3821,11 @@ *Kishor BhatCommits: 2Joined: 2015-01-28 - - *Ferran VidalCommits: 2Joined: 2012-04-21 + + *Réka CsékeiCommits: 2Joined: 2018-10-09 @@ -3810,11 +3835,11 @@ *Akash DeshpandeCommits: 2Joined: 2016-08-13 - - *Dwayne BaileyCommits: 2Joined: 2010-11-03 + + *Furkan Ahmet KaraCommits: 2Joined: 2017-10-21 @@ -3824,11 +3849,11 @@ *Daniel StoneCommits: 2Joined: 2014-10-29 - - *Milos SramekCommits: 2Joined: 2012-01-20 + + *JeevanCommits: 2Joined: 2017-03-04 @@ -3838,11 +3863,11 @@ *Clarence GuoCommits: 2Joined: 2014-05-26 - - Loiseleur MichelCommits: 2Joined: 2010-09-14 + + *Laszlo Kis-AdamCommits: 2Joined: 2015-03-12 @@ -3852,11 +3877,11 @@ *Ward van WanrooijCommits: 2Joined: 2012-06-25 - - *Mark DoboCommits: 2Joined: 2018-10-20 + + *Jesso Clarence MuruganCommits: 2Joined: 2012-06-23 @@ -3866,6 +3891,9 @@ *Andreas SchierlCommits: 2Joined: 2012-01-30 + + *Martin LiškaCommits: 2Joined: 2014-03-26 + @@ -3892,14 +3920,11 @@ *Andreu Correa CasablancaCommits: 2Joined: 2011-09-11 - *Martin NathansenCommits: 2Joined: 2016-04-18 + *martinb214Commits: 2Joined: 2017-11-28 - *martinb214Commits: 2Joined: 2017-11-28 - - *YiiChang YenCommits: 2Joined: 2014-10-16 @@ -3908,10 +3933,13 @@ *Yogesh DesaiCommits: 2Joined: 2016-01-05 + + *Jonathan CallenCommits: 2Joined: 2011-01-29 + - *Jonathan CallenCommits: 2Joined: 2011-01-29 + *Phil KrylovCommits: 2Joined: 2019-02-10 *Mathieu ParentCommits: 2Joined: 2013-10-14 @@ -4065,6 +4093,9 @@ + *Martin NathansenCommits: 2Joined: 2016-04-18 + + *Tóth AttilaCommits: 2Joined: 2018-12-30 @@ -4073,11 +4104,11 @@ *brinzingCommits: 2Joined: 2015-08-22 + + *Pierre LepageCommits: 2Joined: 2016-11-05 - - *Karsten GerloffCommits: 2Joined: 2011-02-06 @@ -4087,98 +4118,106 @@ *Markus WernigCommits: 2Joined: 2015-03-18 + + *Karthik A PadmanabhanCommits: 2Joined: 2012-03-31 - - + + *kaishu-sahuCommits: 2Joined: 2019-01-27 + *Maxim IorshCommits: 2Joined: 2011-10-05 *dbeurleCommits: 2Joined: 2015-01-12 + + *Carlos LuqueCommits: 2Joined: 2015-07-16 *Robert SedakCommits: 2Joined: 2010-10-05 - - *Janit AnjariaCommits: 2Joined: 2013-04-19 *Sheikha AL-HinaiCommits: 2Joined: 2015-12-28 + + *Moritz KuettCommits: 2Joined: 2013-03-23 *Denis ArnaudCommits: 2Joined: 2018-01-16 - - *Andika TriwidadaCommits: 2Joined: 2018-02-15 *Furkan TokacCommits: 2Joined: 2017-10-25 + + *ackepenekCommits: 2Joined: 2016-02-21 *Richard HughesCommits: 2Joined: 2013-10-01 - - *Cyril RoelandtCommits: 2Joined: 2011-04-26 *Yury TarasievichCommits: 2Joined: 2011-11-23 + + *Hideki IkedaCommits: 2Joined: 2014-06-25 *Takashi NakamotoCommits: 2Joined: 2011-08-28 - - *Daniel HerdeCommits: 2Joined: 2012-08-09 *Kelly AndersonCommits: 2Joined: 2011-05-31 + + *Arne de BruijnCommits: 2Joined: 2012-12-11 *Alexey VlasovCommits: 2Joined: 2017-04-12 - - *Emanuele FiaCommits: 2Joined: 2011-11-02 *Johann MessnerCommits: 2Joined: 2012-08-28 + + + + *Alexander FarrowCommits: 2Joined: 2019-03-19 + *Supreme AryalCommits: 2Joined: 2014-12-04 *Nadav VinikCommits: 2Joined: 2010-10-21 - - *Yash SrivastavCommits: 2Joined: 2017-06-20 + + *Bisal NayalCommits: 2Joined: 2014-05-07 @@ -4188,11 +4227,11 @@ *Nurhak ALTINCommits: 1Joined: 2016-05-01 - - *Goran RakicCommits: 1Joined: 2013-03-30 + + *orbeaCommits: 1Joined: 2018-06-01 @@ -4202,11 +4241,11 @@ *Martin BrownCommits: 1Joined: 2013-02-23 - - *Philipp KaluzaCommits: 1Joined: 2012-10-21 + + *Milan CrhaCommits: 1Joined: 2013-02-07 @@ -4216,11 +4255,11 @@ *Christina AccioneCommits: 1Joined: 2016-11-22 - - *Swachhand LokhandeCommits: 1Joined: 2015-03-07 + + *Ruggero CyrilleCommits: 1Joined: 2014-10-18 @@ -4230,11 +4269,11 @@ *Pádraig BradyCommits: 1Joined: 2011-10-21 - - *Foo Lai ChooCommits: 1Joined: 2014-11-26 + + *Srijan ChoudharyCommits: 1Joined: 2013-08-10 @@ -4244,11 +4283,11 @@ *Atef haresCommits: 1Joined: 2017-03-12 - - *Tzvetelina TzenevaCommits: 1Joined: 2011-12-22 + + *Kenneth BeckCommits: 1Joined: 2013-03-02 @@ -4258,11 +4297,11 @@ *Alberto FerreiraCommits: 1Joined: 2012-06-08 - - *Francesco GradiCommits: 1Joined: 2017-05-29 + + *Jörg SonnenbergerCommits: 1Joined: 2014-08-28 @@ -4272,11 +4311,11 @@ *Debarshi RayCommits: 1Joined: 2016-01-08 - - *Ajay MahatoCommits: 1Joined: 2019-01-21 + + *Mattias PõldaruCommits: 1Joined: 2014-12-06 @@ -4286,11 +4325,11 @@ *serdarot5Commits: 1Joined: 2017-08-05 - - *Andreas SliwkaCommits: 1Joined: 2011-02-06 + + *Jeff AignerCommits: 1Joined: 2011-06-09 @@ -4300,11 +4339,11 @@ *Ta Duc TungCommits: 1Joined: 2011-08-08 - - *thvalloisCommits: 1Joined: 2017-01-03 + + *Gabriel HerreraCommits: 1Joined: 2017-04-05 @@ -4314,11 +4353,11 @@ *Robin KumarCommits: 1Joined: 2014-06-17 - - *Neven ĆosićCommits: 1Joined: 2012-10-08 + + *Lennart PoetteringCommits: 1Joined: 2014-10-09 @@ -4328,11 +4367,11 @@ *Mathieu DCommits: 1Joined: 2012-11-19 - - *Benjamin OtteCommits: 1Joined: 2013-06-15 + + *Kevin Brubeck UnhammerCommits: 1Joined: 2018-04-14 @@ -4342,11 +4381,11 @@ *Willian BriottoCommits: 1Joined: 2015-11-21 - - *nigeldiasCommits: 1Joined: 2017-10-02 + + *Dobra GaborCommits: 1Joined: 2015-04-02 @@ -4356,11 +4395,11 @@ *Naser SharifiCommits: 1Joined: 2012-11-26 - - *Shreyansh GandhiCommits: 1Joined: 2014-06-10 + + *Michael KovarikCommits: 1Joined: 2015-01-07 @@ -4370,11 +4409,11 @@ *Mathias SuppCommits: 1Joined: 2014-02-25 - - *Eric S. RaymondCommits: 1Joined: 2013-06-07 + + *Bernhard M. WiedemannCommits: 1Joined: 2011-10-17 @@ -4384,11 +4423,11 @@ *Rafael CabralCommits: 1Joined: 2011-03-31 - - *tinderboxCommits: 1Joined: 2013-04-11 + + *pgajdosCommits: 1Joined: 2011-01-31 @@ -4398,12 +4437,12 @@ *Saurav SachidanandCommits: 1Joined: 2017-01-17 - - *Simon WilperCommits: 1Joined: 2015-01-24 - + + + *Andreas K. Huettel (dilfridge)Commits: 1Joined: 2015-01-04 @@ -4412,11 +4451,11 @@ *Javier CatalaCommits: 1Joined: 2012-04-26 - - *Apachev IvanCommits: 1Joined: 2016-03-08 + + *n5xgdhCommits: 1Joined: 2016-12-04 @@ -4426,11 +4465,11 @@ *Phil HartCommits: 1Joined: 2012-06-29 - - *KappanneoCommits: 1Joined: 2017-05-29 + + *massinissaHamidiCommits: 1Joined: 2015-05-07 @@ -4440,11 +4479,11 @@ *armijnCommits: 1Joined: 2010-12-30 - - *Rizal MuttaqinCommits: 1Joined: 2018-12-18 + + *Ondřej SmržCommits: 1Joined: 2013-03-10 @@ -4454,11 +4493,11 @@ *Suhail AlkowaileetCommits: 1Joined: 2017-12-25 - - *James ClarkeCommits: 1Joined: 2016-08-05 + + *ritztroCommits: 1Joined: 2015-04-11 @@ -4468,11 +4507,11 @@ *Alain RomedenneCommits: 1Joined: 2018-11-22 - - *Marcel HBCommits: 1Joined: 2011-05-03 + + *Xavi Escriche GalindoCommits: 1Joined: 2012-04-24 @@ -4482,10 +4521,13 @@ *Keigo KawamuraCommits: 1Joined: 2015-11-16 + + *Mirco RondiniCommits: 1Joined: 2016-10-10 + - *Mirco RondiniCommits: 1Joined: 2016-10-10 + *Greg VeldmanCommits: 1Joined: 2019-03-24 *Helena SvobodovaCommits: 1Joined: 2016-05-25 @@ -4508,14 +4550,11 @@ *Heiko TietzeCommits: 1Joined: 2018-04-16 - *Andrés MaldonadoCommits: 1Joined: 2019-02-21 + *Timotej LazarCommits: 1Joined: 2017-11-22 - *Timotej LazarCommits: 1Joined: 2017-11-22 - - *qzhengCommits: 1Joined: 2017-11-14 @@ -4524,11 +4563,11 @@ *Johannes WidmerCommits: 1Joined: 2013-03-23 - - *Ryo ONODERACommits: 1Joined: 2014-04-07 + + *umairshahidCommits: 1Joined: 2015-05-29 @@ -4538,11 +4577,11 @@ *Mike SaundersCommits: 1Joined: 2016-06-20 - - *Masataka ShinkeCommits: 1Joined: 2012-02-15 + + *Jason GerlowskiCommits: 1Joined: 2014-03-07 @@ -4552,95 +4591,95 @@ *Victor LeeCommits: 1Joined: 2011-12-24 - - *Yusuf SonmezCommits: 1Joined: 2019-02-10 + + *Andreas SägerCommits: 1Joined: 2017-03-26 - *Mert TumerCommits: 1Joined: 2019-01-17 - - *AWASHIRO IkuyaCommits: 1Joined: 2011-01-04 - - *Christoph BrillCommits: 1Joined: 2016-02-09 *Valek FilippovCommits: 1Joined: 2013-02-23 + + *Joshua CogliatiCommits: 1Joined: 2012-01-06 *xjclCommits: 1Joined: 2014-08-04 - - *Julian MehneCommits: 1Joined: 2016-08-04 *Andrea MussapCommits: 1Joined: 2016-10-02 + + *Javier Silva SanahujaCommits: 1Joined: 2012-04-23 *Matti LehtonenCommits: 1Joined: 2017-10-07 - - *Andrew RistCommits: 1Joined: 2012-10-05 *Travis CarterCommits: 1Joined: 2012-06-22 + + *Péter SzathmáryCommits: 1Joined: 2015-01-07 *Çağrı DolazCommits: 1Joined: 2018-12-30 - - *Arianna MascioliniCommits: 1Joined: 2017-05-29 *Howard JohnsonCommits: 1Joined: 2018-11-25 + + *EL-SHREIFCommits: 1Joined: 2019-02-24 *Hiroto KagotaniCommits: 1Joined: 2014-08-19 - - *Alberto RuizCommits: 1Joined: 2011-03-31 *Petr GajdosCommits: 1Joined: 2015-04-07 + + *Stefano FacchiniCommits: 1Joined: 2013-08-22 *ReshmaCommits: 1Joined: 2018-03-09 - - + + *Jason BurnsCommits: 1Joined: 2019-04-08 + *Mark WrightCommits: 1Joined: 2013-02-09 + + *Ilya PonamarevCommits: 1Joined: 2016-10-05 @@ -4650,11 +4689,11 @@ *Guilhem MoulinCommits: 1Joined: 2018-02-05 - - *roopak12345Commits: 1Joined: 2014-03-09 + + *Juan Pablo Martínez CortésCommits: 1Joined: 2011-11-28 @@ -4664,11 +4703,11 @@ *Rostislav KondratenkoCommits: 1Joined: 2018-02-21 - - *Doğa Deniz ArıcıCommits: 1Joined: 2018-12-30 + + *Christopher BackhouseCommits: 1Joined: 2010-12-06 @@ -4676,6 +4715,9 @@ *Andy HearnCommits: 1Joined: 2011-01-09 + *kushagrakasliwal1Commits: 1Joined: 2019-03-18 + + *Karl KoehlerCommits: 1Joined: 2011-11-11 @@ -4774,11 +4816,14 @@ *Pierre SauterCommits: 1Joined: 2015-12-01 - *NeilBrownCommits: 1Joined: 2010-09-28 + *Sainal ShahCommits: 1Joined: 2019-03-10 + *NeilBrownCommits: 1Joined: 2010-09-28 + + *Miguel FernándezCommits: 1Joined: 2012-04-26 @@ -4787,11 +4832,11 @@ *Leo MoonsCommits: 1Joined: 2018-08-26 + + *Jean-François Fortin TamCommits: 1Joined: 2013-06-10 - - *Kristóf UmannCommits: 1Joined: 2017-10-25 @@ -4801,9 +4846,6 @@ *Chandanathil P. GeevanCommits: 1Joined: 2016-10-24 - - *Martin LiškaCommits: 1Joined: 2014-03-26 - @@ -5317,14 +5359,17 @@ *Alaa.BukhariCommits: 1Joined: 2013-07-04 - *marstayCommits: 1Joined: 2015-10-18 + *Wenzhe PeiCommits: 1Joined: 2019-03-11 - *Guillaume FillolCommits: 1Joined: 2011-01-29 + *marstayCommits: 1Joined: 2015-10-18 + *Guillaume FillolCommits: 1Joined: 2011-01-29 + + *Andrew WestCommits: 1Joined: 2011-10-21 @@ -5333,11 +5378,11 @@ *Aleix PolCommits: 1Joined: 2017-01-19 + + *Dennis E. HamiltonCommits: 1Joined: 2013-01-19 - - *Hugo Beauzée-LuyssenCommits: 1Joined: 2011-09-28 @@ -5347,11 +5392,11 @@ *Michael HornCommits: 1Joined: 2015-03-21 + + *Milan ZelenkaCommits: 1Joined: 2014-03-26 - - *pkoroau pkoroauCommits: 1Joined: 2012-12-20 @@ -5361,11 +5406,11 @@ *Victor PortellaCommits: 1Joined: 2014-11-05 + + *gdm.manmeetCommits: 1Joined: 2014-03-18 - - *Juergen SteinhilberCommits: 1Joined: 2012-03-05 @@ -5375,11 +5420,11 @@ *Juan A. Suarez RomeroCommits: 1Joined: 2014-12-15 + + *Jordi MallachCommits: 1Joined: 2012-05-03 - - *Daniel NaberCommits: 1Joined: 2012-05-09 @@ -5389,11 +5434,11 @@ *Dennis NielenCommits: 1Joined: 2017-03-21 + + *Neil StalkerCommits: 1Joined: 2010-10-02 - - *Sanjaykumar Girishkumar PatelCommits: 1Joined: 2017-08-19 @@ -5403,11 +5448,11 @@ *William BonnetCommits: 1Joined: 2015-12-05 + + *Gordon LackCommits: 1Joined: 2012-05-09 - - *Sergey FukanchikCommits: 1Joined: 2015-09-17 @@ -5417,11 +5462,11 @@ *Honza MinarikCommits: 1Joined: 2013-04-03 + + *Moritz BechlerCommits: 1Joined: 2011-12-19 - - *Raymond WellsCommits: 1Joined: 2013-09-02 @@ -5431,11 +5476,11 @@ *Matt PrattCommits: 1Joined: 2011-11-02 + + *Reto SchneiderCommits: 1Joined: 2015-11-20 - - *Hank LeiningerCommits: 1Joined: 2016-02-27 @@ -5445,11 +5490,11 @@ *Alex GulyásCommits: 1Joined: 2014-04-27 + + *Yurii KolesnykovCommits: 1Joined: 2015-05-10 - - *Nicola PovoleriCommits: 1Joined: 2015-11-28 @@ -5459,11 +5504,11 @@ *frederic vromanCommits: 1Joined: 2017-05-12 + + *Nikita OfitserovCommits: 1Joined: 2011-01-10 - - *Alexandr N. ZamaraevCommits: 1Joined: 2010-10-01 @@ -5471,79 +5516,78 @@ *Kenneth AafløyCommits: 1Joined: 2012-01-11 + *VaibhavCommits: 1Joined: 2019-03-17 + + + + *Colomban WendlingCommits: 1Joined: 2017-03-15 *Sean StanglCommits: 1Joined: 2017-07-09 - - *scitoCommits: 1Joined: 2015-04-13 *Danny RobertsCommits: 1Joined: 2011-02-18 + + *LesterCommits: 1Joined: 2012-10-23 *christianjuCommits: 1Joined: 2014-02-10 - - *Seyeong KimCommits: 1Joined: 2014-10-06 *Florian EffenbergerCommits: 1Joined: 2015-08-04 + + *Michal HorakCommits: 1Joined: 2014-04-21 *Lucian ConstantinCommits: 1Joined: 2013-03-24 - - *Owen GenatCommits: 1Joined: 2016-11-20 *DaeHyun SungCommits: 1Joined: 2018-05-19 + + *Yohei YukawaCommits: 1Joined: 2013-05-06 *Jakub GolebiewskiCommits: 1Joined: 2013-04-09 - - *Umang JainCommits: 1Joined: 2017-03-13 *PhyzerCommits: 1Joined: 2014-09-13 + + *Dolives BenoitCommits: 1Joined: 2011-07-04 *Damien ChambeCommits: 1Joined: 2014-06-15 - - *Christopher HotchkissCommits: 1Joined: 2013-02-15 *galbarnissanCommits: 1Joined: 2014-12-03 - - - - Contributors to bundled templates @@ -5557,7 +5601,7 @@ *Francisco Adrián SánchezCommits: 17Joined: 2016-10-07 - *Laurent BPCommits: 14Joined: 2015-11-19 + *Laurent BPCommits: 15Joined: 2015-11-19 *Samuel MehrbrodtCommits: 7Joined: 2013-01-16 @@ -5640,11 +5684,13 @@ *Stefan Knorr (astron)Commits: 1Joined: 2012-07-16 - + + *Mike KaganskiCommits: 1Joined: 2019-03-13 + + - Developers not committing code since 2010-09-28 @@ -6119,7 +6165,7 @@ - + Oliver BolteCommits: 418Joined: 2004-09-08 @@ -6160,7 +6206,7 @@ We do not distinguish between commits that were imported from the OOo code base and those who went directly into the LibreOffice code base as: - + a) it is technically not possible to distinguish between commits that go directly into the LibreOffice code base and commits that were merged in from the OpenOffice.org code base, and @@ -6170,7 +6216,7 @@ Do note that LibreOffice used to be divided into 20 git repositories. Pushing a change into all repositories will be counted as 20 commits as there is no way to distinguish this from 20 separate commits. Total contributions to the TDF Wiki - 2459 individuals contributed: + 2462 individuals contributed: @@ -6178,7 +6224,7 @@ - K-j (8893) + K-j (8928) Roczek, Dennis (8106) @@ -6187,15 +6233,15 @@ Goncharuk, Lera (5435) - Pierre-yves samyn (5242) + Pierre-yves samyn (5255) - Hrbrgr (4524) + Hrbrgr (4749) - Uroveits (4394) + Uroveits (4399) Tagezibot (3924) @@ -6206,13 +6252,13 @@ - Kü (3256) + Gautier, Sophie (3257) - Gautier, Sophie (3247) + Kü (3256) - Balland-Poirier, Laurent (2494) + Balland-Poirier, Laurent (2497) Jeanweber (2324) @@ -6220,13 +6266,13 @@ - Jayme Barrientos, Adolfo (2113) + Jayme Barrientos, Adolfo (2307) Bielefeld, Rainer (2077) - Filmsi (2036) + Filmsi (2040) Effenberger, Florian (1710) @@ -6234,13 +6280,13 @@ - Kompilainenn (1577) + Kompilainenn (1587) Michaelsen, Björn (1550) - Hibagonsan (1447) + Hibagonsan (1519) Marcpare (1396) @@ -6251,10 +6297,10 @@ GerryT (1226) - Adailton (1203) + Hallot, Olivier (1219) - Hallot, Olivier (1201) + Adailton (1203) Buzzatti Pacheco, Gustavo (1181) @@ -6271,7 +6317,7 @@ Haas, Uwe (1095) - LibreOfficiant (1040) + LibreOfficiant (1079) @@ -6279,13 +6325,13 @@ Nouws, Cor (1022) - Ostrovsky, David (1010) + X1sc0 (1022) - X1sc0 (998) + Ostrovsky, David (1010) - Enoki (977) + Enoki (979) @@ -6293,21 +6339,21 @@ Novak, Nino (976) - Clement21.philippe (942) + FuzzyBot (973) - Meeks, Michael (932) + Clement21.philippe (956) - Tom (926) + Meeks, Michael (932) - FuzzyBot (824) + Tom (926) - Beluga (808) + Beluga (836) H-k (774) @@ -6318,13 +6364,13 @@ - Iversen, Jan (693) + Drew (701) - Drew (689) + Iversen, Jan (693) - Behrens, Thorsten (688) + Behrens, Thorsten (690) Hazel (639) @@ -6341,7 +6387,7 @@ Raulpacheco (596) - Rathke, Eike (562) + Rathke, Eike (563) @@ -6355,11 +6401,14 @@ Lohmaier, Christian (534) - Knorr, Stefan (521) + RobertG (522) + Knorr, Stefan (521) + + Davidnelson (517) @@ -6368,16 +6417,13 @@ Elianedomingos (508) - - Foote, V Stuart (493) - - Reisinger, Florian (491) + Foote, V Stuart (493) - RobertG (489) + Reisinger, Florian (491) Sefran (466) @@ -6388,7 +6434,7 @@ - Elcico (452) + Elcico (454) Mladek, Petr (450) @@ -6402,7 +6448,7 @@ - Mike.saunders (440) + Mike.saunders (446) Eskroni (437) @@ -6411,7 +6457,7 @@ Rmfaile (436) - Sam m (424) + Sam m (431) @@ -6422,18 +6468,18 @@ Gecko (419) - Manuelf (418) + Manuelf (419) - Luz Coelho, Rogério (409) + Henschel, Regina (412) - Henschel, Regina (408) + Luz Coelho, Rogério (409) - Veracape (402) + Veracape (404) Mohrhard, Markus (397) @@ -6450,7 +6496,7 @@ Alexander Wilms (392) - Tardon, David (387) + Tardon, David (388) Foral (384) @@ -6464,30 +6510,41 @@ StefanW (379) - Emanuel Marcatinco (374) + Tietze, Heiko (376) - Stahl, Michael (370) + Emanuel Marcatinco (374) + Stahl, Michael (371) + + Thackert (359) - Tietze, Heiko (354) + Mayan Tigger (347) + + + Kevin, Suo (锁琨珑) (347) + + Thiebaud, Norbert (341) + Jlv (336) + + Vpanter (333) - - Pruegsanusak, Korrawit (330) + + Volkerme (329) @@ -6497,11 +6554,11 @@ Khanson679 (301) - - Tseng, Cheng-Chia (294) + + Heinzws (292) @@ -6511,64 +6568,56 @@ Emanuel A. Marcatinco B. (290) - - - - Jlv (286) - Lillqvist, Tor (273) + + Epix (268) Helen russian (268) - - Kaplan, Lior (267) - Kara, Muhammet (261) + Kara, Muhammet (262) + + Remarques (252) Deemonizer (248) - - Adrianoafonso (246) Loic (240) + + Steve (237) Bosdonnat, Cédric (231) - - - - Schiavinatto (230) - - Kevin, Suo (锁琨珑) (228) + Schiavinatto (231) Bedipp (226) + + Almusaireae (219) - - Kerwyn (218) @@ -6578,11 +6627,11 @@ Gilvanvilarim (217) + + EricBright (216) - - Khirano (215) @@ -6592,25 +6641,25 @@ Jbfaure (212) + + Andreschnabel (207) - - - Bergmann, Stephan (205) + Kitaygrad (206) - Kitaygrad (203) + Bergmann, Stephan (205) XsLiDian (203) + + Wheatbix (198) - - Erhardt (193) @@ -6620,26 +6669,26 @@ DmitryBowie (188) - - Tarnhold (187) - - Méixome, Antón (179) + Tarnhold (187) - Latini, Marina (178) + Kosiorek, Bartosz (180) - Alkurtass, Issa (178) + Latini, Marina (179) - Kosiorek, Bartosz (175) + Méixome, Antón (179) + Alkurtass, Issa (178) + + Raw text (175) @@ -6648,53 +6697,53 @@ Fridrich (172) + + Luizheli (172) - - + + Kaganski, Mike (171) + Furusho (170) Pitkänen, Harri (169) + + Jiang, Yifan (168) - Matuaki (163) + Drodriguez (164) - - - Kaganski, Mike (162) + Matuaki (163) See (160) + + Snelders, Rob (159) - Óvári (157) - - - - - Drodriguez (156) + Óvári (158) - Franklin (154) + Franklin (155) Xystina (154) + + Lodahl (152) - - Pietro (150) @@ -6704,11 +6753,11 @@ Back69 (146) + + Mipmap (144) - - Junmeguro (141) @@ -6718,11 +6767,11 @@ Michelr (141) + + Lorenzo (140) - - Zolnai, Tamás (139) @@ -6732,11 +6781,11 @@ Weissenbacher, Philipp (138) + + Heliojsf (137) - - P.guimberteau (137) @@ -6746,11 +6795,11 @@ Shunesburg69 (134) + + Filhocf (132) - - Richteruwe (131) @@ -6760,54 +6809,54 @@ Jucasaca (129) + + Michel, Mathias (129) - - + + Ki Drupadi (127) + Nik (127) Ikuya (126) + + - Ki Drupadi (126) + Nemeth (124) RGB.ES (124) - - JARF (123) Krackedpress (123) + + - Nemeth (123) + Trapezus (122) - Trapezus (122) + Chris-hoh (120) - - JohnSmith (120) Liebel, Jennifer (119) + + Phorious (118) - Chris-hoh (115) - - - - Spaeth, Sebastian (115) @@ -6816,11 +6865,11 @@ Markers (114) + + Massimo.zaffaina (113) - - Slacka (113) @@ -6830,11 +6879,11 @@ Marcus Gama (112) + + Dougvigliazzi (111) - - Medieval (111) @@ -6844,11 +6893,11 @@ Monthoflibreoffice bot (110) + + Mantke, Andreas (109) - - Nyucel (108) @@ -6858,42 +6907,50 @@ Bitsfritz (104) + + Klaibson (104) - - + + MDDN (104) + Pechlaner, Wolfgang (102) JZA (101) + + + + Gathoye, William (101) + Android272 (99) JeHa (99) - - AlanC (98) + + - Gathoye, William (98) + Jeanmi2403 (97) - Jeanmi2403 (97) + Nogajun (97) - Nogajun (95) + Kees538 (95) - - Llunak (93) + + Andreasg (92) @@ -6901,7 +6958,10 @@ MagicFab (92) - Kees538 (91) + Baffclan (91) + + + Ponzo, Gabriele (91) @@ -6909,72 +6969,61 @@ Frombenny (90) - Baffclan (89) - - - MDDN (89) - - Zeki (89) - - Catalin Festila (88) Dan (88) + + Hertel, Jesper (88) Milos (87) - - Paulojose (87) Nabet, Julien (87) + + Omori (86) Steve- - (86) - - Horáček, Stanislav (86) - Ponzo, Gabriele (85) - - Fišeras, Aurimas (84) + + Evy (84) - - KorrawitBot (84) - JamesWalker (81) + Jfnif (82) - Jfnif (81) + JamesWalker (81) + + Ogervasi (80) - - 80686 (79) @@ -6984,11 +7033,11 @@ Xosé (78) + + Albino (75) - - K.K.Ashisuto (75) @@ -6998,11 +7047,11 @@ Enio.gemmo (74) + + Lbalbalba (74) - - Castermans, Luc (72) @@ -7012,39 +7061,39 @@ Aury88 (71) + + + + Raal (71) + RalfHB (71) - - Al-Harthi, Ahmad Hussein (70) Jo7ueb (70) + + Donaldo (69) Malhassoun (69) - - - - Raal (69) - Freetank (68) Fábio Farias (68) + + Gghh (68) - - Ptux (67) @@ -7054,11 +7103,11 @@ Bmcs (65) + + StanG (65) - - Timur LOL (65) @@ -7068,11 +7117,11 @@ Kudelis, Rimas (63) + + Sikeler (63) - - Popa, Adrian Marius (62) @@ -7082,11 +7131,11 @@ Frieder (61) + + Arnaudlecam (60) - - Jlgrenar (60) @@ -7096,11 +7145,11 @@ Camillem (58) + + Neel, Daniel (58) - - Gurbetoğlu, Gökhan (58) @@ -7110,11 +7159,11 @@ Kukan, Matúš (58) + + Teseu (58) - - Jihui choi (57) @@ -7124,39 +7173,39 @@ Glen.reesor (56) + + Ramones (56) - - + + Thibault, Samuel (56) + Hunt, Andrzej (55) Jrahemipour (55) + + Cornell, Clayton (54) Fanthomas (54) - - Mahfiaz (54) Heben2 (53) - - Thibault, Samuel (53) - + + Sunny2038 (53) - - Bubli (52) @@ -7166,11 +7215,11 @@ Petrizzo (52) + + ArnoldSchiller (51) - - Helmar (51) @@ -7180,11 +7229,11 @@ Agd (50) + + Halparker (50) - - Paz (50) @@ -7194,39 +7243,39 @@ Mpescador (49) + + Magliocchetti, Riccardo (49) - - + + Uwealtmann (49) + Vardomescro (49) Lviktoria (48) + + Dagobert 78 (47) Lendo (47) - - Quest-88 (47) Buj Gelonch, Robert Antoni (47) - - Uwealtmann (47) - + + Sk94 (46) - - Bfo (45) @@ -7236,11 +7285,11 @@ Jung, Philippe (45) + + Quikee (45) - - Robwestein (45) @@ -7250,11 +7299,11 @@ Ikh1 (44) + + Aaronxu (43) - - Cottage14 (43) @@ -7264,11 +7313,11 @@ Wilper, Simon (43) + + Sveinki (43) - - Donkers, Winfried (43) @@ -7278,11 +7327,11 @@ Fkara (42) + + KAMI (42) - - Another sam (41) @@ -7292,11 +7341,11 @@ GerhardW (41) + + Joey (41) - - Pedlino (41) @@ -7306,11 +7355,11 @@ AnXh3L0 (40) + + Fábio Coelho (40) - - Kraucer (40) @@ -7320,11 +7369,11 @@ Jstnlth (39) + + Enervation (38) - - Pje335 (38) @@ -7334,53 +7383,53 @@ Cjenkins (37) + + + + Hogue (37) + Ivanslf (37) - - Aragunde Pérez, Jacobo (37) Kano (37) + + Kinshuksunil (37) Castle, John LeMoyne (37) - - RaducuG (37) Enger, Terrence (37) + + Valdirbarbosa (37) Caco13 (36) - - Danishka (36) Grandin, Noel (36) - - Hogue (36) - + + Patheticcockroach (36) - - Sci citation (36) @@ -7390,11 +7439,11 @@ Liongold (35) + + Nora (35) - - Pingping111 (35) @@ -7404,11 +7453,11 @@ Subramanian, Muthu (35) + + Bormant (33) - - Davidlamhauge (33) @@ -7418,11 +7467,11 @@ Kelemeng (33) + + Lmartinezh (33) - - Mars (33) @@ -7432,11 +7481,11 @@ Pereriksson (33) + + Rafi (33) - - Shirahara (33) @@ -7446,11 +7495,11 @@ Alexanderwerner (32) + + Clio (32) - - Daud (32) @@ -7460,11 +7509,11 @@ Dryomov, Artur (32) + + Monocat (32) - - Vulcain (32) @@ -7474,11 +7523,11 @@ H (31) + + Jingtao, Yan (31) - - IvanM (31) @@ -7488,11 +7537,11 @@ Arnaud versini (30) + + Njsg (30) - - Ptoye (30) @@ -7502,238 +7551,246 @@ Tclovis (30) + + Thardeck (30) - - + + Am97 (29) + Andreas ka (29) Cida.Coltro (29) + + Darbe (29) EdvaldoSCruz (29) - - Haaninjo (29) RodolfoRG (29) + + Серж (29) Ace-dent (28) - - Elmau (28) Riemer, Philipp (28) + + المسيكين (28) Acbaird (27) - - Marcofilippozzi (27) Marcos Paulo de Souza (27) + + Micm (27) PeppinoLib (27) - - Sarojdhakal (27) Thuswaldner, Albert (27) + + Alayaran (26) Eresus (26) - - Ezeperez26 (26) Fanch (26) + + Librek (26) Linuxman (26) - - Lutch (26) Hawkins, Nigel (26) + + Pirat Michi (26) Rizmut (26) - - Vaslav (26) Aidsoid (25) + + Ailion (25) Roßmanith, Christina (25) - - Kłos, Szymon (25) Freddyrh (25) + + Sullivan, Gatlin (25) Guilhem (25) - - Glogowski, Jan-Marek (25) Lboccia (25) + + Manuel De Franceschi (25) Noelson (25) - - Freund, Matthias (25) Schröder, Sophia (25) + + Winniemiel05 (25) Elpapki (24) - - Gaianer (24) Gérard24 (24) + + Ksoviero (24) Nik vr (24) - - Olivier (24) PaoloPelloni (24) + + Hamurcu (23) Montané, Joan (23) - - Olorin (23) TaeWong (23) + + Team One (23) Thumperward (23) - - Tommy27 (23) Toxitom (23) + + Youngman, Anthony W. (23) Aphaia (22) - - Bellerophon (22) Bjoern (22) + + HenryGR (22) JChimene (22) - - + + Valtermura (22) + Webmink (22) + + Jeppebundsgaard (21) @@ -7743,11 +7800,11 @@ Kabe (21) - - Keymap19 (21) + + Liusiqi43 (21) @@ -7757,11 +7814,11 @@ Puster (21) - - WalterPape (21) + + Wayra (21) @@ -7771,11 +7828,11 @@ Grasip (20) - - HeinF (20) + + Icobgr (20) @@ -7785,11 +7842,11 @@ Mattsturgeon (20) - - Vdragon (20) + + Vmalep (20) @@ -7799,11 +7856,11 @@ Yorick (20) - - Zapata (20) + + Clarice Vigliazzi (19) @@ -7813,11 +7870,11 @@ Houbsi (19) - - JaronBaron (19) + + Jem (19) @@ -7827,10 +7884,13 @@ Kentarch (19) + + Ionita, Teodor-Mircea (19) + - Ionita, Teodor-Mircea (19) + Budea, Áron (18) Magee, Timothy (18) @@ -7844,6 +7904,9 @@ + Grzesiek a (18) + + Jstaerk (18) @@ -7852,11 +7915,11 @@ Nestifea61 (18) + + Power, Noel (18) - - Richard (18) @@ -7866,11 +7929,11 @@ UriHerrera (18) + + Vuhung (18) - - 林漢昌 (18) @@ -7878,9 +7941,6 @@ Akerbeltz (17) - Budea, Áron (17) - - Chd (17) @@ -7945,16 +8005,19 @@ Funk, Juergen (16) + Marklh9 (16) + + MoIshihara (16) Oweng (16) + + P.Guimberteau (16) - - PauGNU (16) @@ -7964,16 +8027,13 @@ Smarquespt (16) - - Smrabelo (16) - - TPJ (16) + Smrabelo (16) - Valtermura (16) + TPJ (16) APerson (15) @@ -8046,14 +8106,17 @@ Darkcircle (14) - Elrath (14) + Dennisfrancis (14) - Fina (14) + Elrath (14) + Fina (14) + + Guuml (14) @@ -8062,16 +8125,13 @@ Lfernandocarvalho (14) - - Librosaurus (14) - - Lothar.becker (14) + Librosaurus (14) - Marklh9 (14) + Lothar.becker (14) Mderoucy (14) @@ -8127,19 +8187,16 @@ Gallaecio (13) - Grzesiek a (13) - - Ledure, Jean-Pierre (13) Jobo (13) - - Kadekilo (13) + + Leomota (13) @@ -8149,11 +8206,11 @@ Luc (13) - - Luked (13) + + Mabbb (13) @@ -8163,11 +8220,11 @@ Mortense (13) - - Odd123 (13) + + Pete Boyd (13) @@ -8177,11 +8234,11 @@ Samtuke (13) - - Sanyii (13) + + Simplicity Instinct (13) @@ -8191,11 +8248,11 @@ Tnishiki (13) - - Vivaelcelta (13) + + Vkkodali (13) @@ -8205,11 +8262,11 @@ Alfabech (12) - - Alg (12) + + And471 (12) @@ -8219,11 +8276,11 @@ Bhaskar (12) - - Cralin (12) + + Al-Otaibi, Faisal M. (12) @@ -8233,11 +8290,11 @@ Hidayet (12) - - Immanuelg (12) + + Krabina (12) @@ -8247,11 +8304,11 @@ Godard, Laurent (12) - - Marcio Oliveira (12) + + Pcapeluto (12) @@ -8261,11 +8318,11 @@ Raruenrom, Samphan (12) - - Möller, Sören — spelled Soeren Moeller in some patches (12) + + Staticsafe (12) @@ -8275,11 +8332,11 @@ 翼之靈歌 (12) - - AndikaTriwidada (11) + + Bryanquigley (11) @@ -8289,67 +8346,67 @@ ChristopheS (11) - - Dajare (11) - - Dennisfrancis (11) - + + Ebraminio (11) Eduaraujo (11) - - Gokul, S (11) Johnny M (11) + + Kallecarl (11) Kolbjoern (11) - - Luiz Henrique Natalino (11) MNeto (11) + + Pearson, Timothy (11) Marcuskgosi (11) - - NON (11) Johansson, Niklas (11) + + Nuernbergerj (11) PeeWee (11) - - + + RegisPerdreau (11) + Rogeniobelem (11) + + Salmaan (11) @@ -8359,11 +8416,11 @@ Gomez, Andres (11) - - Vrlivre (11) + + Yaron (11) @@ -8373,11 +8430,11 @@ Aeusebio (10) - - Algotruneman (10) + + Castagno, Giuseppe (10) @@ -8387,11 +8444,11 @@ Crolidge (10) - - Dhsung (10) + + Diginin (10) @@ -8401,11 +8458,11 @@ Eduardogula (10) - - Eficheux (10) + + El7r (10) @@ -8415,11 +8472,11 @@ Jdittrich (10) - - Kadertarlan (10) + + Kingu (10) @@ -8429,11 +8486,11 @@ Linuxuser330250 (10) - - Lionlinux (10) + + Marco c (10) @@ -8443,11 +8500,11 @@ Chung, Elton (10) - - Mikalai (10) + + Mikeyy (10) @@ -8457,471 +8514,464 @@ Nateyee (10) - - Otto (10) - - RegisPerdreau (10) - + + Revol (10) Ronja (10) - - Serge Krot (10) Syntaxerrormmm (10) + + Tatat (10) Tomg (10) - - Ttocsmij (10) Twstdude0to1 (10) + + User8192 (10) Wlenon (10) - - Al-Abdulrazzaq, Abdulmajeed (9) Agger (9) + + Brandner, Andreas (9) AtkinsSJ (9) - - Camargo (9) Cnuss (9) + + Crazyskeggy (9) Dupreyb (9) - - Fatdf (9) Gibi (9) + + GisbertFriege (9) Goranrakic (9) - - Jim-BobHarris (9) Jopsen (9) + + Jowyta (9) Kscanne (9) - - Lapetec (9) Lexeii (9) + + Mapper (9) Marco (9) - - Meo (9) Msaffron (9) + + Ohnemax (9) Onting (9) - - Oprea.luci (9) Foley, Peter (9) + + Pixpray (9) Dricot, Lionel (9) - - Rantaro (9) Rogawa (9) + + Rpr (9) Spacebat (9) - - Svante (9) Therabi (9) + + Urdulizer (9) Zhangxiaofei (9) - - ميدو (9) Alexxed (8) + + AndreasL (8) Ausserirdischegesund (8) - - Cocofan (8) Cusiri (8) + + Dashohoxha (8) DrDub (8) - - Ed Eyles (8) Elacheche (8) + + Horst (8) Israel Chaves (8) - - JR (8) Jiero (8) + + Jonatoni (8) Jrsiqueira (8) - - Jslozier (8) Hoffimann Mendes, Júlio (8) + + Dywan, Christian (8) Kednar (8) - - Rietveld, Kristian (8) Lee (8) + + Leigh, Jack (8) Leo.h.hildebrandt (8) - - Manj k (8) Rimkus, Modestas (8) + + Mrmox2 (8) NightMonkey (8) - - NirajanPant (8) Osnola (8) + + + Paulo.tavares (8) Peterpall (8) - - Ricardolau (8) Thejack (8) + + Tibbylickle (8) Troumad (8) - - Vbkaisetsu (8) VlhOwn (8) + + Tamás, Bunth (8) Yakusha (8) - - Yostane (8) Kabatsayev, Ruslan (7) + + Ahiijny (7) Andrea Gelmini (7) - - Andrea.soragna (7) Bastik (7) + + Belkacem77 (7) Bjherbison (7) - - Bookman900 (7) Borim7 (7) + + Capiscuas (7) Chin Zee Yuen (7) - - Ciaran (7) Dado (7) + + Drose (7) Esbardu (7) - - GuKK-Devel (7) Hunter, Kevin (7) + + Ingotian (7) Levith (7) - - Lonelyhiker (7) M1cky (7) + + Mariosv (7) Mbayer (7) - - MephistoBooks (7) Francis, Matthew (7) + + Nathanjh13 (7) Ndduong (7) - - Nemo bis (7) Olivier DDB (7) + + Opensas (7) PaoloVecchi (7) - - Polte (7) RMCampos (7) + + Rodo (7) Shady (7) - - Simosx (7) Tonnysmile (7) + + Toxicbits (7) Wabuo (7) - - Woordje (7) صفا الفليج (7) + + Alexandrorodrigez (6) - Am97 (6) - - - - Armin Dänzer (6) @@ -8930,11 +8980,11 @@ Higginson, Andrew (6) + + Barend (6) - - Bobe (6) @@ -8944,11 +8994,11 @@ Cccfr (6) + + ClausKofoed (6) - - Coypu (6) @@ -8958,11 +9008,11 @@ BEN MANSOUR, Mohamed-Ali (6) + + Ddxavier (6) - - Dfriedman (6) @@ -8972,11 +9022,11 @@ Mencken, Douglas (6) + + Dr.Faust (6) - - Druzhshchienschkyj (6) @@ -8986,11 +9036,11 @@ Edmund.laugasson (6) + + Equis (6) - - FPhoenix (6) @@ -9000,11 +9050,11 @@ Gallaire, Florent (6) + + Fisiu (6) - - Florian heckl (6) @@ -9014,11 +9064,11 @@ Googly Googly (6) + + HdV (6) - - Hmoi (6) @@ -9028,11 +9078,11 @@ Infoprof (6) + + Iplaw67 (6) - - Timofeev, Ivan (6) @@ -9042,11 +9092,11 @@ Jeffersonx (6) + + Kawichi (6) - - Levlazinskiy (6) @@ -9056,11 +9106,11 @@ MaggieT (6) + + Manas (6) - - Manop (6) @@ -9070,11 +9120,11 @@ Mgommel (6) + + Mmetz (6) - - Ndlsas (6) @@ -9084,11 +9134,11 @@ Only you (6) + + Os cib (6) - - PLNET (6) @@ -9098,11 +9148,11 @@ Pescetti (6) + + Peter Chastain (6) - - Peterhuang1kimo (6) @@ -9110,101 +9160,109 @@ Puggan (6) + Raniaamina (6) + + + + Rotaj (6) Sn!py (6) - - Sukit (6) Heidenreich, Josh (6) + + Thorwil (6) TiagoSantos (6) - - Tyree (6) VACHER (6) + + Vgezer (6) Virthus (6) - - Wagner Augusto Silva Rodrigo (6) Wasserthal (6) + + Wigglejimmy (6) Wiseacre (6) - - Xhi2018 (6) 3blz (5) + + Adam Co (5) Albucasis (5) - - AleXanDeR G (5) Alfalb (5) + + Alvarez, Octavio (5) Anousak (5) - - Liwen, Fan (5) Art.Gilvanov (5) + + Sodora, August (5) AustinSaintAubin (5) - - Baumgarp (5) + BillRVA (5) + + + + Bitigchi (5) @@ -9213,11 +9271,11 @@ Cray85 (5) - - Dejourdain (5) + + DickStomp (5) @@ -9227,11 +9285,11 @@ DoFoWerner (5) - - Faiq Aminuddin (5) + + Fazbdillah (5) @@ -9241,11 +9299,11 @@ Francewhoa (5) - - GaboXandre (5) + + Ggurley (5) @@ -9255,11 +9313,11 @@ H.Sparks (5) - - Habib (5) + + HubPfalz (5) @@ -9269,11 +9327,11 @@ HwangTW (5) - - Icyitscold (5) + + Jaysponsored (5) @@ -9283,11 +9341,11 @@ John.pratt (5) - - KadlecOn (5) + + Kamataki (5) @@ -9297,11 +9355,11 @@ Koji Annoura (5) - - LibreOfficeUser1 (5) + + Mak (5) @@ -9311,11 +9369,11 @@ Midimarcus (5) - - Laplante, Chris (5) + + Mtg (5) @@ -9325,11 +9383,11 @@ Namikawa (5) - - OSVALDO LINS VIANA (5) + + Orcmid (5) @@ -9339,11 +9397,11 @@ Pepe (5) - - Pkoroau (5) + + Poeml (5) @@ -9353,11 +9411,11 @@ Rajesh (5) - - Raknor (5) + + Raulpaes (5) @@ -9367,11 +9425,11 @@ Raykowj (5) - - ReneEngelhard (5) + + Rhoslyn (5) @@ -9381,11 +9439,11 @@ SabinGC (5) - - Salavine1 (5) + + Samson (5) @@ -9395,11 +9453,11 @@ Sergej (5) - - So solid moo (5) + + Srividya (5) @@ -9409,12 +9467,11 @@ Taylorh140 (5) - - - Terentev.mn (5) + + Timotheonb (5) @@ -9424,11 +9481,11 @@ Wasdin (5) - - Wt (5) + + Yury Tarasievich (5) @@ -9438,11 +9495,11 @@ Aaronkyle (4) - - Aas (4) + + Adderbox76 (4) @@ -9452,11 +9509,11 @@ Albertoeda (4) - - Nureña, Aldo Román (4) + + Alex1 (4) @@ -9466,11 +9523,11 @@ Alvarenga (4) - - Alzoo (4) + + Amire80 (4) @@ -9480,11 +9537,11 @@ Archlid (4) - - Arhitectul (4) + + Axel (4) @@ -9494,11 +9551,11 @@ Azorpid (4) - - Bardo (4) + + Widl, Bernhard (4) @@ -9508,11 +9565,11 @@ Blender3dartist (4) - - Bntser (4) + + Cam AW (4) @@ -9522,11 +9579,11 @@ Crankybot (4) - - CyrilBeaussier (4) + + Deivan (4) @@ -9536,11 +9593,11 @@ DmitryRamones (4) - - Doubi (4) + + Dragon (4) @@ -9550,11 +9607,11 @@ Eisaks (4) - - Erx700 (4) + + Fmolinero (4) @@ -9564,11 +9621,11 @@ GKFX (4) - - Garrowolf (4) + + Gmjs (4) @@ -9578,11 +9635,11 @@ Hossein (4) - - ImperfectlyInformed (4) + + Jamesleader (4) @@ -9592,11 +9649,11 @@ Jiehong (4) - - Jjmeric (4) + + JnRouvignac (4) @@ -9606,11 +9663,11 @@ Jones (4) - - Jooste (4) + + Joriki (4) @@ -9620,11 +9677,11 @@ Lethargilistic (4) - - Loren.rogers (4) + + Haggag, Muhammad (4) @@ -9634,11 +9691,11 @@ Rumianowski, Maciej (4) - - Marinela (4) + + Mhonline (4) @@ -9648,11 +9705,11 @@ Morgan greywolf (4) - - Mortgage01 (4) + + NGHLibreOffice (4) @@ -9662,11 +9719,11 @@ Offidocs (4) - - Orson69 (4) + + Oscar90210 (4) @@ -9676,11 +9733,11 @@ Paolopoz (4) - - Paranemertes (4) + + PatrickJ (4) @@ -9690,11 +9747,11 @@ Pgassmann (4) - - Phillip.davis (4) + + Pjacquod (4) @@ -9704,50 +9761,42 @@ Psao (4) - - Qubit-test (4) - - Raniaamina (4) - + + Reyn100 (4) Ricgal (4) - - Rodhos (4) Sasha (4) + + Sealview (4) Silva.arapi (4) - - - - SpencerMann (4) - Sswales (4) Stevenmw (4) + + Surat (4) - - Tct (4) @@ -9757,11 +9806,11 @@ Tk (4) + + Txwikinger (4) - - Ufas (4) @@ -9771,11 +9820,11 @@ Urhixidur (4) + + Uzadmin (4) - - Melenchuk, Vasily (4) @@ -9785,11 +9834,11 @@ Wcolen (4) + + Wikiuser (4) - - Williamjmorenor (4) @@ -9799,11 +9848,11 @@ Денис (4) + + Aalam (3) - - AbhilashSingh (3) @@ -9813,11 +9862,11 @@ Aexyn (3) + + Jain, Atishay (3) - - Alex.simoes (3) @@ -9827,11 +9876,11 @@ Alexstrand7 (3) + + Almorca (3) - - Andrey Usov (3) @@ -9841,11 +9890,11 @@ Ariete (3) + + Arkanosis (3) - - Armin (3) @@ -9855,11 +9904,11 @@ Arthur Zennig (3) + + Aurelien (3) - - Baena (3) @@ -9869,11 +9918,11 @@ Benjwgarner (3) + + Bernardi, Paolo (3) - - Bindassanant (3) @@ -9883,11 +9932,11 @@ Bootingman (3) + + Bos (3) - - Prajapati, Gautam (3) @@ -9897,11 +9946,11 @@ Burdakov (3) + + CIB.Mathias (3) - - Castro (3) @@ -9911,11 +9960,11 @@ Claudiosegovia (3) + + Cmorgan (3) - - Colokalle (3) @@ -9925,11 +9974,11 @@ D0ugparker (3) + + DaSch (3) - - DanShearer (3) @@ -9939,11 +9988,11 @@ Bankston, Daniel (3) + + Donbrookman (3) - - Dubyk (3) @@ -9953,11 +10002,11 @@ Eeha0120 (3) + + Eisa01 (3) - - Elproferoman (3) @@ -9967,11 +10016,11 @@ Eric.ficheux (3) + + Ericatamiris (3) - - Estebanmonge (3) @@ -9981,11 +10030,11 @@ Ferlodev (3) + + Fraang (3) - - Franzjakob (3) @@ -9995,11 +10044,11 @@ Fulldecent (3) + + FunkyPenguin (3) - - Gilward Kukel (3) @@ -10009,11 +10058,11 @@ Gouchi (3) + + Smaha, Guillaume (3) - - Hansgerd.schneider (3) @@ -10023,252 +10072,260 @@ Hwpplayer1 (3) + + IanL (3) - - + + Imanuelr10 (3) + Imcon (3) It-christian (3) + + IvanMM (3) JDM (3) - - JO3EMC (3) Jennifer.park (3) + + Murugan, Jesso Clarence (3) Jhbn (3) - - Jo Cab (3) Joe312213 (3) + + Johannes Rohr (3) Joseroberto (3) - - Juanpabl (3) Julianm (3) + + K Karthikeyan (3) Katasisc (3) - - Kbiondi (3) Kevinob (3) + + Kfogel (3) Khunshan (3) - - Kkrothapalli (3) LO Rob (3) + + Lennoazevedo (3) LewisCowles (3) - - Libcub (3) Linux 9x (3) + + LucaCappelletti (3) Hryniuk, Łukasz (3) - - Luuk (3) Bessières, Marc (3) + + Margott (3) Marializ (3) - - Matteocam (3) Mattias (3) + + Maxwell (3) Measure for Measure (3) - - Melike (3) MertTumer (3) + + Meryemezber (3) Mhoes (3) - - Mhsmsantos (3) Michaelwheatland (3) + + Mkondo (3) Neookano (3) - - NicksonT (3) Nicolas.abel (3) + + Niconil (3) Ragnarsson, Björgvin (3) - - Nloira (3) Noel Power (3) + + OOarthurOo (3) Steinbeiß, Simon (3) - - Ojeremyj (3) Oliverguenther (3) + + Oprea luci (3) Penalvch (3) - - van Oostrum, Piet (3) Pr410 (3) + + Prakash72 (3) Rajatvijay (3) - - Rapha.ksf (3) Rauloliverpaes (3) + + Bevilacqua, Jean-Sébastien (3) RebeccaHodgson (3) - - Rick (3) Robert.E.A.Harvey (3) + + Rosemary (3) + Rptr (3) + + SEVEN (3) - - Sander Klootwijk (3) + + Sangeeta (3) @@ -10278,11 +10335,11 @@ Satabin (3) - - Sayt (3) + + Schroed(ing)er (3) @@ -10292,11 +10349,11 @@ Sergey Aka (3) - - Shelandy (3) + + Skinnerbird (3) @@ -10306,11 +10363,11 @@ Soliac (3) - - Songchuan (3) + + Soued031 (3) @@ -10320,11 +10377,11 @@ SteveKelem (3) - - Strugee (3) + + Suren (3) @@ -10334,11 +10391,11 @@ Taylor46 (3) - - TheWebalyst (3) + + Tiagosilva.anps (3) @@ -10348,11 +10405,11 @@ Tititou36 (3) - - Kumar, Tarun (3) + + Toki (3) @@ -10362,11 +10419,11 @@ Toxifier (3) - - TrnsltLife (3) + + Tushantin (3) @@ -10376,11 +10433,11 @@ Kitzinger, Ulrich (3) - - Underdog (3) + + Vinctor (3) @@ -10390,11 +10447,11 @@ Wagnerluis1982 (3) - - Khoo, Wei Ming (3) + + WesPeacock (3) @@ -10404,11 +10461,11 @@ Yukawa (3) - - Kolesnykov, Yurii (3) + + Yvon Henel (3) @@ -10418,11 +10475,11 @@ §chinagl (3) - - ترجمان05 (3) + + さかみのかさね (3) @@ -10432,11 +10489,11 @@ AdamPrado8 (2) - - AdrianValdez4 (2) + + Adsha (2) @@ -10446,11 +10503,11 @@ Aggelalex (2) - - Akurery (2) + + Alan (2) @@ -10460,11 +10517,11 @@ AliceOliver7 (2) - - Alina12345 (2) + + Alisha (2) @@ -10474,11 +10531,11 @@ AlphonsoNava4 (2) - - Amunizp (2) + + AmyCarney5 (2) @@ -10488,11 +10545,11 @@ Andrew (2) - - AndrewKuhn7 (2) + + AndrewUlrich (2) @@ -10502,11 +10559,11 @@ Anipeter (2) - - Anjar (2) + + Ankit (2) @@ -10516,11 +10573,11 @@ AnnunciationGunn (2) - - Anonimus (2) + + AntoniaMead8 (2) @@ -10530,11 +10587,11 @@ Aplatypus (2) - - ApostlesSheldon (2) + + Asal (2) @@ -10544,11 +10601,11 @@ Nakashian, Ashod (2) - - AvaGreer1 (2) + + Ozdemir, Aybuke (2) @@ -10558,11 +10615,11 @@ BernardMeza9 (2) - - BirdRivas2 (2) + + BlazejJones1 (2) @@ -10572,11 +10629,11 @@ Blume (2) - - Blushingorg (2) + + BoD (2) @@ -10586,11 +10643,11 @@ Boivie (2) - - Boldizsakawi7 (2) + + BoleslausSaunders (2) @@ -10600,11 +10657,11 @@ BrandiToomer (2) - - BridgetJarvis (2) + + Bruceschaller (2) @@ -10614,11 +10671,11 @@ ButlerBarron6 (2) - - C0bb3r (2) + + C1pr1an (2) @@ -10628,11 +10685,11 @@ CallieSalgado (2) - - CamilleMccarthy (2) + + CandidoRutherford (2) @@ -10642,11 +10699,11 @@ Capri99 (2) - - CaraDang6 (2) + + Carlosr (2) @@ -10656,11 +10713,11 @@ CarrieDaniels (2) - - CarrollRico2 (2) + + Iacob, Catalin (2) @@ -10670,11 +10727,11 @@ Celsovsm (2) - - Cgrosdemange (2) + + Chabermu (2) @@ -10684,11 +10741,11 @@ Cheche (2) - - Chemyakyn (2) + + ChrisBarth (2) @@ -10698,11 +10755,11 @@ Cjbackhouse (2) - - Cl-r (2) + + ClariceThorne (2) @@ -10712,11 +10769,11 @@ Clemen Beek (2) - - McDonald, Jason C. (2) + + Codingmicha (2) @@ -10726,11 +10783,11 @@ Conrado (2) - - CoralieCarr7 (2) + + Crxssi (2) @@ -10740,11 +10797,11 @@ Cvk (2) - - CyrillicEscobedo (2) + + Cœur, Antoine (2) @@ -10754,11 +10811,11 @@ Dairdev (2) - - DaisieQuigley (2) + + Damascene (2) @@ -10768,11 +10825,11 @@ Danese (2) - - Danthedev (2) + + Darkixion (2) @@ -10782,11 +10839,11 @@ Bolen, David (2) - - De-jourdain (2) + + Debugercz (2) @@ -10796,11 +10853,11 @@ DellePoole7 (2) - - DenisArnaud (2) + + Dennis' Spam test account (2) @@ -10810,11 +10867,11 @@ Devilcynthy (2) - - Diazbastian (2) + + Retout, Tim (2) @@ -10824,11 +10881,11 @@ DoctorBaxter7 (2) - - Domasj (2) + + Domsau2 (2) @@ -10838,11 +10895,11 @@ Donals (2) - - DrDrack (2) + + Röllin, Lukas (2) @@ -10852,11 +10909,11 @@ DukeDejesus7 (2) - - EarleSiegel7 (2) + + Ed (2) @@ -10866,11 +10923,11 @@ Eduardoarandah (2) - - Edwardcottreau (2) + + Efs710920mex (2) @@ -10880,11 +10937,11 @@ Sánchez, Bartolomé (2) - - Eldan (2) + + ElisabethHolcomb (2) @@ -10894,11 +10951,11 @@ EllieBowers3 (2) - - ElmaGray6 (2) + + Eloquence (2) @@ -10908,11 +10965,11 @@ Emily (2) - - EmperorErnst5 (2) + + EnosKraus6 (2) @@ -10922,11 +10979,11 @@ Eren (2) - - ErieTovar6 (2) + + Erikcht (2) @@ -10936,11 +10993,11 @@ ErwinHammond3 (2) - - EssieKeller8 (2) + + EsterEngland7 (2) @@ -10950,11 +11007,11 @@ FannyTillman8 (2) - - FateHarrington (2) + + Fbartels (2) @@ -10964,15 +11021,18 @@ Fcojavmc (2) - - Feldo (2) + + Ffinlo (2) + Fifh (2) + + FlaviaPratt8 (2) @@ -11144,14 +11204,11 @@ Imagin8or (2) - Imanuelr10 (2) + InezFinney8 (2) - InezFinney8 (2) - - IraLane4 (2) @@ -11160,11 +11217,11 @@ IrvinBernard9 (2) - - IsadoraFoster (2) + + IsaiahBuck5 (2) @@ -11174,11 +11231,11 @@ IvaRoach5 (2) - - Izabela (2) + + Burant, Jiri (2) @@ -11188,11 +11245,11 @@ JacintaGibson (2) - - Adams, Jonathan (2) + + C., James (2) @@ -11202,11 +11259,11 @@ Jasmins (2) - - JasperSawyer7 (2) + + JavierFernandez (2) @@ -11216,11 +11273,11 @@ Jcarl (2) - - Jcentel (2) + + Jcubic (2) @@ -11230,11 +11287,11 @@ JesseBHXEmrh (2) - - JettieGibson2 (2) + + Jgpestana (2) @@ -11244,11 +11301,11 @@ Jnicolas (2) - - JoWi (2) + + Jonathanacohen (2) @@ -11258,11 +11315,11 @@ Jowenshaw (2) - - João Pedro (2) + + Jstaniek (2) @@ -11272,11 +11329,11 @@ JudasPritchard (2) - - JudithGraves6 (2) + + Jumoun (2) @@ -11286,11 +11343,11 @@ K.euser (2) - - Kamran Mackey (2) + + Karakartala (2) @@ -11300,11 +11357,11 @@ Karolus (2) - - Kasos (2) + + Kazuyuki Yoshimura (2) @@ -11314,11 +11371,11 @@ KeithC (2) - - Khokkanen (2) + + KittyBauer5 (2) @@ -11328,11 +11385,11 @@ Kmr (2) - - KolbeKline1 (2) + + Kolorguild (2) @@ -11342,11 +11399,11 @@ keshav, krishna (2) - - KroniK907 (2) + + KrystalMinchin (2) @@ -11356,11 +11413,11 @@ Kwilliams (2) - - L (2) + + LariaJohn3 (2) @@ -11370,11 +11427,11 @@ LemuelHo1 (2) - - LemuelWerner5 (2) + + Lhcezar (2) @@ -11384,11 +11441,11 @@ Lino (2) - - Liotier (2) + + Lliehu (2) @@ -11398,11 +11455,11 @@ LovisaKessler (2) - - Petrolekas, Luke (2) + + LubomyrWalden (2) @@ -11412,11 +11469,11 @@ Lukasjelinek (2) - - LynnForbes3 (2) + + Casalin, Matteo (2) @@ -11426,11 +11483,11 @@ Mărăşoiu, Mariana (2) - - MZNBelendndq (2) + + Ma83mit (2) @@ -11440,11 +11497,11 @@ MadisonDarnell (2) - - MagdaleneOneal (2) + + MaggieGray2 (2) @@ -11454,11 +11511,11 @@ Mangat veer sagar (2) - - Manu.unni (2) + + MarMai (2) @@ -11468,11 +11525,11 @@ Marcinz (2) - - Marco74 (2) + + MargeretRiley (2) @@ -11482,11 +11539,11 @@ Marius (2) - - Marric (2) + + MartaRollins2 (2) @@ -11496,11 +11553,11 @@ MartinPC (2) - - MateuszDominguez (2) + + Matt 51 (2) @@ -11510,11 +11567,11 @@ Mbemidio (2) - - MercedesDelatorre (2) + + Merchantbusiness (2) @@ -11524,11 +11581,11 @@ MerleGlass6 (2) - - Mesutkullar (2) + + Mgiri (2) @@ -11538,11 +11595,11 @@ Michel Gagnon (2) - - Michiel (2) + + MikeyZ (2) @@ -11552,11 +11609,11 @@ Mind4z (2) - - MinervaLuna8 (2) + + Mitcoes (2) @@ -11566,11 +11623,11 @@ Mklever (2) - - Lechner, Marco (2) + + Mloiseleur (2) @@ -11580,11 +11637,11 @@ Mnsoto (2) - - Mordocai (2) + + MorganJohnstone (2) @@ -11594,11 +11651,11 @@ Mst0 (2) - - Mttza1 (2) + + Musicstave (2) @@ -11608,11 +11665,11 @@ Nathansen, Martin (2) - - Mzalewski (2) + + Nacerix (2) @@ -11622,11 +11679,11 @@ NealEspinoza6 (2) - - Nestor (2) + + NettaHurd9 (2) @@ -11636,11 +11693,11 @@ NewtonZuniga9 (2) - - Nishino, Daisuke (2) + + NicholasLanier (2) @@ -11650,11 +11707,11 @@ Christener, Nicolas (2) - - Nicolas PAOUR (2) + + NinaLam6 (2) @@ -11664,11 +11721,11 @@ NoricumArthur (2) - - NorrisAndersen (2) + + NovemberVogel (2) @@ -11678,11 +11735,11 @@ Nuclearbob (2) - - Naeil, Zoueidi (2) + + OUPS (2) @@ -11692,11 +11749,11 @@ Odalcet (2) - - Oiaohm (2) + + OlaPost6 (2) @@ -11706,11 +11763,11 @@ OlivierC (2) - - OnopriyBrandon (2) + + OrlandoArellano (2) @@ -11720,11 +11777,11 @@ Paolettopn (2) - - Paolobenve (2) + + Pascaje (2) @@ -11734,11 +11791,11 @@ Percherie (2) - - PercherskySanford (2) + + Senna Tschudin, Peter (2) @@ -11748,11 +11805,11 @@ Phil.davis (2) - - Szelat, Phillip (2) + + Pierre (2) @@ -11762,11 +11819,11 @@ Pitonyak (2) - - Pkst (2) + + PolishHungarianSharp (2) @@ -11776,11 +11833,11 @@ PragueBergman (2) - - Pulsifer (2) + + R.Yu. (2) @@ -11790,11 +11847,11 @@ Rbecke (2) - - ReeseShepherd (2) + + ReginaldMcgraw (2) @@ -11804,11 +11861,11 @@ RetaStern5 (2) - - RhodaMackey3 (2) + + RiceBurger3 (2) @@ -11818,11 +11875,11 @@ Rmarquardt (2) - - Roadrunner (2) + + RollandHannah (2) @@ -11832,11 +11889,11 @@ RosannaPaul7 (2) - - RosariaLampungm (2) + + RoyFokker (2) @@ -11846,11 +11903,11 @@ Ryan (2) - - S8321414 (2) + + Sagar.libo (2) @@ -11860,11 +11917,11 @@ Sam888 (2) - - SamBenavides5 (2) + + Sankarshan (2) @@ -11874,11 +11931,11 @@ Bosio, Santiago (2) - - Seanyoung (2) + + SebastianNorth (2) @@ -11888,11 +11945,11 @@ Sergwish (2) - - Sfeuser (2) + + Sgrotz (2) @@ -11902,11 +11959,11 @@ Shankar (2) - - Shaun.schutte (2) + + SidneyArredondo (2) @@ -11916,11 +11973,11 @@ Simplecontrast (2) - - SlavicNapier8 (2) + + Kasztenny, Adam (2) @@ -11930,11 +11987,11 @@ Sotrud nik (2) - - Spledger (2) + + Spyros (2) @@ -11944,11 +12001,11 @@ Ssorgatem (2) - - StaciBorthwick (2) + + Stappers (2) @@ -11958,11 +12015,11 @@ Stephan66 (2) - - Stuarta0 (2) + + Sturm (2) @@ -11972,11 +12029,11 @@ Superurbi (2) - - SusanSwain3 (2) + + Sven.fischer.de (2) @@ -11986,11 +12043,11 @@ Synanceia (Pierre) (2) - - Tauon (2) + + Techal (2) @@ -12000,11 +12057,11 @@ TeresaMacias3 (2) - - Teresavillegas1 (2) + + TheaGallardo8 (2) @@ -12014,11 +12071,11 @@ TheophilusHess (2) - - Thomase (2) + + Thomeck (2) @@ -12028,11 +12085,11 @@ Tim1075 (2) - - Timeshifter (2) + + Timj (2) @@ -12042,11 +12099,11 @@ TomaMora8 (2) - - Tomkeb (2) + + Tomrobert87 (2) @@ -12056,11 +12113,11 @@ Tsimonq2 (2) - - TuMadre (2) + + Isnard, Timothée (2) @@ -12070,11 +12127,11 @@ Unknown 32 (2) - - Usik64 (2) + + ValessioBrito (2) @@ -12084,11 +12141,11 @@ Dhall, Varun (2) - - VasylynaKendall (2) + + VerneDodd5 (2) @@ -12097,12 +12154,12 @@ VeronicaGrimes (2) - - - + Viper550 (2) + + VirginArredondo (2) @@ -12112,11 +12169,11 @@ VladimirPrince (2) - - VladislavA (2) + + Volker (2) @@ -12126,11 +12183,11 @@ Vossman (2) - - WaclawaSavage (2) + + WalentynaPatrick (2) @@ -12140,11 +12197,11 @@ WarrenChristian (2) - - WashingtonOakley (2) + + Watermelons (2) @@ -12154,11 +12211,11 @@ WikiImporter (2) - - WilhelminaEaton (2) + + WincentyMorrison (2) @@ -12168,11 +12225,11 @@ Wkn (2) - - Wulei (2) + + Xoristzatziki (2) @@ -12182,11 +12239,11 @@ ZiriaKo (2) - - ZoraWinkler1 (2) + + 流星依旧 (2) @@ -12196,11 +12253,11 @@ A H (1) - - AaronPeterson (1) + + Abdulaziz A Alayed (1) @@ -12210,11 +12267,11 @@ Acagastya (1) - - Kepenek, Ahmet Can (1) + + AdalberDesailll (1) @@ -12224,11 +12281,11 @@ Aevora (1) - - Agradecido (1) + + AhmadHaris (1) @@ -12238,11 +12295,11 @@ Ajaxfiore (1) - - Alagris (1) + + Albrechtloh (1) @@ -12252,11 +12309,11 @@ Aleksio Kverka (1) - - Henrie, Alex (1) + + Alex38-68 (1) @@ -12266,11 +12323,11 @@ AlexF (1) - - AlexP111223 (1) + + AlexPS (1) @@ -12280,11 +12337,11 @@ Alexandri (1) - - Chemichev, Alexey (1) + + Alexis 0071 (1) @@ -12294,11 +12351,11 @@ Alexnivan (1) - - Alexsandro Matias (1) + + Ali (1) @@ -12308,11 +12365,11 @@ Alvaropg (1) - - Alverne (1) + + Amacater (1) @@ -12322,11 +12379,11 @@ Anderius (1) - - AndreasEk (1) + + AndreasK (1) @@ -12336,11 +12393,11 @@ Andrey.turkin (1) - - Andriazdk2177 (1) + + AniVar (1) @@ -12350,11 +12407,11 @@ AntoineVe (1) - - Antonello Lobianco (1) + + AntoniePonder (1) @@ -12364,11 +12421,11 @@ Apfelsaft (1) - - Priyadarshi, Apurva (1) + + Arekm (1) @@ -12378,11 +12435,11 @@ ArielleWx (1) - - Arkonide (1) + + Armandos (1) @@ -12392,11 +12449,11 @@ Arnoldu (1) - - Teigseth, Arno (1) + + Artintal (1) @@ -12406,11 +12463,11 @@ Asiersar (1) - - Asselbornmauro (1) + + Astalaseven (1) @@ -12420,11 +12477,11 @@ AundreaPqf (1) - - Averell7 (1) + + Ayoooub (1) @@ -12434,11 +12491,11 @@ Bailiwick (1) - - Bailly02 (1) + + Bami (1) @@ -12448,11 +12505,11 @@ Le Garrec, Vincent (1) - - BarryLovegrove (1) + + Vincent, Babu (1) @@ -12462,11 +12519,11 @@ BernardHannafor (1) - - Bestdating (1) + + Beyoken (1) @@ -12476,11 +12533,11 @@ Bezzy (1) - - Bgloberman (1) + + Bgranados (1) @@ -12490,11 +12547,11 @@ Biofool (1) - - Bjossir (1) + + Bkg2018 (1) @@ -12504,11 +12561,11 @@ BlancheBelstead (1) - - BlancheClopton (1) + + Blandyna (1) @@ -12518,11 +12575,11 @@ Bolo (1) - - Borowcm (1) + + Bortis (1) @@ -12532,11 +12589,11 @@ BrentHawthorne (1) - - BridgettC (1) + + Brinzing, Oliver (1) @@ -12546,11 +12603,11 @@ BryceBrassell (1) - - BryceMoorhouse (1) + + Budo (1) @@ -12560,11 +12617,11 @@ Bureken (1) - - Burger.ga (1) + + Bzsolt (1) @@ -12574,11 +12631,11 @@ CalebSommer (1) - - CalebWgypcu (1) + + Paul, Cameron (1) @@ -12588,11 +12645,11 @@ CarloASilva (1) - - Carlos (1) + + Carlos.gilaranz (1) @@ -12602,11 +12659,11 @@ Cathy (1) - - CedricQ73ktehvp (1) + + Cesera (1) @@ -12616,11 +12673,11 @@ CharlesJenkins (1) - - Chatjoe (1) + + Chmilblick (1) @@ -12630,11 +12687,11 @@ ChrPr (1) - - Christoph.herzog (1) + + Chrlutz (1) @@ -12644,11 +12701,11 @@ CiaraLockie (1) - - Ciriaco (1) + + Classieur (1) @@ -12658,11 +12715,11 @@ Cleitongalvao (1) - - Clem (1) + + CletaValentino (1) @@ -12672,11 +12729,11 @@ Company (1) - - Cora17 (1) + + Corsolibreoffice (1) @@ -12686,11 +12743,11 @@ Cpatrick08 (1) - - Cpinedar (1) + + Cpmipn (1) @@ -12700,11 +12757,11 @@ Csanyipal (1) - - Csongorhalmai (1) + + Css17 (1) @@ -12714,11 +12771,11 @@ DaisieDavison (1) - - Danichocolate (1) + + Danielt998 (1) @@ -12728,11 +12785,11 @@ DarylAlcantar (1) - - DarylBoot (1) + + Dave (1) @@ -12742,11 +12799,11 @@ DawnOgles (1) - - Dbojan (1) + + Di Marco, Daniel (1) @@ -12756,11 +12813,11 @@ DeannaQuaife (1) - - Ray, Debarshi (1) + + DeborahW18 (1) @@ -12770,11 +12827,11 @@ Dennisroczek's Test Account (1) - - Deragon (1) + + Dezsiszabi (1) @@ -12784,11 +12841,11 @@ Herde, Daniel (1) - - Dhiren (1) + + Dianasedlak (1) @@ -12798,11 +12855,11 @@ Do Nhu Vy (1) - - DocuFree (1) + + Dominiko (1) @@ -12812,11 +12869,11 @@ Donadel (1) - - DoreenDuell (1) + + Douglasm (1) @@ -12826,11 +12883,11 @@ Drlandi (1) - - Drtimwright (1) + + Dusek (1) @@ -12840,11 +12897,11 @@ EarnestLamaro (1) - - Echada (1) + + EdgardoRios (1) @@ -12854,11 +12911,11 @@ Edz (1) - - Efcis (1) + + Efegurkan (1) @@ -12868,11 +12925,11 @@ Ehenryb (1) - - Ekuiitr (1) + + ElahiMohammad (1) @@ -12882,11 +12939,11 @@ ElmaWalcott (1) - - Elshize (1) + + Emad (1) @@ -12896,11 +12953,11 @@ Enesates (1) - - Ennael (1) + + Erasmo (1) @@ -12910,11 +12967,11 @@ Eric (1) - - ErickRijoJr (1) + + Ernsttremel (1) @@ -12924,11 +12981,11 @@ Esben aaberg (1) - - EstelaAWTxiu (1) + + Etinos (1) @@ -12938,11 +12995,11 @@ EyalRozenberg (1) - - FMA (1) + + Factooor (1) @@ -12952,11 +13009,11 @@ Falcao (1) - - Farhaf (1) + + Farhank (1) @@ -12966,11 +13023,11 @@ FarzanehSarafraz (1) - - Faseeh1218 (1) + + Fenchi (1) @@ -12980,1215 +13037,1215 @@ Feyza (1) - - Fgland (1) - - Fifh (1) - + + Flirtwomens (1) Foadv (1) - - Foobar (1) Fourdollars (1) + + Francesco (1) Fred.th (1) - - Funnym0nk3y (1) Manas Joshi (1) + + GabrielSwart (1) Gabrielezorzi (1) - - Bilotta, Giuseppe (1) Gcoelho (1) + + GeeZ (1) Gekacheka (1) - - Geoff newson (1) Gerard (1) + + Gerritg (1) van Valkenhoef, Gert (1) - - Houston, Gary (1) Giancav (1) + + Gicmo (1) Gmeijssen (1) - - Goldensgui (1) Gpmanrpi (1) + + Grahl (1) GrantCelley (1) - - Grass-tree (1) Hernandez, Gregg (1) + + GroverYQVvwokac (1) Gstein (1) - - Guhde (1) Guillaume (1) + + Gwidion (1) Gxyd (1) - - H Wettlaufer (1) HFujimaki (1) + + HKagerer (1) HLGZorawdi (1) - - Haggai (1) Hagos (1) + + Hamati (1) Hamkins (1) - - Hasinasi (1) Hbr (1) + + Rui Wang (1) Hermeli2856 (1) - - HessnovTHR44 (1) Heygo (1) + + Heyheyitshay (1) Hfischer (1) - - Hillrich (1) HiltonFtel (1) + + Hitomi t (1) Hkdocholid (1) - - Hlavaty, Tomas (1) Hoaivan27299 (1) + + Honza.havlicek (1) Hopman (1) - - HoracioRydge (1) Hornmichaels (1) + + Hosiryuhosi (1) Hriostat (1) - - HumbertGno (1) Hwoehrle (1) + + Ialbors (1) Ian (1) - - Iandol (1) Ianjo (1) + + IbraM (1) IceBlur (1) - - Ida (1) Gilham, Ian (1) + + Igorizyumin (1) Imypsychconsult (1) - - Şendur, İrem (1) Irene (1) + + IrrevdJohn (1) IrvinFunkw (1) - - IvanP (1) JDługosz (1) + + JK2308 (1) Jab (1) - - Jailletc36 (1) JaimeS (1) + + Jamil (1) JanEnEm (1) - - Janani (1) Jani (1) + + Janvlug (1) Jayppc (1) - - Jazzon (1) Jcdericco (1) + + Chaffraix, Julien (1) Jcrben (1) - - Jean.fr (1) JeanAmessdvaei (1) + + JeanMcPhillamy (1) JefferyMackenna (1) - - Jentron256 (1) Jeongkyu (1) + + Bicha, Jeremy (1) JerryShi (1) - - JessicaParker (1) Gao, Qiwen (1) + + JestineNww (1) Lazar, Timotej (1) - - Jflory7 (1) Bruhn, Jan-Henrik (1) + + Jinocvla (1) JiroMatsuzawa (1) - - Jj151515 (1) Jmarchn (1) + + Joachim (1) Joanluc (1) - - Joaofernando (1) JoelH (1) + + Johnplay2 (1) JomarSilva (1) - - Jonatanpc8 (1) JonelleFritz (1) + + Wu, Haidong (1) JordanS (1) - - Jorge Rodríguez Fonseca (1) Jorgemendes (1) + + JoseGatica (1) Joselaurian (1) - - Joshun (1) José Eduardo (1) + + Jp.santi (1) Jpl (1) - - Clarke, James (1) Jsbueno (1) + + JudeMcCafferty (1) Juergen (1) - - JuliannSnider (1) Picca, Juan (1) + + Jwcampbell (1) Dubrulle, Kevin (1) - - Kader (1) Kapoorsahab (1) + + KatjaG (1) Bhat, Kishor (1) - - Keith Long (1) Kenneth.venken (1) + + Kenton3255 (1) Kiyotaka Nishibori (1) - - Kasper, Kacper (1) Kkremitzki (1) + + Knobo (1) Koeleman (1) - - Kosmous (1) KourtneNester (1) + + Kr1shna (1) Krotow (1) - - Kumar, Thangavel (1) Kying (1) + + LKPSharylptwsdo (1) LMKemm (1) - - LOFF (1) LaPingvino (1) + + Laskov (1) LatoshaZnu (1) - - LaverneNavarret (1) LavinaVandermar (1) + + Learner (1) Libo02 (1) - - Librestez54 (1) Likoski (1) + + LillieNlowccx (1) Lineinthesand (1) - - Literacyglenys (1) Litishia (1) + + Liturgist (1) Llalllal1 (1) - - Lobillo (1) Lopp Rs (1) + + Lorne (1) Lplatypus (1) - - Luca (1) Lucas Filho (1) + + LudieNutter (1) Luiz Cláudio (1) - - Luiz Rezende (1) Luke (1) + + M.sacharewicz (1) M1ndfr3ak (1) - - MJW (1) Maahicool (1) + + Mabel7997eelu (1) Maemst (1) - - Magicienap (1) Magmag (1) + + Mahdiekrani (1) Mahmudul (1) - - Maliuta (1) Manveru1986 (1) + + MarcelProut (1) MarcoZ (1) - - Biscaro, Marco (1) Marcosalex (1) + + Marcosps (1) MargoBergman (1) - - MarianaConnell (1) Mariano Gaudix (1) + + MarkWielaaard (1) Markcoomes (1) - - Markzog21 (1) MarthaWaterman (1) + + Marwan (1) Maryanndefo91 (1) - - Masaki tamakoshi (1) Massao (1) + + Mastizada (1) Matsuura (1) - - MattTheGeek (1) Campanelli, Matteo (1) + + Matěj (1) Mau (1) - - Maxjf1 (1) Bechler, Moritz (1) + + Mblume3 (1) Doležel, Marek (1) - - Megan44Dgxg (1) Melikeyurtoglu (1) + + Menturi (1) MeskoBalazs (1) - - Mete0r (1) Mhaehnel (1) + + Mhcrnl (1) Mhenriday (1) - - Mibm123 (1) Michaelwood (1) + + Michka B (1) Midomidi2013 (1) - - MiguelKastner (1) Miguelverdu (1) + + Mikolg (1) MilagroWilkerso (1) - - Milanbv (1) Miles (1) + + Minarja4 (1) Mirsad (1) - - Miurahr (1) Mixer (1) + + Mixstah (1) Mlager (1) - - Mmeof (1) Moberg (1) + + Mohammedzalta (1) Momo50 (1) - - Monikayadav (1) Soini, Mox (1) + + Mrund (1) Muhammadsufyanzainalabidin (1) - - Mw (1) Myan (1) + + MyraBlacklow (1) N3rd4i (1) - - NEOhidra (1) NNe8Lx2gc (1) + + Nanotron (1) Nattu (1) - - Ncaio (1) Nedrichards (1) + + NellieSMWX (1) Neteler (1) - - Nevanos (1) Ngoswami (1) + + Nickko (1) Nilss (1) - - Nithin.padavu (1) Ngo, Minh (1) + + Nnino2 (1) Norty (1) - - Notafish (1) NotesTracker (1) + + Nouiurm (1) Norbert X (1) - - Nurohman (1) Oclei (1) + + Oig (1) Oiouitt (1) - - Okusi (1) Olea (1) + + Omansmith (1) Omerta (1) - - Onurkucuk67 (1) Oosterkamp (1) + + Opestawon (1) Sezen, Hunter (1) - - Orrd (1) Osoitz (1) + + Oui (1) Anderson, Owen (1) - - Esen, Özcan (1) Ozpoz (1) + + Öztürk, Emre (1) PBsoft (1) - - Pal, Pawan (1) Padenton (1) + + PamalaDorsch (1) Pankaj (1) - - Papesky (1) Passerpunt (1) + + Pastim (1) Paulmenzel (1) - - Paulolima (1) Pelambrera (1) + + PenelopHewlett (1) Nowee, Peter (1) - - Vorel, Petr (1) Pharmankur (1) + + Phb.nbnet.nb.ca (1) Pherjung (1) - - PhilDur (1) Philhart (1) + + PhilipTimms (1) Philippe43 (1) - - Krylov, Phil (1) Phomes (1) + + Paraiso, Joan (1) Pi (1) - - Piero (1) PieterDeBruijn (1) + + Pietro.caballeri (1) Pilavi (1) - - Piratu (1) Piternoize (1) + + Pjotr (1) Pkavinda (1) - - Plastique (1) Plastovicka (1) + + Moscu, Alexandru (1) PopularOutcast (1) - - Por (1) Carter, Travis (1) + + Prosper (1) Psauthor (1) - - Psmits (1) Psychicread531 (1) + + Vidhey Pv (1) + Pwz266266 (1) + + Illarionov, Arkadiy (1) - - Qiguo (1) + + Qtwallaert (1) @@ -14198,11 +14255,11 @@ Quickbooktech (1) - - Qwe (1) + + Rahuldeshmukh101 (1) @@ -14212,11 +14269,11 @@ Ramonturner (1) - - Ratias (1) + + Rcampbelllaos (1) @@ -14226,11 +14283,11 @@ Rettichschnidi (1) - - RexRTEJnlzus (1) + + Rholler (1) @@ -14240,11 +14297,11 @@ RickieHpejt (1) - - Riessmi (1) + + Rif (1) @@ -14254,11 +14311,11 @@ Ringlerloje (1) - - Rion (1) + + Ritzema, Brent (1) @@ -14268,11 +14325,11 @@ Kondratenko, Rostislav (1) - - Robert Wetzlmayr (1) + + Robineh (1) @@ -14282,11 +14339,11 @@ Rockers (1) - - Rodney78 (1) + + Deshmukh, Rohit (1) @@ -14296,11 +14353,11 @@ Ron1 (1) - - Ronny (1) + + Roscoe5731 (1) @@ -14310,11 +14367,11 @@ Rpott (1) - - Rsedak (1) + + RuleAndLine (1) @@ -14324,11 +14381,11 @@ Ryho (1) - - ONODERA, Ryo (1) + + SallyMorales (1) @@ -14338,11 +14395,11 @@ Sambhav2612 (1) - - Tygier, Sam (1) + + Sandeeps (1) @@ -14352,11 +14409,11 @@ Saracans (1) - - Sariyar (1) + + Sbar1 (1) @@ -14366,11 +14423,11 @@ Schrillesbunteshamburg (1) - - Scito (1) + + Scno (1) @@ -14380,11 +14437,11 @@ Ak, Sedat (1) - - Senopen (1) + + Serdarot5 (1) @@ -14394,11 +14451,11 @@ ShaynaMan (1) - - SherylMillingto (1) + + Shore, Shimon (1) @@ -14408,6 +14465,9 @@ Shortblack (1) + + Shubhamgoyal (1) + @@ -14425,9 +14485,6 @@ - SimsimiUy (1) - - Skierpage (1) @@ -14436,11 +14493,11 @@ Socialmitchell (1) - - Son Sonson (1) + + Sourabh1031 (1) @@ -14450,11 +14507,11 @@ SpeedyGonsales (1) - - Sphericalhorse (1) + + Spreadsheetsorter (1) @@ -14464,11 +14521,11 @@ Stewart75H (1) - - Stonehubmn (1) + + Subhash (1) @@ -14478,11 +14535,11 @@ SusieVeasley (1) - - Svalo (1) + + SvenHornung (1) @@ -14492,11 +14549,11 @@ Sviola (1) - - Svtlichnijj (1) + + Sébastien C. (1) @@ -14506,11 +14563,11 @@ Talueses (1) - - Tanguy k (1) + + Thanakanok, Tantai (1) @@ -14520,11 +14577,11 @@ Techsquirrel (1) - - TeganCreswick (1) + + Tegas (1) @@ -14534,11 +14591,11 @@ Testsflirt (1) - - The Magpie (1) + + ThePokehach (1) @@ -14548,11 +14605,11 @@ Thom (1) - - Thor574 (1) + + ThudDriver (1) @@ -14562,11 +14619,11 @@ Tigerbeard (1) - - Tilt (1) + + Tmongkol (1) @@ -14576,11 +14633,11 @@ Viehmann, Thomas (1) - - Tpokorra (1) + + Transcend (1) @@ -14590,11 +14647,11 @@ Trondtr (1) - - Ttv20 (1) + + Tuliouel (1) @@ -14604,11 +14661,11 @@ Thibault, Vallois (1) - - Jain, Umang (1) + + Udit Sharma (1) @@ -14618,11 +14675,11 @@ Vincent, Brennan (1) - - Unho (1) + + UrmasD (1) @@ -14632,11 +14689,11 @@ Ushabtay (1) - - VIPSylar (1) + + VPUJamikajklq (1) @@ -14646,11 +14703,11 @@ Veeven (1) - - Vera Cavalcante (1) + + VernaSchulze (1) @@ -14660,11 +14717,11 @@ Vinkas (1) - - Virus009 (1) + + WOBFriedauk (1) @@ -14674,11 +14731,11 @@ WandaSingletary (1) - - Wastl (1) + + Waynemcl (1) @@ -14688,11 +14745,11 @@ Wes (1) - - Westantenna (1) + + Wezchlebaty (1) @@ -14702,11 +14759,11 @@ William Avery (1) - - Williewortel (1) + + Klausner, Thomas (1) @@ -14716,11 +14773,11 @@ XSXKristin (1) - - Baudin, Lucas (1) + + Xsdcfghjk (1) @@ -14730,11 +14787,11 @@ XtinaS (1) - - Xtrusia (1) + + Yangyiji (1) @@ -14744,11 +14801,11 @@ Yazu (1) - - Yeliztaneroglu (1) + + Desai, Yogesh (1) @@ -14758,11 +14815,11 @@ Yowbooks (1) - - YvanM (1) + + Yy y ja jp (1) @@ -14772,20 +14829,21 @@ ZBMCallumbwire (1) - - Zangune (1) + + Zizzle (1) 鄒延 (1) - + + If you want to replace your Wiki user name with your full name, go to this wiki page and add yourself to the name mapping list. diff -Nru libreoffice-6.2.2/Repository.mk libreoffice-6.2.3/Repository.mk --- libreoffice-6.2.2/Repository.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/Repository.mk 2019-04-10 10:10:51.000000000 +0000 @@ -404,7 +404,7 @@ $(call gb_Helper_optional,SCRIPTING,msforms) \ mtfrenderer \ $(if $(ENABLE_JAVA),mysql_jdbc) \ - $(call gb_Helper_optional,DBCONNECTIVITY,mysqlc) \ + $(call gb_Helper_optional,MARIADBC,$(call gb_Helper_optional,DBCONNECTIVITY,mysqlc)) \ numbertext \ odbc \ odfflatxml \ diff -Nru libreoffice-6.2.2/sal/osl/w32/procimpl.cxx libreoffice-6.2.3/sal/osl/w32/procimpl.cxx --- libreoffice-6.2.2/sal/osl/w32/procimpl.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sal/osl/w32/procimpl.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -319,10 +319,20 @@ OUString get_file_extension(const OUString& file_name) { - sal_Int32 index = file_name.lastIndexOf('.'); - if ((index != -1) && ((index + 1) < file_name.getLength())) - return file_name.copy(index + 1); - + // Quoted file name + if ((file_name.indexOf(L'"') == 0) && (file_name.lastIndexOf(L'"') == (file_name.getLength() - 1))) + { + sal_Int32 index = file_name.lastIndexOf('.'); + if ((index != -1) && ((index + 2) < file_name.getLength())) + return file_name.copy(index + 1, file_name.getLength() - (index + 2)); + } + // Unquoted file name + else + { + sal_Int32 index = file_name.lastIndexOf('.'); + if ((index != -1) && ((index + 1) < file_name.getLength())) + return file_name.copy(index + 1); + } return OUString(); } diff -Nru libreoffice-6.2.2/sc/CppunitTest_sc_pdf_export.mk libreoffice-6.2.3/sc/CppunitTest_sc_pdf_export.mk --- libreoffice-6.2.2/sc/CppunitTest_sc_pdf_export.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/sc/CppunitTest_sc_pdf_export.mk 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,97 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_CppunitTest_CppunitTest,sc_pdf_export)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_pdf_export, \ + sc/qa/extras/scpdfexport \ +)) + +$(eval $(call gb_CppunitTest_use_externals,sc_pdf_export, \ + boost_headers \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_pdf_export, \ + comphelper \ + cppu \ + editeng \ + sal \ + sax \ + sc \ + sfx \ + svl \ + test \ + tl \ + unotest \ + utl \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_pdf_export,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sc_pdf_export,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sc_pdf_export)) +$(eval $(call gb_CppunitTest_use_vcl,sc_pdf_export)) + +$(eval $(call gb_CppunitTest_use_components,sc_pdf_export,\ + basic/util/sb \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + dbaccess/util/dba \ + eventattacher/source/evtatt \ + filter/source/config/cache/filterconfig1 \ + filter/source/pdf/pdffilter \ + filter/source/storagefilterdetect/storagefd \ + forms/util/frm \ + framework/util/fwk \ + i18npool/source/search/i18nsearch \ + i18npool/util/i18npool \ + linguistic/source/lng \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + scripting/source/basprov/basprov \ + scripting/source/dlgprov/dlgprov \ + scripting/source/vbaevents/vbaevents \ + scripting/util/scriptframe \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ + $(call gb_Helper_optional,SCRIPTING, \ + sc/util/vbaobj) \ + sfx2/util/sfx \ + sot/util/sot \ + svl/source/fsstor/fsstorage \ + svtools/util/svt \ + svx/util/svx \ + svx/util/svxcore \ + toolkit/util/tk \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + ucb/source/ucp/tdoc/ucptdoc1 \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ + uui/util/uui \ + vcl/vcl.common \ + vbahelper/util/msforms \ + xmloff/util/xo \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_pdf_export)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-6.2.2/sc/inc/column.hxx libreoffice-6.2.3/sc/inc/column.hxx --- libreoffice-6.2.2/sc/inc/column.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/inc/column.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -636,13 +636,23 @@ /** * Detach a formula cell that's about to be deleted, or removed from * document storage (if that ever happens). + * + * @param rNewSharedRows collects possible new shared row ranges (top and + * bottom of shared or remaining single twice) resulting from + * unsharing to reestablish listeners on. */ - void DetachFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ); + void DetachFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, + std::vector& rNewSharedRows ); + + /** Re-establish listeners on unshared formula groups */ + void StartListeningUnshared( const std::vector& rNewSharedRows ); - void DetachFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength ); + void DetachFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength, + std::vector* pNewSharedRows ); void AttachFormulaCells( sc::StartListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ); - void DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ); + void DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, + std::vector* pNewSharedRows ); /** * Regroup formula cells for the entire column. @@ -692,18 +702,24 @@ bool ReservePatternCount( SCSIZE nReserve ); private: - sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow ); - sc::CellStoreType::iterator GetPositionToInsert( const sc::CellStoreType::iterator& it, SCROW nRow ); + sc::CellStoreType::iterator GetPositionToInsert( SCROW nRow, std::vector& rNewSharedRows, + bool bInsertFormula ); + sc::CellStoreType::iterator GetPositionToInsert( const sc::CellStoreType::iterator& it, SCROW nRow, + std::vector& rNewSharedRows, bool bInsertFormula ); void AttachNewFormulaCell( const sc::CellStoreType::iterator& itPos, SCROW nRow, ScFormulaCell& rCell, + const std::vector& rNewSharedRows, bool bJoin = true, sc::StartListeningType eListenType = sc::SingleCellListening ); void AttachNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, + const std::vector& rNewSharedRows, bool bJoin = true, sc::StartListeningType eListenType = sc::SingleCellListening ); - void AttachNewFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength ); + void AttachNewFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength, + std::vector& rNewSharedRows ); + void BroadcastNewCell( SCROW nRow ); bool UpdateScriptType( sc::CellTextAttr& rAttr, SCROW nRow, sc::CellStoreType::iterator& itr ); diff -Nru libreoffice-6.2.2/sc/inc/sharedformula.hxx libreoffice-6.2.3/sc/inc/sharedformula.hxx --- libreoffice-6.2.2/sc/inc/sharedformula.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/inc/sharedformula.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -57,6 +57,9 @@ } } + /** Get shared formula top cell from position, if any, else nullptr. */ + static const ScFormulaCell* getSharedTopFormulaCell(const CellStoreType::position_type& aPos); + /** * Split existing shared formula range at specified position. The cell at * specified position becomes the top cell of the lower shared formula @@ -65,8 +68,11 @@ * * @param aPos position of cell to examine. * @param pCxt context to be used, if any, may be nullptr. + * + * @return TRUE if there indeed was a split, else FALSE (e.g. split + * position was top or bottom cell or no formula group). */ - static void splitFormulaCellGroup(const CellStoreType::position_type& aPos, sc::EndListeningContext* pCxt); + static bool splitFormulaCellGroup(const CellStoreType::position_type& aPos, sc::EndListeningContext* pCxt); /** * Split existing shared formula ranges at specified row positions. @@ -75,8 +81,11 @@ * @param rBounds row positions at which to split existing shared formula * ranges. Note that this method will directly modify this * parameter to sort and remove duplicates. + * + * @return TRUE if there indeed was a split, else FALSE (e.g. split + * positions were only top or bottom cells or no formula group). */ - static void splitFormulaCellGroups(CellStoreType& rCells, std::vector& rBounds); + static bool splitFormulaCellGroups(CellStoreType& rCells, std::vector& rBounds); /** * See if two specified adjacent formula cells can be merged, and if they diff -Nru libreoffice-6.2.2/sc/Module_sc.mk libreoffice-6.2.3/sc/Module_sc.mk --- libreoffice-6.2.2/sc/Module_sc.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/Module_sc.mk 2019-04-10 10:10:51.000000000 +0000 @@ -61,6 +61,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sc, \ CppunitTest_sc_cond_format_merge \ CppunitTest_sc_new_cond_format_api \ + CppunitTest_sc_pdf_export \ CppunitTest_sc_subsequent_filters_test \ CppunitTest_sc_subsequent_export_test \ CppunitTest_sc_html_export_test \ diff -Nru libreoffice-6.2.2/sc/qa/extras/scpdfexport.cxx libreoffice-6.2.3/sc/qa/extras/scpdfexport.cxx --- libreoffice-6.2.2/sc/qa/extras/scpdfexport.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/sc/qa/extras/scpdfexport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,284 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace css::lang; +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; + +class ScPDFExportTest : public test::BootstrapFixture, public unotest::MacrosTest +{ + Reference mxComponent; + Reference xTargetFrame; + +public: + ScPDFExportTest() {} + + virtual void setUp() override final; + virtual void tearDown() override final; + + // helpers +private: + std::shared_ptr exportToPdf(uno::Reference& xModel, + const ScRange& range); + + static bool hasFontInPdf(const std::shared_ptr& pXPathFile, + const char* sFontName, bool& bFound); + + void setFont(ScFieldEditEngine& rEE, sal_Int32 nStart, sal_Int32 nEnd, + const OUString& rFontName); + + // unit tests +public: + void testExportRange_Tdf120161(); + + CPPUNIT_TEST_SUITE(ScPDFExportTest); + CPPUNIT_TEST(testExportRange_Tdf120161); + CPPUNIT_TEST_SUITE_END(); +}; + +void ScPDFExportTest::setUp() +{ + test::BootstrapFixture::setUp(); + + mxDesktop.set( + css::frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); + + { + uno::Reference xDesktop = mxDesktop; + CPPUNIT_ASSERT(xDesktop.is()); + + // Create spreadsheet + uno::Sequence args(1); + args[0].Name = "Hidden"; + args[0].Value <<= true; + mxComponent = xDesktop->loadComponentFromURL("private:factory/scalc", "_blank", 0, args); + CPPUNIT_ASSERT(mxComponent.is()); + + // create a frame + xTargetFrame = xDesktop->findFrame("_blank", 0); + CPPUNIT_ASSERT(xTargetFrame.is()); + + uno::Reference xModel + = uno::Reference(mxComponent, uno::UNO_QUERY); + uno::Reference xModel2(xModel, UNO_QUERY); + CPPUNIT_ASSERT(xModel2.is()); + + Reference xController( + xModel2->createDefaultViewController(xTargetFrame), UNO_QUERY); + CPPUNIT_ASSERT(xController.is()); + + // introduce model/view/controller to each other + xController->attachModel(xModel2.get()); + xModel2->connectController(xController.get()); + + xTargetFrame->setComponent(xController->getComponentWindow(), xController.get()); + xController->attachFrame(xTargetFrame); + + xModel2->setCurrentController(xController.get()); + } +} + +void ScPDFExportTest::tearDown() +{ + if (mxComponent.is()) + mxComponent->dispose(); + + test::BootstrapFixture::tearDown(); +} + +bool ScPDFExportTest::hasFontInPdf(const std::shared_ptr& pXPathFile, + const char* sFontName, bool& bFound) +{ + SvStream* pStream = pXPathFile->GetStream(StreamMode::STD_READ); + CPPUNIT_ASSERT(pStream); + + // get file size + pStream->Seek(STREAM_SEEK_TO_END); + const std::size_t nFileSize = pStream->Tell(); + if (nFileSize == 0) + return false; + + // read file content + char* pBuffer = new char[nFileSize]; + pStream->Seek(STREAM_SEEK_TO_BEGIN); + const std::size_t nRead = pStream->ReadBytes(pBuffer, nFileSize); + if (nRead == nFileSize) + { + const std::string haystack(pBuffer, pBuffer + nFileSize); + const std::string needle(sFontName); + const std::size_t n = haystack.find(needle); + bFound = (n != std::string::npos); + } + delete[] pBuffer; + + // close and return the status + pStream = nullptr; + pXPathFile->CloseStream(); + return (nRead == nFileSize); +} + +std::shared_ptr ScPDFExportTest::exportToPdf(uno::Reference& xModel, + const ScRange& range) +{ + // create temp file name + std::shared_ptr pTempFile(new utl::TempFile()); + pTempFile->EnableKillingFile(); + OUString sFileURL = pTempFile->GetURL(); + // Note: under Windows path path should be with "/" delimiters instead of "\\" + // due to usage of INetURLObject() that converts "\\" to hexdecimal notation. + ::osl::FileBase::getFileURLFromSystemPath(sFileURL, sFileURL); + + // get XSpreadsheet + uno::Reference xDoc(xModel, uno::UNO_QUERY_THROW); + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xIndex(xSheets, uno::UNO_QUERY_THROW); + uno::Reference rSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); + + // select requested cells to print + // query for the XCellRange interface + uno::Reference rCellRange(rSheet, UNO_QUERY); + uno::Reference xCellRange = rCellRange->getCellRangeByPosition( + range.aStart.Col(), range.aStart.Row(), range.aEnd.Col(), range.aEnd.Row()); + { + uno::Reference xController = xModel->getCurrentController(); + CPPUNIT_ASSERT(xController.is()); + + uno::Reference xSelection(xController, uno::UNO_QUERY_THROW); + CPPUNIT_ASSERT(xSelection.is()); + + uno::Any rCellRangeAny(xCellRange); + xSelection->select(rCellRangeAny); + } + + // init special pdf export params + css::uno::Sequence aFilterData(3); + aFilterData[0].Name = "Selection"; + aFilterData[0].Value <<= xCellRange; + aFilterData[1].Name = "Printing"; + aFilterData[1].Value <<= sal_Int32(2); + aFilterData[2].Name = "ViewPDFAfterExport"; + aFilterData[2].Value <<= true; + + // init set of params for storeToURL() call + css::uno::Sequence seqArguments(3); + seqArguments[0].Name = "FilterData"; + seqArguments[0].Value <<= aFilterData; + seqArguments[1].Name = "FilterName"; + seqArguments[1].Value <<= OUString("calc_pdf_Export"); + seqArguments[2].Name = "URL"; + seqArguments[2].Value <<= sFileURL; + + // call storeToURL() + uno::Reference xComponent(mxComponent, UNO_QUERY_THROW); + uno::Reference xStorable(xComponent, UNO_QUERY); + xStorable->storeToURL(sFileURL, seqArguments); + + // return file object with generated PDF + return pTempFile; +} + +void ScPDFExportTest::setFont(ScFieldEditEngine& rEE, sal_Int32 nStart, sal_Int32 nEnd, + const OUString& rFontName) +{ + ESelection aSel; + aSel.nStartPara = aSel.nEndPara = 0; + aSel.nStartPos = nStart; + aSel.nEndPos = nEnd; + + SfxItemSet aItemSet = rEE.GetEmptyItemSet(); + SvxFontItem aItem(FAMILY_MODERN, rFontName, "", PITCH_VARIABLE, RTL_TEXTENCODING_UTF8, + EE_CHAR_FONTINFO); + aItemSet.Put(aItem); + rEE.QuickSetAttribs(aItemSet, aSel); +} + +// Selection was not taken into account during export into PDF +void ScPDFExportTest::testExportRange_Tdf120161() +{ + // create test document + uno::Reference xModel + = uno::Reference(mxComponent, uno::UNO_QUERY); + uno::Reference xDoc(xModel, uno::UNO_QUERY_THROW); + uno::Reference xSheets(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference xIndex(xSheets, uno::UNO_QUERY_THROW); + xSheets->insertNewByName("First Sheet", 0); + uno::Reference rSheet(xIndex->getByIndex(0), UNO_QUERY_THROW); + + // 2. Setup data + { + SfxObjectShell* pFoundShell = SfxObjectShell::GetShellFromComponent(mxComponent); + CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell); + ScDocShellRef xDocSh = dynamic_cast(pFoundShell); + CPPUNIT_ASSERT(xDocSh.get() != nullptr); + + // put some content into the first row with default font + ScDocument& rDoc = xDocSh->GetDocument(); + for (unsigned int r = 0; r < 1; ++r) + for (unsigned int c = 0; c < 14; ++c) + rDoc.SetValue(ScAddress(c, r, 0), (r + 1) * (c + 1)); + + // set "Text" to H1 cell with "DejaVuSans" font + ScFieldEditEngine& rEE = rDoc.GetEditEngine(); + rEE.Clear(); + rEE.SetText("Text"); + setFont(rEE, 0, 4, "DejaVuSans"); // set font for first 4 chars + rDoc.SetEditText(ScAddress(7, 0, 0), rEE.CreateTextObject()); + } + + // A1:G1 + { + ScRange range1(0, 0, 0, 6, 0, 0); + std::shared_ptr pXPathFile = exportToPdf(xModel, range1); + bool bFound = false; + CPPUNIT_ASSERT(hasFontInPdf(pXPathFile, "DejaVuSans", bFound)); + CPPUNIT_ASSERT_EQUAL(false, bFound); + } + + // G1:H1 + { + ScRange range1(6, 0, 0, 7, 0, 0); + std::shared_ptr pXPathFile = exportToPdf(xModel, range1); + bool bFound = false; + CPPUNIT_ASSERT(hasFontInPdf(pXPathFile, "DejaVuSans", bFound)); + CPPUNIT_ASSERT_EQUAL(true, bFound); + } + + // H1:I1 + { + ScRange range1(7, 0, 0, 8, 0, 0); + std::shared_ptr pXPathFile = exportToPdf(xModel, range1); + bool bFound = false; + CPPUNIT_ASSERT(hasFontInPdf(pXPathFile, "DejaVuSans", bFound)); + CPPUNIT_ASSERT_EQUAL(true, bFound); + } +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScPDFExportTest); +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sc/qa/unit/data/ods/pivot-table-err-in-cache.ods and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sc/qa/unit/data/ods/pivot-table-err-in-cache.ods differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sc/qa/unit/data/ods/sheet_name_with_dots.ods and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sc/qa/unit/data/ods/sheet_name_with_dots.ods differ diff -Nru libreoffice-6.2.2/sc/qa/unit/pivottable_filters_test.cxx libreoffice-6.2.3/sc/qa/unit/pivottable_filters_test.cxx --- libreoffice-6.2.2/sc/qa/unit/pivottable_filters_test.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/qa/unit/pivottable_filters_test.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -84,6 +84,7 @@ void testPivotTableDuplicatedMemberFilterXLSX(); void testPivotTableTabularModeXLSX(); void testTdf112106(); + void testTdf123923(); CPPUNIT_TEST_SUITE(ScPivotTableFiltersTest); @@ -122,6 +123,7 @@ CPPUNIT_TEST(testPivotTableDuplicatedMemberFilterXLSX); CPPUNIT_TEST(testPivotTableTabularModeXLSX); CPPUNIT_TEST(testTdf112106); + CPPUNIT_TEST(testTdf123923); CPPUNIT_TEST_SUITE_END(); @@ -2315,6 +2317,23 @@ xDocSh->DoClose(); } +void ScPivotTableFiltersTest::testTdf123923() +{ + // tdf#123923: Excel fails when it finds "Err:504" instead of "#REF!" in pivot table cache + + ScDocShellRef xShell = loadDoc("pivot-table-err-in-cache.", FORMAT_ODS); + CPPUNIT_ASSERT(xShell.is()); + + std::shared_ptr pXPathFile + = ScBootstrapFixture::exportTo(&(*xShell), FORMAT_XLSX); + xmlDocPtr pTable = XPathHelper::parseExport(pXPathFile, m_xSFactory, + "xl/pivotCache/pivotCacheDefinition1.xml"); + CPPUNIT_ASSERT(pTable); + + assertXPath(pTable, "/x:pivotCacheDefinition/x:cacheFields/x:cacheField[1]/x:sharedItems/x:e", + "v", "#REF!"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(ScPivotTableFiltersTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-6.2.2/sc/qa/unit/subsequent_export-test.cxx libreoffice-6.2.3/sc/qa/unit/subsequent_export-test.cxx --- libreoffice-6.2.2/sc/qa/unit/subsequent_export-test.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/qa/unit/subsequent_export-test.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -220,6 +220,7 @@ void testTdf118990(); void testTdf121612(); void testPivotCacheAfterExportXLSX(); + void testTdf114969XLSX(); CPPUNIT_TEST_SUITE(ScExportTest); CPPUNIT_TEST(test); @@ -335,6 +336,7 @@ CPPUNIT_TEST(testTdf118990); CPPUNIT_TEST(testTdf121612); CPPUNIT_TEST(testPivotCacheAfterExportXLSX); + CPPUNIT_TEST(testTdf114969XLSX); CPPUNIT_TEST_SUITE_END(); @@ -4231,6 +4233,17 @@ xDocSh->DoClose(); } +void ScExportTest::testTdf114969XLSX() +{ + ScDocShellRef xDocSh = loadDoc("sheet_name_with_dots.", FORMAT_ODS); + CPPUNIT_ASSERT(xDocSh.is()); + + xmlDocPtr pDoc = XPathHelper::parseExport2(*this, *xDocSh, m_xSFactory, "xl/worksheets/sheet1.xml", FORMAT_XLSX); + CPPUNIT_ASSERT(pDoc); + assertXPath(pDoc, "/x:worksheet/x:hyperlinks/x:hyperlink[1]", "location", "'1.1.1.1'!C1"); + assertXPath(pDoc, "/x:worksheet/x:hyperlinks/x:hyperlink[2]", "location", "'1.1.1.1'!C2"); +} + CPPUNIT_TEST_SUITE_REGISTRATION(ScExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-6.2.2/sc/qa/unit/ucalc.hxx libreoffice-6.2.3/sc/qa/unit/ucalc.hxx --- libreoffice-6.2.2/sc/qa/unit/ucalc.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/qa/unit/ucalc.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -407,6 +407,9 @@ void testSharedFormulaListenerDeleteArea(); void testSharedFormulaUpdateOnReplacement(); void testSharedFormulaDeleteTopCell(); + void testSharedFormulaCutCopyMoveIntoRef(); + void testSharedFormulaCutCopyMoveWithRef(); + void testSharedFormulaCutCopyMoveWithinRun(); void testFormulaPosition(); void testFormulaWizardSubformula(); @@ -757,6 +760,9 @@ CPPUNIT_TEST(testSharedFormulaListenerDeleteArea); CPPUNIT_TEST(testSharedFormulaUpdateOnReplacement); CPPUNIT_TEST(testSharedFormulaDeleteTopCell); + CPPUNIT_TEST(testSharedFormulaCutCopyMoveIntoRef); + CPPUNIT_TEST(testSharedFormulaCutCopyMoveWithRef); + CPPUNIT_TEST(testSharedFormulaCutCopyMoveWithinRun); CPPUNIT_TEST(testFormulaPosition); CPPUNIT_TEST(testFormulaWizardSubformula); CPPUNIT_TEST(testMixData); diff -Nru libreoffice-6.2.2/sc/qa/unit/ucalc_sharedformula.cxx libreoffice-6.2.3/sc/qa/unit/ucalc_sharedformula.cxx --- libreoffice-6.2.2/sc/qa/unit/ucalc_sharedformula.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/qa/unit/ucalc_sharedformula.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1668,6 +1668,21 @@ m_pDoc->DeleteTab(0); } +static double checkNewValuesNotification( ScDocument* pDoc, const ScAddress& rOrgPos ) +{ + ScAddress aPos(rOrgPos); + aPos.IncCol(); + pDoc->SetValues( aPos, {1024.0, 2048.0, 4096.0, 8192.0, 16384.0}); + aPos = rOrgPos; + double fVal = 0.0; + for (SCROW i=0; i < 5; ++i) + { + fVal += pDoc->GetValue(aPos); + aPos.IncRow(); + } + return fVal; +} + void Test::testSharedFormulaUnshareAreaListeners() { sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. @@ -1696,6 +1711,460 @@ CPPUNIT_ASSERT_EQUAL(17.0, m_pDoc->GetValue(ScAddress(0,0,0))); CPPUNIT_ASSERT_EQUAL(40.0, m_pDoc->GetValue(ScAddress(0,2,0))); + clearRange(m_pDoc, ScRange( 0,0,0, 1,3,0)); + + for (int nRun = 0; nRun < 7; ++nRun) + { + // Data in A2:C6 + const ScAddress aOrgPos(0,1,0); + const char* pData2[][3] = { + { "=SUM(B2:C2)", "1", "2" }, + { "=SUM(B3:C3)", "4", "8" }, + { "=SUM(B4:C4)", "16", "32" }, + { "=SUM(B5:C5)", "64", "128" }, + { "=SUM(B6:C6)", "256", "512" }, + }; + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Check that A2:A6 is a formula group. + pFC = m_pDoc->GetFormulaCell(aOrgPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A2", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aOrgPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(5), pFC->GetSharedLength()); + + // Overwrite and thus unshare formula in A3. + // Check different code paths with different methods. + ScAddress aPos(aOrgPos); + aPos.IncRow(2); + switch (nRun) + { + case 0: + // Directly set a different formula cell, which bypasses + // ScDocument::SetString(), mimicking formula input in view. + { + ScFormulaCell* pCell = new ScFormulaCell( m_pDoc, aPos, "=B4"); + ScDocFunc& rDocFunc = getDocShell().GetDocFunc(); + rDocFunc.SetFormulaCell( aPos, pCell, false); + } + break; + case 1: + m_pDoc->SetString( aPos, "=B4"); // set formula + break; + case 2: + m_pDoc->SetString( aPos, "x"); // set string + break; + case 3: + m_pDoc->SetString( aPos, "4096"); // set number/numeric + break; + case 4: + m_pDoc->SetValue( aPos, 4096.0); // set numeric + break; + case 5: + m_pDoc->SetValues( aPos, {4096.0}); // set numeric vector + break; + case 6: + // Set formula cell vector. + { + ScFormulaCell* pCell = new ScFormulaCell( m_pDoc, aPos, "=B4"); + std::vector aCells; + aCells.push_back(pCell); + m_pDoc->SetFormulaCells( aPos, aCells); + } + break; + } + + // Check that A2:A3 and A5:A6 are two formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A2", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(3); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A5", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + + // Check that listeners were set up and formulas are updated when B2:B6 + // get new values input (tdf#123736). + aPos = aOrgPos; + aPos.IncCol(); + m_pDoc->SetValues( aPos, {1024.0, 2048.0, 4096.0, 8192.0, 16384.0}); + + aPos = aOrgPos; + CPPUNIT_ASSERT_EQUAL(1026.0, m_pDoc->GetValue(aPos)); + aPos.IncRow(); + CPPUNIT_ASSERT_EQUAL(2056.0, m_pDoc->GetValue(aPos)); + aPos.IncRow(); + if (nRun != 2) // if not string + CPPUNIT_ASSERT_EQUAL(4096.0, m_pDoc->GetValue(aPos)); + aPos.IncRow(); + CPPUNIT_ASSERT_EQUAL(8320.0, m_pDoc->GetValue(aPos)); + aPos.IncRow(); + CPPUNIT_ASSERT_EQUAL(16896.0, m_pDoc->GetValue(aPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,5,0)); + } + + // Check detach/regroup combinations of overlapping when setting formula + // cell vectors. + { + // Fixed data in A3:C7, modified formula range A1:A9 + const ScAddress aOrgPos(0,2,0); + ScAddress aPos( ScAddress::UNINITIALIZED); + ScFormulaCell* pCell; + std::vector aCells; + const char* pData2[][3] = { + { "=SUM(B3:C3)", "1", "2" }, + { "=SUM(B4:C4)", "4", "8" }, + { "=SUM(B5:C5)", "16", "32" }, + { "=SUM(B6:C6)", "64", "128" }, + { "=SUM(B7:C7)", "256", "512" }, + }; + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Add grouping formulas in A1:A2, keep A3:A7 + aPos = ScAddress(0,0,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B1:C1)"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B2:C2)"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check it is one formula group. + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A1", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(7), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Add formulas in A1:A2, keep A3:A7 + aPos = ScAddress(0,0,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B1+C1"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B2+C2"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A1", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(5), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Add formula in A2, overwrite A3, keep A4:A7 + aPos = ScAddress(0,1,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B2+C2"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B3+C3"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A2", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A4", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(4), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Overwrite A3:A4, keep A5:A7 + aPos = ScAddress(0,2,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B3+C3"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B4+C4"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A5", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(3), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3, overwrite A4:A5, keep A6:A7 + aPos = ScAddress(0,3,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B4+C4"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B5+C5"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", !pFC->IsSharedTop()); + aPos.IncRow(1); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A4", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A6", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3:A4, overwrite A5:A6, keep A7 + aPos = ScAddress(0,4,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B5+C5"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B6+C6"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A5", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + aPos.IncRow(2); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A7", !pFC->IsSharedTop()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3:A5, overwrite A6:A7 + aPos = ScAddress(0,5,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B6+C6"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B7+C7"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(3), pFC->GetSharedLength()); + aPos.IncRow(3); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A6", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3:A6, overwrite A7, add A8 + aPos = ScAddress(0,6,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B7+C7"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B8+C8"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(4), pFC->GetSharedLength()); + aPos.IncRow(4); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A7", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3:A7, add A8:A9 + aPos = ScAddress(0,7,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B8+C8"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=B9+C9"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check formula groups. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A3", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(5), pFC->GetSharedLength()); + aPos.IncRow(5); + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A7", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(2), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Keep A3:A7, add grouping formulas in A8:A9 + aPos = ScAddress(0,7,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B8:C8)"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B9:C9)"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check it is one formula group. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A1", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(7), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + + insertRangeData(m_pDoc, aOrgPos, pData2, SAL_N_ELEMENTS(pData2)); + + // Overwrite grouping formulas in A4:A5 + aPos = ScAddress(0,3,0); + std::vector().swap( aCells); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B4:C4)"); + aCells.push_back(pCell); + aPos.IncRow(); + pCell = new ScFormulaCell( m_pDoc, aPos, "=SUM(B5:C5)"); + aCells.push_back(pCell); + aPos.IncRow(-1); + m_pDoc->SetFormulaCells( aPos, aCells); + + // Check it is one formula group. + aPos = aOrgPos; + pFC = m_pDoc->GetFormulaCell(aPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_MESSAGE("A1", pFC->IsSharedTop()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared top row.", aPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE("Shared length.", static_cast(5), pFC->GetSharedLength()); + + // Check notification of setting new values. + CPPUNIT_ASSERT_EQUAL(32426.0, checkNewValuesNotification( m_pDoc, aOrgPos)); + + clearRange(m_pDoc, ScRange( 0,0,0, 2,8,0)); + } + m_pDoc->DeleteTab(0); } @@ -1940,5 +2409,266 @@ m_pDoc->DeleteTab(0); } +void Test::testSharedFormulaCutCopyMoveIntoRef() +{ + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. + + // tdf#123714 case 1 + { + m_pDoc->InsertTab(0, "Test"); + + // Data in A1:C3 + std::vector> aData = { + { "=B1", "", "1" }, + { "=B2", "", "1" }, + { "=B3", "", "" } + }; + const ScAddress aOrgPos(0,0,0); + insertRangeData( m_pDoc, aOrgPos, aData); + + ScMarkData aMark; + aMark.SelectOneTable(0); + + // Set up clip document. + ScDocument aClipDoc(SCDOCMODE_CLIP); + aClipDoc.ResetClip(m_pDoc, &aMark); + // Cut C1:C2 to clipboard. + cutToClip( getDocShell(), ScRange(2,0,0, 2,1,0), &aClipDoc, false); + + // Paste to B1:B2 + ScRange aPasteRange(1,0,0, 1,1,0); + aMark.SetMarkArea(aPasteRange); + m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc); + + // Check data in A1:A2 after Paste. + ScAddress aPos(aOrgPos); + CPPUNIT_ASSERT_EQUAL_MESSAGE("A1", 1.0, m_pDoc->GetValue(aPos)); + aPos.IncRow(); + CPPUNIT_ASSERT_EQUAL_MESSAGE("A2", 1.0, m_pDoc->GetValue(aPos)); + + m_pDoc->DeleteTab(0); + } + + // tdf#123714 case 2 + { + m_pDoc->InsertTab(0, "Test"); + + // Data in A1:C3 + std::vector> aData = { + { "1", "2", "=SUM(A1:B1)" }, + { "4", "8", "=SUM(A2:B2)" }, + { "16", "32", "=SUM(A3:B3)" }, + { "64", "128", "=SUM(A4:B4)" }, + }; + const ScAddress aOrgPos(0,0,0); + insertRangeData( m_pDoc, aOrgPos, aData); + + ScAddress aPos; + // Check results in C1:C4 + const double fVec0[] = { 3.0, 12.0, 48.0, 192.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec0[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + ScMarkData aMark; + aMark.SelectOneTable(0); + + // Set up clip document. + ScDocument aClipDoc(SCDOCMODE_CLIP); + aClipDoc.ResetClip(m_pDoc, &aMark); + // Cut B1:B2 to clipboard. + cutToClip( getDocShell(), ScRange(1,0,0, 1,1,0), &aClipDoc, false); + + // Check results in C1:C4 after Cut. + const double fVec1[] = { 1.0, 4.0, 48.0, 192.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec1[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Paste to B3:B4 + ScRange aPasteRange(1,2,0, 1,3,0); + aMark.SetMarkArea(aPasteRange); + m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc); + + // Check results in C1:C4 after Paste. + const double fVec2[] = { 1.0, 4.0, 18.0, 72.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec2[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Paste to B1:B2 + aPasteRange = ScRange(1,0,0, 1,1,0); + aMark.SetMarkArea(aPasteRange); + m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc); + + // Check results in C1:C4 after Paste. + const double fVec3[] = { 3.0, 12.0, 18.0, 72.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec3[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + m_pDoc->DeleteTab(0); + } +} + +// tdf#121002 +void Test::testSharedFormulaCutCopyMoveWithRef() +{ + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. + + m_pDoc->InsertTab(0, "Test"); + + // Data in A1:C4 + std::vector> aData = { + { "", "", "=SUM(A1:B1)" }, + { "", "", "=SUM(A2:B2)" }, + { "1", "2", "=SUM(A3:B3)" }, + { "4", "8", "=SUM(A4:B4)" } + }; + const ScAddress aOrgPos(0,0,0); + insertRangeData( m_pDoc, aOrgPos, aData); + + ScMarkData aMark; + aMark.SelectOneTable(0); + + ScAddress aPos( ScAddress::UNINITIALIZED); + + // Check results in C1:C4 + const double fVec0[] = { 0.0, 0.0, 3.0, 12.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec0[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Set up clip document. + ScDocument aClipDoc(SCDOCMODE_CLIP); + aClipDoc.ResetClip(m_pDoc, &aMark); + // Cut A3:B3 to clipboard. + cutToClip( getDocShell(), ScRange(0,2,0, 1,2,0), &aClipDoc, false); + + // Check results in C1:C4 after Cut. + const double fVec1[] = { 0.0, 0.0, 0.0, 12.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec1[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Paste to A1:B1 + ScRange aPasteRange(0,0,0, 1,0,0); + aMark.SetMarkArea(aPasteRange); + m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc); + + // Check results in C1:C4 after Paste. + const double fVec2[] = { 3.0, 0.0, 3.0, 12.0 }; + aPos = ScAddress(2,0,0); + for (SCROW i=0; i < 4; ++i) + { + CPPUNIT_ASSERT_EQUAL( fVec2[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Check formulas in C1:C4 after Paste. + const OUStringLiteral sForm[] = { "=SUM(A1:B1)", "=SUM(A2:B2)", "=SUM(A1:B1)", "=SUM(A4:B4)" }; + for (SCROW i=0; i < 4; ++i) + { + OUString aFormula; + m_pDoc->GetFormula( 2,i,0, aFormula); + CPPUNIT_ASSERT_EQUAL( OUString(sForm[i]), aFormula); + } + + m_pDoc->DeleteTab(0); +} + +// tdf#120013 +void Test::testSharedFormulaCutCopyMoveWithinRun() +{ + sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn on auto calc. + + m_pDoc->InsertTab(0, "Test"); + + // Data in C3:E9 + const std::vector> aData = { + { "2200", "", "=SUM(C$3:C3)-SUM(D$3:D3)" }, + { "", "", "=SUM(C$3:C4)-SUM(D$3:D4)" }, + { "", "1900", "=SUM(C$3:C5)-SUM(D$3:D5)" }, + { "", "", "=SUM(C$3:C6)-SUM(D$3:D6)" }, + { "1600", "", "=SUM(C$3:C7)-SUM(D$3:D7)" }, + { "", "1000", "=SUM(C$3:C8)-SUM(D$3:D8)" }, + { "", "", "=SUM(C$3:C9)-SUM(D$3:D9)" } + }; + const ScAddress aOrgPos(2,2,0); + insertRangeData( m_pDoc, aOrgPos, aData); + + // Check that E3:E9 is a formula group. + const ScAddress aFormulaPos(4,2,0); + const ScFormulaCell* pFC = m_pDoc->GetFormulaCell( aFormulaPos); + CPPUNIT_ASSERT(pFC); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shared formula top row.", aFormulaPos.Row(), pFC->GetSharedTopRow()); + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Shared formula length.", static_cast(7), pFC->GetSharedLength()); + + ScAddress aPos( ScAddress::UNINITIALIZED); + + // Check results in E3:E9 + const double fVec0[] = { 2200.0, 2200.0, 300.0, 300.0, 1900.0, 900.0, 900.0 }; + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of checks mismatch.", SAL_N_ELEMENTS(fVec0), aData.size()); + aPos = aFormulaPos; + for (size_t i=0; i < SAL_N_ELEMENTS(fVec0); ++i) + { + CPPUNIT_ASSERT_EQUAL_MESSAGE( "E3:E9", fVec0[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + ScMarkData aMark; + aMark.SelectOneTable(0); + + // Set up clip document. + ScDocument aClipDoc(SCDOCMODE_CLIP); + aClipDoc.ResetClip(m_pDoc, &aMark); + // Cut A8:D8 to clipboard. + cutToClip( getDocShell(), ScRange(0,7,0, 3,7,0), &aClipDoc, false); + + // Check results in E3:E9 after Cut. + const double fVec1[] = { 2200.0, 2200.0, 300.0, 300.0, 1900.0, 1900.0, 1900.0 }; + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of checks mismatch.", SAL_N_ELEMENTS(fVec1), aData.size()); + aPos = aFormulaPos; + for (size_t i=0; i < SAL_N_ELEMENTS(fVec1); ++i) + { + CPPUNIT_ASSERT_EQUAL_MESSAGE( "E3:E9 after Cut.", fVec1[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + // Paste to A4:D4 + ScRange aPasteRange(0,3,0, 3,3,0); + aMark.SetMarkArea(aPasteRange); + m_pDoc->CopyFromClip( aPasteRange, aMark, InsertDeleteFlags::CONTENTS, nullptr, &aClipDoc); + + // Check results in E3:E9 after Paste. + const double fVec2[] = { 2200.0, 1200.0, -700.0, -700.0, 900.0, 900.0, 900.0 }; + CPPUNIT_ASSERT_EQUAL_MESSAGE( "Number of checks mismatch.", SAL_N_ELEMENTS(fVec2), aData.size()); + aPos = aFormulaPos; + for (size_t i=0; i < SAL_N_ELEMENTS(fVec2); ++i) + { + CPPUNIT_ASSERT_EQUAL_MESSAGE( "E3:E9 after Paste.", fVec2[i], m_pDoc->GetValue(aPos)); + aPos.IncRow(); + } + + m_pDoc->DeleteTab(0); +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/sc/source/core/data/column3.cxx libreoffice-6.2.3/sc/source/core/data/column3.cxx --- libreoffice-6.2.2/sc/source/core/data/column3.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/data/column3.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -257,9 +257,10 @@ CellStorageModified(); } -sc::CellStoreType::iterator ScColumn::GetPositionToInsert( SCROW nRow ) +sc::CellStoreType::iterator ScColumn::GetPositionToInsert( SCROW nRow, std::vector& rNewSharedRows, + bool bInsertFormula ) { - return GetPositionToInsert(maCells.begin(), nRow); + return GetPositionToInsert(maCells.begin(), nRow, rNewSharedRows, bInsertFormula); } void ScColumn::JoinNewFormulaCell( @@ -283,15 +284,74 @@ } void ScColumn::DetachFormulaCell( - const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell ) + const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, std::vector& rNewSharedRows ) { if (!GetDoc()->IsClipOrUndo()) + { +#if USE_FORMULA_GROUP_LISTENER + if (rCell.IsShared() && rCell.GetSharedLength() > 1) + { + // Record new spans (shared or remaining single) that will result + // from unsharing to reestablish listeners. + // Same cases as in unshareFormulaCell(). + // XXX NOTE: this is not part of unshareFormulaCell() because that + // is called in other contexts as well, for which passing and + // determining the rows vector would be superfluous. If that was + // needed, move it there. + const SCROW nSharedTopRow = rCell.GetSharedTopRow(); + const SCROW nSharedLength = rCell.GetSharedLength(); + if (rCell.aPos.Row() == nSharedTopRow) + { + // Top cell. + // Next row will be new shared top or single cell. + rNewSharedRows.push_back( nSharedTopRow + 1); + rNewSharedRows.push_back( nSharedTopRow + nSharedLength - 1); + } + else if (rCell.aPos.Row() == nSharedTopRow + nSharedLength - 1) + { + // Bottom cell. + // Current shared top row will be new shared top again or + // single cell. + rNewSharedRows.push_back( nSharedTopRow); + rNewSharedRows.push_back( rCell.aPos.Row() - 1); + } + else + { + // Some mid cell. + // Current shared top row will be new shared top again or + // single cell, plus a new shared top below or single cell. + rNewSharedRows.push_back( nSharedTopRow); + rNewSharedRows.push_back( rCell.aPos.Row() - 1); + rNewSharedRows.push_back( rCell.aPos.Row() + 1); + rNewSharedRows.push_back( nSharedTopRow + nSharedLength - 1); + } + } +#endif + // Have the dying formula cell stop listening. + // If in a shared formula group this ends the group listening. rCell.EndListeningTo(GetDoc()); + } sc::SharedFormulaUtil::unshareFormulaCell(aPos, rCell); } +void ScColumn::StartListeningUnshared( const std::vector& rNewSharedRows ) +{ + assert(rNewSharedRows.empty() || rNewSharedRows.size() == 2 || rNewSharedRows.size() == 4); + ScDocument* pDoc = GetDoc(); + if (!rNewSharedRows.empty() /* && !pDoc->IsDelayedFormulaGrouping() N/A in backport */) + { + std::shared_ptr pPosSet(new sc::ColumnBlockPositionSet(*pDoc)); + sc::StartListeningContext aStartCxt(*pDoc, pPosSet); + sc::EndListeningContext aEndCxt(*pDoc, pPosSet); + if (rNewSharedRows.size() >= 2) + StartListeningFormulaCells(aStartCxt, aEndCxt, rNewSharedRows[0], rNewSharedRows[1]); + if (rNewSharedRows.size() >= 4) + StartListeningFormulaCells(aStartCxt, aEndCxt, rNewSharedRows[2], rNewSharedRows[3]); + } +} + namespace { class AttachFormulaCellsHandler @@ -329,14 +389,59 @@ } void ScColumn::DetachFormulaCells( - const sc::CellStoreType::position_type& aPos, size_t nLength ) + const sc::CellStoreType::position_type& aPos, size_t nLength, std::vector* pNewSharedRows ) { + const size_t nRow = aPos.first->position + aPos.second; + const size_t nNextTopRow = nRow + nLength; // start row of next formula group. + + bool bLowerSplitOff = false; + if (pNewSharedRows && !GetDoc()->IsClipOrUndo()) + { + const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos); + if (pFC) + { + const SCROW nTopRow = pFC->GetSharedTopRow(); + const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; + // nTopRow <= nRow <= nBotRow, because otherwise pFC would not exist. + if (nTopRow < static_cast(nRow)) + { + // Upper part will be split off. + pNewSharedRows->push_back(nTopRow); + pNewSharedRows->push_back(nRow - 1); + } + if (static_cast(nNextTopRow) <= nBotRow) + { + // Lower part will be split off. + pNewSharedRows->push_back(nNextTopRow); + pNewSharedRows->push_back(nBotRow); + bLowerSplitOff = true; + } + } + } + // Split formula grouping at the top and bottom boundaries. sc::SharedFormulaUtil::splitFormulaCellGroup(aPos, nullptr); - size_t nRow = aPos.first->position + aPos.second; - size_t nNextTopRow = nRow + nLength; // start row of next formula group. - if (ValidRow(nNextTopRow)) + + if (nLength > 0 && ValidRow(nNextTopRow)) { + if (pNewSharedRows && !bLowerSplitOff && !GetDoc()->IsClipOrUndo()) + { + sc::CellStoreType::position_type aPos2 = maCells.position(aPos.first, nNextTopRow-1); + const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos2); + if (pFC) + { + const SCROW nTopRow = pFC->GetSharedTopRow(); + const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; + // nRow < nTopRow < nNextTopRow <= nBotRow + if (static_cast(nNextTopRow) <= nBotRow) + { + // Lower part will be split off. + pNewSharedRows->push_back(nNextTopRow); + pNewSharedRows->push_back(nBotRow); + } + } + } + sc::CellStoreType::position_type aPos2 = maCells.position(aPos.first, nNextTopRow); sc::SharedFormulaUtil::splitFormulaCellGroup(aPos2, nullptr); } @@ -367,15 +472,59 @@ sc::ProcessFormula(it, maCells, nRow1, nRow2, aFunc); } -void ScColumn::DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2 ) +void ScColumn::DetachFormulaCells( sc::EndListeningContext& rCxt, SCROW nRow1, SCROW nRow2, + std::vector* pNewSharedRows ) { sc::CellStoreType::position_type aPos = maCells.position(nRow1); sc::CellStoreType::iterator it = aPos.first; + bool bLowerSplitOff = false; + if (pNewSharedRows && !GetDoc()->IsClipOrUndo()) + { + const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos); + if (pFC) + { + const SCROW nTopRow = pFC->GetSharedTopRow(); + const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; + // nTopRow <= nRow1 <= nBotRow, because otherwise pFC would not exist. + if (nTopRow < nRow1) + { + // Upper part will be split off. + pNewSharedRows->push_back(nTopRow); + pNewSharedRows->push_back(nRow1 - 1); + } + if (nRow2 < nBotRow) + { + // Lower part will be split off. + pNewSharedRows->push_back(nRow2 + 1); + pNewSharedRows->push_back(nBotRow); + bLowerSplitOff = true; + } + } + } + // Split formula grouping at the top and bottom boundaries. sc::SharedFormulaUtil::splitFormulaCellGroup(aPos, &rCxt); if (ValidRow(nRow2+1)) { + if (pNewSharedRows && !bLowerSplitOff && !GetDoc()->IsClipOrUndo()) + { + sc::CellStoreType::position_type aPos2 = maCells.position(aPos.first, nRow2); + const ScFormulaCell* pFC = sc::SharedFormulaUtil::getSharedTopFormulaCell(aPos2); + if (pFC) + { + const SCROW nTopRow = pFC->GetSharedTopRow(); + const SCROW nBotRow = nTopRow + pFC->GetSharedLength() - 1; + // nRow1 < nTopRow <= nRow2 < nBotRow + if (nRow2 < nBotRow) + { + // Lower part will be split off. + pNewSharedRows->push_back(nRow2 + 1); + pNewSharedRows->push_back(nBotRow); + } + } + } + aPos = maCells.position(it, nRow2+1); sc::SharedFormulaUtil::splitFormulaCellGroup(aPos, &rCxt); } @@ -387,15 +536,53 @@ sc::ProcessFormula(it, maCells, nRow1, nRow2, aFunc); } -sc::CellStoreType::iterator ScColumn::GetPositionToInsert( const sc::CellStoreType::iterator& it, SCROW nRow ) +static void lcl_AddFormulaGroupBoundaries(const sc::CellStoreType::position_type& rPos, + std::vector& rNewSharedRows ) +{ + sc::CellStoreType::iterator itRet = rPos.first; + if (itRet->type != sc::element_type_formula) + return; + + ScFormulaCell& rFC = *sc::formula_block::at(*itRet->data, rPos.second); + if ( rFC.IsShared() ) + { + const SCROW nSharedTopRow = rFC.GetSharedTopRow(); + const SCROW nSharedLength = rFC.GetSharedLength(); + rNewSharedRows.push_back( nSharedTopRow); + rNewSharedRows.push_back( nSharedTopRow + nSharedLength - 1); + } + else + { + const SCROW nRow = rFC.aPos.Row(); + rNewSharedRows.push_back( nRow); + rNewSharedRows.push_back( nRow); + } +} + +sc::CellStoreType::iterator ScColumn::GetPositionToInsert( const sc::CellStoreType::iterator& it, SCROW nRow, + std::vector& rNewSharedRows, bool bInsertFormula ) { // See if we are overwriting an existing formula cell. sc::CellStoreType::position_type aPos = maCells.position(it, nRow); sc::CellStoreType::iterator itRet = aPos.first; + if (itRet->type == sc::element_type_formula) { ScFormulaCell& rCell = *sc::formula_block::at(*itRet->data, aPos.second); - DetachFormulaCell(aPos, rCell); + DetachFormulaCell(aPos, rCell, rNewSharedRows); + } + else if (bInsertFormula && !GetDoc()->IsClipOrUndo()) + { + if (nRow > 0) + { + sc::CellStoreType::position_type aPosBefore = maCells.position(maCells.begin(), nRow-1); + lcl_AddFormulaGroupBoundaries(aPosBefore, rNewSharedRows); + } + if (nRow < MAXROW) + { + sc::CellStoreType::position_type aPosAfter = maCells.position(maCells.begin(), nRow+1); + lcl_AddFormulaGroupBoundaries(aPosAfter, rNewSharedRows); + } } return itRet; @@ -403,13 +590,15 @@ void ScColumn::AttachNewFormulaCell( const sc::CellStoreType::iterator& itPos, SCROW nRow, ScFormulaCell& rCell, + const std::vector& rNewSharedRows, bool bJoin, sc::StartListeningType eListenType ) { - AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, bJoin, eListenType); + AttachNewFormulaCell(maCells.position(itPos, nRow), rCell, rNewSharedRows, bJoin, eListenType); } void ScColumn::AttachNewFormulaCell( const sc::CellStoreType::position_type& aPos, ScFormulaCell& rCell, + const std::vector& rNewSharedRows, bool bJoin, sc::StartListeningType eListenType ) { if (bJoin) @@ -432,24 +621,50 @@ std::shared_ptr pPosSet(new sc::ColumnBlockPositionSet(*pDocument)); sc::StartListeningContext aStartCxt(*pDocument, pPosSet); sc::EndListeningContext aEndCxt(*pDocument, pPosSet); - SCROW nRow = aPos.first->position + aPos.second; - StartListeningFormulaCells(aStartCxt, aEndCxt, nRow, nRow); + SCROW nStartRow, nEndRow; + nStartRow = nEndRow = aPos.first->position + aPos.second; + for (const SCROW nR : rNewSharedRows) + { + if (nStartRow > nR) + nStartRow = nR; + if (nEndRow < nR) + nEndRow = nR; + } + StartListeningFormulaCells(aStartCxt, aEndCxt, nStartRow, nEndRow); } break; case sc::SingleCellListening: rCell.StartListeningTo(pDocument); + StartListeningUnshared( rNewSharedRows); break; case sc::NoListening: default: - ; - + if (!rNewSharedRows.empty()) + { + assert(rNewSharedRows.size() == 2 || rNewSharedRows.size() == 4); + // Calling SetNeedsListeningGroup() with a top row sets it to + // all affected formula cells of that group. + const ScFormulaCell* pFC = GetFormulaCell( rNewSharedRows[0]); + assert(pFC); // that *is* supposed to be a top row + if (pFC && !pFC->NeedsListening()) + SetNeedsListeningGroup( rNewSharedRows[0]); + if (rNewSharedRows.size() > 2) + { + pFC = GetFormulaCell( rNewSharedRows[2]); + assert(pFC); // that *is* supposed to be a top row + if (pFC && !pFC->NeedsListening()) + SetNeedsListeningGroup( rNewSharedRows[2]); + } + } + break; } if (!pDocument->IsCalcingAfterLoad()) rCell.SetDirty(); } -void ScColumn::AttachNewFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength ) +void ScColumn::AttachNewFormulaCells( const sc::CellStoreType::position_type& aPos, size_t nLength, + std::vector& rNewSharedRows ) { // Make sure the whole length consists of formula cells. if (aPos.first->type != sc::element_type_formula) @@ -460,26 +675,61 @@ return; // Join the top and bottom cells only. - ScFormulaCell* pCell = sc::formula_block::at(*aPos.first->data, aPos.second); - JoinNewFormulaCell(aPos, *pCell); + ScFormulaCell* pCell1 = sc::formula_block::at(*aPos.first->data, aPos.second); + JoinNewFormulaCell(aPos, *pCell1); sc::CellStoreType::position_type aPosLast = aPos; aPosLast.second += nLength - 1; - pCell = sc::formula_block::at(*aPosLast.first->data, aPosLast.second); - JoinNewFormulaCell(aPosLast, *pCell); + ScFormulaCell* pCell2 = sc::formula_block::at(*aPosLast.first->data, aPosLast.second); + JoinNewFormulaCell(aPosLast, *pCell2); ScDocument* pDocument = GetDoc(); if (!pDocument->IsClipOrUndo() && !pDocument->IsInsertingFromOtherDoc()) { + const bool bShared = pCell1->IsShared() || pCell2->IsShared(); + if (bShared) + { + const SCROW nTopRow = (pCell1->IsShared() ? pCell1->GetSharedTopRow() : pCell1->aPos.Row()); + const SCROW nBotRow = (pCell2->IsShared() ? + pCell2->GetSharedTopRow() + pCell2->GetSharedLength() - 1 : pCell2->aPos.Row()); + if (rNewSharedRows.empty()) + { + rNewSharedRows.push_back( nTopRow); + rNewSharedRows.push_back( nBotRow); + } + else if (rNewSharedRows.size() == 2) + { + // Combine into one span. + if (rNewSharedRows[0] > nTopRow) + rNewSharedRows[0] = nTopRow; + if (rNewSharedRows[1] < nBotRow) + rNewSharedRows[1] = nBotRow; + } + else if (rNewSharedRows.size() == 4) + { + // Merge into one span. + // The original two spans are ordered from top to bottom. + std::vector aRows(2); + aRows[0] = std::min( rNewSharedRows[0], nTopRow); + aRows[1] = std::max( rNewSharedRows[3], nBotRow); + rNewSharedRows.swap( aRows); + } + else + { + assert(!"rNewSharedRows?"); + } + } + StartListeningUnshared( rNewSharedRows); + sc::StartListeningContext aCxt(*pDocument); ScFormulaCell** pp = &sc::formula_block::at(*aPos.first->data, aPos.second); ScFormulaCell** ppEnd = pp + nLength; for (; pp != ppEnd; ++pp) { - pCell = *pp; - pCell->StartListeningTo(aCxt); + if (!bShared) + (*pp)->StartListeningTo(aCxt); if (!pDocument->IsCalcingAfterLoad()) - pCell->SetDirty(); + (*pp)->SetDirty(); } } } @@ -1517,7 +1767,7 @@ // Stop all formula cells in the destination range first. sc::CellStoreType::position_type aPos = rDestCells.position(mrBlockPos.miCellPos, mnRowOffset); - mrDestColumn.DetachFormulaCells(aPos, maNewCells.size()); + mrDestColumn.DetachFormulaCells(aPos, maNewCells.size(), nullptr); // Move the new cells to the destination range. sc::CellStoreType::iterator& itDestPos = mrBlockPos.miCellPos; @@ -1876,24 +2126,30 @@ void ScColumn::SetEditText( SCROW nRow, std::unique_ptr pEditText ) { pEditText->NormalizeString(GetDoc()->GetSharedStringPool()); - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, false); maCells.set(it, nRow, pEditText.release()); maCellTextAttrs.set(nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + BroadcastNewCell(nRow); } void ScColumn::SetEditText( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, std::unique_ptr pEditText ) { pEditText->NormalizeString(GetDoc()->GetSharedStringPool()); - rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow); + std::vector aNewSharedRows; + rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow, aNewSharedRows, false); rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, pEditText.release()); rBlockPos.miCellTextAttrPos = maCellTextAttrs.set( rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + BroadcastNewCell(nRow); } @@ -1933,7 +2189,8 @@ { ScAddress aPos(nCol, nRow, nTab); - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, true); ScFormulaCell* pCell = new ScFormulaCell(GetDoc(), aPos, rArray, eGram); sal_uInt32 nCellFormat = GetNumberFormat(GetDoc()->GetNonThreadedContext(), nRow); if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0) @@ -1943,14 +2200,15 @@ CellStorageModified(); - AttachNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell, aNewSharedRows); } void ScColumn::SetFormula( SCROW nRow, const OUString& rFormula, formula::FormulaGrammar::Grammar eGram ) { ScAddress aPos(nCol, nRow, nTab); - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, true); ScFormulaCell* pCell = new ScFormulaCell(GetDoc(), aPos, rFormula, eGram); sal_uInt32 nCellFormat = GetNumberFormat(GetDoc()->GetNonThreadedContext(), nRow); if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0) @@ -1960,14 +2218,15 @@ CellStorageModified(); - AttachNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell, aNewSharedRows); } ScFormulaCell* ScColumn::SetFormulaCell( SCROW nRow, ScFormulaCell* pCell, sc::StartListeningType eListenType, bool bInheritNumFormatIfNeeded ) { - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, true); sal_uInt32 nCellFormat = GetNumberFormat(GetDoc()->GetNonThreadedContext(), nRow); if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 && bInheritNumFormatIfNeeded ) pCell->SetNeedNumberFormat(true); @@ -1976,7 +2235,8 @@ CellStorageModified(); - AttachNewFormulaCell(it, nRow, *pCell, true, eListenType); + AttachNewFormulaCell(it, nRow, *pCell, aNewSharedRows, true, eListenType); + return pCell; } @@ -1985,7 +2245,8 @@ sc::StartListeningType eListenType, bool bInheritNumFormatIfNeeded ) { - rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow); + std::vector aNewSharedRows; + rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow, aNewSharedRows, true); sal_uInt32 nCellFormat = GetNumberFormat(GetDoc()->GetNonThreadedContext(), nRow); if( (nCellFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 && bInheritNumFormatIfNeeded ) pCell->SetNeedNumberFormat(true); @@ -1995,7 +2256,7 @@ CellStorageModified(); - AttachNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell, true, eListenType); + AttachNewFormulaCell(rBlockPos.miCellPos, nRow, *pCell, aNewSharedRows, true, eListenType); } bool ScColumn::SetFormulaCells( SCROW nRow, std::vector& rCells ) @@ -2010,7 +2271,8 @@ sc::CellStoreType::position_type aPos = maCells.position(nRow); // Detach all formula cells that will be overwritten. - DetachFormulaCells(aPos, rCells.size()); + std::vector aNewSharedRows; + DetachFormulaCells(aPos, rCells.size(), &aNewSharedRows); if (!GetDoc()->IsClipOrUndo()) { @@ -2030,7 +2292,10 @@ CellStorageModified(); - AttachNewFormulaCells(aPos, rCells.size()); + // Reget position_type as the type may have changed to formula, block and + // block size changed, ... + aPos = maCells.position(nRow); + AttachNewFormulaCells(aPos, rCells.size(), aNewSharedRows); return true; } @@ -2467,13 +2732,14 @@ ScFormulaCell* pCell = new ScFormulaCell(GetDoc(), ScAddress(nCol, nRow, nTab)); pCell->SetErrCode(nError); - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, true); it = maCells.set(it, nRow, pCell); maCellTextAttrs.set(nRow, sc::CellTextAttr()); CellStorageModified(); - AttachNewFormulaCell(it, nRow, *pCell); + AttachNewFormulaCell(it, nRow, *pCell, aNewSharedRows); } void ScColumn::SetRawString( SCROW nRow, const OUString& rStr ) @@ -2493,12 +2759,15 @@ if (!ValidRow(nRow)) return; - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, false); maCells.set(it, nRow, rStr); maCellTextAttrs.set(nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + BroadcastNewCell(nRow); } @@ -2508,13 +2777,16 @@ if (!ValidRow(nRow)) return; - rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow); + std::vector aNewSharedRows; + rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow, aNewSharedRows, false); rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, rStr); rBlockPos.miCellTextAttrPos = maCellTextAttrs.set( rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + if (bBroadcast) BroadcastNewCell(nRow); } @@ -2524,12 +2796,15 @@ if (!ValidRow(nRow)) return; - sc::CellStoreType::iterator it = GetPositionToInsert(nRow); + std::vector aNewSharedRows; + sc::CellStoreType::iterator it = GetPositionToInsert(nRow, aNewSharedRows, false); maCells.set(it, nRow, fVal); maCellTextAttrs.set(nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + BroadcastNewCell(nRow); } @@ -2539,13 +2814,16 @@ if (!ValidRow(nRow)) return; - rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow); + std::vector aNewSharedRows; + rBlockPos.miCellPos = GetPositionToInsert(rBlockPos.miCellPos, nRow, aNewSharedRows, false); rBlockPos.miCellPos = maCells.set(rBlockPos.miCellPos, nRow, fVal); rBlockPos.miCellTextAttrPos = maCellTextAttrs.set( rBlockPos.miCellTextAttrPos, nRow, sc::CellTextAttr()); CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + if (bBroadcast) BroadcastNewCell(nRow); } diff -Nru libreoffice-6.2.2/sc/source/core/data/column4.cxx libreoffice-6.2.3/sc/source/core/data/column4.cxx --- libreoffice-6.2.2/sc/source/core/data/column4.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/data/column4.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -316,7 +316,8 @@ return; sc::CellStoreType::position_type aPos = maCells.position(nRow); - DetachFormulaCells(aPos, rVals.size()); + std::vector aNewSharedRows; + DetachFormulaCells(aPos, rVals.size(), &aNewSharedRows); maCells.set(nRow, rVals.begin(), rVals.end()); std::vector aDefaults(rVals.size()); @@ -324,6 +325,8 @@ CellStorageModified(); + StartListeningUnshared( aNewSharedRows); + std::vector aRows; aRows.reserve(rVals.size()); for (SCROW i = nRow; i <= nLastRow; ++i) @@ -343,7 +346,7 @@ return; sc::CellStoreType::position_type aPos = maCells.position(nRow); - DetachFormulaCells(aPos, nLen); + DetachFormulaCells(aPos, nLen, nullptr); rDest.transferFrom(*this, nRow, nLen); @@ -368,7 +371,7 @@ return; sc::CellStoreType::position_type aPos = maCells.position(nRow); - DetachFormulaCells(aPos, rSrc.size()); + DetachFormulaCells(aPos, rSrc.size(), nullptr); rSrc.copyTo(*this, nRow); @@ -444,7 +447,7 @@ // No formula cells encountered. return; - DetachFormulaCells(rCxt, nRow1, nRow2); + DetachFormulaCells(rCxt, nRow1, nRow2, nullptr); // Undo storage to hold static values which will get swapped to the cell storage later. sc::CellValues aUndoCells; diff -Nru libreoffice-6.2.2/sc/source/core/data/column.cxx libreoffice-6.2.3/sc/source/core/data/column.cxx --- libreoffice-6.2.2/sc/source/core/data/column.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/data/column.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -2475,7 +2475,7 @@ } // Do the actual splitting. - sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds); + const bool bSplit = sc::SharedFormulaUtil::splitFormulaCellGroups(maCells, aBounds); // Collect all formula groups. std::vector aGroups = GetFormulaGroupEntries(); @@ -2483,7 +2483,7 @@ // Process all collected formula groups. UpdateRefOnNonCopy aHandler(nCol, nTab, &rCxt, pUndoDoc); aHandler = std::for_each(aGroups.begin(), aGroups.end(), aHandler); - if (aHandler.isUpdated()) + if (bSplit || aHandler.isUpdated()) rCxt.maRegroupCols.set(nTab, nCol); return aHandler.isUpdated(); diff -Nru libreoffice-6.2.2/sc/source/core/data/simpleformulacalc.cxx libreoffice-6.2.3/sc/source/core/data/simpleformulacalc.cxx --- libreoffice-6.2.2/sc/source/core/data/simpleformulacalc.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/data/simpleformulacalc.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -45,14 +45,14 @@ return; mbCalculated = true; - ScInterpreter aInt(nullptr, mpDoc, mpDoc->GetNonThreadedContext(), maAddr, *mpCode); - - std::unique_ptr pNewLinkMgr( new sfx2::LinkManager(mpDoc->GetDocumentShell()) ); - aInt.SetLinkManager( pNewLinkMgr.get() ); + ScInterpreter aInt(mpDoc->GetFormulaCell( maAddr ), mpDoc, mpDoc->GetNonThreadedContext(), maAddr, *mpCode); if (mbMatrixFormula) aInt.AssertFormulaMatrix(); + std::unique_ptr pNewLinkMgr( new sfx2::LinkManager(mpDoc->GetDocumentShell()) ); + aInt.SetLinkManager( pNewLinkMgr.get() ); + formula::StackVar aIntType = aInt.Interpret(); if ( aIntType == formula::svMatrixCell ) { @@ -94,6 +94,8 @@ bool ScSimpleFormulaCalculator::IsMatrix() { + Calculate(); + return mbMatrixResult; } diff -Nru libreoffice-6.2.2/sc/source/core/data/table2.cxx libreoffice-6.2.3/sc/source/core/data/table2.cxx --- libreoffice-6.2.2/sc/source/core/data/table2.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/data/table2.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1088,7 +1088,7 @@ sc::EndListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol) - aCol[nCol].DetachFormulaCells(rCxt, nRow1, nRow2); + aCol[nCol].DetachFormulaCells(rCxt, nRow1, nRow2, nullptr); } void ScTable::SetDirtyFromClip( diff -Nru libreoffice-6.2.2/sc/source/core/tool/interpr1.cxx libreoffice-6.2.3/sc/source/core/tool/interpr1.cxx --- libreoffice-6.2.2/sc/source/core/tool/interpr1.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/tool/interpr1.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1738,11 +1738,12 @@ void ScInterpreter::ScRandom() { - if (bMatrixFormula && pMyFormulaCell) + if (bMatrixFormula) { - SCCOL nCols; - SCROW nRows; - pMyFormulaCell->GetMatColsRows( nCols, nRows); + SCCOL nCols = 0; + SCROW nRows = 0; + if(pMyFormulaCell) + pMyFormulaCell->GetMatColsRows( nCols, nRows); // ScViewFunc::EnterMatrix() might be asking for // ScFormulaCell::GetResultDimensions(), which here are none so create // a 1x1 matrix at least which exactly is the case when EnterMatrix() @@ -4385,9 +4386,10 @@ nVal = aPos.Col() + 1; if (bMatrixFormula) { - SCCOL nCols; - SCROW nRows; - pMyFormulaCell->GetMatColsRows( nCols, nRows); + SCCOL nCols = 0; + SCROW nRows = 0; + if (pMyFormulaCell) + pMyFormulaCell->GetMatColsRows( nCols, nRows); if (nCols == 0) { // Happens if called via ScViewFunc::EnterMatrix() @@ -4488,9 +4490,10 @@ nVal = aPos.Row() + 1; if (bMatrixFormula) { - SCCOL nCols; - SCROW nRows; - pMyFormulaCell->GetMatColsRows( nCols, nRows); + SCCOL nCols = 0; + SCROW nRows = 0; + if (pMyFormulaCell) + pMyFormulaCell->GetMatColsRows( nCols, nRows); if (nRows == 0) { // Happens if called via ScViewFunc::EnterMatrix() @@ -5743,6 +5746,7 @@ } break; default: + PopError(); // Propagate it further PushIllegalParameter(); return ; } @@ -9410,7 +9414,12 @@ { // Find n-th occurrence. sal_Int32 nCount = 0; - while (aRegexMatcher.find( status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#if (U_ICU_VERSION_MAJOR_NUM < 55) + int32_t nStartPos = 0; + while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#else + while (aRegexMatcher.find(status) && U_SUCCESS(status) && ++nCount < nOccurrence) +#endif ; if (U_FAILURE(status)) { @@ -9450,7 +9459,12 @@ { // Replace n-th occurrence of match with replacement. sal_Int32 nCount = 0; - while (aRegexMatcher.find( status) && U_SUCCESS(status)) +#if (U_ICU_VERSION_MAJOR_NUM < 55) + int32_t nStartPos = 0; + while (aRegexMatcher.find(nStartPos, status) && U_SUCCESS(status)) +#else + while (aRegexMatcher.find(status) && U_SUCCESS(status)) +#endif { // XXX NOTE: After several RegexMatcher::find() the // RegexMatcher::appendReplacement() still starts at the diff -Nru libreoffice-6.2.2/sc/source/core/tool/parclass.cxx libreoffice-6.2.3/sc/source/core/tool/parclass.cxx --- libreoffice-6.2.2/sc/source/core/tool/parclass.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/tool/parclass.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -173,7 +173,7 @@ { ocMatDet, {{ ForceArray }, 0, Value }}, { ocMatInv, {{ ForceArray }, 0, Value }}, { ocMatMult, {{ ForceArray, ForceArray }, 0, Value }}, - { ocMatTrans, {{ Array }, 0, Value }}, // strange, but Xcl doesn't force MatTrans array + { ocMatTrans, {{ ForceArray }, 0, ForceArrayReturn }}, { ocMatValue, {{ Reference, Value, Value }, 0, Value }}, { ocMatch, {{ Value, ReferenceOrForceArray, Value }, 0, Value }}, { ocMax, {{ ReferenceOrRefArray }, 1, Value }}, diff -Nru libreoffice-6.2.2/sc/source/core/tool/sharedformula.cxx libreoffice-6.2.3/sc/source/core/tool/sharedformula.cxx --- libreoffice-6.2.2/sc/source/core/tool/sharedformula.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/core/tool/sharedformula.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -17,28 +17,44 @@ namespace sc { -void SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type& aPos, sc::EndListeningContext* pCxt) +const ScFormulaCell* SharedFormulaUtil::getSharedTopFormulaCell(const CellStoreType::position_type& aPos) +{ + if (aPos.first->type != sc::element_type_formula) + // Not a formula cell block. + return nullptr; + + sc::formula_block::iterator it = sc::formula_block::begin(*aPos.first->data); + std::advance(it, aPos.second); + const ScFormulaCell* pCell = *it; + if (!pCell->IsShared()) + // Not a shared formula. + return nullptr; + + return pCell->GetCellGroup()->mpTopCell; +} + +bool SharedFormulaUtil::splitFormulaCellGroup(const CellStoreType::position_type& aPos, sc::EndListeningContext* pCxt) { SCROW nRow = aPos.first->position + aPos.second; if (aPos.first->type != sc::element_type_formula) // Not a formula cell block. - return; + return false; if (aPos.second == 0) // Split position coincides with the block border. Nothing to do. - return; + return false; sc::formula_block::iterator it = sc::formula_block::begin(*aPos.first->data); std::advance(it, aPos.second); ScFormulaCell& rTop = **it; if (!rTop.IsShared()) // Not a shared formula. - return; + return false; if (nRow == rTop.GetSharedTopRow()) // Already the top cell of a shared group. - return; + return false; ScFormulaCellGroupRef xGroup = rTop.GetCellGroup(); @@ -71,6 +87,9 @@ else rPrevTop.EndListeningTo( rPrevTop.GetDocument(), nullptr, ScAddress( ScAddress::UNINITIALIZED)); rPrevTop.SetNeedsListening(true); + + // The new group or remaining single cell needs a new listening. + rTop.SetNeedsListening(true); } #endif @@ -97,12 +116,14 @@ ScFormulaCell& rCell = **it; rCell.SetCellGroup(xGroup2); } + + return true; } -void SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vector& rBounds) +bool SharedFormulaUtil::splitFormulaCellGroups(CellStoreType& rCells, std::vector& rBounds) { if (rBounds.empty()) - return; + return false; // Sort and remove duplicates. std::sort(rBounds.begin(), rBounds.end()); @@ -113,9 +134,9 @@ SCROW nRow = *it; CellStoreType::position_type aPos = rCells.position(nRow); if (aPos.first == rCells.end()) - return; + return false; - splitFormulaCellGroup(aPos, nullptr); + bool bSplit = splitFormulaCellGroup(aPos, nullptr); std::vector::iterator itEnd = rBounds.end(); for (++it; it != itEnd; ++it) { @@ -124,10 +145,11 @@ { aPos = rCells.position(aPos.first, nRow); if (aPos.first == rCells.end()) - return; - splitFormulaCellGroup(aPos, nullptr); + return bSplit; + bSplit |= splitFormulaCellGroup(aPos, nullptr); } } + return bSplit; } bool SharedFormulaUtil::joinFormulaCells( @@ -235,9 +257,9 @@ { // Move the top cell to the next formula cell down. ScFormulaCell& rNext = *sc::formula_block::at(*it->data, aPos.second+1); - --xGroup->mnLength; xGroup->mpTopCell = &rNext; } + --xGroup->mnLength; } else if (rCell.aPos.Row() == rCell.GetSharedTopRow() + rCell.GetSharedLength() - 1) { diff -Nru libreoffice-6.2.2/sc/source/filter/excel/xecontent.cxx libreoffice-6.2.3/sc/source/filter/excel/xecontent.cxx --- libreoffice-6.2.2/sc/source/filter/excel/xecontent.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/filter/excel/xecontent.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -418,11 +418,14 @@ { OUString aTextMark( rUrl.copy( 1 ) ); - sal_Int32 nSepPos = aTextMark.lastIndexOf( '.' ); - if(nSepPos != -1) - aTextMark = aTextMark.replaceAt( nSepPos, 1, "!" ); - else - nSepPos = aTextMark.lastIndexOf( '!' ); + sal_Int32 nSepPos = aTextMark.lastIndexOf( '!' ); + sal_Int32 nPointPos = aTextMark.lastIndexOf( '.' ); + // last dot is the separator, if there is no ! after it + if(nSepPos < nPointPos) + { + nSepPos = nPointPos; + aTextMark = aTextMark.replaceAt( nSepPos, 1, "!" ); + } if(nSepPos != -1) { diff -Nru libreoffice-6.2.2/sc/source/filter/excel/xistream.cxx libreoffice-6.2.3/sc/source/filter/excel/xistream.cxx --- libreoffice-6.2.2/sc/source/filter/excel/xistream.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/filter/excel/xistream.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -867,7 +867,9 @@ } *pcEndChar = '\0'; - aRet.append( pcBuffer.get(), pcUniChar - pcBuffer.get() ); + // this has the side-effect of only copying as far as the first null, which appears to be intentional. e.g. + // see tdf#124318 + aRet.append( pcBuffer.get() ); nCharsLeft = nCharsLeft - nReadSize; if( nCharsLeft > 0 ) diff -Nru libreoffice-6.2.2/sc/source/filter/xml/xmlwrap.cxx libreoffice-6.2.3/sc/source/filter/xml/xmlwrap.cxx --- libreoffice-6.2.2/sc/source/filter/xml/xmlwrap.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/filter/xml/xmlwrap.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -37,6 +37,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +77,7 @@ #include using namespace com::sun::star; +using namespace css::uno; ScXMLImportWrapper::ScXMLImportWrapper( ScDocShell& rDocSh, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : mrDocShell(rDocSh), @@ -395,7 +397,7 @@ const uno::Reference< rdf::XDocumentMetadataAccess > xDMA( xModel, uno::UNO_QUERY_THROW ); const uno::Reference< rdf::XURI > xBaseURI( - ::sfx2::createBaseURI( xContext, xStorage, aBaseURL, aName ) ); + ::sfx2::createBaseURI( xContext, xModel, aBaseURL, aName ) ); uno::Reference xHandler = mrDocShell.GetMedium()->GetInteractionHandler(); xDMA->loadMetadataFromStorage( xStorage, xBaseURI, xHandler ); diff -Nru libreoffice-6.2.2/sc/source/ui/inc/printfun.hxx libreoffice-6.2.3/sc/source/ui/inc/printfun.hxx --- libreoffice-6.2.2/sc/source/ui/inc/printfun.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/ui/inc/printfun.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -150,6 +150,7 @@ SCROW nStartRow; SCCOL nEndCol; SCROW nEndRow; + bool bPrintAreaValid; // the 4 variables above are set sal_uInt16 nZoom; size_t nPagesX; size_t nPagesY; @@ -172,6 +173,7 @@ , nStartRow(0) , nEndCol(0) , nEndRow(0) + , bPrintAreaValid(false) , nZoom(0) , nPagesX(0) , nPagesY(0) @@ -209,7 +211,7 @@ const ScRange* pUserArea; // Selection, if set in dialog const SfxItemSet* pParamSet; // Selected template - bool bState; // created from State-struct + bool bFromPrintState; // created from State-struct // Parameter from template: sal_uInt16 nLeftMargin; @@ -258,6 +260,7 @@ SCROW nStartRow; SCCOL nEndCol; SCROW nEndRow; + bool bPrintAreaValid; // the 4 variables above are set sc::PrintPageRanges m_aRanges; diff -Nru libreoffice-6.2.2/sc/source/ui/pagedlg/tptable.cxx libreoffice-6.2.3/sc/source/ui/pagedlg/tptable.cxx --- libreoffice-6.2.2/sc/source/ui/pagedlg/tptable.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/ui/pagedlg/tptable.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -223,7 +223,7 @@ m_xEdScalePageNum->set_value( (nPages > 0) ? nPages : 1 ); } - if (m_xLbScaleMode->get_active() == 0) + if (m_xLbScaleMode->get_active() == -1) { // fall back to 100% OSL_FAIL( "ScTablePage::Reset - missing scaling item" ); diff -Nru libreoffice-6.2.2/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx libreoffice-6.2.3/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx --- libreoffice-6.2.2/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -67,7 +67,7 @@ OUStringBuffer aResult; for (size_t i = 0; i < aRangeList.size(); i++) { - OUString aRangeString(aRangeList[i].Format(ScRefFlags::RANGE_ABS, pDocument, aAddressDetails)); + OUString aRangeString(aRangeList[i].Format(ScRefFlags::RANGE_ABS_3D, pDocument, aAddressDetails)); OUString aFormulaString = aFormulaTemplate.replaceAll(aWildcard, aRangeString); aResult.append(aFormulaString); if(i != aRangeList.size() - 1) // Not Last @@ -260,7 +260,6 @@ output.nextColumn(); // Sum of Squares - aTemplate.setTemplate("=SUMPRODUCT(%SUM_RANGE%;%MEAN_RANGE%)-SUM(%SUM_RANGE%)^2/SUM(%COUNT_RANGE%)"); aTemplate.autoReplaceAddress("%BETWEEN_SS%", output.current()); output.writeFormula(aTemplate.getTemplate()); diff -Nru libreoffice-6.2.2/sc/source/ui/unoobj/docuno.cxx libreoffice-6.2.3/sc/source/ui/unoobj/docuno.cxx --- libreoffice-6.2.2/sc/source/ui/unoobj/docuno.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/ui/unoobj/docuno.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1985,7 +1985,8 @@ std::unique_ptr> pPrintFunc; - if (m_pPrintState && m_pPrintState->nPrintTab == nTab) + if (m_pPrintState && m_pPrintState->nPrintTab == nTab + && ! pSelRange) // tdf#120161 use selection to set required printed area pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, *m_pPrintState, &aStatus.GetOptions())); else pPrintFunc.reset(new ScPrintFunc(pDev, pDocShell, nTab, pPrintFuncCache->GetFirstAttr(nTab), nTotalPages, pSelRange, &aStatus.GetOptions())); diff -Nru libreoffice-6.2.2/sc/source/ui/view/printfun.cxx libreoffice-6.2.3/sc/source/ui/view/printfun.cxx --- libreoffice-6.2.2/sc/source/ui/view/printfun.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/source/ui/view/printfun.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -191,7 +191,7 @@ pParamSet = nullptr; } - if (!bState) + if (!bFromPrintState) nZoom = 100; nManualZoom = 100; bClearWin = false; @@ -214,13 +214,14 @@ nPageStart ( nPage ), nDocPages ( nDocP ), pUserArea ( pArea ), - bState ( false ), + bFromPrintState ( false ), bSourceRangeValid ( false ), bPrintCurrentTable ( false ), bMultiArea ( false ), mbHasPrintRange(true), nTabPages ( 0 ), nTotalPages ( 0 ), + bPrintAreaValid ( false ), pPageData ( pData ) { pDev = pPrinter.get(); @@ -247,6 +248,7 @@ nStartRow = rState.nStartRow; nEndCol = rState.nEndCol; nEndRow = rState.nEndRow; + bPrintAreaValid = rState.bPrintAreaValid; nZoom = rState.nZoom; m_aRanges.m_nPagesX = rState.nPagesX; m_aRanges.m_nPagesY = rState.nPagesY; @@ -254,7 +256,7 @@ nTotalPages = rState.nTotalPages; nPageStart = rState.nPageStart; nDocPages = rState.nDocPages; - bState = true; + bFromPrintState = true; if (rState.bSavedStateRanges) { @@ -279,13 +281,14 @@ nPageStart ( nPage ), nDocPages ( nDocP ), pUserArea ( pArea ), - bState ( false ), + bFromPrintState ( false ), bSourceRangeValid ( false ), bPrintCurrentTable ( false ), bMultiArea ( false ), mbHasPrintRange(true), nTabPages ( 0 ), nTotalPages ( 0 ), + bPrintAreaValid ( false ), pPageData ( nullptr ) { pDev = pOutDev; @@ -311,6 +314,7 @@ nStartRow = rState.nStartRow; nEndCol = rState.nEndCol; nEndRow = rState.nEndRow; + bPrintAreaValid = rState.bPrintAreaValid; nZoom = rState.nZoom; m_aRanges.m_nPagesX = rState.nPagesX; m_aRanges.m_nPagesY = rState.nPagesY; @@ -318,7 +322,7 @@ nTotalPages = rState.nTotalPages; nPageStart = rState.nPageStart; nDocPages = rState.nDocPages; - bState = true; + bFromPrintState = true; if (rState.bSavedStateRanges) { @@ -339,6 +343,7 @@ rState.nStartRow = nStartRow; rState.nEndCol = nEndCol; rState.nEndRow = nEndRow; + rState.bPrintAreaValid = bPrintAreaValid; rState.nZoom = nZoom; rState.nPagesX = m_aRanges.m_nPagesX; rState.nPagesY = m_aRanges.m_nPagesY; @@ -370,6 +375,7 @@ sal_uInt16 nCount = sal::static_int_cast( pPageData->GetCount() ); ScPrintRangeData& rData = pPageData->GetData(nCount); // count up + assert( bPrintAreaValid ); rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab, nEndCol, nEndRow, nPrintTab ) ); // #i123672# @@ -696,6 +702,7 @@ nStartRow = 0; if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes )) return false; // nothing + bPrintAreaValid = true; } else { @@ -734,10 +741,12 @@ if (!bFound) return false; // empty + bPrintAreaValid = true; if (bForcedChangeRow) bChangeRow = true; } + assert( bPrintAreaValid ); pDoc->ExtendMerge( nStartCol,nStartRow, nEndCol,nEndRow, nPrintTab ); // no Refresh, incl. Attrs if ( bChangeCol ) @@ -1057,7 +1066,7 @@ // Split pages - if (!bState) + if (!bPrintAreaValid) { nTabPages = CountPages(); // also calculates zoom nTotalPages = nTabPages; @@ -2544,6 +2553,7 @@ if (bDoThis) { + assert( bPrintAreaValid ); for ( SCCOL nCol = nStartCol; nCol <= nEndCol; ++nCol ) { if (pDoc->HasColNotes(nCol, nPrintTab)) @@ -3003,6 +3013,7 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages from nZoom { + assert( bPrintAreaValid ); m_aRanges.calculate(pDoc, aTableParam.bSkipEmpty, aAreaParam.bPrintArea, nStartRow, nEndRow, nStartCol, nEndCol, nPrintTab, GetDocPageSize()); } diff -Nru libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_compact.ui libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_compact.ui --- libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -850,14 +850,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -1671,14 +1663,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui --- libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -2493,14 +2493,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui --- libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui 2019-04-10 10:10:51.000000000 +0000 @@ -1748,14 +1748,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -2455,14 +2447,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -2880,14 +2864,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar.ui libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar.ui --- libreoffice-6.2.2/sc/uiconfig/scalc/ui/notebookbar.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sc/uiconfig/scalc/ui/notebookbar.ui 2019-04-10 10:10:51.000000000 +0000 @@ -779,14 +779,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sd/qa/unit/data/odp/textbox-link-javascript.odp and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sd/qa/unit/data/odp/textbox-link-javascript.odp differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sd/qa/unit/data/pptx/smartart-picture-strip.pptx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sd/qa/unit/data/pptx/smartart-picture-strip.pptx differ diff -Nru libreoffice-6.2.2/sd/qa/unit/import-tests-smartart.cxx libreoffice-6.2.3/sd/qa/unit/import-tests-smartart.cxx --- libreoffice-6.2.2/sd/qa/unit/import-tests-smartart.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/qa/unit/import-tests-smartart.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -15,6 +15,7 @@ #include #include +#include using namespace ::com::sun::star; @@ -66,6 +67,7 @@ void testContinuousBlockProcess(); void testOrgChart(); void testCycleMatrix(); + void testPictureStrip(); CPPUNIT_TEST_SUITE(SdImportTestSmartArt); @@ -97,6 +99,7 @@ CPPUNIT_TEST(testContinuousBlockProcess); CPPUNIT_TEST(testOrgChart); CPPUNIT_TEST(testCycleMatrix); + CPPUNIT_TEST(testPictureStrip); CPPUNIT_TEST_SUITE_END(); }; @@ -813,6 +816,88 @@ xDocShRef->DoClose(); } + +void SdImportTestSmartArt::testPictureStrip() +{ + sd::DrawDocShellRef xDocShRef = loadURL( + m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-picture-strip.pptx"), PPTX); + uno::Reference xGroup(getShapeFromPage(0, 0, xDocShRef), uno::UNO_QUERY); + CPPUNIT_ASSERT(xGroup.is()); + + uno::Reference xFirstImage(getChildShape(getChildShape(xGroup, 0), 1), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xFirstImage.is()); + drawing::FillStyle eFillStyle = drawing::FillStyle_NONE; + xFirstImage->getPropertyValue("FillStyle") >>= eFillStyle; + // Without the accompanying fix in place, this test would have failed: fill style was solid, not + // bitmap. + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, eFillStyle); + + uno::Reference xGraphic; + xFirstImage->getPropertyValue("FillBitmap") >>= xGraphic; + Graphic aFirstGraphic(xGraphic); + + uno::Reference xSecondImage(getChildShape(getChildShape(xGroup, 1), 1), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xSecondImage.is()); + eFillStyle = drawing::FillStyle_NONE; + xSecondImage->getPropertyValue("FillStyle") >>= eFillStyle; + CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, eFillStyle); + + xSecondImage->getPropertyValue("FillBitmap") >>= xGraphic; + Graphic aSecondGraphic(xGraphic); + // Without the accompanying fix in place, this test would have failed: both xFirstImage and + // xSecondImage had the bitmap fill from the second shape. + CPPUNIT_ASSERT(aFirstGraphic.GetChecksum() != aSecondGraphic.GetChecksum()); + + // Test that the 3 images are in a single column, in 3 rows. + uno::Reference xFirstImageShape(xFirstImage, uno::UNO_QUERY); + CPPUNIT_ASSERT(xFirstImage.is()); + uno::Reference xSecondImageShape(xSecondImage, uno::UNO_QUERY); + CPPUNIT_ASSERT(xSecondImage.is()); + uno::Reference xThirdImageShape(getChildShape(getChildShape(xGroup, 2), 1), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xThirdImageShape.is()); + // Without the accompanying fix in place, this test would have failed: the first and the second + // image were in the same row. + CPPUNIT_ASSERT_EQUAL(xFirstImageShape->getPosition().X, xSecondImageShape->getPosition().X); + CPPUNIT_ASSERT_EQUAL(xSecondImageShape->getPosition().X, xThirdImageShape->getPosition().X); + CPPUNIT_ASSERT_GREATER(xFirstImageShape->getPosition().Y, xSecondImageShape->getPosition().Y); + CPPUNIT_ASSERT_GREATER(xSecondImageShape->getPosition().Y, xThirdImageShape->getPosition().Y); + + // Make sure that the title shape doesn't overlap with the diagram. + // Note that real "no overlap" is asserted here, though in fact what we want is a less strict + // condition: that no text part of the title shape and the diagram overlaps. + uno::Reference xTitle(getShapeFromPage(1, 0, xDocShRef), uno::UNO_QUERY); + CPPUNIT_ASSERT(xTitle.is()); + // Without the accompanying fix in place, this test would have failed with 'Expected greater + // than: 2873; Actual : 2320', i.e. the title shape and the diagram overlapped. + CPPUNIT_ASSERT_GREATER(xTitle->getPosition().Y + xTitle->getSize().Height, + xGroup->getPosition().Y); + + // Make sure that left margin is 60% of width (if you count width in points and margin in mms). + uno::Reference xFirstText(getChildShape(getChildShape(xGroup, 0), 0), + uno::UNO_QUERY); + CPPUNIT_ASSERT(xFirstText.is()); + sal_Int32 nTextLeftDistance = 0; + xFirstText->getPropertyValue("TextLeftDistance") >>= nTextLeftDistance; + uno::Reference xFirstTextShape(xFirstText, uno::UNO_QUERY); + CPPUNIT_ASSERT(xFirstTextShape.is()); + sal_Int32 nWidth = xFirstTextShape->getSize().Width; + double fFactor = oox::drawingml::convertPointToMms(0.6); + // Without the accompanying fix in place, this test would have failed with 'Expected: 3440, + // Actual : 263', i.e. the left margin was too small. + CPPUNIT_ASSERT_EQUAL(static_cast(nWidth * fFactor), nTextLeftDistance); + + // Make sure that aspect ratio is not ignored, i.e. width is not larger than height 3 times. + uno::Reference xFirstPair = getChildShape(xGroup, 0); + awt::Size aFirstPairSize = xFirstPair->getSize(); + // Without the accompanying fix in place, this test would have failed: bad width was 16932, good + // width is 12540, but let's accept 12541 as well. + CPPUNIT_ASSERT_LESSEQUAL(aFirstPairSize.Height * 3 + 1, aFirstPairSize.Width); + + xDocShRef->DoClose(); +} CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTestSmartArt); diff -Nru libreoffice-6.2.2/sd/qa/unit/SVGExportTests.cxx libreoffice-6.2.3/sd/qa/unit/SVGExportTests.cxx --- libreoffice-6.2.2/sd/qa/unit/SVGExportTests.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/qa/unit/SVGExportTests.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -110,8 +110,23 @@ assertXPath(svgDoc, MAKE_PATH_STRING( /SVG_SVG/SVG_G[2]/SVG_G/SVG_G/SVG_G/SVG_G/SVG_G[2]/SVG_G/SVG_TEXT/SVG_TSPAN ), "text-decoration", "line-through"); } + void testSVGExportJavascriptURL() + { + executeExport("textbox-link-javascript.odp"); + + xmlDocPtr svgDoc = parseXml(maTempFile); + CPPUNIT_ASSERT(svgDoc); + + // There should be only one child (no link to javascript url) + assertXPathChildren(svgDoc, + MAKE_PATH_STRING(/ SVG_SVG / SVG_G[2] / SVG_G / SVG_G / SVG_G / SVG_G + / SVG_G[3] / SVG_G), + 1); + } + CPPUNIT_TEST_SUITE(SdSVGFilterTest); CPPUNIT_TEST(testSVGExportTextDecorations); + CPPUNIT_TEST(testSVGExportJavascriptURL); CPPUNIT_TEST_SUITE_END(); }; diff -Nru libreoffice-6.2.2/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui libreoffice-6.2.3/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui --- libreoffice-6.2.2/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -2237,14 +2237,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sd/uiconfig/sdraw/ui/notebookbar.ui libreoffice-6.2.3/sd/uiconfig/sdraw/ui/notebookbar.ui --- libreoffice-6.2.2/sd/uiconfig/sdraw/ui/notebookbar.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/uiconfig/sdraw/ui/notebookbar.ui 2019-04-10 10:10:51.000000000 +0000 @@ -764,14 +764,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui --- libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -2243,14 +2243,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui --- libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui 2019-04-10 10:10:51.000000000 +0000 @@ -1414,14 +1414,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -2108,14 +2100,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -2592,14 +2576,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar.ui libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar.ui --- libreoffice-6.2.2/sd/uiconfig/simpress/ui/notebookbar.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sd/uiconfig/simpress/ui/notebookbar.ui 2019-04-10 10:10:51.000000000 +0000 @@ -764,14 +764,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx libreoffice-6.2.3/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx --- libreoffice-6.2.2/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/setup_native/source/win32/customactions/inst_msu/inst_msu.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -35,6 +35,14 @@ return sMsg.str(); } +std::string Win32ErrorMessage(const char* sFunc, DWORD nWin32Error) +{ + std::stringstream sMsg; + sMsg << sFunc << " failed with Win32 error code " << Num2Hex(nWin32Error) << "!"; + + return sMsg.str(); +} + void ThrowHResult(const char* sFunc, HRESULT hr) { std::stringstream sMsg; @@ -51,10 +59,7 @@ void ThrowWin32Error(const char* sFunc, DWORD nWin32Error) { - std::stringstream sMsg; - sMsg << sFunc << " failed with Win32 error code " << Num2Hex(nWin32Error) << "!"; - - throw std::exception(sMsg.str().c_str()); + throw std::exception(Win32ErrorMessage(sFunc, nWin32Error).c_str()); } void ThrowLastError(const char* sFunc) { ThrowWin32Error(sFunc, GetLastError()); } @@ -177,6 +182,8 @@ }; // Checks if Windows Update service is disabled, and if it is, enables it temporarily. +// Also stops the service if it's currently running, because it seems that wusa.exe +// does not freeze when it starts the service itself. class WUServiceEnabler { public: @@ -219,7 +226,14 @@ ThrowLastError("OpenServiceW"); WriteLog(hInstall, "Obtained WU service handle"); - if (ServiceStatus(hInstall, hService.get()) == SERVICE_RUNNING + const DWORD nCurrentStatus = ServiceStatus(hInstall, hService.get()); + // Stop currently running service to prevent wusa.exe from hanging trying to detect if the + // update is applicable (sometimes this freezes it ~indefinitely; it seems that it doesn't + // happen if wusa.exe starts the service itself: https://superuser.com/questions/1044528/). + if (nCurrentStatus == SERVICE_RUNNING) + StopService(hInstall, hService.get()); + + if (nCurrentStatus == SERVICE_RUNNING || !EnsureServiceEnabled(hInstall, hService.get(), true)) { // No need to restore anything back, since we didn't change config @@ -324,17 +338,26 @@ static void StopService(MSIHANDLE hInstall, SC_HANDLE hService) { - if (ServiceStatus(hInstall, hService) != SERVICE_STOPPED) + try { - SERVICE_STATUS aServiceStatus{}; - if (!ControlService(hService, SERVICE_CONTROL_STOP, &aServiceStatus)) - ThrowLastError("ControlService"); - WriteLog(hInstall, - "Successfully sent SERVICE_CONTROL_STOP code to Windows Update service"); - // No need to wait for the service stopped + if (ServiceStatus(hInstall, hService) != SERVICE_STOPPED) + { + SERVICE_STATUS aServiceStatus{}; + if (!ControlService(hService, SERVICE_CONTROL_STOP, &aServiceStatus)) + WriteLog(hInstall, Win32ErrorMessage("ControlService", GetLastError())); + else + WriteLog( + hInstall, + "Successfully sent SERVICE_CONTROL_STOP code to Windows Update service"); + // No need to wait for the service stopped + } + else + WriteLog(hInstall, "Windows Update service is not running"); + } + catch (std::exception& e) + { + WriteLog(hInstall, e.what()); } - else - WriteLog(hInstall, "Windows Update service is not running"); } MSIHANDLE mhInstall; @@ -446,7 +469,8 @@ WriteLog(hInstall, "Got CustomActionData value:", sBinaryName); auto aDeleteFileGuard(Guard(sBinaryName)); - // In case the Windows Update service is disabled, we temporarily enable it here + // In case the Windows Update service is disabled, we temporarily enable it here. We also + // stop running WU service, to avoid wusa.exe freeze (see comment in EnableWUService). WUServiceEnabler aWUServiceEnabler(hInstall); const bool bWow64Process = IsWow64Process(); @@ -466,12 +490,43 @@ if (!CreateProcessW(sWUSAPath.c_str(), const_cast(sWUSACmd.c_str()), nullptr, nullptr, FALSE, CREATE_NO_WINDOW, nullptr, nullptr, &si, &pi)) ThrowLastError("CreateProcessW"); + CloseHandle(pi.hThread); auto aCloseProcHandleGuard(Guard(pi.hProcess)); WriteLog(hInstall, "CreateProcessW succeeded"); - DWORD nWaitResult = WaitForSingleObject(pi.hProcess, INFINITE); - if (nWaitResult != WAIT_OBJECT_0) - ThrowWin32Error("WaitForSingleObject", nWaitResult); + { + // This block waits when the started wusa.exe process finishes. Since it's possible + // for wusa.exe in some circumstances to wait really long (indefinitely?), we use + // MsiProcessMessage to check for user input: it returns IDCANCEL when user cancels + // installation. + PMSIHANDLE hProgressRec = MsiCreateRecord(3); + // Use explicit progress messages + MsiRecordSetInteger(hProgressRec, 1, 1); + MsiRecordSetInteger(hProgressRec, 2, 1); + MsiRecordSetInteger(hProgressRec, 3, 0); + int nResult = MsiProcessMessage(hInstall, INSTALLMESSAGE_PROGRESS, hProgressRec); + if (nResult == IDCANCEL) + return ERROR_INSTALL_USEREXIT; + // Prepare the record to following progress update calls + MsiRecordSetInteger(hProgressRec, 1, 2); + MsiRecordSetInteger(hProgressRec, 2, 0); // step by 0 - don't move progress + MsiRecordSetInteger(hProgressRec, 3, 0); + for (;;) + { + DWORD nWaitResult = WaitForSingleObject(pi.hProcess, 500); + if (nWaitResult == WAIT_OBJECT_0) + break; // wusa.exe finished + else if (nWaitResult == WAIT_TIMEOUT) + { + // Check if user has cancelled + nResult = MsiProcessMessage(hInstall, INSTALLMESSAGE_PROGRESS, hProgressRec); + if (nResult == IDCANCEL) + return ERROR_INSTALL_USEREXIT; + } + else + ThrowWin32Error("WaitForSingleObject", nWaitResult); + } + } DWORD nExitCode = 0; if (!GetExitCodeProcess(pi.hProcess, &nExitCode)) @@ -484,7 +539,6 @@ switch (hr) { case S_OK: - case S_FALSE: case WU_S_ALREADY_INSTALLED: case WU_E_NOT_APPLICABLE: // Windows could lie us about its version, etc. case ERROR_SUCCESS_REBOOT_REQUIRED: diff -Nru libreoffice-6.2.2/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java libreoffice-6.2.3/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java --- libreoffice-6.2.2/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sfx2/qa/complex/sfx2/DocumentMetadataAccess.java 2019-04-10 10:10:51.000000000 +0000 @@ -615,6 +615,21 @@ } } + @Test + public void checkTdf123293() throws Exception + { + XComponent xComp = null; + try { + xComp = util.DesktopTools.loadDocUsingStream(xMSF, TestDocument.getPath("TESTRDFA.odt")); + + // Metadata was discarded when loading from stream, make sure it's there now + XRepositorySupplier xRepoSupplier = UnoRuntime.queryInterface(XRepositorySupplier.class, xComp); + assertNotNull("No metadata loaded", xRepoSupplier); + } finally { + close(xComp); + } + } + private void storeRDFa(XComponent xComp, String file) throws com.sun.star.io.IOException { System.out.println("Storing test document..."); diff -Nru libreoffice-6.2.2/sfx2/qa/complex/sfx2/tools/TestDocument.java libreoffice-6.2.3/sfx2/qa/complex/sfx2/tools/TestDocument.java --- libreoffice-6.2.2/sfx2/qa/complex/sfx2/tools/TestDocument.java 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sfx2/qa/complex/sfx2/tools/TestDocument.java 2019-04-10 10:10:51.000000000 +0000 @@ -26,6 +26,9 @@ public static String getUrl(String name) { return OfficeFileUrl.getAbsolute(new File(Argument.get("tdoc"), name)); } + public static String getPath(String name) { + return new File(Argument.get("tdoc"), name).toString(); + } private TestDocument() {} } diff -Nru libreoffice-6.2.2/sfx2/source/appl/shutdownicon.cxx libreoffice-6.2.3/sfx2/source/appl/shutdownicon.cxx --- libreoffice-6.2.2/sfx2/source/appl/shutdownicon.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sfx2/source/appl/shutdownicon.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -143,7 +143,7 @@ #endif // ENABLE_QUICKSTART_APPLET } assert(!boost::logic::indeterminate(loaded)); - return loaded; + return bool(loaded); } } diff -Nru libreoffice-6.2.2/sfx2/source/dialog/backingwindow.cxx libreoffice-6.2.3/sfx2/source/dialog/backingwindow.cxx --- libreoffice-6.2.2/sfx2/source/dialog/backingwindow.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sfx2/source/dialog/backingwindow.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -420,15 +420,18 @@ } else // F6 { - if(mpAllRecentThumbnails->IsVisible()) + if( mpAllButtonsBox->HasChildPathFocus() ) { - mpAllRecentThumbnails->GrabFocus(); - return true; - } - else if(mpLocalView->IsVisible()) - { - mpLocalView->GrabFocus(); - return true; + if(mpAllRecentThumbnails->IsVisible()) + { + mpAllRecentThumbnails->GrabFocus(); + return true; + } + else if(mpLocalView->IsVisible()) + { + mpLocalView->GrabFocus(); + return true; + } } } } diff -Nru libreoffice-6.2.2/sfx2/source/doc/DocumentMetadataAccess.cxx libreoffice-6.2.3/sfx2/source/doc/DocumentMetadataAccess.cxx --- libreoffice-6.2.2/sfx2/source/doc/DocumentMetadataAccess.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sfx2/source/doc/DocumentMetadataAccess.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -116,16 +117,44 @@ uno::Reference createBaseURI( uno::Reference const & i_xContext, - uno::Reference const & i_xStorage, + uno::Reference const & i_xModel, OUString const & i_rPkgURI, OUString const & i_rSubDocument) { - if (!i_xContext.is() || !i_xStorage.is() || i_rPkgURI.isEmpty()) { + if (!i_xContext.is() || (!i_xModel.is() && i_rPkgURI.isEmpty())) { throw uno::RuntimeException(); } + OUString pkgURI(i_rPkgURI); + + // tdf#123293 chicken/egg problem when loading from stream: there is no URI, + // and also the model doesn't have a storage yet, so we need to get the + // tdoc URI without a storage... + if (pkgURI.isEmpty()) + { + assert(i_xModel.is()); + uno::Reference + const xTDDCIF( + i_xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.ucb.TransientDocumentsContentProvider", + i_xContext), + uno::UNO_QUERY_THROW); + uno::Reference const xContentId( + xTDDCIF->createDocumentContentIdentifier(i_xModel)); + SAL_WARN_IF(!xContentId.is(), "sfx", "createBaseURI: cannot create ContentIdentifier"); + if (!xContentId.is()) + { + throw uno::RuntimeException("createBaseURI: cannot create ContentIdentifier"); + } + pkgURI = xContentId->getContentIdentifier(); + assert(!pkgURI.isEmpty()); + if (!pkgURI.isEmpty() && !pkgURI.endsWith("/")) + { + pkgURI = pkgURI + "/"; + } + } + // #i108078# workaround non-hierarchical vnd.sun.star.expand URIs // this really should be done somewhere else, not here. - OUString pkgURI(i_rPkgURI); if (pkgURI.matchIgnoreAsciiCase("vnd.sun.star.expand:")) { // expand it here (makeAbsolute requires hierarchical URI) @@ -1252,11 +1281,11 @@ } uno::Reference xBaseURI; try { - xBaseURI = createBaseURI(m_pImpl->m_xContext, xStorage, BaseURL); + xBaseURI = createBaseURI(m_pImpl->m_xContext, nullptr, BaseURL); } catch (const uno::Exception &) { // fall back to URL try { - xBaseURI = createBaseURI(m_pImpl->m_xContext, xStorage, URL); + xBaseURI = createBaseURI(m_pImpl->m_xContext, nullptr, URL); } catch (const uno::Exception &) { OSL_FAIL("cannot create base URI"); } diff -Nru libreoffice-6.2.2/shell/source/unix/exec/shellexec.cxx libreoffice-6.2.3/shell/source/unix/exec/shellexec.cxx --- libreoffice-6.2.2/shell/source/unix/exec/shellexec.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/shell/source/unix/exec/shellexec.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -43,6 +43,10 @@ #include #include +#if defined MACOSX +#include +#endif + using com::sun::star::system::XSystemShellExecute; using com::sun::star::system::SystemShellExecuteException; @@ -113,6 +117,39 @@ } #ifdef MACOSX + if (uri->getScheme().equalsIgnoreAsciiCase("file")) { + OUString pathname; + auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, pathname); + if (e1 != osl::FileBase::E_None) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, getSystemPathFromFileURL <" + aCommand + + "> failed with " + OUString::number(e1)), + {}, 0); + } + OString pathname8; + if (!pathname.convertToString( + &pathname8, RTL_TEXTENCODING_UTF8, + (RTL_UNICODETOTEXT_FLAGS_UNDEFINED_ERROR + | RTL_UNICODETOTEXT_FLAGS_INVALID_ERROR))) + { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, cannot convert \"" + pathname + "\" to UTF-8", {}, + 0); + } + struct stat st; + auto const e2 = stat(pathname8.getStr(), &st); + if (e2 != 0) { + auto const e3 = errno; + SAL_INFO("shell", "stat(" << pathname8 << ") failed with errno " << e3); + } + if (e2 != 0 || !S_ISREG(st.st_mode) + || (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) != 0) + { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, cannot process <" + aCommand + ">", {}, 0); + } + } + //TODO: Using open(1) with an argument that syntactically is an absolute // URI reference does not necessarily give expected results: // 1 If the given URI reference matches a supported scheme (e.g., diff -Nru libreoffice-6.2.2/shell/source/win32/SysShExec.cxx libreoffice-6.2.3/shell/source/win32/SysShExec.cxx --- libreoffice-6.2.2/shell/source/win32/SysShExec.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/shell/source/win32/SysShExec.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -18,8 +18,10 @@ */ #include +#include #include +#include #include #include "SysShExec.hxx" #include @@ -30,12 +32,16 @@ #include #include #include +#include #define WIN32_LEAN_AND_MEAN #include #include +#include #include +#include + using com::sun::star::uno::Reference; using com::sun::star::uno::RuntimeException; using com::sun::star::uno::Sequence; @@ -242,6 +248,18 @@ namespace { +bool checkExtension(OUString const & extension, OUString const & blacklist) { + assert(!extension.isEmpty()); + for (sal_Int32 i = 0; i != -1;) { + OUString tok = blacklist.getToken(0, ';', i); + tok.startsWith(".", &tok); + if (extension.equalsIgnoreAsciiCase(tok)) { + return false; + } + } + return true; +} + // This callback checks if the found window is the specified process's top-level window, // and activates the first found such window. BOOL CALLBACK FindAndActivateProcWnd(HWND hwnd, LPARAM lParam) @@ -295,6 +313,102 @@ + aCommand, static_cast< cppu::OWeakObject * >(this), 0); } + if (uri->getScheme().equalsIgnoreAsciiCase("file")) { + OUString pathname; + auto const e1 = osl::FileBase::getSystemPathFromFileURL(aCommand, pathname); + if (e1 != osl::FileBase::E_None) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, getSystemPathFromFileURL <" + aCommand + + "> failed with " + OUString::number(e1)), + {}, 0); + } + for (int i = 0;; ++i) { + SHFILEINFOW info; + if (SHGetFileInfoW( + o3tl::toW(pathname.getStr()), 0, &info, sizeof info, SHGFI_EXETYPE) + != 0) + { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, cannot process <" + aCommand + ">", {}, 0); + } + if (SHGetFileInfoW( + o3tl::toW(pathname.getStr()), 0, &info, sizeof info, SHGFI_ATTRIBUTES) + == 0) + { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, SHGetFileInfoW(" + pathname + ") failed", {}, + 0); + } + if ((info.dwAttributes & SFGAO_LINK) == 0) { + break; + } + sal::systools::COMReference link; + auto e2 = CoCreateInstance( + CLSID_ShellLink, nullptr, CLSCTX_INPROC_SERVER, IID_IShellLinkW, + reinterpret_cast(&link)); + if (FAILED(e2)) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, CoCreateInstance failed with " + + OUString::number(e2)), + {}, 0); + } + sal::systools::COMReference file; + try { + file = link.QueryInterface(IID_IPersistFile); + } catch(sal::systools::ComError & e3) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, QueryInterface failed with: " + + o3tl::runtimeToOUString(e3.what())), + {}, 0); + } + e2 = file->Load(o3tl::toW(pathname.getStr()), STGM_READ); + if (FAILED(e2)) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, IPersistFile.Load failed with " + + OUString::number(e2)), + {}, 0); + } + e2 = link->Resolve(nullptr, SLR_UPDATE | SLR_NO_UI); + if (FAILED(e2)) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, IShellLink.Resolve failed with " + + OUString::number(e2)), + {}, 0); + } + wchar_t path[MAX_PATH]; + WIN32_FIND_DATAW wfd; + e2 = link->GetPath(path, MAX_PATH, &wfd, SLGP_RAWPATH); + if (FAILED(e2)) { + throw css::lang::IllegalArgumentException( + ("XSystemShellExecute.execute, IShellLink.GetPath failed with " + + OUString::number(e2)), + {}, 0); + } + pathname = o3tl::toU(path); + // Fail at some arbitrary nesting depth, to avoid an infinite loop: + if (i == 30) { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, link depth exceeded for <" + aCommand + ">", + {}, 0); + } + } + auto const n = pathname.lastIndexOf('.'); + if (n > pathname.lastIndexOf('\\')) { + auto const ext = pathname.copy(n + 1); + OUString env; + if (osl_getEnvironment(OUString("PATHEXT").pData, &env.pData) != osl_Process_E_None) + { + SAL_INFO("shell", "osl_getEnvironment(PATHEXT) failed"); + } + if (!(checkExtension(ext, env) + && checkExtension( + ext, ".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.PY"))) + { + throw css::lang::IllegalArgumentException( + "XSystemShellExecute.execute, cannot process <" + aCommand + ">", {}, 0); + } + } + } } /* #i4789#; jump mark detection on system paths diff -Nru libreoffice-6.2.2/slideshow/source/engine/animationnodes/basecontainernode.cxx libreoffice-6.2.3/slideshow/source/engine/animationnodes/basecontainernode.cxx --- libreoffice-6.2.2/slideshow/source/engine/animationnodes/basecontainernode.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/slideshow/source/engine/animationnodes/basecontainernode.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -41,6 +41,7 @@ maChildren(), mnFinishedChildren(0), mnLeftIterations(0), + mbRepeatIndefinite(xNode->getRepeatCount().hasValue() && isIndefiniteTiming(xNode->getRepeatCount())), mbDurationIndefinite( isIndefiniteTiming( xNode->getEnd() ) && isIndefiniteTiming( xNode->getDuration() ) ) { @@ -137,12 +138,9 @@ ++mnFinishedChildren; bool bFinished = (mnFinishedChildren >= nSize); - // all children finished, and we've got indefinite duration? - // think of ParallelTimeContainer::notifyDeactivating() - // if duration given, we will be deactivated by some end event - // @see fillCommonParameters() - if (bFinished && isDurationIndefinite()) { - if( mnLeftIterations >= 1.0 ) + // Handle repetition here. + if (bFinished) { + if(!mbRepeatIndefinite && mnLeftIterations >= 1.0) { mnLeftIterations -= 1.0; } @@ -155,7 +153,7 @@ "BaseContainerNode::repeat"); getContext().mrEventQueue.addEvent( aRepetitionEvent ); } - else + else if (isDurationIndefinite()) { deactivate(); } @@ -166,6 +164,10 @@ void BaseContainerNode::repeat() { + // Prevent repeat event scheduled before deactivation. + if (getState() == FROZEN || getState() == ENDED) + return; + forEachChildNode( std::mem_fn(&AnimationNode::end), ~ENDED ); bool bState = init_children(); if( bState ) diff -Nru libreoffice-6.2.2/slideshow/source/engine/animationnodes/basenode.cxx libreoffice-6.2.3/slideshow/source/engine/animationnodes/basenode.cxx --- libreoffice-6.2.2/slideshow/source/engine/animationnodes/basenode.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/slideshow/source/engine/animationnodes/basenode.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -539,12 +539,26 @@ // if anim base node has no activity, this is called to schedule deactivation, // but what if it does not schedule anything? - // TODO(F2): Handle end time attribute, too auto self(mpSelf); - mpCurrentEvent = generateEvent( - mxAnimationNode->getDuration(), - [self] () { self->deactivate(); }, - maContext, 0.0 ); + if (mxAnimationNode->getEnd().hasValue()) + { + // TODO: We may need to calculate the duration if the end value is numeric. + // We expect that the end value contains EventTrigger::ON_NEXT here. + // LibreOffice does not generate numeric values, so we can leave it + // until we find a test case. + mpCurrentEvent = generateEvent( + mxAnimationNode->getEnd(), + [self] () { self->deactivate(); }, + maContext, 0.0 ); + + } + else + { + mpCurrentEvent = generateEvent( + mxAnimationNode->getDuration(), + [self] () { self->deactivate(); }, + maContext, 0.0 ); + } } } diff -Nru libreoffice-6.2.2/slideshow/source/inc/basecontainernode.hxx libreoffice-6.2.3/slideshow/source/inc/basecontainernode.hxx --- libreoffice-6.2.2/slideshow/source/inc/basecontainernode.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/slideshow/source/inc/basecontainernode.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -88,6 +88,7 @@ double mnLeftIterations; private: + const bool mbRepeatIndefinite; const bool mbDurationIndefinite; }; diff -Nru libreoffice-6.2.2/stoc/source/corereflection/criface.cxx libreoffice-6.2.3/stoc/source/corereflection/criface.cxx --- libreoffice-6.2.2/stoc/source/corereflection/criface.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/stoc/source/corereflection/criface.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -578,7 +578,7 @@ // end of a "short" struct by writing the full contents of a "long" // register); so create enough space here (assuming that no ABI requires // padding larger than 16 byte boundaries): - void * pUnoReturn = alloca( multipleOf16(pReturnType->nSize) ); + void * pUnoReturn = (pReturnType->nSize == 0) ? nullptr : alloca( multipleOf16(pReturnType->nSize) ); void ** ppUnoArgs = static_cast(alloca( sizeof(void *) * nParams *2 )); typelib_TypeDescription ** ppParamTypes = reinterpret_cast(ppUnoArgs + nParams); diff -Nru libreoffice-6.2.2/svl/source/numbers/zformat.cxx libreoffice-6.2.3/svl/source/numbers/zformat.cxx --- libreoffice-6.2.2/svl/source/numbers/zformat.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/svl/source/numbers/zformat.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -3454,7 +3454,7 @@ cEra = 'H'; break; case 5: - cEra = 'N'; /* TODO: the real one letter era name is not known yet (2018-07-26) */ + cEra = 'R'; break; default: cEra = '?'; diff -Nru libreoffice-6.2.2/svx/source/unodraw/unoshtxt.cxx libreoffice-6.2.3/svx/source/unodraw/unoshtxt.cxx --- libreoffice-6.2.2/svx/source/unodraw/unoshtxt.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/svx/source/unodraw/unoshtxt.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -654,10 +654,26 @@ return GetBackgroundTextForwarder(); } else + { + // tdf#123470 if the text edit mode of the shape is active, then we + // cannot trust a previously cached TextForwarder state as the text may + // be out of date, so force a refetch in that case. + if (IsEditMode()) + { + assert(!mbForwarderIsEditMode); // because without a view there is no other option except !mbForwarderIsEditMode + bool bTextEditActive = false; + SdrTextObj* pTextObj = dynamic_cast(mpObject); + // similar to the GetBackgroundTextForwarder check, see if the text edit is active + if (pTextObj && pTextObj->getActiveText() == mpText && pTextObj->GetEditOutlinerParaObject()) + bTextEditActive = true; // text edit active + if (bTextEditActive) + mbDataValid = false; + } + return GetBackgroundTextForwarder(); + } } - std::unique_ptr SvxTextEditSourceImpl::CreateViewForwarder() { if( mpView->GetTextEditOutlinerView() && mpObject ) diff -Nru libreoffice-6.2.2/sw/qa/core/test_ToxTextGenerator.cxx libreoffice-6.2.3/sw/qa/core/test_ToxTextGenerator.cxx --- libreoffice-6.2.2/sw/qa/core/test_ToxTextGenerator.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/core/test_ToxTextGenerator.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -22,10 +22,17 @@ #include #include +#include + using namespace sw; class ToxTextGeneratorTest : public CppUnit::TestFixture { public: + virtual void setUp() override + { + SwGlobals::ensure(); + } + void EmptyStringIsReturnedForPageNumberPlaceholderOfZeroItems(); void OneAtSignIsReturnedForPageNumberPlaceholderOfOneItem(); void TwoAtSignsAreReturnedForPageNumberPlaceholderOfOneItem(); Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/odfimport/data/tdf123829.odt and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/odfimport/data/tdf123829.odt differ diff -Nru libreoffice-6.2.2/sw/qa/extras/odfimport/odfimport.cxx libreoffice-6.2.3/sw/qa/extras/odfimport/odfimport.cxx --- libreoffice-6.2.2/sw/qa/extras/odfimport/odfimport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/odfimport/odfimport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -915,5 +916,15 @@ // The document used to hang the layout, consuming memory until OOM } +DECLARE_ODFIMPORT_TEST(testTdf123829, "tdf123829.odt") +{ + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc(); + CPPUNIT_ASSERT_EQUAL_MESSAGE( + "Compatibility: collapse cell paras should not be set", false, + pDoc->getIDocumentSettingAccess().get(DocumentSettingId::COLLAPSE_EMPTY_CELL_PARA)); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tcw-rounding.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tcw-rounding.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tdf115719.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tdf115719.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tdf121456.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tdf121456.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tdf123104.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tdf123104.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tdf123243.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tdf123243.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlexport/data/tdf124384.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlexport/data/tdf124384.docx differ diff -Nru libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx --- libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -584,7 +584,7 @@ CPPUNIT_ASSERT_EQUAL(58L, aBitmap.GetSizePixel().Width()); CPPUNIT_ASSERT_EQUAL(320L, aBitmap.GetSizePixel().Height()); Color aColor(aBitmap.GetPixelColor(20, 30)); - CPPUNIT_ASSERT_EQUAL(Color( 255, 0xce, 0xce, 0xce ), aColor); + CPPUNIT_ASSERT_EQUAL(Color( 0xce, 0xce, 0xce ), aColor); } DECLARE_OOXMLEXPORT_TEST(testChartSize, "chart-size.docx") @@ -746,10 +746,16 @@ CPPUNIT_ASSERT( textNextRowTop >= imageTop + imageHeight ); } -DECLARE_OOXMLEXPORT_TEST(testTcwRounding, "tcw-rounding.docx") +DECLARE_OOXMLEXPORT_TEST(testTdf123104, "tdf123104.docx") { - // Width of the A1 cell in twips was 3200, due to a rounding error. - CPPUNIT_ASSERT_EQUAL(static_cast(3201), parseDump("/root/page/body/tab/row/cell[1]/infos/bounds", "width").toInt32()); + uno::Reference xTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference xTable(xTables->getByIndex(0), uno::UNO_QUERY); + uno::Reference xCell = xTable->getCellByName("E1"); + // See SwXCell::getPropertyValue(), we really put 'long' into an Any there. + // Without the accompanying fix in place, this test would have failed with 'Expected: 3;Actual : + // 2', i.e. the vertical merge covered one less cell, resulting in a cell with white background. + CPPUNIT_ASSERT_EQUAL(static_cast(3), getProperty(xCell, "RowSpan")); } DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx") diff -Nru libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx --- libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -128,6 +128,13 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(4), getProperty< uno::Sequence >(getParagraph(4), "ParaTabStops").getLength()); } +DECLARE_OOXMLEXPORT_TEST(testTdf124384, "tdf124384.docx") +{ + // There should be no crash during loading of the document + // so, let's check just how much pages we have + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf121456_tabsOffset, "tdf121456_tabsOffset.odt") { for (int i=2; i<8; i++) @@ -152,6 +159,16 @@ assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:docPartObj/w:docPartUnique", 1); } +// Related issue tdf#121561: w:sdt/w:sdtContent around TOC +DECLARE_OOXMLEXPORT_TEST(testTdf124106, "tdf121456.docx") +{ + uno::Reference textDocument(mxComponent, uno::UNO_QUERY); + uno::Reference text(textDocument->getText(), uno::UNO_QUERY); + // -1 if the 'Y' character does not occur + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), text->getString().indexOf('Y')); + CPPUNIT_ASSERT_EQUAL(sal_Int32(-1), text->getString().indexOf('y')); +} + DECLARE_OOXMLEXPORT_TEST(testTdf121561_tocTitleDocx, "tdf121456_tabsOffset.odt") { xmlDocPtr pXmlDoc = parseExport(); @@ -292,6 +309,13 @@ CPPUNIT_ASSERT_EQUAL(2, getPages()); } +DECLARE_OOXMLEXPORT_TEST(testTdf123243, "tdf123243.docx") +{ + // Without the accompanying fix in place, this test would have failed with 'Expected: 1; Actual: + // 2'; i.e. unexpected paragraph margin created 2 pages. + CPPUNIT_ASSERT_EQUAL(1, getPages()); +} + DECLARE_OOXMLEXPORT_TEST(testTdf116410, "tdf116410.docx") { // Opposite of the above, was 2 pages, should be 1 page. diff -Nru libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx --- libreoffice-6.2.2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -298,7 +298,7 @@ xmlDocPtr pXmlDoc = parseExport("word/document.xml"); if (!pXmlDoc) return; - CPPUNIT_ASSERT_EQUAL(static_cast(6137), getXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").toInt32()); + CPPUNIT_ASSERT_EQUAL(static_cast(6138), getXPath(pXmlDoc, "/w:document/w:body/w:tbl/w:tblGrid/w:gridCol[2]", "w").toInt32()); // tdf#106572 - preventative test matching danger conditions, but imported OK anyway CPPUNIT_ASSERT_EQUAL(OUString("First Page"), getProperty(getParagraphOrTable(1), "PageDescName")); Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlimport/data/tdf115719b.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlimport/data/tdf115719b.docx differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/ooxmlimport/data/tdf120548.docx and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/ooxmlimport/data/tdf120548.docx differ diff -Nru libreoffice-6.2.2/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx libreoffice-6.2.3/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx --- libreoffice-6.2.2/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -103,6 +103,14 @@ getProperty(getRun(getParagraphOfText(1, xText), 1), "CharFontNameAsian")); } +DECLARE_OOXMLIMPORT_TEST(testTdf120548, "tdf120548.docx") +{ + // Without the accompanying fix in place, this test would have failed with 'Expected: 00ff0000; + // Actual: ffffffff', i.e. the numbering portion was black, not red. + CPPUNIT_ASSERT_EQUAL(OUString("00ff0000"), + parseDump("//Special[@nType='POR_NUMBER']/SwFont", "color")); +} + DECLARE_OOXMLIMPORT_TEST(test120551, "tdf120551.docx") { auto nHoriOrientPosition = getProperty(getShape(1), "HoriOrientPosition"); diff -Nru libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport2.cxx libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport2.cxx --- libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport2.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport2.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1831,7 +1831,7 @@ // First cell width of the second row should be 2300 uno::Reference xTableRows(xTable->getRows(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int16(2300), getProperty>( + CPPUNIT_ASSERT_EQUAL(sal_Int16(2299), getProperty>( xTableRows->getByIndex(1), "TableColumnSeparators")[0] .Position); } diff -Nru libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport3.cxx libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport3.cxx --- libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport3.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport3.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -124,10 +124,10 @@ CPPUNIT_ASSERT_EQUAL_MESSAGE("Row width", sal_Int32(9360), rowWidth); sal_Int32 cell1Width = parseDump("/root/page/body/tab/row/cell[1]/infos/bounds", "width").toInt32(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("First cell width", sal_Int32(9142), cell1Width); + CPPUNIT_ASSERT_MESSAGE("First cell width", cell1Width >= 9140 && cell1Width <= 9142); sal_Int32 cell2Width = parseDump("/root/page/body/tab/row/cell[2]/infos/bounds", "width").toInt32(); - CPPUNIT_ASSERT_EQUAL_MESSAGE("First cell width", sal_Int32(218), cell2Width); + CPPUNIT_ASSERT_MESSAGE("Second cell width", cell2Width >= 218 && cell2Width <= 220); } DECLARE_RTFEXPORT_TEST(testTdf116841, "tdf116841.rtf") diff -Nru libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport.cxx libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport.cxx --- libreoffice-6.2.2/sw/qa/extras/rtfexport/rtfexport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/rtfexport/rtfexport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1419,7 +1419,7 @@ // First table's second row had 3 cells (so 2 separators). CPPUNIT_ASSERT_EQUAL(static_cast(2), aSeparators.getLength()); // This was 3333, i.e. the B2 cell was too narrow and the text needed 2 lines. - CPPUNIT_ASSERT_GREATER(5000, aSeparators[1].Position - aSeparators[0].Position); + CPPUNIT_ASSERT_GREATEREQUAL(5000, aSeparators[1].Position - aSeparators[0].Position); } DECLARE_RTFEXPORT_TEST(testTdf107480, "tdf107480.rtf") diff -Nru libreoffice-6.2.2/sw/qa/extras/rtfimport/rtfimport.cxx libreoffice-6.2.3/sw/qa/extras/rtfimport/rtfimport.cxx --- libreoffice-6.2.2/sw/qa/extras/rtfimport/rtfimport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/rtfimport/rtfimport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -460,7 +460,7 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(-1877), getProperty(xTable, "LeftMargin")); // Cell width of A1 was 3332 (e.g. not set, 30% percent of total width) uno::Reference xTableRows(xTable->getRows(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int16(897), getProperty>( + CPPUNIT_ASSERT_EQUAL(sal_Int16(896), getProperty>( xTableRows->getByIndex(0), "TableColumnSeparators")[0] .Position); } Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/sw/qa/extras/uiwriter/data2/tdf122942.odt and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/sw/qa/extras/uiwriter/data2/tdf122942.odt differ diff -Nru libreoffice-6.2.2/sw/qa/extras/uiwriter/uiwriter2.cxx libreoffice-6.2.3/sw/qa/extras/uiwriter/uiwriter2.cxx --- libreoffice-6.2.2/sw/qa/extras/uiwriter/uiwriter2.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/extras/uiwriter/uiwriter2.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include namespace { @@ -43,6 +44,7 @@ void testTdf105413(); void testTdf101873(); void testTableWidth(); + void testTdf122942(); CPPUNIT_TEST_SUITE(SwUiWriterTest2); CPPUNIT_TEST(testRedlineMoveInsertInDelete); @@ -56,6 +58,7 @@ CPPUNIT_TEST(testTdf105413); CPPUNIT_TEST(testTdf101873); CPPUNIT_TEST(testTableWidth); + CPPUNIT_TEST(testTdf122942); CPPUNIT_TEST_SUITE_END(); private: @@ -497,6 +500,37 @@ getProperty(xTables->getByIndex(0), "RelativeWidth")); } +void SwUiWriterTest2::testTdf122942() +{ + load(DATA_DIRECTORY, "tdf122942.odt"); + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell(); + + // Do the moral equivalent of mouse button down, move and up. + // Start creating a custom shape that overlaps with the rounded rectangle + // already present in the document. + Point aStartPos(8000, 3000); + pWrtShell->BeginCreate(static_cast(OBJ_CUSTOMSHAPE), aStartPos); + + // Set its size. + Point aMovePos(10000, 5000); + pWrtShell->MoveCreate(aMovePos); + + // Finish creation. + pWrtShell->EndCreate(SdrCreateCmd::ForceEnd); + + // Make sure that the shape is inserted. + SwDoc* pDoc = pWrtShell->GetDoc(); + const SwFrameFormats& rFormats = *pDoc->GetSpzFrameFormats(); + CPPUNIT_ASSERT_EQUAL(static_cast(2), rFormats.size()); + + // Without the accompanying fix in place, this test would have failed with + // 'Expected less than: 0; Actual : 1030', i.e. the shape was below the + // paragraph mark, not above it. + const SwFormatVertOrient& rVert = rFormats[1]->GetVertOrient(); + CPPUNIT_ASSERT_LESS(static_cast(0), rVert.GetPos()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest2); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/sw/qa/uitest/librelogo/compile.py libreoffice-6.2.3/sw/qa/uitest/librelogo/compile.py --- libreoffice-6.2.2/sw/qa/uitest/librelogo/compile.py 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/qa/uitest/librelogo/compile.py 2019-04-10 10:10:51.000000000 +0000 @@ -81,6 +81,7 @@ # PROCEDURE WITH ARGUMENTS ("TO x y\nLABEL y\nEND\nx 25", "global x\ndef x(y):\n __checkhalt__()\n %s\n label(y)\n %s\n%s\nx(25)" % (((self.LS),)*3)), ("TO x :y :z\nLABEL :y + :z\nEND\nx 25 26", "global x\ndef x(_y, _z):\n __checkhalt__()\n %s\n label(_y + _z)\n %s\n%s\nx(25, 26)" % (((self.LS),)*3)), + ("TO x :y :z\nLABEL :y + :z\nEND\nx 25 :w", "global x\ndef x(_y, _z):\n __checkhalt__()\n %s\n label(_y + _z)\n %s\n%s\nx(25, _w)" % (((self.LS),)*3)), # UNICODE VARIABLE NAMES ("Erdős=1", "Erd__u__0151s=1"), # STRING CONSTANTS diff -Nru libreoffice-6.2.2/sw/source/core/crsr/findtxt.cxx libreoffice-6.2.3/sw/source/core/crsr/findtxt.cxx --- libreoffice-6.2.2/sw/source/core/crsr/findtxt.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/crsr/findtxt.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -152,7 +152,11 @@ { if (pFrame) { +#if BOOST_VERSION < 105600 + m_oMergedIter.reset(*pFrame); +#else m_oMergedIter.emplace(*pFrame); +#endif } } diff -Nru libreoffice-6.2.2/sw/source/core/doc/notxtfrm.cxx libreoffice-6.2.3/sw/source/core/doc/notxtfrm.cxx --- libreoffice-6.2.2/sw/source/core/doc/notxtfrm.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/doc/notxtfrm.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -982,9 +982,34 @@ ceil(aClipRange.getMaxX() + aSinglePixelXY.getX()), ceil(aClipRange.getMaxY() + aSinglePixelXY.getY())); + // create the enclosing rectangle as polygon + basegfx::B2DPolyPolygon aTarget(basegfx::utils::createPolygonFromRect(aExpandedClipRange)); + + // tdf#124272 the fix above (tdf#114076) was too rough - the + // clip region used may be a PolyPolygon. In that case that + // PolyPolygon would have to be scaled to mentioned PixelBounds. + // Since that is not really possible geometrically (would need + // more some 'grow in outside direction' but with unequal grow + // values in all directions - just maaany problems + // involved), use a graphical trick: The topology of the + // PolyPolygon uses the stndard FillRule, so adding the now + // guaranteed to be bigger or equal bounding (enclosing) + // rectangle twice as polygon will expand the BoundRange, but + // not change the geometry visualization at all + if(!rOutputDevice.GetClipRegion().IsRectangle()) + { + // double the outer rectangle range polygon to have it + // included twice + aTarget.append(aTarget.getB2DPolygon(0)); + + // add the original clip 'inside' (due to being smaller + // or equal). That PolyPolygon may have an unknown number + // of polygons (>=1) + aTarget.append(aClip); + } + aContent[0] = new drawinglayer::primitive2d::MaskPrimitive2D( - basegfx::B2DPolyPolygon( - basegfx::utils::createPolygonFromRect(aExpandedClipRange)), + aTarget, aContent); } } diff -Nru libreoffice-6.2.2/sw/source/core/edit/acorrect.cxx libreoffice-6.2.3/sw/source/core/edit/acorrect.cxx --- libreoffice-6.2.2/sw/source/core/edit/acorrect.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/edit/acorrect.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -381,17 +381,15 @@ pTextNd->getLayoutFrame(rEditSh.GetLayout()))); assert(pFrame); - //JP 22.04.99: Bug 63883 - Special treatment for dots. - bool bLastCharIsPoint = nEndPos < pFrame->GetText().getLength() && - ('.' == pFrame->GetText()[nEndPos]); - + const OUString sFrameText = pFrame->GetText(); const SvxAutocorrWord* pFnd = rACorrect.SearchWordsInList( - pFrame->GetText(), rSttPos, nEndPos, *this, aLanguageTag); + sFrameText, rSttPos, nEndPos, *this, aLanguageTag); SwDoc* pDoc = rEditSh.GetDoc(); if( pFnd ) { // replace also last colon of keywords surrounded by colons (for example, ":name:") - bool replaceLastChar = pFnd->GetShort()[0] == ':' && pFnd->GetShort().endsWith(":"); + const bool replaceLastChar = sFrameText.getLength() > nEndPos && pFnd->GetShort()[0] == ':' + && pFnd->GetShort().endsWith(":"); SwPaM aPam(pFrame->MapViewToModelPos(TextFrameIndex(rSttPos)), pFrame->MapViewToModelPos(TextFrameIndex(nEndPos + (replaceLastChar ? 1 : 0)))); @@ -399,6 +397,8 @@ if( pFnd->IsTextOnly() ) { //JP 22.04.99: Bug 63883 - Special treatment for dots. + const bool bLastCharIsPoint + = nEndPos < sFrameText.getLength() && ('.' == sFrameText[nEndPos]); if( !bLastCharIsPoint || pFnd->GetLong().isEmpty() || '.' != pFnd->GetLong()[ pFnd->GetLong().getLength() - 1 ] ) { diff -Nru libreoffice-6.2.2/sw/source/core/fields/expfld.cxx libreoffice-6.2.3/sw/source/core/fields/expfld.cxx --- libreoffice-6.2.2/sw/source/core/fields/expfld.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/fields/expfld.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -331,6 +331,7 @@ pTmp->m_fValueRLHidden = m_fValueRLHidden; pTmp->SwValueField::SetValue(GetValue()); pTmp->m_sExpand = m_sExpand; + pTmp->m_sExpandRLHidden = m_sExpandRLHidden; pTmp->m_bIsInBodyText = m_bIsInBodyText; pTmp->SetAutomaticLanguage(IsAutomaticLanguage()); if( m_bLateInitialization ) diff -Nru libreoffice-6.2.2/sw/source/core/frmedt/feshview.cxx libreoffice-6.2.3/sw/source/core/frmedt/feshview.cxx --- libreoffice-6.2.2/sw/source/core/frmedt/feshview.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/frmedt/feshview.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1951,17 +1951,22 @@ nXOffset = pAnch->getFrameArea().Left()+pAnch->getFrameArea().Width()-rBound.Right(); else nXOffset = rBound.Left() - pAnch->getFrameArea().Left(); - if( pAnch->IsTextFrame() && static_cast(pAnch)->IsFollow() ) + if (pAnch->IsTextFrame()) { const SwTextFrame* pTmp = static_cast(pAnch); - do { - pTmp = pTmp->FindMaster(); - OSL_ENSURE( pTmp, "Where's my Master?" ); - // OD 2004-03-30 #i26791# - correction: add frame area height - // of master frames. - nYOffset += pTmp->IsVertical() ? - pTmp->getFrameArea().Width() : pTmp->getFrameArea().Height(); - } while ( pTmp->IsFollow() ); + if (pTmp->IsFollow()) + { + do { + pTmp = pTmp->FindMaster(); + OSL_ENSURE(pTmp, "Where's my Master?"); + // OD 2004-03-30 #i26791# - correction: add frame area height + // of master frames. + nYOffset += pTmp->IsVertical() ? + pTmp->getFrameArea().Width() : pTmp->getFrameArea().Height(); + } while (pTmp->IsFollow()); + } + + nYOffset -= pTmp->GetBaseVertOffsetForFly(false); } } diff -Nru libreoffice-6.2.2/sw/source/core/inc/txtfrm.hxx libreoffice-6.2.3/sw/source/core/inc/txtfrm.hxx --- libreoffice-6.2.2/sw/source/core/inc/txtfrm.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/inc/txtfrm.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -24,6 +24,8 @@ #include #include "TextFrameIndex.hxx" +#include + namespace com { namespace sun { namespace star { namespace linguistic2 { class XHyphenatedWord; } } } } namespace sw { namespace mark { class IMark; } } @@ -980,8 +982,13 @@ class MergedAttrIterBase { protected: +#if BOOST_VERSION < 105600 + sw::MergedPara const* m_pMerged; + SwTextNode const* m_pNode; +#else sw::MergedPara const*const m_pMerged; SwTextNode const*const m_pNode; +#endif size_t m_CurrentExtent; size_t m_CurrentHint; MergedAttrIterBase(SwTextFrame const& rFrame); diff -Nru libreoffice-6.2.2/sw/source/core/layout/tabfrm.cxx libreoffice-6.2.3/sw/source/core/layout/tabfrm.cxx --- libreoffice-6.2.2/sw/source/core/layout/tabfrm.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/layout/tabfrm.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1291,16 +1291,16 @@ // recalculate the split line bRet = lcl_RecalcSplitLine( *pLastRow, *pFollowRow, nRemainingSpaceForLastRow, nShrink ); + // RecalcSplitLine did not work. In this case we conceal the split error: + if (!bRet && !bSplitRowAllowed) + { + bRet = true; + } + // NEW TABLES // check if each cell in the row span line has a good height if ( bRet && pFollowRow->IsRowSpanLine() ) lcl_AdjustRowSpanCells( pFollowRow ); - - // We The RowSplitLine stuff did not work. In this case we conceal the split error: - if ( !bRet && !bSplitRowAllowed ) - { - bRet = true; - } } return bRet; @@ -5582,11 +5582,15 @@ // just return the height of the first line. Basically we need to get the height of the // line as it would be on the last page. Since this is quite complicated to calculate, // we only calculate the height of the first line. + SwFormatFrameSize const& rFrameSize(pFirstRow->GetAttrSet()->GetFrameSize()); if ( pFirstRow->GetPrev() && - static_cast(pFirstRow->GetPrev())->IsRowSpanLine() ) + static_cast(pFirstRow->GetPrev())->IsRowSpanLine() + && rFrameSize.GetHeightSizeType() != ATT_FIX_SIZE) { // Calculate maximum height of all cells with rowspan = 1: - SwTwips nMaxHeight = 0; + SwTwips nMaxHeight = rFrameSize.GetHeightSizeType() == ATT_MIN_SIZE + ? rFrameSize.GetHeight() + : 0; const SwCellFrame* pLower2 = static_cast(pFirstRow->Lower()); while ( pLower2 ) { diff -Nru libreoffice-6.2.2/sw/source/core/text/itradj.cxx libreoffice-6.2.3/sw/source/core/text/itradj.cxx --- libreoffice-6.2.2/sw/source/core/text/itradj.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/text/itradj.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -114,9 +114,6 @@ static bool lcl_CheckKashidaPositions( SwScriptInfo& rSI, SwTextSizeInfo& rInf, SwTextIter& rItr, sal_Int32& rKashidas, TextFrameIndex& nGluePortion) { - if ( rInf.GetOut()->GetMinKashida() <= 0 ) - return false; - // i60594 validate Kashida justification TextFrameIndex nIdx = rItr.GetStart(); TextFrameIndex nEnd = rItr.GetEnd(); @@ -154,6 +151,12 @@ sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, nIdx, nNext - nIdx ); if (nKashidasInAttr > 0) { + // Kashida glyph looks suspicious, skip Kashida justification + if ( rInf.GetOut()->GetMinKashida() <= 0 ) + { + return false; + } + sal_Int32 nKashidasDropped = 0; if ( !SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) ) { @@ -213,7 +216,7 @@ sal_Int32 nKashidasInAttr = rSI.KashidaJustify ( nullptr, nullptr, nIdx, nNext - nIdx ); long nFontMinKashida = rInf.GetOut()->GetMinKashida(); - if ( nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) ) + if ( nFontMinKashida && nKashidasInAttr > 0 && SwScriptInfo::IsArabicText( rInf.GetText(), nIdx, nNext - nIdx ) ) { sal_Int32 nKashidasDropped = 0; while ( rKashidas && nGluePortion && nKashidasInAttr > 0 && diff -Nru libreoffice-6.2.2/sw/source/core/text/portxt.cxx libreoffice-6.2.3/sw/source/core/text/portxt.cxx --- libreoffice-6.2.2/sw/source/core/text/portxt.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/text/portxt.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -115,8 +115,7 @@ // Kashida Justification: Insert Kashidas if ( nEnd > nPos && pSI && COMPLEX == nScript ) { - if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && rInf.GetOut()->GetMinKashida() - && pSI->CountKashida() ) + if ( SwScriptInfo::IsArabicText( *pStr, nPos, nEnd - nPos ) && pSI->CountKashida() ) { const sal_Int32 nKashRes = pSI->KashidaJustify( nullptr, nullptr, nPos, nEnd - nPos ); // i60591: need to check result of KashidaJustify diff -Nru libreoffice-6.2.2/sw/source/core/text/txtfld.cxx libreoffice-6.2.3/sw/source/core/text/txtfld.cxx --- libreoffice-6.2.2/sw/source/core/text/txtfld.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/text/txtfld.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -412,7 +412,9 @@ * character than can be configured to be shown). However, in practice MSO also uses it as direct formatting * for numbering in that paragraph. I don't know if the problem is in the spec or in MSWord. */ -static void checkApplyParagraphMarkFormatToNumbering( SwFont* pNumFnt, SwTextFormatInfo& rInf, const IDocumentSettingAccess* pIDSA ) +static void checkApplyParagraphMarkFormatToNumbering(SwFont* pNumFnt, SwTextFormatInfo& rInf, + const IDocumentSettingAccess* pIDSA, + const SwAttrSet* pFormat) { if( !pIDSA->get(DocumentSettingId::APPLY_PARAGRAPH_MARK_FORMAT_TO_NUMBERING )) return; @@ -447,6 +449,8 @@ { if (SwTextNode::IsIgnoredCharFormatForNumbering(pItem->Which())) pCleanedSet->ClearItem(pItem->Which()); + else if (pFormat && pFormat->HasItem(pItem->Which())) + pCleanedSet->ClearItem(pItem->Which()); if (aIter.IsAtEnd()) break; @@ -552,7 +556,7 @@ if( pFormat ) pNumFnt->SetDiffFnt( pFormat, pIDSA ); - checkApplyParagraphMarkFormatToNumbering( pNumFnt.get(), rInf, pIDSA ); + checkApplyParagraphMarkFormatToNumbering(pNumFnt.get(), rInf, pIDSA, pFormat); if ( pFormatFnt ) { @@ -608,7 +612,7 @@ if( pFormat ) pNumFnt->SetDiffFnt( pFormat, pIDSA ); - checkApplyParagraphMarkFormatToNumbering( pNumFnt.get(), rInf, pIDSA ); + checkApplyParagraphMarkFormatToNumbering(pNumFnt.get(), rInf, pIDSA, pFormat); // we do not allow a vertical font pNumFnt->SetVertical( pNumFnt->GetOrientation(), m_pFrame->IsVertical() ); diff -Nru libreoffice-6.2.2/sw/source/core/text/txtfrm.cxx libreoffice-6.2.3/sw/source/core/text/txtfrm.cxx --- libreoffice-6.2.2/sw/source/core/text/txtfrm.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/text/txtfrm.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -2567,7 +2567,6 @@ SwParaPortion *pPara = GetPara(); if ( !pPara ) return; - pPara->SetPrepWidows(); sal_uInt16 nHave = nNeed; @@ -2599,6 +2598,7 @@ if( bSplit ) { + pPara->SetPrepWidows(); GetFollow()->SetOfst( aLine.GetEnd() ); aLine.TruncLines( true ); if( pPara->IsFollowField() ) diff -Nru libreoffice-6.2.2/sw/source/core/text/widorp.cxx libreoffice-6.2.3/sw/source/core/text/widorp.cxx --- libreoffice-6.2.2/sw/source/core/text/widorp.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/text/widorp.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -460,6 +460,7 @@ // i#91421 if ( !pMaster->GetIndPrev() ) { + pMaster->ChgThisLines(); sal_uLong nLines = pMaster->GetThisLines(); if(nLines == 0 && pMaster->HasPara()) { diff -Nru libreoffice-6.2.2/sw/source/core/txtnode/atrflyin.cxx libreoffice-6.2.3/sw/source/core/txtnode/atrflyin.cxx --- libreoffice-6.2.2/sw/source/core/txtnode/atrflyin.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/txtnode/atrflyin.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -34,6 +34,7 @@ #include #include #include +#include SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat ) : SfxPoolItem( RES_TXTATR_FLYCNT ), @@ -193,6 +194,13 @@ else { assert(!pFormat->IsModifyLocked()); // need to notify anchor node + if (RES_DRAWFRMFMT == pFormat->Which()) + { + if (SdrObject const*const pObj = pFormat->FindSdrObject()) + { // tdf#123259 disconnect with *old* anchor position + static_cast(::GetUserCall(pObj))->DisconnectFromLayout(); + } + } pFormat->SetFormatAttr( aAnchor ); // only set the anchor } diff -Nru libreoffice-6.2.2/sw/source/core/txtnode/fntcache.cxx libreoffice-6.2.3/sw/source/core/txtnode/fntcache.cxx --- libreoffice-6.2.2/sw/source/core/txtnode/fntcache.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/txtnode/fntcache.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1314,8 +1314,7 @@ // Kashida Justification if ( SwFontScript::CTL == nActual && nSpaceAdd ) { - if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) - && rInf.GetOut().GetMinKashida() ) + if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) ) { if ( pSI && pSI->CountKashida() && pSI->KashidaJustify( pKernArray.get(), nullptr, rInf.GetIdx(), @@ -1525,8 +1524,7 @@ // Kashida Justification if ( SwFontScript::CTL == nActual && nSpaceAdd ) { - if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) - && rInf.GetOut().GetMinKashida() ) + if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) ) { if ( pSI && pSI->CountKashida() && pSI->KashidaJustify( pKernArray.get(), pScrArray.get(), rInf.GetIdx(), @@ -1813,9 +1811,8 @@ ? (rInf.GetIdx() ? 1 : 0) : sal_Int32(rInf.GetIdx()); aGlyphsKey = SwTextGlyphsKey{ &rInf.GetOut(), *pStr, nTmpIdx, nLen }; - pGlyphs = lcl_CreateLayout(aGlyphsKey, m_aTextGlyphs[aGlyphsKey]); rInf.GetOut().DrawTextArray( aTextOriginPos, *pStr, pKernArray.get(), - nTmpIdx , nLen, SalLayoutFlags::NONE, pGlyphs ); + nTmpIdx , nLen ); if (bBullet) { rInf.GetOut().Push(); @@ -2127,8 +2124,7 @@ // Kashida Justification if ( SwFontScript::CTL == nActual && rInf.GetSpace() ) { - if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) - && rInf.GetOut().GetMinKashida() ) + if ( SwScriptInfo::IsArabicText( rInf.GetText(), rInf.GetIdx(), rInf.GetLen() ) ) { if ( pSI && pSI->CountKashida() && pSI->KashidaJustify( pKernArray.get(), nullptr, rInf.GetIdx(), rInf.GetLen(), diff -Nru libreoffice-6.2.2/sw/source/core/txtnode/ndtxt.cxx libreoffice-6.2.3/sw/source/core/txtnode/ndtxt.cxx --- libreoffice-6.2.2/sw/source/core/txtnode/ndtxt.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/txtnode/ndtxt.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -279,9 +279,6 @@ SwContentFrame *SwTextNode::MakeFrame( SwFrame* pSib ) { - // fdo#52028: ODF file import does not result in MergePortions being called - // for every attribute, since that would be inefficient. So call it here. - FileLoadedInitHints(); SwContentFrame *pFrame = new SwTextFrame( this, pSib ); return pFrame; } diff -Nru libreoffice-6.2.2/sw/source/core/txtnode/thints.cxx libreoffice-6.2.3/sw/source/core/txtnode/thints.cxx --- libreoffice-6.2.2/sw/source/core/txtnode/thints.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/txtnode/thints.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1760,7 +1760,8 @@ bool SwTextNode::IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich) { - return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_COLOR || nWhich == RES_CHRATR_BACKGROUND || nWhich == RES_CHRATR_ESCAPEMENT); + return (nWhich == RES_CHRATR_UNDERLINE || nWhich == RES_CHRATR_BACKGROUND + || nWhich == RES_CHRATR_ESCAPEMENT); } //In MS Word, following properties of the paragraph end position won't affect the formatting of bullets, so we ignore them: diff -Nru libreoffice-6.2.2/sw/source/core/undo/rolbck.cxx libreoffice-6.2.3/sw/source/core/undo/rolbck.cxx --- libreoffice-6.2.2/sw/source/core/undo/rolbck.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/undo/rolbck.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -54,6 +54,7 @@ #include #include #include +#include #include OUString SwHistoryHint::GetDescription() const @@ -669,9 +670,11 @@ bool SwHistoryBookmark::IsEqualBookmark(const ::sw::mark::IMark& rBkmk) { - return m_nNode == rBkmk.GetMarkPos().nNode.GetIndex() - && m_nContent == rBkmk.GetMarkPos().nContent.GetIndex() - && m_aName == rBkmk.GetName(); + return m_aName == rBkmk.GetName() + && ( ( m_nNode == rBkmk.GetMarkPos().nNode.GetIndex() + && m_nContent == rBkmk.GetMarkPos().nContent.GetIndex()) + // tdf#123313 these are created in middle of ToX update + || dynamic_cast(&rBkmk)); } diff -Nru libreoffice-6.2.2/sw/source/core/unocore/unostyle.cxx libreoffice-6.2.3/sw/source/core/unocore/unostyle.cxx --- libreoffice-6.2.2/sw/source/core/unocore/unostyle.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/core/unocore/unostyle.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -198,7 +198,8 @@ , m_pBasePool(pDocShell->GetStyleSheetPool()) , m_pDocShell(pDocShell) { - StartListening(*m_pBasePool); + if (m_pBasePool) //tdf#124142 html docs can have no styles + StartListening(*m_pBasePool); } //XIndexAccess diff -Nru libreoffice-6.2.2/sw/source/filter/basflt/shellio.cxx libreoffice-6.2.3/sw/source/filter/basflt/shellio.cxx --- libreoffice-6.2.2/sw/source/filter/basflt/shellio.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/filter/basflt/shellio.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -55,6 +55,7 @@ #include #include #include +#include #include #include #include @@ -63,6 +64,15 @@ using namespace ::com::sun::star; +static bool sw_MergePortions(SwNode *const& pNode, void *) +{ + if (pNode->IsTextNode()) + { + pNode->GetTextNode()->FileLoadedInitHints(); + } + return true; +} + ErrCode SwReader::Read( const Reader& rOptions ) { // copy variables @@ -338,6 +348,13 @@ } } + // fdo#52028: ODF file import does not result in MergePortions being called + // for every attribute, since that would be inefficient. So call it here. + // This is only necessary for formats that may contain RSIDs (ODF,MSO). + // It's too hard to figure out which nodes were inserted in Insert->File + // case (redlines, flys, footnotes, header/footer) so just do every node. + mxDoc->GetNodes().ForEach(&sw_MergePortions); + mxDoc->SetInReading( false ); mxDoc->SetInXMLImport( false ); diff -Nru libreoffice-6.2.2/sw/source/filter/ww8/ww8par.cxx libreoffice-6.2.3/sw/source/filter/ww8/ww8par.cxx --- libreoffice-6.2.2/sw/source/filter/ww8/ww8par.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/filter/ww8/ww8par.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -4915,10 +4915,11 @@ // Initialize RDF metadata, to be able to add statements during the import. try { - uno::Reference xDocumentMetadataAccess(m_rDoc.GetDocShell()->GetBaseModel(), uno::UNO_QUERY_THROW); + uno::Reference const xModel(m_rDoc.GetDocShell()->GetBaseModel()); + uno::Reference xDocumentMetadataAccess(xModel, uno::UNO_QUERY_THROW); uno::Reference xComponentContext(comphelper::getProcessComponentContext()); uno::Reference xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); - const uno::Reference xBaseURI(sfx2::createBaseURI(xComponentContext, xStorage, m_sBaseURL)); + const uno::Reference xBaseURI(sfx2::createBaseURI(xComponentContext, xModel, m_sBaseURL)); uno::Reference xHandler; xDocumentMetadataAccess->loadMetadataFromStorage(xStorage, xBaseURI, xHandler); } diff -Nru libreoffice-6.2.2/sw/source/filter/xml/swxml.cxx libreoffice-6.2.3/sw/source/filter/xml/swxml.cxx --- libreoffice-6.2.2/sw/source/filter/xml/swxml.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/filter/xml/swxml.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -795,8 +795,10 @@ { const uno::Reference xDMA(xModelComp, uno::UNO_QUERY_THROW); + const uno::Reference xModel(xModelComp, + uno::UNO_QUERY_THROW); const uno::Reference xBaseURI( ::sfx2::createBaseURI( - xContext, xStorage, rBaseURL, StreamPath) ); + xContext, xModel, rBaseURL, StreamPath) ); const uno::Reference xHandler( pDocSh->GetMedium()->GetInteractionHandler() ); xDMA->loadMetadataFromStorage(xStorage, xBaseURI, xHandler); diff -Nru libreoffice-6.2.2/sw/source/filter/xml/xmlimp.cxx libreoffice-6.2.3/sw/source/filter/xml/xmlimp.cxx --- libreoffice-6.2.2/sw/source/filter/xml/xmlimp.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/filter/xml/xmlimp.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1356,7 +1356,6 @@ aExcludeWhenNotLoadingUserSettings.insert("TabOverMargin"); aExcludeWhenNotLoadingUserSettings.insert("PropLineSpacingShrinksFirstLine"); aExcludeWhenNotLoadingUserSettings.insert("SubtractFlysAnchoredAtFlys"); - aExcludeWhenNotLoadingUserSettings.insert("DisableOffPagePositioning"); sal_Int32 nCount = aConfigProps.getLength(); const PropertyValue* pValues = aConfigProps.getConstArray(); @@ -1391,7 +1390,7 @@ bool bTabOverMarginValue = false; bool bPropLineSpacingShrinksFirstLine = false; bool bSubtractFlysAnchoredAtFlys = false; - bool bDisableOffPagePositioning = false; + bool bCollapseEmptyCellPara = false; const PropertyValue* currentDatabaseDataSource = nullptr; const PropertyValue* currentDatabaseCommand = nullptr; @@ -1487,8 +1486,8 @@ bPropLineSpacingShrinksFirstLine = true; else if (pValues->Name == "SubtractFlysAnchoredAtFlys") bSubtractFlysAnchoredAtFlys = true; - else if (pValues->Name == "DisableOffPagePositioning") - bDisableOffPagePositioning = true; + else if (pValues->Name == "CollapseEmptyCellPara") + bCollapseEmptyCellPara = true; } catch( Exception& ) { @@ -1657,8 +1656,8 @@ if (!bSubtractFlysAnchoredAtFlys) xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true)); - if ( bDisableOffPagePositioning ) - xProps->setPropertyValue("DisableOffPagePositioning", makeAny(true)); + if (!bCollapseEmptyCellPara) + xProps->setPropertyValue("CollapseEmptyCellPara", makeAny(false)); SwDoc *pDoc = getDoc(); SfxPrinter *pPrinter = pDoc->getIDocumentDeviceAccess().getPrinter( false ); diff -Nru libreoffice-6.2.2/sw/source/ui/index/cnttab.cxx libreoffice-6.2.3/sw/source/ui/index/cnttab.cxx --- libreoffice-6.2.2/sw/source/ui/index/cnttab.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/ui/index/cnttab.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1115,7 +1115,7 @@ case TOX_AUTHORITIES: case TOX_BIBLIOGRAPHY : { - if (m_xBracketLB->get_active() != -1) + if (m_xBracketLB->get_active()) rDesc.SetAuthBrackets(m_xBracketLB->get_active_text()); else rDesc.SetAuthBrackets(aEmptyOUStr); diff -Nru libreoffice-6.2.2/sw/source/ui/misc/outline.cxx libreoffice-6.2.3/sw/source/ui/misc/outline.cxx --- libreoffice-6.2.2/sw/source/ui/misc/outline.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/ui/misc/outline.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -823,13 +823,30 @@ { vcl::Font aTmpFont(pVDev->GetFont()); - vcl::Font aFont(*rFormat.GetBulletFont()); - aFont.SetFontSize(rSize); + // via Uno it's possible that no font has been set! + vcl::Font aFont(rFormat.GetBulletFont() ? *rFormat.GetBulletFont() : aTmpFont); + Size aTmpSize(rSize); + aTmpSize.setWidth( aTmpSize.Width() * ( rFormat.GetBulletRelSize()) ); + aTmpSize.setWidth( aTmpSize.Width() / 100 ) ; + aTmpSize.setHeight( aTmpSize.Height() * ( rFormat.GetBulletRelSize()) ); + aTmpSize.setHeight( aTmpSize.Height() / 100 ) ; + // in case of a height of zero it is drawn in original height + if(!aTmpSize.Height()) + aTmpSize.setHeight( 1 ); + aFont.SetFontSize(aTmpSize); aFont.SetTransparent(true); - pVDev->SetFont(aFont); + Color aBulletColor = rFormat.GetBulletColor(); + if(aBulletColor == COL_AUTO) + aBulletColor = pVDev->GetFillColor().IsDark() ? COL_WHITE : COL_BLACK; + else if(aBulletColor == pVDev->GetFillColor()) + aBulletColor.Invert(); + aFont.SetColor(aBulletColor); + pVDev->SetFont( aFont ); OUString aText(rFormat.GetBulletChar()); - pVDev->DrawText(Point(nXStart, nYStart), aText); - const long nRet = pVDev->GetTextWidth(aText); + long nY = nYStart; + nY -= ((aTmpSize.Height() - rSize.Height())/ 2); + pVDev->DrawText( Point(nXStart, nY), aText ); + long nRet = pVDev->GetTextWidth(aText); pVDev->SetFont(aTmpFont); return nRet; diff -Nru libreoffice-6.2.2/sw/source/uibase/app/docsh2.cxx libreoffice-6.2.3/sw/source/uibase/app/docsh2.cxx --- libreoffice-6.2.2/sw/source/uibase/app/docsh2.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/uibase/app/docsh2.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1672,15 +1672,6 @@ return pResult; } -static bool lcl_MergePortions(SwNode *const& pNode, void *) -{ - if (pNode->IsTextNode()) - { - pNode->GetTextNode()->FileLoadedInitHints(); - } - return true; -} - int SwFindDocShell( SfxObjectShellRef& xDocSh, SfxObjectShellLock& xLockRef, const OUString& rFileName, @@ -1771,8 +1762,6 @@ xDocSh = static_cast(xLockRef); if (xDocSh->DoLoad(xMed.release())) { - SwDoc const& rDoc(*pNew->GetDoc()); - const_cast(rDoc).GetNodes().ForEach(&lcl_MergePortions); return 2; } } diff -Nru libreoffice-6.2.2/sw/source/uibase/docvw/HeaderFooterWin.cxx libreoffice-6.2.3/sw/source/uibase/docvw/HeaderFooterWin.cxx --- libreoffice-6.2.2/sw/source/uibase/docvw/HeaderFooterWin.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/uibase/docvw/HeaderFooterWin.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -434,6 +434,9 @@ else if (rIdent == "delete") { rSh.ChangeHeaderOrFooter( rStyleName, m_bIsHeader, false, true ); + if ( IsEmptyHeaderFooter() ) + rSh.ToggleHeaderFooterEdit(); + GrabFocusToDocument(); } else if (rIdent == "insert_pagenumber") { diff -Nru libreoffice-6.2.2/sw/source/uibase/uiview/view.cxx libreoffice-6.2.3/sw/source/uibase/uiview/view.cxx --- libreoffice-6.2.2/sw/source/uibase/uiview/view.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/uibase/uiview/view.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1692,10 +1692,10 @@ case SfxHintId::RedlineChanged: { static sal_uInt16 const aSlotRedLine[] = { - FN_REDLINE_NEXT_CHANGE, - FN_REDLINE_PREV_CHANGE, FN_REDLINE_ACCEPT_DIRECT, FN_REDLINE_REJECT_DIRECT, + FN_REDLINE_NEXT_CHANGE, + FN_REDLINE_PREV_CHANGE, FN_REDLINE_ACCEPT_ALL, FN_REDLINE_REJECT_ALL, 0 diff -Nru libreoffice-6.2.2/sw/source/uibase/uno/unotxdoc.cxx libreoffice-6.2.3/sw/source/uibase/uno/unotxdoc.cxx --- libreoffice-6.2.2/sw/source/uibase/uno/unotxdoc.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/uibase/uno/unotxdoc.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -2621,24 +2621,26 @@ // since printing now also use the API for PDF export this option // should be set for printing as well ... pViewShell->SetPDFExportOption( true ); - bool bOrigStatus = pRenderDocShell->IsEnableSetModified(); - // check configuration: shall update of printing information in DocInfo set the document to "modified"? + + // there is some redundancy between those two function calls, but right now + // there is no time to sort this out. + //TODO: check what exactly needs to be done and make just one function for that + pViewShell->CalcLayout(); + pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); + + + // #122919# Force field update before PDF export, but after layout init (tdf#121962) bool bStateChanged = false; - if ( bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() ) + // check configuration: shall update of printing information in DocInfo set the document to "modified"? + if ( pRenderDocShell->IsEnableSetModified() && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() ) { pRenderDocShell->EnableSetModified( false ); bStateChanged = true; } - + pViewShell->SwViewShell::UpdateFields(true); if( bStateChanged ) pRenderDocShell->EnableSetModified(); - // there is some redundancy between those two function calls, but right now - // there is no time to sort this out. - //TODO: check what exactly needs to be done and make just one function for that - pViewShell->CalcLayout(); - pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() ); - pViewShell->SetPDFExportOption( false ); // enable view again diff -Nru libreoffice-6.2.2/sw/source/uibase/utlui/content.cxx libreoffice-6.2.3/sw/source/uibase/utlui/content.cxx --- libreoffice-6.2.2/sw/source/uibase/utlui/content.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/source/uibase/utlui/content.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -2844,15 +2844,14 @@ //and realize multi-selection . else if(aCode.GetCode() == KEY_SPACE && 0 == aCode.GetModifier()) { - SvTreeListEntry* pEntry = GetCurEntry(); - if( GetChildCount( pEntry ) == 0 ) - m_bIsKeySpace = true; - Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration - m_aOldRectangle = GetFocusRect( pEntry,tempPoint.Y() ); - if(pEntry) { + if( GetChildCount( pEntry ) == 0 ) + m_bIsKeySpace = true; + Point tempPoint = GetEntryPosition( pEntry );//Change from "GetEntryPos" to "GetEntryPosition" for acc migration + m_aOldRectangle = GetFocusRect(pEntry, tempPoint.Y()); + if (State::HIDDEN != m_eState) { if (State::CONSTANT == m_eState) diff -Nru libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_compact.ui libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_compact.ui --- libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -1891,14 +1891,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui --- libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui 2019-04-10 10:10:51.000000000 +0000 @@ -2531,14 +2531,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui --- libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui 2019-04-10 10:10:51.000000000 +0000 @@ -1498,14 +1498,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False @@ -2688,14 +2680,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar.ui libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar.ui --- libreoffice-6.2.2/sw/uiconfig/swriter/ui/notebookbar.ui 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/sw/uiconfig/swriter/ui/notebookbar.ui 2019-04-10 10:10:51.000000000 +0000 @@ -493,14 +493,6 @@ - - True - False - vnd.sun.star.job:alias=UpdateCheck - _Check for Updates... - - - True False diff -Nru libreoffice-6.2.2/tarballs/fetch.log libreoffice-6.2.3/tarballs/fetch.log --- libreoffice-6.2.2/tarballs/fetch.log 2019-03-24 21:28:55.000000000 +0000 +++ libreoffice-6.2.3/tarballs/fetch.log 2019-04-29 11:22:52.000000000 +0000 @@ -1,1470 +1,1470 @@ -dimanche 24 mars 2019, 22:23:08 (UTC+0100) ---2019-03-24 22:23:08-- https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 318400 (311K) [application/octet-stream] -Enregistre : «./libabw-0.1.2.tar.xz» +Mon 29 Apr 2019 12:15:46 PM BST +--2019-04-29 12:15:46-- https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 318400 (311K) [application/octet-stream] +Saving to: ‘./libabw-0.1.2.tar.xz’ - 0K .... 100% 1,17M=0,3s + 0K .... 100% 2.25M=0.1s -2019-03-24 22:23:09 (1,17 MB/s) - «./libabw-0.1.2.tar.xz» enregistré [318400/318400] +2019-04-29 12:15:47 (2.25 MB/s) - ‘./libabw-0.1.2.tar.xz’ saved [318400/318400] ---2019-03-24 22:23:09-- https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 188536 (184K) [application/octet-stream] -Enregistre : «./commons-logging-1.2-src.tar.gz» +--2019-04-29 12:15:47-- https://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 188536 (184K) [application/octet-stream] +Saving to: ‘./commons-logging-1.2-src.tar.gz’ - 0K .. 100% 841K=0,2s + 0K .. 100% 1.92M=0.09s -2019-03-24 22:23:10 (841 KB/s) - «./commons-logging-1.2-src.tar.gz» enregistré [188536/188536] +2019-04-29 12:15:47 (1.92 MB/s) - ‘./commons-logging-1.2-src.tar.gz’ saved [188536/188536] ---2019-03-24 22:23:10-- https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1031613 (1007K) [application/octet-stream] -Enregistre : «./apr-1.5.2.tar.gz» +--2019-04-29 12:15:47-- https://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1031613 (1007K) [application/octet-stream] +Saving to: ‘./apr-1.5.2.tar.gz’ - 0K ........ ....... 100% 1,72M=0,6s + 0K ........ ....... 100% 2.54M=0.4s -2019-03-24 22:23:10 (1,72 MB/s) - «./apr-1.5.2.tar.gz» enregistré [1031613/1031613] +2019-04-29 12:15:48 (2.54 MB/s) - ‘./apr-1.5.2.tar.gz’ saved [1031613/1031613] ---2019-03-24 22:23:11-- https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 874044 (854K) [application/octet-stream] -Enregistre : «./apr-util-1.5.4.tar.gz» +--2019-04-29 12:15:48-- https://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 874044 (854K) [application/octet-stream] +Saving to: ‘./apr-util-1.5.4.tar.gz’ - 0K ........ ..... 100% 1,88M=0,4s + 0K ........ ..... 100% 1.79M=0.5s -2019-03-24 22:23:11 (1,88 MB/s) - «./apr-util-1.5.4.tar.gz» enregistré [874044/874044] +2019-04-29 12:15:49 (1.79 MB/s) - ‘./apr-util-1.5.4.tar.gz’ saved [874044/874044] ---2019-03-24 22:23:11-- https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 85995778 (82M) [application/octet-stream] -Enregistre : «./boost_1_66_0.tar.bz2» +--2019-04-29 12:15:49-- https://dev-www.libreoffice.org/src/boost_1_66_0.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 85995778 (82M) [application/octet-stream] +Saving to: ‘./boost_1_66_0.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 3% 1,67M 47s - 3072K ........ ........ ........ ........ ........ ........ 7% 1,10M 57s - 6144K ........ ........ ........ ........ ........ ........ 10% 1,60M 52s - 9216K ........ ........ ........ ........ ........ ........ 14% 1,37M 50s - 12288K ........ ........ ........ ........ ........ ........ 18% 1,93M 45s - 15360K ........ ........ ........ ........ ........ ........ 21% 1,61M 43s - 18432K ........ ........ ........ ........ ........ ........ 25% 1,18M 42s - 21504K ........ ........ ........ ........ ........ ........ 29% 1,89M 39s - 24576K ........ ........ ........ ........ ........ ........ 32% 1,55M 37s - 27648K ........ ........ ........ ........ ........ ........ 36% 1,97M 34s - 30720K ........ ........ ........ ........ ........ ........ 40% 1,68M 32s - 33792K ........ ........ ........ ........ ........ ........ 43% 1,64M 30s - 36864K ........ ........ ........ ........ ........ ........ 47% 2,01M 27s - 39936K ........ ........ ........ ........ ........ ........ 51% 2,32M 25s - 43008K ........ ........ ........ ........ ........ ........ 54% 1,42M 23s - 46080K ........ ........ ........ ........ ........ ........ 58% 1,93M 21s - 49152K ........ ........ ........ ........ ........ ........ 62% 2,44M 19s - 52224K ........ ........ ........ ........ ........ ........ 65% 2,88M 17s - 55296K ........ ........ ........ ........ ........ ........ 69% 1,85M 15s - 58368K ........ ........ ........ ........ ........ ........ 73% 1,76M 13s - 61440K ........ ........ ........ ........ ........ ........ 76% 1,51M 11s - 64512K ........ ........ ........ ........ ........ ........ 80% 1,89M 9s - 67584K ........ ........ ........ ........ ........ ........ 84% 2,07M 8s - 70656K ........ ........ ........ ........ ........ ........ 87% 2,27M 6s - 73728K ........ ........ ........ ........ ........ ........ 91% 2,03M 4s - 76800K ........ ........ ........ ........ ........ ........ 95% 2,45M 2s - 79872K ........ ........ ........ ........ ........ ........ 98% 1,74M 1s - 82944K ........ ........ 100% 1,26M=47s + 0K ........ ........ ........ ........ ........ ........ 3% 1.16M 68s + 3072K ........ ........ ........ ........ ........ ........ 7% 1.53M 58s + 6144K ........ ........ ........ ........ ........ ........ 10% 2.18M 48s + 9216K ........ ........ ........ ........ ........ ........ 14% 2.32M 42s + 12288K ........ ........ ........ ........ ........ ........ 18% 1.59M 41s + 15360K ........ ........ ........ ........ ........ ........ 21% 1.23M 41s + 18432K ........ ........ ........ ........ ........ ........ 25% 1.87M 38s + 21504K ........ ........ ........ ........ ........ ........ 29% 1.68M 36s + 24576K ........ ........ ........ ........ ........ ........ 32% 1.05M 36s + 27648K ........ ........ ........ ........ ........ ........ 36% 1.29M 35s + 30720K ........ ........ ........ ........ ........ ........ 40% 1.33M 33s + 33792K ........ ........ ........ ........ ........ ........ 43% 1.23M 32s + 36864K ........ ........ ........ ........ ........ ........ 47% 1.64M 29s + 39936K ........ ........ ........ ........ ........ ........ 51% 962K 28s + 43008K ........ ........ ........ ........ ........ ........ 54% 1.09M 27s + 46080K ........ ........ ........ ........ ........ ........ 58% 1.01M 25s + 49152K ........ ........ ........ ........ ........ ........ 62% 879K 24s + 52224K ........ ........ ........ ........ ........ ........ 65% 1.21M 22s + 55296K ........ ........ ........ ........ ........ ........ 69% 1.62M 19s + 58368K ........ ........ ........ ........ ........ ........ 73% 1.65M 17s + 61440K ........ ........ ........ ........ ........ ........ 76% 1.56M 14s + 64512K ........ ........ ........ ........ ........ ........ 80% 1.62M 12s + 67584K ........ ........ ........ ........ ........ ........ 84% 1.44M 10s + 70656K ........ ........ ........ ........ ........ ........ 87% 1.69M 7s + 73728K ........ ........ ........ ........ ........ ........ 91% 1.19M 5s + 76800K ........ ........ ........ ........ ........ ........ 95% 1.00M 3s + 79872K ........ ........ ........ ........ ........ ........ 98% 1.04M 1s + 82944K ........ ........ 100% 1.41M=62s -2019-03-24 22:23:58 (1,75 MB/s) - «./boost_1_66_0.tar.bz2» enregistré [85995778/85995778] +2019-04-29 12:16:51 (1.32 MB/s) - ‘./boost_1_66_0.tar.bz2’ saved [85995778/85995778] ---2019-03-24 22:23:59-- https://dev-www.libreoffice.org/src/breakpad.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 14897049 (14M) [application/zip] -Enregistre : «./breakpad.zip» +--2019-04-29 12:16:52-- https://dev-www.libreoffice.org/src/breakpad.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 14897049 (14M) [application/zip] +Saving to: ‘./breakpad.zip’ - 0K ........ ........ ........ ........ ........ ........ 21% 1,57M 7s - 3072K ........ ........ ........ ........ ........ ........ 42% 1,76M 5s - 6144K ........ ........ ........ ........ ........ ........ 63% 1,50M 3s - 9216K ........ ........ ........ ........ ........ ........ 84% 1,06M 2s - 12288K ........ ........ ........ ........ ... 100% 1,22M=10s + 0K ........ ........ ........ ........ ........ ........ 21% 1.49M 8s + 3072K ........ ........ ........ ........ ........ ........ 42% 1.42M 6s + 6144K ........ ........ ........ ........ ........ ........ 63% 1.32M 4s + 9216K ........ ........ ........ ........ ........ ........ 84% 1.21M 2s + 12288K ........ ........ ........ ........ ... 100% 1.21M=11s -2019-03-24 22:24:09 (1,38 MB/s) - «./breakpad.zip» enregistré [14897049/14897049] +2019-04-29 12:17:03 (1.33 MB/s) - ‘./breakpad.zip’ saved [14897049/14897049] ---2019-03-24 22:24:10-- https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1997625 (1,9M) [application/zip] -Enregistre : «./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip» +--2019-04-29 12:17:03-- https://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1997625 (1.9M) [application/zip] +Saving to: ‘./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip’ - 0K ........ ........ ........ ...... 100% 1,74M=1,1s + 0K ........ ........ ........ ...... 100% 914K=2.1s -2019-03-24 22:24:11 (1,74 MB/s) - «./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip» enregistré [1997625/1997625] +2019-04-29 12:17:05 (914 KB/s) - ‘./beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip’ saved [1997625/1997625] ---2019-03-24 22:24:11-- https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 782025 (764K) [application/octet-stream] -Enregistre : «./00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz» +--2019-04-29 12:17:05-- https://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 782025 (764K) [application/octet-stream] +Saving to: ‘./00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz’ - 0K ........ ... 100% 1,31M=0,6s + 0K ........ ... 100% 1.17M=0.6s -2019-03-24 22:24:12 (1,31 MB/s) - «./00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz» enregistré [782025/782025] +2019-04-29 12:17:06 (1.17 MB/s) - ‘./00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz’ saved [782025/782025] ---2019-03-24 22:24:12-- https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 41997432 (40M) [application/octet-stream] -Enregistre : «./cairo-1.16.0.tar.xz» +--2019-04-29 12:17:06-- https://dev-www.libreoffice.org/src/cairo-1.16.0.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 41997432 (40M) [application/octet-stream] +Saving to: ‘./cairo-1.16.0.tar.xz’ - 0K ........ ........ ........ ........ ........ ........ 7% 1,46M 25s - 3072K ........ ........ ........ ........ ........ ........ 14% 1,69M 22s - 6144K ........ ........ ........ ........ ........ ........ 22% 2,16M 18s - 9216K ........ ........ ........ ........ ........ ........ 29% 2,63M 15s - 12288K ........ ........ ........ ........ ........ ........ 37% 2,40M 13s - 15360K ........ ........ ........ ........ ........ ........ 44% 2,38M 11s - 18432K ........ ........ ........ ........ ........ ........ 52% 1,36M 10s - 21504K ........ ........ ........ ........ ........ ........ 59% 1,64M 9s - 24576K ........ ........ ........ ........ ........ ........ 67% 1,05M 8s - 27648K ........ ........ ........ ........ ........ ........ 74% 2,09M 6s - 30720K ........ ........ ........ ........ ........ ........ 82% 2,38M 4s - 33792K ........ ........ ........ ........ ........ ........ 89% 1,49M 2s - 36864K ........ ........ ........ ........ ........ ........ 97% 1,92M 1s - 39936K ........ ........ 100% 2,40M=22s + 0K ........ ........ ........ ........ ........ ........ 7% 1.19M 31s + 3072K ........ ........ ........ ........ ........ ........ 14% 1.19M 29s + 6144K ........ ........ ........ ........ ........ ........ 22% 1.16M 26s + 9216K ........ ........ ........ ........ ........ ........ 29% 877K 26s + 12288K ........ ........ ........ ........ ........ ........ 37% 1.51M 22s + 15360K ........ ........ ........ ........ ........ ........ 44% 1.93M 18s + 18432K ........ ........ ........ ........ ........ ........ 52% 1.10M 16s + 21504K ........ ........ ........ ........ ........ ........ 59% 1.20M 13s + 24576K ........ ........ ........ ........ ........ ........ 67% 1.32M 11s + 27648K ........ ........ ........ ........ ........ ........ 74% 1.19M 8s + 30720K ........ ........ ........ ........ ........ ........ 82% 1.36M 6s + 33792K ........ ........ ........ ........ ........ ........ 89% 1.26M 3s + 36864K ........ ........ ........ ........ ........ ........ 97% 1.11M 1s + 39936K ........ ........ 100% 1000K=33s -2019-03-24 22:24:35 (1,78 MB/s) - «./cairo-1.16.0.tar.xz» enregistré [41997432/41997432] +2019-04-29 12:17:40 (1.21 MB/s) - ‘./cairo-1.16.0.tar.xz’ saved [41997432/41997432] ---2019-03-24 22:24:35-- https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 878784 (858K) [application/octet-stream] -Enregistre : «./e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz» +--2019-04-29 12:17:40-- https://dev-www.libreoffice.org/src/e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 878784 (858K) [application/octet-stream] +Saving to: ‘./e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz’ - 0K ........ ..... 100% 1,15M=0,7s + 0K ........ ..... 100% 991K=0.9s -2019-03-24 22:24:36 (1,15 MB/s) - «./e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz» enregistré [878784/878784] +2019-04-29 12:17:41 (991 KB/s) - ‘./e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz’ saved [878784/878784] ---2019-03-24 22:24:36-- https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 612252 (598K) [application/octet-stream] -Enregistre : «./libcdr-0.1.5.tar.xz» +--2019-04-29 12:17:41-- https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 612252 (598K) [application/octet-stream] +Saving to: ‘./libcdr-0.1.5.tar.xz’ - 0K ........ . 100% 1,22M=0,5s + 0K ........ . 100% 808K=0.7s -2019-03-24 22:24:37 (1,22 MB/s) - «./libcdr-0.1.5.tar.xz» enregistré [612252/612252] +2019-04-29 12:17:42 (808 KB/s) - ‘./libcdr-0.1.5.tar.xz’ saved [612252/612252] ---2019-03-24 22:24:37-- https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2241498 (2,1M) [application/octet-stream] -Enregistre : «./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz» +--2019-04-29 12:17:42-- https://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2241498 (2.1M) [application/octet-stream] +Saving to: ‘./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz’ - 0K ........ ........ ........ ........ .. 100% 1014K=2,2s + 0K ........ ........ ........ ........ .. 100% 1.00M=2.1s -2019-03-24 22:24:39 (1014 KB/s) - «./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz» enregistré [2241498/2241498] +2019-04-29 12:17:45 (1.00 MB/s) - ‘./48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz’ saved [2241498/2241498] ---2019-03-24 22:24:39-- https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 484404 (473K) [application/octet-stream] -Enregistre : «./libcmis-0.5.2.tar.xz» +--2019-04-29 12:17:45-- https://dev-www.libreoffice.org/src/libcmis-0.5.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 484404 (473K) [application/octet-stream] +Saving to: ‘./libcmis-0.5.2.tar.xz’ - 0K ....... 100% 317K=1,5s + 0K ....... 100% 845K=0.6s -2019-03-24 22:24:41 (317 KB/s) - «./libcmis-0.5.2.tar.xz» enregistré [484404/484404] +2019-04-29 12:17:45 (845 KB/s) - ‘./libcmis-0.5.2.tar.xz’ saved [484404/484404] ---2019-03-24 22:24:41-- https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 10343849 (9,9M) [application/octet-stream] -Enregistre : «./CoinMP-1.7.6.tgz» +--2019-04-29 12:17:45-- https://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 10343849 (9.9M) [application/octet-stream] +Saving to: ‘./CoinMP-1.7.6.tgz’ - 0K ........ ........ ........ ........ ........ ........ 30% 1,40M 5s - 3072K ........ ........ ........ ........ ........ ........ 60% 1,71M 3s - 6144K ........ ........ ........ ........ ........ ........ 91% 1,85M 1s - 9216K ........ ..... 100% 2,01M=6,0s + 0K ........ ........ ........ ........ ........ ........ 30% 1.17M 6s + 3072K ........ ........ ........ ........ ........ ........ 60% 1.31M 3s + 6144K ........ ........ ........ ........ ........ ........ 91% 1.87M 1s + 9216K ........ ..... 100% 1.78M=7.0s -2019-03-24 22:24:47 (1,66 MB/s) - «./CoinMP-1.7.6.tgz» enregistré [10343849/10343849] +2019-04-29 12:17:53 (1.42 MB/s) - ‘./CoinMP-1.7.6.tgz’ saved [10343849/10343849] ---2019-03-24 22:24:47-- https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 959716 (937K) [application/octet-stream] -Enregistre : «./cppunit-1.14.0.tar.gz» +--2019-04-29 12:17:53-- https://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 959716 (937K) [application/octet-stream] +Saving to: ‘./cppunit-1.14.0.tar.gz’ - 0K ........ ...... 100% 1,27M=0,7s + 0K ........ ...... 100% 1.10M=0.8s -2019-03-24 22:24:48 (1,27 MB/s) - «./cppunit-1.14.0.tar.gz» enregistré [959716/959716] +2019-04-29 12:17:54 (1.10 MB/s) - ‘./cppunit-1.14.0.tar.gz’ saved [959716/959716] ---2019-03-24 22:24:48-- https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 49659 (48K) [application/octet-stream] -Enregistre : «./1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt» +--2019-04-29 12:17:54-- https://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 49659 (48K) [application/octet-stream] +Saving to: ‘./1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt’ - 0K 100% 957K=0,05s + 0K 100% 1.13M=0.04s -2019-03-24 22:24:49 (957 KB/s) - «./1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt» enregistré [49659/49659] +2019-04-29 12:17:54 (1.13 MB/s) - ‘./1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt’ saved [49659/49659] ---2019-03-24 22:24:49-- https://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 4032645 (3,8M) [application/octet-stream] -Enregistre : «./curl-7.64.0.tar.gz» +--2019-04-29 12:17:54-- https://dev-www.libreoffice.org/src/curl-7.64.0.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 4032645 (3.8M) [application/octet-stream] +Saving to: ‘./curl-7.64.0.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 78% 1,48M 1s - 3072K ........ ..... 100% 1,81M=2,5s + 0K ........ ........ ........ ........ ........ ........ 78% 1.45M 1s + 3072K ........ ..... 100% 1.22M=2.8s -2019-03-24 22:24:52 (1,54 MB/s) - «./curl-7.64.0.tar.gz» enregistré [4032645/4032645] +2019-04-29 12:17:57 (1.39 MB/s) - ‘./curl-7.64.0.tar.gz’ saved [4032645/4032645] ---2019-03-24 22:24:52-- https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 416268 (407K) [application/octet-stream] -Enregistre : «./libe-book-0.1.3.tar.xz» +--2019-04-29 12:17:57-- https://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 416268 (407K) [application/octet-stream] +Saving to: ‘./libe-book-0.1.3.tar.xz’ - 0K ...... 100% 1,30M=0,3s + 0K ...... 100% 1.18M=0.3s -2019-03-24 22:24:52 (1,30 MB/s) - «./libe-book-0.1.3.tar.xz» enregistré [416268/416268] +2019-04-29 12:17:58 (1.18 MB/s) - ‘./libe-book-0.1.3.tar.xz’ saved [416268/416268] ---2019-03-24 22:24:52-- https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 463264 (452K) [application/octet-stream] -Enregistre : «./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz» +--2019-04-29 12:17:58-- https://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 463264 (452K) [application/octet-stream] +Saving to: ‘./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz’ - 0K ....... 100% 797K=0,6s + 0K ....... 100% 1.09M=0.4s -2019-03-24 22:24:53 (797 KB/s) - «./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz» enregistré [463264/463264] +2019-04-29 12:17:59 (1.09 MB/s) - ‘./3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz’ saved [463264/463264] ---2019-03-24 22:24:53-- https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 324380 (317K) [application/octet-stream] -Enregistre : «./libepubgen-0.1.1.tar.xz» +--2019-04-29 12:17:59-- https://dev-www.libreoffice.org/src/libepubgen-0.1.1.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 324380 (317K) [application/octet-stream] +Saving to: ‘./libepubgen-0.1.1.tar.xz’ - 0K .... 100% 1,43M=0,2s + 0K .... 100% 1.16M=0.3s -2019-03-24 22:24:54 (1,43 MB/s) - «./libepubgen-0.1.1.tar.xz» enregistré [324380/324380] +2019-04-29 12:17:59 (1.16 MB/s) - ‘./libepubgen-0.1.1.tar.xz’ saved [324380/324380] ---2019-03-24 22:24:54-- https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1477064 (1,4M) [application/octet-stream] -Enregistre : «./libetonyek-0.1.9.tar.xz» +--2019-04-29 12:17:59-- https://dev-www.libreoffice.org/src/libetonyek-0.1.9.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1477064 (1.4M) [application/octet-stream] +Saving to: ‘./libetonyek-0.1.9.tar.xz’ - 0K ........ ........ ...... 100% 1,63M=0,9s + 0K ........ ........ ...... 100% 1.24M=1.1s -2019-03-24 22:24:55 (1,63 MB/s) - «./libetonyek-0.1.9.tar.xz» enregistré [1477064/1477064] +2019-04-29 12:18:01 (1.24 MB/s) - ‘./libetonyek-0.1.9.tar.xz’ saved [1477064/1477064] ---2019-03-24 22:24:55-- https://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 510868 (499K) [application/octet-stream] -Enregistre : «./expat-2.2.5.tar.bz2» +--2019-04-29 12:18:01-- https://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 510868 (499K) [application/octet-stream] +Saving to: ‘./expat-2.2.5.tar.bz2’ - 0K ....... 100% 1,62M=0,3s + 0K ....... 100% 460K=1.1s -2019-03-24 22:24:55 (1,62 MB/s) - «./expat-2.2.5.tar.bz2» enregistré [510868/510868] +2019-04-29 12:18:02 (460 KB/s) - ‘./expat-2.2.5.tar.bz2’ saved [510868/510868] ---2019-03-24 22:24:55-- https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 9552809 (9,1M) [application/octet-stream] -Enregistre : «./Firebird-3.0.0.32483-0.tar.bz2» +--2019-04-29 12:18:02-- https://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 9552809 (9.1M) [application/octet-stream] +Saving to: ‘./Firebird-3.0.0.32483-0.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 32% 1,38M 4s - 3072K ........ ........ ........ ........ ........ ........ 65% 2,03M 2s - 6144K ........ ........ ........ ........ ........ ........ 98% 2,18M 0s - 9216K . 100% 2,50M=5,1s + 0K ........ ........ ........ ........ ........ ........ 32% 603K 10s + 3072K ........ ........ ........ ........ ........ ........ 65% 841K 5s + 6144K ........ ........ ........ ........ ........ ........ 98% 591K 0s + 9216K . 100% 1.24M=14s -2019-03-24 22:25:01 (1,79 MB/s) - «./Firebird-3.0.0.32483-0.tar.bz2» enregistré [9552809/9552809] +2019-04-29 12:18:17 (665 KB/s) - ‘./Firebird-3.0.0.32483-0.tar.bz2’ saved [9552809/9552809] ---2019-03-24 22:25:01-- https://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1624683 (1,5M) [application/octet-stream] -Enregistre : «./fontconfig-2.12.6.tar.bz2» +--2019-04-29 12:18:17-- https://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1624683 (1.5M) [application/octet-stream] +Saving to: ‘./fontconfig-2.12.6.tar.bz2’ - 0K ........ ........ ........ 100% 2,03M=0,8s + 0K ........ ........ ........ 100% 679K=2.3s -2019-03-24 22:25:02 (2,03 MB/s) - «./fontconfig-2.12.6.tar.bz2» enregistré [1624683/1624683] +2019-04-29 12:18:20 (679 KB/s) - ‘./fontconfig-2.12.6.tar.bz2’ saved [1624683/1624683] ---2019-03-24 22:25:02-- https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 516132 (504K) [application/octet-stream] -Enregistre : «./libfreehand-0.1.2.tar.xz» +--2019-04-29 12:18:20-- https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 516132 (504K) [application/octet-stream] +Saving to: ‘./libfreehand-0.1.2.tar.xz’ - 0K ....... 100% 1,82M=0,3s + 0K ....... 100% 912K=0.6s -2019-03-24 22:25:02 (1,82 MB/s) - «./libfreehand-0.1.2.tar.xz» enregistré [516132/516132] +2019-04-29 12:18:21 (912 KB/s) - ‘./libfreehand-0.1.2.tar.xz’ saved [516132/516132] ---2019-03-24 22:25:03-- https://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1886443 (1,8M) [application/octet-stream] -Enregistre : «./freetype-2.8.1.tar.bz2» +--2019-04-29 12:18:21-- https://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1886443 (1.8M) [application/octet-stream] +Saving to: ‘./freetype-2.8.1.tar.bz2’ - 0K ........ ........ ........ .... 100% 2,08M=0,9s + 0K ........ ........ ........ .... 100% 850K=2.2s -2019-03-24 22:25:04 (2,08 MB/s) - «./freetype-2.8.1.tar.bz2» enregistré [1886443/1886443] +2019-04-29 12:18:23 (850 KB/s) - ‘./freetype-2.8.1.tar.bz2’ saved [1886443/1886443] ---2019-03-24 22:25:04-- https://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 810044 (791K) [application/octet-stream] -Enregistre : «./libepoxy-1.5.2.tar.xz» +--2019-04-29 12:18:23-- https://dev-www.libreoffice.org/src/libepoxy-1.5.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 810044 (791K) [application/octet-stream] +Saving to: ‘./libepoxy-1.5.2.tar.xz’ - 0K ........ .... 100% 1,77M=0,4s + 0K ........ .... 100% 741K=1.1s -2019-03-24 22:25:04 (1,77 MB/s) - «./libepoxy-1.5.2.tar.xz» enregistré [810044/810044] +2019-04-29 12:18:25 (741 KB/s) - ‘./libepoxy-1.5.2.tar.xz’ saved [810044/810044] ---2019-03-24 22:25:04-- https://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5290295 (5,0M) [application/zip] -Enregistre : «./bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip» +--2019-04-29 12:18:25-- https://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5290295 (5.0M) [application/zip] +Saving to: ‘./bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip’ - 0K ........ ........ ........ ........ ........ ........ 59% 1,23M 2s - 3072K ........ ........ ........ ........ 100% 2,48M=3,3s + 0K ........ ........ ........ ........ ........ ........ 59% 823K 3s + 3072K ........ ........ ........ ........ 100% 1.03M=5.7s -2019-03-24 22:25:08 (1,54 MB/s) - «./bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip» enregistré [5290295/5290295] +2019-04-29 12:18:31 (903 KB/s) - ‘./bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip’ saved [5290295/5290295] ---2019-03-24 22:25:08-- https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1344222 (1,3M) [application/octet-stream] -Enregistre : «./gpgme-1.9.0.tar.bz2» +--2019-04-29 12:18:31-- https://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1344222 (1.3M) [application/octet-stream] +Saving to: ‘./gpgme-1.9.0.tar.bz2’ - 0K ........ ........ .... 100% 1,73M=0,7s + 0K ........ ........ .... 100% 1.35M=0.9s -2019-03-24 22:25:09 (1,73 MB/s) - «./gpgme-1.9.0.tar.bz2» enregistré [1344222/1344222] +2019-04-29 12:18:32 (1.35 MB/s) - ‘./gpgme-1.9.0.tar.bz2’ saved [1344222/1344222] ---2019-03-24 22:25:09-- https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 155690 (152K) [application/octet-stream] -Enregistre : «./graphite2-minimal-1.3.10.tgz» +--2019-04-29 12:18:32-- https://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 155690 (152K) [application/octet-stream] +Saving to: ‘./graphite2-minimal-1.3.10.tgz’ - 0K .. 100% 1,49M=0,1s + 0K .. 100% 1.11M=0.1s -2019-03-24 22:25:10 (1,49 MB/s) - «./graphite2-minimal-1.3.10.tgz» enregistré [155690/155690] +2019-04-29 12:18:33 (1.11 MB/s) - ‘./graphite2-minimal-1.3.10.tgz’ saved [155690/155690] ---2019-03-24 22:25:10-- https://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 3829479 (3,7M) [application/octet-stream] -Enregistre : «./harfbuzz-1.8.4.tar.bz2» +--2019-04-29 12:18:33-- https://dev-www.libreoffice.org/src/harfbuzz-1.8.4.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 3829479 (3.7M) [application/octet-stream] +Saving to: ‘./harfbuzz-1.8.4.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 82% 2,48M 0s - 3072K ........ .. 100% 3,26M=1,4s + 0K ........ ........ ........ ........ ........ ........ 82% 1.28M 1s + 3072K ........ .. 100% 1.25M=2.9s -2019-03-24 22:25:11 (2,59 MB/s) - «./harfbuzz-1.8.4.tar.bz2» enregistré [3829479/3829479] +2019-04-29 12:18:36 (1.27 MB/s) - ‘./harfbuzz-1.8.4.tar.bz2’ saved [3829479/3829479] ---2019-03-24 22:25:11-- https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 3519470 (3,4M) [application/zip] -Enregistre : «./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip» +--2019-04-29 12:18:36-- https://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 3519470 (3.4M) [application/zip] +Saving to: ‘./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip’ - 0K ........ ........ ........ ........ ........ ........ 89% 2,30M 0s - 3072K ..... 100% 2,74M=1,4s + 0K ........ ........ ........ ........ ........ ........ 89% 1.17M 0s + 3072K ..... 100% 1.42M=2.8s -2019-03-24 22:25:13 (2,34 MB/s) - «./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip» enregistré [3519470/3519470] +2019-04-29 12:18:39 (1.19 MB/s) - ‘./17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip’ saved [3519470/3519470] ---2019-03-24 22:25:13-- https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 938142 (916K) [application/octet-stream] -Enregistre : «./hunspell-1.7.0.tar.gz» +--2019-04-29 12:18:39-- https://dev-www.libreoffice.org/src/hunspell-1.7.0.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 938142 (916K) [application/octet-stream] +Saving to: ‘./hunspell-1.7.0.tar.gz’ - 0K ........ ...... 100% 2,09M=0,4s + 0K ........ ...... 100% 1.11M=0.8s -2019-03-24 22:25:14 (2,09 MB/s) - «./hunspell-1.7.0.tar.gz» enregistré [938142/938142] +2019-04-29 12:18:40 (1.11 MB/s) - ‘./hunspell-1.7.0.tar.gz’ saved [938142/938142] ---2019-03-24 22:25:14-- https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 638369 (623K) [application/octet-stream] -Enregistre : «./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz» +--2019-04-29 12:18:40-- https://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 638369 (623K) [application/octet-stream] +Saving to: ‘./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz’ - 0K ........ . 100% 1,56M=0,4s + 0K ........ . 100% 937K=0.7s -2019-03-24 22:25:14 (1,56 MB/s) - «./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz» enregistré [638369/638369] +2019-04-29 12:18:41 (937 KB/s) - ‘./5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz’ saved [638369/638369] ---2019-03-24 22:25:15-- https://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 23746939 (23M) [application/octet-stream] -Enregistre : «./icu4c-63_1-src.tgz» +--2019-04-29 12:18:41-- https://dev-www.libreoffice.org/src/icu4c-63_1-src.tgz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 23746939 (23M) [application/octet-stream] +Saving to: ‘./icu4c-63_1-src.tgz’ - 0K ........ ........ ........ ........ ........ ........ 13% 1,48M 13s - 3072K ........ ........ ........ ........ ........ ........ 26% 1,52M 11s - 6144K ........ ........ ........ ........ ........ ........ 39% 1,38M 9s - 9216K ........ ........ ........ ........ ........ ........ 52% 1,66M 7s - 12288K ........ ........ ........ ........ ........ ........ 66% 1,47M 5s - 15360K ........ ........ ........ ........ ........ ........ 79% 1,25M 3s - 18432K ........ ........ ........ ........ ........ ........ 92% 1,95M 1s - 21504K ........ ........ ........ .. 100% 2,41M=15s + 0K ........ ........ ........ ........ ........ ........ 13% 1.29M 15s + 3072K ........ ........ ........ ........ ........ ........ 26% 931K 16s + 6144K ........ ........ ........ ........ ........ ........ 39% 947K 13s + 9216K ........ ........ ........ ........ ........ ........ 52% 928K 11s + 12288K ........ ........ ........ ........ ........ ........ 66% 1.08M 8s + 15360K ........ ........ ........ ........ ........ ........ 79% 1.01M 5s + 18432K ........ ........ ........ ........ ........ ........ 92% 1.16M 2s + 21504K ........ ........ ........ .. 100% 1.09M=22s -2019-03-24 22:25:29 (1,55 MB/s) - «./icu4c-63_1-src.tgz» enregistré [23746939/23746939] +2019-04-29 12:19:03 (1.03 MB/s) - ‘./icu4c-63_1-src.tgz’ saved [23746939/23746939] ---2019-03-24 22:25:30-- https://dev-www.libreoffice.org/src/icu4c-63_1-data.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 16229251 (15M) [application/zip] -Enregistre : «./icu4c-63_1-data.zip» +--2019-04-29 12:19:03-- https://dev-www.libreoffice.org/src/icu4c-63_1-data.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 16229251 (15M) [application/zip] +Saving to: ‘./icu4c-63_1-data.zip’ - 0K ........ ........ ........ ........ ........ ........ 19% 1,44M 9s - 3072K ........ ........ ........ ........ ........ ........ 38% 2,00M 6s - 6144K ........ ........ ........ ........ ........ ........ 58% 1,89M 4s - 9216K ........ ........ ........ ........ ........ ........ 77% 1,79M 2s - 12288K ........ ........ ........ ........ ........ ........ 96% 1,44M 0s - 15360K ....... 100% 1,55M=9,2s + 0K ........ ........ ........ ........ ........ ........ 19% 868K 15s + 3072K ........ ........ ........ ........ ........ ........ 38% 1.32M 9s + 6144K ........ ........ ........ ........ ........ ........ 58% 1.43M 6s + 9216K ........ ........ ........ ........ ........ ........ 77% 1.78M 3s + 12288K ........ ........ ........ ........ ........ ........ 96% 1.62M 0s + 15360K ....... 100% 1.23M=12s -2019-03-24 22:25:39 (1,67 MB/s) - «./icu4c-63_1-data.zip» enregistré [16229251/16229251] +2019-04-29 12:19:16 (1.31 MB/s) - ‘./icu4c-63_1-data.zip’ saved [16229251/16229251] ---2019-03-24 22:25:39-- https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 743031 (726K) [application/zip] -Enregistre : «./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip» +--2019-04-29 12:19:16-- https://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 743031 (726K) [application/zip] +Saving to: ‘./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip’ - 0K ........ ... 100% 1,63M=0,4s + 0K ........ ... 100% 1.37M=0.5s -2019-03-24 22:25:40 (1,63 MB/s) - «./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip» enregistré [743031/743031] +2019-04-29 12:19:17 (1.37 MB/s) - ‘./ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip’ saved [743031/743031] ---2019-03-24 22:25:40-- https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 207563 (203K) [application/zip] -Enregistre : «./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip» +--2019-04-29 12:19:17-- https://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 207563 (203K) [application/zip] +Saving to: ‘./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip’ - 0K ... 100% 1,25M=0,2s + 0K ... 100% 1.07M=0.2s -2019-03-24 22:25:40 (1,25 MB/s) - «./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip» enregistré [207563/207563] +2019-04-29 12:19:17 (1.07 MB/s) - ‘./d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip’ saved [207563/207563] ---2019-03-24 22:25:40-- https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 427800 (418K) [application/zip] -Enregistre : «./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip» +--2019-04-29 12:19:17-- https://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 427800 (418K) [application/zip] +Saving to: ‘./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip’ - 0K ...... 100% 962K=0,4s + 0K ...... 100% 1.03M=0.4s -2019-03-24 22:25:41 (962 KB/s) - «./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip» enregistré [427800/427800] +2019-04-29 12:19:18 (1.03 MB/s) - ‘./eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip’ saved [427800/427800] ---2019-03-24 22:25:41-- https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5750610 (5,5M) [application/zip] -Enregistre : «./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip» +--2019-04-29 12:19:18-- https://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5750610 (5.5M) [application/zip] +Saving to: ‘./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip’ - 0K ........ ........ ........ ........ ........ ........ 54% 1,02M 2s - 3072K ........ ........ ........ ........ ....... 100% 1,38M=4,8s + 0K ........ ........ ........ ........ ........ ........ 54% 1.61M 2s + 3072K ........ ........ ........ ........ ....... 100% 1.52M=3.5s -2019-03-24 22:25:46 (1,15 MB/s) - «./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip» enregistré [5750610/5750610] +2019-04-29 12:19:21 (1.57 MB/s) - ‘./3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip’ saved [5750610/5750610] ---2019-03-24 22:25:46-- https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1180582 (1,1M) [application/zip] -Enregistre : «./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip» +--2019-04-29 12:19:22-- https://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1180582 (1.1M) [application/zip] +Saving to: ‘./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip’ - 0K ........ ........ .. 100% 1,03M=1,1s + 0K ........ ........ .. 100% 1.85M=0.6s -2019-03-24 22:25:48 (1,03 MB/s) - «./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip» enregistré [1180582/1180582] +2019-04-29 12:19:22 (1.85 MB/s) - ‘./3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip’ saved [1180582/1180582] ---2019-03-24 22:25:48-- https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1396007 (1,3M) [application/zip] -Enregistre : «./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip» +--2019-04-29 12:19:23-- https://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1396007 (1.3M) [application/zip] +Saving to: ‘./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip’ - 0K ........ ........ ..... 100% 625K=2,2s + 0K ........ ........ ..... 100% 1.74M=0.8s -2019-03-24 22:25:50 (625 KB/s) - «./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip» enregistré [1396007/1396007] +2019-04-29 12:19:24 (1.74 MB/s) - ‘./db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip’ saved [1396007/1396007] ---2019-03-24 22:25:50-- https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2938721 (2,8M) [application/zip] -Enregistre : «./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip» +--2019-04-29 12:19:24-- https://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2938721 (2.8M) [application/zip] +Saving to: ‘./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip’ - 0K ........ ........ ........ ........ ........ .... 100% 1,00M=2,8s + 0K ........ ........ ........ ........ ........ .... 100% 1.16M=2.4s -2019-03-24 22:25:54 (1,00 MB/s) - «./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip» enregistré [2938721/2938721] +2019-04-29 12:19:26 (1.16 MB/s) - ‘./97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip’ saved [2938721/2938721] ---2019-03-24 22:25:54-- https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 762419 (745K) [application/zip] -Enregistre : «./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip» +--2019-04-29 12:19:26-- https://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 762419 (745K) [application/zip] +Saving to: ‘./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip’ - 0K ........ ... 100% 1023K=0,7s + 0K ........ ... 100% 1.16M=0.6s -2019-03-24 22:25:55 (1023 KB/s) - «./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip» enregistré [762419/762419] +2019-04-29 12:19:27 (1.16 MB/s) - ‘./8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip’ saved [762419/762419] ---2019-03-24 22:25:55-- https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 211919 (207K) [application/zip] -Enregistre : «./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip» +--2019-04-29 12:19:27-- https://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 211919 (207K) [application/zip] +Saving to: ‘./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip’ - 0K ... 100% 885K=0,2s + 0K ... 100% 956K=0.2s -2019-03-24 22:25:55 (885 KB/s) - «./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip» enregistré [211919/211919] +2019-04-29 12:19:28 (956 KB/s) - ‘./f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip’ saved [211919/211919] ---2019-03-24 22:25:55-- https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2929311 (2,8M) [application/zip] -Enregistre : «./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip» +--2019-04-29 12:19:28-- https://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2929311 (2.8M) [application/zip] +Saving to: ‘./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip’ - 0K ........ ........ ........ ........ ........ .... 100% 1,65M=1,7s + 0K ........ ........ ........ ........ ........ .... 100% 1.28M=2.2s -2019-03-24 22:25:57 (1,65 MB/s) - «./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip» enregistré [2929311/2929311] +2019-04-29 12:19:30 (1.28 MB/s) - ‘./ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip’ saved [2929311/2929311] ---2019-03-24 22:25:57-- https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 153157 (150K) [application/zip] -Enregistre : «./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip» +--2019-04-29 12:19:30-- https://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 153157 (150K) [application/zip] +Saving to: ‘./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip’ - 0K .. 100% 1,64M=0,09s + 0K .. 100% 979K=0.2s -2019-03-24 22:25:58 (1,64 MB/s) - «./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip» enregistré [153157/153157] +2019-04-29 12:19:31 (979 KB/s) - ‘./39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip’ saved [153157/153157] ---2019-03-24 22:25:58-- https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1658672 (1,6M) [application/octet-stream] -Enregistre : «./libjpeg-turbo-1.5.3.tar.gz» +--2019-04-29 12:19:31-- https://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.3.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1658672 (1.6M) [application/octet-stream] +Saving to: ‘./libjpeg-turbo-1.5.3.tar.gz’ - 0K ........ ........ ........ . 100% 2,09M=0,8s + 0K ........ ........ ........ . 100% 944K=1.7s -2019-03-24 22:25:59 (2,09 MB/s) - «./libjpeg-turbo-1.5.3.tar.gz» enregistré [1658672/1658672] +2019-04-29 12:19:33 (944 KB/s) - ‘./libjpeg-turbo-1.5.3.tar.gz’ saved [1658672/1658672] ---2019-03-24 22:25:59-- https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 37482428 (36M) [application/octet-stream] -Enregistre : «./b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2» +--2019-04-29 12:19:33-- https://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 37482428 (36M) [application/octet-stream] +Saving to: ‘./b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 8% 2,05M 16s - 3072K ........ ........ ........ ........ ........ ........ 16% 1,27M 19s - 6144K ........ ........ ........ ........ ........ ........ 25% 1,82M 16s - 9216K ........ ........ ........ ........ ........ ........ 33% 1,79M 14s - 12288K ........ ........ ........ ........ ........ ........ 41% 1,67M 12s - 15360K ........ ........ ........ ........ ........ ........ 50% 1,37M 11s - 18432K ........ ........ ........ ........ ........ ........ 58% 1,93M 9s - 21504K ........ ........ ........ ........ ........ ........ 67% 1,79M 7s - 24576K ........ ........ ........ ........ ........ ........ 75% 1,76M 5s - 27648K ........ ........ ........ ........ ........ ........ 83% 1,87M 3s - 30720K ........ ........ ........ ........ ........ ........ 92% 1,18M 2s - 33792K ........ ........ ........ ........ ........ ... 100% 1,48M=22s + 0K ........ ........ ........ ........ ........ ........ 8% 1.11M 29s + 3072K ........ ........ ........ ........ ........ ........ 16% 1.40M 24s + 6144K ........ ........ ........ ........ ........ ........ 25% 1.08M 23s + 9216K ........ ........ ........ ........ ........ ........ 33% 1.52M 19s + 12288K ........ ........ ........ ........ ........ ........ 41% 1.30M 16s + 15360K ........ ........ ........ ........ ........ ........ 50% 1.14M 14s + 18432K ........ ........ ........ ........ ........ ........ 58% 1.31M 12s + 21504K ........ ........ ........ ........ ........ ........ 67% 1.56M 9s + 24576K ........ ........ ........ ........ ........ ........ 75% 1.37M 7s + 27648K ........ ........ ........ ........ ........ ........ 83% 1.32M 4s + 30720K ........ ........ ........ ........ ........ ........ 92% 970K 2s + 33792K ........ ........ ........ ........ ........ ... 100% 1.19M=29s -2019-03-24 22:26:21 (1,62 MB/s) - «./b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2» enregistré [37482428/37482428] +2019-04-29 12:20:02 (1.25 MB/s) - ‘./b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2’ saved [37482428/37482428] ---2019-03-24 22:26:21-- https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 10974649 (10M) [application/octet-stream] -Enregistre : «./lcms2-2.9.tar.gz» +--2019-04-29 12:20:02-- https://dev-www.libreoffice.org/src/lcms2-2.9.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 10974649 (10M) [application/octet-stream] +Saving to: ‘./lcms2-2.9.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 28% 1,57M 5s - 3072K ........ ........ ........ ........ ........ ........ 57% 1,41M 3s - 6144K ........ ........ ........ ........ ........ ........ 85% 1,19M 1s - 9216K ........ ........ ....... 100% 1,57M=7,5s + 0K ........ ........ ........ ........ ........ ........ 28% 907K 8s + 3072K ........ ........ ........ ........ ........ ........ 57% 968K 5s + 6144K ........ ........ ........ ........ ........ ........ 85% 1.21M 1s + 9216K ........ ........ ....... 100% 1.18M=10s -2019-03-24 22:26:29 (1,40 MB/s) - «./lcms2-2.9.tar.gz» enregistré [10974649/10974649] +2019-04-29 12:20:13 (1.02 MB/s) - ‘./lcms2-2.9.tar.gz’ saved [10974649/10974649] ---2019-03-24 22:26:29-- https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 503550 (492K) [application/octet-stream] -Enregistre : «./libatomic_ops-7.6.8.tar.gz» +--2019-04-29 12:20:13-- https://dev-www.libreoffice.org/src/libatomic_ops-7.6.8.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 503550 (492K) [application/octet-stream] +Saving to: ‘./libatomic_ops-7.6.8.tar.gz’ - 0K ....... 100% 1,22M=0,4s + 0K ....... 100% 1.13M=0.4s -2019-03-24 22:26:30 (1,22 MB/s) - «./libatomic_ops-7.6.8.tar.gz» enregistré [503550/503550] +2019-04-29 12:20:13 (1.13 MB/s) - ‘./libatomic_ops-7.6.8.tar.gz’ saved [503550/503550] ---2019-03-24 22:26:30-- https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 564857 (552K) [application/octet-stream] -Enregistre : «./libassuan-2.5.1.tar.bz2» +--2019-04-29 12:20:13-- https://dev-www.libreoffice.org/src/libassuan-2.5.1.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 564857 (552K) [application/octet-stream] +Saving to: ‘./libassuan-2.5.1.tar.bz2’ - 0K ........ 100% 1,27M=0,4s + 0K ........ 100% 1.29M=0.4s -2019-03-24 22:26:31 (1,27 MB/s) - «./libassuan-2.5.1.tar.bz2» enregistré [564857/564857] +2019-04-29 12:20:14 (1.29 MB/s) - ‘./libassuan-2.5.1.tar.bz2’ saved [564857/564857] ---2019-03-24 22:26:31-- https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 260288 (254K) [application/octet-stream] -Enregistre : «./libeot-0.01.tar.bz2» +--2019-04-29 12:20:14-- https://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 260288 (254K) [application/octet-stream] +Saving to: ‘./libeot-0.01.tar.bz2’ - 0K ... 100% 1,11M=0,2s + 0K ... 100% 945K=0.3s -2019-03-24 22:26:31 (1,11 MB/s) - «./libeot-0.01.tar.bz2» enregistré [260288/260288] +2019-04-29 12:20:15 (945 KB/s) - ‘./libeot-0.01.tar.bz2’ saved [260288/260288] ---2019-03-24 22:26:31-- https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1041268 (1017K) [application/octet-stream] -Enregistre : «./libexttextcat-3.4.5.tar.xz» +--2019-04-29 12:20:15-- https://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1041268 (1017K) [application/octet-stream] +Saving to: ‘./libexttextcat-3.4.5.tar.xz’ - 0K ........ ....... 100% 648K=1,6s + 0K ........ ....... 100% 1.22M=0.8s -2019-03-24 22:26:33 (648 KB/s) - «./libexttextcat-3.4.5.tar.xz» enregistré [1041268/1041268] +2019-04-29 12:20:16 (1.22 MB/s) - ‘./libexttextcat-3.4.5.tar.xz’ saved [1041268/1041268] ---2019-03-24 22:26:33-- https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 813060 (794K) [application/octet-stream] -Enregistre : «./libgpg-error-1.27.tar.bz2» +--2019-04-29 12:20:16-- https://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 813060 (794K) [application/octet-stream] +Saving to: ‘./libgpg-error-1.27.tar.bz2’ - 0K ........ .... 100% 810K=1,0s + 0K ........ .... 100% 1.27M=0.6s -2019-03-24 22:26:34 (810 KB/s) - «./libgpg-error-1.27.tar.bz2» enregistré [813060/813060] +2019-04-29 12:20:17 (1.27 MB/s) - ‘./libgpg-error-1.27.tar.bz2’ saved [813060/813060] ---2019-03-24 22:26:34-- https://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 75201 (73K) [application/octet-stream] -Enregistre : «./language-subtag-registry-2018-04-23.tar.bz2» +--2019-04-29 12:20:17-- https://dev-www.libreoffice.org/src/language-subtag-registry-2018-04-23.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 75201 (73K) [application/octet-stream] +Saving to: ‘./language-subtag-registry-2018-04-23.tar.bz2’ - 0K . 100% 861K=0,09s + 0K . 100% 1.42M=0.05s -2019-03-24 22:26:35 (861 KB/s) - «./language-subtag-registry-2018-04-23.tar.bz2» enregistré [75201/75201] +2019-04-29 12:20:17 (1.42 MB/s) - ‘./language-subtag-registry-2018-04-23.tar.bz2’ saved [75201/75201] ---2019-03-24 22:26:35-- https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 766080 (748K) [application/octet-stream] -Enregistre : «./liblangtag-0.6.2.tar.bz2» +--2019-04-29 12:20:17-- https://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 766080 (748K) [application/octet-stream] +Saving to: ‘./liblangtag-0.6.2.tar.bz2’ - 0K ........ ... 100% 953K=0,8s + 0K ........ ... 100% 1.23M=0.6s -2019-03-24 22:26:36 (953 KB/s) - «./liblangtag-0.6.2.tar.bz2» enregistré [766080/766080] +2019-04-29 12:20:18 (1.23 MB/s) - ‘./liblangtag-0.6.2.tar.bz2’ saved [766080/766080] ---2019-03-24 22:26:36-- https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 281640 (275K) [application/octet-stream] -Enregistre : «./libnumbertext-1.0.5.tar.xz» +--2019-04-29 12:20:18-- https://dev-www.libreoffice.org/src/libnumbertext-1.0.5.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 281640 (275K) [application/octet-stream] +Saving to: ‘./libnumbertext-1.0.5.tar.xz’ - 0K .... 100% 780K=0,4s + 0K .... 100% 1.03M=0.3s -2019-03-24 22:26:37 (780 KB/s) - «./libnumbertext-1.0.5.tar.xz» enregistré [281640/281640] +2019-04-29 12:20:19 (1.03 MB/s) - ‘./libnumbertext-1.0.5.tar.xz’ saved [281640/281640] ---2019-03-24 22:26:37-- https://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 997968 (975K) [application/octet-stream] -Enregistre : «./libpng-1.6.34.tar.xz» +--2019-04-29 12:20:19-- https://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 997968 (975K) [application/octet-stream] +Saving to: ‘./libpng-1.6.34.tar.xz’ - 0K ........ ....... 100% 1,02M=0,9s + 0K ........ ....... 100% 1.09M=0.9s -2019-03-24 22:26:38 (1,02 MB/s) - «./libpng-1.6.34.tar.xz» enregistré [997968/997968] +2019-04-29 12:20:20 (1.09 MB/s) - ‘./libpng-1.6.34.tar.xz’ saved [997968/997968] ---2019-03-24 22:26:38-- https://dev-www.libreoffice.org/src/ltm-1.0.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2542693 (2,4M) [application/zip] -Enregistre : «./ltm-1.0.zip» +--2019-04-29 12:20:20-- https://dev-www.libreoffice.org/src/ltm-1.0.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2542693 (2.4M) [application/zip] +Saving to: ‘./ltm-1.0.zip’ - 0K ........ ........ ........ ........ ...... 100% 1,75M=1,4s + 0K ........ ........ ........ ........ ...... 100% 1.19M=2.0s -2019-03-24 22:26:39 (1,75 MB/s) - «./ltm-1.0.zip» enregistré [2542693/2542693] +2019-04-29 12:20:22 (1.19 MB/s) - ‘./ltm-1.0.zip’ saved [2542693/2542693] ---2019-03-24 22:26:40-- https://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5476717 (5,2M) [application/octet-stream] -Enregistre : «./libxml2-2.9.9.tar.gz» +--2019-04-29 12:20:22-- https://dev-www.libreoffice.org/src/libxml2-2.9.9.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5476717 (5.2M) [application/octet-stream] +Saving to: ‘./libxml2-2.9.9.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 57% 1,87M 1s - 3072K ........ ........ ........ ........ ... 100% 2,28M=2,6s + 0K ........ ........ ........ ........ ........ ........ 57% 973K 2s + 3072K ........ ........ ........ ........ ... 100% 1.30M=4.9s -2019-03-24 22:26:42 (2,03 MB/s) - «./libxml2-2.9.9.tar.gz» enregistré [5476717/5476717] +2019-04-29 12:20:27 (1.07 MB/s) - ‘./libxml2-2.9.9.tar.gz’ saved [5476717/5476717] ---2019-03-24 22:26:42-- https://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2013651 (1,9M) [application/octet-stream] -Enregistre : «./xmlsec1-1.2.27.tar.gz» +--2019-04-29 12:20:27-- https://dev-www.libreoffice.org/src/xmlsec1-1.2.27.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2013651 (1.9M) [application/octet-stream] +Saving to: ‘./xmlsec1-1.2.27.tar.gz’ - 0K ........ ........ ........ ...... 100% 2,46M=0,8s + 0K ........ ........ ........ ...... 100% 1.53M=1.3s -2019-03-24 22:26:43 (2,46 MB/s) - «./xmlsec1-1.2.27.tar.gz» enregistré [2013651/2013651] +2019-04-29 12:20:29 (1.53 MB/s) - ‘./xmlsec1-1.2.27.tar.gz’ saved [2013651/2013651] ---2019-03-24 22:26:44-- https://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 3444093 (3,3M) [application/octet-stream] -Enregistre : «./libxslt-1.1.33.tar.gz» +--2019-04-29 12:20:29-- https://dev-www.libreoffice.org/src/libxslt-1.1.33.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 3444093 (3.3M) [application/octet-stream] +Saving to: ‘./libxslt-1.1.33.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 91% 2,20M 0s - 3072K .... 100% 2,79M=1,5s + 0K ........ ........ ........ ........ ........ ........ 91% 1.27M 0s + 3072K .... 100% 850K=2.7s -2019-03-24 22:26:45 (2,24 MB/s) - «./libxslt-1.1.33.tar.gz» enregistré [3444093/3444093] +2019-04-29 12:20:32 (1.21 MB/s) - ‘./libxslt-1.1.33.tar.gz’ saved [3444093/3444093] ---2019-03-24 22:26:45-- https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 769268 (751K) [application/octet-stream] -Enregistre : «./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz» +--2019-04-29 12:20:32-- https://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 769268 (751K) [application/octet-stream] +Saving to: ‘./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz’ - 0K ........ ... 100% 2,38M=0,3s + 0K ........ ... 100% 572K=1.3s -2019-03-24 22:26:46 (2,38 MB/s) - «./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz» enregistré [769268/769268] +2019-04-29 12:20:34 (572 KB/s) - ‘./26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz’ saved [769268/769268] ---2019-03-24 22:26:46-- https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2380804 (2,3M) [application/octet-stream] -Enregistre : «./lxml-4.1.1.tgz» +--2019-04-29 12:20:34-- https://dev-www.libreoffice.org/src/lxml-4.1.1.tgz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2380804 (2.3M) [application/octet-stream] +Saving to: ‘./lxml-4.1.1.tgz’ - 0K ........ ........ ........ ........ .... 100% 1,77M=1,3s + 0K ........ ........ ........ ........ .... 100% 658K=3.5s -2019-03-24 22:26:48 (1,77 MB/s) - «./lxml-4.1.1.tgz» enregistré [2380804/2380804] +2019-04-29 12:20:38 (658 KB/s) - ‘./lxml-4.1.1.tgz’ saved [2380804/2380804] ---2019-03-24 22:26:48-- https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1923436 (1,8M) [application/octet-stream] -Enregistre : «./a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz» +--2019-04-29 12:20:38-- https://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1923436 (1.8M) [application/octet-stream] +Saving to: ‘./a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz’ - 0K ........ ........ ........ ..... 100% 2,25M=0,8s + 0K ........ ........ ........ ..... 100% 862K=2.2s -2019-03-24 22:26:49 (2,25 MB/s) - «./a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz» enregistré [1923436/1923436] +2019-04-29 12:20:40 (862 KB/s) - ‘./a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz’ saved [1923436/1923436] ---2019-03-24 22:26:49-- https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 334515 (327K) [application/octet-stream] -Enregistre : «./mdds-1.4.3.tar.bz2» +--2019-04-29 12:20:40-- https://dev-www.libreoffice.org/src/mdds-1.4.3.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 334515 (327K) [application/octet-stream] +Saving to: ‘./mdds-1.4.3.tar.bz2’ - 0K ..... 100% 1,56M=0,2s + 0K ..... 100% 561K=0.6s -2019-03-24 22:26:49 (1,56 MB/s) - «./mdds-1.4.3.tar.bz2» enregistré [334515/334515] +2019-04-29 12:20:41 (561 KB/s) - ‘./mdds-1.4.3.tar.bz2’ saved [334515/334515] ---2019-03-24 22:26:49-- https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2537410 (2,4M) [application/octet-stream] -Enregistre : «./mDNSResponder-878.200.35.tar.gz» +--2019-04-29 12:20:41-- https://dev-www.libreoffice.org/src/mDNSResponder-878.200.35.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2537410 (2.4M) [application/octet-stream] +Saving to: ‘./mDNSResponder-878.200.35.tar.gz’ - 0K ........ ........ ........ ........ ...... 100% 1,46M=1,7s + 0K ........ ........ ........ ........ ...... 100% 1.09M=2.2s -2019-03-24 22:26:51 (1,46 MB/s) - «./mDNSResponder-878.200.35.tar.gz» enregistré [2537410/2537410] +2019-04-29 12:20:43 (1.09 MB/s) - ‘./mDNSResponder-878.200.35.tar.gz’ saved [2537410/2537410] ---2019-03-24 22:26:51-- https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 112756 (110K) [application/octet-stream] -Enregistre : «./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz» +--2019-04-29 12:20:44-- https://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 112756 (110K) [application/octet-stream] +Saving to: ‘./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz’ - 0K . 100% 1,18M=0,09s + 0K . 100% 844K=0.1s -2019-03-24 22:26:52 (1,18 MB/s) - «./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz» enregistré [112756/112756] +2019-04-29 12:20:44 (844 KB/s) - ‘./368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz’ saved [112756/112756] ---2019-03-24 22:26:52-- https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1169488 (1,1M) [application/octet-stream] -Enregistre : «./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz» +--2019-04-29 12:20:44-- https://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1169488 (1.1M) [application/octet-stream] +Saving to: ‘./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz’ - 0K ........ ........ . 100% 1,41M=0,8s + 0K ........ ........ . 100% 1.09M=1.0s -2019-03-24 22:26:53 (1,41 MB/s) - «./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz» enregistré [1169488/1169488] +2019-04-29 12:20:45 (1.09 MB/s) - ‘./c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz’ saved [1169488/1169488] ---2019-03-24 22:26:53-- https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5522795 (5,3M) [application/zip] -Enregistre : «./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip» +--2019-04-29 12:20:45-- https://dev-www.libreoffice.org/src/33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5522795 (5.3M) [application/zip] +Saving to: ‘./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip’ - 0K ........ ........ ........ ........ ........ ........ 56% 1,65M 1s - 3072K ........ ........ ........ ........ .... 100% 1,69M=3,2s + 0K ........ ........ ........ ........ ........ ........ 56% 2.02M 1s + 3072K ........ ........ ........ ........ .... 100% 2.07M=2.6s -2019-03-24 22:26:56 (1,66 MB/s) - «./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip» enregistré [5522795/5522795] +2019-04-29 12:20:48 (2.04 MB/s) - ‘./33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip’ saved [5522795/5522795] ---2019-03-24 22:26:56-- https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 811606 (793K) [application/zip] -Enregistre : «./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip» +--2019-04-29 12:20:48-- https://dev-www.libreoffice.org/src/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 811606 (793K) [application/zip] +Saving to: ‘./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip’ - 0K ........ .... 100% 1,61M=0,5s + 0K ........ .... 100% 1.84M=0.4s -2019-03-24 22:26:57 (1,61 MB/s) - «./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip» enregistré [811606/811606] +2019-04-29 12:20:49 (1.84 MB/s) - ‘./1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip’ saved [811606/811606] ---2019-03-24 22:26:57-- https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 300832 (294K) [application/octet-stream] -Enregistre : «./liberation-narrow-fonts-ttf-1.07.6.tar.gz» +--2019-04-29 12:20:49-- https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 300832 (294K) [application/octet-stream] +Saving to: ‘./liberation-narrow-fonts-ttf-1.07.6.tar.gz’ - 0K .... 100% 1,64M=0,2s + 0K .... 100% 1.69M=0.2s -2019-03-24 22:26:58 (1,64 MB/s) - «./liberation-narrow-fonts-ttf-1.07.6.tar.gz» enregistré [300832/300832] +2019-04-29 12:20:49 (1.69 MB/s) - ‘./liberation-narrow-fonts-ttf-1.07.6.tar.gz’ saved [300832/300832] ---2019-03-24 22:26:58-- https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2355235 (2,2M) [application/octet-stream] -Enregistre : «./liberation-fonts-ttf-2.00.4.tar.gz» +--2019-04-29 12:20:49-- https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2355235 (2.2M) [application/octet-stream] +Saving to: ‘./liberation-fonts-ttf-2.00.4.tar.gz’ - 0K ........ ........ ........ ........ ... 100% 1,76M=1,3s + 0K ........ ........ ........ ........ ... 100% 2.11M=1.1s -2019-03-24 22:26:59 (1,76 MB/s) - «./liberation-fonts-ttf-2.00.4.tar.gz» enregistré [2355235/2355235] +2019-04-29 12:20:51 (2.11 MB/s) - ‘./liberation-fonts-ttf-2.00.4.tar.gz’ saved [2355235/2355235] ---2019-03-24 22:26:59-- https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 6651982 (6,3M) [application/zip] -Enregistre : «./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip» +--2019-04-29 12:20:51-- https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 6651982 (6.3M) [application/zip] +Saving to: ‘./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip’ - 0K ........ ........ ........ ........ ........ ........ 47% 1,64M 2s - 3072K ........ ........ ........ ........ ........ ........ 94% 1,23M 0s - 6144K ..... 100% 1,16M=4,6s + 0K ........ ........ ........ ........ ........ ........ 47% 1.65M 2s + 3072K ........ ........ ........ ........ ........ ........ 94% 1.45M 0s + 6144K ..... 100% 1.31M=4.1s -2019-03-24 22:27:04 (1,39 MB/s) - «./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip» enregistré [6651982/6651982] +2019-04-29 12:20:55 (1.53 MB/s) - ‘./e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip’ saved [6651982/6651982] ---2019-03-24 22:27:04-- https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1338551 (1,3M) [application/octet-stream] -Enregistre : «./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz» +--2019-04-29 12:20:55-- https://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1338551 (1.3M) [application/octet-stream] +Saving to: ‘./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz’ - 0K ........ ........ .... 100% 1,42M=0,9s + 0K ........ ........ .... 100% 1.15M=1.1s -2019-03-24 22:27:05 (1,42 MB/s) - «./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz» enregistré [1338551/1338551] +2019-04-29 12:20:57 (1.15 MB/s) - ‘./907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz’ saved [1338551/1338551] ---2019-03-24 22:27:05-- https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1098827 (1,0M) [application/octet-stream] -Enregistre : «./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz» +--2019-04-29 12:20:57-- https://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1098827 (1.0M) [application/octet-stream] +Saving to: ‘./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz’ - 0K ........ ........ 100% 1,31M=0,8s + 0K ........ ........ 100% 886K=1.2s -2019-03-24 22:27:06 (1,31 MB/s) - «./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz» enregistré [1098827/1098827] +2019-04-29 12:20:58 (886 KB/s) - ‘./edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz’ saved [1098827/1098827] ---2019-03-24 22:27:06-- https://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 820083 (801K) [application/octet-stream] -Enregistre : «./source-serif-font-2.007R.tar.gz» +--2019-04-29 12:20:58-- https://dev-www.libreoffice.org/src/source-serif-font-2.007R.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 820083 (801K) [application/octet-stream] +Saving to: ‘./source-serif-font-2.007R.tar.gz’ - 0K ........ .... 100% 1,05M=0,7s + 0K ........ .... 100% 1.01M=0.8s -2019-03-24 22:27:07 (1,05 MB/s) - «./source-serif-font-2.007R.tar.gz» enregistré [820083/820083] +2019-04-29 12:20:59 (1.01 MB/s) - ‘./source-serif-font-2.007R.tar.gz’ saved [820083/820083] ---2019-03-24 22:27:07-- https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2961759 (2,8M) [application/octet-stream] -Enregistre : «./EmojiOneColor-SVGinOT-1.3.tar.gz» +--2019-04-29 12:21:00-- https://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2961759 (2.8M) [application/octet-stream] +Saving to: ‘./EmojiOneColor-SVGinOT-1.3.tar.gz’ - 0K ........ ........ ........ ........ ........ ..... 100% 1,27M=2,2s + 0K ........ ........ ........ ........ ........ ..... 100% 871K=3.3s -2019-03-24 22:27:10 (1,27 MB/s) - «./EmojiOneColor-SVGinOT-1.3.tar.gz» enregistré [2961759/2961759] +2019-04-29 12:21:03 (871 KB/s) - ‘./EmojiOneColor-SVGinOT-1.3.tar.gz’ saved [2961759/2961759] ---2019-03-24 22:27:10-- https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 6646182 (6,3M) [application/octet-stream] -Enregistre : «./noto-fonts-20171024.tar.gz» +--2019-04-29 12:21:03-- https://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 6646182 (6.3M) [application/octet-stream] +Saving to: ‘./noto-fonts-20171024.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 47% 1,21M 3s - 3072K ........ ........ ........ ........ ........ ........ 94% 1,55M 0s - 6144K ..... 100% 1,72M=4,6s + 0K ........ ........ ........ ........ ........ ........ 47% 1.04M 3s + 3072K ........ ........ ........ ........ ........ ........ 94% 772K 0s + 6144K ..... 100% 1.17M=7.1s -2019-03-24 22:27:15 (1,37 MB/s) - «./noto-fonts-20171024.tar.gz» enregistré [6646182/6646182] +2019-04-29 12:21:11 (909 KB/s) - ‘./noto-fonts-20171024.tar.gz’ saved [6646182/6646182] ---2019-03-24 22:27:15-- https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1076737 (1,0M) [application/octet-stream] -Enregistre : «./culmus-0.131.tar.gz» +--2019-04-29 12:21:11-- https://dev-www.libreoffice.org/src/culmus-0.131.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1076737 (1.0M) [application/octet-stream] +Saving to: ‘./culmus-0.131.tar.gz’ - 0K ........ ........ 100% 1,12M=0,9s + 0K ........ ........ 100% 1.22M=0.8s -2019-03-24 22:27:16 (1,12 MB/s) - «./culmus-0.131.tar.gz» enregistré [1076737/1076737] +2019-04-29 12:21:12 (1.22 MB/s) - ‘./culmus-0.131.tar.gz’ saved [1076737/1076737] ---2019-03-24 22:27:16-- https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 531276 (519K) [application/octet-stream] -Enregistre : «./libre-hebrew-1.0.tar.gz» +--2019-04-29 12:21:12-- https://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 531276 (519K) [application/octet-stream] +Saving to: ‘./libre-hebrew-1.0.tar.gz’ - 0K ........ 100% 1,14M=0,4s + 0K ........ 100% 1.17M=0.4s -2019-03-24 22:27:17 (1,14 MB/s) - «./libre-hebrew-1.0.tar.gz» enregistré [531276/531276] +2019-04-29 12:21:12 (1.17 MB/s) - ‘./libre-hebrew-1.0.tar.gz’ saved [531276/531276] ---2019-03-24 22:27:17-- https://dev-www.libreoffice.org/src/alef-1.001.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 93498 (91K) [application/octet-stream] -Enregistre : «./alef-1.001.tar.gz» +--2019-04-29 12:21:13-- https://dev-www.libreoffice.org/src/alef-1.001.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 93498 (91K) [application/octet-stream] +Saving to: ‘./alef-1.001.tar.gz’ - 0K . 100% 975K=0,09s + 0K . 100% 1.05M=0.09s -2019-03-24 22:27:17 (975 KB/s) - «./alef-1.001.tar.gz» enregistré [93498/93498] +2019-04-29 12:21:13 (1.05 MB/s) - ‘./alef-1.001.tar.gz’ saved [93498/93498] ---2019-03-24 22:27:17-- https://dev-www.libreoffice.org/src/Amiri-0.111.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1423863 (1,4M) [application/zip] -Enregistre : «./Amiri-0.111.zip» +--2019-04-29 12:21:13-- https://dev-www.libreoffice.org/src/Amiri-0.111.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1423863 (1.4M) [application/zip] +Saving to: ‘./Amiri-0.111.zip’ - 0K ........ ........ ..... 100% 1,35M=1,0s + 0K ........ ........ ..... 100% 1.50M=0.9s -2019-03-24 22:27:19 (1,35 MB/s) - «./Amiri-0.111.zip» enregistré [1423863/1423863] +2019-04-29 12:21:14 (1.50 MB/s) - ‘./Amiri-0.111.zip’ saved [1423863/1423863] ---2019-03-24 22:27:19-- https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 407400 (398K) [application/octet-stream] -Enregistre : «./ttf-kacst_2.01+mry.tar.gz» +--2019-04-29 12:21:14-- https://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 407400 (398K) [application/octet-stream] +Saving to: ‘./ttf-kacst_2.01+mry.tar.gz’ - 0K ...... 100% 1,22M=0,3s + 0K ...... 100% 1.73M=0.2s -2019-03-24 22:27:19 (1,22 MB/s) - «./ttf-kacst_2.01+mry.tar.gz» enregistré [407400/407400] +2019-04-29 12:21:15 (1.73 MB/s) - ‘./ttf-kacst_2.01+mry.tar.gz’ saved [407400/407400] ---2019-03-24 22:27:19-- https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 153832 (150K) [application/zip] -Enregistre : «./ReemKufi-0.7.zip» +--2019-04-29 12:21:15-- https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 153832 (150K) [application/zip] +Saving to: ‘./ReemKufi-0.7.zip’ - 0K .. 100% 1,01M=0,1s + 0K .. 100% 1.73M=0.08s -2019-03-24 22:27:20 (1,01 MB/s) - «./ReemKufi-0.7.zip» enregistré [153832/153832] +2019-04-29 12:21:15 (1.73 MB/s) - ‘./ReemKufi-0.7.zip’ saved [153832/153832] ---2019-03-24 22:27:20-- https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1114645 (1,1M) [application/zip] -Enregistre : «./Scheherazade-2.100.zip» +--2019-04-29 12:21:15-- https://dev-www.libreoffice.org/src/Scheherazade-2.100.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1114645 (1.1M) [application/zip] +Saving to: ‘./Scheherazade-2.100.zip’ - 0K ........ ........ . 100% 1,41M=0,8s + 0K ........ ........ . 100% 1.29M=0.8s -2019-03-24 22:27:21 (1,41 MB/s) - «./Scheherazade-2.100.zip» enregistré [1114645/1114645] +2019-04-29 12:21:16 (1.29 MB/s) - ‘./Scheherazade-2.100.zip’ saved [1114645/1114645] ---2019-03-24 22:27:21-- https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 377472 (369K) [application/octet-stream] -Enregistre : «./libmspub-0.1.4.tar.xz» +--2019-04-29 12:21:16-- https://dev-www.libreoffice.org/src/libmspub-0.1.4.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 377472 (369K) [application/octet-stream] +Saving to: ‘./libmspub-0.1.4.tar.xz’ - 0K ..... 100% 1,30M=0,3s + 0K ..... 100% 807K=0.5s -2019-03-24 22:27:21 (1,30 MB/s) - «./libmspub-0.1.4.tar.xz» enregistré [377472/377472] +2019-04-29 12:21:17 (807 KB/s) - ‘./libmspub-0.1.4.tar.xz’ saved [377472/377472] ---2019-03-24 22:27:21-- https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1276240 (1,2M) [application/octet-stream] -Enregistre : «./libmwaw-0.3.14.tar.xz» +--2019-04-29 12:21:17-- https://dev-www.libreoffice.org/src/libmwaw-0.3.14.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1276240 (1.2M) [application/octet-stream] +Saving to: ‘./libmwaw-0.3.14.tar.xz’ - 0K ........ ........ ... 100% 713K=1,7s + 0K ........ ........ ... 100% 1.28M=1.0s -2019-03-24 22:27:23 (713 KB/s) - «./libmwaw-0.3.14.tar.xz» enregistré [1276240/1276240] +2019-04-29 12:21:18 (1.28 MB/s) - ‘./libmwaw-0.3.14.tar.xz’ saved [1276240/1276240] ---2019-03-24 22:27:24-- https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 4910303 (4,7M) [application/octet-stream] -Enregistre : «./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz» +--2019-04-29 12:21:18-- https://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 4910303 (4.7M) [application/octet-stream] +Saving to: ‘./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 64% 1,98M 1s - 3072K ........ ........ ........ .. 100% 3,71M=2,0s + 0K ........ ........ ........ ........ ........ ........ 64% 1.38M 1s + 3072K ........ ........ ........ .. 100% 1.46M=3.3s -2019-03-24 22:27:26 (2,38 MB/s) - «./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz» enregistré [4910303/4910303] +2019-04-29 12:21:22 (1.41 MB/s) - ‘./a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz’ saved [4910303/4910303] ---2019-03-24 22:27:26-- https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 932779 (911K) [application/octet-stream] -Enregistre : «./neon-0.30.2.tar.gz» +--2019-04-29 12:21:22-- https://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 932779 (911K) [application/octet-stream] +Saving to: ‘./neon-0.30.2.tar.gz’ - 0K ........ ...... 100% 1,86M=0,5s + 0K ........ ...... 100% 1.19M=0.7s -2019-03-24 22:27:27 (1,86 MB/s) - «./neon-0.30.2.tar.gz» enregistré [932779/932779] +2019-04-29 12:21:23 (1.19 MB/s) - ‘./neon-0.30.2.tar.gz’ saved [932779/932779] ---2019-03-24 22:27:27-- https://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 24423714 (23M) [application/octet-stream] -Enregistre : «./nss-3.38-with-nspr-4.19.tar.gz» +--2019-04-29 12:21:23-- https://dev-www.libreoffice.org/src/nss-3.38-with-nspr-4.19.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 24423714 (23M) [application/octet-stream] +Saving to: ‘./nss-3.38-with-nspr-4.19.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 12% 1,69M 12s - 3072K ........ ........ ........ ........ ........ ........ 25% 1,49M 11s - 6144K ........ ........ ........ ........ ........ ........ 38% 1,09M 10s - 9216K ........ ........ ........ ........ ........ ........ 51% 1,47M 8s - 12288K ........ ........ ........ ........ ........ ........ 64% 1,94M 6s - 15360K ........ ........ ........ ........ ........ ........ 77% 1,88M 3s - 18432K ........ ........ ........ ........ ........ ........ 90% 1,81M 1s - 21504K ........ ........ ........ ........ .... 100% 1,86M=15s + 0K ........ ........ ........ ........ ........ ........ 12% 1.58M 13s + 3072K ........ ........ ........ ........ ........ ........ 25% 1013K 14s + 6144K ........ ........ ........ ........ ........ ........ 38% 968K 13s + 9216K ........ ........ ........ ........ ........ ........ 51% 1.01M 10s + 12288K ........ ........ ........ ........ ........ ........ 64% 1.38M 7s + 15360K ........ ........ ........ ........ ........ ........ 77% 1.48M 4s + 18432K ........ ........ ........ ........ ........ ........ 90% 1.74M 2s + 21504K ........ ........ ........ ........ .... 100% 1.58M=18s -2019-03-24 22:27:42 (1,59 MB/s) - «./nss-3.38-with-nspr-4.19.tar.gz» enregistré [24423714/24423714] +2019-04-29 12:21:42 (1.26 MB/s) - ‘./nss-3.38-with-nspr-4.19.tar.gz’ saved [24423714/24423714] ---2019-03-24 22:27:42-- https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 446705 (436K) [application/octet-stream] -Enregistre : «./libodfgen-0.1.6.tar.bz2» +--2019-04-29 12:21:42-- https://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 446705 (436K) [application/octet-stream] +Saving to: ‘./libodfgen-0.1.6.tar.bz2’ - 0K ...... 100% 1,39M=0,3s + 0K ...... 100% 1.09M=0.4s -2019-03-24 22:27:42 (1,39 MB/s) - «./libodfgen-0.1.6.tar.bz2» enregistré [446705/446705] +2019-04-29 12:21:42 (1.09 MB/s) - ‘./libodfgen-0.1.6.tar.bz2’ saved [446705/446705] ---2019-03-24 22:27:42-- https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5672845 (5,4M) [application/octet-stream] -Enregistre : «./openldap-2.4.45.tgz» +--2019-04-29 12:21:43-- https://dev-www.libreoffice.org/src/openldap-2.4.45.tgz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5672845 (5.4M) [application/octet-stream] +Saving to: ‘./openldap-2.4.45.tgz’ - 0K ........ ........ ........ ........ ........ ........ 55% 2,17M 1s - 3072K ........ ........ ........ ........ ...... 100% 1,55M=2,9s + 0K ........ ........ ........ ........ ........ ........ 55% 1.03M 2s + 3072K ........ ........ ........ ........ ...... 100% 1.20M=4.9s -2019-03-24 22:27:46 (1,84 MB/s) - «./openldap-2.4.45.tgz» enregistré [5672845/5672845] +2019-04-29 12:21:48 (1.10 MB/s) - ‘./openldap-2.4.45.tgz’ saved [5672845/5672845] ---2019-03-24 22:27:46-- https://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 5348369 (5,1M) [application/octet-stream] -Enregistre : «./openssl-1.0.2r.tar.gz» +--2019-04-29 12:21:48-- https://dev-www.libreoffice.org/src/openssl-1.0.2r.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 5348369 (5.1M) [application/octet-stream] +Saving to: ‘./openssl-1.0.2r.tar.gz’ - 0K ........ ........ ........ ........ ........ ........ 58% 1,74M 1s - 3072K ........ ........ ........ ........ . 100% 1,48M=3,1s + 0K ........ ........ ........ ........ ........ ........ 58% 1.35M 2s + 3072K ........ ........ ........ ........ . 100% 1.08M=4.2s -2019-03-24 22:27:49 (1,62 MB/s) - «./openssl-1.0.2r.tar.gz» enregistré [5348369/5348369] +2019-04-29 12:21:52 (1.22 MB/s) - ‘./openssl-1.0.2r.tar.gz’ saved [5348369/5348369] ---2019-03-24 22:27:49-- https://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2454001 (2,3M) [application/octet-stream] -Enregistre : «./liborcus-0.14.1.tar.gz» +--2019-04-29 12:21:52-- https://dev-www.libreoffice.org/src/liborcus-0.14.1.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2454001 (2.3M) [application/octet-stream] +Saving to: ‘./liborcus-0.14.1.tar.gz’ - 0K ........ ........ ........ ........ ..... 100% 1,28M=1,8s + 0K ........ ........ ........ ........ ..... 100% 1.27M=1.8s -2019-03-24 22:27:51 (1,28 MB/s) - «./liborcus-0.14.1.tar.gz» enregistré [2454001/2454001] +2019-04-29 12:21:54 (1.27 MB/s) - ‘./liborcus-0.14.1.tar.gz’ saved [2454001/2454001] ---2019-03-24 22:27:51-- https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 760676 (743K) [application/octet-stream] -Enregistre : «./owncloud-android-library-0.9.4-no-binary-deps.tar.gz» +--2019-04-29 12:21:54-- https://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 760676 (743K) [application/octet-stream] +Saving to: ‘./owncloud-android-library-0.9.4-no-binary-deps.tar.gz’ - 0K ........ ... 100% 1,35M=0,5s + 0K ........ ... 100% 1.43M=0.5s -2019-03-24 22:27:52 (1,35 MB/s) - «./owncloud-android-library-0.9.4-no-binary-deps.tar.gz» enregistré [760676/760676] +2019-04-29 12:21:55 (1.43 MB/s) - ‘./owncloud-android-library-0.9.4-no-binary-deps.tar.gz’ saved [760676/760676] ---2019-03-24 22:27:52-- https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 306496 (299K) [application/octet-stream] -Enregistre : «./libpagemaker-0.0.4.tar.xz» +--2019-04-29 12:21:55-- https://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 306496 (299K) [application/octet-stream] +Saving to: ‘./libpagemaker-0.0.4.tar.xz’ - 0K .... 100% 1,01M=0,3s + 0K .... 100% 1.34M=0.2s -2019-03-24 22:27:53 (1,01 MB/s) - «./libpagemaker-0.0.4.tar.xz» enregistré [306496/306496] +2019-04-29 12:21:56 (1.34 MB/s) - ‘./libpagemaker-0.0.4.tar.xz’ saved [306496/306496] ---2019-03-24 22:27:53-- https://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 6923846 (6,6M) [application/octet-stream] -Enregistre : «./pdfium-3550.tar.bz2» +--2019-04-29 12:21:56-- https://dev-www.libreoffice.org/src/pdfium-3550.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 6923846 (6.6M) [application/octet-stream] +Saving to: ‘./pdfium-3550.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 45% 977K 4s - 3072K ........ ........ ........ ........ ........ ........ 90% 1,21M 1s - 6144K ........ . 100% 1,69M=6,0s + 0K ........ ........ ........ ........ ........ ........ 45% 1.55M 2s + 3072K ........ ........ ........ ........ ........ ........ 90% 1.78M 0s + 6144K ........ . 100% 2.17M=3.9s -2019-03-24 22:27:59 (1,10 MB/s) - «./pdfium-3550.tar.bz2» enregistré [6923846/6923846] +2019-04-29 12:22:00 (1.69 MB/s) - ‘./pdfium-3550.tar.bz2’ saved [6923846/6923846] ---2019-03-24 22:27:59-- https://dev-www.libreoffice.org/src/poppler-0.73.0.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1507068 (1,4M) [application/octet-stream] -Enregistre : «./poppler-0.73.0.tar.xz» +--2019-04-29 12:22:00-- https://dev-www.libreoffice.org/src/poppler-0.74.0.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1514044 (1.4M) [application/octet-stream] +Saving to: ‘./poppler-0.74.0.tar.xz’ - 0K ........ ........ ...... 100% 1,46M=1,0s + 0K ........ ........ ....... 100% 1.71M=0.8s -2019-03-24 22:28:00 (1,46 MB/s) - «./poppler-0.73.0.tar.xz» enregistré [1507068/1507068] +2019-04-29 12:22:01 (1.71 MB/s) - ‘./poppler-0.74.0.tar.xz’ saved [1514044/1514044] ---2019-03-24 22:28:00-- https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 16552576 (16M) [application/octet-stream] -Enregistre : «./postgresql-9.2.24.tar.bz2» +--2019-04-29 12:22:01-- https://dev-www.libreoffice.org/src/postgresql-9.2.24.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 16552576 (16M) [application/octet-stream] +Saving to: ‘./postgresql-9.2.24.tar.bz2’ - 0K ........ ........ ........ ........ ........ ........ 19% 1,18M 11s - 3072K ........ ........ ........ ........ ........ ........ 38% 1,04M 9s - 6144K ........ ........ ........ ........ ........ ........ 57% 1012K 6s - 9216K ........ ........ ........ ........ ........ ........ 76% 1,54M 3s - 12288K ........ ........ ........ ........ ........ ........ 95% 1,77M 1s - 15360K ........ .... 100% 2,05M=12s + 0K ........ ........ ........ ........ ........ ........ 19% 1.58M 8s + 3072K ........ ........ ........ ........ ........ ........ 38% 1.62M 6s + 6144K ........ ........ ........ ........ ........ ........ 57% 1.51M 4s + 9216K ........ ........ ........ ........ ........ ........ 76% 1.87M 2s + 12288K ........ ........ ........ ........ ........ ........ 95% 1.94M 0s + 15360K ........ .... 100% 2.34M=9.2s -2019-03-24 22:28:13 (1,26 MB/s) - «./postgresql-9.2.24.tar.bz2» enregistré [16552576/16552576] +2019-04-29 12:22:11 (1.71 MB/s) - ‘./postgresql-9.2.24.tar.bz2’ saved [16552576/16552576] ---2019-03-24 22:28:13-- https://dev-www.libreoffice.org/src/Python-3.5.6.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 15412832 (15M) [application/octet-stream] -Enregistre : «./Python-3.5.6.tar.xz» +--2019-04-29 12:22:11-- https://dev-www.libreoffice.org/src/Python-3.5.7.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 15324736 (15M) [application/octet-stream] +Saving to: ‘./Python-3.5.7.tar.xz’ - 0K ........ ........ ........ ........ ........ ........ 20% 1000K 12s - 3072K ........ ........ ........ ........ ........ ........ 40% 1,09M 8s - 6144K ........ ........ ........ ........ ........ ........ 61% 1,49M 5s - 9216K ........ ........ ........ ........ ........ ........ 81% 1,67M 2s - 12288K ........ ........ ........ ........ ........ ... 100% 1,93M=11s + 0K ........ ........ ........ ........ ........ ........ 20% 1.07M 11s + 3072K ........ ........ ........ ........ ........ ........ 41% 953K 9s + 6144K ........ ........ ........ ........ ........ ........ 61% 1.22M 5s + 9216K ........ ........ ........ ........ ........ ........ 82% 1.40M 2s + 12288K ........ ........ ........ ........ ........ . 100% 1.44M=12s -2019-03-24 22:28:25 (1,33 MB/s) - «./Python-3.5.6.tar.xz» enregistré [15412832/15412832] +2019-04-29 12:22:24 (1.17 MB/s) - ‘./Python-3.5.7.tar.xz’ saved [15324736/15324736] ---2019-03-24 22:28:25-- https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 341760 (334K) [application/octet-stream] -Enregistre : «./libqxp-0.0.2.tar.xz» +--2019-04-29 12:22:24-- https://dev-www.libreoffice.org/src/libqxp-0.0.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 341760 (334K) [application/octet-stream] +Saving to: ‘./libqxp-0.0.2.tar.xz’ - 0K ..... 100% 1,31M=0,2s + 0K ..... 100% 1.02M=0.3s -2019-03-24 22:28:26 (1,31 MB/s) - «./libqxp-0.0.2.tar.xz» enregistré [341760/341760] +2019-04-29 12:22:24 (1.02 MB/s) - ‘./libqxp-0.0.2.tar.xz’ saved [341760/341760] ---2019-03-24 22:28:26-- https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1886657 (1,8M) [application/octet-stream] -Enregistre : «./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz» +--2019-04-29 12:22:24-- https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1886657 (1.8M) [application/octet-stream] +Saving to: ‘./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz’ - 0K ........ ........ ........ .... 100% 1,86M=1,0s + 0K ........ ........ ........ .... 100% 1.49M=1.2s -2019-03-24 22:28:27 (1,86 MB/s) - «./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz» enregistré [1886657/1886657] +2019-04-29 12:22:26 (1.49 MB/s) - ‘./a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz’ saved [1886657/1886657] ---2019-03-24 22:28:27-- https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1595647 (1,5M) [application/octet-stream] -Enregistre : «./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz» +--2019-04-29 12:22:26-- https://dev-www.libreoffice.org/src/1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1595647 (1.5M) [application/octet-stream] +Saving to: ‘./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz’ - 0K ........ ........ ........ 100% 1,55M=1,0s + 0K ........ ........ ........ 100% 1.81M=0.8s -2019-03-24 22:28:28 (1,55 MB/s) - «./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz» enregistré [1595647/1595647] +2019-04-29 12:22:27 (1.81 MB/s) - ‘./1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz’ saved [1595647/1595647] ---2019-03-24 22:28:28-- https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1621566 (1,5M) [application/octet-stream] -Enregistre : «./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz» +--2019-04-29 12:22:27-- https://dev-www.libreoffice.org/src/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1621566 (1.5M) [application/octet-stream] +Saving to: ‘./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz’ - 0K ........ ........ ........ 100% 1,85M=0,8s + 0K ........ ........ ........ 100% 2.37M=0.7s -2019-03-24 22:28:29 (1,85 MB/s) - «./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz» enregistré [1621566/1621566] +2019-04-29 12:22:28 (2.37 MB/s) - ‘./e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz’ saved [1621566/1621566] ---2019-03-24 22:28:29-- https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 529833 (517K) [application/octet-stream] -Enregistre : «./librevenge-0.0.4.tar.bz2» +--2019-04-29 12:22:28-- https://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 529833 (517K) [application/octet-stream] +Saving to: ‘./librevenge-0.0.4.tar.bz2’ - 0K ........ 100% 1,42M=0,4s + 0K ........ 100% 1.73M=0.3s -2019-03-24 22:28:30 (1,42 MB/s) - «./librevenge-0.0.4.tar.bz2» enregistré [529833/529833] +2019-04-29 12:22:29 (1.73 MB/s) - ‘./librevenge-0.0.4.tar.bz2’ saved [529833/529833] ---2019-03-24 22:28:30-- https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 1521926 (1,5M) [application/zip] -Enregistre : «./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip» +--2019-04-29 12:22:29-- https://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 1521926 (1.5M) [application/zip] +Saving to: ‘./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip’ - 0K ........ ........ ....... 100% 1,39M=1,0s + 0K ........ ........ ....... 100% 2.31M=0.6s -2019-03-24 22:28:31 (1,39 MB/s) - «./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip» enregistré [1521926/1521926] +2019-04-29 12:22:30 (2.31 MB/s) - ‘./798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip’ saved [1521926/1521926] ---2019-03-24 22:28:31-- https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 9796 (9,6K) [application/zip] -Enregistre : «./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip» +--2019-04-29 12:22:30-- https://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 9796 (9.6K) [application/zip] +Saving to: ‘./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip’ - 0K 100% 89,7M=0s + 0K 100% 149M=0s -2019-03-24 22:28:32 (89,7 MB/s) - «./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip» enregistré [9796/9796] +2019-04-29 12:22:30 (149 MB/s) - ‘./35c94d2df8893241173de1d16b6034c0-swingExSrc.zip’ saved [9796/9796] ---2019-03-24 22:28:32-- https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2 -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 190464 (186K) [application/octet-stream] -Enregistre : «./serf-1.2.1.tar.bz2» +--2019-04-29 12:22:30-- https://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2 +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 190464 (186K) [application/octet-stream] +Saving to: ‘./serf-1.2.1.tar.bz2’ - 0K .. 100% 1,21M=0,2s + 0K .. 100% 1.94M=0.09s -2019-03-24 22:28:32 (1,21 MB/s) - «./serf-1.2.1.tar.bz2» enregistré [190464/190464] +2019-04-29 12:22:30 (1.94 MB/s) - ‘./serf-1.2.1.tar.bz2’ saved [190464/190464] ---2019-03-24 22:28:32-- https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 706324 (690K) [application/octet-stream] -Enregistre : «./libstaroffice-0.0.6.tar.xz» +--2019-04-29 12:22:30-- https://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 706324 (690K) [application/octet-stream] +Saving to: ‘./libstaroffice-0.0.6.tar.xz’ - 0K ........ .. 100% 802K=0,9s + 0K ........ .. 100% 1.64M=0.4s -2019-03-24 22:28:33 (802 KB/s) - «./libstaroffice-0.0.6.tar.xz» enregistré [706324/706324] +2019-04-29 12:22:31 (1.64 MB/s) - ‘./libstaroffice-0.0.6.tar.xz’ saved [706324/706324] ---2019-03-24 22:28:33-- https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 96939 (95K) [application/octet-stream] -Enregistre : «./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz» +--2019-04-29 12:22:31-- https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 96939 (95K) [application/octet-stream] +Saving to: ‘./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz’ - 0K . 100% 991K=0,1s + 0K . 100% 1.99M=0.05s -2019-03-24 22:28:34 (991 KB/s) - «./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz» enregistré [96939/96939] +2019-04-29 12:22:31 (1.99 MB/s) - ‘./0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz’ saved [96939/96939] ---2019-03-24 22:28:34-- https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 676396 (661K) [application/octet-stream] -Enregistre : «./libvisio-0.1.6.tar.xz» +--2019-04-29 12:22:31-- https://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 676396 (661K) [application/octet-stream] +Saving to: ‘./libvisio-0.1.6.tar.xz’ - 0K ........ .. 100% 947K=0,7s + 0K ........ .. 100% 1.66M=0.4s -2019-03-24 22:28:35 (947 KB/s) - «./libvisio-0.1.6.tar.xz» enregistré [676396/676396] +2019-04-29 12:22:32 (1.66 MB/s) - ‘./libvisio-0.1.6.tar.xz’ saved [676396/676396] ---2019-03-24 22:28:35-- https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 534712 (522K) [application/octet-stream] -Enregistre : «./libwpd-0.10.3.tar.xz» +--2019-04-29 12:22:32-- https://dev-www.libreoffice.org/src/libwpd-0.10.3.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 534712 (522K) [application/octet-stream] +Saving to: ‘./libwpd-0.10.3.tar.xz’ - 0K ........ 100% 1,16M=0,4s + 0K ........ 100% 1.06M=0.5s -2019-03-24 22:28:35 (1,16 MB/s) - «./libwpd-0.10.3.tar.xz» enregistré [534712/534712] +2019-04-29 12:22:33 (1.06 MB/s) - ‘./libwpd-0.10.3.tar.xz’ saved [534712/534712] ---2019-03-24 22:28:36-- https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 328664 (321K) [application/octet-stream] -Enregistre : «./libwpg-0.3.3.tar.xz» +--2019-04-29 12:22:33-- https://dev-www.libreoffice.org/src/libwpg-0.3.3.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 328664 (321K) [application/octet-stream] +Saving to: ‘./libwpg-0.3.3.tar.xz’ - 0K ..... 100% 954K=0,3s + 0K ..... 100% 1.26M=0.2s -2019-03-24 22:28:36 (954 KB/s) - «./libwpg-0.3.3.tar.xz» enregistré [328664/328664] +2019-04-29 12:22:33 (1.26 MB/s) - ‘./libwpg-0.3.3.tar.xz’ saved [328664/328664] ---2019-03-24 22:28:36-- https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 695448 (679K) [application/octet-stream] -Enregistre : «./libwps-0.4.10.tar.xz» +--2019-04-29 12:22:34-- https://dev-www.libreoffice.org/src/libwps-0.4.10.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 695448 (679K) [application/octet-stream] +Saving to: ‘./libwps-0.4.10.tar.xz’ - 0K ........ .. 100% 1,03M=0,6s + 0K ........ .. 100% 1.17M=0.6s -2019-03-24 22:28:37 (1,03 MB/s) - «./libwps-0.4.10.tar.xz» enregistré [695448/695448] +2019-04-29 12:22:34 (1.17 MB/s) - ‘./libwps-0.4.10.tar.xz’ saved [695448/695448] ---2019-03-24 22:28:37-- https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 23150 (23K) [application/zip] -Enregistre : «./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip» +--2019-04-29 12:22:34-- https://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 23150 (23K) [application/zip] +Saving to: ‘./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip’ - 0K 100% 120M=0s + 0K 100% 224M=0s -2019-03-24 22:28:37 (120 MB/s) - «./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip» enregistré [23150/23150] +2019-04-29 12:22:35 (224 MB/s) - ‘./a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip’ saved [23150/23150] ---2019-03-24 22:28:37-- https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 467960 (457K) [application/octet-stream] -Enregistre : «./zlib-1.2.11.tar.xz» +--2019-04-29 12:22:35-- https://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 467960 (457K) [application/octet-stream] +Saving to: ‘./zlib-1.2.11.tar.xz’ - 0K ....... 100% 875K=0,5s + 0K ....... 100% 1.23M=0.4s -2019-03-24 22:28:38 (875 KB/s) - «./zlib-1.2.11.tar.xz» enregistré [467960/467960] +2019-04-29 12:22:35 (1.23 MB/s) - ‘./zlib-1.2.11.tar.xz’ saved [467960/467960] ---2019-03-24 22:28:38-- https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 320952 (313K) [application/octet-stream] -Enregistre : «./libzmf-0.0.2.tar.xz» +--2019-04-29 12:22:35-- https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 320952 (313K) [application/octet-stream] +Saving to: ‘./libzmf-0.0.2.tar.xz’ - 0K .... 100% 930K=0,3s + 0K .... 100% 832K=0.4s -2019-03-24 22:28:39 (930 KB/s) - «./libzmf-0.0.2.tar.xz» enregistré [320952/320952] +2019-04-29 12:22:36 (832 KB/s) - ‘./libzmf-0.0.2.tar.xz’ saved [320952/320952] ---2019-03-24 22:28:39-- https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 12288 (12K) [application/octet-stream] -Enregistre : «./185d60944ea767075d27247c3162b3bc-unowinreg.dll» +--2019-04-29 12:22:36-- https://dev-www.libreoffice.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 12288 (12K) [application/octet-stream] +Saving to: ‘./185d60944ea767075d27247c3162b3bc-unowinreg.dll’ - 0K 100% 219M=0s + 0K 100% 330M=0s -2019-03-24 22:28:39 (219 MB/s) - «./185d60944ea767075d27247c3162b3bc-unowinreg.dll» enregistré [12288/12288] +2019-04-29 12:22:36 (330 MB/s) - ‘./185d60944ea767075d27247c3162b3bc-unowinreg.dll’ saved [12288/12288] ---2019-03-24 22:28:39-- https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 207400 (203K) [application/octet-stream] -Enregistre : «./49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf» +--2019-04-29 12:22:36-- https://dev-www.libreoffice.org/extern/49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 207400 (203K) [application/octet-stream] +Saving to: ‘./49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf’ - 0K ... 100% 879K=0,2s + 0K ... 100% 945K=0.2s -2019-03-24 22:28:40 (879 KB/s) - «./49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf» enregistré [207400/207400] +2019-04-29 12:22:37 (945 KB/s) - ‘./49a64f3bcf20a7909ba2751349231d6652ded9cd2840e961b5164d09de3ffa63-opens___.ttf’ saved [207400/207400] ---2019-03-24 22:28:40-- https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 23988874 (23M) [application/java-archive] -Enregistre : «./odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar» +--2019-04-29 12:22:37-- https://dev-www.libreoffice.org/extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 23988874 (23M) [application/java-archive] +Saving to: ‘./odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar’ - 0K ........ ........ ........ ........ ........ ........ 13% 1,17M 17s - 3072K ........ ........ ........ ........ ........ ........ 26% 1,70M 12s - 6144K ........ ........ ........ ........ ........ ........ 39% 1,98M 9s - 9216K ........ ........ ........ ........ ........ ........ 52% 2,02M 7s - 12288K ........ ........ ........ ........ ........ ........ 65% 2,29M 5s - 15360K ........ ........ ........ ........ ........ ........ 78% 2,49M 3s - 18432K ........ ........ ........ ........ ........ ........ 91% 1,71M 1s - 21504K ........ ........ ........ ...... 100% 1,99M=13s + 0K ........ ........ ........ ........ ........ ........ 13% 1.88M 11s + 3072K ........ ........ ........ ........ ........ ........ 26% 3.42M 7s + 6144K ........ ........ ........ ........ ........ ........ 39% 1.64M 7s + 9216K ........ ........ ........ ........ ........ ........ 52% 1.74M 5s + 12288K ........ ........ ........ ........ ........ ........ 65% 2.19M 4s + 15360K ........ ........ ........ ........ ........ ........ 78% 1.35M 3s + 18432K ........ ........ ........ ........ ........ ........ 91% 1.49M 1s + 21504K ........ ........ ........ ...... 100% 1.19M=13s -2019-03-24 22:28:53 (1,83 MB/s) - «./odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar» enregistré [23988874/23988874] +2019-04-29 12:22:50 (1.73 MB/s) - ‘./odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar’ saved [23988874/23988874] ---2019-03-24 22:28:53-- https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar -Résolution de dev-www.libreoffice.org (dev-www.libreoffice.org)… 89.238.68.201, 2a00:1828:a012:201::1 -Connexion à dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443… connecté. -requête HTTP transmise, en attente de la réponse… 200 OK -Taille : 2448421 (2,3M) [application/java-archive] -Enregistre : «./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar» +--2019-04-29 12:22:51-- https://dev-www.libreoffice.org/extern/8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar +Resolving dev-www.libreoffice.org (dev-www.libreoffice.org)... 89.238.68.201, 2a00:1828:a012:201::1 +Connecting to dev-www.libreoffice.org (dev-www.libreoffice.org)|89.238.68.201|:443... connected. +HTTP request sent, awaiting response... 200 OK +Length: 2448421 (2.3M) [application/java-archive] +Saving to: ‘./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar’ - 0K ........ ........ ........ ........ ..... 100% 1,40M=1,7s + 0K ........ ........ ........ ........ ..... 100% 1.49M=1.6s -2019-03-24 22:28:55 (1,40 MB/s) - «./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar» enregistré [2448421/2448421] +2019-04-29 12:22:52 (1.49 MB/s) - ‘./8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar’ saved [2448421/2448421] Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/tarballs/poppler-0.73.0.tar.xz and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/tarballs/poppler-0.73.0.tar.xz differ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/tarballs/poppler-0.74.0.tar.xz and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/tarballs/poppler-0.74.0.tar.xz differ diff -Nru libreoffice-6.2.2/toolkit/CppunitTest_toolkit.mk libreoffice-6.2.3/toolkit/CppunitTest_toolkit.mk --- libreoffice-6.2.2/toolkit/CppunitTest_toolkit.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/toolkit/CppunitTest_toolkit.mk 2019-04-10 10:10:51.000000000 +0000 @@ -10,6 +10,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,toolkit)) $(eval $(call gb_CppunitTest_add_exception_objects,toolkit, \ + toolkit/qa/cppunit/Dialog \ toolkit/qa/cppunit/UnitConversion \ )) @@ -32,6 +33,10 @@ udkapi \ )) +$(eval $(call gb_CppunitTest_use_externals,toolkit,\ + boost_headers \ +)) + $(eval $(call gb_CppunitTest_use_ure,toolkit)) $(eval $(call gb_CppunitTest_use_configuration,toolkit)) diff -Nru libreoffice-6.2.2/toolkit/qa/cppunit/Dialog.cxx libreoffice-6.2.3/toolkit/qa/cppunit/Dialog.cxx --- libreoffice-6.2.2/toolkit/qa/cppunit/Dialog.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/toolkit/qa/cppunit/Dialog.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,75 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include +#include +#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +using namespace css; + +namespace +{ +/// Test dialogs constructed via UNO +class DialogTest : public test::BootstrapFixture, public unotest::MacrosTest +{ +protected: + uno::Reference mxContext; + +public: + virtual void setUp() override; +}; + +void DialogTest::setUp() +{ + test::BootstrapFixture::setUp(); + + mxContext.set(comphelper::getComponentContext(getMultiServiceFactory())); +} + +CPPUNIT_TEST_FIXTURE(DialogTest, testDialogSizeable) +{ + uno::Reference xDialog; + uno::Reference xFactory(mxContext->getServiceManager(), + uno::UNO_QUERY_THROW); + uno::Reference xControlModel( + xFactory->createInstanceWithContext("com.sun.star.awt.UnoControlDialogModel", mxContext), + uno::UNO_QUERY_THROW); + + uno::Reference xPropSet(xControlModel, uno::UNO_QUERY_THROW); + xPropSet->setPropertyValue("Sizeable", uno::Any(true)); + + uno::Reference xControl = awt::UnoControlDialog::create(mxContext); + xControl->setModel(xControlModel); + uno::Reference xWindow(xControl, uno::UNO_QUERY); + xWindow->setVisible(true); + xDialog.set(xControl, uno::UNO_QUERY_THROW); + xDialog->execute(); + + VclPtr pWindow = VCLUnoHelper::GetWindow(xControl->getPeer()); + CPPUNIT_ASSERT(pWindow); + CPPUNIT_ASSERT(pWindow->GetStyle() & WB_SIZEABLE); + + xDialog->endExecute(); +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/translations/source/ab/editeng/messages.po libreoffice-6.2.3/translations/source/ab/editeng/messages.po --- libreoffice-6.2.2/translations/source/ab/editeng/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/editeng/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-02-27 13:56+0100\n" -"PO-Revision-Date: 2018-07-22 09:19+0000\n" +"PO-Revision-Date: 2019-04-02 09:18+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1532251189.000000\n" +"X-POOTLE-MTIME: 1554196685.000000\n" #: editeng/uiconfig/ui/spellmenu.ui:12 msgctxt "spellmenu|ignore" @@ -305,7 +305,7 @@ #: include/editeng/editrids.hrc:86 msgctxt "RID_SVXITEMS_UL_DASHDOTDOT" msgid "Underline (dot dot dash)" -msgstr "" +msgstr "Аҵшьра (акәаԥ акәаԥ аҵәагәашьҭа)" #: include/editeng/editrids.hrc:87 #, fuzzy @@ -398,12 +398,12 @@ #: include/editeng/editrids.hrc:106 msgctxt "RID_SVXITEMS_OL_DASHDOT" msgid "Overline (dot dash)" -msgstr "" +msgstr "Ақәшьра (акәаԥ аҵәагәашьҭа)" #: include/editeng/editrids.hrc:107 msgctxt "RID_SVXITEMS_OL_DASHDOTDOT" msgid "Overline (dot dot dash)" -msgstr "" +msgstr "Ақәшьра (акәаԥ акәаԥ аҵәагәашьҭа)" #: include/editeng/editrids.hrc:108 #, fuzzy @@ -434,17 +434,17 @@ #: include/editeng/editrids.hrc:113 msgctxt "RID_SVXITEMS_OL_BOLDDASH" msgid "Overline (Dash bold)" -msgstr "" +msgstr "Ақәшьра (ижәпоу аҵәаӷәасҭа)" #: include/editeng/editrids.hrc:114 msgctxt "RID_SVXITEMS_OL_BOLDLONGDASH" msgid "Overline (long dash, bold)" -msgstr "" +msgstr "Ақәшьра (ижәпоу иауу аҵәаӷәасҭа)" #: include/editeng/editrids.hrc:115 msgctxt "RID_SVXITEMS_OL_BOLDDASHDOT" msgid "Overline (dot dash, bold)" -msgstr "" +msgstr "Ақәшьра (ижәпоу акәаԥи аҵәаӷәасҭеи)" #: include/editeng/editrids.hrc:116 msgctxt "RID_SVXITEMS_OL_BOLDDASHDOTDOT" @@ -478,10 +478,9 @@ msgstr "Аҵәаӷәара" #: include/editeng/editrids.hrc:124 -#, fuzzy msgctxt "RID_SVXITEMS_STRIKEOUT_BOLD" msgid "Bold strikethrough" -msgstr "Аҵәаӷәара" +msgstr "Ижәпаны аҵәаӷәара" #: include/editeng/editrids.hrc:125 msgctxt "RID_SVXITEMS_STRIKEOUT_SLASH" @@ -502,12 +501,12 @@ #: include/editeng/editrids.hrc:130 msgctxt "RID_SVXITEMS_CASEMAP_VERSALIEN" msgid "Caps" -msgstr "" +msgstr "Анбан дуқәа" #: include/editeng/editrids.hrc:131 msgctxt "RID_SVXITEMS_CASEMAP_GEMEINE" msgid "Lowercase" -msgstr "" +msgstr "Анбан хәыҷқәа" #: include/editeng/editrids.hrc:132 msgctxt "RID_SVXITEMS_CASEMAP_TITEL" @@ -619,7 +618,7 @@ #: include/editeng/editrids.hrc:157 msgctxt "RID_EMBOSSED" msgid "3D embossed" -msgstr "" +msgstr "3D-арелиеф" #: include/editeng/editrids.hrc:158 msgctxt "RID_ENGRAVED" @@ -690,7 +689,7 @@ #: include/editeng/editrids.hrc:173 msgctxt "RID_SVXITEMS_SHADOWED_TRUE" msgid "Shadowed" -msgstr "" +msgstr "Аршәшьра" #: include/editeng/editrids.hrc:174 msgctxt "RID_SVXITEMS_SHADOWED_FALSE" @@ -750,17 +749,17 @@ #: include/editeng/editrids.hrc:185 msgctxt "RID_SVXITEMS_OPAQUE_TRUE" msgid "Opaque" -msgstr "" +msgstr "Иҵәцам" #: include/editeng/editrids.hrc:186 msgctxt "RID_SVXITEMS_OPAQUE_FALSE" msgid "Not Opaque" -msgstr "" +msgstr "Мҵәцоу" #: include/editeng/editrids.hrc:187 msgctxt "RID_SVXITEMS_FMTKEEP_TRUE" msgid "Keep with next paragraph" -msgstr "" +msgstr "Анаҩстәи абзац иаҟәыҭхатәӡам" #: include/editeng/editrids.hrc:188 msgctxt "RID_SVXITEMS_FMTKEEP_FALSE" @@ -811,12 +810,12 @@ #: include/editeng/editrids.hrc:197 msgctxt "RID_SVXITEMS_TRANSPARENT_TRUE" msgid "Transparent" -msgstr "" +msgstr "Иҵәцоу" #: include/editeng/editrids.hrc:198 msgctxt "RID_SVXITEMS_TRANSPARENT_FALSE" msgid "Not Transparent" -msgstr "" +msgstr "Иҵәцам" #: include/editeng/editrids.hrc:199 msgctxt "RID_SVXITEMS_HYPHEN_TRUE" @@ -851,7 +850,7 @@ #: include/editeng/editrids.hrc:205 msgctxt "RID_SVXITEMS_LRSPACE_LEFT" msgid "Indent left " -msgstr "" +msgstr "Ахьаҵ арымарахь" #: include/editeng/editrids.hrc:206 msgctxt "RID_SVXITEMS_LRSPACE_FLINE" @@ -861,22 +860,22 @@ #: include/editeng/editrids.hrc:207 msgctxt "RID_SVXITEMS_LRSPACE_RIGHT" msgid "Indent right " -msgstr "" +msgstr "Ахьаҵ арыӷьарахь" #: include/editeng/editrids.hrc:208 msgctxt "RID_SVXITEMS_SHADOW_COMPLETE" msgid "Shadow: " -msgstr "" +msgstr "Агага: " #: include/editeng/editrids.hrc:209 msgctxt "RID_SVXITEMS_BORDER_COMPLETE" msgid "Borders " -msgstr "" +msgstr "Аҿыкәырша" #: include/editeng/editrids.hrc:210 msgctxt "RID_SVXITEMS_BORDER_NONE" msgid "No border" -msgstr "" +msgstr "Аҿыкәырша ада" #: include/editeng/editrids.hrc:211 msgctxt "RID_SVXITEMS_BORDER_TOP" @@ -957,12 +956,12 @@ #: include/editeng/editrids.hrc:227 msgctxt "RID_SVXITEMS_KERNING_EXPANDED" msgid "locked " -msgstr "" +msgstr "имҩаркуп " #: include/editeng/editrids.hrc:228 msgctxt "RID_SVXITEMS_KERNING_CONDENSED" msgid "Condensed " -msgstr "" +msgstr "Еиҵацалоу " #: include/editeng/editrids.hrc:229 msgctxt "RID_SVXITEMS_GRAPHIC" @@ -1008,22 +1007,22 @@ #: include/editeng/editrids.hrc:238 msgctxt "RID_SVXITEMS_TWOLINES_OFF" msgid "Double-lined off" -msgstr "" +msgstr "Иаҿых. ҩ-цәаҳәактәи" #: include/editeng/editrids.hrc:239 msgctxt "RID_SVXITEMS_TWOLINES" msgid "Double-lined" -msgstr "" +msgstr "Ҩ-цәаҳәакны аҭагалара" #: include/editeng/editrids.hrc:240 msgctxt "RID_SVXITEMS_SCRPTSPC_OFF" msgid "No automatic character spacing" -msgstr "" +msgstr "Автоматикала адыргабжьаратәи аинтервал ада" #: include/editeng/editrids.hrc:241 msgctxt "RID_SVXITEMS_SCRPTSPC_ON" msgid "No automatic character spacing" -msgstr "" +msgstr "Автоматикала адыргабжьаратәи аинтервал ада" #: include/editeng/editrids.hrc:242 msgctxt "RID_SVXITEMS_HNGPNCT_OFF" @@ -1048,12 +1047,12 @@ #: include/editeng/editrids.hrc:246 msgctxt "RID_SVXITEMS_CHARROTATE_OFF" msgid "No rotated characters" -msgstr "" +msgstr "Иаарҳәу асимволқәа рыда" #: include/editeng/editrids.hrc:247 msgctxt "RID_SVXITEMS_CHARROTATE" msgid "Character rotated by $(ARG1)°" -msgstr "" +msgstr "Иргьежьтәуп асимволқәа $(ARG1)° ала" #: include/editeng/editrids.hrc:248 msgctxt "RID_SVXITEMS_CHARROTATE_FITLINE" @@ -1078,12 +1077,12 @@ #: include/editeng/editrids.hrc:252 msgctxt "RID_SVXITEMS_CHARSCALE_OFF" msgid "No scaled characters" -msgstr "" +msgstr "Асимволқәа рмасштабркрада" #: include/editeng/editrids.hrc:253 msgctxt "RID_SVXITEMS_RELIEF_NONE" msgid "No relief" -msgstr "" +msgstr "Арелиеф ада" #: include/editeng/editrids.hrc:254 msgctxt "RID_SVXITEMS_RELIEF_EMBOSSED" @@ -1194,13 +1193,13 @@ #: include/editeng/editrids.hrc:277 msgctxt "RID_SVXITEMS_HORJUST_REPEAT" msgid "Repeat alignment" -msgstr "" +msgstr "Аиҟаратәра ҽазнык иҟаҵатәуп" #. enum SvxCellVerJustify ---------------------------------------------------- #: include/editeng/editrids.hrc:280 msgctxt "RID_SVXITEMS_VERJUST_STANDARD" msgid "Vertical alignment default" -msgstr "" +msgstr "Вертикалла аиҟаратәра ишыҟәоу еиԥш" #: include/editeng/editrids.hrc:281 msgctxt "RID_SVXITEMS_VERJUST_TOP" diff -Nru libreoffice-6.2.2/translations/source/ab/librelogo/source/pythonpath.po libreoffice-6.2.3/translations/source/ab/librelogo/source/pythonpath.po --- libreoffice-6.2.2/translations/source/ab/librelogo/source/pythonpath.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/librelogo/source/pythonpath.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-04-12 14:14+0200\n" -"PO-Revision-Date: 2018-06-24 09:46+0000\n" +"PO-Revision-Date: 2019-04-09 10:21+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1529833615.000000\n" +"X-POOTLE-MTIME: 1554805307.000000\n" #: LibreLogo_en_US.properties msgctxt "" @@ -112,13 +112,12 @@ msgstr "акәакьҭаиаша" #: LibreLogo_en_US.properties -#, fuzzy msgctxt "" "LibreLogo_en_US.properties\n" "LABEL\n" "property.text" msgid "label" -msgstr "Анапаҵаҩра" +msgstr "адҩыла" #: LibreLogo_en_US.properties msgctxt "" @@ -343,7 +342,7 @@ "FONTFAMILY\n" "property.text" msgid "fontfamily" -msgstr "" +msgstr "ашрифтқәа_реизак" #: LibreLogo_en_US.properties msgctxt "" @@ -351,7 +350,7 @@ "CLEARSCREEN\n" "property.text" msgid "clearscreen|cs" -msgstr "" +msgstr "ирыцқьатәуп_аекран|иа" #: LibreLogo_en_US.properties msgctxt "" @@ -616,7 +615,7 @@ "FLOAT\n" "property.text" msgid "float" -msgstr "" +msgstr "Аихшаратә" #: LibreLogo_en_US.properties msgctxt "" @@ -1110,7 +1109,7 @@ "ERR_MAXRECURSION\n" "property.text" msgid "maximum recursion depth (%d) exceeded." -msgstr "" +msgstr "иахысуп арекурсиа имаксималу аҵаулара (%d)." #: LibreLogo_en_US.properties msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/base.po libreoffice-6.2.3/translations/source/ab/scp2/source/base.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/base.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/base.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2018-06-24 13:29+0000\n" +"PO-Revision-Date: 2019-03-20 10:45+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1529846997.000000\n" +"X-POOTLE-MTIME: 1553078726.000000\n" #: folderitem_base.ulf msgctxt "" @@ -45,7 +45,7 @@ "STR_NAME_MODULE_PRG_BASE_BIN\n" "LngText.text" msgid "Program Module" -msgstr "" +msgstr "Апрограмматә модуль" #: module_base.ulf msgctxt "" @@ -70,7 +70,7 @@ "STR_DESC_MODULE_PRG_BASE_HELP\n" "LngText.text" msgid "Help about %PRODUCTNAME Base" -msgstr "" +msgstr "%PRODUCTNAME Base иазку аилыркаага" #: postgresqlsdbc.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/calc.po libreoffice-6.2.3/translations/source/ab/scp2/source/calc.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/calc.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/calc.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-04-12 14:13+0200\n" -"PO-Revision-Date: 2017-11-27 08:51+0000\n" +"PO-Revision-Date: 2019-03-20 10:47+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -12,8 +12,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1511772667.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553078842.000000\n" #: folderitem_calc.ulf msgctxt "" @@ -64,13 +64,12 @@ msgstr "" #: module_calc.ulf -#, fuzzy msgctxt "" "module_calc.ulf\n" "STR_NAME_MODULE_PRG_CALC_HELP\n" "LngText.text" msgid "%PRODUCTNAME Calc Help" -msgstr "%PRODUCTNAME Calc" +msgstr "%PRODUCTNAME Calc иазку аилыркаага" #: module_calc.ulf msgctxt "" @@ -105,31 +104,28 @@ msgstr "&Аҿыц" #: registryitem_calc.ulf -#, fuzzy msgctxt "" "registryitem_calc.ulf\n" "STR_REG_VAL_SO60_SPREADSHEET\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet" -msgstr "аформула %SXWFORMATNAME %SXWFORMATVERSION" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION аелектронтә таблица" #: registryitem_calc.ulf -#, fuzzy msgctxt "" "registryitem_calc.ulf\n" "STR_REG_VAL_SO60_CALC_TEMPLATE\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Spreadsheet Template" -msgstr "%SXWFORMATNAME %SXWFORMATVERSION атеқсттә документ ашаблон" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION аелектронтә таблица ашаблон" #: registryitem_calc.ulf -#, fuzzy msgctxt "" "registryitem_calc.ulf\n" "STR_REG_VAL_OO_CALC\n" "LngText.text" msgid "OpenDocument Spreadsheet" -msgstr "OpenDocumentа аелектронтә таблица" +msgstr "OpenDocument аелектронтә таблица" #: registryitem_calc.ulf msgctxt "" @@ -140,13 +136,12 @@ msgstr "OpenDocument аелектронтә таблица ашаблон" #: registryitem_calc.ulf -#, fuzzy msgctxt "" "registryitem_calc.ulf\n" "STR_REG_VAL_MS_EXCEL_WORKSHEET_OLD\n" "LngText.text" msgid "Microsoft Excel 97-2003 Worksheet" -msgstr "Microsoft Excel аелектронтә таблица" +msgstr "Microsoft Excel 97-2003 абӷьыц" #: registryitem_calc.ulf msgctxt "" @@ -173,13 +168,12 @@ msgstr "Microsoft Excel 97-2003 ашаблон" #: registryitem_calc.ulf -#, fuzzy msgctxt "" "registryitem_calc.ulf\n" "STR_REG_VAL_MS_EXCEL_TEMPLATE\n" "LngText.text" msgid "Microsoft Excel Template" -msgstr "Microsoft Excel 95 ашаблон" +msgstr "Microsoft Excel ашаблон" #: registryitem_calc.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/draw.po libreoffice-6.2.3/translations/source/ab/scp2/source/draw.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/draw.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/draw.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2017-12-12 11:12+0000\n" +"PO-Revision-Date: 2019-03-20 10:49+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -12,11 +12,10 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1513077171.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553078972.000000\n" #: folderitem_draw.ulf -#, fuzzy msgctxt "" "folderitem_draw.ulf\n" "STR_FI_NAME_ZEICHNUNG\n" @@ -30,7 +29,7 @@ "STR_FI_TOOLTIP_DRAW\n" "LngText.text" msgid "Create and edit drawings, flow charts, and logos by using Draw." -msgstr "" +msgstr "Асахьақәеи, адиграммақәеи алоготипқәеи раԥҵареи аредакциарзуреи Draw ахархәарала." #: module_draw.ulf msgctxt "" @@ -46,7 +45,7 @@ "STR_DESC_MODULE_PRG_DRAW\n" "LngText.text" msgid "Create and edit drawings, flow charts, and logos by using %PRODUCTNAME Draw." -msgstr "" +msgstr "Асахьақәеи, адиаграммақәеи алоготипқәеи раԥҵареи аредакциарзуреи %PRODUCTNAME Draw ахархәарала." #: module_draw.ulf msgctxt "" @@ -54,7 +53,7 @@ "STR_NAME_MODULE_PRG_DRAW_BIN\n" "LngText.text" msgid "Program Module" -msgstr "" +msgstr "Апрограмматә модуль" #: module_draw.ulf msgctxt "" @@ -65,13 +64,12 @@ msgstr "" #: module_draw.ulf -#, fuzzy msgctxt "" "module_draw.ulf\n" "STR_NAME_MODULE_PRG_DRAW_HELP\n" "LngText.text" msgid "%PRODUCTNAME Draw Help" -msgstr "%PRODUCTNAME Draw" +msgstr "%PRODUCTNAME Draw иазку аилыркаага" #: module_draw.ulf msgctxt "" @@ -79,7 +77,7 @@ "STR_DESC_MODULE_PRG_DRAW_HELP\n" "LngText.text" msgid "Help about %PRODUCTNAME Draw" -msgstr "" +msgstr "%PRODUCTNAME Draw иазку аилыркаага" #: registryitem_draw.ulf msgctxt "" @@ -90,13 +88,12 @@ msgstr "&Аҿыц" #: registryitem_draw.ulf -#, fuzzy msgctxt "" "registryitem_draw.ulf\n" "STR_REG_VAL_SO60_DRAWING\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Drawing" -msgstr "аформула %SXWFORMATNAME %SXWFORMATVERSION" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION асахьа" #: registryitem_draw.ulf #, fuzzy @@ -129,7 +126,7 @@ "STR_REG_VAL_MS_VISIO_DOCUMENT\n" "LngText.text" msgid "Microsoft Visio 2000/XP/2003 Document" -msgstr "" +msgstr "Microsoft Visio 2000/XP/2003 адокумент" #: registryitem_draw.ulf msgctxt "" @@ -137,7 +134,7 @@ "STR_REG_VAL_MS_VISIO_TEMPLATE\n" "LngText.text" msgid "Microsoft Visio 2000/XP/2003 Template" -msgstr "" +msgstr "Microsoft Visio 2000/XP/2003 ашаблон " #: registryitem_draw.ulf msgctxt "" @@ -145,7 +142,7 @@ "STR_REG_VAL_MS_PUBLISHER_DOCUMENT\n" "LngText.text" msgid "Microsoft Publisher Document" -msgstr "" +msgstr "Microsoft Publisher адокумент" #: registryitem_draw.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/impress.po libreoffice-6.2.3/translations/source/ab/scp2/source/impress.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/impress.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/impress.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2017-11-27 08:51+0000\n" +"PO-Revision-Date: 2019-03-20 10:53+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -12,8 +12,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1511772681.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553079205.000000\n" #: folderitem_impress.ulf msgctxt "" @@ -53,7 +53,7 @@ "STR_NAME_MODULE_PRG_IMPRESS_BIN\n" "LngText.text" msgid "Program Module" -msgstr "" +msgstr "Апрограмматә модуль" #: module_impress.ulf msgctxt "" @@ -64,13 +64,12 @@ msgstr "" #: module_impress.ulf -#, fuzzy msgctxt "" "module_impress.ulf\n" "STR_NAME_MODULE_PRG_IMPRESS_HELP\n" "LngText.text" msgid "%PRODUCTNAME Impress Help" -msgstr "%PRODUCTNAME Impress" +msgstr "%PRODUCTNAME Impress иазку аилыркаага" #: module_impress.ulf msgctxt "" @@ -78,7 +77,7 @@ "STR_DESC_MODULE_PRG_IMPRESS_HELP\n" "LngText.text" msgid "Help about %PRODUCTNAME Impress" -msgstr "" +msgstr "%PRODUCTNAME Impress иазку аилыркаага" #: registryitem_impress.ulf msgctxt "" @@ -97,13 +96,12 @@ msgstr "Иаарҧштәуп" #: registryitem_impress.ulf -#, fuzzy msgctxt "" "registryitem_impress.ulf\n" "STR_REG_VAL_SO60_PRESENT\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Presentation" -msgstr "апрезентациа %SXWFORMATNAME %SXWFORMATVERSION ашаблон" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION апрезентациа" #: registryitem_impress.ulf msgctxt "" @@ -130,25 +128,22 @@ msgstr "OpenDocument апрезентациа ашаблон" #: registryitem_impress.ulf -#, fuzzy msgctxt "" "registryitem_impress.ulf\n" "STR_REG_VAL_MS_POWERPOINT_PRESENTATION_OLD\n" "LngText.text" msgid "Microsoft PowerPoint 97-2003 Presentation" -msgstr "Microsoft PowerPoint апрезентациа" +msgstr "Microsoft PowerPoint 97-2003 апрезентациа" #: registryitem_impress.ulf -#, fuzzy msgctxt "" "registryitem_impress.ulf\n" "STR_REG_VAL_MS_POWERPOINT_SHOW\n" "LngText.text" msgid "Microsoft PowerPoint Show" -msgstr "Microsoft PowerPoint 97-2003" +msgstr "Microsoft PowerPoint адемонстрациа" #: registryitem_impress.ulf -#, fuzzy msgctxt "" "registryitem_impress.ulf\n" "STR_REG_VAL_MS_POWERPOINT_PRESENTATION\n" @@ -165,13 +160,12 @@ msgstr "Microsoft PowerPoint 97-2003 ашаблон" #: registryitem_impress.ulf -#, fuzzy msgctxt "" "registryitem_impress.ulf\n" "STR_REG_VAL_MS_POWERPOINT_TEMPLATE\n" "LngText.text" msgid "Microsoft PowerPoint Template" -msgstr "Microsoft PowerPoint 97-2003 ашаблон" +msgstr "Microsoft PowerPoint ашаблон" #: registryitem_impress.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/math.po libreoffice-6.2.3/translations/source/ab/scp2/source/math.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/math.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/math.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2017-11-27 08:51+0000\n" +"PO-Revision-Date: 2019-03-20 10:55+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -12,8 +12,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1511772685.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553079314.000000\n" #: folderitem_math.ulf msgctxt "" @@ -45,7 +45,7 @@ "STR_NAME_MODULE_PRG_MATH_BIN\n" "LngText.text" msgid "Program Module" -msgstr "" +msgstr "Апрограмматә модуль" #: module_math.ulf msgctxt "" @@ -56,13 +56,12 @@ msgstr "" #: module_math.ulf -#, fuzzy msgctxt "" "module_math.ulf\n" "STR_NAME_MODULE_PRG_MATH_HELP\n" "LngText.text" msgid "%PRODUCTNAME Math Help" -msgstr "%PRODUCTNAME Math" +msgstr "%PRODUCTNAME Math иазку аилыркаага" #: module_math.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/ooo.po libreoffice-6.2.3/translations/source/ab/scp2/source/ooo.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/ooo.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/ooo.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,16 +4,16 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2016-12-01 16:34+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-20 11:06+0000\n" +"Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1480610074.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553079964.000000\n" #: folderitem_ooo.ulf msgctxt "" @@ -24,13 +24,12 @@ msgstr "Ашаблон аҟынтәи..." #: folderitem_ooo.ulf -#, fuzzy msgctxt "" "folderitem_ooo.ulf\n" "STR_FI_NAME_OPENDOCUMENT\n" "LngText.text" msgid "Open Document" -msgstr "Афаил аартра" +msgstr "Иаарттәуп адокумент" #: folderitem_ooo.ulf msgctxt "" @@ -110,7 +109,7 @@ "STR_NAME_MODULE_HELPPACK_IT\n" "LngText.text" msgid "Italian" -msgstr "" +msgstr "Италиатәи" #: module_helppack.ulf msgctxt "" @@ -126,7 +125,7 @@ "STR_NAME_MODULE_HELPPACK_ES\n" "LngText.text" msgid "Spanish" -msgstr "" +msgstr "Испаниатә" #: module_helppack.ulf msgctxt "" @@ -142,7 +141,7 @@ "STR_NAME_MODULE_HELPPACK_SV\n" "LngText.text" msgid "Swedish" -msgstr "" +msgstr "Ашведтә" #: module_helppack.ulf msgctxt "" @@ -174,7 +173,7 @@ "STR_NAME_MODULE_HELPPACK_PT_BR\n" "LngText.text" msgid "Portuguese (Brazil)" -msgstr "" +msgstr "Португалиатәи (Бразилиа)" #: module_helppack.ulf msgctxt "" @@ -190,7 +189,7 @@ "STR_NAME_MODULE_HELPPACK_JA\n" "LngText.text" msgid "Japanese" -msgstr "" +msgstr "Иапониатәи" #: module_helppack.ulf msgctxt "" @@ -206,7 +205,7 @@ "STR_NAME_MODULE_HELPPACK_KO\n" "LngText.text" msgid "Korean" -msgstr "" +msgstr "Кореиатә" #: module_helppack.ulf msgctxt "" @@ -222,7 +221,7 @@ "STR_NAME_MODULE_HELPPACK_ZH_CN\n" "LngText.text" msgid "Chinese (simplified)" -msgstr "" +msgstr "Китаитәи (ирмариоу)" #: module_helppack.ulf msgctxt "" @@ -238,7 +237,7 @@ "STR_NAME_MODULE_HELPPACK_ZH_TW\n" "LngText.text" msgid "Chinese (traditional)" -msgstr "" +msgstr "Китаитәи (итрадициатәу)" #: module_helppack.ulf msgctxt "" @@ -270,7 +269,7 @@ "STR_NAME_MODULE_HELPPACK_HU\n" "LngText.text" msgid "Hungarian" -msgstr "" +msgstr "Венгриатәи" #: module_helppack.ulf msgctxt "" @@ -286,7 +285,7 @@ "STR_NAME_MODULE_HELPPACK_PL\n" "LngText.text" msgid "Polish" -msgstr "" +msgstr "Польшатәи" #: module_helppack.ulf msgctxt "" @@ -302,7 +301,7 @@ "STR_NAME_MODULE_HELPPACK_RU\n" "LngText.text" msgid "Russian" -msgstr "" +msgstr "Аурыс" #: module_helppack.ulf msgctxt "" @@ -329,13 +328,12 @@ msgstr "" #: module_helppack.ulf -#, fuzzy msgctxt "" "module_helppack.ulf\n" "STR_NAME_MODULE_HELPPACK_EL\n" "LngText.text" msgid "Greek" -msgstr "Аиаҵәа" +msgstr "Абырзентә" #: module_helppack.ulf msgctxt "" @@ -367,7 +365,7 @@ "STR_NAME_MODULE_HELPPACK_CS\n" "LngText.text" msgid "Czech" -msgstr "" +msgstr "Чехиатәи" #: module_helppack.ulf msgctxt "" @@ -383,7 +381,7 @@ "STR_NAME_MODULE_HELPPACK_SK\n" "LngText.text" msgid "Slovak" -msgstr "" +msgstr "Словакиатәи" #: module_helppack.ulf msgctxt "" @@ -399,7 +397,7 @@ "STR_NAME_MODULE_HELPPACK_HR\n" "LngText.text" msgid "Croatian" -msgstr "" +msgstr "Хорватиатәи" #: module_helppack.ulf msgctxt "" @@ -415,7 +413,7 @@ "STR_NAME_MODULE_HELPPACK_ET\n" "LngText.text" msgid "Estonian" -msgstr "" +msgstr "Естониатәи" #: module_helppack.ulf msgctxt "" @@ -447,7 +445,7 @@ "STR_NAME_MODULE_HELPPACK_BG\n" "LngText.text" msgid "Bulgarian" -msgstr "" +msgstr "Болгариатәи" #: module_helppack.ulf msgctxt "" @@ -479,7 +477,7 @@ "STR_NAME_MODULE_HELPPACK_PA_IN\n" "LngText.text" msgid "Punjabi" -msgstr "" +msgstr "Панджаби" #: module_helppack.ulf msgctxt "" @@ -495,7 +493,7 @@ "STR_NAME_MODULE_HELPPACK_TA\n" "LngText.text" msgid "Tamil" -msgstr "" +msgstr "Тамилтәи" #: module_helppack.ulf msgctxt "" @@ -511,7 +509,7 @@ "STR_NAME_MODULE_HELPPACK_HI\n" "LngText.text" msgid "Hindi" -msgstr "" +msgstr "Хинди" #: module_helppack.ulf msgctxt "" @@ -559,7 +557,7 @@ "STR_NAME_MODULE_HELPPACK_XH\n" "LngText.text" msgid "Xhosa" -msgstr "" +msgstr "Коса" #: module_helppack.ulf msgctxt "" @@ -623,7 +621,7 @@ "STR_NAME_MODULE_HELPPACK_LO\n" "LngText.text" msgid "Lao" -msgstr "" +msgstr "Лаостәи" #: module_helppack.ulf msgctxt "" @@ -671,7 +669,7 @@ "STR_NAME_MODULE_HELPPACK_BN_IN\n" "LngText.text" msgid "Bengali (India)" -msgstr "" +msgstr "Бенгалтәи (Индиа)" #: module_helppack.ulf msgctxt "" @@ -687,7 +685,7 @@ "STR_NAME_MODULE_HELPPACK_OR\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "Ориа" #: module_helppack.ulf msgctxt "" @@ -703,7 +701,7 @@ "STR_NAME_MODULE_HELPPACK_MR\n" "LngText.text" msgid "Marathi" -msgstr "" +msgstr "Маратхи" #: module_helppack.ulf msgctxt "" @@ -751,7 +749,7 @@ "STR_NAME_MODULE_HELPPACK_CA\n" "LngText.text" msgid "Catalan" -msgstr "" +msgstr "Каталантәи" #: module_helppack.ulf msgctxt "" @@ -767,7 +765,7 @@ "STR_NAME_MODULE_HELPPACK_CA_VALENCIA\n" "LngText.text" msgid "Catalan (Valencian)" -msgstr "" +msgstr "Каталантәи (валенсиатәи)" #: module_helppack.ulf msgctxt "" @@ -783,7 +781,7 @@ "STR_NAME_MODULE_HELPPACK_DA\n" "LngText.text" msgid "Danish" -msgstr "" +msgstr "Даниатәи" #: module_helppack.ulf msgctxt "" @@ -799,7 +797,7 @@ "STR_NAME_MODULE_HELPPACK_FI\n" "LngText.text" msgid "Finnish" -msgstr "" +msgstr "Финтәи" #: module_helppack.ulf msgctxt "" @@ -815,7 +813,7 @@ "STR_NAME_MODULE_HELPPACK_HE\n" "LngText.text" msgid "Hebrew" -msgstr "" +msgstr "Иврит" #: module_helppack.ulf msgctxt "" @@ -831,7 +829,7 @@ "STR_NAME_MODULE_HELPPACK_IS\n" "LngText.text" msgid "Icelandic" -msgstr "" +msgstr "Исландиатәи" #: module_helppack.ulf msgctxt "" @@ -895,7 +893,7 @@ "STR_NAME_MODULE_HELPPACK_SQ\n" "LngText.text" msgid "Albanian" -msgstr "" +msgstr "Албаниатәи" #: module_helppack.ulf msgctxt "" @@ -911,7 +909,7 @@ "STR_NAME_MODULE_HELPPACK_ID\n" "LngText.text" msgid "Indonesian" -msgstr "" +msgstr "Индонезиатәи" #: module_helppack.ulf msgctxt "" @@ -943,7 +941,7 @@ "STR_NAME_MODULE_HELPPACK_BE\n" "LngText.text" msgid "Belarusian" -msgstr "" +msgstr "Белоруссиатәи" #: module_helppack.ulf msgctxt "" @@ -959,7 +957,7 @@ "STR_NAME_MODULE_HELPPACK_SL\n" "LngText.text" msgid "Slovenian" -msgstr "" +msgstr "Словениатәи" #: module_helppack.ulf msgctxt "" @@ -975,7 +973,7 @@ "STR_NAME_MODULE_HELPPACK_LV\n" "LngText.text" msgid "Latvian" -msgstr "" +msgstr "Латвиатәи" #: module_helppack.ulf msgctxt "" @@ -2170,13 +2168,12 @@ msgstr "" #: module_langpack.ulf -#, fuzzy msgctxt "" "module_langpack.ulf\n" "STR_NAME_MODULE_LANGPACK_EL\n" "LngText.text" msgid "Greek" -msgstr "Аиаҵәа" +msgstr "Абырзентә" #: module_langpack.ulf msgctxt "" @@ -3995,13 +3992,12 @@ msgstr "" #: module_ooo.ulf -#, fuzzy msgctxt "" "module_ooo.ulf\n" "STR_NAME_MODULE_EXTENSION_DICTIONARY_EL\n" "LngText.text" msgid "Greek" -msgstr "Аиаҵәа" +msgstr "Абырзентә" #: module_ooo.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ab/scp2/source/writer.po libreoffice-6.2.3/translations/source/ab/scp2/source/writer.po --- libreoffice-6.2.2/translations/source/ab/scp2/source/writer.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/scp2/source/writer.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2018-07-22 09:34+0000\n" +"PO-Revision-Date: 2019-03-20 10:57+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1532252069.000000\n" +"X-POOTLE-MTIME: 1553079431.000000\n" #: folderitem_writer.ulf msgctxt "" @@ -61,7 +61,7 @@ "STR_NAME_MODULE_PRG_WRT_BIN\n" "LngText.text" msgid "Program Module" -msgstr "" +msgstr "Апрограмматә модуль" #: module_writer.ulf msgctxt "" @@ -72,13 +72,12 @@ msgstr "" #: module_writer.ulf -#, fuzzy msgctxt "" "module_writer.ulf\n" "STR_NAME_MODULE_PRG_WRT_HELP\n" "LngText.text" msgid "%PRODUCTNAME Writer Help" -msgstr "%PRODUCTNAME Writer/Web" +msgstr "%PRODUCTNAME Writer иазку аилыркаага" #: module_writer.ulf msgctxt "" @@ -86,7 +85,7 @@ "STR_DESC_MODULE_PRG_WRT_HELP\n" "LngText.text" msgid "Help about %PRODUCTNAME Writer" -msgstr "" +msgstr "%PRODUCTNAME Writer иазку аилыркаага" #: module_writer.ulf msgctxt "" @@ -102,7 +101,7 @@ "STR_DESC_MODULE_PRG_WRT_WRITER2LATEX\n" "LngText.text" msgid "LaTeX export filter for Writer documents." -msgstr "" +msgstr "Аекспорт афильтр LaTeX аҟны Writer адокументқәа рзы." #: registryitem_writer.ulf msgctxt "" @@ -174,7 +173,7 @@ "STR_REG_VAL_MS_WORD_DOCUMENT_OLD\n" "LngText.text" msgid "Microsoft Word 97-2003 Document" -msgstr "" +msgstr "Microsoft Word 97-2003 адокумент" #: registryitem_writer.ulf msgctxt "" @@ -193,7 +192,6 @@ msgstr "Microsoft Word 97-2003 ашаблон" #: registryitem_writer.ulf -#, fuzzy msgctxt "" "registryitem_writer.ulf\n" "STR_REG_VAL_MS_WORD_TEMPLATE\n" @@ -218,7 +216,6 @@ msgstr "Uniform Office атеқсттә документ" #: registryitem_writer.ulf -#, fuzzy msgctxt "" "registryitem_writer.ulf\n" "STR_REG_VAL_WORDPRO_DOCUMENT\n" diff -Nru libreoffice-6.2.2/translations/source/ab/starmath/messages.po libreoffice-6.2.3/translations/source/ab/starmath/messages.po --- libreoffice-6.2.2/translations/source/ab/starmath/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/starmath/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,22 +4,21 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2018-05-08 13:23+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-19 10:48+0000\n" +"Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1525785797.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1552992522.000000\n" #: starmath/inc/smmod.hrc:16 -#, fuzzy msgctxt "RID_UI_SYMBOLSET_NAMES" msgid "Greek" -msgstr "Аиаҵәа" +msgstr "Абырзентә" #: starmath/inc/smmod.hrc:17 msgctxt "RID_UI_SYMBOLSET_NAMES" @@ -294,7 +293,7 @@ #: starmath/inc/smmod.hrc:75 msgctxt "RID_UI_SYMBOL_NAMES" msgid "varphi" -msgstr "" +msgstr "varphi" #: starmath/inc/smmod.hrc:76 msgctxt "RID_UI_SYMBOL_NAMES" @@ -304,38 +303,37 @@ #: starmath/inc/smmod.hrc:77 msgctxt "RID_UI_SYMBOL_NAMES" msgid "noelement" -msgstr "" +msgstr "noelement" #: starmath/inc/smmod.hrc:78 msgctxt "RID_UI_SYMBOL_NAMES" msgid "strictlylessthan" -msgstr "" +msgstr "strictlylessthan" #: starmath/inc/smmod.hrc:79 msgctxt "RID_UI_SYMBOL_NAMES" msgid "strictlygreaterthan" -msgstr "" +msgstr "strictlygreaterthan" #: starmath/inc/smmod.hrc:80 -#, fuzzy msgctxt "RID_UI_SYMBOL_NAMES" msgid "notequal" -msgstr "иаҟараӡам" +msgstr "notequal" #: starmath/inc/smmod.hrc:81 msgctxt "RID_UI_SYMBOL_NAMES" msgid "identical" -msgstr "" +msgstr "identical" #: starmath/inc/smmod.hrc:82 msgctxt "RID_UI_SYMBOL_NAMES" msgid "tendto" -msgstr "" +msgstr "tendto" #: starmath/inc/smmod.hrc:83 msgctxt "RID_UI_SYMBOL_NAMES" msgid "infinite" -msgstr "" +msgstr "infinite" #: starmath/inc/smmod.hrc:84 msgctxt "RID_UI_SYMBOL_NAMES" @@ -345,7 +343,7 @@ #: starmath/inc/smmod.hrc:85 msgctxt "RID_UI_SYMBOL_NAMES" msgid "perthousand" -msgstr "" +msgstr "perthousand" #: starmath/inc/smmod.hrc:86 msgctxt "RID_UI_SYMBOL_NAMES" @@ -420,7 +418,7 @@ #: starmath/inc/strings.hrc:37 msgctxt "RID_XOVERY_HELP" msgid "Division (Fraction)" -msgstr "" +msgstr "Ашара (аихша)" #: starmath/inc/strings.hrc:38 msgctxt "RID_XODIVIDEY_HELP" @@ -430,27 +428,27 @@ #: starmath/inc/strings.hrc:39 msgctxt "RID_XODOTY_HELP" msgid "Circled Dot" -msgstr "" +msgstr "Акәаԥ аҵәаӷәагьежь аҟны" #: starmath/inc/strings.hrc:40 msgctxt "RID_XOMINUSY_HELP" msgid "Circled Minus" -msgstr "" +msgstr "Минус аҵәаӷәагьежь аҟны" #: starmath/inc/strings.hrc:41 msgctxt "RID_XOPLUSY_HELP" msgid "Circled Plus" -msgstr "" +msgstr "Плиус аҵәаӷәагьежь аҟны" #: starmath/inc/strings.hrc:42 msgctxt "RID_XOTIMESY_HELP" msgid "Tensor Product" -msgstr "" +msgstr "Атензортә шьҭыхлыҵ" #: starmath/inc/strings.hrc:43 msgctxt "RID_XANDY_HELP" msgid "Boolean AND" -msgstr "" +msgstr "Алогикатә И" #: starmath/inc/strings.hrc:44 msgctxt "RID_XORY_HELP" @@ -500,7 +498,7 @@ #: starmath/inc/strings.hrc:53 msgctxt "RID_XLLY_HELP" msgid "Is Much Less Than" -msgstr "" +msgstr "Кыр еиҵоуп" #: starmath/inc/strings.hrc:54 msgctxt "RID_XGGY_HELP" @@ -515,37 +513,37 @@ #: starmath/inc/strings.hrc:56 msgctxt "RID_XEQUIVY_HELP" msgid "Is Congruent To" -msgstr "" +msgstr "Иконгурентуп" #: starmath/inc/strings.hrc:57 msgctxt "RID_XAPPROXY_HELP" msgid "Is Approximately Equal" -msgstr "" +msgstr "Инықәырԥшны иаҟароуп" #: starmath/inc/strings.hrc:58 msgctxt "RID_XSIMY_HELP" msgid "Is Similar To" -msgstr "" +msgstr "Иашьашәалоуп" #: starmath/inc/strings.hrc:59 msgctxt "RID_XSIMEQY_HELP" msgid "Is Similar Or Equal" -msgstr "" +msgstr "Иашьашәалоуп ма иаҟароуп" #: starmath/inc/strings.hrc:60 msgctxt "RID_XPROPY_HELP" msgid "Is Proportional To" -msgstr "" +msgstr "Ипропорционалуп" #: starmath/inc/strings.hrc:61 msgctxt "RID_XORTHOY_HELP" msgid "Is Orthogonal To" -msgstr "" +msgstr "Иортогоналны" #: starmath/inc/strings.hrc:62 msgctxt "RID_XPARALLELY_HELP" msgid "Is Parallel To" -msgstr "" +msgstr "Ипараллелны" #: starmath/inc/strings.hrc:63 msgctxt "RID_XTOWARDY_HELP" @@ -555,22 +553,22 @@ #: starmath/inc/strings.hrc:64 msgctxt "RID_XTRANSLY_HELP" msgid "Corresponds To (Left)" -msgstr "" +msgstr "Иашьашәалоуп (арымарахь)" #: starmath/inc/strings.hrc:65 msgctxt "RID_XTRANSRY_HELP" msgid "Corresponds To (Right)" -msgstr "" +msgstr "Иашьашәалоуп (арыӷьарахь)" #: starmath/inc/strings.hrc:66 msgctxt "RID_XINY_HELP" msgid "Is In" -msgstr "" +msgstr "Иаҵанакуеит аҟны" #: starmath/inc/strings.hrc:67 msgctxt "RID_XNOTINY_HELP" msgid "Is Not In" -msgstr "" +msgstr "Иаҵанакӡом аҟны" #: starmath/inc/strings.hrc:68 msgctxt "RID_XOWNSY_HELP" @@ -585,7 +583,7 @@ #: starmath/inc/strings.hrc:70 msgctxt "RID_XINTERSECTIONY_HELP" msgid "Intersection" -msgstr "" +msgstr "Аихысырҭа" #: starmath/inc/strings.hrc:71 msgctxt "RID_XSETMINUSY_HELP" @@ -640,7 +638,7 @@ #: starmath/inc/strings.hrc:81 msgctxt "RID_ABSX_HELP" msgid "Absolute Value" -msgstr "" +msgstr "Абсолиуттә ҵакы" #: starmath/inc/strings.hrc:82 msgctxt "RID_FACTX_HELP" @@ -660,17 +658,17 @@ #: starmath/inc/strings.hrc:85 msgctxt "RID_EX_HELP" msgid "Exponential Function" -msgstr "" +msgstr "Аекспоненциалтә функциа" #: starmath/inc/strings.hrc:86 msgctxt "RID_EXPX_HELP" msgid "Exponential Function" -msgstr "" +msgstr "Аекспоненциалтә функциа" #: starmath/inc/strings.hrc:87 msgctxt "RID_LNX_HELP" msgid "Natural Logarithm" -msgstr "" +msgstr "Анатуралтә логарифм" #: starmath/inc/strings.hrc:88 msgctxt "RID_LOGX_HELP" @@ -919,7 +917,7 @@ #: starmath/inc/strings.hrc:136 msgctxt "RID_IINTX_HELP" msgid "Double Integral" -msgstr "" +msgstr "Иҩбоу аинтеграл" #: starmath/inc/strings.hrc:137 #, fuzzy @@ -942,7 +940,7 @@ #: starmath/inc/strings.hrc:140 msgctxt "RID_IIINTX_HELP" msgid "Triple Integral" -msgstr "" +msgstr "Ихԥоу аинтеграл" #: starmath/inc/strings.hrc:141 #, fuzzy @@ -985,7 +983,7 @@ #: starmath/inc/strings.hrc:148 msgctxt "RID_LLINTX_HELP" msgid "Double Curve Integral" -msgstr "" +msgstr "Иҩбоу аҵәаӷәахәахәатә интеграл" #: starmath/inc/strings.hrc:149 #, fuzzy @@ -1008,7 +1006,7 @@ #: starmath/inc/strings.hrc:152 msgctxt "RID_LLLINTX_HELP" msgid "Triple Curve Integral" -msgstr "" +msgstr "Ихԥоу аҵәаӷәахәахәатә интеграл" #: starmath/inc/strings.hrc:153 #, fuzzy @@ -1031,7 +1029,7 @@ #: starmath/inc/strings.hrc:156 msgctxt "RID_ACUTEX_HELP" msgid "Acute Accent" -msgstr "" +msgstr "Акут" #: starmath/inc/strings.hrc:157 msgctxt "RID_BARX_HELP" @@ -1046,7 +1044,7 @@ #: starmath/inc/strings.hrc:159 msgctxt "RID_CHECKX_HELP" msgid "Reverse Circumflex" -msgstr "" +msgstr "Иаарҳәу ациркумфлекс" #: starmath/inc/strings.hrc:160 msgctxt "RID_CIRCLEX_HELP" @@ -1071,17 +1069,17 @@ #: starmath/inc/strings.hrc:164 msgctxt "RID_GRAVEX_HELP" msgid "Grave Accent" -msgstr "" +msgstr "Гравис" #: starmath/inc/strings.hrc:165 msgctxt "RID_HATX_HELP" msgid "Circumflex" -msgstr "" +msgstr "Циркумфлекс" #: starmath/inc/strings.hrc:166 msgctxt "RID_TILDEX_HELP" msgid "Tilde" -msgstr "" +msgstr "Тильда" #: starmath/inc/strings.hrc:167 msgctxt "RID_VECX_HELP" @@ -1096,7 +1094,7 @@ #: starmath/inc/strings.hrc:169 msgctxt "RID_OVERLINEX_HELP" msgid "Line Over" -msgstr "" +msgstr "Аҵәаӷәа хыхьла" #: starmath/inc/strings.hrc:170 msgctxt "RID_OVERSTRIKEX_HELP" @@ -1106,7 +1104,7 @@ #: starmath/inc/strings.hrc:171 msgctxt "RID_PHANTOMX_HELP" msgid "Transparent" -msgstr "" +msgstr "Иҵәцоу" #: starmath/inc/strings.hrc:172 msgctxt "RID_BOLDX_HELP" @@ -1247,12 +1245,12 @@ #: starmath/inc/strings.hrc:199 msgctxt "RID_LRLINEX_HELP" msgid "Single Lines" -msgstr "" +msgstr "Иаабац аҵәаӷәақәа" #: starmath/inc/strings.hrc:200 msgctxt "RID_LRDLINEX_HELP" msgid "Double Lines" -msgstr "" +msgstr "Иҩбоу аҵәаӷәақәа" #: starmath/inc/strings.hrc:201 msgctxt "RID_LMRANGLEXY_HELP" @@ -1327,7 +1325,7 @@ #: starmath/inc/strings.hrc:215 msgctxt "RID_RSUBX_HELP" msgid "Subscript Right" -msgstr "" +msgstr "Ҵаҟатәи аиндекс арыӷьарахь" #: starmath/inc/strings.hrc:216 msgctxt "RID_RSUPX_HELP" @@ -1385,10 +1383,9 @@ msgstr "" #: starmath/inc/strings.hrc:227 -#, fuzzy msgctxt "RID_ALIGNLX_HELP" msgid "Align Left" -msgstr "Армарахь ала" +msgstr "Еиҟаратәтәуп арымарахь ала" #: starmath/inc/strings.hrc:228 msgctxt "RID_ALIGNCX_HELP" @@ -1396,21 +1393,19 @@ msgstr "" #: starmath/inc/strings.hrc:229 -#, fuzzy msgctxt "RID_ALIGNRX_HELP" msgid "Align Right" -msgstr "Арӷьарахь ала" +msgstr "Еиҟаратәтәуп арыӷьарахь ала" #: starmath/inc/strings.hrc:230 msgctxt "RID_ALEPH_HELP" msgid "Aleph" -msgstr "" +msgstr "Алеф" #: starmath/inc/strings.hrc:231 -#, fuzzy msgctxt "RID_EMPTYSET_HELP" msgid "Empty Set" -msgstr "иҭацәу арацәа" +msgstr "Иҭацәу арацәа" #: starmath/inc/strings.hrc:232 msgctxt "RID_RE_HELP" @@ -1425,42 +1420,42 @@ #: starmath/inc/strings.hrc:234 msgctxt "RID_INFINITY_HELP" msgid "Infinity" -msgstr "" +msgstr "Ҵыхәаԥҵәарада" #: starmath/inc/strings.hrc:235 msgctxt "RID_PARTIAL_HELP" msgid "Partial" -msgstr "" +msgstr "Ихатәу адифференциал" #: starmath/inc/strings.hrc:236 msgctxt "RID_NABLA_HELP" msgid "Nabla" -msgstr "" +msgstr "Набла" #: starmath/inc/strings.hrc:237 msgctxt "RID_WP_HELP" msgid "Weierstrass p" -msgstr "" +msgstr "Вейерштрасс аеллиптикатә символ" #: starmath/inc/strings.hrc:238 msgctxt "RID_DOTSAXIS_HELP" msgid "Dots In Middle" -msgstr "" +msgstr "Акәаԥқәа агәҭаны" #: starmath/inc/strings.hrc:239 msgctxt "RID_DOTSUP_HELP" msgid "Dots To Top" -msgstr "" +msgstr "Акәаԥқәа хыхь" #: starmath/inc/strings.hrc:240 msgctxt "RID_DOTSDOWN_HELP" msgid "Dots To Bottom" -msgstr "" +msgstr "Акәаԥқәа ҵаҟа" #: starmath/inc/strings.hrc:241 msgctxt "RID_DOTSLOW_HELP" msgid "Dots At Bottom" -msgstr "" +msgstr "Акәаԥқәа ҵаҟала" #: starmath/inc/strings.hrc:242 msgctxt "RID_DOTSVERT_HELP" @@ -1530,7 +1525,7 @@ #: starmath/inc/strings.hrc:255 msgctxt "RID_SETC_HELP" msgid "Complex Numbers Set" -msgstr "" +msgstr "Акомплекстә хыԥхьаӡарақәа рырацәа" #: starmath/inc/strings.hrc:256 msgctxt "RID_WIDEHATX_HELP" @@ -1585,7 +1580,7 @@ #: starmath/inc/strings.hrc:266 msgctxt "RID_XPRECEDESY_HELP" msgid "Precedes" -msgstr "" +msgstr "Иаԥхьанеиуеит" #: starmath/inc/strings.hrc:267 msgctxt "RID_XPRECEDESEQUALY_HELP" @@ -1600,32 +1595,32 @@ #: starmath/inc/strings.hrc:269 msgctxt "RID_XSUCCEEDSY_HELP" msgid "Succeeds" -msgstr "" +msgstr "Иашьҭанеиуеит" #: starmath/inc/strings.hrc:270 msgctxt "RID_XSUCCEEDSEQUALY_HELP" msgid "Succeeds or equal to" -msgstr "" +msgstr "Иашьҭанеиуеит ма иаҟароуп" #: starmath/inc/strings.hrc:271 msgctxt "RID_XSUCCEEDSEQUIVY_HELP" msgid "Succeeds or equivalent to" -msgstr "" +msgstr "Иашьҭанеиуеит ма еквивалентуп" #: starmath/inc/strings.hrc:272 msgctxt "RID_XNOTPRECEDESY_HELP" msgid "Not precedes" -msgstr "" +msgstr "Иаԥхьанеиӡом" #: starmath/inc/strings.hrc:273 msgctxt "RID_XNOTSUCCEEDSY_HELP" msgid "Not succeeds" -msgstr "" +msgstr "Иашьҭанеиӡом" #: starmath/inc/strings.hrc:274 msgctxt "RID_CATEGORY_UNARY_BINARY_OPERATORS" msgid "Unary/Binary Operators" -msgstr "" +msgstr "Аунартәи/Абинартәи операторқәа" #: starmath/inc/strings.hrc:275 msgctxt "RID_CATEGORY_RELATIONS" @@ -1766,10 +1761,9 @@ msgstr "аҩежь" #: starmath/inc/strings.hrc:303 -#, fuzzy msgctxt "STR_HIDE" msgid "hide" -msgstr "Иҵәахтәуп" +msgstr "иҵәаху" #: starmath/inc/strings.hrc:304 msgctxt "STR_SIZE" @@ -1834,7 +1828,7 @@ #: starmath/inc/strings.hrc:316 msgctxt "RID_ERR_LGROUPEXPECTED" msgid "'{' expected" -msgstr "" +msgstr "Иазыԥшуп «{»" #: starmath/inc/strings.hrc:317 msgctxt "RID_ERR_RGROUPEXPECTED" @@ -1854,22 +1848,22 @@ #: starmath/inc/strings.hrc:320 msgctxt "RID_ERR_PARENTMISMATCH" msgid "Left and right symbols mismatched" -msgstr "" +msgstr "Арӷьарахьи армарахьи асимволқәа еиқәшәаӡом" #: starmath/inc/strings.hrc:321 msgctxt "RID_ERR_FONTEXPECTED" msgid "'fixed', 'sans', or 'serif' expected" -msgstr "" +msgstr "Иазыԥшуп «fixed», «sans» ма «serif»" #: starmath/inc/strings.hrc:322 msgctxt "RID_ERR_SIZEEXPECTED" msgid "'size' followed by an unexpected token" -msgstr "" +msgstr "Иззыԥшымыз атокен «size» ашьҭахь" #: starmath/inc/strings.hrc:323 msgctxt "RID_ERR_DOUBLEALIGN" msgid "Double aligning is not allowed" -msgstr "" +msgstr "Ҩынтәны аиҟаратәра азин ыҟам" #: starmath/inc/strings.hrc:324 msgctxt "RID_ERR_DOUBLESUBSUPSCRIPT" @@ -1884,12 +1878,12 @@ #: starmath/inc/strings.hrc:326 msgctxt "RID_ERR_COLOREXPECTED" msgid "Color required" -msgstr "" +msgstr "Иаҭахуп аԥштәы" #: starmath/inc/strings.hrc:327 msgctxt "RID_ERR_RIGHTEXPECTED" msgid "'RIGHT' expected" -msgstr "" +msgstr "Иазыԥшуп «Арӷьарахь»" #: starmath/inc/strings.hrc:328 msgctxt "RID_PRINTUIOPT_PRODNAME" @@ -1985,7 +1979,7 @@ #: starmath/uiconfig/smath/ui/catalogdialog.ui:103 msgctxt "catalogdialog|label1" msgid "_Symbol set:" -msgstr "" +msgstr "Асимволқәа реизга:" #: starmath/uiconfig/smath/ui/catalogdialog.ui:127 msgctxt "catalogdialog|symbolname" @@ -2223,7 +2217,7 @@ #: starmath/uiconfig/smath/ui/smathsettings.ui:39 msgctxt "smathsettings|title" msgid "_Title row" -msgstr "" +msgstr "Ахалагаратә цәаҳәа" #: starmath/uiconfig/smath/ui/smathsettings.ui:55 msgctxt "smathsettings|text" @@ -2299,7 +2293,7 @@ #: starmath/uiconfig/smath/ui/spacingdialog.ui:58 msgctxt "spacingdialog|menuitem4" msgid "Fraction Bars" -msgstr "" +msgstr "Аихшатә ҵәаӷәа" #: starmath/uiconfig/smath/ui/spacingdialog.ui:68 msgctxt "spacingdialog|menuitem5" @@ -2395,18 +2389,17 @@ #: starmath/uiconfig/smath/ui/spacingdialog.ui:981 msgctxt "spacingdialog|3label1" msgid "_Numerator:" -msgstr "" +msgstr "Ахагыла:" #: starmath/uiconfig/smath/ui/spacingdialog.ui:994 msgctxt "spacingdialog|3label2" msgid "_Denominator:" -msgstr "" +msgstr "Аҵагыла" #: starmath/uiconfig/smath/ui/spacingdialog.ui:1025 -#, fuzzy msgctxt "spacingdialog|3title" msgid "Fractions" -msgstr "Афункциақәа" +msgstr "Аихша мариақәа" #: starmath/uiconfig/smath/ui/spacingdialog.ui:1079 msgctxt "spacingdialog|4label1" @@ -2421,7 +2414,7 @@ #: starmath/uiconfig/smath/ui/spacingdialog.ui:1123 msgctxt "spacingdialog|4title" msgid "Fraction Bar" -msgstr "" +msgstr "Аихшатә ҵәаӷәа" #: starmath/uiconfig/smath/ui/spacingdialog.ui:1177 msgctxt "spacingdialog|5label1" @@ -2476,12 +2469,12 @@ #: starmath/uiconfig/smath/ui/spacingdialog.ui:1484 msgctxt "spacingdialog|8label1" msgid "_Primary height:" -msgstr "" +msgstr "Ихадоу аҳаракыра:" #: starmath/uiconfig/smath/ui/spacingdialog.ui:1497 msgctxt "spacingdialog|8label2" msgid "_Minimum spacing:" -msgstr "" +msgstr "Имин. аинтервал:" #: starmath/uiconfig/smath/ui/spacingdialog.ui:1528 msgctxt "spacingdialog|8title" @@ -2526,7 +2519,7 @@ #: starmath/uiconfig/smath/ui/spacingdialog.ui:1750 msgctxt "spacingdialog|10title" msgid "Borders" -msgstr "" +msgstr "Аҭакырақәа" #: starmath/uiconfig/smath/ui/symdefinedialog.ui:8 msgctxt "symdefinedialog|EditSymbols" @@ -2541,7 +2534,7 @@ #: starmath/uiconfig/smath/ui/symdefinedialog.ui:144 msgctxt "symdefinedialog|oldSymbolText" msgid "_Old symbol:" -msgstr "" +msgstr "_Уаанӡатәи асимвол:" #: starmath/uiconfig/smath/ui/symdefinedialog.ui:242 msgctxt "symdefinedialog|modify" @@ -2556,7 +2549,7 @@ #: starmath/uiconfig/smath/ui/symdefinedialog.ui:311 msgctxt "symdefinedialog|symbolSetText" msgid "Symbol s_et:" -msgstr "" +msgstr "Асимволқәа реизга:" #: starmath/uiconfig/smath/ui/symdefinedialog.ui:325 msgctxt "symdefinedialog|fontText" diff -Nru libreoffice-6.2.2/translations/source/ab/sw/messages.po libreoffice-6.2.3/translations/source/ab/sw/messages.po --- libreoffice-6.2.2/translations/source/ab/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-02-23 19:57+0000\n" +"PO-Revision-Date: 2019-04-09 11:26+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550951868.000000\n" +"X-POOTLE-MTIME: 1554809203.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -219,17 +219,17 @@ #: sw/inc/dbui.hrc:48 msgctxt "SA_ADDRESS_HEADER" msgid "Company Name" -msgstr "" +msgstr "Акомпаниа ахьӡ" #: sw/inc/dbui.hrc:49 msgctxt "SA_ADDRESS_HEADER" msgid "Address Line 1" -msgstr "" +msgstr "Адрес (1-тәи ацәаҳәа)" #: sw/inc/dbui.hrc:50 msgctxt "SA_ADDRESS_HEADER" msgid "Address Line 2" -msgstr "" +msgstr "Адрес (2-тәи ацәаҳәа)" #: sw/inc/dbui.hrc:51 msgctxt "SA_ADDRESS_HEADER" @@ -244,7 +244,7 @@ #: sw/inc/dbui.hrc:53 msgctxt "SA_ADDRESS_HEADER" msgid "ZIP" -msgstr "" +msgstr "Аԥошьҭа аиндекс" #: sw/inc/dbui.hrc:54 msgctxt "SA_ADDRESS_HEADER" @@ -254,17 +254,17 @@ #: sw/inc/dbui.hrc:55 msgctxt "SA_ADDRESS_HEADER" msgid "Telephone private" -msgstr "" +msgstr "Аҩнтәи аҭел" #: sw/inc/dbui.hrc:56 msgctxt "SA_ADDRESS_HEADER" msgid "Telephone business" -msgstr "" +msgstr "Аусураҿтәи аҭел" #: sw/inc/dbui.hrc:57 msgctxt "SA_ADDRESS_HEADER" msgid "E-mail Address" -msgstr "" +msgstr "E-mail адрес" #: sw/inc/dbui.hrc:58 msgctxt "SA_ADDRESS_HEADER" @@ -285,17 +285,17 @@ #: sw/inc/error.hrc:35 msgctxt "RID_SW_ERRHDL" msgid "This is not a valid WinWord6 file." -msgstr "" +msgstr "Ари афаил WinWord6 иатәӡам." #: sw/inc/error.hrc:36 msgctxt "RID_SW_ERRHDL" msgid "File format error found at $(ARG1)(row,col)." -msgstr "" +msgstr "Афаил аформат агха, апозициа $(ARG1)(ацәаҳәа, аиҵагыла) аҟны." #: sw/inc/error.hrc:37 msgctxt "RID_SW_ERRHDL" msgid "This is not a valid WinWord97 file." -msgstr "" +msgstr "Ари афаил WinWord97 иатәӡам." #: sw/inc/error.hrc:38 sw/inc/error.hrc:57 msgctxt "RID_SW_ERRHDL" @@ -337,7 +337,7 @@ #: sw/inc/error.hrc:48 msgctxt "RID_SW_ERRHDL" msgid "Cells cannot be further split." -msgstr "" +msgstr "Иауам абларҭақәа уаҳа реихшара." #: sw/inc/error.hrc:49 msgctxt "RID_SW_ERRHDL" @@ -347,22 +347,22 @@ #: sw/inc/error.hrc:50 msgctxt "RID_SW_ERRHDL" msgid "The structure of a linked table cannot be modified." -msgstr "" +msgstr "Иадҳәало атаблица аструктура аԥсахра ауам." #: sw/inc/error.hrc:52 msgctxt "RID_SW_ERRHDL" msgid "Not all attributes could be read." -msgstr "" +msgstr "Атрибутқәа зегьы рыԥхьара ауам." #: sw/inc/error.hrc:53 msgctxt "RID_SW_ERRHDL" msgid "Not all attributes could be recorded." -msgstr "" +msgstr "Атрибутқәа зегьы рҭаҩра ауам." #: sw/inc/error.hrc:54 msgctxt "RID_SW_ERRHDL" msgid "Document could not be completely saved." -msgstr "" +msgstr "Иауам адокумент шеибгоу аиқәырхара." #: sw/inc/error.hrc:55 msgctxt "RID_SW_ERRHDL" @@ -370,6 +370,8 @@ "This HTML document contains %PRODUCTNAME Basic macros.\n" "They were not saved with the current export settings." msgstr "" +"Ари HTML адокумент иаҵанакуеит амакросқәа %PRODUCTNAME Basic.\n" +"Дара еиқәырхаӡамызт, аекспорт азы иарбоу адокументқәа рырхиарақәа ирыхҟьаны." #: sw/inc/flddinf.hrc:27 msgctxt "flddocinfopage|liststore1" @@ -394,17 +396,17 @@ #: sw/inc/fldref.hrc:27 msgctxt "fldrefpage|liststore1" msgid "Bookmarks" -msgstr "" +msgstr "Агәылаҵақәа" #: sw/inc/fldref.hrc:28 msgctxt "fldrefpage|liststore1" msgid "Footnotes" -msgstr "" +msgstr "Албаагақәа" #: sw/inc/fldref.hrc:29 msgctxt "fldrefpage|liststore1" msgid "Endnotes" -msgstr "" +msgstr "Анҵәамҭатә лбаагақәа" #: sw/inc/fldref.hrc:30 msgctxt "fldrefpage|liststore1" @@ -429,7 +431,7 @@ #: sw/inc/mmaddressblockpage.hrc:29 msgctxt "RA_SALUTATION" msgid "Hi" -msgstr "" +msgstr "Салам" #: sw/inc/mmaddressblockpage.hrc:34 msgctxt "RA_PUNCTUATION" @@ -489,7 +491,7 @@ #: sw/inc/optload.hrc:34 msgctxt "STR_ARR_METRIC" msgid "Pica" -msgstr "" +msgstr "Пика" #: sw/inc/optload.hrc:35 msgctxt "STR_ARR_METRIC" @@ -554,88 +556,88 @@ #: sw/inc/pageformatpanel.hrc:18 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "None" -msgstr "" +msgstr "Мап" #: sw/inc/pageformatpanel.hrc:19 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Narrow" -msgstr "" +msgstr "Иҭшәақәо" #: sw/inc/pageformatpanel.hrc:20 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Moderate" -msgstr "" +msgstr "Абжьаратәқәа" #: sw/inc/pageformatpanel.hrc:21 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Normal (0.75\")" -msgstr "" +msgstr "Инормалу (0.75\")" #: sw/inc/pageformatpanel.hrc:22 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Normal (1\")" -msgstr "" +msgstr "Инормалу (1\")" #: sw/inc/pageformatpanel.hrc:23 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Normal (1.25\")" -msgstr "" +msgstr "Инормалу (1.25\")" #: sw/inc/pageformatpanel.hrc:24 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Wide" -msgstr "" +msgstr "Иҭбаақәо" #: sw/inc/pageformatpanel.hrc:25 msgctxt "RID_PAGEFORMATPANEL_MARGINS_INCH" msgid "Mirrored" -msgstr "" +msgstr "Ианырԥшқәоу" #: sw/inc/pageformatpanel.hrc:31 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "None" -msgstr "" +msgstr "Мап" #: sw/inc/pageformatpanel.hrc:32 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Narrow" -msgstr "" +msgstr "Иҭшәақәо" #: sw/inc/pageformatpanel.hrc:33 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Moderate" -msgstr "" +msgstr "Абжьаратәқәа" #: sw/inc/pageformatpanel.hrc:34 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Normal (1.9cm)" -msgstr "" +msgstr "Инормалу (1,9 см)" #: sw/inc/pageformatpanel.hrc:35 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Normal (2.54cm)" -msgstr "" +msgstr "Инормалу (2,54 см)" #: sw/inc/pageformatpanel.hrc:36 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Normal (3.18cm)" -msgstr "" +msgstr "Инормалу (3,18 см)" #: sw/inc/pageformatpanel.hrc:37 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Wide" -msgstr "" +msgstr "Иҭбаақәо" #: sw/inc/pageformatpanel.hrc:38 msgctxt "RID_PAGEFORMATPANEL_MARGINS_CM" msgid "Mirrored" -msgstr "" +msgstr "Ианырԥшқәоу" #. Format names #: sw/inc/strings.hrc:27 msgctxt "STR_POOLCHR_FOOTNOTE" msgid "Footnote Characters" -msgstr "" +msgstr "Албаага асимвол" #: sw/inc/strings.hrc:28 msgctxt "STR_POOLCHR_PAGENO" @@ -650,7 +652,7 @@ #: sw/inc/strings.hrc:30 msgctxt "STR_POOLCHR_DROPCAPS" msgid "Drop Caps" -msgstr "" +msgstr "Ахалагаранбан" #: sw/inc/strings.hrc:31 msgctxt "STR_POOLCHR_NUM_LEVEL" @@ -670,22 +672,22 @@ #: sw/inc/strings.hrc:34 msgctxt "STR_POOLCHR_INET_VISIT" msgid "Visited Internet Link" -msgstr "" +msgstr "Изҭаахьоу агиперзхьарԥш" #: sw/inc/strings.hrc:35 msgctxt "STR_POOLCHR_JUMPEDIT" msgid "Placeholder" -msgstr "" +msgstr "Ахарҭәаага" #: sw/inc/strings.hrc:36 msgctxt "STR_POOLCHR_TOXJUMP" msgid "Index Link" -msgstr "" +msgstr "Аҭыԥрбага азхьарԥш" #: sw/inc/strings.hrc:37 msgctxt "STR_POOLCHR_ENDNOTE" msgid "Endnote Characters" -msgstr "" +msgstr "Анҵәамҭатә лбаага асимвол" #: sw/inc/strings.hrc:38 msgctxt "STR_POOLCHR_LINENUM" @@ -695,17 +697,17 @@ #: sw/inc/strings.hrc:39 msgctxt "STR_POOLCHR_IDX_MAIN_ENTRY" msgid "Main Index Entry" -msgstr "" +msgstr "Аҭыԥрбага ихадоу аелемент" #: sw/inc/strings.hrc:40 msgctxt "STR_POOLCHR_FOOTNOTE_ANCHOR" msgid "Footnote Anchor" -msgstr "" +msgstr "Албаага адҳәала" #: sw/inc/strings.hrc:41 msgctxt "STR_POOLCHR_ENDNOTE_ANCHOR" msgid "Endnote Anchor" -msgstr "" +msgstr "Анҵәамҭатә лбаага адҳәала" #: sw/inc/strings.hrc:42 msgctxt "STR_POOLCHR_RUBYTEXT" @@ -715,7 +717,7 @@ #: sw/inc/strings.hrc:43 msgctxt "STR_POOLCHR_VERT_NUM" msgid "Vertical Numbering Symbols" -msgstr "" +msgstr "Асимволқәа вертикаллатәи рхырхарҭа" #. Drawing templates for HTML #: sw/inc/strings.hrc:45 @@ -731,7 +733,7 @@ #: sw/inc/strings.hrc:47 msgctxt "STR_POOLCHR_HTML_STRONG" msgid "Strong Emphasis" -msgstr "" +msgstr "Ижәпаны алкаара" #: sw/inc/strings.hrc:48 msgctxt "STR_POOLCHR_HTML_CODE" @@ -762,7 +764,7 @@ #: sw/inc/strings.hrc:53 msgctxt "STR_POOLCHR_HTML_TELETYPE" msgid "Teletype" -msgstr "" +msgstr "Ипропорционалым атеқст" #. Border templates #: sw/inc/strings.hrc:55 @@ -788,12 +790,12 @@ #: sw/inc/strings.hrc:59 msgctxt "STR_POOLFRM_MARGINAL" msgid "Marginalia" -msgstr "" +msgstr "Азгәаҭақәа" #: sw/inc/strings.hrc:60 msgctxt "STR_POOLFRM_WATERSIGN" msgid "Watermark" -msgstr "" +msgstr "Аӡдырга" #: sw/inc/strings.hrc:61 msgctxt "STR_POOLFRM_LABEL" @@ -804,7 +806,7 @@ #: sw/inc/strings.hrc:63 msgctxt "STR_POOLCOLL_STANDARD" msgid "Default Style" -msgstr "" +msgstr "Абазатә стиль" #: sw/inc/strings.hrc:64 msgctxt "STR_POOLCOLL_TEXT" @@ -814,17 +816,17 @@ #: sw/inc/strings.hrc:65 msgctxt "STR_POOLCOLL_TEXT_IDENT" msgid "First Line Indent" -msgstr "" +msgstr "Актәи ацәаҳәа ахьаҵ ацны" #: sw/inc/strings.hrc:66 msgctxt "STR_POOLCOLL_TEXT_NEGIDENT" msgid "Hanging Indent" -msgstr "" +msgstr "Шьҭахьлатәи ахьаҵ" #: sw/inc/strings.hrc:67 msgctxt "STR_POOLCOLL_TEXT_MOVE" msgid "Text Body Indent" -msgstr "" +msgstr "Ихадоу атеқст ахьаҵ ацны" #: sw/inc/strings.hrc:68 msgctxt "STR_POOLCOLL_GREETING" @@ -854,12 +856,12 @@ #: sw/inc/strings.hrc:73 msgctxt "STR_POOLCOLL_CONFRONTATION" msgid "List Indent" -msgstr "" +msgstr "Ахьаҵқәа" #: sw/inc/strings.hrc:74 msgctxt "STR_POOLCOLL_MARGINAL" msgid "Marginalia" -msgstr "" +msgstr "Азгәаҭақәа" #: sw/inc/strings.hrc:75 msgctxt "STR_POOLCOLL_HEADLINE1" @@ -914,7 +916,7 @@ #: sw/inc/strings.hrc:85 msgctxt "STR_POOLCOLL_NUM_LEVEL1S" msgid "Numbering 1 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 1" #: sw/inc/strings.hrc:86 msgctxt "STR_POOLCOLL_NUM_LEVEL1" @@ -924,17 +926,17 @@ #: sw/inc/strings.hrc:87 msgctxt "STR_POOLCOLL_NUM_LEVEL1E" msgid "Numbering 1 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 1" #: sw/inc/strings.hrc:88 msgctxt "STR_POOLCOLL_NUM_NONUM1" msgid "Numbering 1 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 1" #: sw/inc/strings.hrc:89 msgctxt "STR_POOLCOLL_NUM_LEVEL2S" msgid "Numbering 2 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 2" #: sw/inc/strings.hrc:90 msgctxt "STR_POOLCOLL_NUM_LEVEL2" @@ -944,17 +946,17 @@ #: sw/inc/strings.hrc:91 msgctxt "STR_POOLCOLL_NUM_LEVEL2E" msgid "Numbering 2 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 2" #: sw/inc/strings.hrc:92 msgctxt "STR_POOLCOLL_NUM_NONUM2" msgid "Numbering 2 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 2" #: sw/inc/strings.hrc:93 msgctxt "STR_POOLCOLL_NUM_LEVEL3S" msgid "Numbering 3 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 3" #: sw/inc/strings.hrc:94 msgctxt "STR_POOLCOLL_NUM_LEVEL3" @@ -964,17 +966,17 @@ #: sw/inc/strings.hrc:95 msgctxt "STR_POOLCOLL_NUM_LEVEL3E" msgid "Numbering 3 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 3" #: sw/inc/strings.hrc:96 msgctxt "STR_POOLCOLL_NUM_NONUM3" msgid "Numbering 3 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 3" #: sw/inc/strings.hrc:97 msgctxt "STR_POOLCOLL_NUM_LEVEL4S" msgid "Numbering 4 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 4" #: sw/inc/strings.hrc:98 msgctxt "STR_POOLCOLL_NUM_LEVEL4" @@ -984,17 +986,17 @@ #: sw/inc/strings.hrc:99 msgctxt "STR_POOLCOLL_NUM_LEVEL4E" msgid "Numbering 4 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 4" #: sw/inc/strings.hrc:100 msgctxt "STR_POOLCOLL_NUM_NONUM4" msgid "Numbering 4 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 4" #: sw/inc/strings.hrc:101 msgctxt "STR_POOLCOLL_NUM_LEVEL5S" msgid "Numbering 5 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 5" #: sw/inc/strings.hrc:102 msgctxt "STR_POOLCOLL_NUM_LEVEL5" @@ -1004,47 +1006,47 @@ #: sw/inc/strings.hrc:103 msgctxt "STR_POOLCOLL_NUM_LEVEL5E" msgid "Numbering 5 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 5" #: sw/inc/strings.hrc:104 msgctxt "STR_POOLCOLL_NUM_NONUM5" msgid "Numbering 5 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 5" #: sw/inc/strings.hrc:105 msgctxt "STR_POOLCOLL_BUL_LEVEL1S" msgid "List 1 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 1" #: sw/inc/strings.hrc:106 msgctxt "STR_POOLCOLL_BUL_LEVEL1" msgid "List 1" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 1" #: sw/inc/strings.hrc:107 msgctxt "STR_POOLCOLL_BUL_LEVEL1E" msgid "List 1 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 1" #: sw/inc/strings.hrc:108 msgctxt "STR_POOLCOLL_BUL_NONUM1" msgid "List 1 Cont." -msgstr "" +msgstr "Иномеррку ахьӡынҵа иацу 1" #: sw/inc/strings.hrc:109 msgctxt "STR_POOLCOLL_BUL_LEVEL2S" msgid "List 2 Start" -msgstr "" +msgstr "Иномеррку ахьӡынҵа алагамҭа 2" #: sw/inc/strings.hrc:110 msgctxt "STR_POOLCOLL_BUL_LEVEL2" msgid "List 2" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 2" #: sw/inc/strings.hrc:111 msgctxt "STR_POOLCOLL_BUL_LEVEL2E" msgid "List 2 End" -msgstr "" +msgstr "Иномеррку ахьӡынҵа анҵәамҭа 2" #: sw/inc/strings.hrc:112 msgctxt "STR_POOLCOLL_BUL_NONUM2" @@ -1114,32 +1116,32 @@ #: sw/inc/strings.hrc:125 msgctxt "STR_POOLCOLL_HEADER" msgid "Header" -msgstr "" +msgstr "Хыхтәи аколонтитул" #: sw/inc/strings.hrc:126 msgctxt "STR_POOLCOLL_HEADERL" msgid "Header Left" -msgstr "" +msgstr "Хыхтәи аколонтитул арымарахь" #: sw/inc/strings.hrc:127 msgctxt "STR_POOLCOLL_HEADERR" msgid "Header Right" -msgstr "" +msgstr "Хыхтәи аколонтитул арыӷьарахь" #: sw/inc/strings.hrc:128 msgctxt "STR_POOLCOLL_FOOTER" msgid "Footer" -msgstr "" +msgstr "Ҵаҟатәи аколонтитул" #: sw/inc/strings.hrc:129 msgctxt "STR_POOLCOLL_FOOTERL" msgid "Footer Left" -msgstr "" +msgstr "Ҵаҟатәи аколонтитул арымарахь" #: sw/inc/strings.hrc:130 msgctxt "STR_POOLCOLL_FOOTERR" msgid "Footer Right" -msgstr "" +msgstr "Ҵаҟатәи аколонтитул арыӷьарахь" #: sw/inc/strings.hrc:131 msgctxt "STR_POOLCOLL_TABLE" @@ -1159,12 +1161,12 @@ #: sw/inc/strings.hrc:134 msgctxt "STR_POOLCOLL_FOOTNOTE" msgid "Footnote" -msgstr "" +msgstr "Албаага" #: sw/inc/strings.hrc:135 msgctxt "STR_POOLCOLL_ENDNOTE" msgid "Endnote" -msgstr "" +msgstr "Анҵәамҭатә лбаага" #: sw/inc/strings.hrc:136 msgctxt "STR_POOLCOLL_LABEL" @@ -1194,7 +1196,7 @@ #: sw/inc/strings.hrc:141 msgctxt "STR_POOLCOLL_LABEL_FIGURE" msgid "Figure" -msgstr "" +msgstr "Афигура" #: sw/inc/strings.hrc:142 msgctxt "STR_POOLCOLL_JAKETADRESS" @@ -1209,22 +1211,22 @@ #: sw/inc/strings.hrc:144 msgctxt "STR_POOLCOLL_TOX_IDXH" msgid "Index Heading" -msgstr "" +msgstr "Аҭыԥрбага ахы" #: sw/inc/strings.hrc:145 msgctxt "STR_POOLCOLL_TOX_IDX1" msgid "Index 1" -msgstr "" +msgstr "Аҭыԥрбага 1" #: sw/inc/strings.hrc:146 msgctxt "STR_POOLCOLL_TOX_IDX2" msgid "Index 2" -msgstr "" +msgstr "Аҭыԥрбага 2" #: sw/inc/strings.hrc:147 msgctxt "STR_POOLCOLL_TOX_IDX3" msgid "Index 3" -msgstr "" +msgstr "Аҭыԥрбага 3" #: sw/inc/strings.hrc:148 msgctxt "STR_POOLCOLL_TOX_IDXBREAK" @@ -1239,107 +1241,107 @@ #: sw/inc/strings.hrc:150 msgctxt "STR_POOLCOLL_TOX_CNTNT1" msgid "Contents 1" -msgstr "" +msgstr "Ахы 1" #: sw/inc/strings.hrc:151 msgctxt "STR_POOLCOLL_TOX_CNTNT2" msgid "Contents 2" -msgstr "" +msgstr "Ахы 2" #: sw/inc/strings.hrc:152 msgctxt "STR_POOLCOLL_TOX_CNTNT3" msgid "Contents 3" -msgstr "" +msgstr "Ахы 3" #: sw/inc/strings.hrc:153 msgctxt "STR_POOLCOLL_TOX_CNTNT4" msgid "Contents 4" -msgstr "" +msgstr "Ахы 4" #: sw/inc/strings.hrc:154 msgctxt "STR_POOLCOLL_TOX_CNTNT5" msgid "Contents 5" -msgstr "" +msgstr "Ахы 5" #: sw/inc/strings.hrc:155 msgctxt "STR_POOLCOLL_TOX_CNTNT6" msgid "Contents 6" -msgstr "" +msgstr "Ахы 6" #: sw/inc/strings.hrc:156 msgctxt "STR_POOLCOLL_TOX_CNTNT7" msgid "Contents 7" -msgstr "" +msgstr "Ахы 7" #: sw/inc/strings.hrc:157 msgctxt "STR_POOLCOLL_TOX_CNTNT8" msgid "Contents 8" -msgstr "" +msgstr "Ахы 8" #: sw/inc/strings.hrc:158 msgctxt "STR_POOLCOLL_TOX_CNTNT9" msgid "Contents 9" -msgstr "" +msgstr "Ахы 9" #: sw/inc/strings.hrc:159 msgctxt "STR_POOLCOLL_TOX_CNTNT10" msgid "Contents 10" -msgstr "" +msgstr "Ахы 10" #: sw/inc/strings.hrc:160 msgctxt "STR_POOLCOLL_TOX_USERH" msgid "User Index Heading" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбагақәа рхы" #: sw/inc/strings.hrc:161 msgctxt "STR_POOLCOLL_TOX_USER1" msgid "User Index 1" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 1" #: sw/inc/strings.hrc:162 msgctxt "STR_POOLCOLL_TOX_USER2" msgid "User Index 2" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 2" #: sw/inc/strings.hrc:163 msgctxt "STR_POOLCOLL_TOX_USER3" msgid "User Index 3" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 3" #: sw/inc/strings.hrc:164 msgctxt "STR_POOLCOLL_TOX_USER4" msgid "User Index 4" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 4" #: sw/inc/strings.hrc:165 msgctxt "STR_POOLCOLL_TOX_USER5" msgid "User Index 5" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 5" #: sw/inc/strings.hrc:166 msgctxt "STR_POOLCOLL_TOX_USER6" msgid "User Index 6" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 6" #: sw/inc/strings.hrc:167 msgctxt "STR_POOLCOLL_TOX_USER7" msgid "User Index 7" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 7" #: sw/inc/strings.hrc:168 msgctxt "STR_POOLCOLL_TOX_USER8" msgid "User Index 8" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 8" #: sw/inc/strings.hrc:169 msgctxt "STR_POOLCOLL_TOX_USER9" msgid "User Index 9" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 9" #: sw/inc/strings.hrc:170 msgctxt "STR_POOLCOLL_TOX_USER10" msgid "User Index 10" -msgstr "" +msgstr "Ахархәаҩ иҭыԥрбага 10" #: sw/inc/strings.hrc:171 msgctxt "STR_POOLCOLL_TOX_CITATION" @@ -1349,27 +1351,27 @@ #: sw/inc/strings.hrc:172 msgctxt "STR_POOLCOLL_TOX_ILLUSH" msgid "Figure Index Heading" -msgstr "" +msgstr "Асахьқәа рыхьӡынҵа ахы" #: sw/inc/strings.hrc:173 msgctxt "STR_POOLCOLL_TOX_ILLUS1" msgid "Figure Index 1" -msgstr "" +msgstr "Асахьақәа рыхьӡынҵа 1" #: sw/inc/strings.hrc:174 msgctxt "STR_POOLCOLL_TOX_OBJECTH" msgid "Object Index Heading" -msgstr "" +msgstr "Аобиектқәа рыхьӡынҵа ахы" #: sw/inc/strings.hrc:175 msgctxt "STR_POOLCOLL_TOX_OBJECT1" msgid "Object Index 1" -msgstr "" +msgstr "Аобиеқтқәа рыхьӡынҵа 1" #: sw/inc/strings.hrc:176 msgctxt "STR_POOLCOLL_TOX_TABLESH" msgid "Table Index Heading" -msgstr "" +msgstr "Атаблицақәа рыхьӡынҵа ахы" #: sw/inc/strings.hrc:177 msgctxt "STR_POOLCOLL_TOX_TABLES1" @@ -1379,7 +1381,7 @@ #: sw/inc/strings.hrc:178 msgctxt "STR_POOLCOLL_TOX_AUTHORITIESH" msgid "Bibliography Heading" -msgstr "" +msgstr "Абиблиографиа ахы" #: sw/inc/strings.hrc:179 msgctxt "STR_POOLCOLL_TOX_AUTHORITIES1" @@ -1400,7 +1402,7 @@ #: sw/inc/strings.hrc:183 msgctxt "STR_POOLCOLL_HTML_BLOCKQUOTE" msgid "Quotations" -msgstr "" +msgstr "Блоклатәи ацитата" #: sw/inc/strings.hrc:184 msgctxt "STR_POOLCOLL_HTML_PRE" @@ -1415,18 +1417,18 @@ #: sw/inc/strings.hrc:186 msgctxt "STR_POOLCOLL_HTML_DD" msgid "List Contents" -msgstr "" +msgstr "Ахьӡынҵа аҵанакы" #: sw/inc/strings.hrc:187 msgctxt "STR_POOLCOLL_HTML_DT" msgid "List Heading" -msgstr "" +msgstr "Ахьӡынҵа ахы" #. page style names #: sw/inc/strings.hrc:189 msgctxt "STR_POOLPAGE_STANDARD" msgid "Default Style" -msgstr "" +msgstr "Абазатә стиль" #: sw/inc/strings.hrc:190 msgctxt "STR_POOLPAGE_FIRST" @@ -1446,7 +1448,7 @@ #: sw/inc/strings.hrc:193 msgctxt "STR_POOLPAGE_JAKET" msgid "Envelope" -msgstr "" +msgstr "Аконверт" #: sw/inc/strings.hrc:194 #, fuzzy @@ -1462,12 +1464,12 @@ #: sw/inc/strings.hrc:196 msgctxt "STR_POOLPAGE_FOOTNOTE" msgid "Footnote" -msgstr "" +msgstr "Албаага" #: sw/inc/strings.hrc:197 msgctxt "STR_POOLPAGE_ENDNOTE" msgid "Endnote" -msgstr "" +msgstr "Анҵәамҭатә лбаага" #: sw/inc/strings.hrc:198 msgctxt "STR_POOLPAGE_LANDSCAPE" @@ -1478,83 +1480,83 @@ #: sw/inc/strings.hrc:200 msgctxt "STR_POOLNUMRULE_NUM1" msgid "Numbering 123" -msgstr "" +msgstr "Иномеррку 123" #: sw/inc/strings.hrc:201 msgctxt "STR_POOLNUMRULE_NUM2" msgid "Numbering ABC" -msgstr "" +msgstr "Иномеррку ABC" #: sw/inc/strings.hrc:202 msgctxt "STR_POOLNUMRULE_NUM3" msgid "Numbering abc" -msgstr "" +msgstr "Иномеррку abc" #: sw/inc/strings.hrc:203 msgctxt "STR_POOLNUMRULE_NUM4" msgid "Numbering IVX" -msgstr "" +msgstr "Иномеррку IVX" #: sw/inc/strings.hrc:204 msgctxt "STR_POOLNUMRULE_NUM5" msgid "Numbering ivx" -msgstr "" +msgstr "Иномеррку ivx" #: sw/inc/strings.hrc:205 msgctxt "STR_POOLNUMRULE_BUL1" msgid "List 1" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 1" #: sw/inc/strings.hrc:206 msgctxt "STR_POOLNUMRULE_BUL2" msgid "List 2" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 2" #: sw/inc/strings.hrc:207 msgctxt "STR_POOLNUMRULE_BUL3" msgid "List 3" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 3" #: sw/inc/strings.hrc:208 msgctxt "STR_POOLNUMRULE_BUL4" msgid "List 4" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 4" #: sw/inc/strings.hrc:209 msgctxt "STR_POOLNUMRULE_BUL5" msgid "List 5" -msgstr "" +msgstr "Иномеррку ахьӡынҵа 5" #: sw/inc/strings.hrc:210 msgctxt "STR_COLUMN_VALUESET_ITEM0" msgid "1 column" -msgstr "" +msgstr "Аиҵаҩ 1" #: sw/inc/strings.hrc:211 msgctxt "STR_COLUMN_VALUESET_ITEM1" msgid "2 columns with equal size" -msgstr "" +msgstr "Еиҟароу аҭбаара змоу аиҵаҩқәа 2" #: sw/inc/strings.hrc:212 msgctxt "STR_COLUMN_VALUESET_ITEM2" msgid "3 columns with equal size" -msgstr "" +msgstr "Еиҟароу аҭбаара змоу аиҵагылақәа 3" #: sw/inc/strings.hrc:213 msgctxt "STR_COLUMN_VALUESET_ITEM3" msgid "2 columns with different size (left > right)" -msgstr "" +msgstr "Зыҭбаарақәа еиҟарам аиҵаҩқәа 2 (армарахьтәи > арӷьарахьтәи)" #: sw/inc/strings.hrc:214 msgctxt "STR_COLUMN_VALUESET_ITEM4" msgid "2 columns with different size (left < right)" -msgstr "" +msgstr "Зыҭбаарақәа еиҟарам аиҵаҩқәа 2 (армарахьтәи > арӷьарахьтәи)" #. Table styles, Writer internal, others are taken from Svx #: sw/inc/strings.hrc:216 msgctxt "STR_TABSTYLE_DEFAULT" msgid "Default Style" -msgstr "" +msgstr "Абазатә стиль" #: sw/inc/strings.hrc:218 msgctxt "STR_PARAGRAPHSTYLEFAMILY" @@ -1590,7 +1592,7 @@ #: sw/inc/strings.hrc:224 msgctxt "STR_ENV_TITLE" msgid "Envelope" -msgstr "" +msgstr "Аконверт" #: sw/inc/strings.hrc:225 #, fuzzy @@ -1627,27 +1629,27 @@ #: sw/inc/strings.hrc:232 msgctxt "STR_LOAD_GLOBAL_DOC" msgid "Name and Path of Master Document" -msgstr "" +msgstr "Еилоу адокумент ахьӡи амҩеи" #: sw/inc/strings.hrc:233 msgctxt "STR_LOAD_HTML_DOC" msgid "Name and Path of the HTML Document" -msgstr "" +msgstr "HTML адокумент ахьӡи амҩеи" #: sw/inc/strings.hrc:234 msgctxt "STR_JAVA_EDIT" msgid "Edit Script" -msgstr "" +msgstr "Асценари аредакциазура" #: sw/inc/strings.hrc:235 msgctxt "STR_REMOVE_WARNING" msgid "The following characters are not valid and have been removed: " -msgstr "" +msgstr "Анаҩстәи ииашам асимволқәа аныхын: " #: sw/inc/strings.hrc:236 msgctxt "STR_BOOKMARK_DEF_NAME" msgid "Bookmark" -msgstr "" +msgstr "Агәылаҵа" #: sw/inc/strings.hrc:237 msgctxt "STR_BOOKMARK_NAME" @@ -1662,7 +1664,7 @@ #: sw/inc/strings.hrc:239 msgctxt "STR_BOOKMARK_HIDDEN" msgid "Hidden" -msgstr "" +msgstr "Иҵәаху" #: sw/inc/strings.hrc:240 msgctxt "STR_BOOKMARK_CONDITION" @@ -1702,7 +1704,7 @@ #: sw/inc/strings.hrc:247 msgctxt "STR_READONLY_PATH" msgid "The 'AutoText' directories are read-only. Do you want to call the path settings dialog?" -msgstr "" +msgstr "Акаталог 'AutoText' азкуп аԥхьара мацара. Иааԥхатәума амҩа азалхра иазку диалог?" #: sw/inc/strings.hrc:248 msgctxt "STR_DOC_STAT" @@ -1728,12 +1730,12 @@ #: sw/inc/strings.hrc:253 msgctxt "STR_STATSTR_REFORMAT" msgid "Repagination..." -msgstr "" +msgstr "Даҟьала аихшара..." #: sw/inc/strings.hrc:254 msgctxt "STR_STATSTR_AUTOFORMAT" msgid "Formatting document automatically..." -msgstr "" +msgstr "Адокумент автоматикала аформатркра..." #: sw/inc/strings.hrc:255 msgctxt "STR_STATSTR_SEARCH" @@ -1753,27 +1755,27 @@ #: sw/inc/strings.hrc:258 msgctxt "STR_STATSTR_HYPHEN" msgid "Hyphenation..." -msgstr "" +msgstr "Аиагагақәа рыргылара..." #: sw/inc/strings.hrc:259 msgctxt "STR_STATSTR_TOX_INSERT" msgid "Inserting Index..." -msgstr "" +msgstr "Аҭыԥрбага аҭаргылара..." #: sw/inc/strings.hrc:260 msgctxt "STR_STATSTR_TOX_UPDATE" msgid "Updating Index..." -msgstr "" +msgstr "Аҭыԥрба арҿыцра..." #: sw/inc/strings.hrc:261 msgctxt "STR_STATSTR_SUMMARY" msgid "Creating abstract..." -msgstr "" +msgstr "Ареферат аԥҵара..." #: sw/inc/strings.hrc:262 msgctxt "STR_STATSTR_SWGPRTOLENOTIFY" msgid "Adapt Objects..." -msgstr "" +msgstr "Аобиектқәа адаптациа рзутәуп..." #: sw/inc/strings.hrc:263 msgctxt "STR_TABLE_DEFNAME" @@ -1823,12 +1825,12 @@ #: sw/inc/strings.hrc:272 msgctxt "STR_FDLG_TEMPLATE_NAME" msgid "separated by: " -msgstr "" +msgstr "еидыхлатәуп ала: " #: sw/inc/strings.hrc:273 msgctxt "STR_FDLG_OUTLINE_LEVEL" msgid "Outline: Level " -msgstr "" +msgstr "Аструктура: аҩаӡара" #: sw/inc/strings.hrc:274 msgctxt "STR_FDLG_STYLE" @@ -1858,12 +1860,12 @@ #: sw/inc/strings.hrc:279 msgctxt "STR_CTL_FONT" msgid "CTL text: " -msgstr "" +msgstr "ИАР атеқст:" #: sw/inc/strings.hrc:280 msgctxt "STR_REDLINE_UNKNOWN_AUTHOR" msgid "Unknown Author" -msgstr "" +msgstr "<ианониму>" #: sw/inc/strings.hrc:281 msgctxt "STR_DELETE_NOTE_AUTHOR" @@ -1885,7 +1887,7 @@ #: sw/inc/strings.hrc:286 msgctxt "STR_WORDCOUNT" msgid "Selected: $1, $2" -msgstr "" +msgstr "Иалкаауп: $1, $2" #. To translators: STR_WORDCOUNT_WORDARG is $1 of STR_WORDCOUNT. $1 of STR_WORDCOUNT is number of words #: sw/inc/strings.hrc:288 @@ -1908,7 +1910,7 @@ #: sw/inc/strings.hrc:293 msgctxt "STR_WORDCOUNT_NO_SELECTION" msgid "$1, $2" -msgstr "" +msgstr "$1, $2" #. To translators: STR_WORDCOUNT_WORDARG_NO_SELECTION is $1 of STR_WORDCOUNT_NO_SELECTION. #. $1 of STR_WORDCOUNT_NO_SELECTION is number of words @@ -1991,7 +1993,7 @@ #: sw/inc/strings.hrc:312 msgctxt "STR_SOUTH" msgid "South" -msgstr "" +msgstr "Алада" #: sw/inc/strings.hrc:313 msgctxt "STR_SUM" @@ -2005,6 +2007,9 @@ "The desired AutoFormat could not be created. \n" "Try again using a different name." msgstr "" +"Иҭагалоуп ииашам ахьӡ.\n" +"Иаҭаху автоформат аԥҵара ауам.\n" +"Шәхы иашәырхәа даҽа хьӡык." #: sw/inc/strings.hrc:315 msgctxt "STR_NUMERIC" @@ -2034,7 +2039,7 @@ #: sw/inc/strings.hrc:320 msgctxt "STR_ACCESS_PAGESETUP_SPACING" msgid "Spacing between %1 and %2" -msgstr "" +msgstr "%1- и %2-еи рыбжьара аинтервал" #: sw/inc/strings.hrc:321 msgctxt "STR_ACCESS_COLUMN_WIDTH" @@ -2059,12 +2064,12 @@ #: sw/inc/strings.hrc:325 msgctxt "STR_CAPTION_OLE" msgid "Other OLE Objects" -msgstr "" +msgstr "OLE егьырҭ аобиектқәа" #: sw/inc/strings.hrc:326 msgctxt "STR_WRONG_TABLENAME" msgid "The name of the table must not contain spaces." -msgstr "" +msgstr "Атаблица ахьӡ иаҵанамкуазароуп абжьажьқәа." #: sw/inc/strings.hrc:327 msgctxt "STR_ERR_TABLE_MERGE" @@ -2074,7 +2079,7 @@ #: sw/inc/strings.hrc:328 msgctxt "STR_SRTERR" msgid "Cannot sort selection" -msgstr "" +msgstr "Иалху асортра ауам" #. Miscellaneous #: sw/inc/strings.hrc:331 @@ -2085,17 +2090,17 @@ #: sw/inc/strings.hrc:332 msgctxt "STR_EVENT_START_INS_GLOSSARY" msgid "Before inserting AutoText" -msgstr "" +msgstr "Автотеқст аҭаргылара аԥхьа" #: sw/inc/strings.hrc:333 msgctxt "STR_EVENT_END_INS_GLOSSARY" msgid "After inserting AutoText" -msgstr "" +msgstr "Автотеқст аҭаргылара ашьҭахь" #: sw/inc/strings.hrc:334 msgctxt "STR_EVENT_MOUSEOVER_OBJECT" msgid "Mouse over object" -msgstr "" +msgstr "Аҳәынаԥ аобиект аҩадахьы" #: sw/inc/strings.hrc:335 msgctxt "STR_EVENT_MOUSECLICK_OBJECT" @@ -2105,7 +2110,7 @@ #: sw/inc/strings.hrc:336 msgctxt "STR_EVENT_MOUSEOUT_OBJECT" msgid "Mouse leaves object" -msgstr "" +msgstr "Аҳәынаԥ аобиект ннажьуеит" #: sw/inc/strings.hrc:337 msgctxt "STR_EVENT_IMAGE_LOAD" @@ -2136,12 +2141,12 @@ #: sw/inc/strings.hrc:342 msgctxt "STR_EVENT_FRM_RESIZE" msgid "Resize frame" -msgstr "" +msgstr "Арамка ашәагаа аԥсахра" #: sw/inc/strings.hrc:343 msgctxt "STR_EVENT_FRM_MOVE" msgid "Move frame" -msgstr "" +msgstr "Арамка аиҭагара" #: sw/inc/strings.hrc:344 msgctxt "STR_CONTENT_TYPE_OUTLINE" @@ -2171,7 +2176,7 @@ #: sw/inc/strings.hrc:349 msgctxt "STR_CONTENT_TYPE_BOOKMARK" msgid "Bookmarks" -msgstr "" +msgstr "Агәылаҵақәа" #: sw/inc/strings.hrc:350 #, fuzzy @@ -2217,7 +2222,7 @@ #: sw/inc/strings.hrc:358 msgctxt "STR_IDXEXAMPLE_IDXTXT_HEADING11" msgid "Heading 1.1" -msgstr "" +msgstr "Ахы 1.1" #: sw/inc/strings.hrc:359 msgctxt "STR_IDXEXAMPLE_IDXTXT_ENTRY11" @@ -2227,7 +2232,7 @@ #: sw/inc/strings.hrc:360 msgctxt "STR_IDXEXAMPLE_IDXTXT_HEADING12" msgid "Heading 1.2" -msgstr "" +msgstr "Ахы 1.2" #: sw/inc/strings.hrc:361 msgctxt "STR_IDXEXAMPLE_IDXTXT_ENTRY12" @@ -2242,7 +2247,7 @@ #: sw/inc/strings.hrc:363 msgctxt "STR_IDXEXAMPLE_IDXTXT_IMAGE1" msgid "Image 1: This is image 1" -msgstr "" +msgstr "Асахьа 1: Ари асахьа 1" #: sw/inc/strings.hrc:364 msgctxt "STR_CONTENT_TYPE_SINGLE_OUTLINE" @@ -2272,7 +2277,7 @@ #: sw/inc/strings.hrc:369 msgctxt "STR_CONTENT_TYPE_SINGLE_BOOKMARK" msgid "Bookmark" -msgstr "" +msgstr "Агәылаҵа" #: sw/inc/strings.hrc:370 msgctxt "STR_CONTENT_TYPE_SINGLE_REGION" @@ -2303,12 +2308,12 @@ #: sw/inc/strings.hrc:375 msgctxt "STR_CONTENT_TYPE_SINGLE_DRAWOBJECT" msgid "Draw object" -msgstr "" +msgstr "Аграфикатә обиект" #: sw/inc/strings.hrc:376 msgctxt "STR_DEFINE_NUMBERFORMAT" msgid "Additional formats..." -msgstr "" +msgstr "Егьырҭ аформатқәа..." #: sw/inc/strings.hrc:377 msgctxt "RID_STR_SYSTEM" @@ -2321,11 +2326,13 @@ "The interactive hyphenation is already active\n" "in a different document" msgstr "" +"Интерактивла аиагагақәа рықәыргылара\n" +"аҿакуп егьи адокумент аҟны" #: sw/inc/strings.hrc:379 msgctxt "STR_HYPH_TITLE" msgid "Hyphenation" -msgstr "" +msgstr "Аиагагақәа рыргылара" #: sw/inc/strings.hrc:382 msgctxt "STR_CANT_UNDO" @@ -2435,17 +2442,17 @@ #: sw/inc/strings.hrc:403 msgctxt "STR_INSERT_PAGE_BREAK_UNDO" msgid "Insert page break" -msgstr "" +msgstr "Иҭаргылатәуп адаҟьа аимҟьара" #: sw/inc/strings.hrc:404 msgctxt "STR_INSERT_COLUMN_BREAK_UNDO" msgid "Insert column break" -msgstr "" +msgstr "Иҭаргылатәуп аиҵаҩ аимҟьара" #: sw/inc/strings.hrc:405 msgctxt "STR_INSERT_ENV_UNDO" msgid "Insert Envelope" -msgstr "" +msgstr "Иҭаргылатәуп аконверт" #: sw/inc/strings.hrc:406 msgctxt "STR_DRAG_AND_COPY" @@ -2491,7 +2498,7 @@ #: sw/inc/strings.hrc:414 msgctxt "STR_INSERTSECTION" msgid "Insert section" -msgstr "" +msgstr "Иҭаргылатәуп аҟәша" #: sw/inc/strings.hrc:415 msgctxt "STR_DELETESECTION" @@ -2501,12 +2508,12 @@ #: sw/inc/strings.hrc:416 msgctxt "STR_CHANGESECTION" msgid "Modify section" -msgstr "" +msgstr "Иԥсахтәуп аҟәша" #: sw/inc/strings.hrc:417 msgctxt "STR_CHANGEDEFATTR" msgid "Modify default values" -msgstr "" +msgstr "Иԥсахтәуп астандарттә ҵакқәа" #: sw/inc/strings.hrc:418 msgctxt "STR_REPLACE_STYLE" @@ -2526,7 +2533,7 @@ #: sw/inc/strings.hrc:421 msgctxt "STR_OUTLINE_LR" msgid "Promote/demote outline" -msgstr "" +msgstr "Албаагақәа рструктура" #: sw/inc/strings.hrc:422 msgctxt "STR_OUTLINE_UD" @@ -2536,17 +2543,17 @@ #: sw/inc/strings.hrc:423 msgctxt "STR_INSNUM" msgid "Insert numbering" -msgstr "" +msgstr "Иҭаргылатәуп аномерркра" #: sw/inc/strings.hrc:424 msgctxt "STR_NUMUP" msgid "Promote level" -msgstr "" +msgstr "Ахьаҵ аҩаӡара" #: sw/inc/strings.hrc:425 msgctxt "STR_NUMDOWN" msgid "Demote level" -msgstr "" +msgstr "Иларҟәтәуп аҩаӡара" #: sw/inc/strings.hrc:426 msgctxt "STR_MOVENUM" @@ -2556,7 +2563,7 @@ #: sw/inc/strings.hrc:427 msgctxt "STR_INSERTDRAW" msgid "Insert drawing object: $1" -msgstr "" +msgstr "Иҭаргылатәуп аграфикатә обиект: $1" #: sw/inc/strings.hrc:428 msgctxt "STR_NUMORNONUM" @@ -2566,37 +2573,37 @@ #: sw/inc/strings.hrc:429 msgctxt "STR_INC_LEFTMARGIN" msgid "Increase Indent" -msgstr "" +msgstr "Иазырҳатәуп ахьаҵ" #: sw/inc/strings.hrc:430 msgctxt "STR_DEC_LEFTMARGIN" msgid "Decrease indent" -msgstr "" +msgstr "Иазырҵатәуп ахьаҵ" #: sw/inc/strings.hrc:431 msgctxt "STR_INSERTLABEL" msgid "Insert caption: $1" -msgstr "" +msgstr "Иҭаргылатәуп ахы: $1" #: sw/inc/strings.hrc:432 msgctxt "STR_SETNUMRULESTART" msgid "Restart numbering" -msgstr "" +msgstr "Иалагатәуп аномерркра ҿыц" #: sw/inc/strings.hrc:433 msgctxt "STR_CHANGEFTN" msgid "Modify footnote" -msgstr "" +msgstr "Иԥсахтәуп албаага" #: sw/inc/strings.hrc:434 msgctxt "STR_ACCEPT_REDLINE" msgid "Accept change: $1" -msgstr "" +msgstr "Ихадкылатәуп аԥсахра: $1" #: sw/inc/strings.hrc:435 msgctxt "STR_REJECT_REDLINE" msgid "Reject change: $1" -msgstr "" +msgstr "Мап ацәктәуп аԥсахра: $1" #: sw/inc/strings.hrc:436 msgctxt "STR_SPLIT_TABLE" @@ -2636,12 +2643,12 @@ #: sw/inc/strings.hrc:443 msgctxt "STR_DRAWGROUP" msgid "Group draw objects" -msgstr "" +msgstr "Иргәыԥтәуп аграфикатә обиектқәа" #: sw/inc/strings.hrc:444 msgctxt "STR_DRAWUNGROUP" msgid "Ungroup drawing objects" -msgstr "" +msgstr "Асахьақәа рыргәыԥра ықәгатәуп" #: sw/inc/strings.hrc:445 msgctxt "STR_DRAWDELETE" @@ -2696,7 +2703,7 @@ #: sw/inc/strings.hrc:455 msgctxt "STR_UNDO_TABLE_SPLIT" msgid "Split Cells" -msgstr "" +msgstr "Еиҟәшатәуп абларҭақәа" #: sw/inc/strings.hrc:456 msgctxt "STR_UNDO_TABLE_MERGE" @@ -2716,7 +2723,7 @@ #: sw/inc/strings.hrc:459 msgctxt "STR_CLEAR_TOX_RANGE" msgid "Remove index/table" -msgstr "" +msgstr "Иныхтәуп ахқәа/аҭыԥрбага" #: sw/inc/strings.hrc:460 msgctxt "STR_TABLE_TBLCPYTBL" @@ -2731,7 +2738,7 @@ #: sw/inc/strings.hrc:462 msgctxt "STR_INS_FROM_SHADOWCRSR" msgid "Set cursor" -msgstr "" +msgstr "Иқәыргылатәуп акурсор" #: sw/inc/strings.hrc:463 msgctxt "STR_UNDO_CHAIN" @@ -2766,12 +2773,12 @@ #: sw/inc/strings.hrc:469 msgctxt "STR_INSERT_FOOTNOTE" msgid "Insert footnote" -msgstr "" +msgstr "Иҭаргылатәуп албаага" #: sw/inc/strings.hrc:470 msgctxt "STR_INSERT_URLBTN" msgid "insert URL button" -msgstr "" +msgstr "Иҭаргылатәуп URL акнопка" #: sw/inc/strings.hrc:471 msgctxt "STR_INSERT_URLTXT" @@ -2781,7 +2788,7 @@ #: sw/inc/strings.hrc:472 msgctxt "STR_DELETE_INVISIBLECNTNT" msgid "remove invisible content" -msgstr "" +msgstr "ианыхтәуп иҵәаху аҵанакы" #: sw/inc/strings.hrc:473 msgctxt "STR_TOXCHANGE" @@ -2806,7 +2813,7 @@ #: sw/inc/strings.hrc:477 msgctxt "STR_MULTISEL" msgid "multiple selection" -msgstr "" +msgstr "ирацәоу алхра" #: sw/inc/strings.hrc:478 msgctxt "STR_TYPING_UNDO" @@ -2816,7 +2823,7 @@ #: sw/inc/strings.hrc:479 msgctxt "STR_PASTE_CLIPBOARD_UNDO" msgid "Paste clipboard" -msgstr "" +msgstr "Иҭаргылатәуп аиҭныԥсахларатә гәынкылага" #: sw/inc/strings.hrc:480 msgctxt "STR_YIELDS" @@ -2850,7 +2857,7 @@ #: sw/inc/strings.hrc:485 msgctxt "STR_UNDO_COLBRKS" msgid "column break" -msgstr "" +msgstr "аиҵаҩ аимҟьара" #: sw/inc/strings.hrc:486 msgctxt "STR_UNDO_REDLINE_INSERT" @@ -2895,7 +2902,7 @@ #: sw/inc/strings.hrc:494 msgctxt "STR_UNDO_REDLINE_TABLE_CELL_INSERT" msgid "Insert Cell" -msgstr "" +msgstr "Абларҭа аҭаргылара" #: sw/inc/strings.hrc:495 msgctxt "STR_UNDO_REDLINE_TABLE_CELL_DELETE" @@ -2935,7 +2942,7 @@ #: sw/inc/strings.hrc:502 msgctxt "STR_UNDO_FIELD" msgid "Field changed" -msgstr "" +msgstr "Аҭакыра ԥсахуп" #: sw/inc/strings.hrc:503 msgctxt "STR_UNDO_TXTFMTCOL_CREATE" @@ -3000,7 +3007,7 @@ #: sw/inc/strings.hrc:515 msgctxt "STR_UNDO_BOOKMARK_RENAME" msgid "Rename bookmark: $1 $2 $3" -msgstr "" +msgstr "Агәылаҵа ахьӡ ԥсахтәуп: $1 $2 $3" #: sw/inc/strings.hrc:516 msgctxt "STR_UNDO_INDEX_ENTRY_INSERT" @@ -3061,7 +3068,7 @@ #: sw/inc/strings.hrc:528 msgctxt "STR_AUTHORITY_ENTRY" msgid "bibliography entry" -msgstr "" +msgstr "алитература ахьӡынҵа аелемент" #: sw/inc/strings.hrc:529 msgctxt "STR_SPECIALCHAR" @@ -3071,7 +3078,7 @@ #: sw/inc/strings.hrc:530 msgctxt "STR_FOOTNOTE" msgid "footnote" -msgstr "" +msgstr "албаага" #: sw/inc/strings.hrc:531 msgctxt "STR_GRAPHIC" @@ -3096,12 +3103,12 @@ #: sw/inc/strings.hrc:535 msgctxt "STR_PARAGRAPH_SIGN_UNDO" msgid "Paragraph sign" -msgstr "" +msgstr "Абзац адырга" #: sw/inc/strings.hrc:536 msgctxt "STR_UNDO_FLYFRMFMT_TITLE" msgid "Change object title of $1" -msgstr "" +msgstr "Иԥсахтәуп аобиект %1 ахы" #: sw/inc/strings.hrc:537 msgctxt "STR_UNDO_FLYFRMFMT_DESCRITPTION" @@ -3171,12 +3178,12 @@ #: sw/inc/strings.hrc:551 msgctxt "STR_ACCESS_ENDNOTE_NAME" msgid "Endnote $(ARG1)" -msgstr "" +msgstr "Анҵәамҭатә лбаага $(ARG1)" #: sw/inc/strings.hrc:552 msgctxt "STR_ACCESS_ENDNOTE_DESC" msgid "Endnote $(ARG1)" -msgstr "" +msgstr "Анҵәамҭатә лбаага $(ARG1)" #: sw/inc/strings.hrc:553 msgctxt "STR_ACCESS_TABLE_DESC" @@ -3236,12 +3243,12 @@ #: sw/inc/strings.hrc:565 msgctxt "STR_COMCORE_CANT_SHOW" msgid "Image cannot be displayed." -msgstr "" +msgstr "Иауам асахьа аарԥшра." #: sw/inc/strings.hrc:566 msgctxt "STR_ERROR_CLPBRD_READ" msgid "Error reading from the clipboard." -msgstr "" +msgstr "Аиҭныԥсахларатә гәыкылага аҟынтәи аԥхьараан агха." #: sw/inc/strings.hrc:568 msgctxt "STR_COLUMN_BREAK" @@ -3297,17 +3304,17 @@ #: sw/inc/strings.hrc:580 msgctxt "ST_SCRIPT_ASIAN" msgid "Asian" -msgstr "" +msgstr "Мрагыларазиатәиқәа" #: sw/inc/strings.hrc:581 msgctxt "ST_SCRIPT_CTL" msgid "CTL" -msgstr "" +msgstr "Иуадаҩу аҩырақәа рсистемақәа" #: sw/inc/strings.hrc:582 msgctxt "ST_SCRIPT_WESTERN" msgid "Western" -msgstr "" +msgstr "Мраҭашәарахьтәиқәа" #: sw/inc/strings.hrc:583 msgctxt "STR_PRINTOPTUI_PRODUCTNAME" @@ -3327,7 +3334,7 @@ #: sw/inc/strings.hrc:586 msgctxt "STR_PRINTOPTUI_PICTURES" msgid "~Images and other graphic objects" -msgstr "" +msgstr "Асахьақәеи егьырҭ аграфикатә обиектқәеи" #: sw/inc/strings.hrc:587 msgctxt "STR_PRINTOPTUI_HIDDEN" @@ -3337,12 +3344,12 @@ #: sw/inc/strings.hrc:588 msgctxt "STR_PRINTOPTUI_TEXT_PLACEHOLDERS" msgid "~Text placeholders" -msgstr "" +msgstr "Атеқст ахарҭәаага" #: sw/inc/strings.hrc:589 msgctxt "STR_PRINTOPTUI_FORM_CONTROLS" msgid "Form control~s" -msgstr "" +msgstr "Анапхгара аелементқәа" #: sw/inc/strings.hrc:590 msgctxt "STR_PRINTOPTUI_COLOR" @@ -3362,12 +3369,12 @@ #: sw/inc/strings.hrc:593 msgctxt "STR_PRINTOPTUI_PRINT_BLANK" msgid "Print ~automatically inserted blank pages" -msgstr "" +msgstr "Икьыԥхьлатәуп автоматикала иҭаргылоу иҭацәу адаҟьақәа" #: sw/inc/strings.hrc:594 msgctxt "STR_PRINTOPTUI_ONLY_PAPER" msgid "~Use only paper tray from printer preferences" -msgstr "" +msgstr "Ақьаад анашьҭра апринтер архиарақәа ирықәыршәаны" #: sw/inc/strings.hrc:595 msgctxt "STR_PRINTOPTUI_PRINT" @@ -3377,7 +3384,7 @@ #: sw/inc/strings.hrc:596 msgctxt "STR_PRINTOPTUI_NONE" msgid "None (document only)" -msgstr "" +msgstr "Мап (адокумент мацара)" #: sw/inc/strings.hrc:597 msgctxt "STR_PRINTOPTUI_COMMENTS_ONLY" @@ -3387,7 +3394,7 @@ #: sw/inc/strings.hrc:598 msgctxt "STR_PRINTOPTUI_PLACE_END" msgid "Place at end of document" -msgstr "" +msgstr "Ииагатәуп адокумент анҵәамҭахь " #: sw/inc/strings.hrc:599 msgctxt "STR_PRINTOPTUI_PLACE_PAGE" @@ -3412,12 +3419,12 @@ #: sw/inc/strings.hrc:603 msgctxt "STR_PRINTOPTUI_BACK_PAGES" msgid "Back sides / left pages" -msgstr "" +msgstr "Шьҭахьтәи аганқәа / армарахьтәи адаҟьақәа" #: sw/inc/strings.hrc:604 msgctxt "STR_PRINTOPTUI_FONT_PAGES" msgid "Front sides / right pages" -msgstr "" +msgstr "Ԥхьҟатәи аганқәа / арӷьарахьтәи адаҟьақәа" #: sw/inc/strings.hrc:605 msgctxt "STR_PRINTOPTUI_INCLUDE" @@ -3442,7 +3449,7 @@ #: sw/inc/strings.hrc:609 msgctxt "STR_PRINTOPTUI_RANGE_COPIES" msgid "Range and copies" -msgstr "" +msgstr "Акьыԥхьреи акопиақәеи рҵакыра" #: sw/inc/strings.hrc:610 msgctxt "STR_PRINTOPTUI_ALLPAGES" @@ -3462,7 +3469,7 @@ #: sw/inc/strings.hrc:613 msgctxt "STR_PRINTOPTUI_PLACE_MARGINS" msgid "Place in margins" -msgstr "" +msgstr "Иҭагӡатәуп аҭакырақәа" #: sw/inc/strings.hrc:615 msgctxt "STR_FORMULA_CALC" @@ -3502,7 +3509,7 @@ #: sw/inc/strings.hrc:623 msgctxt "STR_ACCESS_TL_CONTENT" msgid "Content Navigation View" -msgstr "" +msgstr "Аҵанакы" #: sw/inc/strings.hrc:624 msgctxt "STR_OUTLINE_LEVEL" @@ -3512,7 +3519,7 @@ #: sw/inc/strings.hrc:625 msgctxt "STR_DRAGMODE" msgid "Drag Mode" -msgstr "" +msgstr "Аиагара арежим" #: sw/inc/strings.hrc:626 msgctxt "STR_HYPERLINK" @@ -3527,7 +3534,7 @@ #: sw/inc/strings.hrc:628 msgctxt "STR_COPY_REGION" msgid "Insert as Copy" -msgstr "" +msgstr "Иҭаргылатәуп копиа ҳасабла" #: sw/inc/strings.hrc:629 msgctxt "STR_DISPLAY" @@ -3582,7 +3589,7 @@ #: sw/inc/strings.hrc:639 msgctxt "STR_INDEX" msgid "~Index" -msgstr "" +msgstr "Аҭыԥрбага" #: sw/inc/strings.hrc:640 msgctxt "STR_FILE" @@ -3632,12 +3639,12 @@ #: sw/inc/strings.hrc:649 msgctxt "STR_REMOVE_INDEX" msgid "~Remove Index" -msgstr "" +msgstr "Ианыхтәуп аҭыԥрбага" #: sw/inc/strings.hrc:650 msgctxt "STR_REMOVE_TBL_PROTECTION" msgid "~Unprotect" -msgstr "" +msgstr "Иқәгатәуп ахьчара" #: sw/inc/strings.hrc:651 msgctxt "STR_INVISIBLE" @@ -3738,12 +3745,12 @@ #: sw/inc/strings.hrc:673 msgctxt "STR_CALC_POW" msgid "** Square function overflow **" -msgstr "" +msgstr "** Аквадрат афункциа аҭәцәара **" #: sw/inc/strings.hrc:674 msgctxt "STR_CALC_OVERFLOW" msgid "** Overflow **" -msgstr "" +msgstr "** Аҭәцәара **" #: sw/inc/strings.hrc:675 msgctxt "STR_CALC_DEFAULT" @@ -3753,12 +3760,12 @@ #: sw/inc/strings.hrc:676 msgctxt "STR_CALC_ERROR" msgid "** Expression is faulty **" -msgstr "" +msgstr "** Агха змо аҵакҳәага **" #: sw/inc/strings.hrc:677 msgctxt "STR_GETREFFLD_REFITEMNOTFOUND" msgid "Error: Reference source not found" -msgstr "" +msgstr "Агха: еимаздоу азхьарԥшқәа рхыҵхырҭа ԥшаам" #: sw/inc/strings.hrc:678 msgctxt "STR_TEMPLATE_NONE" @@ -3773,12 +3780,12 @@ #: sw/inc/strings.hrc:680 msgctxt "STR_DURATION_FORMAT" msgid " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6" -msgstr "" +msgstr " Y: %1 M: %2 D: %3 H: %4 M: %5 S: %6" #: sw/inc/strings.hrc:681 msgctxt "STR_TOI" msgid "Alphabetical Index" -msgstr "" +msgstr "Алфавиттә ҭыԥрбага" #: sw/inc/strings.hrc:682 msgctxt "STR_TOU" @@ -3813,18 +3820,18 @@ #: sw/inc/strings.hrc:688 msgctxt "STR_TOX_ILL" msgid "Table of Figures" -msgstr "" +msgstr "Асахьақәа рыхьӡынҵа" #: sw/inc/strings.hrc:689 #, c-format msgctxt "STR_LINK_CTRL_CLICK" msgid "%s-Click to follow link" -msgstr "" +msgstr "%s-ақәыӷәӷәара азхьарԥш ала аиасразы" #: sw/inc/strings.hrc:690 msgctxt "STR_LINK_CLICK" msgid "Click to follow link" -msgstr "" +msgstr "Шәақәыӷәӷәа азхьарԥш ала аиасразы" #. SubType DocInfo #: sw/inc/strings.hrc:692 @@ -3870,7 +3877,7 @@ #: sw/inc/strings.hrc:700 msgctxt "FLD_DOCINFO_EDIT" msgid "Total editing time" -msgstr "" +msgstr "Аредакциазура иақәырӡу аамҭа зегьы" #: sw/inc/strings.hrc:701 msgctxt "STR_PAGEDESC_NAME" @@ -3905,22 +3912,22 @@ #: sw/inc/strings.hrc:707 msgctxt "STR_AUTH_TYPE_CONFERENCE" msgid "Conference proceedings" -msgstr "" +msgstr "Аилацәажәара апротокол" #: sw/inc/strings.hrc:708 msgctxt "STR_AUTH_TYPE_INBOOK" msgid "Book excerpt" -msgstr "" +msgstr "Ашәҟәы аҟынтәи ацыԥҵәахақәа" #: sw/inc/strings.hrc:709 msgctxt "STR_AUTH_TYPE_INCOLLECTION" msgid "Book excerpt with title" -msgstr "" +msgstr "Ахқәа змоу ашәҟәы аҟынтәи ацыԥҵәахақәа" #: sw/inc/strings.hrc:710 msgctxt "STR_AUTH_TYPE_INPROCEEDINGS" msgid "Conference proceedings" -msgstr "" +msgstr "Аилацәажәара апротокол" #: sw/inc/strings.hrc:711 msgctxt "STR_AUTH_TYPE_JOURNAL" @@ -3940,7 +3947,7 @@ #: sw/inc/strings.hrc:714 msgctxt "STR_AUTH_TYPE_MISC" msgid "Miscellaneous" -msgstr "" +msgstr "Егьырҭқәа" #: sw/inc/strings.hrc:715 msgctxt "STR_AUTH_TYPE_PHDTHESIS" @@ -3950,17 +3957,17 @@ #: sw/inc/strings.hrc:716 msgctxt "STR_AUTH_TYPE_PROCEEDINGS" msgid "Conference proceedings" -msgstr "" +msgstr "Аилацәажәара апротокол" #: sw/inc/strings.hrc:717 msgctxt "STR_AUTH_TYPE_TECHREPORT" msgid "Research report" -msgstr "" +msgstr "Аҭҵаара иазку аҳасабырба" #: sw/inc/strings.hrc:718 msgctxt "STR_AUTH_TYPE_UNPUBLISHED" msgid "Unpublished" -msgstr "" +msgstr "Икьыԥхьым" #: sw/inc/strings.hrc:719 msgctxt "STR_AUTH_TYPE_EMAIL" @@ -4025,12 +4032,12 @@ #: sw/inc/strings.hrc:731 msgctxt "STR_AUTH_FIELD_BOOKTITLE" msgid "Book title" -msgstr "" +msgstr "Ашәҟәы ахқәа" #: sw/inc/strings.hrc:732 msgctxt "STR_AUTH_FIELD_CHAPTER" msgid "Chapter" -msgstr "" +msgstr "Ахқәа" #: sw/inc/strings.hrc:733 msgctxt "STR_AUTH_FIELD_EDITION" @@ -4155,12 +4162,12 @@ #: sw/inc/strings.hrc:758 msgctxt "STR_IDXMRK_EDIT" msgid "Edit Index Entry" -msgstr "" +msgstr "Аҭыԥрбага аелемент ариашара" #: sw/inc/strings.hrc:759 msgctxt "STR_IDXMRK_INSERT" msgid "Insert Index Entry" -msgstr "" +msgstr "Иҭаргылатәуп аҭыԥрбага аелемент" #: sw/inc/strings.hrc:760 msgctxt "STR_QUERY_CHANGE_AUTH_ENTRY" @@ -4185,7 +4192,7 @@ #: sw/inc/strings.hrc:766 msgctxt "STR_DOUBLE_SHORTNAME" msgid "Shortcut name already exists. Please choose another name." -msgstr "" +msgstr "Ари армаҷра ыҟоуп. Иалышәх даҽа хьӡык." #: sw/inc/strings.hrc:767 msgctxt "STR_QUERY_DELETE" @@ -4225,17 +4232,17 @@ #: sw/inc/strings.hrc:775 msgctxt "STR_NOGLOS" msgid "AutoText for Shortcut '%1' not found." -msgstr "" +msgstr "Армаҷраз автотеқст аелемент «%1» ԥшаам." #: sw/inc/strings.hrc:776 msgctxt "STR_NO_TABLE" msgid "A table with no rows or no cells cannot be inserted" -msgstr "" +msgstr "Иауам аҭаргылара атаблица ацәаҳәақәа ма аиҵагылақәа змам" #: sw/inc/strings.hrc:777 msgctxt "STR_TABLE_TOO_LARGE" msgid "The table cannot be inserted because it is too large" -msgstr "" +msgstr "Иауам аҭаргылара атаблица, идуцәоуп" #: sw/inc/strings.hrc:778 msgctxt "STR_ERR_INSERT_GLOS" @@ -4255,17 +4262,17 @@ #: sw/inc/strings.hrc:781 msgctxt "STR_PRIVATEGRAPHIC" msgid "Image (%PRODUCTNAME %PRODUCTVERSION Text Document)" -msgstr "" +msgstr "Асахьа (Атексттә документ %PRODUCTNAME %PRODUCTVERSION)" #: sw/inc/strings.hrc:782 msgctxt "STR_PRIVATEOLE" msgid "Object (%PRODUCTNAME %PRODUCTVERSION Text Document)" -msgstr "" +msgstr "Аобиект (Атексттә документ %PRODUCTNAME %PRODUCTVERSION)" #: sw/inc/strings.hrc:783 msgctxt "STR_DDEFORMAT" msgid "Dynamic Data Exchange (DDE link)" -msgstr "" +msgstr "Динамикала адырқәа реиҭныԥсахлара (DDE-аимадара)" #: sw/inc/strings.hrc:785 msgctxt "STR_DELETE_ALL_NOTES" @@ -4280,7 +4287,7 @@ #: sw/inc/strings.hrc:787 msgctxt "STR_DELETE_AUTHOR_NOTES" msgid "Comments by " -msgstr "" +msgstr "Акомментари иҟынтә" #: sw/inc/strings.hrc:788 msgctxt "STR_NODATE" @@ -4300,32 +4307,32 @@ #: sw/inc/strings.hrc:792 msgctxt "ST_TITLE_EDIT" msgid "Edit Address Block" -msgstr "" +msgstr "Аредакциазутәуп аблок адрес зцу" #: sw/inc/strings.hrc:793 msgctxt "ST_TITLE_MALE" msgid "Custom Salutation (Male Recipients)" -msgstr "" +msgstr "Персоналла ахацәа ирызку аԥсшәаҳәара" #: sw/inc/strings.hrc:794 msgctxt "ST_TITLE_FEMALE" msgid "Custom Salutation (Female Recipients)" -msgstr "" +msgstr "Персоналла аҳәсаа ирызку аԥсшәаҳәара" #: sw/inc/strings.hrc:795 msgctxt "ST_SALUTATIONELEMENTS" msgid "Salutation e~lements" -msgstr "" +msgstr "Аԥсшәаҳәара аелементқәа" #: sw/inc/strings.hrc:796 msgctxt "ST_INSERTSALUTATIONFIELD" msgid "Add to salutation" -msgstr "" +msgstr "Иацҵатәуп аԥсшәаҳәарахь" #: sw/inc/strings.hrc:797 msgctxt "ST_REMOVESALUTATIONFIELD" msgid "Remove from salutation" -msgstr "" +msgstr "Ианыхтәуп аԥсшәаҳәара аҟынтәи" #: sw/inc/strings.hrc:798 msgctxt "ST_DRAGSALUTATION" @@ -4335,12 +4342,12 @@ #: sw/inc/strings.hrc:799 msgctxt "ST_SALUTATION" msgid "Salutation" -msgstr "" +msgstr "Аԥсшәаҳәара" #: sw/inc/strings.hrc:800 msgctxt "ST_PUNCTUATION" msgid "Punctuation Mark" -msgstr "" +msgstr "Ааҭгыларатә дырга" #: sw/inc/strings.hrc:801 msgctxt "ST_TEXT" @@ -4355,22 +4362,22 @@ #: sw/inc/strings.hrc:803 msgctxt "ST_SALUTATIONPREVIEW" msgid "Salutation preview" -msgstr "" +msgstr "Аԥсшәаҳәара ахәаԥшра" #: sw/inc/strings.hrc:804 msgctxt "ST_ADDRESSELEMENT" msgid "Address elements" -msgstr "" +msgstr "Адрес аелементқәа" #: sw/inc/strings.hrc:805 msgctxt "ST_SALUTATIONELEMENT" msgid "Salutation elements" -msgstr "" +msgstr "Аԥсшәаҳәара аелементқәа" #: sw/inc/strings.hrc:806 msgctxt "ST_MATCHESTO" msgid "Matches to field:" -msgstr "" +msgstr "Аҭакыра иақәшәақәо:" #: sw/inc/strings.hrc:807 msgctxt "ST_PREVIEW" @@ -4380,7 +4387,7 @@ #: sw/inc/strings.hrc:809 msgctxt "STR_NOTASSIGNED" msgid " not yet matched " -msgstr "" +msgstr "анеира залшом " #: sw/inc/strings.hrc:810 msgctxt "STR_FILTER_ALL" @@ -4390,22 +4397,22 @@ #: sw/inc/strings.hrc:811 msgctxt "STR_FILTER_ALL_DATA" msgid "Address lists(*.*)" -msgstr "" +msgstr "Адресқәа рыхьӡынҵақәа(*.*)" #: sw/inc/strings.hrc:812 msgctxt "STR_FILTER_SXB" msgid "%PRODUCTNAME Base (*.odb)" -msgstr "" +msgstr "%PRODUCTNAME Base (*.odb)" #: sw/inc/strings.hrc:813 msgctxt "STR_FILTER_SXC" msgid "%PRODUCTNAME Calc (*.ods;*.sxc)" -msgstr "" +msgstr "%PRODUCTNAME Calc (*.ods;*.sxc)" #: sw/inc/strings.hrc:814 msgctxt "STR_FILTER_SXW" msgid "%PRODUCTNAME Writer (*.odt;*.sxw)" -msgstr "" +msgstr "%PRODUCTNAME Writer (*.odt;*.sxw)" #: sw/inc/strings.hrc:815 msgctxt "STR_FILTER_DBF" @@ -4430,7 +4437,7 @@ #: sw/inc/strings.hrc:819 msgctxt "STR_FILTER_CSV" msgid "Text Comma Separated (*.csv)" -msgstr "" +msgstr "Аҿарҵәиқәа рыла еиҟәшо атеқст (*.csv)" #: sw/inc/strings.hrc:820 msgctxt "STR_FILTER_MDB" @@ -4453,7 +4460,7 @@ #: sw/inc/strings.hrc:823 msgctxt "ST_FILTERNAME" msgid "%PRODUCTNAME Address List (.csv)" -msgstr "" +msgstr "Адрестә шәҟәы %PRODUCTNAME (.csv)" #: sw/inc/strings.hrc:825 msgctxt "ST_STARTING" @@ -4468,22 +4475,22 @@ #: sw/inc/strings.hrc:827 msgctxt "ST_ADDRESSBLOCK" msgid "Insert address block" -msgstr "" +msgstr "Адрес аблок аҭарргылара" #: sw/inc/strings.hrc:828 msgctxt "ST_ADDRESSLIST" msgid "Select address list" -msgstr "" +msgstr "Адресқәа рыхьӡынҵа алхра" #: sw/inc/strings.hrc:829 msgctxt "ST_GREETINGSLINE" msgid "Create salutation" -msgstr "" +msgstr "Аԥсшәаҳәара аԥҵара" #: sw/inc/strings.hrc:830 msgctxt "ST_LAYOUT" msgid "Adjust layout" -msgstr "" +msgstr "Аҭыԥнҵара архиара" #: sw/inc/strings.hrc:831 msgctxt "ST_EXCLUDE" @@ -4498,7 +4505,7 @@ #: sw/inc/strings.hrc:833 msgctxt "ST_MMWTITLE" msgid "Mail Merge Wizard" -msgstr "" +msgstr "Mail адәықәҵарақәа" #: sw/inc/strings.hrc:835 msgctxt "ST_NAME" @@ -4523,7 +4530,7 @@ #: sw/inc/strings.hrc:840 msgctxt "STR_QUERY_SPELL_CONTINUE" msgid "Continue checking at beginning of document?" -msgstr "" +msgstr "Иацҵатәума адокумент агәаҭара ахы инаркны?" #: sw/inc/strings.hrc:841 msgctxt "STR_SPELLING_COMPLETED" @@ -4562,7 +4569,7 @@ #: sw/inc/strings.hrc:852 msgctxt "STR_PAGENUMBERFLD" msgid "Page number" -msgstr "" +msgstr "Адаҟьа аномер:" #: sw/inc/strings.hrc:853 msgctxt "STR_DOCSTATFLD" @@ -4603,17 +4610,17 @@ #: sw/inc/strings.hrc:861 msgctxt "STR_INPUTFLD" msgid "Input field" -msgstr "" +msgstr "Аҭагаларҭа аҭакыра" #: sw/inc/strings.hrc:862 msgctxt "STR_SETINPUTFLD" msgid "Input field (variable)" -msgstr "" +msgstr "Аҭагаларҭа аҭакыра (зыԥсахра ауа)" #: sw/inc/strings.hrc:863 msgctxt "STR_USRINPUTFLD" msgid "Input field (user)" -msgstr "" +msgstr "Аҭагаларҭа аҭакыра (ахархәаҩтәи)" #: sw/inc/strings.hrc:864 msgctxt "STR_CONDTXTFLD" @@ -4623,7 +4630,7 @@ #: sw/inc/strings.hrc:865 msgctxt "STR_DDEFLD" msgid "DDE field" -msgstr "" +msgstr "DDE аҭакыра" #: sw/inc/strings.hrc:866 msgctxt "STR_MACROFLD" @@ -4638,22 +4645,22 @@ #: sw/inc/strings.hrc:868 msgctxt "STR_SETREFPAGEFLD" msgid "Set page variable" -msgstr "" +msgstr "Иазалхтәуп адаҟьа аҽеиҭак" #: sw/inc/strings.hrc:869 msgctxt "STR_GETREFPAGEFLD" msgid "Show page variable" -msgstr "" +msgstr "Иаарԥштәуп адаҟьа аҽеиҭакқәа" #: sw/inc/strings.hrc:870 msgctxt "STR_INTERNETFLD" msgid "Load URL" -msgstr "" +msgstr "URL адрес" #: sw/inc/strings.hrc:871 msgctxt "STR_JUMPEDITFLD" msgid "Placeholder" -msgstr "" +msgstr "Ахарҭәаага" #: sw/inc/strings.hrc:872 msgctxt "STR_COMBINED_CHARS" @@ -4674,7 +4681,7 @@ #: sw/inc/strings.hrc:876 msgctxt "STR_GETREFFLD" msgid "Insert Reference" -msgstr "" +msgstr "Иҭаргылатәуп азхьарԥш" #. range database #: sw/inc/strings.hrc:878 @@ -4716,7 +4723,7 @@ #: sw/inc/strings.hrc:886 msgctxt "STR_USERFLD" msgid "User Field" -msgstr "" +msgstr "Ахархәаҩ иҭакыра" #: sw/inc/strings.hrc:887 msgctxt "STR_POSTITFLD" @@ -4765,7 +4772,7 @@ #: sw/inc/strings.hrc:899 msgctxt "FLD_TIME_FIX" msgid "Time (fixed)" -msgstr "" +msgstr "Аамҭа (аԥсахра зымуа)" #. SubCmd Statistic #: sw/inc/strings.hrc:901 @@ -4855,7 +4862,7 @@ #: sw/inc/strings.hrc:922 msgctxt "FLD_EU_PLZ" msgid "Zip code" -msgstr "" +msgstr "Аԥошьҭатә индекс" #: sw/inc/strings.hrc:923 msgctxt "FLD_EU_ORT" @@ -5148,12 +5155,12 @@ #: sw/inc/strings.hrc:999 msgctxt "FMT_REF_WITH_LOWERCASE_HU_ARTICLE" msgid "Article a/az + " -msgstr "" +msgstr "Астатиа a/az + " #: sw/inc/strings.hrc:1000 msgctxt "FMT_REF_WITH_UPPERCASE_HU_ARTICLE" msgid "Article A/Az + " -msgstr "" +msgstr "Астстиа A/Az + " #. -------------------------------------------------------------------- #. Description: placeholder @@ -5199,7 +5206,7 @@ #: sw/inc/strings.hrc:1014 msgctxt "STR_DDE_CMD" msgid "DDE Statement" -msgstr "" +msgstr "DDE алаҳәара" #: sw/inc/strings.hrc:1015 msgctxt "STR_INSTEXT" @@ -5224,7 +5231,7 @@ #: sw/inc/strings.hrc:1019 msgctxt "STR_OFFSET" msgid "O~ffset" -msgstr "" +msgstr "Аҭыԥхгара" #: sw/inc/strings.hrc:1020 msgctxt "STR_VALUE" @@ -5250,12 +5257,12 @@ #: sw/inc/strings.hrc:1026 msgctxt "STR_HDIST" msgid "H. Pitch" -msgstr "" +msgstr "Ашьаҿа горизонт. " #: sw/inc/strings.hrc:1027 msgctxt "STR_VDIST" msgid "V. Pitch" -msgstr "" +msgstr "Ашьаҿа верт." #: sw/inc/strings.hrc:1028 msgctxt "STR_WIDTH" @@ -5310,28 +5317,28 @@ #: sw/inc/strings.hrc:1040 msgctxt "STR_VIEWLAYOUT_BOOK" msgid "Book view" -msgstr "" +msgstr "Ашәҟәытә ԥшра" #: sw/inc/strings.hrc:1041 msgctxt "STR_BOOKCTRL_HINT" msgid "Page number in document. Click to open Go to Page dialog or right-click for bookmark list." -msgstr "" +msgstr "Адокумент адаҟьа аномер. Ақәыӷәӷәара иаанартуеит адиалог «Ииастәуп адаҟьахь», арӷьарахьтәи ақәыӷәӷәара - агәылаҵақәа рыхьӡынҵа.." #: sw/inc/strings.hrc:1042 msgctxt "STR_BOOKCTRL_HINT_EXTENDED" msgid "Page number in document (Page number on printed document). Click to open Go to Page dialog." -msgstr "" +msgstr "Адокумент аҟны адаҟьа аномер (акьыԥхьраан). Ақәыӷәӷәара иаанартуеит адиалог «Ииастәуп адаҟьахь»." #: sw/inc/strings.hrc:1043 msgctxt "STR_TMPLCTRL_HINT" msgid "Page Style. Right-click to change style or click to open Style dialog." -msgstr "" +msgstr "Адаҟьа астиль. Арӷьарахьтәи ақәыӷәӷәара астиль аԥсахразы, ақәыӷәӷәара - адиалог «Астильқәа»" #. Strings for textual attributes. #: sw/inc/strings.hrc:1046 msgctxt "STR_DROP_OVER" msgid "Drop Caps over" -msgstr "" +msgstr "Ахалагаранбан аҩадахьы" #: sw/inc/strings.hrc:1047 msgctxt "STR_DROP_LINES" @@ -5341,7 +5348,7 @@ #: sw/inc/strings.hrc:1048 msgctxt "STR_NO_DROP_LINES" msgid "No Drop Caps" -msgstr "" +msgstr "Ахалагаранбан ада" #: sw/inc/strings.hrc:1049 msgctxt "STR_NO_PAGEDESC" @@ -5351,7 +5358,7 @@ #: sw/inc/strings.hrc:1050 msgctxt "STR_NO_MIRROR" msgid "Don't mirror" -msgstr "" +msgstr "Ианырԥштәӡам" #: sw/inc/strings.hrc:1051 msgctxt "STR_VERT_MIRROR" @@ -5366,12 +5373,12 @@ #: sw/inc/strings.hrc:1053 msgctxt "STR_BOTH_MIRROR" msgid "Horizontal and Vertical Flip" -msgstr "" +msgstr "Ианырԥштәуп вертикаллеи горизонталлеи" #: sw/inc/strings.hrc:1054 msgctxt "STR_MIRROR_TOGGLE" msgid "+ mirror horizontal on even pages" -msgstr "" +msgstr "Горизонталла ианырԥштәуп еиҩшо адаҟьақәа рҟны" #: sw/inc/strings.hrc:1055 msgctxt "STR_CHARFMT" @@ -5386,32 +5393,32 @@ #: sw/inc/strings.hrc:1057 msgctxt "STR_FOOTER" msgid "Footer" -msgstr "" +msgstr "Ҵаҟатәи аколонтитул" #: sw/inc/strings.hrc:1058 msgctxt "STR_NO_FOOTER" msgid "No footer" -msgstr "" +msgstr "Ҵаҟатәи аколонтитул ада" #: sw/inc/strings.hrc:1059 msgctxt "STR_HEADER" msgid "Header" -msgstr "" +msgstr "Хыхтәи аколонтитул" #: sw/inc/strings.hrc:1060 msgctxt "STR_NO_HEADER" msgid "No header" -msgstr "" +msgstr "Хыхьтәи аколонтитул ада" #: sw/inc/strings.hrc:1061 msgctxt "STR_SURROUND_IDEAL" msgid "Optimal wrap" -msgstr "" +msgstr "Иоптималу аҿыкәшара" #: sw/inc/strings.hrc:1062 msgctxt "STR_SURROUND_NONE" msgid "No wrap" -msgstr "" +msgstr "Аҿыкәшара ада" #: sw/inc/strings.hrc:1063 msgctxt "STR_SURROUND_THROUGH" @@ -5421,7 +5428,7 @@ #: sw/inc/strings.hrc:1064 msgctxt "STR_SURROUND_PARALLEL" msgid "Parallel wrap" -msgstr "" +msgstr "Аҿыкәшара аконтур ала" #: sw/inc/strings.hrc:1065 msgctxt "STR_SURROUND_LEFT" @@ -5436,7 +5443,7 @@ #: sw/inc/strings.hrc:1067 msgctxt "STR_SURROUND_ANCHORONLY" msgid "(Anchor only)" -msgstr "" +msgstr "(Адҳәалара мацара)" #: sw/inc/strings.hrc:1068 msgctxt "STR_FRM_WIDTH" @@ -5446,12 +5453,12 @@ #: sw/inc/strings.hrc:1069 msgctxt "STR_FRM_FIXEDHEIGHT" msgid "Fixed height:" -msgstr "" +msgstr "Афиксациа зызу аҳаракыра:" #: sw/inc/strings.hrc:1070 msgctxt "STR_FRM_MINHEIGHT" msgid "Min. height:" -msgstr "" +msgstr "Имин. аҳаракыра:" #: sw/inc/strings.hrc:1071 msgctxt "STR_FLY_AT_PARA" @@ -5486,7 +5493,7 @@ #: sw/inc/strings.hrc:1077 msgctxt "STR_VERT_CENTER" msgid "Centered vertically" -msgstr "" +msgstr "Вертикалла ацентрла" #: sw/inc/strings.hrc:1078 msgctxt "STR_VERT_BOTTOM" @@ -5496,17 +5503,17 @@ #: sw/inc/strings.hrc:1079 msgctxt "STR_LINE_TOP" msgid "Top of line" -msgstr "" +msgstr "Ацәаҳәа ахыхь" #: sw/inc/strings.hrc:1080 msgctxt "STR_LINE_CENTER" msgid "Line centered" -msgstr "" +msgstr "Ацәаҳәа агәҭа" #: sw/inc/strings.hrc:1081 msgctxt "STR_LINE_BOTTOM" msgid "Bottom of line" -msgstr "" +msgstr "Ацәаҳәа аҵаҟа" #: sw/inc/strings.hrc:1082 msgctxt "STR_REGISTER_ON" @@ -5526,12 +5533,12 @@ #: sw/inc/strings.hrc:1085 msgctxt "STR_HORI_CENTER" msgid "Centered horizontally" -msgstr "" +msgstr "Горизонталла ацентр ала" #: sw/inc/strings.hrc:1086 msgctxt "STR_HORI_LEFT" msgid "at the left" -msgstr "" +msgstr "арымарахь" #: sw/inc/strings.hrc:1087 msgctxt "STR_HORI_INSIDE" @@ -5546,7 +5553,7 @@ #: sw/inc/strings.hrc:1089 msgctxt "STR_HORI_FULL" msgid "Full width" -msgstr "" +msgstr "Ихарҭәаау аҭбаара" #: sw/inc/strings.hrc:1090 msgctxt "STR_COLUMNS" @@ -5556,22 +5563,22 @@ #: sw/inc/strings.hrc:1091 msgctxt "STR_LINE_WIDTH" msgid "Separator Width:" -msgstr "" +msgstr "Аиҟәыҭхага ҵәаӷәа аҭбаара:" #: sw/inc/strings.hrc:1092 msgctxt "STR_MAX_FTN_HEIGHT" msgid "Max. footnote area:" -msgstr "" +msgstr "Албаагақәа имакс. рҵакыра:" #: sw/inc/strings.hrc:1093 msgctxt "STR_EDIT_IN_READONLY" msgid "Editable in read-only document" -msgstr "" +msgstr "Изинтәуп ариашара адокумент «аԥхьара мацараз» аҟны" #: sw/inc/strings.hrc:1094 msgctxt "STR_LAYOUT_SPLIT" msgid "Split" -msgstr "" +msgstr "Еиҟәшатәуп" #: sw/inc/strings.hrc:1095 msgctxt "STR_NUMRULE_ON" @@ -5581,12 +5588,12 @@ #: sw/inc/strings.hrc:1096 msgctxt "STR_NUMRULE_OFF" msgid "no numbering" -msgstr "" +msgstr "Аномерркра ада" #: sw/inc/strings.hrc:1097 msgctxt "STR_CONNECT1" msgid "linked to " -msgstr "" +msgstr "Иадҳәалатәуп " #: sw/inc/strings.hrc:1098 msgctxt "STR_CONNECT2" @@ -5596,22 +5603,22 @@ #: sw/inc/strings.hrc:1099 msgctxt "STR_LINECOUNT" msgid "Count lines" -msgstr "" +msgstr "Ацәаҳәақәа рыԥхьаӡара" #: sw/inc/strings.hrc:1100 msgctxt "STR_DONTLINECOUNT" msgid "don't count lines" -msgstr "" +msgstr "Ацәаҳәақәа ԥхьаӡатәӡам" #: sw/inc/strings.hrc:1101 msgctxt "STR_LINCOUNT_START" msgid "restart line count with: " -msgstr "" +msgstr "Иалагатәуп ацәақәа рыԥхьазара аҟынтә:" #: sw/inc/strings.hrc:1102 msgctxt "STR_LUMINANCE" msgid "Brightness: " -msgstr "" +msgstr "Ажжара: " #: sw/inc/strings.hrc:1103 msgctxt "STR_CHANNELR" @@ -5686,12 +5693,12 @@ #: sw/inc/strings.hrc:1117 msgctxt "STR_GRID_NONE" msgid "No grid" -msgstr "" +msgstr "Акаҭа ада" #: sw/inc/strings.hrc:1118 msgctxt "STR_GRID_LINES_ONLY" msgid "Grid (lines only)" -msgstr "" +msgstr "Акаҭа (аҵәаӷәақәа мацара рзы)" #: sw/inc/strings.hrc:1119 msgctxt "STR_GRID_LINES_CHARS" diff -Nru libreoffice-6.2.2/translations/source/ab/vcl/messages.po libreoffice-6.2.3/translations/source/ab/vcl/messages.po --- libreoffice-6.2.2/translations/source/ab/vcl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/vcl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,16 +4,16 @@ "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: 2018-12-17 16:29+0100\n" -"PO-Revision-Date: 2018-11-12 11:32+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-28 11:08+0000\n" +"Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1542022338.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553771300.000000\n" #. To translators: This is the first entry of a sequence of paper size names #: vcl/inc/print.hrc:28 @@ -85,27 +85,27 @@ #: vcl/inc/print.hrc:41 msgctxt "RID_STR_PAPERNAMES" msgid "C4 Envelope" -msgstr "" +msgstr "Аконверт C4" #: vcl/inc/print.hrc:42 msgctxt "RID_STR_PAPERNAMES" msgid "C5 Envelope" -msgstr "" +msgstr "Аконверт C5" #: vcl/inc/print.hrc:43 msgctxt "RID_STR_PAPERNAMES" msgid "C6 Envelope" -msgstr "" +msgstr "Аконверт C6" #: vcl/inc/print.hrc:44 msgctxt "RID_STR_PAPERNAMES" msgid "C6/5 Envelope" -msgstr "" +msgstr "Аконверт C6/5" #: vcl/inc/print.hrc:45 msgctxt "RID_STR_PAPERNAMES" msgid "DL Envelope" -msgstr "" +msgstr "Аконверт DL" #: vcl/inc/print.hrc:46 msgctxt "RID_STR_PAPERNAMES" @@ -115,22 +115,22 @@ #: vcl/inc/print.hrc:47 msgctxt "RID_STR_PAPERNAMES" msgid "C" -msgstr "" +msgstr "C" #: vcl/inc/print.hrc:48 msgctxt "RID_STR_PAPERNAMES" msgid "D" -msgstr "" +msgstr "D" #: vcl/inc/print.hrc:49 msgctxt "RID_STR_PAPERNAMES" msgid "E" -msgstr "" +msgstr "E" #: vcl/inc/print.hrc:50 msgctxt "RID_STR_PAPERNAMES" msgid "Executive" -msgstr "" +msgstr "Executive" #: vcl/inc/print.hrc:51 msgctxt "RID_STR_PAPERNAMES" @@ -140,32 +140,32 @@ #: vcl/inc/print.hrc:52 msgctxt "RID_STR_PAPERNAMES" msgid "#8 (Monarch) Envelope" -msgstr "" +msgstr "Аконверт #8 ((Monarch)" #: vcl/inc/print.hrc:53 msgctxt "RID_STR_PAPERNAMES" msgid "#6 3/4 (Personal) Envelope" -msgstr "" +msgstr "Аконверт #6 3/4 (Personal)" #: vcl/inc/print.hrc:54 msgctxt "RID_STR_PAPERNAMES" msgid "#9 Envelope" -msgstr "" +msgstr "Аконверт #9" #: vcl/inc/print.hrc:55 msgctxt "RID_STR_PAPERNAMES" msgid "#10 Envelope" -msgstr "" +msgstr "Аконверт #10" #: vcl/inc/print.hrc:56 msgctxt "RID_STR_PAPERNAMES" msgid "#11 Envelope" -msgstr "" +msgstr "Аконверт #11" #: vcl/inc/print.hrc:57 msgctxt "RID_STR_PAPERNAMES" msgid "#12 Envelope" -msgstr "" +msgstr "Аконверт #12" #: vcl/inc/print.hrc:58 msgctxt "RID_STR_PAPERNAMES" @@ -201,7 +201,7 @@ #: vcl/inc/print.hrc:65 msgctxt "RID_STR_PAPERNAMES" msgid "Japanese Postcard" -msgstr "" +msgstr "Иапониатәи ашәҟәаарт" #: vcl/inc/printaccessoryview.hrc:27 msgctxt "SV_PRINT_NATIVE_STRINGS" @@ -243,22 +243,22 @@ #: vcl/inc/strings.hrc:28 msgctxt "SV_MENU_MAC_HIDEAPP" msgid "Hide %PRODUCTNAME" -msgstr "" +msgstr "Иҵәахтәуп %PRODUCTNAME" #: vcl/inc/strings.hrc:29 msgctxt "SV_MENU_MAC_HIDEALL" msgid "Hide Others" -msgstr "" +msgstr "Иҵәахтәуп егьырҭқәа" #: vcl/inc/strings.hrc:30 msgctxt "SV_MENU_MAC_SHOWALL" msgid "Show All" -msgstr "" +msgstr "Иаарԥштәуп зегьы" #: vcl/inc/strings.hrc:31 msgctxt "SV_MENU_MAC_QUITAPP" msgid "Quit %PRODUCTNAME" -msgstr "" +msgstr "Иҭыҵтәуп %PRODUCTNAME аҟынтәи" #: vcl/inc/strings.hrc:33 msgctxt "SV_HELPTEXT_CLOSE" @@ -268,7 +268,7 @@ #: vcl/inc/strings.hrc:34 msgctxt "SV_HELPTEXT_MINIMIZE" msgid "Minimize" -msgstr "" +msgstr "Еикәарҳәтәуп" #: vcl/inc/strings.hrc:35 msgctxt "SV_HELPTEXT_MAXIMIZE" @@ -278,7 +278,7 @@ #: vcl/inc/strings.hrc:36 msgctxt "SV_HELPTEXT_RESTORE" msgid "Restore" -msgstr "" +msgstr "Еиҭашьақәыргылатәуп" #: vcl/inc/strings.hrc:37 msgctxt "SV_HELPTEXT_ROLLDOWN" @@ -288,7 +288,7 @@ #: vcl/inc/strings.hrc:38 msgctxt "SV_HELPTEXT_ROLLUP" msgid "Roll up" -msgstr "" +msgstr "Еикәрҳәтәуп" #: vcl/inc/strings.hrc:39 msgctxt "SV_HELPTEXT_HELP" @@ -298,7 +298,7 @@ #: vcl/inc/strings.hrc:40 msgctxt "SV_HELPTEXT_SCREENSHOT" msgid "Take and annotate a screenshot" -msgstr "" +msgstr "Иҟаҵатәуп аекран ақәҭыхымҭа" #: vcl/inc/strings.hrc:41 msgctxt "SV_HELPTEXT_FADEIN" @@ -347,7 +347,7 @@ #: vcl/inc/strings.hrc:54 msgctxt "SV_BUTTONTEXT_NO" msgid "~No" -msgstr "" +msgstr "М~ап" #: vcl/inc/strings.hrc:55 msgctxt "SV_BUTTONTEXT_RETRY" @@ -360,10 +360,9 @@ msgstr "~Ацхыраагӡа" #: vcl/inc/strings.hrc:57 -#, fuzzy msgctxt "SV_BUTTONTEXT_CLOSE" msgid "~Close" -msgstr "Иарктәуп" +msgstr "~Иарктәуп" #: vcl/inc/strings.hrc:58 msgctxt "SV_BUTTONTEXT_MORE" @@ -373,7 +372,7 @@ #: vcl/inc/strings.hrc:59 msgctxt "SV_BUTTONTEXT_IGNORE" msgid "~Ignore" -msgstr "" +msgstr "~Ибжьажьтәуп" #: vcl/inc/strings.hrc:60 msgctxt "SV_BUTTONTEXT_ABORT" @@ -383,7 +382,7 @@ #: vcl/inc/strings.hrc:61 msgctxt "SV_BUTTONTEXT_LESS" msgid "~Less" -msgstr "" +msgstr "Иҵә~ахтәуп" #: vcl/inc/strings.hrc:62 msgctxt "SV_BUTTONTEXT_RESET" @@ -443,22 +442,22 @@ #: vcl/inc/strings.hrc:73 msgctxt "SV_BUTTONTEXT_PREV" msgid "~Previous" -msgstr "" +msgstr "Аԥхьатәи" #: vcl/inc/strings.hrc:74 msgctxt "SV_BUTTONTEXT_GO_UP" msgid "~Up" -msgstr "" +msgstr "Аҩада" #: vcl/inc/strings.hrc:75 msgctxt "SV_BUTTONTEXT_GO_DOWN" msgid "Do~wn" -msgstr "" +msgstr "Алада" #: vcl/inc/strings.hrc:76 msgctxt "SV_BUTTONTEXT_CLEAR" msgid "~Clear" -msgstr "" +msgstr "Ирыцқьатәуп" #: vcl/inc/strings.hrc:77 msgctxt "SV_BUTTONTEXT_OPEN" @@ -484,12 +483,12 @@ #: vcl/inc/strings.hrc:81 msgctxt "SV_BUTTONTEXT_CONNECT" msgid "C~onnect" -msgstr "" +msgstr "Еиԥшьтәуп" #: vcl/inc/strings.hrc:82 msgctxt "SV_BUTTONTEXT_SCREENSHOT" msgid "~Screenshot" -msgstr "" +msgstr "Аекран ақәҭыхымҭа" #: vcl/inc/strings.hrc:84 #, c-format @@ -498,26 +497,28 @@ "The component (%s) could not be loaded.\n" "Please start setup with the repair option." msgstr "" +"Акомпонент (%s) аҭагалара ауам.\n" +"Идәықәышәҵа ақәыргылара Аиҭашьақәыргылара арежим ала." #: vcl/inc/strings.hrc:86 msgctxt "SV_STDTEXT_ABOUT" msgid "About %PRODUCTNAME" -msgstr "" +msgstr "%PRODUCTNAME иазкны" #: vcl/inc/strings.hrc:87 msgctxt "SV_STDTEXT_PREFERENCES" msgid "Preferences..." -msgstr "" +msgstr "Апараметрқәа..." #: vcl/inc/strings.hrc:88 msgctxt "SV_STDTEXT_ALLFILETYPES" msgid "Any type" -msgstr "" +msgstr "Иарбанзаалакьу атип" #: vcl/inc/strings.hrc:90 msgctxt "STR_FPICKER_AUTO_EXTENSION" msgid "~Automatic file name extension" -msgstr "" +msgstr "Автоматикала арҭбаара" #: vcl/inc/strings.hrc:91 msgctxt "STR_FPICKER_PASSWORD" @@ -528,7 +529,7 @@ #: vcl/inc/strings.hrc:93 msgctxt "STR_FPICKER_GPGENCRYPT" msgid "Encrypt with ~GPG key" -msgstr "" +msgstr "Ишифррктәуп GPG ацаԥхала" #: vcl/inc/strings.hrc:94 msgctxt "STR_FPICKER_FILTER_OPTIONS" @@ -595,7 +596,7 @@ #: vcl/inc/strings.hrc:106 msgctxt "STR_FPICKER_ALREADYEXISTOVERWRITE_PRIMARY" msgid "A file named \"$filename$\" already exists. Do you want to replace it?" -msgstr "" +msgstr "Афаил ахьӡ \"$filename$\" змоу ыҟоуп. Иалаԥсахтәума иара?" #: vcl/inc/strings.hrc:107 msgctxt "STR_FPICKER_ALREADYEXISTOVERWRITE_SECONDARY" @@ -625,7 +626,7 @@ #: vcl/inc/strings.hrc:113 msgctxt "SV_ACCESSERROR_NO_FONTS" msgid "No fonts could be found on the system." -msgstr "" +msgstr "Ашрифтқәа асистемаҟны иԥшаам." #: vcl/inc/strings.hrc:115 msgctxt "SV_PRINT_NOPAGES" @@ -640,7 +641,7 @@ #: vcl/inc/strings.hrc:117 msgctxt "SV_PRINT_DEFPRT_TXT" msgid "Default printer" -msgstr "" +msgstr "Апринтер ишыҟоу еиԥш" #: vcl/inc/strings.hrc:118 msgctxt "SV_PRINT_PRINTPREVIEW_TXT" @@ -650,12 +651,12 @@ #: vcl/inc/strings.hrc:119 msgctxt "SV_PRINT_QUERYFAXNUMBER_TXT" msgid "Please enter the fax number" -msgstr "" +msgstr "Иҭажәгал афакс аномер" #: vcl/inc/strings.hrc:120 msgctxt "SV_PRINT_INVALID_TXT" msgid "" -msgstr "" +msgstr "<ибжьажьтәуп>" #: vcl/inc/strings.hrc:121 msgctxt "SV_PRINT_CUSTOM_TXT" @@ -675,7 +676,7 @@ #: vcl/inc/strings.hrc:126 msgctxt "SV_APP_OSVERSION" msgid "OS: " -msgstr "" +msgstr "ОС:" #: vcl/inc/strings.hrc:127 msgctxt "SV_APP_UIRENDER" @@ -685,7 +686,7 @@ #: vcl/inc/strings.hrc:128 msgctxt "SV_APP_GL" msgid "GL" -msgstr "" +msgstr "GL" #: vcl/inc/strings.hrc:129 #, fuzzy @@ -709,10 +710,9 @@ msgstr "Агха" #: vcl/inc/strings.hrc:134 -#, fuzzy msgctxt "SV_MSGBOX_QUERY" msgid "Confirmation" -msgstr "Архиара" +msgstr "Ашьақәырӷәӷәара" #: vcl/inc/strings.hrc:136 msgctxt "STR_TEXTUNDO_DELPARA" @@ -732,7 +732,7 @@ #: vcl/inc/strings.hrc:139 msgctxt "STR_TEXTUNDO_INSERTCHARS" msgid "insert '$1'" -msgstr "" +msgstr "иҭаргылатәуп '$1'" #: vcl/inc/strings.hrc:140 msgctxt "STR_TEXTUNDO_REMOVECHARS" @@ -743,12 +743,12 @@ #: vcl/inc/strings.hrc:143 msgctxt "STR_SVT_ACC_DESC_TABLISTBOX" msgid "Row: %1, Column: %2" -msgstr "" +msgstr "Ацәаҳәа: %1, Аиҵагыла: %2" #: vcl/inc/strings.hrc:144 msgctxt "STR_SVT_ACC_EMPTY_FIELD" msgid "Empty Field" -msgstr "" +msgstr "Иҭацәу аҭакыра" #. To translators: This is the first entry of a sequence of measurement unit names #: vcl/inc/units.hrc:28 @@ -764,22 +764,22 @@ #: vcl/inc/units.hrc:30 msgctxt "SV_FUNIT_STRINGS" msgid "m" -msgstr "" +msgstr "м" #: vcl/inc/units.hrc:31 msgctxt "SV_FUNIT_STRINGS" msgid "km" -msgstr "" +msgstr "км" #: vcl/inc/units.hrc:32 msgctxt "SV_FUNIT_STRINGS" msgid "twips" -msgstr "" +msgstr "твип" #: vcl/inc/units.hrc:33 msgctxt "SV_FUNIT_STRINGS" msgid "twip" -msgstr "" +msgstr "твип" #: vcl/inc/units.hrc:34 msgctxt "SV_FUNIT_STRINGS" @@ -789,12 +789,12 @@ #: vcl/inc/units.hrc:35 msgctxt "SV_FUNIT_STRINGS" msgid "pc" -msgstr "" +msgstr "пк" #: vcl/inc/units.hrc:36 msgctxt "SV_FUNIT_STRINGS" msgid "\"" -msgstr "" +msgstr "\"" #: vcl/inc/units.hrc:37 msgctxt "SV_FUNIT_STRINGS" @@ -809,12 +809,12 @@ #: vcl/inc/units.hrc:39 msgctxt "SV_FUNIT_STRINGS" msgid "'" -msgstr "" +msgstr "'" #: vcl/inc/units.hrc:40 msgctxt "SV_FUNIT_STRINGS" msgid "ft" -msgstr "" +msgstr "афут" #: vcl/inc/units.hrc:41 msgctxt "SV_FUNIT_STRINGS" @@ -824,7 +824,7 @@ #: vcl/inc/units.hrc:42 msgctxt "SV_FUNIT_STRINGS" msgid "feet" -msgstr "" +msgstr "афутқәа" #: vcl/inc/units.hrc:43 msgctxt "SV_FUNIT_STRINGS" @@ -839,7 +839,7 @@ #: vcl/inc/units.hrc:45 msgctxt "SV_FUNIT_STRINGS" msgid "ch" -msgstr "" +msgstr "ch" #: vcl/inc/units.hrc:46 msgctxt "SV_FUNIT_STRINGS" @@ -860,18 +860,18 @@ #: vcl/inc/units.hrc:50 msgctxt "SV_FUNIT_STRINGS" msgid "°" -msgstr "" +msgstr "°" #: vcl/inc/units.hrc:51 msgctxt "SV_FUNIT_STRINGS" msgid "sec" -msgstr "" +msgstr "с" #. To translators: This is the last entry of the sequence of measurement unit names #: vcl/inc/units.hrc:53 msgctxt "SV_FUNIT_STRINGS" msgid "ms" -msgstr "" +msgstr "мс" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:25 msgctxt "STR_FONT_FEATURE_ID_AALT" @@ -886,7 +886,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:27 msgctxt "STR_FONT_FEATURE_ID_ALIG" msgid "Ancient Ligatures" -msgstr "" +msgstr "Ажәытәӡатәи алигатурақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:28 msgctxt "STR_FONT_FEATURE_ID_C2PC" @@ -936,7 +936,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:37 msgctxt "STR_FONT_FEATURE_ID_DCAP" msgid "Drop Caps" -msgstr "" +msgstr "Ахалагаранбан" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:38 msgctxt "STR_FONT_FEATURE_ID_DLIG" @@ -946,7 +946,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:39 msgctxt "STR_FONT_FEATURE_ID_DNOM" msgid "Denominators" -msgstr "" +msgstr "Аҵагылақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:40 msgctxt "STR_FONT_FEATURE_ID_DPNG" @@ -956,7 +956,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:41 msgctxt "STR_FONT_FEATURE_ID_EXPT" msgid "Expert Forms" -msgstr "" +msgstr "Аексперттә формақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:42 msgctxt "STR_FONT_FEATURE_ID_FALT" @@ -981,7 +981,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:46 msgctxt "STR_FONT_FEATURE_ID_FWID" msgid "Full Widths" -msgstr "" +msgstr "Ихарҭәаау аҭбаара" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:47 msgctxt "STR_FONT_FEATURE_ID_HALT" @@ -991,7 +991,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:48 msgctxt "STR_FONT_FEATURE_ID_HIST" msgid "Historical Forms" -msgstr "" +msgstr "Аҭоурыхтә формақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:49 msgctxt "STR_FONT_FEATURE_ID_HKNA" @@ -1001,7 +1001,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:50 msgctxt "STR_FONT_FEATURE_ID_HLIG" msgid "Historical Ligatures" -msgstr "" +msgstr "Аҭоурыхтә лигатурақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:51 msgctxt "STR_FONT_FEATURE_ID_HNGL" @@ -1021,47 +1021,47 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:54 msgctxt "STR_FONT_FEATURE_ID_ITAL" msgid "Italics" -msgstr "" +msgstr "Акурсив" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:55 msgctxt "STR_FONT_FEATURE_ID_JALT" msgid "Justification Alternates" -msgstr "" +msgstr "Аиҟаратәра авариантқәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:56 msgctxt "STR_FONT_FEATURE_ID_JP04" msgid "JIS2004 Forms" -msgstr "" +msgstr "JIS2004 аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:57 msgctxt "STR_FONT_FEATURE_ID_JP78" msgid "JIS78 Forms" -msgstr "" +msgstr "JIS78 аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:58 msgctxt "STR_FONT_FEATURE_ID_JP83" msgid "JIS83 Forms" -msgstr "" +msgstr "JIS83 аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:59 msgctxt "STR_FONT_FEATURE_ID_JP90" msgid "JIS90 Forms" -msgstr "" +msgstr "JIS90 аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:60 msgctxt "STR_FONT_FEATURE_ID_KERN" msgid "Horizontal Kerning" -msgstr "" +msgstr "Игоризонталу акернинг" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:61 msgctxt "STR_FONT_FEATURE_ID_LFBD" msgid "Left Bounds" -msgstr "" +msgstr "Армарахьтәи аҳәаақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:62 msgctxt "STR_FONT_FEATURE_ID_LIGA" msgid "Standard Ligatures" -msgstr "" +msgstr "Истандарту алигатурақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:63 msgctxt "STR_FONT_FEATURE_ID_LNUM" @@ -1081,12 +1081,12 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:66 msgctxt "STR_FONT_FEATURE_ID_NLCK" msgid "NLC Kanji Forms" -msgstr "" +msgstr "NLC Кандзи аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:67 msgctxt "STR_FONT_FEATURE_ID_NUMR" msgid "Numerators" -msgstr "" +msgstr "Ахагылақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:68 msgctxt "STR_FONT_FEATURE_ID_ONUM" @@ -1096,7 +1096,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:69 msgctxt "STR_FONT_FEATURE_ID_OPBD" msgid "Optical Bounds" -msgstr "" +msgstr "Аоптикатә ҳәаақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:70 msgctxt "STR_FONT_FEATURE_ID_ORDN" @@ -1106,7 +1106,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:71 msgctxt "STR_FONT_FEATURE_ID_ORNM" msgid "Ornaments" -msgstr "" +msgstr "Аорнаментқәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:72 msgctxt "STR_FONT_FEATURE_ID_PALT" @@ -1126,12 +1126,12 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:75 msgctxt "STR_FONT_FEATURE_ID_PNUM" msgid "Proportional Numbers" -msgstr "" +msgstr "Ипропорционалу ахыԥхьаӡарақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:76 msgctxt "STR_FONT_FEATURE_ID_PWID" msgid "Proportional Widths" -msgstr "" +msgstr "Ипропорционалу аҭбаара" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:77 msgctxt "STR_FONT_FEATURE_ID_QWID" @@ -1141,7 +1141,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:78 msgctxt "STR_FONT_FEATURE_ID_RTBD" msgid "Right Bounds" -msgstr "" +msgstr "Арӷьарахьтәи аҳәаақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:79 msgctxt "STR_FONT_FEATURE_ID_RUBY" @@ -1166,7 +1166,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:83 msgctxt "STR_FONT_FEATURE_ID_SMPL" msgid "Simplified Forms" -msgstr "" +msgstr "Ирмариоу аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:84 msgctxt "STR_FONT_FEATURE_ID_SSXX" @@ -1176,12 +1176,12 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:85 msgctxt "STR_FONT_FEATURE_ID_SUBS" msgid "Subscript" -msgstr "" +msgstr "Ҵаҟатәи аиндекс " #: vcl/inc/font/OpenTypeFeatureStrings.hrc:86 msgctxt "STR_FONT_FEATURE_ID_SUPS" msgid "Superscript" -msgstr "" +msgstr "Хыхьтәи аиндекс" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:87 msgctxt "STR_FONT_FEATURE_ID_SWSH" @@ -1206,7 +1206,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:91 msgctxt "STR_FONT_FEATURE_ID_TRAD" msgid "Traditional Forms" -msgstr "" +msgstr "Идрадициатәу аформақәа" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:92 msgctxt "STR_FONT_FEATURE_ID_TWID" @@ -1236,7 +1236,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:97 msgctxt "STR_FONT_FEATURE_ID_VKRN" msgid "Vertical Kerning" -msgstr "" +msgstr "Ивертикалу акернинг" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:98 msgctxt "STR_FONT_FEATURE_ID_VPAL" @@ -1256,17 +1256,17 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:101 msgctxt "STR_FONT_FEATURE_ID_ZERO" msgid "Slashed Zero" -msgstr "" +msgstr "Иҵәаӷәо ноль" #: vcl/uiconfig/ui/cupspassworddialog.ui:8 msgctxt "cupspassworddialog|CUPSPasswordDialog" msgid "Authentication Request" -msgstr "" +msgstr "Аутентификациа азыҳәара" #: vcl/uiconfig/ui/cupspassworddialog.ui:72 msgctxt "cupspassworddialog|label1" msgid "_User:" -msgstr "" +msgstr "Ахархәаҩ:" #: vcl/uiconfig/ui/cupspassworddialog.ui:86 msgctxt "cupspassworddialog|label2" @@ -1276,7 +1276,7 @@ #: vcl/uiconfig/ui/cupspassworddialog.ui:100 msgctxt "cupspassworddialog|text" msgid "Please enter your authentication data for server “%s”" -msgstr "" +msgstr "Иҭажәгал аутентификациа адырқәа асервер «%s» азы" #: vcl/uiconfig/ui/editmenu.ui:12 msgctxt "editmenu|undo" @@ -1341,37 +1341,37 @@ #: vcl/uiconfig/ui/errornoprinterdialog.ui:15 msgctxt "errornoprinterdialog|ErrorNoPrinterDialog" msgid "Please choose a printer and try again." -msgstr "" +msgstr "Иалышәх апринтер нас игәашәҭ ҿыц." #: vcl/uiconfig/ui/printdialog.ui:46 msgctxt "printdialog|liststore1" msgid "1" -msgstr "" +msgstr "1" #: vcl/uiconfig/ui/printdialog.ui:50 msgctxt "printdialog|liststore1" msgid "2" -msgstr "" +msgstr "2" #: vcl/uiconfig/ui/printdialog.ui:54 msgctxt "printdialog|liststore1" msgid "4" -msgstr "" +msgstr "4" #: vcl/uiconfig/ui/printdialog.ui:58 msgctxt "printdialog|liststore1" msgid "6" -msgstr "" +msgstr "6" #: vcl/uiconfig/ui/printdialog.ui:62 msgctxt "printdialog|liststore1" msgid "9" -msgstr "" +msgstr "9" #: vcl/uiconfig/ui/printdialog.ui:66 msgctxt "printdialog|liststore1" msgid "16" -msgstr "" +msgstr "16" #: vcl/uiconfig/ui/printdialog.ui:70 #, fuzzy @@ -1422,17 +1422,17 @@ #: vcl/uiconfig/ui/printdialog.ui:232 msgctxt "printdialog|totalnumpages" msgid "/ %n" -msgstr "" +msgstr "/ %n" #: vcl/uiconfig/ui/printdialog.ui:246 msgctxt "printdialog|forward" msgid "Next page" -msgstr "" +msgstr "Анаҩстәи адаҟьа" #: vcl/uiconfig/ui/printdialog.ui:261 msgctxt "printdialog|backward" msgid "Previous page" -msgstr "" +msgstr "Аԥхьатәи адаҟьа" #: vcl/uiconfig/ui/printdialog.ui:335 msgctxt "printdialog|label7" @@ -1457,7 +1457,7 @@ #: vcl/uiconfig/ui/printdialog.ui:396 msgctxt "printdialog|location" msgid "Place" -msgstr "" +msgstr "Аҭыԥ" #: vcl/uiconfig/ui/printdialog.ui:412 msgctxt "printdialog|comment" @@ -1482,7 +1482,7 @@ #: vcl/uiconfig/ui/printdialog.ui:518 msgctxt "printdialog|label14" msgid "Number of copies" -msgstr "" +msgstr "Акопиақәа рыԥхьаӡа" #: vcl/uiconfig/ui/printdialog.ui:555 #, fuzzy @@ -1493,7 +1493,7 @@ #: vcl/uiconfig/ui/printdialog.ui:613 msgctxt "printdialog|printallsheets" msgid "All sheets" -msgstr "" +msgstr "Абӷьыцқәа зегьы" #: vcl/uiconfig/ui/printdialog.ui:631 msgctxt "printdialog|printselectedsheets" @@ -1618,12 +1618,12 @@ #: vcl/uiconfig/ui/printdialog.ui:1312 msgctxt "printdialog|sheetmargintxt2" msgid "to sheet border" -msgstr "" +msgstr "адаҟьа акьыԥшь иаркны" #: vcl/uiconfig/ui/printdialog.ui:1322 msgctxt "printdialog|bordercb" msgid "Draw a border around each page" -msgstr "" +msgstr "Даҟьа цыҟхьаӡа ирыкәыршан арамка ҭыхтәуп" #: vcl/uiconfig/ui/printdialog.ui:1344 msgctxt "printdialog|ordertxt" @@ -1673,7 +1673,7 @@ #: vcl/uiconfig/ui/printdialog.ui:1561 msgctxt "printdialog|optionstab" msgid "Options" -msgstr "" +msgstr "Апараметрқәа" #: vcl/uiconfig/ui/printerdevicepage.ui:34 msgctxt "printerdevicepage|label7" @@ -1683,17 +1683,17 @@ #: vcl/uiconfig/ui/printerdevicepage.ui:48 msgctxt "printerdevicepage|label8" msgid "Current _value:" -msgstr "" +msgstr "Уажәтәи аҵакы:" #: vcl/uiconfig/ui/printerdevicepage.ui:170 msgctxt "printerdevicepage|label11" msgid "Color _depth:" -msgstr "" +msgstr "Аԥштәы аҵаулара:" #: vcl/uiconfig/ui/printerdevicepage.ui:184 msgctxt "printerdevicepage|label10" msgid "Co_lor:" -msgstr "" +msgstr "Аԥштәы:" #: vcl/uiconfig/ui/printerdevicepage.ui:198 msgctxt "printerdevicepage|label9" @@ -1703,37 +1703,37 @@ #: vcl/uiconfig/ui/printerdevicepage.ui:214 msgctxt "printerdevicepage|liststore1" msgid "Automatic : %s" -msgstr "" +msgstr "Автоматикала: %s" #: vcl/uiconfig/ui/printerdevicepage.ui:215 msgctxt "printerdevicepage|liststore1" msgid "PostScript (Level from driver)" -msgstr "" +msgstr "PostScript (аҩаӡара адраивер аҟынтә)" #: vcl/uiconfig/ui/printerdevicepage.ui:216 msgctxt "printerdevicepage|liststore1" msgid "PostScript Level 1" -msgstr "" +msgstr "PostScript 1 аҩаӡара" #: vcl/uiconfig/ui/printerdevicepage.ui:217 msgctxt "printerdevicepage|liststore1" msgid "PostScript Level 2" -msgstr "" +msgstr "PostScript 2 аҩаӡара" #: vcl/uiconfig/ui/printerdevicepage.ui:218 msgctxt "printerdevicepage|liststore1" msgid "PostScript Level 3" -msgstr "" +msgstr "PostScript 3 аҩаӡара" #: vcl/uiconfig/ui/printerdevicepage.ui:219 msgctxt "printerdevicepage|liststore1" msgid "PDF" -msgstr "" +msgstr "PDF" #: vcl/uiconfig/ui/printerdevicepage.ui:232 msgctxt "printerdevicepage|colorspace" msgid "From driver" -msgstr "" +msgstr "Адраивер аҟынтә" #: vcl/uiconfig/ui/printerdevicepage.ui:233 msgctxt "printerdevicepage|colorspace" @@ -1748,12 +1748,12 @@ #: vcl/uiconfig/ui/printerdevicepage.ui:247 msgctxt "printerdevicepage|colordepth" msgid "8 Bit" -msgstr "" +msgstr "8 бит" #: vcl/uiconfig/ui/printerdevicepage.ui:248 msgctxt "printerdevicepage|colordepth" msgid "24 Bit" -msgstr "" +msgstr "24 бит" #: vcl/uiconfig/ui/printerpaperpage.ui:19 msgctxt "printerpaperpage|paperft" @@ -1763,17 +1763,17 @@ #: vcl/uiconfig/ui/printerpaperpage.ui:32 msgctxt "printerpaperpage|orientft" msgid "_Orientation:" -msgstr "" +msgstr "_Аориентациа:" #: vcl/uiconfig/ui/printerpaperpage.ui:45 msgctxt "printerpaperpage|duplexft" msgid "_Duplex:" -msgstr "" +msgstr "Адуплекс:" #: vcl/uiconfig/ui/printerpaperpage.ui:58 msgctxt "printerpaperpage|slotft" msgid "Paper tray:" -msgstr "" +msgstr "Ақьаад анашьҭра:" #: vcl/uiconfig/ui/printerpaperpage.ui:82 msgctxt "printerpaperpage|orientlb" @@ -1793,7 +1793,7 @@ #: vcl/uiconfig/ui/printerpropertiesdialog.ui:8 msgctxt "printerpropertiesdialog|PrinterPropertiesDialog" msgid "Properties of %s" -msgstr "" +msgstr "Аҷыдаҟазшьақәа %s" #: vcl/uiconfig/ui/printerpropertiesdialog.ui:105 msgctxt "printerpropertiesdialog|paper" @@ -1803,7 +1803,7 @@ #: vcl/uiconfig/ui/printerpropertiesdialog.ui:152 msgctxt "printerpropertiesdialog|device" msgid "Device" -msgstr "" +msgstr "Аиҿартәыра" #: vcl/uiconfig/ui/printprogressdialog.ui:8 msgctxt "printprogressdialog|PrintProgressDialog" diff -Nru libreoffice-6.2.2/translations/source/ab/wizards/source/resources.po libreoffice-6.2.3/translations/source/ab/wizards/source/resources.po --- libreoffice-6.2.2/translations/source/ab/wizards/source/resources.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ab/wizards/source/resources.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-10-04 11:47+0200\n" -"PO-Revision-Date: 2018-06-24 13:33+0000\n" +"PO-Revision-Date: 2019-04-02 09:36+0000\n" "Last-Translator: Андрей Абухба \n" "Language-Team: LANGUAGE \n" "Language: ab\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1529847201.000000\n" +"X-POOTLE-MTIME: 1554197789.000000\n" #: resources_en_US.properties msgctxt "" @@ -21,7 +21,7 @@ "RID_COMMON_0\n" "property.text" msgid "The directory '%1' could not be created.
There may not be enough space left on your hard disk." -msgstr "" +msgstr "Акаталог «%1» аԥҵара ауам.
Иҟалап, асанҭыр кьакьа аҟны аҭыԥ азымхозар." #: resources_en_US.properties msgctxt "" @@ -181,7 +181,7 @@ "RID_COMMON_20\n" "property.text" msgid "Template created via on ." -msgstr "" +msgstr "Ашаблон аԥҵоуп азҟаза ахархәарала." #: resources_en_US.properties msgctxt "" @@ -229,7 +229,7 @@ "RID_REPORT_8\n" "property.text" msgid "- undefined -" -msgstr "" +msgstr "- еилкааӡам -" #: resources_en_US.properties msgctxt "" @@ -237,7 +237,7 @@ "RID_REPORT_9\n" "property.text" msgid "~Fields in report" -msgstr "" +msgstr "Аҳасабырба аҟны аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -245,7 +245,7 @@ "RID_REPORT_11\n" "property.text" msgid "Grouping" -msgstr "" +msgstr "Гәыԥла аихшара" #: resources_en_US.properties msgctxt "" @@ -253,7 +253,7 @@ "RID_REPORT_12\n" "property.text" msgid "Sort options" -msgstr "" +msgstr "Асортра апараметрқәа" #: resources_en_US.properties msgctxt "" @@ -301,7 +301,7 @@ "RID_REPORT_20\n" "property.text" msgid "~Sort by" -msgstr "" +msgstr "Исорттәуп ала" #: resources_en_US.properties msgctxt "" @@ -309,7 +309,7 @@ "RID_REPORT_21\n" "property.text" msgid "T~hen by" -msgstr "" +msgstr "Нас ала" #: resources_en_US.properties msgctxt "" @@ -341,7 +341,7 @@ "RID_REPORT_28\n" "property.text" msgid "Which fields do you want to have in your report?" -msgstr "" +msgstr "Иарбан ҭакырақәоу аҳасабырбаҿ ижәбарц ишәҭаху?" #: resources_en_US.properties msgctxt "" @@ -357,7 +357,7 @@ "RID_REPORT_30\n" "property.text" msgid "According to which fields do you want to sort the data?" -msgstr "" +msgstr "Асортра хырхарҭаз иаҭатәузеи?" #: resources_en_US.properties msgctxt "" @@ -365,7 +365,7 @@ "RID_REPORT_31\n" "property.text" msgid "How do you want your report to look?" -msgstr "" +msgstr "Аҳасабырба аԥшра шԥаҟазар акуи?" #: resources_en_US.properties msgctxt "" @@ -461,7 +461,7 @@ "RID_REPORT_50\n" "property.text" msgid "Groupings" -msgstr "" +msgstr "Аргәыԥра" #: resources_en_US.properties msgctxt "" @@ -557,7 +557,7 @@ "RID_REPORT_63\n" "property.text" msgid "Number of records inserted: " -msgstr "" +msgstr "Иҭаргылоу анҵамҭақәа рыԥхьаӡа: " #: resources_en_US.properties msgctxt "" @@ -565,7 +565,7 @@ "RID_REPORT_64\n" "property.text" msgid "The form '' does not exist." -msgstr "" +msgstr "Аформа «» ыҟаӡам." #: resources_en_US.properties msgctxt "" @@ -597,7 +597,7 @@ "RID_REPORT_68\n" "property.text" msgid "Labeling fields" -msgstr "" +msgstr "Аҭыԥдыргақәа рҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -605,7 +605,7 @@ "RID_REPORT_69\n" "property.text" msgid "How do you want to label the fields?" -msgstr "" +msgstr "Ишԥашәҭаху аҭакырақәа азгәашәҭарц?" #: resources_en_US.properties msgctxt "" @@ -693,7 +693,7 @@ "RID_REPORT_81\n" "property.text" msgid "Columnar, single-column" -msgstr "" +msgstr "Аиҵаҩыратәи" #: resources_en_US.properties msgctxt "" @@ -701,7 +701,7 @@ "RID_REPORT_82\n" "property.text" msgid "Columnar, two columns" -msgstr "" +msgstr "Аиҵаҩыратәи, аиҵаҩырақәа ҩба" #: resources_en_US.properties msgctxt "" @@ -709,7 +709,7 @@ "RID_REPORT_83\n" "property.text" msgid "Columnar, three columns" -msgstr "" +msgstr "Аиҵаҩыратәи, аиҵаҩырақәа хԥа" #: resources_en_US.properties msgctxt "" @@ -717,7 +717,7 @@ "RID_REPORT_84\n" "property.text" msgid "In blocks, labels left" -msgstr "" +msgstr "Аблокқәа - анапаҵаҩрақәа арыӷьарахь" #: resources_en_US.properties msgctxt "" @@ -725,7 +725,7 @@ "RID_REPORT_85\n" "property.text" msgid "In blocks, labels above" -msgstr "" +msgstr "Аблокқәа - анапаҵаҩрақәа хыхьла" #: resources_en_US.properties msgctxt "" @@ -781,7 +781,7 @@ "RID_REPORT_92\n" "property.text" msgid "No valid report template was found." -msgstr "" +msgstr "Иԥшаам иақәнаго аҳасабырба ашаблон." #: resources_en_US.properties msgctxt "" @@ -869,7 +869,7 @@ "RID_REPORT_103\n" "property.text" msgid "Outline - Elegant" -msgstr "" +msgstr "Арамка аҟны - Иелеганту" #: resources_en_US.properties msgctxt "" @@ -877,7 +877,7 @@ "RID_REPORT_104\n" "property.text" msgid "Outline - Highlighted" -msgstr "" +msgstr "Арамка аҟны - Иалкаау" #: resources_en_US.properties msgctxt "" @@ -885,7 +885,7 @@ "RID_REPORT_105\n" "property.text" msgid "Outline - Modern" -msgstr "" +msgstr "Арамка аҟны - Ҳаамҭазтәи" #: resources_en_US.properties msgctxt "" @@ -901,7 +901,7 @@ "RID_REPORT_107\n" "property.text" msgid "Outline, indented - Borders" -msgstr "" +msgstr "Арамка аҟны, ахьаҵ ацны - Аҿыкәырша" #: resources_en_US.properties msgctxt "" @@ -909,7 +909,7 @@ "RID_REPORT_108\n" "property.text" msgid "Outline, indented - Compact" -msgstr "" +msgstr "Арамка аҟны, ахьаҵ ацны - Икомпакту" #: resources_en_US.properties msgctxt "" @@ -917,7 +917,7 @@ "RID_REPORT_109\n" "property.text" msgid "Outline, indented - Elegant" -msgstr "" +msgstr "Арамка аҟны, ахьаҵ ацны - Иелеганту" #: resources_en_US.properties msgctxt "" @@ -925,7 +925,7 @@ "RID_REPORT_110\n" "property.text" msgid "Outline, indented - Highlighted" -msgstr "" +msgstr "Арамка аҟны, ахьаҵ ацны - Иалкаау" #: resources_en_US.properties msgctxt "" @@ -933,7 +933,7 @@ "RID_REPORT_111\n" "property.text" msgid "Outline, indented - Modern" -msgstr "" +msgstr "Арамка аҟны, ахьаҵ ацны - Ҳаамҭазтәи" #: resources_en_US.properties msgctxt "" @@ -1006,7 +1006,7 @@ "RID_REPORT_120\n" "property.text" msgid "Formal with Company Logo" -msgstr "" +msgstr "Иофициалтәу, акомпаниа алоготип ацны" #: resources_en_US.properties msgctxt "" @@ -1078,7 +1078,7 @@ "RID_DB_COMMON_6\n" "property.text" msgid "An error occurred while running the wizard. The wizard will be terminated." -msgstr "" +msgstr "Азҟаза аусура агха. Азҟаза аусура еиԥырҟьахоит." #: resources_en_US.properties msgctxt "" @@ -1086,7 +1086,7 @@ "RID_DB_COMMON_8\n" "property.text" msgid "No database has been installed. At least one database is required before the wizard for forms can be started." -msgstr "" +msgstr "Иқәыргылоу, адырқәа рбазақәа ыҟаӡам. Аформақәа разҟаза адәықәҵараз ихымԥадатәиуп акы иадамзаргьы." #: resources_en_US.properties msgctxt "" @@ -1102,7 +1102,7 @@ "RID_DB_COMMON_10\n" "property.text" msgid "This title already exists in the database. Please enter another name." -msgstr "" +msgstr "Ари аҩызы ахьӡ адырқәа рбазаҿ иҟоуп. Иҭажәгал даҽакы." #: resources_en_US.properties msgctxt "" @@ -1110,7 +1110,7 @@ "RID_DB_COMMON_11\n" "property.text" msgid "The title must not contain any spaces or special characters." -msgstr "" +msgstr "Ахьӡ иаҵанамкуазароуп апробелқәеи испециалу асимволқәеи." #: resources_en_US.properties msgctxt "" @@ -1190,7 +1190,7 @@ "RID_DB_COMMON_36\n" "property.text" msgid "The file path entered is not valid." -msgstr "" +msgstr "Иҭагалоуп афаил ахь ииашам амҩа." #: resources_en_US.properties msgctxt "" @@ -1206,7 +1206,7 @@ "RID_DB_COMMON_38\n" "property.text" msgid "Please select a table or query" -msgstr "" +msgstr "Иҭажәгал атаблица ма азыҳәара" #: resources_en_US.properties msgctxt "" @@ -1246,7 +1246,7 @@ "RID_DB_COMMON_43\n" "property.text" msgid "Move field up" -msgstr "" +msgstr "Ииагатәуп аҩада" #: resources_en_US.properties msgctxt "" @@ -1254,7 +1254,7 @@ "RID_DB_COMMON_44\n" "property.text" msgid "Move field down" -msgstr "" +msgstr "Ииагатәуп алада" #: resources_en_US.properties msgctxt "" @@ -1262,7 +1262,7 @@ "RID_DB_COMMON_45\n" "property.text" msgid "The field names from '%NAME' could not be retrieved." -msgstr "" +msgstr "Аҭакырақәа рыхьӡқәа раиура «%NAME» аҟынтәи иауам." #: resources_en_US.properties msgctxt "" @@ -1270,7 +1270,7 @@ "RID_QUERY_0\n" "property.text" msgid "Query Wizard" -msgstr "" +msgstr "Азыҳәарақәа разҟаза" #: resources_en_US.properties msgctxt "" @@ -1286,7 +1286,7 @@ "RID_QUERY_2\n" "property.text" msgid "Query Wizard" -msgstr "" +msgstr "Азыҳәарақәа разҟаза" #: resources_en_US.properties msgctxt "" @@ -1302,7 +1302,7 @@ "RID_QUERY_4\n" "property.text" msgid "A~vailable fields" -msgstr "" +msgstr "Иҟоу аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -1310,7 +1310,7 @@ "RID_QUERY_5\n" "property.text" msgid "Name ~of the query" -msgstr "" +msgstr "Азыҳәара ахьӡ" #: resources_en_US.properties msgctxt "" @@ -1318,7 +1318,7 @@ "RID_QUERY_6\n" "property.text" msgid "Display ~Query" -msgstr "" +msgstr "Иаарԥштәуп азыҳәара" #: resources_en_US.properties msgctxt "" @@ -1326,7 +1326,7 @@ "RID_QUERY_7\n" "property.text" msgid "~Modify Query" -msgstr "" +msgstr "Иԥсахтәуп азыҳәара" #: resources_en_US.properties msgctxt "" @@ -1334,7 +1334,7 @@ "RID_QUERY_8\n" "property.text" msgid "~How do you want to proceed after creating the query?" -msgstr "" +msgstr "Иҟаҵатәузеи азыҳәара аԥҵара ашьҭахь?" #: resources_en_US.properties msgctxt "" @@ -1374,7 +1374,7 @@ "RID_QUERY_16\n" "property.text" msgid "Aggregate functions" -msgstr "" +msgstr "Агрегаттә функциақәа" #: resources_en_US.properties msgctxt "" @@ -1390,7 +1390,7 @@ "RID_QUERY_18\n" "property.text" msgid "~Group by" -msgstr "" +msgstr "Иргәыԥтәуп ала" #: resources_en_US.properties msgctxt "" @@ -1566,7 +1566,7 @@ "RID_QUERY_41\n" "property.text" msgid "get the average of" -msgstr "" +msgstr "ибжьаратәу" #: resources_en_US.properties msgctxt "" @@ -1606,7 +1606,7 @@ "RID_QUERY_50\n" "property.text" msgid "Fie~lds in the Query:" -msgstr "" +msgstr "Аҭакырақәа азыҳәара аҟны: " #: resources_en_US.properties msgctxt "" @@ -1614,7 +1614,7 @@ "RID_QUERY_51\n" "property.text" msgid "Sorting order:" -msgstr "" +msgstr "Асортра аиҿкаашьа:" #: resources_en_US.properties msgctxt "" @@ -1622,7 +1622,7 @@ "RID_QUERY_52\n" "property.text" msgid "No sorting fields were assigned." -msgstr "" +msgstr "Иазалхым аҭакырақәа рсортра аиҿкаашьа." #: resources_en_US.properties msgctxt "" @@ -1630,7 +1630,7 @@ "RID_QUERY_53\n" "property.text" msgid "Search conditions:" -msgstr "" +msgstr "Аԥшаара аҭагылазаашьа:" #: resources_en_US.properties msgctxt "" @@ -1646,7 +1646,7 @@ "RID_QUERY_55\n" "property.text" msgid "Aggregate functions:" -msgstr "" +msgstr "Агрегаттә функциақәа:" #: resources_en_US.properties msgctxt "" @@ -1654,7 +1654,7 @@ "RID_QUERY_56\n" "property.text" msgid "No aggregate functions were assigned." -msgstr "" +msgstr "Иазалхым агрегаттә функциақәа." #: resources_en_US.properties msgctxt "" @@ -1662,7 +1662,7 @@ "RID_QUERY_57\n" "property.text" msgid "Grouped by:" -msgstr "" +msgstr "Иргәыԥтәуп ала:" #: resources_en_US.properties msgctxt "" @@ -1670,7 +1670,7 @@ "RID_QUERY_58\n" "property.text" msgid "No Groups were assigned." -msgstr "" +msgstr "Иазалхым агәыԥқәа." #: resources_en_US.properties msgctxt "" @@ -1702,7 +1702,7 @@ "RID_QUERY_71\n" "property.text" msgid "Select the sorting order" -msgstr "" +msgstr "Иалышәх асортра аиҿкаашьа" #: resources_en_US.properties msgctxt "" @@ -1710,7 +1710,7 @@ "RID_QUERY_72\n" "property.text" msgid "Select the search conditions" -msgstr "" +msgstr "Иалышәх аԥшаара аҭагылазаашьа" #: resources_en_US.properties msgctxt "" @@ -1718,7 +1718,7 @@ "RID_QUERY_73\n" "property.text" msgid "Select the type of query" -msgstr "" +msgstr "Иалышә азыҳәара атип" #: resources_en_US.properties msgctxt "" @@ -1766,7 +1766,7 @@ "RID_QUERY_81\n" "property.text" msgid "Sorting order" -msgstr "" +msgstr "Асортра аиҿкаашьа" #: resources_en_US.properties msgctxt "" @@ -1790,7 +1790,7 @@ "RID_QUERY_84\n" "property.text" msgid "Grouping" -msgstr "" +msgstr "Гәыԥла аихшара" #: resources_en_US.properties msgctxt "" @@ -1806,7 +1806,7 @@ "RID_QUERY_86\n" "property.text" msgid "Aliases" -msgstr "" +msgstr "Апсевдонимқәа" #: resources_en_US.properties msgctxt "" @@ -1902,7 +1902,7 @@ "RID_FORM_1\n" "property.text" msgid "Fields in ~the form" -msgstr "" +msgstr "Аҭакырақәа аформа аҟны" #: resources_en_US.properties msgctxt "" @@ -1910,7 +1910,7 @@ "RID_FORM_2\n" "property.text" msgid "Binary fields are always listed and selectable from the left list.\\nIf possible, they are interpreted as images." -msgstr "" +msgstr "Иҩбашьаҭатәу аҭакырақәа есқьаангьы еиқәыԥхьаӡоуп ахьӡынҵа аҟны, иалхзаргьы ауеит. Иауазар, дара аарԥшхоит сахьа ҳасабла." #: resources_en_US.properties msgctxt "" @@ -1942,7 +1942,7 @@ "RID_FORM_6\n" "property.text" msgid "Tables or queries" -msgstr "" +msgstr "Атаблицақәа ма азыҳәарақәа" #: resources_en_US.properties msgctxt "" @@ -1958,7 +1958,7 @@ "RID_FORM_8\n" "property.text" msgid "~Which relation do you want to add?" -msgstr "" +msgstr "Иарбан еизыҟазаашьоу иалышәхырц ишәҭаху?" #: resources_en_US.properties msgctxt "" @@ -1974,7 +1974,7 @@ "RID_FORM_12\n" "property.text" msgid "~Available fields" -msgstr "" +msgstr "Иҟоу аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -2086,7 +2086,7 @@ "RID_FORM_31\n" "property.text" msgid "Flat" -msgstr "" +msgstr "Иҟьаԥсу" #: resources_en_US.properties msgctxt "" @@ -2094,7 +2094,7 @@ "RID_FORM_32\n" "property.text" msgid "Label placement" -msgstr "" +msgstr "Анапаҵаҩра аҭыԥ" #: resources_en_US.properties msgctxt "" @@ -2118,7 +2118,7 @@ "RID_FORM_35\n" "property.text" msgid "Arrangement of DB fields" -msgstr "" +msgstr "Адырқәа рбаза аҭакырақәа рҭыԥ" #: resources_en_US.properties msgctxt "" @@ -2126,7 +2126,7 @@ "RID_FORM_36\n" "property.text" msgid "Columnar - Labels Left" -msgstr "" +msgstr "Аиҵагылақәа - анапаҵаҩрақәа арымарахь" #: resources_en_US.properties msgctxt "" @@ -2134,7 +2134,7 @@ "RID_FORM_37\n" "property.text" msgid "Columnar - Labels on Top" -msgstr "" +msgstr "Аиҵагылақәа - анапаҵаҩрақәа хыхьла" #: resources_en_US.properties msgctxt "" @@ -2142,7 +2142,7 @@ "RID_FORM_38\n" "property.text" msgid "In Blocks - Labels Left" -msgstr "" +msgstr "Аблокқәа - анапаҵаҩрақәа арымарахь" #: resources_en_US.properties msgctxt "" @@ -2150,7 +2150,7 @@ "RID_FORM_39\n" "property.text" msgid "In Blocks - Labels Above" -msgstr "" +msgstr "Аблокқәа - анапаҵаҩрақәа хыхьла" #: resources_en_US.properties msgctxt "" @@ -2158,7 +2158,7 @@ "RID_FORM_40\n" "property.text" msgid "As Data Sheet" -msgstr "" +msgstr "Адырқәа рбӷьыц еиԥш" #: resources_en_US.properties msgctxt "" @@ -2166,7 +2166,7 @@ "RID_FORM_41\n" "property.text" msgid "Arrangement of the main form" -msgstr "" +msgstr "Ихадоу аформа аҭыԥ" #: resources_en_US.properties msgctxt "" @@ -2190,7 +2190,7 @@ "RID_FORM_45\n" "property.text" msgid "Existing data will not be displayed" -msgstr "" +msgstr "Иҟоу адырқәа аарԥшхаӡом" #: resources_en_US.properties msgctxt "" @@ -2198,7 +2198,7 @@ "RID_FORM_46\n" "property.text" msgid "T~he form is to display all data" -msgstr "" +msgstr "Адырқәа зегьы раарԥшра аформа" #: resources_en_US.properties msgctxt "" @@ -2294,7 +2294,7 @@ "RID_FORM_83\n" "property.text" msgid "Get joined fields" -msgstr "" +msgstr "Иаиутәуп аидҵара аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -2310,7 +2310,7 @@ "RID_FORM_85\n" "property.text" msgid "Set data entry" -msgstr "" +msgstr "Иазалхтәуп адырқәа рхыҵхырҭа" #: resources_en_US.properties msgctxt "" @@ -2375,7 +2375,7 @@ "RID_FORM_93\n" "property.text" msgid "Select the joins between your forms" -msgstr "" +msgstr "Ишәырхиа аформақәа реидҵара" #: resources_en_US.properties msgctxt "" @@ -2407,7 +2407,7 @@ "RID_FORM_97\n" "property.text" msgid "Set the name of the form" -msgstr "" +msgstr "Иашәырба аформа ахьӡ" #: resources_en_US.properties msgctxt "" @@ -2415,7 +2415,7 @@ "RID_FORM_98\n" "property.text" msgid "A form with the name '%FORMNAME' already exists.\\nChoose another name." -msgstr "" +msgstr "Аформа ахьӡ «%FORMNAME» змоу ыҟоуп. \\n Иалышәх даҽа хьӡык." #: resources_en_US.properties msgctxt "" @@ -2439,7 +2439,7 @@ "RID_TABLE_3\n" "property.text" msgid "Set types and formats" -msgstr "" +msgstr "Иалхтәуп атипи аформати" #: resources_en_US.properties msgctxt "" @@ -2447,7 +2447,7 @@ "RID_TABLE_4\n" "property.text" msgid "Set primary key" -msgstr "" +msgstr "Иазалхтәуп актәи ацаԥха" #: resources_en_US.properties msgctxt "" @@ -2471,7 +2471,7 @@ "RID_TABLE_9\n" "property.text" msgid "Set field types and formats" -msgstr "" +msgstr "Иазалхтәуп аҭакырақәеи ртипқәеи рформатқәеи" #: resources_en_US.properties msgctxt "" @@ -2479,7 +2479,7 @@ "RID_TABLE_10\n" "property.text" msgid "Set primary key" -msgstr "" +msgstr "Иазалхтәуп актәи ацаԥха" #: resources_en_US.properties msgctxt "" @@ -2535,7 +2535,7 @@ "RID_TABLE_19\n" "property.text" msgid "A~vailable fields" -msgstr "" +msgstr "Иҟоу аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -2599,7 +2599,7 @@ "RID_TABLE_27\n" "property.text" msgid "~Create a primary key" -msgstr "" +msgstr "Иаԥҵатәуп актәи ацаԥха" #: resources_en_US.properties msgctxt "" @@ -2607,7 +2607,7 @@ "RID_TABLE_28\n" "property.text" msgid "~Automatically add a primary key" -msgstr "" +msgstr "Автоматикала иацҵатәуп актәи ацаԥха" #: resources_en_US.properties msgctxt "" @@ -2615,7 +2615,7 @@ "RID_TABLE_29\n" "property.text" msgid "~Use an existing field as a primary key" -msgstr "" +msgstr "Ихархәатәуп иҟоу аҭакыра актәи ацаԥха аиԥш" #: resources_en_US.properties msgctxt "" @@ -2623,7 +2623,7 @@ "RID_TABLE_30\n" "property.text" msgid "Define p~rimary key as a combination of several fields" -msgstr "" +msgstr "Иаԥҵатәуп актәи ацаԥха аҭакырақәа ԥыҭк рхархәарала" #: resources_en_US.properties msgctxt "" @@ -2639,7 +2639,7 @@ "RID_TABLE_32\n" "property.text" msgid "~Primary key fields" -msgstr "" +msgstr "Актәи ацаԥха аҭакырақәа" #: resources_en_US.properties msgctxt "" @@ -2647,7 +2647,7 @@ "RID_TABLE_33\n" "property.text" msgid "Auto ~value" -msgstr "" +msgstr "Автомат. ҵакы" #: resources_en_US.properties msgctxt "" @@ -2663,7 +2663,7 @@ "RID_TABLE_35\n" "property.text" msgid "Congratulations. You have entered all the information needed to create your table." -msgstr "" +msgstr "Ишәыдаҳныҳәалоит! Атаблица аԥҵаразы иаҭахыз аинформациа зегьы ҭагалоуп." #: resources_en_US.properties msgctxt "" @@ -2687,7 +2687,7 @@ "RID_TABLE_38\n" "property.text" msgid "Insert data immediately" -msgstr "" +msgstr "Иаразнак иҭаргылатәп адырқәа" #: resources_en_US.properties msgctxt "" @@ -2695,7 +2695,7 @@ "RID_TABLE_39\n" "property.text" msgid "C~reate a form based on this table" -msgstr "" +msgstr "Иаԥҵатәуп аформа атаблица ашьаҭала" #: resources_en_US.properties msgctxt "" @@ -2711,7 +2711,7 @@ "RID_TABLE_41\n" "property.text" msgid "The table name '%TABLENAME' contains a character ('%SPECIALCHAR') that might not be supported by the database." -msgstr "" +msgstr "Атаблица «%TABLENAME» иаҵанакуеит асимвол («%SPECIALCHAR»), адырқәа рбаза иаднамкылар зуа." #: resources_en_US.properties msgctxt "" @@ -2719,7 +2719,7 @@ "RID_TABLE_42\n" "property.text" msgid "The field name '%FIELDNAME' contains a special character ('%SPECIALCHAR') that might not be supported by the database." -msgstr "" +msgstr "Аҭакыра «%FIELDNAME» иаҵанакуеит асимвол («%SPECIALCHAR»), адырқәа рбаза иаднамкылар зуа." #: resources_en_US.properties msgctxt "" @@ -2759,7 +2759,7 @@ "RID_TABLE_47\n" "property.text" msgid "The field cannot be inserted because this would exceed the maximum number of %COUNT possible fields in the database table" -msgstr "" +msgstr "Иауам аҭакыра аҭаргылара, адырқәа рбаза (%COUNT) аҟны иахысуп аҭакырақәа рыԥхьаӡа амаксимум" #: resources_en_US.properties #, fuzzy @@ -2792,7 +2792,7 @@ "RID_TABLE_51\n" "property.text" msgid "The field '%FIELDNAME' already exists." -msgstr "" +msgstr "Аҭакыра «%FIELDNAME» ыҟоуп." #: resources_en_US.properties msgctxt "" @@ -2824,7 +2824,7 @@ "STEP_ZERO_3\n" "property.text" msgid "~Convert" -msgstr "" +msgstr "Аконвертациа азутәуп" #: resources_en_US.properties msgctxt "" @@ -2840,7 +2840,7 @@ "STEP_ZERO_5\n" "property.text" msgid "First, unprotect all sheets." -msgstr "" +msgstr "Раԥхьа абӷьыцқәа зегь ирхышәх ахьчага." #: resources_en_US.properties msgctxt "" @@ -2896,7 +2896,7 @@ "STEP_CONVERTER_3\n" "property.text" msgid "Currency cells in the current ~sheet" -msgstr "" +msgstr "Авалиута абларҭақәа уажәтәи абӷьыц аҟны" #: resources_en_US.properties msgctxt "" @@ -2904,7 +2904,7 @@ "STEP_CONVERTER_4\n" "property.text" msgid "Currency cells in the entire ~document" -msgstr "" +msgstr "Авалиута абларҭақәа адокумент зегь аҟны" #: resources_en_US.properties msgctxt "" @@ -2960,7 +2960,7 @@ "STEP_AUTOPILOT_1\n" "property.text" msgid "~Single %PRODUCTNAME Calc document" -msgstr "" +msgstr "~Документк %PRODUCTNAME" #: resources_en_US.properties msgctxt "" @@ -3000,7 +3000,7 @@ "STEP_AUTOPILOT_6\n" "property.text" msgid "Target directory:" -msgstr "" +msgstr "Иазалху акаталог:" #: resources_en_US.properties msgctxt "" @@ -3008,7 +3008,7 @@ "STEP_AUTOPILOT_7\n" "property.text" msgid "Temporarily unprotect sheet without query" -msgstr "" +msgstr "Аамҭала иамхтәуп ахьчара абӷьыц азыҳәара змам" #: resources_en_US.properties msgctxt "" @@ -3016,7 +3016,7 @@ "STEP_AUTOPILOT_10\n" "property.text" msgid "Also convert fields and tables in text documents" -msgstr "" +msgstr "Аконвертациа рзутәуп атеқсттә документ аҭакырақәеи атаблицақәеи" #: resources_en_US.properties msgctxt "" @@ -3032,7 +3032,7 @@ "STATUSLINE_1\n" "property.text" msgid "Conversion status of the cell templates:" -msgstr "" +msgstr "Абларҭақәа рстильқәа рконвертациа аҭагылазаашьа:" #: resources_en_US.properties msgctxt "" @@ -3056,7 +3056,7 @@ "STATUSLINE_4\n" "property.text" msgid "Sheet protection for each sheet will be restored..." -msgstr "" +msgstr "Бӷьыццыԥхьаӡа рыхьчара аиҭашьақәыргылара иаҿуп..." #: resources_en_US.properties msgctxt "" @@ -3169,7 +3169,7 @@ "MESSAGES_12\n" "property.text" msgid "Sheet cannot be unprotected" -msgstr "" +msgstr "Иауам абӷьыц ахьчага ахыхра" #: resources_en_US.properties msgctxt "" @@ -3274,7 +3274,7 @@ "CURRENCIES_0\n" "property.text" msgid "Portuguese Escudo" -msgstr "" +msgstr "Португалиатәи ескудо" #: resources_en_US.properties msgctxt "" @@ -3282,7 +3282,7 @@ "CURRENCIES_1\n" "property.text" msgid "Dutch Guilder" -msgstr "" +msgstr "Нидерландиатәи гульден" #: resources_en_US.properties msgctxt "" @@ -3290,7 +3290,7 @@ "CURRENCIES_2\n" "property.text" msgid "French Franc" -msgstr "" +msgstr "Франциатәи афранк" #: resources_en_US.properties msgctxt "" @@ -3298,7 +3298,7 @@ "CURRENCIES_3\n" "property.text" msgid "Spanish Peseta" -msgstr "" +msgstr "Испаниатәи апесета" #: resources_en_US.properties msgctxt "" @@ -3306,7 +3306,7 @@ "CURRENCIES_4\n" "property.text" msgid "Italian Lira" -msgstr "" +msgstr "Италиатәи алира" #: resources_en_US.properties msgctxt "" @@ -3314,7 +3314,7 @@ "CURRENCIES_5\n" "property.text" msgid "German Mark" -msgstr "" +msgstr "Агермантә марка" #: resources_en_US.properties msgctxt "" @@ -3322,7 +3322,7 @@ "CURRENCIES_6\n" "property.text" msgid "Belgian Franc" -msgstr "" +msgstr "Бельгиатәи афранк" #: resources_en_US.properties msgctxt "" @@ -3330,7 +3330,7 @@ "CURRENCIES_7\n" "property.text" msgid "Irish Punt" -msgstr "" +msgstr "Ирландиатәи афунт" #: resources_en_US.properties msgctxt "" @@ -3338,7 +3338,7 @@ "CURRENCIES_8\n" "property.text" msgid "Luxembourg Franc" -msgstr "" +msgstr "Люксембургтәи афранк" #: resources_en_US.properties msgctxt "" @@ -3346,7 +3346,7 @@ "CURRENCIES_9\n" "property.text" msgid "Austrian Schilling" -msgstr "" +msgstr "Австриатәи шиллинг" #: resources_en_US.properties msgctxt "" @@ -3354,7 +3354,7 @@ "CURRENCIES_10\n" "property.text" msgid "Finnish Mark" -msgstr "" +msgstr "Финтәи амарка" #: resources_en_US.properties msgctxt "" @@ -3362,7 +3362,7 @@ "CURRENCIES_11\n" "property.text" msgid "Greek Drachma" -msgstr "" +msgstr "Абырзентә драхма" #: resources_en_US.properties msgctxt "" @@ -3370,7 +3370,7 @@ "CURRENCIES_12\n" "property.text" msgid "Slovenian Tolar" -msgstr "" +msgstr "Словениатәи атолар" #: resources_en_US.properties msgctxt "" @@ -3378,7 +3378,7 @@ "CURRENCIES_13\n" "property.text" msgid "Cypriot Pound" -msgstr "" +msgstr "Кипртәи афунт" #: resources_en_US.properties msgctxt "" @@ -3386,7 +3386,7 @@ "CURRENCIES_14\n" "property.text" msgid "Maltese Lira" -msgstr "" +msgstr "Мальтитәи алира" #: resources_en_US.properties msgctxt "" @@ -3394,7 +3394,7 @@ "CURRENCIES_15\n" "property.text" msgid "Slovak Koruna" -msgstr "" +msgstr "Словакиатәи акрона" #: resources_en_US.properties msgctxt "" @@ -3402,7 +3402,7 @@ "CURRENCIES_16\n" "property.text" msgid "Estonian Kroon" -msgstr "" +msgstr "Естониатәи акрона" #: resources_en_US.properties msgctxt "" @@ -3410,7 +3410,7 @@ "CURRENCIES_17\n" "property.text" msgid "Latvian Lats" -msgstr "" +msgstr "Латвиатәи алат" #: resources_en_US.properties msgctxt "" @@ -3418,7 +3418,7 @@ "CURRENCIES_18\n" "property.text" msgid "Lithuanian Litas" -msgstr "" +msgstr "Литоватәи алит" #: resources_en_US.properties msgctxt "" @@ -3515,7 +3515,7 @@ "STYLENAME_2\n" "property.text" msgid "Be" -msgstr "" +msgstr "Бериллии" #: resources_en_US.properties msgctxt "" @@ -3539,7 +3539,7 @@ "STYLENAME_5\n" "property.text" msgid "Blue Jeans" -msgstr "" +msgstr "Аџьынсқәа" #: resources_en_US.properties msgctxt "" @@ -3547,7 +3547,7 @@ "STYLENAME_6\n" "property.text" msgid "Fifties Diner" -msgstr "" +msgstr "Ҩынҩажәабатәиқәа" #: resources_en_US.properties msgctxt "" @@ -3579,7 +3579,7 @@ "STYLENAME_10\n" "property.text" msgid "Millennium" -msgstr "" +msgstr "Миллениум" #: resources_en_US.properties msgctxt "" @@ -3628,7 +3628,7 @@ "STYLENAME_16\n" "property.text" msgid "Pool Party" -msgstr "" +msgstr "Ахәылԥаз" #: resources_en_US.properties msgctxt "" @@ -3636,7 +3636,7 @@ "STYLENAME_17\n" "property.text" msgid "Pumpkin" -msgstr "" +msgstr "Аҟаб" #: resources_en_US.properties msgctxt "" @@ -3652,7 +3652,7 @@ "CorrespondenceDialog_1\n" "property.text" msgid "One recipient" -msgstr "" +msgstr "Изауа аӡәы" #: resources_en_US.properties msgctxt "" @@ -3660,7 +3660,7 @@ "CorrespondenceDialog_2\n" "property.text" msgid "Several recipients (address database)" -msgstr "" +msgstr "Изауа ԥыҭҩык (адресқәа рдырқәа рбаза)" #: resources_en_US.properties msgctxt "" @@ -3773,7 +3773,7 @@ "CorrespondenceFields_11\n" "property.text" msgid "Form of Address" -msgstr "" +msgstr "Адрес аформа" #: resources_en_US.properties msgctxt "" @@ -3789,7 +3789,7 @@ "CorrespondenceFields_13\n" "property.text" msgid "Salutation" -msgstr "" +msgstr "Аԥсшәаҳәара" #: resources_en_US.properties msgctxt "" @@ -3933,7 +3933,7 @@ "CorrespondenceFields_31\n" "property.text" msgid "Invite" -msgstr "" +msgstr "Иааԥхьатәуп" #: resources_en_US.properties msgctxt "" @@ -3957,7 +3957,7 @@ "AgendaDlgName\n" "property.text" msgid "Minutes Template" -msgstr "" +msgstr "Апротокол ашаблон" #: resources_en_US.properties msgctxt "" @@ -3965,7 +3965,7 @@ "AgendaDlgNoCancel\n" "property.text" msgid "An option must be confirmed." -msgstr "" +msgstr "Ихымԥадатәиуп апараметр ашьақәырӷәӷәара." #: resources_en_US.properties msgctxt "" @@ -3981,7 +3981,7 @@ "AgendaDlgButton1\n" "property.text" msgid "Results Minutes" -msgstr "" +msgstr "Аихшьалақәа рпротокол" #: resources_en_US.properties msgctxt "" @@ -3997,7 +3997,7 @@ "TextField\n" "property.text" msgid "User data field is not defined!" -msgstr "" +msgstr "Ахархәаҩ иҭакыра азалхӡам." #: resources_en_US.properties msgctxt "" @@ -4005,7 +4005,7 @@ "NoDirCreation\n" "property.text" msgid "The '%1' directory cannot be created:" -msgstr "" +msgstr "Иауам акаталог «%1» аԥҵара:" #: resources_en_US.properties msgctxt "" @@ -4013,7 +4013,7 @@ "MsgDirNotThere\n" "property.text" msgid "The '%1' directory does not exist." -msgstr "" +msgstr "Акаталог «%1» ыҟаӡам." #: resources_en_US.properties msgctxt "" @@ -4021,7 +4021,7 @@ "QueryfornewCreation\n" "property.text" msgid "Do you want to create it now?" -msgstr "" +msgstr "Иаԥҵатәума?" #: resources_en_US.properties msgctxt "" @@ -4061,7 +4061,7 @@ "BeginButton\n" "property.text" msgid "~Convert" -msgstr "" +msgstr "~Аконвертациа азутәуп" #: resources_en_US.properties msgctxt "" @@ -4085,7 +4085,7 @@ "WelcometextLabel3\n" "property.text" msgid "Select the document type for conversion:" -msgstr "" +msgstr "Иалышәх аконвертациа ззухо адокументқәа ртипқәа:" #: resources_en_US.properties msgctxt "" @@ -4240,7 +4240,7 @@ "ReeditMacro\n" "property.text" msgid "Document macro has to be revised." -msgstr "" +msgstr "Адокумент амакрос еиҭахәаԥштәуп." #: resources_en_US.properties msgctxt "" @@ -4304,7 +4304,7 @@ "ProgressPage3\n" "property.text" msgid "Converting the documents" -msgstr "" +msgstr "Адокументқәа аконвертациа рзура" #: resources_en_US.properties msgctxt "" @@ -4344,7 +4344,7 @@ "TargetDocuments\n" "property.text" msgid "Target documents" -msgstr "" +msgstr "Ахықәкытә документқәа" #: resources_en_US.properties msgctxt "" @@ -4352,7 +4352,7 @@ "LogfileSummary\n" "property.text" msgid " documents converted" -msgstr "" +msgstr "Аконвертациа зызу адокументқәа: " #: resources_en_US.properties msgctxt "" @@ -4376,7 +4376,7 @@ "TextImportLabel\n" "property.text" msgid "Import from:" -msgstr "" +msgstr "Аимпортра аҟынтә:" #: resources_en_US.properties msgctxt "" @@ -4400,7 +4400,7 @@ "LogfileHelpText\n" "property.text" msgid "A log file will be created in your work directory" -msgstr "" +msgstr "Ажурнал аԥҵахоит аусуратә каталог аҟны" #: resources_en_US.properties msgctxt "" @@ -4416,7 +4416,7 @@ "SumMSTextDocuments\n" "property.text" msgid "All Word documents contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит Word адокументқәа зегьы:" #: resources_en_US.properties msgctxt "" @@ -4424,7 +4424,7 @@ "SumMSTableDocuments\n" "property.text" msgid "All Excel documents contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит Excel адокументқәа зегьы:" #: resources_en_US.properties msgctxt "" @@ -4432,7 +4432,7 @@ "SumMSDrawDocuments\n" "property.text" msgid "All PowerPoint/Publisher documents contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит PowerPoint/Publisher адокументқәа зегьы:" #: resources_en_US.properties msgctxt "" @@ -4440,7 +4440,7 @@ "SumMSTextTemplates\n" "property.text" msgid "All Word templates contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит Word ашаблонқәа зегьы:" #: resources_en_US.properties msgctxt "" @@ -4448,7 +4448,7 @@ "SumMSTableTemplates\n" "property.text" msgid "All Excel templates contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит Excel ашаблонқәа зегьы:" #: resources_en_US.properties msgctxt "" @@ -4456,4 +4456,4 @@ "SumMSDrawTemplates\n" "property.text" msgid "All PowerPoint templates contained in the following directory will be imported:" -msgstr "" +msgstr "Ари акаталог аҟынтәи импортхоит PowerPoint ашаблонқәа зегьы:" diff -Nru libreoffice-6.2.2/translations/source/am/cui/messages.po libreoffice-6.2.3/translations/source/am/cui/messages.po --- libreoffice-6.2.2/translations/source/am/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-01-20 21:38+0000\n" +"PO-Revision-Date: 2019-03-17 18:56+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1548020319.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1552848976.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -3726,7 +3726,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:288 msgctxt "colorconfigwin|writer" msgid "Text Document" -msgstr "የጽሁፍ ሰነድ" +msgstr "የ ጽሁፍ ሰነድ" #: cui/uiconfig/ui/colorconfigwin.ui:315 msgctxt "colorconfigwin|writergrid" @@ -8609,7 +8609,7 @@ #: cui/uiconfig/ui/optsavepage.ui:366 msgctxt "optsavepage|doctype" msgid "Text document" -msgstr "የጽሁፍ ሰነድ" +msgstr "የ ጽሁፍ ሰነድ" #: cui/uiconfig/ui/optsavepage.ui:367 msgctxt "optsavepage|doctype" diff -Nru libreoffice-6.2.2/translations/source/am/filter/source/config/fragments/filters.po libreoffice-6.2.3/translations/source/am/filter/source/config/fragments/filters.po --- libreoffice-6.2.2/translations/source/am/filter/source/config/fragments/filters.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/filter/source/config/fragments/filters.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-07-02 00:14+0200\n" -"PO-Revision-Date: 2018-07-01 23:12+0000\n" +"PO-Revision-Date: 2019-03-17 18:56+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1530486750.000000\n" +"X-POOTLE-MTIME: 1552848989.000000\n" #: ADO_rowset_XML.xcu msgctxt "" @@ -1040,7 +1040,7 @@ "UIName\n" "value.text" msgid "OpenOffice.org 1.0 Text Document" -msgstr "OpenOffice.org 1.0 የጽሁፍ ሰነድ" +msgstr "OpenOffice.org 1.0 የ ጽሁፍ ሰነድ" #: T602Document.xcu msgctxt "" @@ -1796,7 +1796,7 @@ "UIName\n" "value.text" msgid "ODF Text Document" -msgstr "ODF የጽሁፍ ሰነድ" +msgstr "ODF የ ጽሁፍ ሰነድ" #: writer8_template.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/am/librelogo/source/pythonpath.po libreoffice-6.2.3/translations/source/am/librelogo/source/pythonpath.po --- libreoffice-6.2.2/translations/source/am/librelogo/source/pythonpath.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/librelogo/source/pythonpath.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: LibO 40l10n\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2017-04-12 14:14+0200\n" -"PO-Revision-Date: 2017-11-23 23:06+0000\n" +"PO-Revision-Date: 2019-03-17 18:56+0000\n" "Last-Translator: Samson B \n" "Language-Team: none\n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1511478393.000000\n" +"X-POOTLE-MTIME: 1552849004.000000\n" #: LibreLogo_en_US.properties msgctxt "" @@ -1118,4 +1118,4 @@ "ERR_NOTAPROGRAM\n" "property.text" msgid "Do you want to run this text document?" -msgstr "ይህን የጽሁፍ ሰነድ ማስኬድ ይፈልጋሉ?" +msgstr "ይህን የ ጽሁፍ ሰነድ ማስኬድ ይፈልጋሉ?" diff -Nru libreoffice-6.2.2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-01-03 22:19+0000\n" +"PO-Revision-Date: 2019-03-17 18:57+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1546553968.000000\n" +"X-POOTLE-MTIME: 1552849046.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -19978,7 +19978,7 @@ "Label\n" "value.text" msgid "Text Document Options" -msgstr "የጽሁፍ ሰነድ ምርጫዎች" +msgstr "የ ጽሁፍ ሰነድ ምርጫዎች" #: GenericCommands.xcu msgctxt "" @@ -24271,7 +24271,7 @@ "Label\n" "value.text" msgid "Text Document" -msgstr "የጽሁፍ ሰነድ" +msgstr "የ ጽሁፍ ሰነድ" #: ReportCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/am/officecfg/registry/data/org/openoffice/Office.po libreoffice-6.2.3/translations/source/am/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-6.2.2/translations/source/am/officecfg/registry/data/org/openoffice/Office.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/officecfg/registry/data/org/openoffice/Office.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2018-11-17 15:52+0000\n" +"PO-Revision-Date: 2019-03-17 18:57+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1542469961.000000\n" +"X-POOTLE-MTIME: 1552849034.000000\n" #: Addons.xcu msgctxt "" @@ -113,7 +113,7 @@ "Title\n" "value.text" msgid "~Text Document" -msgstr "~የጽሁፍ ሰነድ" +msgstr "የ ~ጽሁፍ ሰነድ" #: Common.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/am/sc/messages.po libreoffice-6.2.3/translations/source/am/sc/messages.po --- libreoffice-6.2.2/translations/source/am/sc/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/sc/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-02-15 00:34+0000\n" +"PO-Revision-Date: 2019-03-17 19:11+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550190870.000000\n" +"X-POOTLE-MTIME: 1552849889.000000\n" #: sc/inc/compiler.hrc:27 msgctxt "RID_FUNCTION_CATEGORIES" @@ -14929,22 +14929,22 @@ #: sc/inc/strings.hrc:316 msgctxt "STR_MESSAGE_INVALID_OUTPUT_ADDR" msgid "Output range is not valid." -msgstr "" +msgstr "የ ውጤቱ መጠን ዋጋ ያለው አይደለም:" #: sc/inc/strings.hrc:317 msgctxt "STR_MESSAGE_INVALID_CONFIDENCE_LEVEL" msgid "Confidence level must be in the interval (0, 1)." -msgstr "" +msgstr "የ መተመማኛ ክፍተት በ (0, 1) መካከል መሆን አለበት: ." #: sc/inc/strings.hrc:318 msgctxt "STR_MESSAGE_YVARIABLE_MULTI_COLUMN" msgid "Y variable range cannot have more than 1 column." -msgstr "" +msgstr "የ Y ተለዋዋጭ ከ 1 አምድ በላይ ሊኖረው አይችልም:" #: sc/inc/strings.hrc:319 msgctxt "STR_MESSAGE_YVARIABLE_MULTI_ROW" msgid "Y variable range cannot have more than 1 row." -msgstr "" +msgstr "የ Y ተለዋዋጭ ከ 1 ረድፍ በላይ ሊኖረው አይችልም:" #: sc/inc/strings.hrc:320 msgctxt "STR_MESSAGE_UNIVARIATE_NUMOBS_MISMATCH" diff -Nru libreoffice-6.2.2/translations/source/am/scp2/source/writer.po libreoffice-6.2.3/translations/source/am/scp2/source/writer.po --- libreoffice-6.2.2/translations/source/am/scp2/source/writer.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/scp2/source/writer.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2017-10-26 00:36+0000\n" +"PO-Revision-Date: 2019-03-17 18:58+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1508978187.000000\n" +"X-POOTLE-MTIME: 1552849110.000000\n" #: folderitem_writer.ulf msgctxt "" @@ -30,7 +30,7 @@ "STR_FI_NAME_TEXTDOKUMENT\n" "LngText.text" msgid "Text Document" -msgstr "የጽሁፍ ሰነድ" +msgstr "የ ጽሁፍ ሰነድ" #: folderitem_writer.ulf msgctxt "" @@ -118,7 +118,7 @@ "STR_REG_VAL_SO60_TEXT\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Text Document" -msgstr "%SXWFORMATNAME %SXWFORMATVERSION የጽሁፍ ሰነድ" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION የ ጽሁፍ ሰነድ" #: registryitem_writer.ulf msgctxt "" @@ -134,7 +134,7 @@ "STR_REG_VAL_SO60_WRITER_TEMPLATE\n" "LngText.text" msgid "%SXWFORMATNAME %SXWFORMATVERSION Text Document Template" -msgstr "%SXWFORMATNAME %SXWFORMATVERSION የጽሁፍ ሰነድ ቴምፕሌት" +msgstr "%SXWFORMATNAME %SXWFORMATVERSION የ ጽሁፍ ሰነድ ቴምፕሌት" #: registryitem_writer.ulf msgctxt "" @@ -142,7 +142,7 @@ "STR_REG_VAL_OO_WRITER\n" "LngText.text" msgid "OpenDocument Text" -msgstr "የጽሁፍ ሰነድ መክፈቻ" +msgstr "የ ጽሁፍ ሰነድ መክፈቻ" #: registryitem_writer.ulf msgctxt "" @@ -158,7 +158,7 @@ "STR_REG_VAL_OO_MASTERDOC\n" "LngText.text" msgid "OpenDocument Master Document" -msgstr "ዋና የጽሁፍ ሰነድ መክፈቻ" +msgstr "ዋና የ ጽሁፍ ሰነድ መክፈቻ" #: registryitem_writer.ulf msgctxt "" @@ -206,7 +206,7 @@ "STR_REG_VAL_MS_RTF_DOCUMENT\n" "LngText.text" msgid "Rich Text Document" -msgstr "የሀብታም ጽሁፍ ሰነድ" +msgstr "የ ሀብታም ጽሁፍ ሰነድ" #: registryitem_writer.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/am/svtools/messages.po libreoffice-6.2.3/translations/source/am/svtools/messages.po --- libreoffice-6.2.2/translations/source/am/svtools/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/svtools/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-14 12:22+0100\n" -"PO-Revision-Date: 2018-11-17 21:30+0000\n" +"PO-Revision-Date: 2019-03-17 18:58+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1542490244.000000\n" +"X-POOTLE-MTIME: 1552849116.000000\n" #: include/svtools/strings.hrc:25 msgctxt "STR_UNDO" @@ -1330,7 +1330,7 @@ #: include/svtools/strings.hrc:318 msgctxt "STR_DESCRIPTION_FACTORY_WRITER" msgid "Text Document" -msgstr "የጽሁፍ ሰነድ" +msgstr "የ ጽሁፍ ሰነድ" #: include/svtools/strings.hrc:319 msgctxt "STR_DESCRIPTION_FACTORY_CALC" diff -Nru libreoffice-6.2.2/translations/source/am/sw/messages.po libreoffice-6.2.3/translations/source/am/sw/messages.po --- libreoffice-6.2.2/translations/source/am/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-02-11 14:29+0100\n" +"PO-Revision-Date: 2019-03-29 16:37+0100\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1546974051.000000\n" +"X-POOTLE-MTIME: 1552849131.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -1595,7 +1595,7 @@ #: sw/inc/strings.hrc:228 msgctxt "STR_WRITER_DOCUMENT_FULLTYPE" msgid "%PRODUCTNAME %PRODUCTVERSION Text Document" -msgstr "%PRODUCTNAME %PRODUCTVERSION የጽሁፍ ሰነድ" +msgstr "%PRODUCTNAME %PRODUCTVERSION የ ጽሁፍ ሰነድ" #: sw/inc/strings.hrc:229 msgctxt "STR_CANTOPEN" diff -Nru libreoffice-6.2.2/translations/source/am/swext/mediawiki/help.po libreoffice-6.2.3/translations/source/am/swext/mediawiki/help.po --- libreoffice-6.2.2/translations/source/am/swext/mediawiki/help.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/swext/mediawiki/help.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-15 13:53+0100\n" -"PO-Revision-Date: 2019-01-03 19:15+0000\n" +"PO-Revision-Date: 2019-03-17 18:59+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1546542941.000000\n" +"X-POOTLE-MTIME: 1552849187.000000\n" #: help.tree msgctxt "" @@ -70,7 +70,7 @@ "par_id6468703\n" "help.text" msgid "Choose File - Send - To MediaWiki to upload the current Writer document to a MediaWiki server." -msgstr "ይምረጡ ፋይል - መላኪያ - ወደ MediaWiki የጻፉትን የጽሁፍ ሰነድ ወደ MediaWiki ሰርቨር ለመጫን" +msgstr "ይምረጡ ፋይል - መላኪያ - ወደ MediaWiki የጻፉትን የ ጽሁፍ ሰነድ ወደ MediaWiki ሰርቨር ለ መጫን" #: wiki.xhp msgctxt "" @@ -142,7 +142,7 @@ "par_id9533677\n" "help.text" msgid "Open a Writer document, and choose Tools - Options - Internet - MediaWiki." -msgstr "የጽሁፍ መጻፊያ ሰነድ ይክፈቱ ፡ እና ይምረጡ መሳሪያዎች - ምርጫዎች - ኢንተርኔት - MediaWiki ." +msgstr "የ ጽሁፍ መጻፊያ ሰነድ ይክፈቱ: እና ይምረጡ መሳሪያዎች - ምርጫዎች - ኢንተርኔት - MediaWiki ." #: wiki.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/am/sysui/desktop/share.po libreoffice-6.2.3/translations/source/am/sysui/desktop/share.po --- libreoffice-6.2.2/translations/source/am/sysui/desktop/share.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/am/sysui/desktop/share.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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-05-07 21:35+0200\n" -"PO-Revision-Date: 2017-10-07 22:14+0000\n" +"PO-Revision-Date: 2019-03-17 19:00+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1507414467.000000\n" +"X-POOTLE-MTIME: 1552849216.000000\n" #: documents.ulf msgctxt "" @@ -22,7 +22,7 @@ "text\n" "LngText.text" msgid "OpenOffice.org 1.0 Text Document" -msgstr "OpenOffice.org 1.0 የጽሁፍ ሰነድ" +msgstr "OpenOffice.org 1.0 የ ጽሁፍ ሰነድ" #: documents.ulf msgctxt "" @@ -102,7 +102,7 @@ "oasis-text\n" "LngText.text" msgid "OpenDocument Text" -msgstr "የጽሁፍ ሰነድ መክፈቻ" +msgstr "የ ጽሁፍ ሰነድ መክፈቻ" #: documents.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/scalc/guide.po libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/scalc/guide.po --- libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/scalc/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/scalc/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-01-07 19:55+0000\n" +"PO-Revision-Date: 2019-03-18 19:39+0000\n" "Last-Translator: Sophia Schröder \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1546890917.000000\n" +"X-POOTLE-MTIME: 1552937972.000000\n" #: address_auto.xhp msgctxt "" @@ -2678,7 +2678,7 @@ "par_id3156016\n" "help.text" msgid "Select the AVERAGE function. Use the mouse to select all your random numbers. If you cannot see the entire range, because the Function Wizard is obscuring it, you can temporarily shrink the dialog using the Shrink / Maximize icon." -msgstr "Wählen Sie die Funktion MITTELWERT. Wählen Sie per Maus alle Ihre Zufallszahlen aus. Wenn Sie den Bereich nicht ganz sehen, weil er vom Funktions-Assistenten verdeckt wird, können Sie den Dialog mit der Taste Verkleinern/Ausdehnen vorübergehend verkleinern." +msgstr "Wählen Sie die Funktion MITTELWERT. Wählen Sie per Maus alle Ihre Zufallszahlen aus. Wenn Sie den Bereich nicht ganz sehen, weil er vom Funktions-Assistenten verdeckt wird, können Sie den Dialog mit der Taste Verkleinern / Vergrößern vorübergehend verkleinern." #: cellstyle_conditional.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/shared/00.po libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/shared/00.po --- libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/shared/00.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/shared/00.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-01-13 12:59+0000\n" +"PO-Revision-Date: 2019-03-18 19:39+0000\n" "Last-Translator: Sophia Schröder \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1547384358.000000\n" +"X-POOTLE-MTIME: 1552937982.000000\n" #: 00000001.xhp msgctxt "" @@ -254,7 +254,7 @@ "hd_id3153760\n" "help.text" msgid "Shrink / Maximize" -msgstr "Verkleinern/Vergrößern" +msgstr "Verkleinern / Vergrößern" #: 00000001.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/shared/guide.po libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/shared/guide.po --- libreoffice-6.2.2/translations/source/de/helpcontent2/source/text/shared/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/de/helpcontent2/source/text/shared/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-01-13 12:48+0000\n" +"PO-Revision-Date: 2019-03-18 19:24+0000\n" "Last-Translator: Sophia Schröder \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1547383721.000000\n" +"X-POOTLE-MTIME: 1552937084.000000\n" #: aaa_start.xhp msgctxt "" @@ -4142,7 +4142,7 @@ "par_id2584002\n" "help.text" msgid "On Windows systems, you can also use drag-and-drop instead of Copy and Paste. Also, for registered databases, you can open the datasource browser (press CommandCtrl + Shift + F4 keys) instead of opening the Base window." -msgstr "Auf Windows-Systemen können Sie auch Ziehen-und-Ablegen anstatt Kopieren-und-Einfügen verwenden. Für registrierte Datenbanken können Sie auch den Datenquellen-Browser (Tastenkombination BefehlStrg+Umschalt+F4) anstelle des Base-Fenster öffnen." +msgstr "Auf Windows-Systemen können Sie auch Ziehen-und-Ablegen anstatt Kopieren-und-Einfügen verwenden. Für registrierte Datenbanken können Sie auch den Datenquellen-Browser (Tastenkombination BefehlStrg + Umschalt + F4) anstelle des Base-Fensters öffnen." #: data_new.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/de/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/de/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/de/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/de/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-14 17:00+0000\n" +"PO-Revision-Date: 2019-03-21 05:40+0000\n" "Last-Translator: Christian Kühl \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552582848.000000\n" +"X-POOTLE-MTIME: 1553146841.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -16835,7 +16835,7 @@ "PopupLabel\n" "value.text" msgid "Open ~Remote File..." -msgstr "Datei auf Server ~öffnen..." +msgstr "Datei vom Server ~öffnen..." #: GenericCommands.xcu msgctxt "" @@ -16844,7 +16844,7 @@ "Label\n" "value.text" msgid "Sa~ve Remote..." -msgstr "Datei auf Server speichern~..." +msgstr "Auf Server speichern~..." #: GenericCommands.xcu msgctxt "" @@ -22309,7 +22309,7 @@ "Label\n" "value.text" msgid "Alig~n" -msgstr "Ausric~hten" +msgstr "Ausric~htung" #: GenericCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/de/sw/messages.po libreoffice-6.2.3/translations/source/de/sw/messages.po --- libreoffice-6.2.2/translations/source/de/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/de/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2018-12-22 06:07+0000\n" +"PO-Revision-Date: 2019-03-21 05:43+0000\n" "Last-Translator: Christian Kühl \n" "Language-Team: LANGUAGE \n" "Language: de\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1545458829.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553147033.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -14719,7 +14719,7 @@ #: sw/uiconfig/swriter/ui/printoptionspage.ui:82 msgctxt "printoptionspage|inblack" msgid "Print text in blac_k" -msgstr "Text Sch_warz drucken" +msgstr "Text sch_warz drucken" #: sw/uiconfig/swriter/ui/printoptionspage.ui:97 msgctxt "printoptionspage|hiddentext" diff -Nru libreoffice-6.2.2/translations/source/fi/sfx2/messages.po libreoffice-6.2.3/translations/source/fi/sfx2/messages.po --- libreoffice-6.2.2/translations/source/fi/sfx2/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/fi/sfx2/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-15 17:35+0000\n" -"Last-Translator: serval2412 \n" +"PO-Revision-Date: 2019-03-15 18:04+0000\n" +"Last-Translator: buovjaga \n" "Language-Team: LANGUAGE \n" "Language: fi\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552671319.000000\n" +"X-POOTLE-MTIME: 1552673045.000000\n" #: include/sfx2/strings.hrc:25 msgctxt "STR_TEMPLATE_FILTER" @@ -1777,7 +1777,7 @@ #: sfx2/uiconfig/ui/alienwarndialog.ui:25 msgctxt "alienwarndialog|cancel" msgid "Use %DEFAULTEXTENSION _Format" -msgstr "Käytä %DEFAULTEXTENSION-muotoa" +msgstr "Käytä %DEFAULTEXTENSION-_muotoa" #: sfx2/uiconfig/ui/alienwarndialog.ui:40 msgctxt "alienwarndialog|save" diff -Nru libreoffice-6.2.2/translations/source/gl/basctl/messages.po libreoffice-6.2.3/translations/source/gl/basctl/messages.po --- libreoffice-6.2.2/translations/source/gl/basctl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/gl/basctl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-14 10:25+0000\n" -"Last-Translator: Navhy \n" +"PO-Revision-Date: 2019-03-26 21:59+0000\n" +"Last-Translator: Xosé \n" "Language-Team: LANGUAGE \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552559108.000000\n" +"X-POOTLE-MTIME: 1553637578.000000\n" #: basctl/inc/strings.hrc:25 msgctxt "RID_STR_FILTER_ALLFILES" @@ -74,7 +74,7 @@ #: basctl/inc/strings.hrc:36 msgctxt "RID_STR_ENTERPASSWORD" msgid "Enter password for 'XX'" -msgstr "Escribir o contrasinal para «XX»" +msgstr "Introducir o contrasinal para «XX»" #: basctl/inc/strings.hrc:37 msgctxt "RID_STR_SBXNAMEALLREADYUSED" diff -Nru libreoffice-6.2.2/translations/source/lt/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-6.2.3/translations/source/lt/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-6.2.2/translations/source/lt/instsetoo_native/inc_openoffice/windows/msi_languages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/instsetoo_native/inc_openoffice/windows/msi_languages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2018-10-03 20:09+0000\n" +"PO-Revision-Date: 2019-03-24 16:24+0000\n" "Last-Translator: Modestas Rimkus \n" "Language-Team: LANGUAGE \n" "Language: lt\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1538597382.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553444661.000000\n" #: ActionTe.ulf msgctxt "" @@ -1670,7 +1670,7 @@ "OOO_CONTROL_124\n" "LngText.text" msgid "Build contributed in collaboration with the community by [Manufacturer]. For credits, see: https://www.documentfoundation.org" -msgstr "" +msgstr "Programos laida parengta bendradarbiaujant su „[Manufacturer]“ bendruomene. Bendradarbiai išvardinti tinklalapyje https://www.documentfoundation.org." #: Control.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/lt/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/lt/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/lt/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-14 20:46+0000\n" +"PO-Revision-Date: 2019-04-03 07:01+0000\n" "Last-Translator: Modestas Rimkus \n" "Language-Team: Lithuanian \n" "Language: lt\n" @@ -15,7 +15,7 @@ "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1552596389.000000\n" +"X-POOTLE-MTIME: 1554274895.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -8314,7 +8314,7 @@ "Label\n" "value.text" msgid "Transparency tool" -msgstr "Skaidrumo įrankis" +msgstr "" #: DrawImpressCommands.xcu msgctxt "" @@ -8323,7 +8323,7 @@ "TooltipLabel\n" "value.text" msgid "Interactive transparency tool" -msgstr "Interaktyvus skaidrumo įrankis" +msgstr "" #: DrawImpressCommands.xcu msgctxt "" @@ -8332,7 +8332,7 @@ "Label\n" "value.text" msgid "Gradient tool" -msgstr "Gradiento įrankis" +msgstr "" #: DrawImpressCommands.xcu msgctxt "" @@ -8341,7 +8341,7 @@ "TooltipLabel\n" "value.text" msgid "Interactive gradient tool" -msgstr "Interaktyvus gradiento įrankis" +msgstr "" #: DrawImpressCommands.xcu msgctxt "" @@ -8893,6 +8893,7 @@ msgstr "Siųsti el. paštu – „OpenDocument“ pateiktį..." #: DrawImpressCommands.xcu +#, fuzzy msgctxt "" "DrawImpressCommands.xcu\n" "..DrawImpressCommands.UserInterface.Commands..uno:ZoomMode\n" @@ -8902,6 +8903,7 @@ msgstr "Mastelis ir slinkimas" #: DrawImpressCommands.xcu +#, fuzzy msgctxt "" "DrawImpressCommands.xcu\n" "..DrawImpressCommands.UserInterface.Commands..uno:ZoomMode\n" @@ -28818,7 +28820,7 @@ "Label\n" "value.text" msgid "Minimize Column Width" -msgstr "Sumažinti stulpelio plotį" +msgstr "Mažiausias stulpelio plotis" #: WriterCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/lt/sd/messages.po libreoffice-6.2.3/translations/source/lt/sd/messages.po --- libreoffice-6.2.2/translations/source/lt/sd/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/sd/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-01-08 11:49+0100\n" -"PO-Revision-Date: 2019-02-16 16:12+0000\n" -"Last-Translator: Mindaugas \n" +"PO-Revision-Date: 2019-04-07 19:28+0000\n" +"Last-Translator: Modestas Rimkus \n" "Language-Team: LANGUAGE \n" "Language: lt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550333568.000000\n" +"X-POOTLE-MTIME: 1554665307.000000\n" #: sd/inc/DocumentRenderer.hrc:27 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES" @@ -3064,12 +3064,12 @@ #: sd/uiconfig/sdraw/ui/notebookbar.ui:3180 msgctxt "drawnotebookbar|HomeMenuButton" msgid "_Home" -msgstr "_Pagrindinis" +msgstr "" #: sd/uiconfig/sdraw/ui/notebookbar.ui:4278 msgctxt "drawnotebookbar|HomeLabel" msgid "~Home" -msgstr "~Pagrindinis" +msgstr "" #: sd/uiconfig/sdraw/ui/notebookbar.ui:4836 msgctxt "drawnotebookbar|FieldMenuButton" @@ -4718,12 +4718,12 @@ #: sd/uiconfig/simpress/ui/notebookbar.ui:3331 msgctxt "impressnotebookbar|HomeMenuButton" msgid "_Home" -msgstr "_Pagrindinis" +msgstr "" #: sd/uiconfig/simpress/ui/notebookbar.ui:4644 msgctxt "impressnotebookbar|HomeLabel" msgid "~Home" -msgstr "~Pagrindinis" +msgstr "" #: sd/uiconfig/simpress/ui/notebookbar.ui:5109 msgctxt "impressnotebookbar|FieldMenuButton" @@ -6173,7 +6173,7 @@ #: sd/uiconfig/simpress/ui/publishingdialog.ui:1591 msgctxt "publishingdialog|nextPageButton" msgid "Ne_xt >" -msgstr "_Toliau >" +msgstr "Toliau >" #: sd/uiconfig/simpress/ui/publishingdialog.ui:1607 msgctxt "publishingdialog|finishButton" diff -Nru libreoffice-6.2.2/translations/source/lt/svx/messages.po libreoffice-6.2.3/translations/source/lt/svx/messages.po --- libreoffice-6.2.2/translations/source/lt/svx/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/svx/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2019-03-07 06:37+0000\n" +"PO-Revision-Date: 2019-03-25 21:32+0000\n" "Last-Translator: Modestas Rimkus \n" "Language-Team: LANGUAGE \n" "Language: lt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551940657.000000\n" +"X-POOTLE-MTIME: 1553549568.000000\n" #: include/svx/strings.hrc:25 msgctxt "STR_ObjNameSingulNONE" @@ -12469,13 +12469,11 @@ msgstr "Savybės…" #: svx/uiconfig/ui/gallerymenu2.ui:12 -#, fuzzy msgctxt "gallerymenu2|add" msgid "_Insert" msgstr "Įterpti" #: svx/uiconfig/ui/gallerymenu2.ui:20 -#, fuzzy msgctxt "gallerymenu2|background" msgid "Insert as Bac_kground" msgstr "Įterpti kaip foną" diff -Nru libreoffice-6.2.2/translations/source/lt/sw/messages.po libreoffice-6.2.3/translations/source/lt/sw/messages.po --- libreoffice-6.2.2/translations/source/lt/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-11 19:07+0000\n" +"PO-Revision-Date: 2019-04-03 11:17+0000\n" "Last-Translator: Modestas Rimkus \n" "Language-Team: LANGUAGE \n" "Language: lt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552331277.000000\n" +"X-POOTLE-MTIME: 1554290261.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -11948,12 +11948,12 @@ #: sw/uiconfig/swriter/ui/notebookbar.ui:3030 msgctxt "WriterNotebookbar|HomeMenuButton" msgid "_Home" -msgstr "_Pagrindinis" +msgstr "" #: sw/uiconfig/swriter/ui/notebookbar.ui:4405 msgctxt "WriterNotebookbar|HomeLabel" msgid "~Home" -msgstr "~Pagrindinis" +msgstr "" #: sw/uiconfig/swriter/ui/notebookbar.ui:5484 msgctxt "WriterNotebookbar|InsertMenuButton" diff -Nru libreoffice-6.2.2/translations/source/lt/wizards/messages.po libreoffice-6.2.3/translations/source/lt/wizards/messages.po --- libreoffice-6.2.2/translations/source/lt/wizards/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lt/wizards/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-02-27 15:07+0100\n" -"PO-Revision-Date: 2018-01-04 21:48+0000\n" +"PO-Revision-Date: 2019-04-06 16:41+0000\n" "Last-Translator: Modestas Rimkus \n" "Language-Team: LANGUAGE \n" "Language: lt\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1515102505.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1554568877.000000\n" #: wizards/com/sun/star/wizards/common/strings.hrc:32 msgctxt "RID_COMMON_START_0" @@ -175,7 +175,7 @@ #: wizards/com/sun/star/wizards/common/strings.hrc:64 msgctxt "RID_LETTERWIZARDDIALOG_START_9" msgid "~Include footer" -msgstr "Įterpti psl. poraštę" +msgstr "Puslapinė poraštė" #: wizards/com/sun/star/wizards/common/strings.hrc:65 msgctxt "RID_LETTERWIZARDDIALOG_START_10" @@ -925,7 +925,7 @@ #: wizards/com/sun/star/wizards/common/strings.hrc:232 msgctxt "RID_AGENDAWIZARDDIALOG_START_10" msgid "Please select the names you wish to include in your agenda template" -msgstr "Parinkite darbotvarkės šablone norimus naudoti pavadinimus" +msgstr "Parinkite darbotvarkės šablone norimus naudoti vardus" #: wizards/com/sun/star/wizards/common/strings.hrc:233 msgctxt "RID_AGENDAWIZARDDIALOG_START_11" diff -Nru libreoffice-6.2.2/translations/source/lv/basctl/messages.po libreoffice-6.2.3/translations/source/lv/basctl/messages.po --- libreoffice-6.2.2/translations/source/lv/basctl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/basctl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2017-11-22 16:41+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-20 17:25+0000\n" +"Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1511368899.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553102754.000000\n" #: basctl/inc/strings.hrc:25 msgctxt "RID_STR_FILTER_ALLFILES" @@ -286,7 +286,7 @@ #: basctl/inc/strings.hrc:78 msgctxt "RID_STR_USERMACROS" msgid "My Macros" -msgstr "Mani makro" +msgstr "Manas makrokomandas" #: basctl/inc/strings.hrc:79 msgctxt "RID_STR_USERDIALOGS" @@ -296,12 +296,12 @@ #: basctl/inc/strings.hrc:80 msgctxt "RID_STR_USERMACROSDIALOGS" msgid "My Macros & Dialogs" -msgstr "Mani makro un dialogi" +msgstr "Manas makrokomandas un dialogi" #: basctl/inc/strings.hrc:81 msgctxt "RID_STR_SHAREMACROS" msgid "%PRODUCTNAME Macros" -msgstr "%PRODUCTNAME makro" +msgstr "%PRODUCTNAME makrokomandas" #: basctl/inc/strings.hrc:82 msgctxt "RID_STR_SHAREDIALOGS" @@ -311,7 +311,7 @@ #: basctl/inc/strings.hrc:83 msgctxt "RID_STR_SHAREMACROSDIALOGS" msgid "%PRODUCTNAME Macros & Dialogs" -msgstr "%PRODUCTNAME makro un dialogi" +msgstr "%PRODUCTNAME makrokomandas un dialogi" #: basctl/inc/strings.hrc:84 msgctxt "RID_STR_REMOVEWATCHTIP" @@ -521,17 +521,17 @@ #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:166 msgctxt "basicmacrodialog|existingmacrosft" msgid "Existing Macros In:" -msgstr "Esošie makro iekš:" +msgstr "Esošās makrokomandas iekš:" #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:250 msgctxt "basicmacrodialog|macrofromft" msgid "Macro From" -msgstr "Makro no" +msgstr "Makrokomanda no" #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:266 msgctxt "basicmacrodialog|macrotoft" msgid "Save Macro In" -msgstr "Saglabāt makro iekš" +msgstr "Saglabāt makrokomandu iekš" #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:312 msgctxt "basicmacrodialog|libraryft1" @@ -811,7 +811,7 @@ #: basctl/uiconfig/basicide/ui/organizedialog.ui:8 msgctxt "organizedialog|OrganizeDialog" msgid "%PRODUCTNAME Basic Macro Organizer" -msgstr "%PRODUCTNAME Basic makro organizētājs" +msgstr "%PRODUCTNAME Basic makrokomandu organizētājs" #: basctl/uiconfig/basicide/ui/organizedialog.ui:80 msgctxt "organizedialog|modules" diff -Nru libreoffice-6.2.2/translations/source/lv/cui/messages.po libreoffice-6.2.3/translations/source/lv/cui/messages.po --- libreoffice-6.2.2/translations/source/lv/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-14 05:51+0000\n" +"PO-Revision-Date: 2019-03-24 17:39+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552542666.000000\n" +"X-POOTLE-MTIME: 1553449147.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -385,22 +385,22 @@ #: cui/inc/strings.hrc:92 msgctxt "RID_SVXSTR_MACROS" msgid "Macros" -msgstr "Makro" +msgstr "Makrokomandas" #: cui/inc/strings.hrc:93 msgctxt "RID_SVXSTR_MYMACROS" msgid "My Macros" -msgstr "Mani makro" +msgstr "Manas makrokomandas" #: cui/inc/strings.hrc:94 msgctxt "RID_SVXSTR_PRODMACROS" msgid "%PRODUCTNAME Macros" -msgstr "%PRODUCTNAME makro" +msgstr "%PRODUCTNAME makrokomandas" #: cui/inc/strings.hrc:95 msgctxt "RID_SVXSTR_NOMACRODESC" msgid "There is no description available for this macro." -msgstr "Šim makro nav pieejams apraksts." +msgstr "Šai makrokomandai nav pieejams apraksts." #: cui/inc/strings.hrc:96 msgctxt "RID_SVXSTR_SELECTOR_ADD_COMMANDS" @@ -518,7 +518,7 @@ #: cui/inc/strings.hrc:121 msgctxt "RID_SVXSTR_BASICMACROS" msgid "BASIC Macros" -msgstr "BASIC makrosi" +msgstr "BASIC makrokomandas" #: cui/inc/strings.hrc:122 msgctxt "RID_SVXSTR_GROUP_STYLES" @@ -4986,7 +4986,7 @@ #: cui/uiconfig/ui/eventassigndialog.ui:8 msgctxt "eventassigndialog|EventAssignDialog" msgid "Assign Macro" -msgstr "Piesaistīt makro" +msgstr "Piešķirt makrokomandu" #: cui/uiconfig/ui/eventassignpage.ui:84 msgctxt "eventassignpage|eventft" @@ -5016,12 +5016,12 @@ #: cui/uiconfig/ui/eventassignpage.ui:243 msgctxt "eventassignpage|macrotoft" msgid "Macro From" -msgstr "Makro no" +msgstr "Makrokomanda no" #: cui/uiconfig/ui/eventassignpage.ui:319 msgctxt "eventassignpage|existingmacrosft" msgid "Existing Macros" -msgstr "Esošie makro" +msgstr "Esošās makrokomandas" #: cui/uiconfig/ui/eventsconfigpage.ui:31 msgctxt "eventsconfigpage|label1" @@ -6624,7 +6624,7 @@ #: cui/uiconfig/ui/macroselectordialog.ui:8 msgctxt "macroselectordialog|MacroSelectorDialog" msgid "Macro Selector" -msgstr "Makro selektors" +msgstr "Makrokomandas selektors" #: cui/uiconfig/ui/macroselectordialog.ui:37 msgctxt "macroselectordialog|add" @@ -6634,7 +6634,7 @@ #: cui/uiconfig/ui/macroselectordialog.ui:114 msgctxt "macroselectordialog|helpmacro" msgid "Select the library that contains the macro you want. Then select the macro under 'Macro name'." -msgstr "Izvēlieties bibliotēku, kas satur vajadzīgo makro. Tad izvēlieties makro zem 'Makro nosaukums'." +msgstr "Izvēlieties bibliotēku, kas satur vajadzīgo makrokomandu. Tad izvēlieties makrokomandu zem 'Makrokomandas nosaukums'." #: cui/uiconfig/ui/macroselectordialog.ui:130 msgctxt "macroselectordialog|helptoolbar" @@ -6654,7 +6654,7 @@ #: cui/uiconfig/ui/macroselectordialog.ui:256 msgctxt "macroselectordialog|macronameft" msgid "Macro Name" -msgstr "Makro nosaukums" +msgstr "Makrokomandas nosaukums" #: cui/uiconfig/ui/macroselectordialog.ui:272 msgctxt "macroselectordialog|commandsft" @@ -6929,7 +6929,7 @@ #: cui/uiconfig/ui/newlibdialog.ui:97 msgctxt "newlibdialog|newmacroft" msgid "Enter the name for the new macro." -msgstr "Ievadiet nosaukumu jaunajam makro." +msgstr "Ievadiet nosaukumu jaunajai makrokomandai." #: cui/uiconfig/ui/newlibdialog.ui:111 msgctxt "newlibdialog|renameft" @@ -7458,7 +7458,7 @@ #: cui/uiconfig/ui/optadvancedpage.ui:330 msgctxt "optadvancedpage|macrorecording" msgid "Enable macro recording (may be limited)" -msgstr "Ieslēgt makro ierakstīšanu (var būt ierobežots)" +msgstr "Ieslēgt makrokomandu ierakstīšanu (var būt ierobežota)" #: cui/uiconfig/ui/optadvancedpage.ui:345 msgctxt "optadvancedpage|expertconfig" @@ -7718,7 +7718,7 @@ #: cui/uiconfig/ui/optemailpage.ui:167 msgctxt "optemailpage|label1" msgid "Sending Documents as E-mail Attachments" -msgstr "Sūtot dokumentus kā e-pasta pielikumus" +msgstr "Dokumentu kā e-pasta ziņojumu pielikumu sūtīšana" #: cui/uiconfig/ui/optfltrembedpage.ui:52 msgctxt "optfltrembedpage|label2" @@ -8088,7 +8088,7 @@ #: cui/uiconfig/ui/optjsearchpage.ui:135 msgctxt "optjsearchpage|matchvariantformkanji" msgid "_variant-form kanji (itaiji)" -msgstr "_kanji varianta forma (itaiji)" +msgstr "kanji _varianta forma (itaiji)" #: cui/uiconfig/ui/optjsearchpage.ui:152 msgctxt "optjsearchpage|matcholdkanaforms" @@ -8684,17 +8684,17 @@ #: cui/uiconfig/ui/optsecuritypage.ui:186 msgctxt "optsecuritypage|label5" msgid "Adjust the security level for executing macros and specify trusted macro developers." -msgstr "Pielāgot drošības līmeni makrokomandu izpildei un norādīt uzticamos makro izstrādātājus." +msgstr "Pielāgot drošības līmeni makrokomandu izpildei un norādīt uzticamos makrokomandu izstrādātājus." #: cui/uiconfig/ui/optsecuritypage.ui:199 msgctxt "optsecuritypage|macro" msgid "Macro Securit_y..." -msgstr "Makro drošī_ba..." +msgstr "Makrokomandu drošī_ba..." #: cui/uiconfig/ui/optsecuritypage.ui:221 msgctxt "optsecuritypage|label3" msgid "Macro Security" -msgstr "Makro drošība" +msgstr "Makrokomandu drošība" #: cui/uiconfig/ui/optsecuritypage.ui:263 msgctxt "optsecuritypage|savepassword" @@ -10331,7 +10331,7 @@ #: cui/uiconfig/ui/scriptorganizer.ui:7 msgctxt "scriptorganizer|ScriptOrganizerDialog" msgid "%MACROLANG Macros" -msgstr "%MACROLANG makro" +msgstr "%MACROLANG makrokomandas" #: cui/uiconfig/ui/scriptorganizer.ui:20 msgctxt "scriptorganizer|run" @@ -10356,7 +10356,7 @@ #: cui/uiconfig/ui/scriptorganizer.ui:159 msgctxt "scriptorganizer|macrosft" msgid "Macros" -msgstr "Makro" +msgstr "Makrokomandas" #: cui/uiconfig/ui/searchattrdialog.ui:9 msgctxt "searchattrdialog|SearchAttrDialog" @@ -10466,7 +10466,7 @@ #: cui/uiconfig/ui/securityoptionsdialog.ui:327 msgctxt "securityoptionsdialog|blockuntrusted" msgid "Block any links from documents not among the trusted locations (see Macro Security)" -msgstr "Bloķēt visas saites no dokumentiem, kas nav starp uzticamajām vietām (skatiet makro drošību)" +msgstr "Bloķēt visas saites no dokumentiem, kas nav starp uzticamajām vietām (skatiet \"Makrokomandu drošība\")" #: cui/uiconfig/ui/securityoptionsdialog.ui:398 msgctxt "securityoptionsdialog|label2" diff -Nru libreoffice-6.2.2/translations/source/lv/dbaccess/messages.po libreoffice-6.2.3/translations/source/lv/dbaccess/messages.po --- libreoffice-6.2.2/translations/source/lv/dbaccess/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/dbaccess/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-14 06:11+0000\n" +"PO-Revision-Date: 2019-03-21 06:23+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552543905.000000\n" +"X-POOTLE-MTIME: 1553149396.000000\n" #: dbaccess/inc/query.hrc:26 msgctxt "RSC_QUERY_OBJECT_TYPE" @@ -980,7 +980,7 @@ #: dbaccess/inc/strings.hrc:220 msgctxt "STR_SUB_DOCS_WITH_SCRIPTS" msgid "The document contains forms or reports with embedded macros." -msgstr "Dokuments satur formas un atskaites ar iegultiem makro." +msgstr "Dokuments satur formas vai atskaites ar iegultām makrokomandām." #: dbaccess/inc/strings.hrc:221 msgctxt "STR_SUB_DOCS_WITH_SCRIPTS_DETAIL" @@ -991,11 +991,11 @@ "\n" "Note that you won't be able to embed macros into the database document itself until this migration is done. " msgstr "" -"Makro vajadzētu tikt iegultiem pašā datubāzes dokumentā.\n" +"Makrokomandām vajadzētu tikt iegultām pašā datubāzes dokumentā.\n" "\n" -"Jūs varat turpināt izmantot savu dokumentu kā iepriekš, taču makro ir vēlams migrēt. Ja vēlaties palīdzību, izvēlieties 'Rīki / Migrēt makro....'.\n" +"Jūs varat turpināt izmantot savu dokumentu kā iepriekš, taču makrokomandas ir vēlams migrēt. Ja vēlaties palīdzību, izvēlieties 'Rīki / Migrēt makrokomandas...'.\n" "\n" -"Ņemiet vērā, ka bez šīs migrācijas iegult makro datubāzes dokumentā nebūs iespējams." +"Ņemiet vērā, ka pašā datubāzes dokumentā nebūs iespējams iegult makrokomandas, kamēr šī migrācija nebūs pabeigta." #: dbaccess/inc/strings.hrc:226 msgctxt "RID_STR_EMBEDDED_DATABASE" @@ -3389,7 +3389,7 @@ #: dbaccess/uiconfig/ui/preparepage.ui:17 msgctxt "preparepage|label1" msgid "Welcome to the Database Macro Migration Wizard" -msgstr "Laipni lūdzam datubāžu makro migrācijas vednī" +msgstr "Laipni lūdzam datubāžu makrokomandu migrācijas vednī" #: dbaccess/uiconfig/ui/preparepage.ui:34 msgctxt "preparepage|label2" @@ -3402,11 +3402,11 @@ "\n" "Before the migration can start, all forms, reports, queries and tables belonging to the document must be closed. Press 'Next' to do so." msgstr "" -"Šis vednis palīdzēs jums migrēt jūsu makro.\n" +"Šis vednis palīdzēs jums migrēt jūsu makrokomandas.\n" "\n" -"Pēc pabeigšanas visi makro, kas agrāk bija iegulti pašreizējā datubāzes dokumenta formās un atskaitēs, būs pārvietoti uz pašu dokumentu. Arī bibliotēkas tiks atbilstoši pārdēvētas.\n" +"Pēc pabeigšanas visas makrokomandas, kas agrāk bija iegultas pašreizējā datubāzes dokumenta formās un atskaitēs, būs pārvietotas uz pašu dokumentu. Arī bibliotēkas tiks atbilstoši pārdēvētas.\n" "\n" -"Ja formas un atskaites satur atsauces uz šiem makro, tās iespēju robežās tiks pieskaņotas.\n" +"Ja formas un atskaites satur atsauces uz šīm makrokomandām, tās iespēju robežās tiks pieskaņotas.\n" "\n" "Pirms sākt migrāciju, visām dokumenta formām, atskaitēm, vaicājumiem un tabulām jābūt aizvērtām. Lai to darītu, spiediet “Nākamais”." diff -Nru libreoffice-6.2.2/translations/source/lv/filter/source/config/fragments/filters.po libreoffice-6.2.3/translations/source/lv/filter/source/config/fragments/filters.po --- libreoffice-6.2.2/translations/source/lv/filter/source/config/fragments/filters.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/filter/source/config/fragments/filters.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2018-07-02 00:14+0200\n" -"PO-Revision-Date: 2019-03-05 15:28+0000\n" +"PO-Revision-Date: 2019-03-21 06:38+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551799730.000000\n" +"X-POOTLE-MTIME: 1553150327.000000\n" #: ADO_rowset_XML.xcu msgctxt "" @@ -1292,7 +1292,7 @@ "UIName\n" "value.text" msgid "Excel 2007–2019 (macro-enabled)" -msgstr "Excel 2007–2019 (ar ieslēgtām makrokomandām)" +msgstr "Excel 2007–2019 (ar makrokomandām)" #: calc_MS_Excel_2007_XML.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/lv/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/lv/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/lv/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-15 16:52+0000\n" +"PO-Revision-Date: 2019-03-21 09:35+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: Latvian \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552668759.000000\n" +"X-POOTLE-MTIME: 1553160949.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -257,7 +257,7 @@ "UIName\n" "value.text" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: BasicIDEWindowState.xcu msgctxt "" @@ -3947,7 +3947,7 @@ "Label\n" "value.text" msgid "Assign Macro..." -msgstr "Piešķirt makro..." +msgstr "Piešķirt makrokomandu..." #: CalcCommands.xcu msgctxt "" @@ -6692,7 +6692,7 @@ "Label\n" "value.text" msgid "Migrate Macros ..." -msgstr "Migrēt makro..." +msgstr "Migrēt makrokomandas..." #: DbuCommands.xcu msgctxt "" @@ -15755,7 +15755,7 @@ "Label\n" "value.text" msgid "Select Macro" -msgstr "Izvēlēties makro" +msgstr "Izvēlēties makrokomandu" #: GenericCommands.xcu msgctxt "" @@ -16079,7 +16079,7 @@ "Label\n" "value.text" msgid "Edit Macros" -msgstr "Rediģēt makro" +msgstr "Rediģēt makrokomandas" #: GenericCommands.xcu msgctxt "" @@ -19447,7 +19447,7 @@ "Label\n" "value.text" msgid "Interrupt Macro" -msgstr "Pārtraukt makro" +msgstr "Pārtraukt makrokomandu" #: GenericCommands.xcu msgctxt "" @@ -19807,7 +19807,7 @@ "Label\n" "value.text" msgid "Edit Macros" -msgstr "Rediģēt makro" +msgstr "Rediģēt makrokomandas" #: GenericCommands.xcu msgctxt "" @@ -20437,7 +20437,7 @@ "Label\n" "value.text" msgid "Record Macro" -msgstr "Ierakstīt makro" +msgstr "Ierakstīt makrokomandu" #: GenericCommands.xcu msgctxt "" @@ -20716,7 +20716,7 @@ "Label\n" "value.text" msgid "Macro Toolbar On/Off" -msgstr "Makro rīkjosla ieslēgta/izslēgta" +msgstr "Makrokomandas rīkjosla ieslēgta/izslēgta" #: GenericCommands.xcu msgctxt "" @@ -20833,7 +20833,7 @@ "Label\n" "value.text" msgid "~Organize Macros" -msgstr "~Organizēt makro" +msgstr "~Organizēt makrokomandas" #: GenericCommands.xcu msgctxt "" @@ -20842,7 +20842,7 @@ "Label\n" "value.text" msgid "R~un Macro..." -msgstr "P~alaist makro..." +msgstr "Palaist makrokomand~u..." #: GenericCommands.xcu msgctxt "" @@ -22435,7 +22435,7 @@ "Label\n" "value.text" msgid "~Macros" -msgstr "~Makro" +msgstr "~Makrokomandas" #: GenericCommands.xcu msgctxt "" @@ -22831,7 +22831,7 @@ "Label\n" "value.text" msgid "%PRODUCTNAME Basic Macro Organizer..." -msgstr "%PRODUCTNAME Basic makro organizētājs..." +msgstr "%PRODUCTNAME Basic makrokomandu organizētājs..." #: GenericCommands.xcu msgctxt "" @@ -27799,7 +27799,7 @@ "Label\n" "value.text" msgid "Run Macro Field" -msgstr "Palaist makro lauku" +msgstr "Palaist makrokomandas lauku" #: WriterCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/lv/sc/messages.po libreoffice-6.2.3/translations/source/lv/sc/messages.po --- libreoffice-6.2.2/translations/source/lv/sc/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/sc/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-15 16:58+0000\n" +"PO-Revision-Date: 2019-03-21 20:25+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552669121.000000\n" +"X-POOTLE-MTIME: 1553199950.000000\n" #: sc/inc/compiler.hrc:27 msgctxt "RID_FUNCTION_CATEGORIES" @@ -1041,7 +1041,7 @@ #: sc/inc/globstr.hrc:233 msgctxt "STR_LONG_ERR_NO_MACRO" msgid "Error: Macro not found" -msgstr "Kļūda: makro nav atrasts" +msgstr "Kļūda: makrokomanda nav atrasta" #: sc/inc/globstr.hrc:234 msgctxt "STR_LONG_ERR_SYNTAX" @@ -11382,7 +11382,7 @@ #: sc/inc/scfuncs.hrc:3282 msgctxt "SC_OPCODE_ADDRESS" msgid "The spreadsheet name of the cell reference." -msgstr "Loksnes nosaukums šūnas norādei." +msgstr "Šūnas atsauces izklājlapas nosaukums." #: sc/inc/scfuncs.hrc:3288 msgctxt "SC_OPCODE_AREAS" @@ -11437,7 +11437,7 @@ #: sc/inc/scfuncs.hrc:3308 msgctxt "SC_OPCODE_COLUMN" msgid "The reference to a cell or a range." -msgstr "Norāde uz šūnu vai diapazonu." +msgstr "Atsauce uz šūnu vai diapazonu." #: sc/inc/scfuncs.hrc:3314 msgctxt "SC_OPCODE_ROW" @@ -11452,7 +11452,7 @@ #: sc/inc/scfuncs.hrc:3316 msgctxt "SC_OPCODE_ROW" msgid "The reference to a cell or a range." -msgstr "Norāde uz šūnu vai diapazonu." +msgstr "Atsauce uz šūnu vai diapazonu." #: sc/inc/scfuncs.hrc:3322 msgctxt "SC_OPCODE_SHEET" @@ -11467,7 +11467,7 @@ #: sc/inc/scfuncs.hrc:3324 msgctxt "SC_OPCODE_SHEET" msgid "The reference to a cell or a range or the character string of a sheet name." -msgstr "Norāde uz šūnu vai diapazonu vai teksts, kas ir loksnes nosaukums." +msgstr "Atsauce uz šūnu vai diapazonu, vai loksnes nosaukuma rakstzīmju virkni." #: sc/inc/scfuncs.hrc:3330 msgctxt "SC_OPCODE_COLUMNS" @@ -11512,12 +11512,12 @@ #: sc/inc/scfuncs.hrc:3348 msgctxt "SC_OPCODE_SHEETS" msgid "The reference to a cell or a range." -msgstr "Norāde uz šūnu vai diapazonu." +msgstr "Atsauce uz šūnu vai diapazonu." #: sc/inc/scfuncs.hrc:3354 msgctxt "SC_OPCODE_H_LOOKUP" msgid "Horizontal search and reference to the cells located below." -msgstr "Horizontāla meklēšana un norāde uz šūnām zem atrastās." +msgstr "Horizontālā meklēšana un atsauce uz šūnām, kas atrodas zemāk." #: sc/inc/scfuncs.hrc:3355 msgctxt "SC_OPCODE_H_LOOKUP" @@ -11757,7 +11757,7 @@ #: sc/inc/scfuncs.hrc:3432 msgctxt "SC_OPCODE_OFFSET" msgid "The reference (cell) from which to base the movement." -msgstr "Norāde (šūna), no kuras sākt pārvietojumu." +msgstr "Atsauce (šūna), no kuras sākt pārvietošanos." #: sc/inc/scfuncs.hrc:3433 msgctxt "SC_OPCODE_OFFSET" @@ -11812,7 +11812,7 @@ #: sc/inc/scfuncs.hrc:3448 msgctxt "SC_OPCODE_ERROR_TYPE" msgid "The reference (cell) in which the error occurred." -msgstr "Norāde uz šūnu, kurā gadījās kļūda." +msgstr "Atsauce (šūna), kurā gadījās kļūda." #: sc/inc/scfuncs.hrc:3454 msgctxt "SC_OPCODE_ERROR_TYPE_ODF" @@ -11827,7 +11827,7 @@ #: sc/inc/scfuncs.hrc:3456 msgctxt "SC_OPCODE_ERROR_TYPE_ODF" msgid "The error value whose identifying number you want to find. Can be the actual error value or a reference to a cell that you want to test." -msgstr "Kļūdas vērtība, kuras identifikācijas numuru vēlaties atrast. Var būt pati kļūdas vērtība vai arī norāde uz šūnu, kuru vēlaties pārbaudīt." +msgstr "Kļūdas vērtība, kuras identifikācijas numuru vēlaties atrast. Var būt pati kļūdas vērtība vai arī atsauce uz šūnu, kuru vēlaties pārbaudīt." #: sc/inc/scfuncs.hrc:3462 msgctxt "SC_OPCODE_STYLE" @@ -11957,7 +11957,7 @@ #: sc/inc/scfuncs.hrc:3502 msgctxt "SC_OPCODE_GET_PIVOT_DATA" msgid "A reference to a cell or range in the pivot table." -msgstr "Norāde uz šūnu vai diapazonu pivot tabulā." +msgstr "Atsauce uz šūnu vai diapazonu pivot tabulā." #: sc/inc/scfuncs.hrc:3503 msgctxt "SC_OPCODE_GET_PIVOT_DATA" @@ -12042,7 +12042,7 @@ #: sc/inc/scfuncs.hrc:3544 msgctxt "SC_OPCODE_CURRENCY" msgid "Value is a number, a reference to a cell containing a number or a formula that results in a number." -msgstr "Vērtība ir skaitlis, norāde uz šūnu ar skaitli vai formula, kuras rezultāts ir skaitlis." +msgstr "Vērtība ir skaitlis, atsauce uz skaitli saturošu šūnu vai formula, kuras rezultāts ir skaitlis." #: sc/inc/scfuncs.hrc:3545 msgctxt "SC_OPCODE_CURRENCY" @@ -12777,12 +12777,12 @@ #: sc/inc/scfuncs.hrc:3829 msgctxt "SC_OPCODE_REGEX" msgid "Flags or Occurrence" -msgstr "Karodziņi vai notikšana" +msgstr "Karodziņi vai atgadīšanās" #: sc/inc/scfuncs.hrc:3830 msgctxt "SC_OPCODE_REGEX" msgid "Text specifying option flags, \"g\" for global replacement. Or number of occurrence to match or replace." -msgstr "" +msgstr "Opciju karodziņus norādošais teksts, \"g\" globālai aizstāšanai. Vai atgadīšanās kārtas numurs, lai sakristu vai aizstātu." #: sc/inc/scfuncs.hrc:3836 msgctxt "SC_OPCODE_BASE" @@ -14080,7 +14080,7 @@ #: sc/inc/strings.hrc:128 msgctxt "STR_WRONGROWCOL" msgid "Undefined name or wrong cell reference." -msgstr "Nedefinēts nosaukums vai nepareiza atsauce uz šūnu." +msgstr "Nedefinēts nosaukums vai nepareiza šūnas atsauce." #: sc/inc/strings.hrc:129 msgctxt "STR_NOCOLFORMULA" @@ -17458,7 +17458,7 @@ #: sc/uiconfig/scalc/ui/erroralerttabpage.ui:153 msgctxt "erroralerttabpage|actionCB" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: sc/uiconfig/scalc/ui/erroralerttabpage.ui:169 msgctxt "erroralerttabpage|label1" @@ -21443,7 +21443,7 @@ #: sc/uiconfig/scalc/ui/scgeneralpage.ui:405 msgctxt "scgeneralpage|sortrefupdatecb" msgid "Update references when sorting range of cells" -msgstr "Atjaunināt norādes, kad kārto šūnas" +msgstr "Atjaunināt atsauces, kad kārto šūnu diapazonu" #: sc/uiconfig/scalc/ui/scgeneralpage.ui:440 msgctxt "scgeneralpage|label3" diff -Nru libreoffice-6.2.2/translations/source/lv/sd/messages.po libreoffice-6.2.3/translations/source/lv/sd/messages.po --- libreoffice-6.2.2/translations/source/lv/sd/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/sd/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-08 11:49+0100\n" -"PO-Revision-Date: 2019-03-14 06:37+0000\n" +"PO-Revision-Date: 2019-03-21 10:28+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552545420.000000\n" +"X-POOTLE-MTIME: 1553164118.000000\n" #: sd/inc/DocumentRenderer.hrc:27 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES" @@ -896,7 +896,7 @@ #: sd/inc/strings.hrc:141 msgctxt "STR_CLICK_ACTION_MACRO" msgid "Run macro" -msgstr "Palaist makro" +msgstr "Palaist makrokomandu" #: sd/inc/strings.hrc:142 msgctxt "STR_CLICK_ACTION_STOPPRESENTATION" @@ -936,7 +936,7 @@ #: sd/inc/strings.hrc:149 msgctxt "STR_EFFECTDLG_MACRO" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #. Strings for animation effects #: sd/inc/strings.hrc:151 diff -Nru libreoffice-6.2.2/translations/source/lv/sfx2/messages.po libreoffice-6.2.3/translations/source/lv/sfx2/messages.po --- libreoffice-6.2.2/translations/source/lv/sfx2/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/sfx2/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-14 16:18+0000\n" +"PO-Revision-Date: 2019-03-21 10:30+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552580317.000000\n" +"X-POOTLE-MTIME: 1553164242.000000\n" #: include/sfx2/strings.hrc:25 msgctxt "STR_TEMPLATE_FILTER" @@ -2175,7 +2175,7 @@ #: sfx2/uiconfig/ui/floatingrecord.ui:9 msgctxt "floatingrecord|FloatingRecord" msgid "Record Macro" -msgstr "Ierakstīt makro" +msgstr "Ierakstīt makrokomandu" #: sfx2/uiconfig/ui/helpbookmarkpage.ui:22 msgctxt "helpbookmarkpage|display" diff -Nru libreoffice-6.2.2/translations/source/lv/svtools/messages.po libreoffice-6.2.3/translations/source/lv/svtools/messages.po --- libreoffice-6.2.2/translations/source/lv/svtools/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/svtools/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-14 12:22+0100\n" -"PO-Revision-Date: 2019-03-10 18:20+0000\n" +"PO-Revision-Date: 2019-03-21 12:28+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552242045.000000\n" +"X-POOTLE-MTIME: 1553171328.000000\n" #: include/svtools/strings.hrc:25 msgctxt "STR_UNDO" @@ -2059,7 +2059,7 @@ "For security reasons, macro support is disabled." msgstr "" "Tika mēģināts izpildīt makrokomandu.\n" -"Drošības apsvērumu dēļ makro atbalsts ir izslēgts." +"Drošības apsvērumu dēļ makrokomandu atbalsts ir izslēgts." #: svtools/inc/errtxt.hrc:123 msgctxt "RID_ERRHDL" @@ -2072,7 +2072,7 @@ msgstr "" "Šis dokuments satur makrokomandas.\n" "\n" -"Makro var saturēt vīrusus. Makro izpildīšana ir deaktivēta saskaņā ar drošības iestatījumiem, kas atrodami %PRODUCTNAME - Iestatījumi - %PRODUCTNAME - Drošība.\n" +"Makrokomandas var saturēt vīrusus. Makrokomandu izpildīšana ir izslēgta saskaņā ar makrokomandu drošības iestatījumiem, kas atrodami %PRODUCTNAME - Iestatījumi - %PRODUCTNAME - Drošība.\n" "\n" "Tāpēc iespējams, ka ne visa funkcionalitāte ir pieejama." @@ -2087,7 +2087,7 @@ msgstr "" "Šis dokuments satur makrokomandas.\n" "\n" -"Makro var saturēt vīrusus. Makro izpildīšana ir deaktivēta saskaņā ar drošības iestatījumiem, kas atrodami Rīki - Opcijas - %PRODUCTNAME - Drošība.\n" +"Makrokomandas var saturēt vīrusus. Makrokomandu izpildīšana ir izslēgta saskaņā ar makrokomandu drošības iestatījumiem, kas atrodami Rīki - Opcijas - %PRODUCTNAME - Drošība.\n" "\n" "Tāpēc iespējams, ka ne visa funkcionalitāte ir pieejama." @@ -2107,7 +2107,7 @@ "Tas var notikt dokumenta ļaunprātīgas pārveidošanas rezultātā.\n" "\n" "Mēs neiesakām jums uzticēties šī dokumenta saturam.\n" -"Makro izpildīšana šim dokumentam ir izslēgta.\n" +"Makrokomandu izpildīšana šim dokumentam ir izslēgta.\n" " " #: svtools/inc/errtxt.hrc:126 diff -Nru libreoffice-6.2.2/translations/source/lv/svx/messages.po libreoffice-6.2.3/translations/source/lv/svx/messages.po --- libreoffice-6.2.2/translations/source/lv/svx/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/svx/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2019-03-14 06:38+0000\n" +"PO-Revision-Date: 2019-03-21 12:42+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552545484.000000\n" +"X-POOTLE-MTIME: 1553172123.000000\n" #: include/svx/strings.hrc:25 msgctxt "STR_ObjNameSingulNONE" @@ -8919,7 +8919,7 @@ #: svx/inc/svxerr.hrc:63 msgctxt "RID_SVXERRCODE" msgid "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead." -msgstr "Visas izmaiņas Basic kodā ir zudušas. Bet tā vietā ir saglabāts sākotnējais VBA Macro kods." +msgstr "Visas Basic kodā veiktās izmaiņas ir zudušas. Tā vietā ir saglabāts sākotnējais VBA makrokomandu kods." #: svx/inc/svxerr.hrc:65 msgctxt "RID_SVXERRCODE" @@ -12607,7 +12607,7 @@ #: svx/uiconfig/ui/imapdialog.ui:254 msgctxt "imapdialog|TBI_MACRO" msgid "Macro..." -msgstr "Makro..." +msgstr "Makrokomanda..." #: svx/uiconfig/ui/imapdialog.ui:268 msgctxt "imapdialog|TBI_PROPERTY" @@ -12637,7 +12637,7 @@ #: svx/uiconfig/ui/imapmenu.ui:20 msgctxt "imapmenu|macro" msgid "_Macro..." -msgstr "_Makro..." +msgstr "_Makrokomanda..." #: svx/uiconfig/ui/imapmenu.ui:28 msgctxt "imapmenu|active" diff -Nru libreoffice-6.2.2/translations/source/lv/sw/messages.po libreoffice-6.2.3/translations/source/lv/sw/messages.po --- libreoffice-6.2.2/translations/source/lv/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-04 05:57+0000\n" +"PO-Revision-Date: 2019-03-27 09:13+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551679038.000000\n" +"X-POOTLE-MTIME: 1553678008.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -366,14 +366,13 @@ msgstr "Neizdevās pilnībā saglabāt dokumentu." #: sw/inc/error.hrc:55 -#, fuzzy msgctxt "RID_SW_ERRHDL" msgid "" "This HTML document contains %PRODUCTNAME Basic macros.\n" "They were not saved with the current export settings." msgstr "" "Šis HTML dokuments satur %PRODUCTNAME Basic makrokomandas.\n" -"Atbilstoši aktīvajiem eksportēšanas iestatījumiem tās netika saglabātas." +"Ar pašreizējiem eksportēšanas iestatījumiem tās netika saglabātas." #: sw/inc/flddinf.hrc:27 msgctxt "flddocinfopage|liststore1" @@ -4638,7 +4637,7 @@ #: sw/inc/strings.hrc:866 msgctxt "STR_MACROFLD" msgid "Execute macro" -msgstr "Darbināt makro" +msgstr "Izpildīt makrokomandu" #: sw/inc/strings.hrc:867 msgctxt "STR_SEQFLD" @@ -5218,7 +5217,7 @@ #: sw/inc/strings.hrc:1016 msgctxt "STR_MACNAME" msgid "~Macro name" -msgstr "~Makro nosaukums" +msgstr "~Makrokomandas nosaukums" #: sw/inc/strings.hrc:1017 msgctxt "STR_PROMPT" @@ -7282,7 +7281,7 @@ #: sw/uiconfig/swriter/ui/autotext.ui:458 msgctxt "autotext|macro" msgid "_Macro..." -msgstr "_Makro..." +msgstr "_Makrokomanda..." #: sw/uiconfig/swriter/ui/autotext.ui:472 msgctxt "autotext|import" @@ -9031,7 +9030,7 @@ #: sw/uiconfig/swriter/ui/fldfuncpage.ui:160 msgctxt "fldfuncpage|macro" msgid "_Macro..." -msgstr "_Makro..." +msgstr "_Makrokomanda..." #: sw/uiconfig/swriter/ui/fldfuncpage.ui:185 msgctxt "fldfuncpage|valueft" @@ -9616,7 +9615,7 @@ #: sw/uiconfig/swriter/ui/framedialog.ui:510 msgctxt "framedialog|macro" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: sw/uiconfig/swriter/ui/frmaddpage.ui:73 msgctxt "frmaddpage|name_label" @@ -11376,7 +11375,7 @@ #: sw/uiconfig/swriter/ui/mmmailbody.ui:138 msgctxt "mmmailbody|greeting" msgid "This e-mail should contain a salutation" -msgstr "Šim e-pastam būtu jāsatur sveiciens" +msgstr "Šim e-pasta ziņojumam būtu jāsatur sveiciens" #: sw/uiconfig/swriter/ui/mmmailbody.ui:167 msgctxt "mmmailbody|generalft" @@ -11761,7 +11760,7 @@ #: sw/uiconfig/swriter/ui/mmsendmails.ui:148 msgctxt "mmsendmails|transferstatus" msgid "%1 of %2 e-mails sent" -msgstr "%1 no %2 e-pastiem nosūtīti" +msgstr "Nosūtīti %1 no %2 e-pasta ziņojumiem" #: sw/uiconfig/swriter/ui/mmsendmails.ui:164 msgctxt "mmsendmails|paused" @@ -13124,7 +13123,7 @@ #: sw/uiconfig/swriter/ui/objectdialog.ui:268 msgctxt "objectdialog|macro" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: sw/uiconfig/swriter/ui/optcaptionpage.ui:60 msgctxt "optcaptionpage|label7" @@ -14562,7 +14561,7 @@ #: sw/uiconfig/swriter/ui/picturedialog.ui:557 msgctxt "picturedialog|macro" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: sw/uiconfig/swriter/ui/picturepage.ui:32 msgctxt "picturepage|browse" @@ -16321,7 +16320,7 @@ #: sw/uiconfig/swriter/ui/templatedialog4.ui:541 msgctxt "templatedialog4|macros" msgid "Macro" -msgstr "Makro" +msgstr "Makrokomanda" #: sw/uiconfig/swriter/ui/templatedialog8.ui:8 msgctxt "templatedialog8|TemplateDialog8" diff -Nru libreoffice-6.2.2/translations/source/lv/uui/messages.po libreoffice-6.2.3/translations/source/lv/uui/messages.po --- libreoffice-6.2.2/translations/source/lv/uui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/uui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-05 17:38+0100\n" -"PO-Revision-Date: 2019-02-10 13:26+0000\n" +"PO-Revision-Date: 2019-03-21 19:33+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1549805201.000000\n" +"X-POOTLE-MTIME: 1553196802.000000\n" #: uui/inc/ids.hrc:27 msgctxt "RID_UUI_ERRHDL" @@ -45,7 +45,7 @@ msgstr "" "Tiek saglabāta/eksportēta paroles aizsargāta bibliotēka, kuras modulis(-ļi)\n" "$(ARG1)\n" -"ir par lielu saglabāšanai binārā formātā. Ja vēlaties, lai lietotāji, kuriem nav bibliotēkas paroles, varētu darbināt šo moduļu makro, tie ir jāsadala mazākos moduļos. Vai vēlaties turpināt saglabāt/eksportēt šo bibliotēku?" +"ir par lielu saglabāšanai binārā formātā. Ja vēlaties, lai lietotāji, kuriem nav bibliotēkas paroles, varētu darbināt šo moduļu makrokomandas, tie ir jāsadala mazākos moduļos. Vai vēlaties turpināt saglabāt/eksportēt šo bibliotēku?" #: uui/inc/ids.hrc:37 msgctxt "RID_UUI_ERRHDL" @@ -318,7 +318,7 @@ "Bojājums varēja rasties ļaunprātīgas rīcības rezultātā, vai arī nejauši datu pārsūtīšanas laikā.\n" "\n" "Mēs neiesakām uzticēties atjaunotā dokumenta saturam.\n" -"Makro palaišana šim dokumentam ir izslēgta.\n" +"Makrokomandu izpildīšana šim dokumentam ir izslēgta.\n" "\n" "Vai %PRODUCTNAME jāmēģina salabot datni?\n" @@ -848,29 +848,29 @@ "\n" "Macros may contain viruses. Disabling macros for a document is always safe. If you disable macros you may lose functionality provided by the document macros." msgstr "" -"Dokuments satur dokumentu makro.\n" +"Dokuments satur dokumentu makrokomandas.\n" "\n" -"Makro var saturēt vīrusus. Makro izslēgšana dokumentā vienmēr ir droša. Ja izslēgsiet makro, iespējams, nebūs pieejama funkcionalitāte, kuru nodrošina šī dokumenta makro." +"Makrokomandas var saturēt vīrusus. Makrokomandu izslēgšana dokumentā vienmēr ir droša. Ja izslēgsiet makrokomandas, iespējams, nebūs pieejama funkcionalitāte, kuru nodrošina šī dokumenta makrokomandas." #: uui/uiconfig/ui/macrowarnmedium.ui:27 msgctxt "macrowarnmedium|cancel" msgid "_Disable Macros" -msgstr "_Izslēgt makro" +msgstr "Izslēgt makrokoman_das" #: uui/uiconfig/ui/macrowarnmedium.ui:43 msgctxt "macrowarnmedium|ok" msgid "_Enable Macros" -msgstr "I_eslēgt makro" +msgstr "I_eslēgt makrokomandas" #: uui/uiconfig/ui/macrowarnmedium.ui:88 msgctxt "macrowarnmedium|descr1Label" msgid "The document contains document macros signed by:" -msgstr "Šajā dokumenta ir makro, kurus ir parakstījis:" +msgstr "Dokuments satur dokumenta makrokomandas, kuras ir parakstījis:" #: uui/uiconfig/ui/macrowarnmedium.ui:97 msgctxt "macrowarnmedium|alwaysTrustCheckbutton" msgid "_Always trust macros from this source" -msgstr "Vienmēr uzticēties m_akrosiem no šī avota" +msgstr "Vienmēr uzticēties m_akrokomandām no šī avota" #: uui/uiconfig/ui/macrowarnmedium.ui:128 msgctxt "macrowarnmedium|viewSignsButton" diff -Nru libreoffice-6.2.2/translations/source/lv/vcl/messages.po libreoffice-6.2.3/translations/source/lv/vcl/messages.po --- libreoffice-6.2.2/translations/source/lv/vcl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/vcl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:29+0100\n" -"PO-Revision-Date: 2019-03-04 07:36+0000\n" +"PO-Revision-Date: 2019-03-24 17:32+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551684972.000000\n" +"X-POOTLE-MTIME: 1553448762.000000\n" #. To translators: This is the first entry of a sequence of paper size names #: vcl/inc/print.hrc:28 @@ -1005,7 +1005,7 @@ #: vcl/inc/font/OpenTypeFeatureStrings.hrc:52 msgctxt "STR_FONT_FEATURE_ID_HOJO" msgid "Hojo Kanji Forms (JIS X 0212-1990 Kanji Forms)" -msgstr "" +msgstr "Hojo Kanji formas (JIS X 0212-1990 Kanji formas)" #: vcl/inc/font/OpenTypeFeatureStrings.hrc:53 msgctxt "STR_FONT_FEATURE_ID_HWID" diff -Nru libreoffice-6.2.2/translations/source/lv/wizards/source/resources.po libreoffice-6.2.3/translations/source/lv/wizards/source/resources.po --- libreoffice-6.2.2/translations/source/lv/wizards/source/resources.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/wizards/source/resources.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-10-04 11:47+0200\n" -"PO-Revision-Date: 2019-02-22 17:59+0000\n" +"PO-Revision-Date: 2019-03-21 19:36+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550858395.000000\n" +"X-POOTLE-MTIME: 1553196964.000000\n" #: resources_en_US.properties msgctxt "" @@ -4233,7 +4233,7 @@ "ReeditMacro\n" "property.text" msgid "Document macro has to be revised." -msgstr "Dokumenta makro ir jāpārskata." +msgstr "Dokumenta makrokomanda ir jāpārskata." #: resources_en_US.properties msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/lv/xmlsecurity/messages.po libreoffice-6.2.3/translations/source/lv/xmlsecurity/messages.po --- libreoffice-6.2.2/translations/source/lv/xmlsecurity/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/lv/xmlsecurity/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:29+0100\n" -"PO-Revision-Date: 2019-02-01 21:58+0000\n" +"PO-Revision-Date: 2019-03-27 10:27+0000\n" "Last-Translator: Ingmārs Dīriņš \n" "Language-Team: LANGUAGE \n" "Language: lv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1549058335.000000\n" +"X-POOTLE-MTIME: 1553682474.000000\n" #: xmlsecurity/inc/strings.hrc:25 msgctxt "STR_CERTIFICATE_NOT_VALIDATED" @@ -103,7 +103,7 @@ "Adding or removing a macro signature will remove all document signatures.\n" "Do you really want to continue?" msgstr "" -"Makro paraksta pievienošana vai izņemšana izņems visus dokumenta parakstus.\n" +"Makrokomandas paraksta pievienošana vai izņemšana izņems visus dokumenta parakstus.\n" "Vai tiešām vēlaties turpināt?" #: xmlsecurity/inc/strings.hrc:46 @@ -118,7 +118,7 @@ #: xmlsecurity/inc/strings.hrc:49 msgctxt "STR_XMLSECDLG_SIGNING_FAILED" msgid "An error occurred while adding the signature." -msgstr "Gadījās kļūda, pievienojot parakstu." +msgstr "Pievienojot parakstu, gadījās kļūda." #: xmlsecurity/inc/strings.hrc:50 msgctxt "STR_XMLSECDLG_NO_CERT_MANAGER" @@ -253,7 +253,7 @@ #: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:233 msgctxt "digitalsignaturesdialog|macrohint" msgid "The following have signed the document macro:" -msgstr "Šī dokumenta makro ir parakstījuši:" +msgstr "Dokumenta makrokomandu ir parakstījuši:" #: xmlsecurity/uiconfig/ui/digitalsignaturesdialog.ui:245 msgctxt "digitalsignaturesdialog|packagehint" @@ -308,8 +308,8 @@ "Use this setting only if you are certain that all documents that will be opened are safe." msgstr "" "_Zems (nav ieteicams).\n" -"Visi makro tiks palaisti bez brīdinājuma.\n" -"Šo iestatījumu lietojiet tikai tad, ja visi atveramie dokumenti būs uzticami." +"Visas makrokomandas tiks izpildītas bez apstiprinājuma.\n" +"Šo iestatījumu lietojiet tikai, ja esat pārliecināts, ka visi dokumenti, kas tiks atvērti, ir droši." #: xmlsecurity/uiconfig/ui/securitylevelpage.ui:32 msgctxt "securitylevelpage|med" @@ -318,7 +318,7 @@ "Confirmation required before executing macros from untrusted sources." msgstr "" "_Vidējs.\n" -"Nepieciešams apstiprinājums, pirms izpildīt makro no nezināma avota." +"Nepieciešams apstiprinājums, pirms izpildīt makrokomandas no neuzticamiem avotiem." #: xmlsecurity/uiconfig/ui/securitylevelpage.ui:49 msgctxt "securitylevelpage|high" @@ -328,8 +328,8 @@ "Unsigned macros are disabled." msgstr "" "_Augsts.\n" -"Atļauts palaist makro tikai no uzticamiem avotiem.\n" -"Neparakstītie makro tiks izslēgti." +"Atļauts palaist tikai parakstītas makrokomandas no uzticamiem avotiem.\n" +"Neparakstītas makrokomandas tiek izslēgtas." #: xmlsecurity/uiconfig/ui/securitylevelpage.ui:68 msgctxt "securitylevelpage|vhigh" @@ -339,8 +339,8 @@ "All other macros, regardless whether signed or not, are disabled." msgstr "" "Ļ_oti augsts.\n" -"Atļauts palaist makro tikai no uzticamām datnēm.\n" -"Visi citi makro, neatkarīgi no parakstīšanas, tiks izslēgti." +"Atļauts palaist tikai makrokomandas no uzticamām datņu atrašanās vietām.\n" +"Visas citas makrokomandas, neatkarīgi no tā, vai parakstītas vai ne, tiek izslēgtas." #: xmlsecurity/uiconfig/ui/securitytrustpage.ui:45 msgctxt "securitytrustpage|viewcert" @@ -370,7 +370,7 @@ #: xmlsecurity/uiconfig/ui/securitytrustpage.ui:217 msgctxt "securitytrustpage|label8" msgid "Document macros are always executed if they have been opened from one of the following locations." -msgstr "Dokumentu makro vienmēr tiks palaisti, ja tie atvērti no kādas no šīm vietām." +msgstr "Dokumentu makrokomandas vienmēr tiek izpildītas, ja tās ir tikušas atvērtas no kādas no sekojošajām atrašanās vietām." #: xmlsecurity/uiconfig/ui/securitytrustpage.ui:236 msgctxt "securitytrustpage|addfile" diff -Nru libreoffice-6.2.2/translations/source/ne/chart2/messages.po libreoffice-6.2.3/translations/source/ne/chart2/messages.po --- libreoffice-6.2.2/translations/source/ne/chart2/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/chart2/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-02-15 16:54+0000\n" -"Last-Translator: Saroj Dhakal \n" +"PO-Revision-Date: 2019-03-27 07:48+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550249661.000000\n" +"X-POOTLE-MTIME: 1553672925.000000\n" #: chart2/inc/chart.hrc:17 msgctxt "tp_ChartType|liststore1" @@ -1791,12 +1791,12 @@ #: chart2/uiconfig/ui/sidebarseries.ui:260 msgctxt "sidebarseries|axis_label" msgid "Align Series to Axis" -msgstr "" +msgstr "अक्षमा पङ्क्तिबद्ध गर्नुहोस्" #: chart2/uiconfig/ui/sidebarseries.ui:276 msgctxt "sidebarseries|label_series_tmpl" msgid "Data series '%1'" -msgstr "" +msgstr "डेटा श्रृंखला '%1'" #: chart2/uiconfig/ui/smoothlinesdlg.ui:22 msgctxt "smoothlinesdlg|SmoothLinesDialog" @@ -1826,22 +1826,22 @@ #: chart2/uiconfig/ui/smoothlinesdlg.ui:172 msgctxt "smoothlinesdlg|PolynomialsLabel" msgid "_Degree of polynomials:" -msgstr "" +msgstr "पोलीनोमियल को डिग्री" #: chart2/uiconfig/ui/steppedlinesdlg.ui:131 msgctxt "steppedlinesdlg|step_start_rb" msgid "_Start with horizontal line" -msgstr "" +msgstr "तेर्सो रेखासँग सुरु गर्नुहोस्" #: chart2/uiconfig/ui/steppedlinesdlg.ui:147 msgctxt "steppedlinesdlg|step_center_x_rb" msgid "Step at the _horizontal mean" -msgstr "" +msgstr "क्षैतिज अर्थमा स्टेप" #: chart2/uiconfig/ui/steppedlinesdlg.ui:164 msgctxt "steppedlinesdlg|step_end_rb" msgid "_End with horizontal line" -msgstr "" +msgstr "तेर्सो रेखासँग अन्त्य गर्नुहोस्" #: chart2/uiconfig/ui/steppedlinesdlg.ui:181 msgctxt "steppedlinesdlg|step_center_y_rb" @@ -1899,18 +1899,16 @@ msgstr "योजना" #: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:90 -#, fuzzy msgctxt "tp_3D_SceneAppearance|CB_SHADING" msgid "_Shading" -msgstr "Shading" +msgstr "छायाँकरण" #: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:106 msgctxt "tp_3D_SceneAppearance|CB_OBJECTLINES" msgid "_Object borders" -msgstr "" +msgstr "वस्तु किनाराहरु" #: chart2/uiconfig/ui/tp_3D_SceneAppearance.ui:122 -#, fuzzy msgctxt "tp_3D_SceneAppearance|CB_ROUNDEDEDGE" msgid "_Rounded edges" msgstr "गोलाकार कुनाहरू" @@ -1918,12 +1916,12 @@ #: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:24 msgctxt "tp_3D_SceneGeometry|CBX_RIGHT_ANGLED_AXES" msgid "_Right-angled axes" -msgstr "" +msgstr "दायाँ कोण भएका अक्षहरू" #: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:42 msgctxt "tp_3D_SceneGeometry|FT_X_ROTATION" msgid "_X rotation" -msgstr "" +msgstr "X रोटेशन" #: chart2/uiconfig/ui/tp_3D_SceneGeometry.ui:56 msgctxt "tp_3D_SceneGeometry|FT_Y_ROTATION" @@ -2001,20 +1999,19 @@ msgstr "रङ संवाद प्रयोग गरेर एक रङ चयन गर्नुहोस्" #: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:347 -#, fuzzy msgctxt "tp_3D_SceneIllumination|FT_AMBIENTLIGHT" msgid "_Ambient light" -msgstr "सर्वब्यापक प्रकाश" +msgstr "परिवेशी प्रकाश" #: chart2/uiconfig/ui/tp_3D_SceneIllumination.ui:373 msgctxt "tp_3D_SceneIllumination|CTL_LIGHT_PREVIEW|tooltip_text" msgid "Light Preview" -msgstr "" +msgstr "मुद्रण पूर्वावलोकन" #: chart2/uiconfig/ui/tp_AxisPositions.ui:48 msgctxt "tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT" msgid "_Cross other axis at" -msgstr "" +msgstr "अर्को अक्षलाई यहाँ मिलन गर्नुहोस" #: chart2/uiconfig/ui/tp_AxisPositions.ui:64 msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT" @@ -2022,7 +2019,6 @@ msgstr "सुरु गर्नुहोस्" #: chart2/uiconfig/ui/tp_AxisPositions.ui:65 -#, fuzzy msgctxt "tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT" msgid "End" msgstr "अन्त्य" @@ -2040,43 +2036,42 @@ #: chart2/uiconfig/ui/tp_AxisPositions.ui:116 msgctxt "tp_AxisPositions|CB_AXIS_BETWEEN_CATEGORIES" msgid "Axis _between categories" -msgstr "" +msgstr "कोटिहरूको बिचमा अक्ष" #: chart2/uiconfig/ui/tp_AxisPositions.ui:137 msgctxt "tp_AxisPositions|TXT_AXIS_LINE" msgid "Axis Line" -msgstr "" +msgstr "अक्ष रेखा" #: chart2/uiconfig/ui/tp_AxisPositions.ui:178 msgctxt "tp_AxisPositions|FT_PLACE_LABELS" msgid "_Place labels" -msgstr "" +msgstr "लेबलहरू राख्नुहोस" #: chart2/uiconfig/ui/tp_AxisPositions.ui:194 msgctxt "tp_AxisPositions|LB_PLACE_LABELS" msgid "Near axis" -msgstr "" +msgstr "अक्षको नजिकमा" #: chart2/uiconfig/ui/tp_AxisPositions.ui:195 msgctxt "tp_AxisPositions|LB_PLACE_LABELS" msgid "Near axis (other side)" -msgstr "" +msgstr "अक्षको नजिकमा (अर्को भागमा)" #: chart2/uiconfig/ui/tp_AxisPositions.ui:196 msgctxt "tp_AxisPositions|LB_PLACE_LABELS" msgid "Outside start" -msgstr "" +msgstr "बाहिरि सुरु" #: chart2/uiconfig/ui/tp_AxisPositions.ui:197 msgctxt "tp_AxisPositions|LB_PLACE_LABELS" msgid "Outside end" -msgstr "" +msgstr "बाहिरि अन्त" #: chart2/uiconfig/ui/tp_AxisPositions.ui:221 -#, fuzzy msgctxt "tp_AxisPositions|FT_AXIS_LABEL_DISTANCE" msgid "_Distance" -msgstr "Distance" +msgstr "दूरी" #: chart2/uiconfig/ui/tp_AxisPositions.ui:259 msgctxt "tp_AxisPositions|TXT_FL_LABELS" @@ -2149,7 +2144,6 @@ msgstr "अल्प ग्रिड देखाउनुहोस" #: chart2/uiconfig/ui/tp_AxisPositions.ui:523 -#, fuzzy msgctxt "tp_AxisPositions|PB_MAJOR_GRID" msgid "Mo_re..." msgstr "धेरै..." @@ -2270,7 +2264,6 @@ msgstr "स्वत: पाठ रयाप्" #: chart2/uiconfig/ui/tp_DataLabel.ui:112 -#, fuzzy msgctxt "tp_DataLabel|PB_NUMBERFORMAT" msgid "Number _format..." msgstr "सङ्ख्या ढाँचा..." @@ -2406,25 +2399,21 @@ msgstr "पाठ घुमाउनुहोस्" #: chart2/uiconfig/ui/tp_DataSource.ui:18 -#, fuzzy msgctxt "tp_DataSource|imageIMB_RANGE_CAT|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्" #: chart2/uiconfig/ui/tp_DataSource.ui:24 -#, fuzzy msgctxt "tp_DataSource|imageIMB_RANGE_MAIN|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्" #: chart2/uiconfig/ui/tp_DataSource.ui:60 -#, fuzzy msgctxt "tp_DataSource|FT_SERIES" msgid "Data _series:" -msgstr "डेटा श्रृङ्खला" +msgstr "डेटा श्रृङ्खला:" #: chart2/uiconfig/ui/tp_DataSource.ui:118 -#, fuzzy msgctxt "tp_DataSource|BTN_ADD" msgid "_Add" msgstr "थप्नुहोस्" @@ -2445,10 +2434,9 @@ msgstr "तल" #: chart2/uiconfig/ui/tp_DataSource.ui:211 -#, fuzzy msgctxt "tp_DataSource|FT_ROLE" msgid "_Data ranges:" -msgstr "डेटा दायरा" +msgstr "डेटा दायराहरु:" #: chart2/uiconfig/ui/tp_DataSource.ui:274 msgctxt "tp_DataSource|FT_RANGE" @@ -2456,21 +2444,19 @@ msgstr "" #: chart2/uiconfig/ui/tp_DataSource.ui:329 -#, fuzzy msgctxt "tp_DataSource|FT_CATEGORIES" msgid "_Categories" msgstr "कोटिहरू" #: chart2/uiconfig/ui/tp_DataSource.ui:343 -#, fuzzy msgctxt "tp_DataSource|FT_DATALABELS" msgid "Data _labels" -msgstr "डेटा लेबल" +msgstr "डेटा लेबलहरु" #: chart2/uiconfig/ui/tp_DataSource.ui:416 msgctxt "tp_DataSource|FT_CAPTION_FOR_WIZARD" msgid "Customize Data Ranges for Individual Data Series" -msgstr "" +msgstr "व्यक्तिगत डेटा श्रृङ्खलाका लागि डेटा दायरा अनुकूलन गर्नुहोस्" #: chart2/uiconfig/ui/tp_ErrorBars.ui:57 msgctxt "tp_ErrorBars|RB_NONE" @@ -2480,96 +2466,89 @@ #: chart2/uiconfig/ui/tp_ErrorBars.ui:74 msgctxt "tp_ErrorBars|RB_CONST" msgid "_Constant Value" -msgstr "" +msgstr "अचल मान" #: chart2/uiconfig/ui/tp_ErrorBars.ui:92 msgctxt "tp_ErrorBars|RB_PERCENT" msgid "_Percentage" -msgstr "" +msgstr "प्रतिशत" #: chart2/uiconfig/ui/tp_ErrorBars.ui:135 msgctxt "tp_ErrorBars|liststoreFUNCTION" msgid "Standard Error" -msgstr "" +msgstr "मानक त्रुटि" #: chart2/uiconfig/ui/tp_ErrorBars.ui:136 -#, fuzzy msgctxt "tp_ErrorBars|liststoreFUNCTION" msgid "Standard Deviation" -msgstr "मानक विचलन" +msgstr "स्ट्यान्डर्ड डेभिएसन" #: chart2/uiconfig/ui/tp_ErrorBars.ui:137 -#, fuzzy msgctxt "tp_ErrorBars|liststoreFUNCTION" msgid "Variance" -msgstr "चल" +msgstr "भिन्नता" #: chart2/uiconfig/ui/tp_ErrorBars.ui:138 msgctxt "tp_ErrorBars|liststoreFUNCTION" msgid "Error Margin" -msgstr "" +msgstr "त्रुटिको सीमान्तता" #: chart2/uiconfig/ui/tp_ErrorBars.ui:156 msgctxt "tp_ErrorBars|RB_RANGE" msgid "Cell _Range" -msgstr "" +msgstr "सेल दायरा" #: chart2/uiconfig/ui/tp_ErrorBars.ui:180 msgctxt "tp_ErrorBars|label1" msgid "Error Category" -msgstr "" +msgstr "त्रुटिको वर्ग" #: chart2/uiconfig/ui/tp_ErrorBars.ui:213 msgctxt "tp_ErrorBars|RB_BOTH" msgid "Positive _and Negative" -msgstr "" +msgstr "सकारात्मक र नकारात्मक" #: chart2/uiconfig/ui/tp_ErrorBars.ui:229 -#, fuzzy msgctxt "tp_ErrorBars|RB_POSITIVE" msgid "Pos_itive" -msgstr "स्थिति" +msgstr "सकारात्मक" #: chart2/uiconfig/ui/tp_ErrorBars.ui:246 -#, fuzzy msgctxt "tp_ErrorBars|RB_NEGATIVE" msgid "Ne_gative" -msgstr "तल्लो सूचक" +msgstr "नकारात्मक" #: chart2/uiconfig/ui/tp_ErrorBars.ui:302 msgctxt "tp_ErrorBars|label2" msgid "Error Indicator" -msgstr "" +msgstr "त्रुटि सूचक" #: chart2/uiconfig/ui/tp_ErrorBars.ui:350 msgctxt "tp_ErrorBars|FT_POSITIVE" msgid "P_ositive (+)" -msgstr "" +msgstr "सकारात्मक (+)" #: chart2/uiconfig/ui/tp_ErrorBars.ui:391 -#, fuzzy msgctxt "tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्।" #: chart2/uiconfig/ui/tp_ErrorBars.ui:416 msgctxt "tp_ErrorBars|FT_NEGATIVE" msgid "_Negative (-)" -msgstr "" +msgstr "नकारात्मक (-)" #: chart2/uiconfig/ui/tp_ErrorBars.ui:456 -#, fuzzy msgctxt "tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्" #: chart2/uiconfig/ui/tp_ErrorBars.ui:474 msgctxt "tp_ErrorBars|CB_SYN_POS_NEG" msgid "Same value for both" -msgstr "" +msgstr "दुवैमा एउटै मान" #: chart2/uiconfig/ui/tp_ErrorBars.ui:496 -#, fuzzy msgctxt "tp_ErrorBars|label3" msgid "Parameters" msgstr "परामितिहरू" @@ -2577,12 +2556,12 @@ #: chart2/uiconfig/ui/tp_ErrorBars.ui:513 msgctxt "tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS" msgid "Select Range for Positive Error Bars" -msgstr "" +msgstr "सकारात्मक सूचक त्रुटि पट्टीको लागि दायरा चयन गर्नुहोस" #: chart2/uiconfig/ui/tp_ErrorBars.ui:524 msgctxt "tp_ErrorBars|STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS" msgid "Select Range for Negative Error Bars" -msgstr "" +msgstr "नकारात्मक सूचक त्रुटि पट्टीको लागि दायरा चयन गर्नुहोस" #: chart2/uiconfig/ui/tp_ErrorBars.ui:535 msgctxt "tp_ErrorBars|STR_CONTROLTEXT_ERROR_BARS_FROM_DATA" @@ -2595,19 +2574,16 @@ msgstr "बायाँ" #: chart2/uiconfig/ui/tp_LegendPosition.ui:45 -#, fuzzy msgctxt "tp_LegendPosition|right" msgid "_Right" msgstr "दायाँ" #: chart2/uiconfig/ui/tp_LegendPosition.ui:61 -#, fuzzy msgctxt "tp_LegendPosition|top" msgid "_Top" msgstr "माथि" #: chart2/uiconfig/ui/tp_LegendPosition.ui:77 -#, fuzzy msgctxt "tp_LegendPosition|bottom" msgid "_Bottom" msgstr "तल" @@ -2618,13 +2594,11 @@ msgstr "स्थिति" #: chart2/uiconfig/ui/tp_LegendPosition.ui:134 -#, fuzzy msgctxt "tp_LegendPosition|FT_LEGEND_TEXTDIR" msgid "Te_xt direction" -msgstr "पाठ दिशा (_x)" +msgstr "पाठ दिशा" #: chart2/uiconfig/ui/tp_LegendPosition.ui:163 -#, fuzzy msgctxt "tp_LegendPosition|TXT_ORIENTATION" msgid "Text Orientation" msgstr "पाठ अभिमूखिकरण" @@ -2632,13 +2606,12 @@ #: chart2/uiconfig/ui/tp_PolarOptions.ui:30 msgctxt "tp_PolarOptions|CB_CLOCKWISE" msgid "_Clockwise direction" -msgstr "" +msgstr "घड़ी को दिशा" #: chart2/uiconfig/ui/tp_PolarOptions.ui:46 -#, fuzzy msgctxt "tp_PolarOptions|label1" msgid "Orientation" -msgstr "प्रस्तुति" +msgstr "अभिमूखिकरण" #: chart2/uiconfig/ui/tp_PolarOptions.ui:122 msgctxt "tp_PolarOptions|FT_ROTATION_DEGREES" @@ -2648,60 +2621,57 @@ #: chart2/uiconfig/ui/tp_PolarOptions.ui:141 msgctxt "tp_PolarOptions|label2" msgid "Starting Angle" -msgstr "" +msgstr "सुरुवातको कोण" #: chart2/uiconfig/ui/tp_PolarOptions.ui:168 msgctxt "tp_PolarOptions|CB_INCLUDE_HIDDEN_CELLS_POLAR" msgid "Include _values from hidden cells" -msgstr "" +msgstr "लुकेका कक्षहरूको मान समावेश गर्नुहोस" #: chart2/uiconfig/ui/tp_PolarOptions.ui:184 msgctxt "tp_PolarOptions|label3" msgid "Plot Options" -msgstr "" +msgstr "प्लॉट विकल्पहरु" #: chart2/uiconfig/ui/tp_RangeChooser.ui:8 -#, fuzzy msgctxt "tp_RangeChooser|imageIB_RANGE|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्।" #: chart2/uiconfig/ui/tp_RangeChooser.ui:25 msgctxt "tp_RangeChooser|FT_CAPTION_FOR_WIZARD" msgid "Choose a Data Range" -msgstr "" +msgstr "डेटा दायरा रोज्नुहोस्" #: chart2/uiconfig/ui/tp_RangeChooser.ui:46 -#, fuzzy msgctxt "tp_RangeChooser|FT_RANGE" msgid "_Data range:" -msgstr "डेटा दायरा" +msgstr "डेटा दायरा:" #: chart2/uiconfig/ui/tp_RangeChooser.ui:73 -#, fuzzy msgctxt "tp_RangeChooser|IB_RANGE|tooltip_text" msgid "Select data range" -msgstr "डाटाबेस चयन गर्नुहोस्" +msgstr "डेटा दायरा चयन गर्नुहोस्।" #: chart2/uiconfig/ui/tp_RangeChooser.ui:89 msgctxt "tp_RangeChooser|RB_DATAROWS" msgid "Data series in _rows" -msgstr "" +msgstr "स्तम्भमा डेटा श्रृङ्खला" #: chart2/uiconfig/ui/tp_RangeChooser.ui:105 msgctxt "tp_RangeChooser|RB_DATACOLS" msgid "Data series in _columns" -msgstr "" +msgstr "स्तम्भमा डेटा श्रृङ्खला" #: chart2/uiconfig/ui/tp_RangeChooser.ui:121 msgctxt "tp_RangeChooser|CB_FIRST_ROW_ASLABELS" msgid "_First row as label" -msgstr "" +msgstr "लेबुलको रूपमा पहिलो पङ्क्ति" #: chart2/uiconfig/ui/tp_RangeChooser.ui:136 msgctxt "tp_RangeChooser|CB_FIRST_COLUMN_ASLABELS" msgid "F_irst column as label" -msgstr "" +msgstr "लेबुलको रूपमा पहिलो स्तम्भ" #: chart2/uiconfig/ui/tp_RangeChooser.ui:161 msgctxt "tp_RangeChooser|CB_TIME_BASED" @@ -2726,15 +2696,14 @@ #: chart2/uiconfig/ui/tp_Scale.ui:59 msgctxt "tp_Scale|CBX_REVERSE" msgid "_Reverse direction" -msgstr "" +msgstr "उल्टो दिशा" #: chart2/uiconfig/ui/tp_Scale.ui:75 msgctxt "tp_Scale|CBX_LOGARITHM" msgid "_Logarithmic scale" -msgstr "" +msgstr "लोगारिदमिक मापन" #: chart2/uiconfig/ui/tp_Scale.ui:98 -#, fuzzy msgctxt "tp_Scale|TXT_AXIS_TYPE" msgid "T_ype" msgstr "प्रकार" @@ -2755,19 +2724,16 @@ msgstr "मिति" #: chart2/uiconfig/ui/tp_Scale.ui:149 -#, fuzzy msgctxt "tp_Scale|TXT_MIN" msgid "_Minimum" msgstr "न्यूनतम" #: chart2/uiconfig/ui/tp_Scale.ui:163 -#, fuzzy msgctxt "tp_Scale|TXT_MAX" msgid "Ma_ximum" msgstr "अधिकतम" #: chart2/uiconfig/ui/tp_Scale.ui:175 -#, fuzzy msgctxt "tp_Scale|CBX_AUTO_MIN" msgid "_Automatic" msgstr "स्वचालित" @@ -2778,14 +2744,12 @@ msgstr "स्वचालित" #: chart2/uiconfig/ui/tp_Scale.ui:245 -#, fuzzy msgctxt "tp_Scale|TXT_TIME_RESOLUTION" msgid "R_esolution" msgstr "रिजोल्युसन" #: chart2/uiconfig/ui/tp_Scale.ui:261 chart2/uiconfig/ui/tp_Scale.ui:343 #: chart2/uiconfig/ui/tp_Scale.ui:469 -#, fuzzy msgctxt "tp_Scale|liststoreDATE" msgid "Days" msgstr "दिनहरू" @@ -2803,7 +2767,6 @@ msgstr "वर्ष" #: chart2/uiconfig/ui/tp_Scale.ui:274 -#, fuzzy msgctxt "tp_Scale|CBX_AUTO_TIME_RESOLUTION" msgid "Automat_ic" msgstr "स्वचालित" @@ -2811,10 +2774,9 @@ #: chart2/uiconfig/ui/tp_Scale.ui:304 msgctxt "tp_Scale|TXT_STEP_MAIN" msgid "Ma_jor interval" -msgstr "" +msgstr "मुख्य अन्तराल" #: chart2/uiconfig/ui/tp_Scale.ui:384 -#, fuzzy msgctxt "tp_Scale|CBX_AUTO_STEP_MAIN" msgid "Au_tomatic" msgstr "स्वचालित" @@ -2822,15 +2784,14 @@ #: chart2/uiconfig/ui/tp_Scale.ui:419 msgctxt "tp_Scale|TXT_STEP_HELP" msgid "Minor inter_val" -msgstr "" +msgstr "साधारण अन्तराल" #: chart2/uiconfig/ui/tp_Scale.ui:433 msgctxt "tp_Scale|TXT_STEP_HELP_COUNT" msgid "Minor inter_val count" -msgstr "" +msgstr "साधारण अन्तराल" #: chart2/uiconfig/ui/tp_Scale.ui:482 -#, fuzzy msgctxt "tp_Scale|CBX_AUTO_STEP_HELP" msgid "Aut_omatic" msgstr "स्वचालित" @@ -2838,10 +2799,9 @@ #: chart2/uiconfig/ui/tp_Scale.ui:512 msgctxt "tp_Scale|TXT_ORIGIN" msgid "Re_ference value" -msgstr "" +msgstr "सन्दर्भ मान" #: chart2/uiconfig/ui/tp_Scale.ui:538 -#, fuzzy msgctxt "tp_Scale|CBX_AUTO_ORIGIN" msgid "Automat_ic" msgstr "स्वचालित" @@ -2854,10 +2814,9 @@ #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:42 msgctxt "tp_SeriesToAxis|RBT_OPT_AXIS_1" msgid "Primary Y axis" -msgstr "" +msgstr "प्राथमिक y अक्ष" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:59 -#, fuzzy msgctxt "tp_SeriesToAxis|RBT_OPT_AXIS_2" msgid "Secondary Y axis" msgstr "गौण Y अक्ष" @@ -2865,10 +2824,9 @@ #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:83 msgctxt "tp_SeriesToAxis|label1" msgid "Align Data Series to" -msgstr "" +msgstr "यसमा डेटा शृङ्खला पङ्क्तिबद्ध गर्नुहोस्" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:125 -#, fuzzy msgctxt "tp_SeriesToAxis|FT_GAP" msgid "_Spacing" msgstr "खाली स्थान" @@ -2876,18 +2834,17 @@ #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:138 msgctxt "tp_SeriesToAxis|FT_OVERLAP" msgid "_Overlap" -msgstr "" +msgstr "खप्ट्याउनुहोस्" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:178 msgctxt "tp_SeriesToAxis|CB_BARS_SIDE_BY_SIDE" msgid "Show _bars side by side" -msgstr "" +msgstr "पट्टीको प्रत्येक छेउ देखाउनुहोस्" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:194 -#, fuzzy msgctxt "tp_SeriesToAxis|CB_CONNECTOR" msgid "Connection lines" -msgstr "जडान असफल भयो" +msgstr "जडान रेखाहरू" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:216 msgctxt "tp_SeriesToAxis|label2" @@ -2897,52 +2854,49 @@ #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:257 msgctxt "tp_SeriesToAxis|FT_MISSING_VALUES" msgid "Plot missing values" -msgstr "" +msgstr "प्लॉटको मान हराइरहेको छ" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:267 msgctxt "tp_SeriesToAxis|RB_DONT_PAINT" msgid "_Leave gap" -msgstr "" +msgstr "अन्तर छोड़नु होस" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:283 msgctxt "tp_SeriesToAxis|RB_ASSUME_ZERO" msgid "_Assume zero" -msgstr "" +msgstr "शून्य मान्नुहोस" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:300 msgctxt "tp_SeriesToAxis|RB_CONTINUE_LINE" msgid "_Continue line" -msgstr "" +msgstr "रेखा सुचारु गर्नुहोस" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:330 msgctxt "tp_SeriesToAxis|CB_INCLUDE_HIDDEN_CELLS" msgid "Include _values from hidden cells" -msgstr "" +msgstr "लुकेका कक्षहरूको मान समावेश गर्नुहोस" #: chart2/uiconfig/ui/tp_SeriesToAxis.ui:352 msgctxt "tp_SeriesToAxis|label3" msgid "Plot Options" -msgstr "" +msgstr "प्लॉट विकल्प" #: chart2/uiconfig/ui/tp_Trendline.ui:65 -#, fuzzy msgctxt "tp_Trendline|linear" msgid "_Linear" msgstr "रेखात्मक" #: chart2/uiconfig/ui/tp_Trendline.ui:81 -#, fuzzy msgctxt "tp_Trendline|logarithmic" msgid "L_ogarithmic" -msgstr "लघुगणक" +msgstr "लोगारिदमिक" #: chart2/uiconfig/ui/tp_Trendline.ui:98 msgctxt "tp_Trendline|exponential" msgid "_Exponential" -msgstr "" +msgstr "घातीय" #: chart2/uiconfig/ui/tp_Trendline.ui:115 -#, fuzzy msgctxt "tp_Trendline|power" msgid "Po_wer" msgstr "घात" @@ -2950,18 +2904,17 @@ #: chart2/uiconfig/ui/tp_Trendline.ui:132 msgctxt "tp_Trendline|polynomial" msgid "_Polynomial" -msgstr "" +msgstr "पोलिनोमियल" #: chart2/uiconfig/ui/tp_Trendline.ui:149 msgctxt "tp_Trendline|movingAverage" msgid "_Moving Average" -msgstr "" +msgstr "औसत सार्दैछ" #: chart2/uiconfig/ui/tp_Trendline.ui:173 -#, fuzzy msgctxt "tp_Trendline|label3" msgid "Degree" -msgstr "डिग्रीहरू (_D)" +msgstr "डिग्री" #: chart2/uiconfig/ui/tp_Trendline.ui:209 msgctxt "tp_Trendline|label4" @@ -2971,7 +2924,7 @@ #: chart2/uiconfig/ui/tp_Trendline.ui:316 msgctxt "tp_Trendline|label1" msgid "Regression Type" -msgstr "" +msgstr "रिग्रेसन प्रकार" #: chart2/uiconfig/ui/tp_Trendline.ui:352 msgctxt "tp_Trendline|label7" @@ -2991,12 +2944,12 @@ #: chart2/uiconfig/ui/tp_Trendline.ui:423 msgctxt "tp_Trendline|showEquation" msgid "Show E_quation" -msgstr "" +msgstr "समीकरण देखाउनुहोस" #: chart2/uiconfig/ui/tp_Trendline.ui:439 msgctxt "tp_Trendline|showCorrelationCoefficient" msgid "Show _Coefficient of Determination (R²)" -msgstr "" +msgstr "निर्धारणको (R²) कोफिसियन्ट देखाउनुहोस" #: chart2/uiconfig/ui/tp_Trendline.ui:457 msgctxt "tp_Trendline|label5" @@ -3024,7 +2977,6 @@ msgstr "" #: chart2/uiconfig/ui/tp_axisLabel.ui:62 -#, fuzzy msgctxt "tp_axisLabel|tile" msgid "_Tile" msgstr "शीर्षक" @@ -3032,12 +2984,12 @@ #: chart2/uiconfig/ui/tp_axisLabel.ui:79 msgctxt "tp_axisLabel|odd" msgid "St_agger odd" -msgstr "" +msgstr "बिजोर बनाउनुहोस्" #: chart2/uiconfig/ui/tp_axisLabel.ui:96 msgctxt "tp_axisLabel|even" msgid "Stagger _even" -msgstr "" +msgstr "जोर स्ट्यागर" #: chart2/uiconfig/ui/tp_axisLabel.ui:113 msgctxt "tp_axisLabel|auto" @@ -3052,7 +3004,7 @@ #: chart2/uiconfig/ui/tp_axisLabel.ui:171 msgctxt "tp_axisLabel|overlapCB" msgid "O_verlap" -msgstr "" +msgstr "खप्ट्याउनुहोस्" #: chart2/uiconfig/ui/tp_axisLabel.ui:187 msgctxt "tp_axisLabel|breakCB" @@ -3065,47 +3017,41 @@ msgstr "पाठ प्रवाह" #: chart2/uiconfig/ui/tp_axisLabel.ui:276 -#, fuzzy msgctxt "tp_axisLabel|degreeL" msgid "_Degrees" -msgstr "डिग्रीहरू (_D)" +msgstr "डिग्रीहरू" #: chart2/uiconfig/ui/tp_axisLabel.ui:336 msgctxt "tp_axisLabel|stackedCB" msgid "Ve_rtically stacked" -msgstr "" +msgstr "ठाडो रूपमा राखिएको थाक" #: chart2/uiconfig/ui/tp_axisLabel.ui:353 msgctxt "tp_axisLabel|labelABCD" msgid "ABCD" -msgstr "" +msgstr "ABCD" #: chart2/uiconfig/ui/tp_axisLabel.ui:370 -#, fuzzy msgctxt "tp_axisLabel|textdirL" msgid "Te_xt direction:" -msgstr "पाठ दिशा (_x)" +msgstr "पाठ दिशा" #: chart2/uiconfig/ui/tp_axisLabel.ui:397 -#, fuzzy msgctxt "tp_axisLabel|labelTextOrient" msgid "Text Orientation" msgstr "पाठ अभिमूखिकरण" #: chart2/uiconfig/ui/wizelementspage.ui:39 -#, fuzzy msgctxt "wizelementspage|labelPrimaryXaxis" msgid "_X axis" msgstr "X अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:53 -#, fuzzy msgctxt "wizelementspage|labelPrimaryYaxis" msgid "_Y axis" msgstr "Y अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:67 -#, fuzzy msgctxt "wizelementspage|labelPrimaryZaxis" msgid "_Z axis" msgstr "Z अक्ष" @@ -3116,19 +3062,16 @@ msgstr "शीर्षक" #: chart2/uiconfig/ui/wizelementspage.ui:131 -#, fuzzy msgctxt "wizelementspage|labelSubTitle" msgid "_Subtitle" msgstr "उप-शीर्षक" #: chart2/uiconfig/ui/wizelementspage.ui:169 -#, fuzzy msgctxt "wizelementspage|labelSecondaryXAxis" msgid "X _axis" msgstr "X अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:183 -#, fuzzy msgctxt "wizelementspage|labelSecondaryYAxis" msgid "Y ax_is" msgstr "Y अक्ष" @@ -3136,7 +3079,7 @@ #: chart2/uiconfig/ui/wizelementspage.ui:230 msgctxt "wizelementspage|show" msgid "_Display legend" -msgstr "" +msgstr "लेजेन्ड प्रदर्शन गर्नुहोस्" #: chart2/uiconfig/ui/wizelementspage.ui:255 msgctxt "wizelementspage|left" @@ -3144,19 +3087,16 @@ msgstr "बायाँ" #: chart2/uiconfig/ui/wizelementspage.ui:271 -#, fuzzy msgctxt "wizelementspage|right" msgid "_Right" msgstr "दायाँ" #: chart2/uiconfig/ui/wizelementspage.ui:287 -#, fuzzy msgctxt "wizelementspage|top" msgid "_Top" msgstr "माथि" #: chart2/uiconfig/ui/wizelementspage.ui:303 -#, fuzzy msgctxt "wizelementspage|bottom" msgid "_Bottom" msgstr "तल" @@ -3164,28 +3104,24 @@ #: chart2/uiconfig/ui/wizelementspage.ui:339 msgctxt "wizelementspage|Axe" msgid "Choose Titles, Legend, and Grid Settings" -msgstr "" +msgstr "शीर्षक, लेजेन्ड, र ग्रिड सेटिङ रोज्नुहोस्" #: chart2/uiconfig/ui/wizelementspage.ui:372 -#, fuzzy msgctxt "wizelementspage|x" msgid "X axis" msgstr "X अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:387 -#, fuzzy msgctxt "wizelementspage|y" msgid "Y ax_is" msgstr "Y अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:402 -#, fuzzy msgctxt "wizelementspage|z" msgid "Z axi_s" msgstr "Z अक्ष" #: chart2/uiconfig/ui/wizelementspage.ui:423 -#, fuzzy msgctxt "wizelementspage|label2" msgid "Display Grids" msgstr "ग्रिड प्रदर्शन गर्नुहोस्" diff -Nru libreoffice-6.2.2/translations/source/ne/connectivity/messages.po libreoffice-6.2.3/translations/source/ne/connectivity/messages.po --- libreoffice-6.2.2/translations/source/ne/connectivity/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/connectivity/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2018-09-03 13:23+0200\n" -"PO-Revision-Date: 2018-07-22 03:31+0000\n" -"Last-Translator: Saroj Dhakal \n" +"PO-Revision-Date: 2019-03-25 18:14+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1532230303.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553537653.000000\n" #. = the mozab driver's resource strings #: connectivity/inc/strings.hrc:26 @@ -283,7 +283,7 @@ #: connectivity/inc/strings.hrc:80 msgctxt "STR_COULD_NOT_CREATE_INDEX_NAME" msgid "The index could not be created. The file '$filename$' is used by another index." -msgstr "" +msgstr "अनुक्रमणिका सिर्जना गर्न सकिन्न। फाइल '$filename$' अर्को अनुक्रमणिका द्वारा प्रयोग भएको छ।" #: connectivity/inc/strings.hrc:81 msgctxt "STR_COULD_NOT_CREATE_INDEX_KEYSIZE" diff -Nru libreoffice-6.2.2/translations/source/ne/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess.po libreoffice-6.2.3/translations/source/ne/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess.po --- libreoffice-6.2.2/translations/source/ne/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/connectivity/registry/mysqlc/org/openoffice/Office/DataAccess.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,14 +4,17 @@ "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: 2018-10-02 17:57+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-03-22 12:42+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553258570.000000\n" #: Drivers.xcu msgctxt "" @@ -20,4 +23,4 @@ "DriverTypeDisplayName\n" "value.text" msgid "MySQL Connector" -msgstr "" +msgstr "MySQL जडानकर्ता" diff -Nru libreoffice-6.2.2/translations/source/ne/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po libreoffice-6.2.3/translations/source/ne/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po --- libreoffice-6.2.2/translations/source/ne/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/connectivity/registry/mysql_jdbc/org/openoffice/Office/DataAccess.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,14 +4,17 @@ "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: 2018-10-21 20:58+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2019-03-22 12:42+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" +"Language: ne\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553258567.000000\n" #: Drivers.xcu msgctxt "" @@ -20,7 +23,7 @@ "DriverTypeDisplayName\n" "value.text" msgid "MySQL (JDBC)" -msgstr "" +msgstr "MySQL (JDBC)" #: Drivers.xcu msgctxt "" @@ -29,7 +32,7 @@ "DriverTypeDisplayName\n" "value.text" msgid "MySQL (ODBC)" -msgstr "" +msgstr "MySQL (ODBC)" #: Drivers.xcu msgctxt "" @@ -38,4 +41,4 @@ "DriverTypeDisplayName\n" "value.text" msgid "MySQL (Native)" -msgstr "" +msgstr "MySQL (Native)" diff -Nru libreoffice-6.2.2/translations/source/ne/cui/messages.po libreoffice-6.2.3/translations/source/ne/cui/messages.po --- libreoffice-6.2.2/translations/source/ne/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2018-11-14 11:42+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-31 03:20+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1542195771.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1554002428.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -240,10 +240,9 @@ msgstr "सबैलाई हो" #: cui/inc/strings.hrc:58 -#, fuzzy msgctxt "RID_SXVSTR_CONFIRM_DELETE_TOOLBAR" msgid "There are no more commands on the toolbar. Do you want to delete the toolbar?" -msgstr "उपकरण-पट्टीमा अरू कुनै आदेशहरू छैन । के तपाईँ यो उपकरण-पट्टी मेटाउन चाहनु हुन्छ ?" +msgstr "उपकरण-पट्टीमा अरू कुनै आदेशहरू छैन । के तपाईँ यो उपकरण-पट्टी मेटाउन चाहनु हुन्छ?" #. Translators: Do not translate %SAVE IN SELECTION% It is a placeholder #. and will be replaced at runtime by the name of the selected application @@ -251,24 +250,22 @@ #: cui/inc/strings.hrc:63 msgctxt "RID_SVXSTR_CONFIRM_MENU_RESET" msgid "The menu configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?" -msgstr "" +msgstr "%SAVE IN SELECTION% को लागि मेनु कन्फिगरेसन र्निर्धरित सेटिङमा रिसेट हुनेछ । के तपाईँ जारी राख्नु चाहनु हुन्छ ?" #: cui/inc/strings.hrc:64 msgctxt "RID_SVXSTR_CONFIRM_TOOLBAR_RESET" msgid "The toolbar configuration for %SAVE IN SELECTION% will be reset to the default settings. Do you want to continue?" -msgstr "" +msgstr "%SAVE IN SELECTION% को लागि उपकरण-पट्टी कन्फिगरेसन स्वत सेटिङमा रिसेट हुनेछ। के तपाईँ जारी राख्नु चाहनु हुन्छ?" #: cui/inc/strings.hrc:65 -#, fuzzy msgctxt "RID_SVXSTR_CONFIRM_RESTORE_DEFAULT" msgid "This will delete all changes previously made to this toolbar. Do you really want to reset the toolbar?" -msgstr "यसले उपकरण-पट्टीमा अघि गरिएको सबै परिवर्तनहरू मेटाउनेछ । के तपाईँ साच्चै उपकरण-पट्टी रिसेट गर्नु चाहनु हुन्छ ?" +msgstr "यसले उपकरण-पट्टीमा अघि गरिएको सबै परिवर्तनहरू मेटाउनेछ। के तपाईँ साच्चै उपकरण-पट्टी रिसेट गर्नु चाहनु हुन्छ?" #: cui/inc/strings.hrc:66 -#, fuzzy msgctxt "RID_SVXSTR_CONFIRM_RESTORE_DEFAULT_MENU" msgid "This will delete all changes previously made to this context menu. Do you really want to reset?" -msgstr "यसले उपकरण-पट्टीमा अघि गरिएको सबै परिवर्तनहरू मेटाउनेछ । के तपाईँ साच्चै उपकरण-पट्टी रिसेट गर्नु चाहनु हुन्छ ?" +msgstr "यसले उपकरण-पट्टीमा अघि गरिएको सबै परिवर्तनहरू मेटाउनेछ। के तपाईँ साच्चै उपकरण-पट्टी रिसेट गर्नु चाहनु हुन्छ?" #: cui/inc/strings.hrc:67 msgctxt "RID_SVXSTR_MNUCFG_ALREADY_INCLUDED" @@ -333,7 +330,7 @@ #: cui/inc/strings.hrc:80 msgctxt "RID_SVXSTR_HYPERDLG_HLMAILTP_HELP" msgid "This is where you create a hyperlink to an e-mail address." -msgstr "" +msgstr "यहाँ तपाईँले इमेल ठेगानाका लागि हाइपरलिङ्क बनाउनुहोस्।" #: cui/inc/strings.hrc:81 msgctxt "RID_SVXSTR_HYPERDLG_HLDOCTP" @@ -450,7 +447,7 @@ #: cui/inc/strings.hrc:106 msgctxt "RID_SVXSTR_PPI" msgid "(%1 PPI)" -msgstr "" +msgstr "(%1 PPI)" #: cui/inc/strings.hrc:107 msgctxt "RID_SVXSTR_COL" @@ -481,12 +478,12 @@ #: cui/inc/strings.hrc:113 msgctxt "RID_SVXSTR_LOADACCELCONFIG" msgid "Load Keyboard Configuration" -msgstr "" +msgstr "कीबोर्डको विन्यास लोड गर्नुहोस्" #: cui/inc/strings.hrc:114 msgctxt "RID_SVXSTR_SAVEACCELCONFIG" msgid "Save Keyboard Configuration" -msgstr "" +msgstr "कीबोर्डको विन्यास बचत गर्नुहोस्" #: cui/inc/strings.hrc:115 msgctxt "RID_SVXSTR_FILTERNAME_CFG" @@ -506,7 +503,7 @@ #: cui/inc/strings.hrc:118 msgctxt "RID_SVXSTR_EDITHINT" msgid "[Enter text here]" -msgstr "" +msgstr "[यहाँ पाठ प्रविष्टि गर्नुहोस्]" #: cui/inc/strings.hrc:119 msgctxt "RID_SVXSTR_HANGUL" @@ -891,7 +888,7 @@ #: cui/inc/strings.hrc:197 msgctxt "RID_STR_SEARCH_END" msgid "end of field" -msgstr "" +msgstr "फाँटको अन्त्य" #: cui/inc/strings.hrc:198 msgctxt "RID_STR_SEARCH_WHOLE" @@ -899,10 +896,9 @@ msgstr "पूरा फाँट" #: cui/inc/strings.hrc:199 -#, fuzzy msgctxt "RID_STR_FROM_TOP" msgid "From top" -msgstr "माथिबाट" +msgstr "माथि बाट" #: cui/inc/strings.hrc:200 msgctxt "RID_STR_FROM_BOTTOM" @@ -932,17 +928,17 @@ #: cui/inc/strings.hrc:205 msgctxt "RID_STR_SEARCH_COUNTING" msgid "counting records" -msgstr "" +msgstr "रेकर्ड्सहरु गन्दै" #: cui/inc/strings.hrc:207 msgctxt "RID_SVXSTR_GALLERY_NOFILES" msgid "" -msgstr "" +msgstr "" #: cui/inc/strings.hrc:208 msgctxt "RID_SVXSTR_GALLERYPROPS_OBJECT" msgid "Object;Objects" -msgstr "" +msgstr "Object;Objects" #: cui/inc/strings.hrc:209 msgctxt "RID_SVXSTR_GALLERY_READONLY" @@ -952,7 +948,7 @@ #: cui/inc/strings.hrc:210 msgctxt "RID_SVXSTR_GALLERY_ALLFILES" msgid "" -msgstr "" +msgstr "" #: cui/inc/strings.hrc:211 msgctxt "RID_SVXSTR_GALLERY_ID_EXISTS" @@ -967,12 +963,12 @@ #: cui/inc/strings.hrc:214 msgctxt "RID_SVXSTR_ARCHIVE_TITLE" msgid "Select Archives" -msgstr "" +msgstr "अभिलेखहरु चयन गर्नुहोस्" #: cui/inc/strings.hrc:215 msgctxt "RID_SVXSTR_ARCHIVE_HEADLINE" msgid "Archives" -msgstr "" +msgstr "अभिलेखहरु" #: cui/inc/strings.hrc:216 msgctxt "RID_SVXSTR_MULTIFILE_DBL_ERR" @@ -982,12 +978,12 @@ #: cui/inc/strings.hrc:217 msgctxt "RID_SVXSTR_ADD_IMAGE" msgid "Add Image" -msgstr "" +msgstr "तस्बिर थप्नुहोस" #: cui/inc/strings.hrc:219 msgctxt "RID_SVXSTR_ONE_PASSWORD_MISMATCH" msgid "The confirmation password did not match the password. Set the password again by entering the same password in both boxes." -msgstr "" +msgstr "पुष्टि गरेको पासवर्ड र पासवर्ड मिलेन्न । पासवर्ड सेट गर्न लागि फेरि दुवै बक्सामा समान पासवर्ड प्रविष्ट गर्नुहोस्।" #: cui/inc/strings.hrc:220 msgctxt "RID_SVXSTR_TWO_PASSWORDS_MISMATCH" @@ -1017,7 +1013,7 @@ #: cui/inc/strings.hrc:226 msgctxt "STR_BROKENLINK" msgid "Not available" -msgstr "" +msgstr "उपलब्ध छैन" #: cui/inc/strings.hrc:227 msgctxt "STR_CLOSELINKMSG" @@ -1043,22 +1039,22 @@ #: cui/inc/strings.hrc:234 msgctxt "RID_SVXSTR_DIAGRAM_ROW" msgid "Data Series $(ROW)" -msgstr "" +msgstr "डेटा श्रृंखला $(ROW)" #: cui/inc/strings.hrc:236 msgctxt "RID_SVXSTR_DRIVER_NAME" msgid "Driver name" -msgstr "" +msgstr "ड्राईभरको नाम" #: cui/inc/strings.hrc:237 msgctxt "RID_SVXSTR_POOLED_FLAG" msgid "Pool" -msgstr "" +msgstr "पूल" #: cui/inc/strings.hrc:238 msgctxt "RID_SVXSTR_POOL_TIMEOUT" msgid "Timeout" -msgstr "" +msgstr "समय सकियो" #: cui/inc/strings.hrc:239 msgctxt "RID_SVXSTR_YES" @@ -1186,10 +1182,9 @@ msgstr "%LANGUAGENAME लिपि %SCRIPTNAME चलिरहदा एउटा त्रुटि उत्पन्न भयो ।" #: cui/inc/strings.hrc:263 -#, fuzzy msgctxt "RID_SVXSTR_ERROR_TYPE_LABEL" msgid "Type:" -msgstr "प्रकार" +msgstr "प्रकार:" #: cui/inc/strings.hrc:264 msgctxt "RID_SVXSTR_ERROR_MESSAGE_LABEL" @@ -1199,25 +1194,24 @@ #: cui/inc/strings.hrc:266 msgctxt "RID_SVXSTR_TYPE" msgid "Registered name" -msgstr "" +msgstr "दर्ता गरिएको नाम" #: cui/inc/strings.hrc:267 -#, fuzzy msgctxt "RID_SVXSTR_PATH" msgid "Database file" -msgstr "डाटाबेस फाँट" +msgstr "डाटाबेस फाइल" #. abbreviation for "[Load]" #: cui/inc/strings.hrc:270 msgctxt "RID_SVXSTR_HEADER1" msgid "[L]" -msgstr "" +msgstr "[L]" #. abbreviation for "[Save]" #: cui/inc/strings.hrc:272 msgctxt "RID_SVXSTR_HEADER2" msgid "[S]" -msgstr "" +msgstr "[S]" #: cui/inc/strings.hrc:273 msgctxt "RID_SVXSTR_CHG_MATH" @@ -1271,10 +1265,9 @@ msgstr "" #: cui/inc/strings.hrc:295 -#, fuzzy msgctxt "STR_MODIFY" msgid "~Replace" -msgstr "प्रतिस्थापन गर्नुहोस्" +msgstr "बदल्नुहोस्" #: cui/inc/strings.hrc:296 msgctxt "RID_SVXSTR_CONFIRM_SET_LANGUAGE" @@ -1294,12 +1287,12 @@ #: cui/inc/strings.hrc:300 msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE1" msgid "Save scheme" -msgstr "" +msgstr "योजना बचत गर्नुहोस्" #: cui/inc/strings.hrc:301 msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE2" msgid "Name of color scheme" -msgstr "" +msgstr "रङ योजनाको नाम" #: cui/inc/strings.hrc:303 msgctxt "RID_SVXSTR_SPELL" @@ -1324,22 +1317,22 @@ #: cui/inc/strings.hrc:307 msgctxt "RID_SVXSTR_CAPITAL_WORDS" msgid "Check uppercase words" -msgstr "" +msgstr "ठुला बर्णका शव्दहरू जाँच गर्नुहोस" #: cui/inc/strings.hrc:308 msgctxt "RID_SVXSTR_WORDS_WITH_DIGITS" msgid "Check words with numbers " -msgstr "" +msgstr "शव्दहरू सङ्ख्या सँग जाँच गर्नुहोस।" #: cui/inc/strings.hrc:309 msgctxt "RID_SVXSTR_SPELL_SPECIAL" msgid "Check special regions" -msgstr "" +msgstr "विशेष क्षेत्रहरू जाँच गर्नुहोस" #: cui/inc/strings.hrc:310 msgctxt "RID_SVXSTR_SPELL_AUTO" msgid "Check spelling as you type" -msgstr "" +msgstr "तपाईँंले टाइप गर्नासाथ हिज्जे जाँच गर्नुहोस" #: cui/inc/strings.hrc:311 msgctxt "RID_SVXSTR_GRAMMAR_AUTO" @@ -1349,27 +1342,27 @@ #: cui/inc/strings.hrc:312 msgctxt "RID_SVXSTR_NUM_MIN_WORDLEN" msgid "Minimal number of characters for hyphenation: " -msgstr "" +msgstr "योजक चिन्ह राख्ने कामका लागि क्यारेक्टरहरूको न्यूनतम सङ्ख्या:" #: cui/inc/strings.hrc:313 msgctxt "RID_SVXSTR_NUM_PRE_BREAK" msgid "Characters before line break: " -msgstr "" +msgstr "हरफ विच्छेदन अगाडि क्यारेक्टरहरू:" #: cui/inc/strings.hrc:314 msgctxt "RID_SVXSTR_NUM_POST_BREAK" msgid "Characters after line break: " -msgstr "" +msgstr "हरफ विच्छेदन पछाडी क्यारेक्टरहरू:" #: cui/inc/strings.hrc:315 msgctxt "RID_SVXSTR_HYPH_AUTO" msgid "Hyphenate without inquiry" -msgstr "" +msgstr "सोधपुछ बिना योजक चिन्ह राख्नुहोस" #: cui/inc/strings.hrc:316 msgctxt "RID_SVXSTR_HYPH_SPECIAL" msgid "Hyphenate special regions" -msgstr "" +msgstr "विशेष क्षेत्रहरू जाँच गर्नुहोस" #: cui/inc/strings.hrc:318 msgctxt "RID_SVXSTR_JRE_NOT_RECOGNIZED" @@ -1393,7 +1386,7 @@ #: cui/inc/strings.hrc:321 msgctxt "RID_SVXSTR_JAVA_START_PARAM" msgid "Edit Parameter" -msgstr "" +msgstr "परिमिति सम्पादन गर्नुहोस्" #: cui/inc/strings.hrc:323 msgctxt "RID_SVXSTR_OPT_PROXYPORTS" @@ -1422,10 +1415,9 @@ msgstr "नयाँ एरोहेड लागि एउटा नयाँ नाम प्रविष्ट गर्नुहोस्" #: cui/inc/strings.hrc:328 -#, fuzzy msgctxt "RID_SVXSTR_DESC_NEW_PATTERN" msgid "Please enter a name for the pattern:" -msgstr "नयाँ एरोहेड लागि एउटा नयाँ नाम प्रविष्ट गर्नुहोस्" +msgstr "कृपया ढाँचाको लागि नाम प्रविष्ट गर्नुहोस्:" #: cui/inc/strings.hrc:329 msgctxt "RID_SVXSTR_DESC_LINESTYLE" @@ -1445,7 +1437,6 @@ msgstr "नयाँ एरोहेड लागि एउटा नयाँ नाम प्रविष्ट गर्नुहोस्" #: cui/inc/strings.hrc:332 -#, fuzzy msgctxt "RID_SVXSTR_CHANGE" msgid "Modify" msgstr "परिमार्जन गर्नुहोस्" @@ -1473,54 +1464,47 @@ #: cui/inc/strings.hrc:337 msgctxt "RID_SVXSTR_CHARNAME_NOSTYLE" msgid "No %1" -msgstr "" +msgstr "No %1" #: cui/inc/strings.hrc:338 -#, fuzzy msgctxt "RID_SVXSTR_CHARNAME_FAMILY" msgid "Family:" -msgstr "तामिल" +msgstr "परिवार:" #: cui/inc/strings.hrc:339 -#, fuzzy msgctxt "RID_SVXSTR_CHARNAME_FONT" msgid "Font:" msgstr "फन्ट" #: cui/inc/strings.hrc:340 -#, fuzzy msgctxt "RID_SVXSTR_CHARNAME_STYLE" msgid "Style:" msgstr "शैली" #: cui/inc/strings.hrc:341 -#, fuzzy msgctxt "RID_SVXSTR_CHARNAME_TYPEFACE" msgid "Typeface:" -msgstr "टाइप मोहडा" +msgstr "टाइपफेस:" #: cui/inc/strings.hrc:342 msgctxt "RID_SVXSTR_CHARNAME_HIGHLIGHTING" msgid "Highlight Color" -msgstr "" +msgstr "रंग हाइलाइट गर्ने" #: cui/inc/strings.hrc:343 -#, fuzzy msgctxt "RID_SVXSTR_USE_REPLACE" msgid "Use replacement table" -msgstr "प्रतिस्थापन तालिका प्रयोग गर्नुहोस् " +msgstr "प्रतिस्थापन तालिका प्रयोग गर्नुहोस्" #: cui/inc/strings.hrc:344 -#, fuzzy msgctxt "RID_SVXSTR_CPTL_STT_WORD" msgid "Correct TWo INitial CApitals" msgstr "दुई प्रारम्भिक ठूला अक्षरहरू ठीक गर्नुहोस्" #: cui/inc/strings.hrc:345 -#, fuzzy msgctxt "RID_SVXSTR_CPTL_STT_SENT" msgid "Capitalize first letter of every sentence" -msgstr "वाक्यहरूको पहिलो अक्षर ठूलो बनाउनुहोस्" +msgstr "प्रत्येक वाक्यको पहिलो अक्षर ठूलो लेख्नुहोस्" #: cui/inc/strings.hrc:346 msgctxt "RID_SVXSTR_BOLD_UNDER" @@ -1530,7 +1514,7 @@ #: cui/inc/strings.hrc:347 msgctxt "RID_SVXSTR_NO_DBL_SPACES" msgid "Ignore double spaces" -msgstr "" +msgstr "डबल खाली स्थानहरू वेवास्ता गर्नुहोस्" #: cui/inc/strings.hrc:348 #, fuzzy @@ -1539,7 +1523,6 @@ msgstr "URL मान्यता" #: cui/inc/strings.hrc:349 -#, fuzzy msgctxt "RID_SVXSTR_DASH" msgid "Replace dashes" msgstr "ड्यासहरू बदल्नुहोस्" @@ -1560,16 +1543,14 @@ msgstr "" #: cui/inc/strings.hrc:353 -#, fuzzy msgctxt "RID_SVXSTR_DEL_EMPTY_PARA" msgid "Remove blank paragraphs" msgstr "खाली अनुच्छेदहरू हटाउनुहोस्" #: cui/inc/strings.hrc:354 -#, fuzzy msgctxt "RID_SVXSTR_USER_STYLE" msgid "Replace Custom Styles" -msgstr "शैलीहरू अनुकूलन बदल्नुहोस्" +msgstr "कस्टम शैलीहरू बदल्नुहोस्" #: cui/inc/strings.hrc:355 msgctxt "RID_SVXSTR_BULLET" @@ -1590,7 +1571,7 @@ #: cui/inc/strings.hrc:359 msgctxt "RID_SVXSTR_BORDER" msgid "Apply border" -msgstr "" +msgstr "किनारा लागू गर्नुहोस्" #: cui/inc/strings.hrc:360 msgctxt "RID_SVXSTR_CREATE_TABLE" @@ -1625,12 +1606,12 @@ #: cui/inc/strings.hrc:366 msgctxt "RID_SVXSTR_STARTQUOTE" msgid "Start Quote" -msgstr "" +msgstr "सुरु उद्धरण" #: cui/inc/strings.hrc:367 msgctxt "RID_SVXSTR_ENDQUOTE" msgid "End Quote" -msgstr "" +msgstr "अन्त्य उद्धरण" #: cui/inc/strings.hrc:369 #, fuzzy @@ -1641,7 +1622,7 @@ #: cui/inc/strings.hrc:370 msgctxt "RID_SVXSTR_SEARCHING" msgid "Searching, please wait..." -msgstr "" +msgstr "खोज्दै, कृपया पर्खनुहोस् ..." #: cui/inc/strings.hrc:371 msgctxt "RID_SVXSTR_SEARCHERROR" @@ -1804,27 +1785,27 @@ #: cui/inc/treeopt.hrc:38 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "Personalization" -msgstr "" +msgstr "निजीकरण" #: cui/inc/treeopt.hrc:39 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "Application Colors" -msgstr "" +msgstr "अनुप्रयोग रंगहरु" #: cui/inc/treeopt.hrc:40 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "Accessibility" -msgstr "" +msgstr "पहुँचता" #: cui/inc/treeopt.hrc:41 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "Advanced" -msgstr "" +msgstr "उन्नत" #: cui/inc/treeopt.hrc:42 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "Basic IDE" -msgstr "" +msgstr "साधारण IDE" #: cui/inc/treeopt.hrc:43 msgctxt "SID_GENERAL_OPTIONS_RES" @@ -1834,12 +1815,12 @@ #: cui/inc/treeopt.hrc:44 msgctxt "SID_GENERAL_OPTIONS_RES" msgid "OpenCL" -msgstr "" +msgstr "OpenCL" #: cui/inc/treeopt.hrc:49 msgctxt "SID_LANGUAGE_OPTIONS_RES" msgid "Language Settings" -msgstr "" +msgstr "भाषा सेटिङ" #: cui/inc/treeopt.hrc:50 #, fuzzy @@ -1850,12 +1831,12 @@ #: cui/inc/treeopt.hrc:51 msgctxt "SID_LANGUAGE_OPTIONS_RES" msgid "Writing Aids" -msgstr "" +msgstr "लेखाइ सहयोगहरू" #: cui/inc/treeopt.hrc:52 msgctxt "SID_LANGUAGE_OPTIONS_RES" msgid "Searching in Japanese" -msgstr "" +msgstr "जापानीमा खोजी गरिदै" #: cui/inc/treeopt.hrc:53 msgctxt "SID_LANGUAGE_OPTIONS_RES" @@ -1865,7 +1846,7 @@ #: cui/inc/treeopt.hrc:54 msgctxt "SID_LANGUAGE_OPTIONS_RES" msgid "Complex Text Layout" -msgstr "" +msgstr "जटिल पाठ लेआउट" #: cui/inc/treeopt.hrc:59 msgctxt "SID_INET_DLG_RES" @@ -1875,7 +1856,7 @@ #: cui/inc/treeopt.hrc:60 msgctxt "SID_INET_DLG_RES" msgid "Proxy" -msgstr "" +msgstr "प्रोक्सि" #: cui/inc/treeopt.hrc:61 msgctxt "SID_INET_DLG_RES" @@ -1902,7 +1883,7 @@ #: cui/inc/treeopt.hrc:69 msgctxt "SID_SW_EDITOPTIONS_RES" msgid "Formatting Aids" -msgstr "" +msgstr "ढाँचा सहायताहरू" #: cui/inc/treeopt.hrc:70 msgctxt "SID_SW_EDITOPTIONS_RES" @@ -1943,7 +1924,7 @@ #: cui/inc/treeopt.hrc:77 msgctxt "SID_SW_EDITOPTIONS_RES" msgid "Comparison" -msgstr "" +msgstr "तुलना" #: cui/inc/treeopt.hrc:78 #, fuzzy @@ -1978,7 +1959,7 @@ #: cui/inc/treeopt.hrc:87 msgctxt "SID_SW_ONLINEOPTIONS_RES" msgid "Formatting Aids" -msgstr "" +msgstr "ढाँचा सहायताहरू" #: cui/inc/treeopt.hrc:88 msgctxt "SID_SW_ONLINEOPTIONS_RES" @@ -2048,7 +2029,7 @@ #: cui/inc/treeopt.hrc:108 msgctxt "SID_SC_EDITOPTIONS_RES" msgid "Sort Lists" -msgstr "" +msgstr "सूचीहरू क्रमबद्ध गर्नुहोस" #: cui/inc/treeopt.hrc:109 #, fuzzy @@ -2134,7 +2115,7 @@ #: cui/inc/treeopt.hrc:136 msgctxt "SID_SCH_EDITOPTIONS_RES" msgid "Default Colors" -msgstr "" +msgstr "पूर्वनिर्धारित रङहरू" #: cui/inc/treeopt.hrc:141 msgctxt "SID_FILTER_DLG_RES" @@ -2149,7 +2130,7 @@ #: cui/inc/treeopt.hrc:143 msgctxt "SID_FILTER_DLG_RES" msgid "VBA Properties" -msgstr "" +msgstr "VBA गुणहरू" #: cui/inc/treeopt.hrc:144 msgctxt "SID_FILTER_DLG_RES" @@ -2188,27 +2169,27 @@ #: cui/inc/twolines.hrc:25 msgctxt "twolinespage|liststore1" msgid "(" -msgstr "" +msgstr "(" #: cui/inc/twolines.hrc:26 msgctxt "twolinespage|liststore1" msgid "[" -msgstr "" +msgstr "[" #: cui/inc/twolines.hrc:27 msgctxt "twolinespage|liststore1" msgid "<" -msgstr "" +msgstr "<" #: cui/inc/twolines.hrc:28 msgctxt "twolinespage|liststore1" msgid "{" -msgstr "" +msgstr "{" #: cui/inc/twolines.hrc:29 msgctxt "twolinespage|liststore1" msgid "Other Characters..." -msgstr "" +msgstr "अन्य क्यारेक्टरहरू..." #: cui/inc/twolines.hrc:34 msgctxt "twolinespage|liststore2" @@ -2218,39 +2199,37 @@ #: cui/inc/twolines.hrc:35 msgctxt "twolinespage|liststore2" msgid ")" -msgstr "" +msgstr ")" #: cui/inc/twolines.hrc:36 msgctxt "twolinespage|liststore2" msgid "]" -msgstr "" +msgstr "]" #: cui/inc/twolines.hrc:37 msgctxt "twolinespage|liststore2" msgid ">" -msgstr "" +msgstr ">" #: cui/inc/twolines.hrc:38 msgctxt "twolinespage|liststore2" msgid "}" -msgstr "" +msgstr "}" #: cui/inc/twolines.hrc:39 msgctxt "twolinespage|liststore2" msgid "Other Characters..." -msgstr "" +msgstr "अन्य क्यारेक्टरहरू..." #: cui/uiconfig/ui/aboutconfigdialog.ui:9 -#, fuzzy msgctxt "aboutconfigdialog|AboutConfig" msgid "Expert Configuration" -msgstr "प्रयोगकर्ता कन्फिगरेसन" +msgstr "विशेषज्ञ कन्फिगरेसन" #: cui/uiconfig/ui/aboutconfigdialog.ui:49 -#, fuzzy msgctxt "aboutconfigdialog|searchButton" msgid "_Search" -msgstr "खोज गर्नुहोस्" +msgstr "खोजी" #: cui/uiconfig/ui/aboutconfigdialog.ui:82 msgctxt "aboutconfigdialog|preference" @@ -2288,15 +2267,14 @@ msgstr "नाम" #: cui/uiconfig/ui/aboutconfigvaluedialog.ui:87 -#, fuzzy msgctxt "aboutconfigvaluedialog|label1" msgid "Value:" -msgstr "मान" +msgstr "मान:" #: cui/uiconfig/ui/aboutdialog.ui:6 msgctxt "aboutdialog|textbuffer1" msgid "Version: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX" -msgstr "" +msgstr "संस्करण: %ABOUTBOXPRODUCTVERSION%ABOUTBOXPRODUCTVERSIONSUFFIX" #: cui/uiconfig/ui/aboutdialog.ui:11 msgctxt "aboutdialog|AboutDialog" @@ -2309,10 +2287,9 @@ msgstr "" #: cui/uiconfig/ui/aboutdialog.ui:40 -#, fuzzy msgctxt "aboutdialog|website" msgid "_Website" -msgstr "मेरो वेबसाइट" +msgstr "वेबसाइट" #: cui/uiconfig/ui/aboutdialog.ui:109 msgctxt "aboutdialog|logoreplacement" @@ -2347,12 +2324,12 @@ #: cui/uiconfig/ui/aboutdialog.ui:227 msgctxt "aboutdialog|copyright" msgid "Copyright © 2000–2019 LibreOffice contributors." -msgstr "" +msgstr "कपीराईट © २०००-२०१९ LibreOffice योगदानकर्ता।" #: cui/uiconfig/ui/aboutdialog.ui:241 msgctxt "aboutdialog|libreoffice" msgid "LibreOffice was based on OpenOffice.org." -msgstr "" +msgstr "LibreOffice OpenOffice.org मा आधारित थियो।" #: cui/uiconfig/ui/aboutdialog.ui:255 msgctxt "aboutdialog|derived" @@ -2362,12 +2339,12 @@ #: cui/uiconfig/ui/aboutdialog.ui:269 msgctxt "aboutdialog|vendor" msgid "This release was supplied by %OOOVENDOR." -msgstr "" +msgstr "यो रिलीज %OOOVENDOR द्वारा आपूर्ति गरिएको थियो।" #: cui/uiconfig/ui/aboutdialog.ui:289 msgctxt "aboutdialog|link" msgid "https://www.libreoffice.org/about-us/credits/" -msgstr "" +msgstr "https://www.libreoffice.org/about-us/credits/" #: cui/uiconfig/ui/accelconfigpage.ui:54 #, fuzzy @@ -2383,7 +2360,7 @@ #: cui/uiconfig/ui/accelconfigpage.ui:97 msgctxt "accelconfigpage|module" msgid "$(MODULE)" -msgstr "" +msgstr "$(MODULE)" #: cui/uiconfig/ui/accelconfigpage.ui:129 msgctxt "accelconfigpage|change" @@ -2393,7 +2370,7 @@ #: cui/uiconfig/ui/accelconfigpage.ui:157 msgctxt "accelconfigpage|load" msgid "_Load..." -msgstr "" +msgstr "लोड गर्नुहोस्" #: cui/uiconfig/ui/accelconfigpage.ui:172 #, fuzzy @@ -2421,7 +2398,7 @@ #: cui/uiconfig/ui/accelconfigpage.ui:295 msgctxt "accelconfigpage|label25" msgid "_Keys" -msgstr "" +msgstr "कुञ्जीहरू" #: cui/uiconfig/ui/accelconfigpage.ui:365 #, fuzzy @@ -2432,7 +2409,7 @@ #: cui/uiconfig/ui/acorexceptpage.ui:68 msgctxt "acorexceptpage|autoabbrev" msgid "_AutoInclude" -msgstr "" +msgstr "स्वतसम्मिलित" #: cui/uiconfig/ui/acorexceptpage.ui:101 msgctxt "acorexceptpage|newabbrev-atkobject" @@ -2457,7 +2434,7 @@ #: cui/uiconfig/ui/acorexceptpage.ui:259 msgctxt "acorexceptpage|autodouble" msgid "A_utoInclude" -msgstr "" +msgstr "स्वतसम्मिलित" #: cui/uiconfig/ui/acorexceptpage.ui:292 msgctxt "acorexceptpage|newdouble-atkobject" @@ -2510,7 +2487,7 @@ #: cui/uiconfig/ui/agingdialog.ui:158 msgctxt "agingdialog|label2" msgid "Aging degree:" -msgstr "" +msgstr "पाकोपनाको मात्रा:" #: cui/uiconfig/ui/agingdialog.ui:182 #, fuzzy @@ -2536,22 +2513,22 @@ #: cui/uiconfig/ui/applyautofmtpage.ui:118 msgctxt "applyautofmtpage|m" msgid "[M]" -msgstr "" +msgstr "[M]" #: cui/uiconfig/ui/applyautofmtpage.ui:133 msgctxt "applyautofmtpage|t" msgid "[T]" -msgstr "" +msgstr "[T]" #: cui/uiconfig/ui/applylocalizedpage.ui:78 msgctxt "applylocalizedpage|m" msgid "[M]" -msgstr "" +msgstr "[M]" #: cui/uiconfig/ui/applylocalizedpage.ui:93 msgctxt "applylocalizedpage|t" msgid "[T]" -msgstr "" +msgstr "[T]" #: cui/uiconfig/ui/applylocalizedpage.ui:211 #, fuzzy @@ -2562,7 +2539,7 @@ #: cui/uiconfig/ui/applylocalizedpage.ui:228 msgctxt "applylocalizedpage|startquoteft" msgid "_Start quote:" -msgstr "" +msgstr "सुरु उद्धरण:" #: cui/uiconfig/ui/applylocalizedpage.ui:251 msgctxt "applylocalizedpage|startsingle-atkobject" @@ -2582,12 +2559,12 @@ #: cui/uiconfig/ui/applylocalizedpage.ui:288 msgctxt "applylocalizedpage|defaultsingle-atkobject" msgid "Single quotes default" -msgstr "" +msgstr "पूर्वनिर्धारित सेट गर्नुहोस्" #: cui/uiconfig/ui/applylocalizedpage.ui:301 msgctxt "applylocalizedpage|endquoteft" msgid "_End quote:" -msgstr "" +msgstr "अन्त्य उद्धरण:" #: cui/uiconfig/ui/applylocalizedpage.ui:324 msgctxt "applylocalizedpage|endsingle-atkobject" @@ -2613,7 +2590,7 @@ #: cui/uiconfig/ui/applylocalizedpage.ui:406 msgctxt "applylocalizedpage|label6" msgid "_Start quote:" -msgstr "" +msgstr "सुरु उद्धरण:" #: cui/uiconfig/ui/applylocalizedpage.ui:429 msgctxt "applylocalizedpage|startdouble-atkobject" @@ -2633,12 +2610,12 @@ #: cui/uiconfig/ui/applylocalizedpage.ui:466 msgctxt "applylocalizedpage|defaultdouble-atkobject" msgid "Double quotes default" -msgstr "" +msgstr "डबल बाँण बायाँ" #: cui/uiconfig/ui/applylocalizedpage.ui:479 msgctxt "applylocalizedpage|label8" msgid "_End quote:" -msgstr "" +msgstr "अन्त्य उद्धरण:" #: cui/uiconfig/ui/applylocalizedpage.ui:502 msgctxt "applylocalizedpage|enddouble-atkobject" @@ -2683,7 +2660,7 @@ #: cui/uiconfig/ui/areatabpage.ui:34 msgctxt "areatabpage|tablelb" msgid "Row" -msgstr "" +msgstr "पङ्क्ति" #: cui/uiconfig/ui/areatabpage.ui:35 msgctxt "areatabpage|tablelb" @@ -2730,7 +2707,7 @@ #: cui/uiconfig/ui/asiantypography.ui:42 msgctxt "asiantypography|checkHangPunct" msgid "Allow hanging punctuation" -msgstr "" +msgstr "झुण्डिरहेको विराम चिन्हलाई अनुमति दिनुहोस्" #: cui/uiconfig/ui/asiantypography.ui:59 msgctxt "asiantypography|checkApplySpacing" @@ -2740,7 +2717,7 @@ #: cui/uiconfig/ui/asiantypography.ui:82 msgctxt "asiantypography|labelLineChange" msgid "Line Change" -msgstr "" +msgstr "रेखा परिवर्तन" #: cui/uiconfig/ui/assigncomponentdialog.ui:10 #, fuzzy @@ -2762,7 +2739,7 @@ #: cui/uiconfig/ui/autocorrectdialog.ui:108 msgctxt "autocorrectdialog|label1" msgid "Replacements and exceptions for language:" -msgstr "" +msgstr "भाषाका लागि बदल्नुहोस् गर्छ र अपवाद गर्छ:" #: cui/uiconfig/ui/autocorrectdialog.ui:181 msgctxt "autocorrectdialog|replace" @@ -2772,7 +2749,7 @@ #: cui/uiconfig/ui/autocorrectdialog.ui:227 msgctxt "autocorrectdialog|exceptions" msgid "Exceptions" -msgstr "" +msgstr "अपवादहरू" #: cui/uiconfig/ui/autocorrectdialog.ui:274 msgctxt "autocorrectdialog|options" @@ -2787,12 +2764,12 @@ #: cui/uiconfig/ui/autocorrectdialog.ui:368 msgctxt "autocorrectdialog|localized" msgid "Localized Options" -msgstr "" +msgstr "अनुवादित उद्धरणहरू" #: cui/uiconfig/ui/autocorrectdialog.ui:415 msgctxt "autocorrectdialog|wordcompletion" msgid "Word Completion" -msgstr "" +msgstr "शब्द समाप्ति" #: cui/uiconfig/ui/autocorrectdialog.ui:462 msgctxt "autocorrectdialog|smarttags" @@ -2817,7 +2794,7 @@ #: cui/uiconfig/ui/backgroundpage.ui:49 msgctxt "backgroundpage|forft" msgid "F_or:" -msgstr "" +msgstr "लागी:" #: cui/uiconfig/ui/backgroundpage.ui:69 msgctxt "backgroundpage|tablelb" @@ -2911,12 +2888,12 @@ #: cui/uiconfig/ui/baselinksdialog.ui:80 msgctxt "baselinksdialog|BREAK_LINK" msgid "_Break Link" -msgstr "" +msgstr "विच्छेदन् लिङ्क" #: cui/uiconfig/ui/baselinksdialog.ui:127 msgctxt "baselinksdialog|FILES" msgid "Source file" -msgstr "" +msgstr "स्रोत फाइल" #: cui/uiconfig/ui/baselinksdialog.ui:141 #, fuzzy @@ -2943,7 +2920,7 @@ #: cui/uiconfig/ui/baselinksdialog.ui:226 msgctxt "baselinksdialog|FILES2" msgid "Source file" -msgstr "" +msgstr "स्रोत फाइल" #: cui/uiconfig/ui/baselinksdialog.ui:242 #, fuzzy @@ -3093,12 +3070,12 @@ #: cui/uiconfig/ui/bitmaptabpage.ui:364 msgctxt "bitmaptabpage|label10" msgid "X-Offset:" -msgstr "" +msgstr "X-अफसेट:" #: cui/uiconfig/ui/bitmaptabpage.ui:402 msgctxt "bitmaptabpage|label11" msgid "Y-Offset:" -msgstr "" +msgstr "Y-अफसेट:" #: cui/uiconfig/ui/bitmaptabpage.ui:447 msgctxt "bitmaptabpage|label15" @@ -3154,7 +3131,7 @@ #: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:227 msgctxt "blackorwhitelistentrydialog|label7" msgid "Device:" -msgstr "" +msgstr "यन्त्र:" #: cui/uiconfig/ui/blackorwhitelistentrydialog.ui:240 msgctxt "blackorwhitelistentrydialog|label8" @@ -3247,7 +3224,7 @@ #: cui/uiconfig/ui/borderpage.ui:189 msgctxt "borderpage|label8" msgid "Line Arrangement" -msgstr "" +msgstr "रेखा मिलान" #: cui/uiconfig/ui/borderpage.ui:222 #, fuzzy @@ -3297,7 +3274,7 @@ #: cui/uiconfig/ui/borderpage.ui:452 msgctxt "borderpage|sync" msgid "Synchronize" -msgstr "" +msgstr "समक्रमण गर्नुहोस्" #: cui/uiconfig/ui/borderpage.ui:474 msgctxt "borderpage|label10" @@ -3325,7 +3302,7 @@ #: cui/uiconfig/ui/borderpage.ui:617 msgctxt "borderpage|label11" msgid "Shadow Style" -msgstr "" +msgstr "छाँया शैली" #: cui/uiconfig/ui/borderpage.ui:650 #, fuzzy @@ -3336,7 +3313,7 @@ #: cui/uiconfig/ui/borderpage.ui:665 msgctxt "borderpage|mergeadjacent" msgid "_Merge adjacent line styles" -msgstr "" +msgstr "आसन्न रेखा शैलीहरू गाभ्नुहोस्" #: cui/uiconfig/ui/borderpage.ui:686 msgctxt "borderpage|label12" @@ -3351,12 +3328,12 @@ #: cui/uiconfig/ui/breaknumberoption.ui:99 msgctxt "breaknumberoption|beforelabel" msgid "Characters Before Break" -msgstr "" +msgstr "हरफ विच्छेदन अगाडि क्यारेक्टरहरू" #: cui/uiconfig/ui/breaknumberoption.ui:138 msgctxt "breaknumberoption|afterlabel" msgid "Characters After Break" -msgstr "" +msgstr "हरफ विच्छेदन पछि क्यारेक्टरहरू" #: cui/uiconfig/ui/breaknumberoption.ui:177 msgctxt "breaknumberoption|minimallabel" @@ -3502,17 +3479,17 @@ #: cui/uiconfig/ui/cellalignment.ui:63 msgctxt "cellalignment|labelRefEdge" msgid "_Reference edge:" -msgstr "" +msgstr "सन्दर्भ किनारा:" #: cui/uiconfig/ui/cellalignment.ui:158 msgctxt "cellalignment|checkVertStack" msgid "Vertically s_tacked" -msgstr "" +msgstr "ठाडो रूपमा राखिएको थाक" #: cui/uiconfig/ui/cellalignment.ui:174 msgctxt "cellalignment|checkAsianMode" msgid "Asian layout _mode" -msgstr "" +msgstr "एसियन सजावट मोड" #: cui/uiconfig/ui/cellalignment.ui:203 #, fuzzy @@ -3529,12 +3506,12 @@ #: cui/uiconfig/ui/cellalignment.ui:254 msgctxt "cellalignment|checkShrinkFitCellSize" msgid "_Shrink to fit cell size" -msgstr "" +msgstr "कक्ष साइज ठीक पार्न खुम्च्याउनुहोस्" #: cui/uiconfig/ui/cellalignment.ui:270 msgctxt "cellalignment|checkHyphActive" msgid "Hyphenation _active" -msgstr "" +msgstr "सक्रिय हाइफनेसन" #: cui/uiconfig/ui/cellalignment.ui:295 #, fuzzy @@ -3652,12 +3629,12 @@ #: cui/uiconfig/ui/cellalignment.ui:517 msgctxt "cellalignment|labelABCD" msgid "ABCD" -msgstr "" +msgstr "ABCD" #: cui/uiconfig/ui/certdialog.ui:9 msgctxt "certdialog|CertDialog" msgid "Certificate Path" -msgstr "" +msgstr "प्रमाणीकरण बाटो" #: cui/uiconfig/ui/certdialog.ui:78 #, fuzzy @@ -3695,7 +3672,7 @@ #: cui/uiconfig/ui/certdialog.ui:235 msgctxt "certdialog|label1" msgid "Certificate Path" -msgstr "" +msgstr "प्रमाणीकरण बाटो" #: cui/uiconfig/ui/charnamepage.ui:351 #, fuzzy @@ -3729,7 +3706,7 @@ #: cui/uiconfig/ui/charnamepage.ui:626 msgctxt "charnamepage|west_features_button-cjk" msgid "Features..." -msgstr "" +msgstr "विशेषताहरु" #: cui/uiconfig/ui/charnamepage.ui:652 msgctxt "charnamepage|label4" @@ -3997,12 +3974,12 @@ #: cui/uiconfig/ui/colorconfigwin.ui:936 msgctxt "colorconfigwin|basic" msgid "Basic Syntax Highlighting" -msgstr "" +msgstr "आधारभूत सिन्ट्याक्स हाइलाइटिंग" #: cui/uiconfig/ui/colorconfigwin.ui:963 msgctxt "colorconfigwin|basicid" msgid "Identifier" -msgstr "" +msgstr "पहिचानकर्ता" #: cui/uiconfig/ui/colorconfigwin.ui:986 msgctxt "colorconfigwin|basiccomment" @@ -4027,7 +4004,7 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1078 msgctxt "colorconfigwin|basickeyword" msgid "Reserved expression" -msgstr "" +msgstr "सुरक्षित अभिव्यक्ति" #: cui/uiconfig/ui/colorconfigwin.ui:1101 msgctxt "colorconfigwin|error" @@ -4037,12 +4014,12 @@ #: cui/uiconfig/ui/colorconfigwin.ui:1113 msgctxt "colorconfigwin|sql" msgid "SQL Syntax Highlighting" -msgstr "" +msgstr "SQL सिन्ट्याक्स हाइलाइटिंग" #: cui/uiconfig/ui/colorconfigwin.ui:1140 msgctxt "colorconfigwin|sqlid" msgid "Identifier" -msgstr "" +msgstr "पहिचानकर्ता" #: cui/uiconfig/ui/colorconfigwin.ui:1163 msgctxt "colorconfigwin|sqlnumber" @@ -4060,16 +4037,14 @@ msgstr "सञ्चालक" #: cui/uiconfig/ui/colorconfigwin.ui:1232 -#, fuzzy msgctxt "colorconfigwin|sqlkeyword" msgid "Keyword" -msgstr "शब्दकुञ्जीहरू" +msgstr "शब्दकुञ्जी" #: cui/uiconfig/ui/colorconfigwin.ui:1255 -#, fuzzy msgctxt "colorconfigwin|sqlparam" msgid "Parameter" -msgstr "परामितिहरू" +msgstr "परामिति" #: cui/uiconfig/ui/colorconfigwin.ui:1278 msgctxt "colorconfigwin|sqlcomment" @@ -4077,31 +4052,29 @@ msgstr "द्रष्टब्य" #: cui/uiconfig/ui/colorconfigwin.ui:1287 -#, fuzzy msgctxt "colorconfigwin|shadows" msgid "Shadows" -msgstr "छाँया" +msgstr "छाँयाहरु" #: cui/uiconfig/ui/colorpage.ui:82 -#, fuzzy msgctxt "colorpage|label21" msgid "Palette:" -msgstr "प्यालेटहरू" +msgstr "प्यालेट:" #: cui/uiconfig/ui/colorpage.ui:122 msgctxt "colorpage|label20" msgid "Recent Colors" -msgstr "" +msgstr "हालका रंगहरू" #: cui/uiconfig/ui/colorpage.ui:175 msgctxt "colorpage|RGB" msgid "RGB" -msgstr "" +msgstr "RGB" #: cui/uiconfig/ui/colorpage.ui:190 msgctxt "colorpage|CMYK" msgid "CMYK" -msgstr "" +msgstr "CMYK" #: cui/uiconfig/ui/colorpage.ui:205 msgctxt "colorpage|delete" @@ -4111,23 +4084,22 @@ #: cui/uiconfig/ui/colorpage.ui:220 msgctxt "colorpage|label22" msgid "Custom Palette" -msgstr "" +msgstr "अनुकूलन रङदानी" #: cui/uiconfig/ui/colorpage.ui:286 -#, fuzzy msgctxt "colorpage|label1" msgid "Colors" -msgstr "रङ" +msgstr "रङहरु" #: cui/uiconfig/ui/colorpage.ui:345 msgctxt "colorpage|oldpreview-atkobject" msgid "Old Color" -msgstr "" +msgstr "पुरानो रङ्ग" #: cui/uiconfig/ui/colorpage.ui:379 msgctxt "colorpage|label7" msgid "B" -msgstr "" +msgstr "B" #: cui/uiconfig/ui/colorpage.ui:392 msgctxt "colorpage|label8" @@ -4137,35 +4109,34 @@ #: cui/uiconfig/ui/colorpage.ui:405 msgctxt "colorpage|label9" msgid "R" -msgstr "" +msgstr "R" #: cui/uiconfig/ui/colorpage.ui:418 msgctxt "colorpage|label18" msgid "Hex" -msgstr "" +msgstr "Hex" #: cui/uiconfig/ui/colorpage.ui:494 msgctxt "colorpage|label10" msgid "_C" -msgstr "" +msgstr "C" #: cui/uiconfig/ui/colorpage.ui:507 msgctxt "colorpage|label16" msgid "_K" -msgstr "" +msgstr "K" #: cui/uiconfig/ui/colorpage.ui:520 msgctxt "colorpage|label17" msgid "_Y" -msgstr "" +msgstr "Y" #: cui/uiconfig/ui/colorpage.ui:581 msgctxt "colorpage|label15" msgid "_M" -msgstr "" +msgstr "M" #: cui/uiconfig/ui/colorpage.ui:605 -#, fuzzy msgctxt "colorpage|label5" msgid "Active" msgstr "सक्रिय" @@ -4173,10 +4144,9 @@ #: cui/uiconfig/ui/colorpage.ui:664 msgctxt "colorpage|newpreview-atkobject" msgid "New Color" -msgstr "" +msgstr "नया रङ्ग" #: cui/uiconfig/ui/colorpage.ui:699 -#, fuzzy msgctxt "colorpage|B_custom" msgid "Blue" msgstr "नीलो" @@ -4271,55 +4241,52 @@ #: cui/uiconfig/ui/colorpickerdialog.ui:393 msgctxt "colorpickerdialog|label1" msgid "RGB" -msgstr "" +msgstr "RGB" #: cui/uiconfig/ui/colorpickerdialog.ui:432 msgctxt "colorpickerdialog|hueRadiobutton" msgid "H_ue:" -msgstr "" +msgstr "Hue:" #: cui/uiconfig/ui/colorpickerdialog.ui:448 msgctxt "colorpickerdialog|satRadiobutton" msgid "_Saturation:" -msgstr "" +msgstr "संतृप्ति:" #: cui/uiconfig/ui/colorpickerdialog.ui:464 -#, fuzzy msgctxt "colorpickerdialog|brightRadiobutton" msgid "Bright_ness:" -msgstr "चम्किलोपन" +msgstr "उज्यालोपन:" #: cui/uiconfig/ui/colorpickerdialog.ui:522 msgctxt "colorpickerdialog|label3" msgid "HSB" -msgstr "" +msgstr "HSB" #: cui/uiconfig/ui/colorpickerdialog.ui:562 msgctxt "colorpickerdialog|label5" msgid "_Cyan:" -msgstr "" +msgstr "क्यान:" #: cui/uiconfig/ui/colorpickerdialog.ui:577 -#, fuzzy msgctxt "colorpickerdialog|label6" msgid "_Magenta:" -msgstr "म्याजेन्टा" +msgstr "मजेन्टा" #: cui/uiconfig/ui/colorpickerdialog.ui:592 -#, fuzzy msgctxt "colorpickerdialog|label7" msgid "_Yellow:" -msgstr "पहेलो" +msgstr "पहेंलो" #: cui/uiconfig/ui/colorpickerdialog.ui:607 msgctxt "colorpickerdialog|label8" msgid "_Key:" -msgstr "" +msgstr "कुञ्जी" #: cui/uiconfig/ui/colorpickerdialog.ui:673 msgctxt "colorpickerdialog|label4" msgid "CMYK" -msgstr "" +msgstr "CMYK" #: cui/uiconfig/ui/comment.ui:18 msgctxt "comment|CommentDialog" @@ -4357,56 +4324,54 @@ msgstr "सामग्रीहरू" #: cui/uiconfig/ui/connectortabpage.ui:62 -#, fuzzy msgctxt "connectortabpage|FT_TYPE" msgid "_Type:" -msgstr "प्रकार" +msgstr "प्रकार:" #: cui/uiconfig/ui/connectortabpage.ui:113 msgctxt "connectortabpage|FT_LINE_1" msgid "Line _1:" -msgstr "" +msgstr "रेखा १:" #: cui/uiconfig/ui/connectortabpage.ui:127 msgctxt "connectortabpage|FT_LINE_2" msgid "Line _2:" -msgstr "" +msgstr "रेखा २:" #: cui/uiconfig/ui/connectortabpage.ui:141 msgctxt "connectortabpage|FT_LINE_3" msgid "Line _3:" -msgstr "" +msgstr "रेखा ३:" #: cui/uiconfig/ui/connectortabpage.ui:198 msgctxt "connectortabpage|label2" msgid "Line Skew" -msgstr "" +msgstr "पङ्क्ति स्क्यू" #: cui/uiconfig/ui/connectortabpage.ui:234 msgctxt "connectortabpage|FT_HORZ_1" msgid "_Begin horizontal:" -msgstr "" +msgstr "तेर्सो सुरु गर्नुहोस्:" #: cui/uiconfig/ui/connectortabpage.ui:248 msgctxt "connectortabpage|FT_HORZ_2" msgid "End _horizontal:" -msgstr "" +msgstr "तेर्सो अन्त्य गर्नुहोस्:" #: cui/uiconfig/ui/connectortabpage.ui:262 msgctxt "connectortabpage|FT_VERT_1" msgid "Begin _vertical:" -msgstr "" +msgstr "ठाडो सुरु गर्नुहोस्:" #: cui/uiconfig/ui/connectortabpage.ui:276 msgctxt "connectortabpage|FT_VERT_2" msgid "_End vertical:" -msgstr "" +msgstr "ठाडो अन्त्य गर्नुहोस्:" #: cui/uiconfig/ui/connectortabpage.ui:346 -#, fuzzy msgctxt "connectortabpage|label3" msgid "Line Spacing" -msgstr "रेखा खाली स्थान" +msgstr "रेखा खालीठाउँ" #: cui/uiconfig/ui/connectortabpage.ui:385 msgctxt "connectortabpage|CTL_PREVIEW|tooltip_text" @@ -4421,7 +4386,7 @@ #: cui/uiconfig/ui/connpooloptions.ui:39 msgctxt "connpooloptions|connectionpooling" msgid "Connection pooling enabled" -msgstr "" +msgstr "जडान पुलिङ सक्षम पारियो" #: cui/uiconfig/ui/connpooloptions.ui:67 msgctxt "connpooloptions|driverslabel" @@ -4431,60 +4396,54 @@ #: cui/uiconfig/ui/connpooloptions.ui:101 msgctxt "connpooloptions|driverlabel" msgid "Current driver:" -msgstr "" +msgstr "हालको ड्राईभर" #: cui/uiconfig/ui/connpooloptions.ui:132 msgctxt "connpooloptions|enablepooling" msgid "Enable pooling for this driver" -msgstr "" +msgstr "यो ड्राईभरका लागि पुलिङ सक्षम पार्नुहोस" #: cui/uiconfig/ui/connpooloptions.ui:158 msgctxt "connpooloptions|timeoutlabel" msgid "_Timeout (seconds)" -msgstr "" +msgstr "समय समाप्ति (सेकेन्डहरू)" #: cui/uiconfig/ui/connpooloptions.ui:206 -#, fuzzy msgctxt "connpooloptions|label1" msgid "Connection Pool" -msgstr "सम्पर्क हरायो" +msgstr "जडान पुल" #: cui/uiconfig/ui/croppage.ui:82 msgctxt "croppage|keepscale" msgid "Keep _scale" -msgstr "" +msgstr "स्केल राख्नुहोस्" #: cui/uiconfig/ui/croppage.ui:100 msgctxt "croppage|keepsize" msgid "Keep image si_ze" -msgstr "" +msgstr "छविचित्र साइज राख्नुहोस्" #: cui/uiconfig/ui/croppage.ui:125 -#, fuzzy msgctxt "croppage|label2" msgid "_Left:" msgstr "बायाँ:" #: cui/uiconfig/ui/croppage.ui:152 -#, fuzzy msgctxt "croppage|label3" msgid "_Right:" msgstr "दायाँ:" #: cui/uiconfig/ui/croppage.ui:191 -#, fuzzy msgctxt "croppage|label4" msgid "_Top:" msgstr "माथि:" #: cui/uiconfig/ui/croppage.ui:205 -#, fuzzy msgctxt "croppage|label5" msgid "_Bottom:" msgstr "तल:" #: cui/uiconfig/ui/croppage.ui:255 -#, fuzzy msgctxt "croppage|label1" msgid "Crop" msgstr "काटछाँट गर्नुहोस्" @@ -4500,10 +4459,9 @@ msgstr "उचाइ:" #: cui/uiconfig/ui/croppage.ui:345 -#, fuzzy msgctxt "croppage|label10" msgid "Scale" -msgstr "स्केल" +msgstr "मापन" #: cui/uiconfig/ui/croppage.ui:379 msgctxt "croppage|label8" @@ -4518,10 +4476,9 @@ #: cui/uiconfig/ui/croppage.ui:437 msgctxt "croppage|label11" msgid "Image Size" -msgstr "" +msgstr "छविचित्र साइज" #: cui/uiconfig/ui/croppage.ui:506 -#, fuzzy msgctxt "croppage|origsize" msgid "_Original Size" msgstr "मौलिक साइज" @@ -4534,16 +4491,14 @@ #: cui/uiconfig/ui/cuiimapdlg.ui:96 msgctxt "cuiimapdlg|label1" msgid "_URL:" -msgstr "" +msgstr "URL" #: cui/uiconfig/ui/cuiimapdlg.ui:137 -#, fuzzy msgctxt "cuiimapdlg|label2" msgid "F_rame:" msgstr "फ्रेम:" #: cui/uiconfig/ui/cuiimapdlg.ui:184 -#, fuzzy msgctxt "cuiimapdlg|label3" msgid "_Name:" msgstr "नाम" @@ -4551,28 +4506,24 @@ #: cui/uiconfig/ui/cuiimapdlg.ui:225 msgctxt "cuiimapdlg|label4" msgid "Alternative _text:" -msgstr "" +msgstr "वैकल्पिक पाठ:" #: cui/uiconfig/ui/cuiimapdlg.ui:266 -#, fuzzy msgctxt "cuiimapdlg|label5" msgid "_Description:" msgstr "वर्णन" #: cui/uiconfig/ui/customizedialog.ui:8 -#, fuzzy msgctxt "customizedialog|CustomizeDialog" msgid "Customize" -msgstr "अनुकूलन गरिएको" +msgstr "अनुकूलन" #: cui/uiconfig/ui/customizedialog.ui:107 -#, fuzzy msgctxt "customizedialog|menus" msgid "Menus" -msgstr "मेनु" +msgstr "मेनुहरू" #: cui/uiconfig/ui/customizedialog.ui:129 -#, fuzzy msgctxt "customizedialog|toolbars" msgid "Toolbars" msgstr "उपकरणपट्टीहरू" @@ -4580,7 +4531,7 @@ #: cui/uiconfig/ui/customizedialog.ui:152 msgctxt "customizedialog|contextmenus" msgid "Context Menus" -msgstr "" +msgstr "प्रसङ्ग मेनुहरू" #: cui/uiconfig/ui/customizedialog.ui:175 msgctxt "customizedialog|keyboard" @@ -4605,12 +4556,12 @@ #: cui/uiconfig/ui/databaselinkdialog.ui:104 msgctxt "databaselinkdialog|label1" msgid "_Database file:" -msgstr "" +msgstr "डाटाबेस फाइल" #: cui/uiconfig/ui/databaselinkdialog.ui:148 msgctxt "databaselinkdialog|label4" msgid "Registered _name:" -msgstr "" +msgstr "दर्ता गरिएको नाम" #: cui/uiconfig/ui/databaselinkdialog.ui:179 msgctxt "databaselinkdialog|alttitle" @@ -4635,35 +4586,34 @@ #: cui/uiconfig/ui/dbregisterpage.ui:117 msgctxt "dbregisterpage|label1" msgid "Registered Databases" -msgstr "" +msgstr "दर्ता गरिएका डाटाबेसहरू" #: cui/uiconfig/ui/dimensionlinestabpage.ui:76 msgctxt "dimensionlinestabpage|FT_LINE_DIST" msgid "Line _distance:" -msgstr "" +msgstr "पङ्क्ति दूरी" #: cui/uiconfig/ui/dimensionlinestabpage.ui:91 msgctxt "dimensionlinestabpage|FT_HELPLINE_OVERHANG" msgid "Guide _overhang:" -msgstr "" +msgstr "मार्गदर्शक ओभरह्याङ" #: cui/uiconfig/ui/dimensionlinestabpage.ui:105 msgctxt "dimensionlinestabpage|FT_HELPLINE_DIST" msgid "_Guide distance:" -msgstr "" +msgstr "मार्गदर्शक दूरी" #: cui/uiconfig/ui/dimensionlinestabpage.ui:119 msgctxt "dimensionlinestabpage|FT_HELPLINE1_LEN" msgid "_Left guide:" -msgstr "" +msgstr "बायाँ मार्गदर्शक:" #: cui/uiconfig/ui/dimensionlinestabpage.ui:133 msgctxt "dimensionlinestabpage|FT_HELPLINE2_LEN" msgid "_Right guide:" -msgstr "" +msgstr "दायाँ मार्गदर्शक" #: cui/uiconfig/ui/dimensionlinestabpage.ui:147 -#, fuzzy msgctxt "dimensionlinestabpage|FT_DECIMALPLACES" msgid "Decimal _places:" msgstr "दशमलब स्थानहरू" @@ -4681,22 +4631,22 @@ #: cui/uiconfig/ui/dimensionlinestabpage.ui:296 msgctxt "dimensionlinestabpage|FT_POSITION" msgid "_Text position" -msgstr "" +msgstr "पाठ अवस्था" #: cui/uiconfig/ui/dimensionlinestabpage.ui:350 msgctxt "dimensionlinestabpage|TSB_AUTOPOSV" msgid "_AutoVertical" -msgstr "" +msgstr "स्वत:ठाडो" #: cui/uiconfig/ui/dimensionlinestabpage.ui:367 msgctxt "dimensionlinestabpage|TSB_AUTOPOSH" msgid "A_utoHorizontal" -msgstr "" +msgstr "स्वत:तेर्सो" #: cui/uiconfig/ui/dimensionlinestabpage.ui:393 msgctxt "dimensionlinestabpage|TSB_PARALLEL" msgid "_Parallel to line" -msgstr "" +msgstr "रेखा सँग समानान्तर" #: cui/uiconfig/ui/dimensionlinestabpage.ui:410 msgctxt "dimensionlinestabpage|TSB_SHOW_UNIT" @@ -4714,13 +4664,11 @@ msgstr "स्वचालित" #: cui/uiconfig/ui/distributiondialog.ui:8 -#, fuzzy msgctxt "distributiondialog|DistributionDialog" msgid "Distribution" -msgstr "वितरण..." +msgstr "वितरण" #: cui/uiconfig/ui/distributionpage.ui:36 -#, fuzzy msgctxt "distributionpage|hornone" msgid "_None" msgstr "कुनै पनि होइन" @@ -4736,13 +4684,11 @@ msgstr "केन्द्र" #: cui/uiconfig/ui/distributionpage.ui:84 -#, fuzzy msgctxt "distributionpage|horright" msgid "_Right" msgstr "दायाँ" #: cui/uiconfig/ui/distributionpage.ui:126 -#, fuzzy msgctxt "distributionpage|hordistance" msgid "_Spacing" msgstr "खाली स्थान" @@ -4753,31 +4699,26 @@ msgstr "तेर्सो" #: cui/uiconfig/ui/distributionpage.ui:210 -#, fuzzy msgctxt "distributionpage|vernone" msgid "N_one" msgstr "कुनै पनि होइन" #: cui/uiconfig/ui/distributionpage.ui:225 -#, fuzzy msgctxt "distributionpage|vertop" msgid "_Top" msgstr "माथि" #: cui/uiconfig/ui/distributionpage.ui:241 -#, fuzzy msgctxt "distributionpage|vercenter" msgid "C_enter" msgstr "केन्द्र" #: cui/uiconfig/ui/distributionpage.ui:258 -#, fuzzy msgctxt "distributionpage|verdistance" msgid "S_pacing" msgstr "खाली स्थान" #: cui/uiconfig/ui/distributionpage.ui:274 -#, fuzzy msgctxt "distributionpage|verbottom" msgid "_Bottom" msgstr "तल" @@ -4788,7 +4729,6 @@ msgstr "ठाडो" #: cui/uiconfig/ui/editdictionarydialog.ui:8 -#, fuzzy msgctxt "editdictionarydialog|EditDictionaryDialog" msgid "Edit Custom Dictionary" msgstr "अनुकूल शब्दकोश सम्पादन गर्नुहोस्" @@ -4796,19 +4736,17 @@ #: cui/uiconfig/ui/editdictionarydialog.ui:95 msgctxt "editdictionarydialog|book_label" msgid "_Book:" -msgstr "" +msgstr "किताब" #: cui/uiconfig/ui/editdictionarydialog.ui:110 -#, fuzzy msgctxt "editdictionarydialog|lang_label" msgid "_Language:" msgstr "भाषा" #: cui/uiconfig/ui/editdictionarydialog.ui:180 -#, fuzzy msgctxt "editdictionarydialog|word_label" msgid "_Word" -msgstr "शब्दहरू" +msgstr "शब्द" #: cui/uiconfig/ui/editdictionarydialog.ui:196 msgctxt "editdictionarydialog|replace_label" @@ -4828,7 +4766,7 @@ #: cui/uiconfig/ui/editmodulesdialog.ui:9 msgctxt "editmodulesdialog|EditModulesDialog" msgid "Edit Modules" -msgstr "" +msgstr "मोड्युल सम्पादन गर्नुहोस्" #: cui/uiconfig/ui/editmodulesdialog.ui:84 msgctxt "editmodulesdialog|moredictslink" @@ -4836,10 +4774,9 @@ msgstr "" #: cui/uiconfig/ui/editmodulesdialog.ui:108 -#, fuzzy msgctxt "editmodulesdialog|label2" msgid "Language:" -msgstr "भाषा" +msgstr "भाषा:" #: cui/uiconfig/ui/editmodulesdialog.ui:153 msgctxt "editmodulesdialog|up" @@ -4852,7 +4789,6 @@ msgstr "तल सार्नुहोस्" #: cui/uiconfig/ui/editmodulesdialog.ui:181 -#, fuzzy msgctxt "editmodulesdialog|back" msgid "_Back" msgstr "पछाडि" @@ -4863,19 +4799,16 @@ msgstr "विकल्प" #: cui/uiconfig/ui/effectspage.ui:24 -#, fuzzy msgctxt "effectspage|fontcolorft" msgid "Font color:" msgstr "फन्ट रङ" #: cui/uiconfig/ui/effectspage.ui:38 -#, fuzzy msgctxt "effectspage|effectsft" msgid "Effects:" msgstr "प्रभावहरू" #: cui/uiconfig/ui/effectspage.ui:52 -#, fuzzy msgctxt "effectspage|reliefft" msgid "Relief:" msgstr "राहत" @@ -4886,10 +4819,9 @@ msgstr "" #: cui/uiconfig/ui/effectspage.ui:80 -#, fuzzy msgctxt "effectspage|label47" msgid "Strikethrough:" -msgstr "स्ट्राइकथ्रु" +msgstr "स्ट्रयाइकथ्रु" #: cui/uiconfig/ui/effectspage.ui:94 msgctxt "effectspage|label48" @@ -4909,7 +4841,7 @@ #: cui/uiconfig/ui/effectspage.ui:152 msgctxt "effectspage|liststore1" msgid "(Without)" -msgstr "" +msgstr "(बिना)" #: cui/uiconfig/ui/effectspage.ui:153 msgctxt "effectspage|liststore1" @@ -4934,7 +4866,7 @@ #: cui/uiconfig/ui/effectspage.ui:169 cui/uiconfig/ui/effectspage.ui:213 msgctxt "effectspage|liststore6" msgid "(Without)" -msgstr "" +msgstr "(बिना)" #: cui/uiconfig/ui/effectspage.ui:170 cui/uiconfig/ui/effectspage.ui:214 msgctxt "effectspage|liststore6" @@ -5459,7 +5391,7 @@ #: cui/uiconfig/ui/galleryfilespage.ui:222 msgctxt "galleryfilespage|addall" msgid "A_dd All" -msgstr "" +msgstr "सबै थप्नुहोस्" #: cui/uiconfig/ui/gallerygeneralpage.ui:21 msgctxt "gallerygeneralpage|label1" @@ -5509,7 +5441,7 @@ #: cui/uiconfig/ui/gallerythemedialog.ui:8 msgctxt "gallerythemedialog|GalleryThemeDialog" msgid "Properties of %1" -msgstr "" +msgstr "“%1” को गुणहरू" #: cui/uiconfig/ui/gallerythemedialog.ui:135 msgctxt "gallerythemedialog|general" @@ -5604,7 +5536,7 @@ #: cui/uiconfig/ui/gradientpage.ui:248 msgctxt "gradientpage|incrementft" msgid "Increment:" -msgstr "" +msgstr "वृद्धि:" #: cui/uiconfig/ui/gradientpage.ui:288 msgctxt "gradientpage|autoincrement" @@ -5638,16 +5570,14 @@ msgstr "" #: cui/uiconfig/ui/gradientpage.ui:551 -#, fuzzy msgctxt "gradientpage|a11y_center_x" msgid "Center X" -msgstr "मध्य" +msgstr "मध्य X" #: cui/uiconfig/ui/gradientpage.ui:565 -#, fuzzy msgctxt "gradientpage|a11y_center_y" msgid "Center Y" -msgstr "मध्य" +msgstr "मध्य Y" #: cui/uiconfig/ui/gradientpage.ui:579 msgctxt "gradientpage|a11y_percentage_from" @@ -5677,13 +5607,12 @@ #: cui/uiconfig/ui/hangulhanjaadddialog.ui:8 msgctxt "hangulhanjaadddialog|HangulHanjaAddDialog" msgid "New Dictionary" -msgstr "" +msgstr "नयाँ शब्दकोश" #: cui/uiconfig/ui/hangulhanjaadddialog.ui:99 -#, fuzzy msgctxt "hangulhanjaadddialog|label2" msgid "_Name:" -msgstr "नाम" +msgstr "नाम:" #: cui/uiconfig/ui/hangulhanjaadddialog.ui:130 msgctxt "hangulhanjaadddialog|label1" @@ -5706,7 +5635,6 @@ msgstr "शब्दहरू" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:153 -#, fuzzy msgctxt "hangulhanjaconversiondialog|find" msgid "_Find" msgstr "फेला पार्नुहोस्" @@ -5714,7 +5642,7 @@ #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:181 msgctxt "hangulhanjaconversiondialog|label4" msgid "Suggestions" -msgstr "" +msgstr "सुझावहरू" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:219 msgctxt "hangulhanjaconversiondialog|label5" @@ -5724,55 +5652,54 @@ #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:229 msgctxt "hangulhanjaconversiondialog|simpleconversion" msgid "_Hangul/Hanja" -msgstr "" +msgstr "हाङ्गुल/हान्जा" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:247 msgctxt "hangulhanjaconversiondialog|hangulbracket" msgid "Hanja (Han_gul)" -msgstr "" +msgstr "हान्जा (हाङ्गुल)" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:264 msgctxt "hangulhanjaconversiondialog|hanjabracket" msgid "Hang_ul (Hanja)" -msgstr "" +msgstr "हाङ्गल (हान्जा)" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:295 msgctxt "hangulhanjaconversiondialog|hanja_above" msgid "Hanja" -msgstr "" +msgstr "हान्जा" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:312 msgctxt "hangulhanjaconversiondialog|hanja_below" msgid "Hanja" -msgstr "" +msgstr "हान्जा" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:328 msgctxt "hangulhanjaconversiondialog|hangul_above" msgid "Hangul" -msgstr "" +msgstr "हाङ्गुल" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:344 msgctxt "hangulhanjaconversiondialog|hangul_below" msgid "Hangul" -msgstr "" +msgstr "हाङ्गुल" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:375 msgctxt "hangulhanjaconversiondialog|label6" msgid "Conversion" -msgstr "" +msgstr "रूपान्तरण" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:385 msgctxt "hangulhanjaconversiondialog|hangulonly" msgid "Hangul _only" -msgstr "" +msgstr "हाङ्गुल मात्र" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:402 msgctxt "hangulhanjaconversiondialog|hanjaonly" msgid "Hanja onl_y" -msgstr "" +msgstr "हान्जा मात्र" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:440 -#, fuzzy msgctxt "hangulhanjaconversiondialog|ignore" msgid "_Ignore" msgstr "उपेक्षा गर्नुहोस्" @@ -5780,7 +5707,7 @@ #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:456 msgctxt "hangulhanjaconversiondialog|ignoreall" msgid "Always I_gnore" -msgstr "" +msgstr "सधै वेवास्ता गर्नुहोस्" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:470 msgctxt "hangulhanjaconversiondialog|replace" @@ -5790,12 +5717,12 @@ #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:484 msgctxt "hangulhanjaconversiondialog|replaceall" msgid "Always R_eplace" -msgstr "" +msgstr "सधै बदल्नुहोस्" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:501 msgctxt "hangulhanjaconversiondialog|replacebychar" msgid "Replace b_y character" -msgstr "" +msgstr "y क्यारेक्टर द्वारा बदल्नुहोस्" #: cui/uiconfig/ui/hangulhanjaconversiondialog.ui:517 msgctxt "hangulhanjaconversiondialog|options" @@ -5803,7 +5730,6 @@ msgstr "विकल्प" #: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:9 -#, fuzzy msgctxt "hangulhanjaeditdictdialog|HangulHanjaEditDictDialog" msgid "Edit Custom Dictionary" msgstr "अनुकूल शब्दकोश सम्पादन गर्नुहोस्" @@ -5821,15 +5747,14 @@ #: cui/uiconfig/ui/hangulhanjaeditdictdialog.ui:326 msgctxt "hangulhanjaeditdictdialog|label3" msgid "Suggestions" -msgstr "" +msgstr "सुझावहरू" #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:8 msgctxt "hangulhanjaoptdialog|HangulHanjaOptDialog" msgid "Hangul/Hanja Options" -msgstr "" +msgstr "हाङ्गुल/हान्जा विकल्पहरु" #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:107 -#, fuzzy msgctxt "hangulhanjaoptdialog|new" msgid "New..." msgstr "नयाँ..." @@ -5840,7 +5765,6 @@ msgstr "सम्पादन गर्नुहोस्..." #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:172 -#, fuzzy msgctxt "hangulhanjaoptdialog|label1" msgid "User-defined Dictionaries" msgstr "प्रयोगकर्ता-परिभाषित शब्दकोशहरू" @@ -5848,7 +5772,7 @@ #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:203 msgctxt "hangulhanjaoptdialog|ignorepost" msgid "Ignore post-positional word" -msgstr "" +msgstr "पोष्ट-पोजिसनल शब्द वेवास्ता गर्नुहोस्" #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:218 msgctxt "hangulhanjaoptdialog|showrecentfirst" @@ -5858,7 +5782,7 @@ #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:233 msgctxt "hangulhanjaoptdialog|autoreplaceunique" msgid "Replace all unique entries automatically" -msgstr "" +msgstr "स्वचालित तवरले सबै अद्वितिय प्रविष्टिहरू बदल्नुहोस्" #: cui/uiconfig/ui/hangulhanjaoptdialog.ui:254 msgctxt "hangulhanjaoptdialog|label2" @@ -5871,10 +5795,9 @@ msgstr "परिमार्जन गर्नुहोस्" #: cui/uiconfig/ui/hatchpage.ui:123 -#, fuzzy msgctxt "hatchpage|label2" msgid "Hatch" -msgstr "हेर्नुहोस्" +msgstr "ह्याच" #: cui/uiconfig/ui/hatchpage.ui:164 #, fuzzy @@ -5890,7 +5813,7 @@ #: cui/uiconfig/ui/hatchpage.ui:244 msgctxt "hatchpage|linetypeft" msgid "_Line type:" -msgstr "" +msgstr "रेखा प्रकार" #: cui/uiconfig/ui/hatchpage.ui:260 msgctxt "hatchpage|linetypelb" @@ -5908,10 +5831,9 @@ msgstr "" #: cui/uiconfig/ui/hatchpage.ui:275 -#, fuzzy msgctxt "hatchpage|linecolorft" msgid "Line _color:" -msgstr "रेखा रङ" +msgstr "रेखा रङ:" #: cui/uiconfig/ui/hatchpage.ui:306 msgctxt "hatchpage|backgroundcolor" @@ -5949,19 +5871,16 @@ msgstr "रिसेट गर्नुहोस् " #: cui/uiconfig/ui/hyperlinkdocpage.ui:39 -#, fuzzy msgctxt "hyperlinkdocpage|path_label" msgid "_Path:" msgstr "मार्ग:" #: cui/uiconfig/ui/hyperlinkdocpage.ui:61 -#, fuzzy msgctxt "hyperlinkdocpage|fileopen" msgid "Open File" msgstr "फाईल खोल्नुहोस्" #: cui/uiconfig/ui/hyperlinkdocpage.ui:65 -#, fuzzy msgctxt "hyperlinkdocpage|fileopen|tooltip_text" msgid "Open File" msgstr "फाईल खोल्नुहोस्" @@ -5972,58 +5891,49 @@ msgstr "कागजात" #: cui/uiconfig/ui/hyperlinkdocpage.ui:117 -#, fuzzy msgctxt "hyperlinkdocpage|target_label" msgid "Targ_et:" msgstr "लक्ष्य" #: cui/uiconfig/ui/hyperlinkdocpage.ui:132 -#, fuzzy msgctxt "hyperlinkdocpage|url_label" msgid "URL:" -msgstr "URL" +msgstr "URL:" #: cui/uiconfig/ui/hyperlinkdocpage.ui:142 -#, fuzzy msgctxt "hyperlinkdocpage|browse" msgid "Target in Document" msgstr "कागजातमा लक्ष्य" #: cui/uiconfig/ui/hyperlinkdocpage.ui:146 -#, fuzzy msgctxt "hyperlinkdocpage|browse|tooltip_text" msgid "Target in Document" msgstr "कागजातमा लक्ष्य" #: cui/uiconfig/ui/hyperlinkdocpage.ui:169 -#, fuzzy msgctxt "hyperlinkdocpage|url" msgid "Test text" msgstr "परीक्षण पाठ" #: cui/uiconfig/ui/hyperlinkdocpage.ui:187 -#, fuzzy msgctxt "hyperlinkdocpage|label3" msgid "Target in Document" msgstr "कागजातमा लक्ष्य" #: cui/uiconfig/ui/hyperlinkdocpage.ui:226 -#, fuzzy msgctxt "hyperlinkdocpage|frame_label" msgid "F_rame:" msgstr "फ्रेम:" #: cui/uiconfig/ui/hyperlinkdocpage.ui:241 -#, fuzzy msgctxt "hyperlinkdocpage|indication_label" msgid "Te_xt:" msgstr "पाठ:" #: cui/uiconfig/ui/hyperlinkdocpage.ui:256 -#, fuzzy msgctxt "hyperlinkdocpage|name_label" msgid "N_ame:" -msgstr "नाम" +msgstr "नाम:" #: cui/uiconfig/ui/hyperlinkdocpage.ui:297 msgctxt "hyperlinkdocpage|form_label" @@ -6036,19 +5946,16 @@ msgstr "घटनाहरू" #: cui/uiconfig/ui/hyperlinkdocpage.ui:360 -#, fuzzy msgctxt "hyperlinkdocpage|label1" msgid "Further Settings" -msgstr "अरु सेटिङहरू" +msgstr "अगाडिको सेटिङहरू" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:42 -#, fuzzy msgctxt "hyperlinkinternetpage|linktyp_internet" msgid "_Web" msgstr "वेब" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:58 -#, fuzzy msgctxt "hyperlinkinternetpage|linktyp_ftp" msgid "_FTP" msgstr "FTP" @@ -6056,49 +5963,42 @@ #: cui/uiconfig/ui/hyperlinkinternetpage.ui:84 msgctxt "hyperlinkinternetpage|target_label" msgid "_URL:" -msgstr "" +msgstr "URL:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:110 -#, fuzzy msgctxt "hyperlinkinternetpage|login_label" msgid "_Login name:" -msgstr "लॉगिन नाम" +msgstr "लॉगिन नाम:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:125 -#, fuzzy msgctxt "hyperlinkinternetpage|password_label" msgid "_Password:" -msgstr "पासवर्ड" +msgstr "पासवर्ड:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:159 -#, fuzzy msgctxt "hyperlinkinternetpage|anonymous" msgid "Anonymous _user" -msgstr "बेनामी प्रयोगकर्ता" +msgstr "अज्ञात प्रयोगकर्ता" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:186 -#, fuzzy msgctxt "hyperlinkinternetpage|label2" msgid "Hyperlink Type" msgstr "हाइपरलिङ्क प्रकार" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:224 -#, fuzzy msgctxt "hyperlinkinternetpage|frame_label" msgid "F_rame:" msgstr "फ्रेम:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:239 -#, fuzzy msgctxt "hyperlinkinternetpage|indication_label" msgid "Te_xt:" msgstr "पाठ:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:254 -#, fuzzy msgctxt "hyperlinkinternetpage|name_label" msgid "Na_me:" -msgstr "नाम" +msgstr "नाम:" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:295 msgctxt "hyperlinkinternetpage|form_label" @@ -6111,31 +6011,26 @@ msgstr "घटनाहरू" #: cui/uiconfig/ui/hyperlinkinternetpage.ui:359 -#, fuzzy msgctxt "hyperlinkinternetpage|label1" msgid "Further Settings" -msgstr "अरु सेटिङहरू" +msgstr "अगाडिको सेटिङहरू" #: cui/uiconfig/ui/hyperlinkmailpage.ui:39 -#, fuzzy msgctxt "hyperlinkmailpage|receiver_label" msgid "Re_cipient:" -msgstr "प्रापक" +msgstr "प्रापक:" #: cui/uiconfig/ui/hyperlinkmailpage.ui:61 -#, fuzzy msgctxt "hyperlinkmailpage|adressbook" msgid "Data Sources…" -msgstr "डेटा स्रोत" +msgstr "डेटा स्रोतहरू" #: cui/uiconfig/ui/hyperlinkmailpage.ui:65 -#, fuzzy msgctxt "hyperlinkmailpage|adressbook|tooltip_text" msgid "Data Sources..." -msgstr "डेटा स्रोत..." +msgstr "डेटा स्रोतहरू" #: cui/uiconfig/ui/hyperlinkmailpage.ui:79 -#, fuzzy msgctxt "hyperlinkmailpage|subject_label" msgid "_Subject:" msgstr "विषय:" @@ -6143,10 +6038,9 @@ #: cui/uiconfig/ui/hyperlinkmailpage.ui:116 msgctxt "hyperlinkmailpage|label2" msgid "Mail" -msgstr "" +msgstr "मेल" #: cui/uiconfig/ui/hyperlinkmailpage.ui:155 -#, fuzzy msgctxt "hyperlinkmailpage|frame_label" msgid "F_rame:" msgstr "फ्रेम:" @@ -6436,7 +6330,7 @@ #: cui/uiconfig/ui/insertoleobject.ui:100 msgctxt "insertoleobject|createnew" msgid "Create new" -msgstr "" +msgstr "नयाँ सिर्जना गर्नुहोस्" #: cui/uiconfig/ui/insertoleobject.ui:117 msgctxt "insertoleobject|createfromfile" @@ -6505,22 +6399,22 @@ #: cui/uiconfig/ui/javaclasspathdialog.ui:18 msgctxt "javaclasspathdialog|JavaClassPath" msgid "Class Path" -msgstr "" +msgstr "वर्ग बाटो" #: cui/uiconfig/ui/javaclasspathdialog.ui:105 msgctxt "javaclasspathdialog|label1" msgid "A_ssigned folders and archives" -msgstr "" +msgstr "मानाङ्कन गरिएका फोल्डरहरू र सङ्ग्रहहरू" #: cui/uiconfig/ui/javaclasspathdialog.ui:180 msgctxt "javaclasspathdialog|archive" msgid "_Add Archive..." -msgstr "" +msgstr "सङ्ग्रह थप्नुहोस" #: cui/uiconfig/ui/javaclasspathdialog.ui:194 msgctxt "javaclasspathdialog|folder" msgid "Add _Folder" -msgstr "" +msgstr "फोल्डर थप्नुहोस" #: cui/uiconfig/ui/javaclasspathdialog.ui:208 msgctxt "javaclasspathdialog|remove" @@ -6530,12 +6424,12 @@ #: cui/uiconfig/ui/javastartparametersdialog.ui:16 msgctxt "javastartparametersdialog|JavaStartParameters" msgid "Java Start Parameters" -msgstr "" +msgstr "जाभा सुरु परामितिहरू" #: cui/uiconfig/ui/javastartparametersdialog.ui:107 msgctxt "javastartparametersdialog|label4" msgid "Java start _parameter" -msgstr "" +msgstr "जाभा सुरु परामिति" #: cui/uiconfig/ui/javastartparametersdialog.ui:132 msgctxt "javastartparametersdialog|label5" @@ -6801,7 +6695,7 @@ #: cui/uiconfig/ui/linetabpage.ui:648 msgctxt "linetabpage|FT_EDGE_STYLE" msgid "_Corner style:" -msgstr "" +msgstr "किनारा शैली" #: cui/uiconfig/ui/linetabpage.ui:662 msgctxt "linetabpage|FT_CAP_STYLE" @@ -6898,12 +6792,12 @@ #: cui/uiconfig/ui/macroassignpage.ui:70 msgctxt "macroassignpage|assignft" msgid "Assigned Action" -msgstr "" +msgstr "मानाङ्कन गरिएको कार्य" #: cui/uiconfig/ui/macroassignpage.ui:95 msgctxt "macroassignpage|libraryft1" msgid "Assignments" -msgstr "" +msgstr "पङ्क्तिबद्धता" #: cui/uiconfig/ui/macroassignpage.ui:130 #, fuzzy @@ -6976,7 +6870,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:13 msgctxt "menuassignpage|gear_add" msgid "_Add..." -msgstr "" +msgstr "थप्नुहोस्..." #: cui/uiconfig/ui/menuassignpage.ui:21 msgctxt "menuassignpage|gear_delete" @@ -6986,7 +6880,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:29 msgctxt "menuassignpage|gear_rename" msgid "_Rename..." -msgstr "" +msgstr "नाम फेर्नुहोस्..." #: cui/uiconfig/ui/menuassignpage.ui:37 msgctxt "menuassignpage|gear_move" @@ -7006,7 +6900,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:67 msgctxt "menuassignpage|gear_textOnly" msgid "_Text only" -msgstr "" +msgstr "पाठ मात्र" #: cui/uiconfig/ui/menuassignpage.ui:119 #, fuzzy @@ -7022,7 +6916,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:157 msgctxt "menuassignpage|label33" msgid "D_escription" -msgstr "" +msgstr "वर्णन" #: cui/uiconfig/ui/menuassignpage.ui:191 #, fuzzy @@ -7092,22 +6986,22 @@ #: cui/uiconfig/ui/menuassignpage.ui:518 msgctxt "menuassignpage|moveupbtn" msgid "Move up" -msgstr "" +msgstr "माथि सार्नुहोस्" #: cui/uiconfig/ui/menuassignpage.ui:531 msgctxt "menuassignpage|movedownbtn" msgid "Move down" -msgstr "" +msgstr "तल सार्नुहोस्" #: cui/uiconfig/ui/menuassignpage.ui:550 msgctxt "menuassignpage|scopelabel" msgid "S_cope" -msgstr "" +msgstr "कार्यक्षेत्र" #: cui/uiconfig/ui/menuassignpage.ui:563 msgctxt "menuassignpage|targetlabel" msgid "_Target" -msgstr "" +msgstr "लक्ष्य" #: cui/uiconfig/ui/menuassignpage.ui:576 msgctxt "menuassignpage|functionlabel" @@ -7150,7 +7044,7 @@ #: cui/uiconfig/ui/menuassignpage.ui:715 msgctxt "menuassignpage|restoreItem" msgid "Restore Default Command" -msgstr "" +msgstr "पूर्वनिर्धारित आदेश पूर्वावस्थामा ल्याउनुहोस्" #: cui/uiconfig/ui/mosaicdialog.ui:21 msgctxt "mosaicdialog|MosaicDialog" @@ -7165,7 +7059,7 @@ #: cui/uiconfig/ui/mosaicdialog.ui:196 msgctxt "mosaicdialog|height" msgid "2" -msgstr "" +msgstr "२" #: cui/uiconfig/ui/mosaicdialog.ui:209 msgctxt "mosaicdialog|label3" @@ -7186,17 +7080,17 @@ #: cui/uiconfig/ui/movemenu.ui:26 msgctxt "movemenu|MoveMenuDialog" msgid "New Menu" -msgstr "" +msgstr "नयाँ मेनु" #: cui/uiconfig/ui/movemenu.ui:112 msgctxt "movemenu|menunameft" msgid "Menu name:" -msgstr "" +msgstr "मेनु नाम" #: cui/uiconfig/ui/movemenu.ui:155 msgctxt "movemenu|label1" msgid "Menu _position:" -msgstr "" +msgstr "मेनु स्थान" #: cui/uiconfig/ui/movemenu.ui:228 msgctxt "movemenu|up-atkobject" @@ -7238,12 +7132,12 @@ #: cui/uiconfig/ui/newlibdialog.ui:8 msgctxt "newlibdialog|NewLibDialog" msgid "Create Library" -msgstr "" +msgstr "लाइब्रेरी सिर्जना गर्नुहोस्" #: cui/uiconfig/ui/newlibdialog.ui:71 msgctxt "newlibdialog|newlibft" msgid "Enter the name for the new library." -msgstr "" +msgstr "लाइब्रेरीको नयाँ नाम प्रविष्ट गर्नुहोस्।" #: cui/uiconfig/ui/newlibdialog.ui:97 msgctxt "newlibdialog|newmacroft" @@ -7253,12 +7147,12 @@ #: cui/uiconfig/ui/newlibdialog.ui:111 msgctxt "newlibdialog|renameft" msgid "Enter the new name for the selected object." -msgstr "" +msgstr "चयन गरिएको ‌वस्तुको नयाँ नाम प्रविष्ट गर्नुहोस् ।" #: cui/uiconfig/ui/newlibdialog.ui:125 msgctxt "newlibdialog|altmacrotitle" msgid "Create Macro" -msgstr "" +msgstr "म्याक्रो सिर्जना गर्नुहोस्" #: cui/uiconfig/ui/newlibdialog.ui:137 #, fuzzy @@ -8528,13 +8422,11 @@ msgstr "" #: cui/uiconfig/ui/optjsearchpage.ui:405 -#, fuzzy msgctxt "optjsearchpage|label2" msgid "Ignore" msgstr "उपेक्षा गर्नुहोस्" #: cui/uiconfig/ui/optlanguagespage.ui:37 -#, fuzzy msgctxt "optlanguagespage|label4" msgid "_User interface:" msgstr "प्रयोगकर्ता इन्टरफेस" @@ -8542,13 +8434,12 @@ #: cui/uiconfig/ui/optlanguagespage.ui:51 msgctxt "optlanguagespage|localesettingFT" msgid "Locale setting:" -msgstr "" +msgstr "लोकेल सेटिङ:" #: cui/uiconfig/ui/optlanguagespage.ui:65 -#, fuzzy msgctxt "optlanguagespage|label6" msgid "Decimal separator key:" -msgstr "दशमलब विभाजक" +msgstr "दशमलब विभाजक कुंजी:" #: cui/uiconfig/ui/optlanguagespage.ui:79 msgctxt "optlanguagespage|defaultcurrency" @@ -11318,10 +11209,9 @@ msgstr "" #: cui/uiconfig/ui/smarttagoptionspage.ui:70 -#, fuzzy msgctxt "smarttagoptionspage|properties" msgid "Properties..." -msgstr "गुणहरू" +msgstr "गुणहरू..." #: cui/uiconfig/ui/smarttagoptionspage.ui:145 msgctxt "smarttagoptionspage|label1" @@ -11339,7 +11229,6 @@ msgstr "" #: cui/uiconfig/ui/smoothdialog.ui:183 -#, fuzzy msgctxt "smoothdialog|label1" msgid "Parameters" msgstr "परामितिहरू" @@ -11352,16 +11241,14 @@ #: cui/uiconfig/ui/solarizedialog.ui:156 msgctxt "solarizedialog|label2" msgid "Threshold _value:" -msgstr "" +msgstr "थ्रेसहोल्ड मान:" #: cui/uiconfig/ui/solarizedialog.ui:168 -#, fuzzy msgctxt "solarizedialog|invert" msgid "_Invert" -msgstr "घुसाउनुहोस्" +msgstr "उल्ट्याउनुहोस्" #: cui/uiconfig/ui/solarizedialog.ui:195 -#, fuzzy msgctxt "solarizedialog|label1" msgid "Parameters" msgstr "परामितिहरू" @@ -11377,22 +11264,19 @@ msgstr "घुसाउनुहोस्" #: cui/uiconfig/ui/specialcharacters.ui:107 -#, fuzzy msgctxt "specialcharacters|subsetft" msgid "Subset:" -msgstr "उपसेट" +msgstr "उपसेट:" #: cui/uiconfig/ui/specialcharacters.ui:121 -#, fuzzy msgctxt "specialcharacters|fontft" msgid "Font:" -msgstr "फन्ट" +msgstr "फन्ट:" #: cui/uiconfig/ui/specialcharacters.ui:135 -#, fuzzy msgctxt "specialcharacters|srchft" msgid "Search:" -msgstr "खोज गर्नुहोस्" +msgstr "खोज गर्नुहोस्:" #: cui/uiconfig/ui/specialcharacters.ui:221 msgctxt "specialcharacters|hexlabel" @@ -11400,10 +11284,9 @@ msgstr "" #: cui/uiconfig/ui/specialcharacters.ui:274 -#, fuzzy msgctxt "specialcharacters|decimallabel" msgid "Decimal:" -msgstr "दशमलब" +msgstr "दशमलब:" #: cui/uiconfig/ui/specialcharacters.ui:298 msgctxt "specialcharacters|favbtn" @@ -11431,20 +11314,19 @@ msgstr "" #: cui/uiconfig/ui/spellingdialog.ui:38 -#, fuzzy msgctxt "spellingdialog|options" msgid "_Options..." -msgstr "विकल्प..." +msgstr "विकल्पहरु..." #: cui/uiconfig/ui/spellingdialog.ui:110 msgctxt "spellingdialog|ignore" msgid "_Ignore Once" -msgstr "" +msgstr "एक पटक वेवास्ता गर्नुहोस्" #: cui/uiconfig/ui/spellingdialog.ui:138 msgctxt "spellingdialog|change" msgid "Co_rrect" -msgstr "" +msgstr "सहि" #: cui/uiconfig/ui/spellingdialog.ui:152 msgctxt "spellingdialog|changeall" @@ -11464,7 +11346,7 @@ #: cui/uiconfig/ui/spellingdialog.ui:196 msgctxt "spellingdialog|ignoreall" msgid "I_gnore All" -msgstr "" +msgstr "सबै वेवास्ता गर्नुहोस्" #: cui/uiconfig/ui/spellingdialog.ui:210 msgctxt "spellingdialog|ignorerule" @@ -11474,7 +11356,7 @@ #: cui/uiconfig/ui/spellingdialog.ui:226 msgctxt "spellingdialog|languageft" msgid "Text languag_e:" -msgstr "" +msgstr "पाठ भाषा:" #: cui/uiconfig/ui/spellingdialog.ui:252 msgctxt "spellingdialog|explainlink" @@ -11499,17 +11381,17 @@ #: cui/uiconfig/ui/spellingdialog.ui:320 msgctxt "spellingdialog|add" msgid "_Add to Dictionary" -msgstr "" +msgstr "शब्दकोशमा थप्नुहोस" #: cui/uiconfig/ui/spellingdialog.ui:334 msgctxt "spellingdialog|addmb" msgid "_Add to Dictionary" -msgstr "" +msgstr "शब्दकोशमा थप्नुहोस" #: cui/uiconfig/ui/spellingdialog.ui:350 msgctxt "spellingdialog|suggestionsft" msgid "_Suggestions" -msgstr "" +msgstr "सुझावहरू" #: cui/uiconfig/ui/spellingdialog.ui:366 msgctxt "spellingdialog|notindictft" @@ -11522,7 +11404,6 @@ msgstr "टाँस्नुहोस्" #: cui/uiconfig/ui/spellingdialog.ui:401 -#, fuzzy msgctxt "spellingdialog|insert" msgid "Special Character" msgstr "विशेष क्यारेक्टरहरू" @@ -11579,13 +11460,11 @@ msgstr "" #: cui/uiconfig/ui/storedwebconnectiondialog.ui:87 -#, fuzzy msgctxt "storedwebconnectiondialog|website" msgid "Website" -msgstr "मेरो वेबसाइट" +msgstr "वेबसाइट" #: cui/uiconfig/ui/storedwebconnectiondialog.ui:98 -#, fuzzy msgctxt "storedwebconnectiondialog|username" msgid "User name" msgstr "प्रयोगकर्ता नाम" @@ -11596,7 +11475,6 @@ msgstr "" #: cui/uiconfig/ui/storedwebconnectiondialog.ui:162 -#, fuzzy msgctxt "storedwebconnectiondialog|change" msgid "_Change Password..." msgstr "पासवर्ड परिवर्तन गर्नुहोस्..." @@ -11607,13 +11485,11 @@ msgstr "चौडाइ:" #: cui/uiconfig/ui/swpossizepage.ui:123 -#, fuzzy msgctxt "swpossizepage|heightft" msgid "H_eight:" msgstr "उचाइ" #: cui/uiconfig/ui/swpossizepage.ui:141 -#, fuzzy msgctxt "swpossizepage|ratio" msgid "_Keep ratio" msgstr "अनुपात राख्नुहोस्" @@ -11624,31 +11500,26 @@ msgstr "साइज" #: cui/uiconfig/ui/swpossizepage.ui:218 -#, fuzzy msgctxt "swpossizepage|topage" msgid "To _page" msgstr "पृष्ठमा" #: cui/uiconfig/ui/swpossizepage.ui:234 -#, fuzzy msgctxt "swpossizepage|topara" msgid "To paragrap_h" -msgstr "अनुच्छेद" +msgstr "अनुच्छेदमा" #: cui/uiconfig/ui/swpossizepage.ui:250 -#, fuzzy msgctxt "swpossizepage|tochar" msgid "To cha_racter" msgstr "क्यारेक्टरमा" #: cui/uiconfig/ui/swpossizepage.ui:266 -#, fuzzy msgctxt "swpossizepage|aschar" msgid "_As character" -msgstr "क्यारेक्टर जस्तो" +msgstr "क्यारेक्टरको रूपमा" #: cui/uiconfig/ui/swpossizepage.ui:282 -#, fuzzy msgctxt "swpossizepage|toframe" msgid "To _frame" msgstr "फ्रेममा" @@ -11659,7 +11530,6 @@ msgstr "एङ्कर" #: cui/uiconfig/ui/swpossizepage.ui:344 -#, fuzzy msgctxt "swpossizepage|horiposft" msgid "Hori_zontal:" msgstr "तेर्सो" @@ -11675,16 +11545,14 @@ msgstr "" #: cui/uiconfig/ui/swpossizepage.ui:386 -#, fuzzy msgctxt "swpossizepage|horitoft" msgid "_to:" -msgstr "लाई" +msgstr "लाई:" #: cui/uiconfig/ui/swpossizepage.ui:433 -#, fuzzy msgctxt "swpossizepage|vertposft" msgid "_Vertical:" -msgstr "ठाडो" +msgstr "ठाडो:" #: cui/uiconfig/ui/swpossizepage.ui:470 msgctxt "swpossizepage|verttoft" @@ -11707,31 +11575,26 @@ msgstr "स्थान" #: cui/uiconfig/ui/swpossizepage.ui:563 -#, fuzzy msgctxt "swpossizepage|pos" msgid "Positio_n" msgstr "स्थान" #: cui/uiconfig/ui/swpossizepage.ui:579 -#, fuzzy msgctxt "swpossizepage|size" msgid "_Size" -msgstr "साइज" +msgstr "आकार" #: cui/uiconfig/ui/swpossizepage.ui:601 -#, fuzzy msgctxt "swpossizepage|label3" msgid "Protect" msgstr "सुरक्षा" #: cui/uiconfig/ui/textanimtabpage.ui:63 -#, fuzzy msgctxt "textanimtabpage|FT_EFFECTS" msgid "E_ffect:" -msgstr "प्रभावहरू" +msgstr "प्रभाव:" #: cui/uiconfig/ui/textanimtabpage.ui:80 -#, fuzzy msgctxt "textanimtabpage|liststoreEFFECT" msgid "No Effect" msgstr "प्रभाव पर्दैन" @@ -11757,10 +11620,9 @@ msgstr "भित्र स्क्रोल गर्नुहोस्" #: cui/uiconfig/ui/textanimtabpage.ui:111 -#, fuzzy msgctxt "textanimtabpage|FT_DIRECTION" msgid "Direction:" -msgstr "दिशा" +msgstr "दिशा:" #: cui/uiconfig/ui/textanimtabpage.ui:131 msgctxt "textanimtabpage|BTN_UP|tooltip_text" @@ -11805,7 +11667,7 @@ #: cui/uiconfig/ui/textanimtabpage.ui:269 msgctxt "textanimtabpage|TSB_START_INSIDE" msgid "S_tart inside" -msgstr "" +msgstr "भित्र सुरु गर्नुहोस्" #: cui/uiconfig/ui/textanimtabpage.ui:286 msgctxt "textanimtabpage|TSB_STOP_INSIDE" @@ -11818,7 +11680,6 @@ msgstr "" #: cui/uiconfig/ui/textanimtabpage.ui:323 -#, fuzzy msgctxt "textanimtabpage|TSB_ENDLESS" msgid "_Continuous" msgstr "निरन्तर" @@ -11826,21 +11687,19 @@ #: cui/uiconfig/ui/textanimtabpage.ui:368 msgctxt "textanimtabpage|FT_AMOUNT" msgid "Increment:" -msgstr "" +msgstr "वृद्धि:" #: cui/uiconfig/ui/textanimtabpage.ui:386 msgctxt "textanimtabpage|TSB_PIXEL" msgid "_Pixels" -msgstr "" +msgstr "पिक्सेलहरू" #: cui/uiconfig/ui/textanimtabpage.ui:431 -#, fuzzy msgctxt "textanimtabpage|FT_DELAY" msgid "Delay:" -msgstr "ढिलाई" +msgstr "विलम्ब:" #: cui/uiconfig/ui/textanimtabpage.ui:449 -#, fuzzy msgctxt "textanimtabpage|TSB_AUTO" msgid "_Automatic" msgstr "स्वचालित" @@ -11869,7 +11728,7 @@ #: cui/uiconfig/ui/textattrtabpage.ui:108 msgctxt "textattrtabpage|TSB_CONTOUR" msgid "_Adjust to contour" -msgstr "" +msgstr "रूपरेखामा समायोजन गर्नुहोस्" #: cui/uiconfig/ui/textattrtabpage.ui:130 #, fuzzy @@ -11894,25 +11753,21 @@ msgstr "" #: cui/uiconfig/ui/textattrtabpage.ui:248 -#, fuzzy msgctxt "textattrtabpage|label4" msgid "_Left:" msgstr "बायाँ:" #: cui/uiconfig/ui/textattrtabpage.ui:262 -#, fuzzy msgctxt "textattrtabpage|label5" msgid "_Right:" msgstr "दायाँ:" #: cui/uiconfig/ui/textattrtabpage.ui:276 -#, fuzzy msgctxt "textattrtabpage|label6" msgid "_Top:" msgstr "माथि:" #: cui/uiconfig/ui/textattrtabpage.ui:290 -#, fuzzy msgctxt "textattrtabpage|label7" msgid "_Bottom:" msgstr "तल:" @@ -11923,10 +11778,9 @@ msgstr "" #: cui/uiconfig/ui/textattrtabpage.ui:423 -#, fuzzy msgctxt "textattrtabpage|TSB_FULL_WIDTH" msgid "Full _width" -msgstr "पूरा-चौडाइ" +msgstr "पूरा_चौडाइ" #: cui/uiconfig/ui/textattrtabpage.ui:446 msgctxt "textattrtabpage|label3" @@ -11979,28 +11833,24 @@ msgstr "घुसाउनुहोस्" #: cui/uiconfig/ui/textflowpage.ui:233 -#, fuzzy msgctxt "textflowpage|checkPageStyle" msgid "With page st_yle:" msgstr "पृष्ठ शैलीसँग" #: cui/uiconfig/ui/textflowpage.ui:255 -#, fuzzy msgctxt "textflowpage|labelType" msgid "_Type:" msgstr "प्रकार" #: cui/uiconfig/ui/textflowpage.ui:282 -#, fuzzy msgctxt "textflowpage|labelPageNum" msgid "Page _number:" -msgstr "पृष्ठ सङ्ख्या" +msgstr "पृष्ठ सङ्ख्या:" #: cui/uiconfig/ui/textflowpage.ui:303 -#, fuzzy msgctxt "textflowpage|labelPosition" msgid "Position:" -msgstr "स्थान" +msgstr "स्थान:" #: cui/uiconfig/ui/textflowpage.ui:323 msgctxt "textflowpage|comboPageStyle-atkobject" @@ -12030,10 +11880,9 @@ #: cui/uiconfig/ui/textflowpage.ui:371 msgctxt "textflowpage|label3" msgid "Breaks" -msgstr "" +msgstr "बिच्छेदहरू" #: cui/uiconfig/ui/textflowpage.ui:403 -#, fuzzy msgctxt "textflowpage|checkSplitPara" msgid "_Do not split paragraph" msgstr "अनुच्छेद विभाजन नगर्नुहोस्" @@ -12046,7 +11895,7 @@ #: cui/uiconfig/ui/textflowpage.ui:435 msgctxt "textflowpage|checkOrphan" msgid "_Orphan control" -msgstr "" +msgstr "अर्फ्यान नियन्त्रण" #: cui/uiconfig/ui/textflowpage.ui:454 msgctxt "textflowpage|checkWidow" @@ -12054,16 +11903,14 @@ msgstr "" #: cui/uiconfig/ui/textflowpage.ui:507 -#, fuzzy msgctxt "textflowpage|labelOrphan" msgid "lines" msgstr "लाइनहरू" #: cui/uiconfig/ui/textflowpage.ui:519 -#, fuzzy msgctxt "textflowpage|labelWidow" msgid "lines" -msgstr "लाइनहरू" +msgstr "रेखाहरू" #: cui/uiconfig/ui/textflowpage.ui:547 msgctxt "textflowpage|labelOptions" @@ -12081,10 +11928,9 @@ msgstr "बदल्नुहोस्" #: cui/uiconfig/ui/thesaurus.ui:89 -#, fuzzy msgctxt "thesaurus|label1" msgid "Current word:" -msgstr "हालको शब्द" +msgstr "हालको शब्द:" #: cui/uiconfig/ui/thesaurus.ui:104 #, fuzzy @@ -12093,7 +11939,6 @@ msgstr "वैकल्पिक" #: cui/uiconfig/ui/thesaurus.ui:119 -#, fuzzy msgctxt "thesaurus|label3" msgid "Replace with:" msgstr "यससँग प्रतिस्थापन गर्नुहोस्" diff -Nru libreoffice-6.2.2/translations/source/ne/extras/source/autocorr/emoji.po libreoffice-6.2.3/translations/source/ne/extras/source/autocorr/emoji.po --- libreoffice-6.2.2/translations/source/ne/extras/source/autocorr/emoji.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/extras/source/autocorr/emoji.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2017-12-20 08:16+0100\n" -"PO-Revision-Date: 2018-04-27 01:47+0000\n" -"Last-Translator: Dipesh Kumar \n" +"PO-Revision-Date: 2019-04-03 06:16+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1524793663.000000\n" +"X-POOTLE-MTIME: 1554272211.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -301,13 +301,12 @@ #. Υ (U+003A5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_CAPITAL_LETTER_UPSILON\n" "LngText.text" msgid "Upsilon" -msgstr "एप्सिलन" +msgstr "अप्सिलन" #. Φ (U+003A6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -316,7 +315,7 @@ "GREEK_CAPITAL_LETTER_PHI\n" "LngText.text" msgid "Phi" -msgstr "" +msgstr "फाई" #. Χ (U+003A7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -325,7 +324,7 @@ "GREEK_CAPITAL_LETTER_CHI\n" "LngText.text" msgid "Chi" -msgstr "" +msgstr "काई" #. Ψ (U+003A8), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -334,11 +333,10 @@ "GREEK_CAPITAL_LETTER_PSI\n" "LngText.text" msgid "Psi" -msgstr "" +msgstr "साई" #. Ω (U+003A9), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_CAPITAL_LETTER_OMEGA\n" @@ -501,13 +499,12 @@ #. ς (U+003C2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SMALL_LETTER_FINAL_SIGMA\n" "LngText.text" msgid "sigma2" -msgstr "सीग्मा" +msgstr "सीग्मा२" #. σ (U+003C3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -583,7 +580,6 @@ #. – (U+02013), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EN_DASH\n" @@ -593,7 +589,6 @@ #. — (U+02014), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EM_DASH\n" @@ -603,7 +598,6 @@ #. ’ (U+02019), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "RIGHT_SINGLE_QUOTATION_MARK\n" @@ -631,7 +625,6 @@ #. • (U+02022), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BULLET\n" @@ -650,7 +643,6 @@ #. … (U+02026), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "HORIZONTAL_ELLIPSIS\n" @@ -696,7 +688,6 @@ #. ‼ (U+0203C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "DOUBLE_EXCLAMATION_MARK\n" @@ -706,7 +697,6 @@ #. ⁉ (U+02049), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EXCLAMATION_QUESTION_MARK\n" @@ -797,13 +787,12 @@ #. ℹ (U+02139), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "INFORMATION_SOURCE\n" "LngText.text" msgid "information" -msgstr "सूचना" +msgstr "सुचना" #. ← (U+02190), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -812,7 +801,7 @@ "LEFTWARDS_ARROW\n" "LngText.text" msgid "W" -msgstr "" +msgstr "W" #. ↑ (U+02191), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -821,7 +810,7 @@ "UPWARDS_ARROW\n" "LngText.text" msgid "N" -msgstr "" +msgstr "N" #. → (U+02192), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -830,7 +819,7 @@ "RIGHTWARDS_ARROW\n" "LngText.text" msgid "E" -msgstr "" +msgstr "E" #. ↓ (U+02193), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -839,7 +828,7 @@ "DOWNWARDS_ARROW\n" "LngText.text" msgid "S" -msgstr "" +msgstr "S" #. ↔ (U+02194), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -848,7 +837,7 @@ "LEFT_RIGHT_ARROW\n" "LngText.text" msgid "EW" -msgstr "" +msgstr "EW" #. ↕ (U+02195), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -857,7 +846,7 @@ "UP_DOWN_ARROW\n" "LngText.text" msgid "NS" -msgstr "" +msgstr "NS" #. ↖ (U+02196), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -866,7 +855,7 @@ "NORTH_WEST_ARROW\n" "LngText.text" msgid "NW" -msgstr "" +msgstr "NW" #. ↗ (U+02197), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -875,7 +864,7 @@ "NORTH_EAST_ARROW\n" "LngText.text" msgid "NE" -msgstr "" +msgstr "NE" #. ↘ (U+02198), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -884,7 +873,7 @@ "SOUTH_EAST_ARROW\n" "LngText.text" msgid "SE" -msgstr "" +msgstr "SE" #. ↙ (U+02199), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -893,7 +882,7 @@ "SOUTH_WEST_ARROW\n" "LngText.text" msgid "SW" -msgstr "" +msgstr "SW" #. ⇐ (U+021D0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-6.2.2/translations/source/ne/helpcontent2/source/auxiliary.po libreoffice-6.2.3/translations/source/ne/helpcontent2/source/auxiliary.po --- libreoffice-6.2.2/translations/source/ne/helpcontent2/source/auxiliary.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/helpcontent2/source/auxiliary.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-07-19 13:30+0200\n" -"PO-Revision-Date: 2018-05-28 04:49+0000\n" +"PO-Revision-Date: 2019-03-31 03:47+0000\n" "Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1527482958.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1554004071.000000\n" #: sbasic.tree msgctxt "" @@ -62,7 +62,7 @@ "070205\n" "node.text" msgid "Advanced Basic Libraries" -msgstr "" +msgstr "उन्नत साधारण लाइब्रेरीहरू" #: sbasic.tree msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ne/helpcontent2/source/text/sbasic/shared.po libreoffice-6.2.3/translations/source/ne/helpcontent2/source/text/sbasic/shared.po --- libreoffice-6.2.2/translations/source/ne/helpcontent2/source/text/sbasic/shared.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/helpcontent2/source/text/sbasic/shared.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2018-11-16 22:41+0100\n" -"PO-Revision-Date: 2018-10-21 20:27+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-31 03:49+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1540153658.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1554004150.000000\n" #: 00000002.xhp msgctxt "" @@ -6742,7 +6742,7 @@ "par_id3150751\n" "help.text" msgid "Add the Exclamation Point icon to the dialog." -msgstr "" +msgstr "संवादमा उद्घाटन प्वाइन्ट प्रतिमा थप्नुहोस्।" #: 03010101.xhp msgctxt "" @@ -6990,7 +6990,7 @@ "par_id3150716\n" "help.text" msgid "Add the Stop icon to the dialog." -msgstr "" +msgstr "संवादमा रोक् आइकनमा थप्नुहोस्।" #: 03010102.xhp msgctxt "" @@ -7006,7 +7006,7 @@ "par_id3150751\n" "help.text" msgid "Add the Exclamation Point icon to the dialog." -msgstr "" +msgstr "संवादमा उद्घाटन प्वाइन्ट प्रतिमा थप्नुहोस्।" #: 03010102.xhp msgctxt "" @@ -7758,7 +7758,7 @@ "hd_id3148947\n" "help.text" msgid "Red Function" -msgstr "" +msgstr "रातो प्रकार्य" #: 03010303.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ne/svx/messages.po libreoffice-6.2.3/translations/source/ne/svx/messages.po --- libreoffice-6.2.2/translations/source/ne/svx/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ne/svx/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2018-11-12 12:05+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"PO-Revision-Date: 2019-03-20 15:02+0000\n" +"Last-Translator: सन्जोग सिग्देल \n" "Language-Team: LANGUAGE \n" "Language: ne\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1542024353.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553094154.000000\n" #: include/svx/strings.hrc:25 #, fuzzy @@ -8923,7 +8923,7 @@ #: svx/inc/spacing.hrc:61 msgctxt "RID_SVXSTRARY_MARGINS_CM" msgid "None" -msgstr "" +msgstr "कोहि पनि होइन" #: svx/inc/spacing.hrc:62 msgctxt "RID_SVXSTRARY_MARGINS_CM" @@ -8991,16 +8991,15 @@ msgstr "$(ERR) ग्राफिक्स लोड गर्दा ।" #: svx/inc/svxerr.hrc:51 -#, fuzzy msgctxt "RID_SVXERRCODE" msgid "" "$(ARG1) is not supported by the spellcheck function or is not presently active.\n" "Please check your installation and, if necessary, install the required language module\n" "or activate it under 'Tools - Options - Language Settings - Writing Aids'." msgstr "" -"$(ARG1) हिज्जेजाँच प्रकार्यद्वारा समर्थित छैन वा हाल सक्रिय छैन ।\n" -"कृपया तपाईँको स्थापना जाँच गर्नुहोस् र यदि आवश्यक छ भने चाहेको भाषा मोड्युल स्थापना गर्नुहोस्\n" -" वा यसलाई 'उपकरणहरू - विकल्प - भाषा सेटिङ - लिखित विज्ञापन' अन्तर्गत सक्रिय पार्नुहोस् ।" +"$(ARG1) लाई हिज्जे जाँच प्रकार्यद्वारा समर्थित छैन वा वर्तमानमा सक्रिय छैन\n" +"कृपया तपाईँको स्थापना जाँच गर्नुहोस् र यदि आवश्यक छ भने चाहेको भाषा मोड्युल स्थापना गर्नुहोस्वा\n" +" यसलाई 'उपकरणहरू - विकल्प - भाषा सेटिङ - लिखित विज्ञापन' अन्तर्गत सक्रिय पार्नुहोस् ।" #: svx/inc/svxerr.hrc:53 msgctxt "RID_SVXERRCODE" @@ -9030,7 +9029,7 @@ #: svx/inc/svxerr.hrc:63 msgctxt "RID_SVXERRCODE" msgid "All changes to the Basic Code are lost. The original VBA Macro Code is saved instead." -msgstr "" +msgstr "आधारभूत सङ्केतका सबै परिवर्तनहरू हराएका छन्। मौलिक VBA म्याक्रो सङ्केत बचत गरिएको छ।" #: svx/inc/svxerr.hrc:65 msgctxt "RID_SVXERRCODE" diff -Nru libreoffice-6.2.2/translations/source/nl/cui/messages.po libreoffice-6.2.3/translations/source/nl/cui/messages.po --- libreoffice-6.2.2/translations/source/nl/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/nl/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-01-13 21:55+0000\n" -"Last-Translator: vpanter \n" +"PO-Revision-Date: 2019-04-03 08:55+0000\n" +"Last-Translator: Cor Nouws \n" "Language-Team: LANGUAGE \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1547416545.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1554281721.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -8755,7 +8755,7 @@ #: cui/uiconfig/ui/optuserpage.ui:12 msgctxt "optuserpage|liststore1" msgid "No key" -msgstr "Geen toets" +msgstr "Geen sleutel" #: cui/uiconfig/ui/optuserpage.ui:45 msgctxt "optuserpage|companyft" diff -Nru libreoffice-6.2.2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-02-27 10:54+0000\n" +"PO-Revision-Date: 2019-03-31 18:47+0000\n" "Last-Translator: Piotr Roszkowski \n" "Language-Team: LANGUAGE \n" "Language: pl\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551264864.000000\n" +"X-POOTLE-MTIME: 1554058070.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -8906,7 +8906,7 @@ "TooltipLabel\n" "value.text" msgid "Zoom & Pan (CTRL to Zoom Out, SHIFT to Pan)" -msgstr "" +msgstr "Zmiana rozmiaru i przesuwanie (CTRL, aby zmniejszyć. SHIFT, aby przesunąć)" #: DrawImpressCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/pt/formula/messages.po libreoffice-6.2.3/translations/source/pt/formula/messages.po --- libreoffice-6.2.2/translations/source/pt/formula/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/pt/formula/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-05 17:38+0100\n" -"PO-Revision-Date: 2019-01-15 13:18+0000\n" +"PO-Revision-Date: 2019-04-01 12:41+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1547558308.000000\n" +"X-POOTLE-MTIME: 1554122506.000000\n" #: formula/inc/core_resource.hrc:2263 msgctxt "RID_STRLIST_FUNCTION_NAMES" @@ -2026,7 +2026,7 @@ #: formula/inc/core_resource.hrc:2672 msgctxt "RID_STRLIST_FUNCTION_NAMES" msgid "FILTERXML" -msgstr "FILTROXML" +msgstr "FILTRARXML" #: formula/inc/core_resource.hrc:2673 msgctxt "RID_STRLIST_FUNCTION_NAMES" @@ -2051,7 +2051,7 @@ #: formula/inc/core_resource.hrc:2677 msgctxt "RID_STRLIST_FUNCTION_NAMES" msgid "ENCODEURL" -msgstr "CODIFURL" +msgstr "CODIFICAÇÃOURL" #: formula/inc/core_resource.hrc:2678 msgctxt "RID_STRLIST_FUNCTION_NAMES" diff -Nru libreoffice-6.2.2/translations/source/pt/helpcontent2/source/text/scalc/01.po libreoffice-6.2.3/translations/source/pt/helpcontent2/source/text/scalc/01.po --- libreoffice-6.2.2/translations/source/pt/helpcontent2/source/text/scalc/01.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/pt/helpcontent2/source/text/scalc/01.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-01-15 13:18+0000\n" +"PO-Revision-Date: 2019-04-01 12:40+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1547558302.000000\n" +"X-POOTLE-MTIME: 1554122450.000000\n" #: 01120000.xhp msgctxt "" @@ -55910,7 +55910,7 @@ "bm_id3149012\n" "help.text" msgid "WEBSERVICE function" -msgstr "função SERVIÇOWEB" +msgstr "Função SERVIÇOWEB" #: func_webservice.xhp msgctxt "" @@ -55918,7 +55918,7 @@ "hd_id3149012\n" "help.text" msgid "WEBSERVICE" -msgstr "" +msgstr "SERVICOWEB" #: func_webservice.xhp msgctxt "" @@ -55966,7 +55966,7 @@ "bm_id2949012\n" "help.text" msgid "FILTERXML function" -msgstr "função FILTROXML" +msgstr "Função FILTRARXML" #: func_webservice.xhp msgctxt "" @@ -55974,7 +55974,7 @@ "hd_id2949012\n" "help.text" msgid "FILTERXML" -msgstr "" +msgstr "FILTRARXML" #: func_webservice.xhp msgctxt "" @@ -55990,7 +55990,7 @@ "par_id2954844\n" "help.text" msgid "FILTERXML(XML Document; XPath expression)" -msgstr "FILTROXML(documento_xml; expressão_xpath)" +msgstr "FILTRARXML(documento_xml; expressão_xpath)" #: func_webservice.xhp msgctxt "" @@ -56014,7 +56014,7 @@ "par_id2946142\n" "help.text" msgid "=FILTERXML(WEBSERVICE(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\");\"//lastBuildDate\")" -msgstr "" +msgstr "=FILTRARXML(SERVICOWEB(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\");\"//lastBuildDate\")" #: func_webservice.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/pt-BR/helpcontent2/source/text/shared/help.po libreoffice-6.2.3/translations/source/pt-BR/helpcontent2/source/text/shared/help.po --- libreoffice-6.2.2/translations/source/pt-BR/helpcontent2/source/text/shared/help.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/pt-BR/helpcontent2/source/text/shared/help.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2018-12-18 11:43+0000\n" +"PO-Revision-Date: 2019-03-20 11:48+0000\n" "Last-Translator: Olivier Hallot \n" "Language-Team: LANGUAGE \n" "Language: pt_BR\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1545133415.000000\n" +"X-POOTLE-MTIME: 1553082488.000000\n" #: browserhelp.xhp msgctxt "" @@ -78,7 +78,7 @@ "par_id191525734190260\n" "help.text" msgid "If this page has been helpful, you can support us!" -msgstr "O LibreOffice é feito por voluntários de todo o mundo, ajudados por uma fundação sem fins lucrativos. Apoie nosso trabalho: sua doação nos ajudará a criar um produto cada vez melhor em benefício de milhões de brasileiros!" +msgstr "Apoie nosso trabalho: Faça uma doação!" #: browserhelp.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/pt-BR/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/pt-BR/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/pt-BR/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/pt-BR/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2018-12-18 11:12+0000\n" +"PO-Revision-Date: 2019-03-22 12:14+0000\n" "Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1545131546.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553256867.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -17692,7 +17692,7 @@ "ContextLabel\n" "value.text" msgid "~Web" -msgstr "~Web" +msgstr "Como página ~web" #: GenericCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: UI\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-02-28 15:23+0000\n" +"PO-Revision-Date: 2019-03-21 12:29+0000\n" "Last-Translator: bormant \n" "Language-Team: Russian \n" "Language: ru\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551367431.000000\n" +"X-POOTLE-MTIME: 1553171364.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -29338,7 +29338,7 @@ "Label\n" "value.text" msgid "E-mail as ~OpenDocument Text..." -msgstr "Эл. почтой как ~текст ODF" +msgstr "Эл. почтой как ~текст ODF..." #: WriterCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/ru/svtools/messages.po libreoffice-6.2.3/translations/source/ru/svtools/messages.po --- libreoffice-6.2.2/translations/source/ru/svtools/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ru/svtools/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-14 12:22+0100\n" -"PO-Revision-Date: 2019-01-31 20:51+0000\n" +"PO-Revision-Date: 2019-03-21 20:53+0000\n" "Last-Translator: bormant \n" "Language-Team: LANGUAGE \n" "Language: ru\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1548967877.000000\n" +"X-POOTLE-MTIME: 1553201631.000000\n" #: include/svtools/strings.hrc:25 msgctxt "STR_UNDO" @@ -54,12 +54,12 @@ #: include/svtools/strings.hrc:33 msgctxt "STR_FORMAT_RTF" msgid "Rich text formatting (RTF)" -msgstr "" +msgstr "Текст с форматированием (RTF)" #: include/svtools/strings.hrc:34 msgctxt "STR_FORMAT_ID_RICHTEXT" msgid "Rich text formatting (Richtext)" -msgstr "" +msgstr "Текст с форматированием (Richtext)" #: include/svtools/strings.hrc:35 msgctxt "STR_FORMAT_ID_DRAWING" diff -Nru libreoffice-6.2.2/translations/source/ru/svx/messages.po libreoffice-6.2.3/translations/source/ru/svx/messages.po --- libreoffice-6.2.2/translations/source/ru/svx/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ru/svx/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2019-01-31 20:55+0000\n" +"PO-Revision-Date: 2019-03-21 18:22+0000\n" "Last-Translator: bormant \n" "Language-Team: LANGUAGE \n" "Language: ru\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1548968152.000000\n" +"X-POOTLE-MTIME: 1553192550.000000\n" #: include/svx/strings.hrc:25 msgctxt "STR_ObjNameSingulNONE" @@ -6387,7 +6387,7 @@ #: include/svx/strings.hrc:1356 msgctxt "RID_SVXITEMS_PAGE_USAGE_MIRROR" msgid "Mirrored" -msgstr "Отражённые" +msgstr "Зеркально" #: include/svx/strings.hrc:1357 msgctxt "RID_SVXITEMS_AUTHOR_COMPLETE" diff -Nru libreoffice-6.2.2/translations/source/ru/sw/messages.po libreoffice-6.2.3/translations/source/ru/sw/messages.po --- libreoffice-6.2.2/translations/source/ru/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/ru/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-02-28 15:42+0000\n" +"PO-Revision-Date: 2019-03-21 21:11+0000\n" "Last-Translator: bormant \n" "Language-Team: LANGUAGE \n" "Language: ru\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551368540.000000\n" +"X-POOTLE-MTIME: 1553202690.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -12024,7 +12024,7 @@ #: sw/uiconfig/swriter/ui/notebookbar.ui:12239 msgctxt "WriterNotebookbar|DrawMenuButton" msgid "_Draw" -msgstr "Рисование" +msgstr "Рисунок" #: sw/uiconfig/swriter/ui/notebookbar.ui:12349 msgctxt "WriterNotebookbar|DrawLabel" diff -Nru libreoffice-6.2.2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-02-22 19:28+0000\n" +"PO-Revision-Date: 2019-03-30 19:00+0000\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: LANGUAGE \n" "Language: tr\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1550863711.000000\n" +"X-POOTLE-MTIME: 1553972421.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -2399,7 +2399,7 @@ "PopupLabel\n" "value.text" msgid "Insert Columns ~Before" -msgstr "Sütun Ekle ~Öncesine" +msgstr "~Öncesine Sütunlar Ekle" #: CalcCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/tr/sc/messages.po libreoffice-6.2.3/translations/source/tr/sc/messages.po --- libreoffice-6.2.2/translations/source/tr/sc/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/tr/sc/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-02-25 19:20+0000\n" +"PO-Revision-Date: 2019-03-30 18:55+0000\n" "Last-Translator: Ayhan YALÇINSOY \n" "Language-Team: LANGUAGE \n" "Language: tr\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551122456.000000\n" +"X-POOTLE-MTIME: 1553972157.000000\n" #: sc/inc/compiler.hrc:27 msgctxt "RID_FUNCTION_CATEGORIES" @@ -23219,16 +23219,14 @@ msgstr "Sütunlar:" #: sc/uiconfig/scalc/ui/texttransformationentry.ui:81 -#, fuzzy msgctxt "texttransformation_type|tolower" msgid "To Lower" -msgstr "Küçük Harfe" +msgstr "Küçük Harf" #: sc/uiconfig/scalc/ui/texttransformationentry.ui:82 -#, fuzzy msgctxt "texttransformation_type|toupper" msgid "To Upper" -msgstr "Büyük Harfe" +msgstr "BÜYÜK HARF" #: sc/uiconfig/scalc/ui/texttransformationentry.ui:83 msgctxt "texttransformation_type|capitalize" diff -Nru libreoffice-6.2.2/translations/source/uk/helpcontent2/source/text/sbasic/shared.po libreoffice-6.2.3/translations/source/uk/helpcontent2/source/text/sbasic/shared.po --- libreoffice-6.2.2/translations/source/uk/helpcontent2/source/text/sbasic/shared.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/uk/helpcontent2/source/text/sbasic/shared.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2018-11-16 22:41+0100\n" -"PO-Revision-Date: 2018-12-11 17:01+0000\n" -"Last-Translator: Olexandr Pylypchuk \n" +"PO-Revision-Date: 2019-03-25 18:40+0000\n" +"Last-Translator: Михаїл Юрійович \n" "Language-Team: LANGUAGE \n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1544547665.000000\n" +"X-POOTLE-MTIME: 1553539210.000000\n" #: 00000002.xhp msgctxt "" @@ -29286,7 +29286,7 @@ "par_id3146121\n" "help.text" msgid "Print LCase(sVar) ' Returns \"las vegas\"" -msgstr "Print LCase(sVar) ' повертає \"галич\"" +msgstr "Print LCase(sVar) ' Повертає \"las vegas\"" #: 03120302.xhp msgctxt "" @@ -29294,7 +29294,7 @@ "par_id3146986\n" "help.text" msgid "Print UCase(sVar) ' Returns \"LAS VEGAS\"" -msgstr "Print UCase(sVar) ' повертає \"ГАЛИЧ\"" +msgstr "Print UCase(sVar) ' Повертає \"LAS VEGAS\"" #: 03120303.xhp msgctxt "" @@ -30230,7 +30230,7 @@ "par_id3149204\n" "help.text" msgid "Print LCase(sVar) ' returns \"las vegas\"" -msgstr "Print LCase(sVar) ' повертає \"галич\"" +msgstr "Print LCase(sVar) ' повертає \"las vegas\"" #: 03120310.xhp msgctxt "" @@ -30238,7 +30238,7 @@ "par_id3156280\n" "help.text" msgid "Print UCase(sVar) ' returns \"LAS VEGAS\"" -msgstr "Print UCase(sVar) ' повертає \"ГАЛИЧ\"" +msgstr "Print UCase(sVar) ' повертає \"LAS VEGAS\"" #: 03120311.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/basctl/messages.po libreoffice-6.2.3/translations/source/zh-CN/basctl/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/basctl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/basctl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-02-26 18:57+0000\n" +"PO-Revision-Date: 2019-03-19 07:27+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551207454.000000\n" +"X-POOTLE-MTIME: 1552980423.000000\n" #: basctl/inc/strings.hrc:25 msgctxt "RID_STR_FILTER_ALLFILES" @@ -496,7 +496,7 @@ #: basctl/inc/strings.hrc:116 msgctxt "RID_STR_EXPORTPACKAGE" msgid "Export library as extension" -msgstr "将库导出为扩展功能" +msgstr "将库导出为扩展" #: basctl/inc/strings.hrc:117 msgctxt "RID_STR_EXPORTBASIC" @@ -506,7 +506,7 @@ #: basctl/inc/strings.hrc:118 msgctxt "RID_STR_PACKAGE_BUNDLE" msgid "Extension" -msgstr "扩展功能" +msgstr "扩展" #: basctl/uiconfig/basicide/ui/basicmacrodialog.ui:26 msgctxt "basicmacrodialog|BasicMacroDialog" @@ -661,7 +661,7 @@ #: basctl/uiconfig/basicide/ui/exportdialog.ui:89 msgctxt "exportdialog|extension" msgid "Export as _extension" -msgstr "导出为扩展功能(_E)" +msgstr "导出为扩展(_E)" #: basctl/uiconfig/basicide/ui/exportdialog.ui:105 msgctxt "exportdialog|basic" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/basic/messages.po libreoffice-6.2.3/translations/source/zh-CN/basic/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/basic/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/basic/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-02-27 15:07+0100\n" -"PO-Revision-Date: 2019-03-04 19:41+0000\n" +"PO-Revision-Date: 2019-03-19 07:02+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551728487.000000\n" +"X-POOTLE-MTIME: 1552978978.000000\n" #: basic/inc/basic.hrc:27 msgctxt "RID_BASIC_START" @@ -254,17 +254,17 @@ #: basic/inc/basic.hrc:74 msgctxt "RID_BASIC_START" msgid "External application cannot execute DDE operation." -msgstr "外部程序无法执行动态数据交换(DDE)操作。" +msgstr "外部程序无法执行动态数据交换 (DDE) 操作。" #: basic/inc/basic.hrc:75 msgctxt "RID_BASIC_START" msgid "Timeout while waiting for DDE response." -msgstr "等待动态数据交换(DDE)响应已超时。" +msgstr "等待动态数据交换 (DDE) 响应已超时。" #: basic/inc/basic.hrc:76 msgctxt "RID_BASIC_START" msgid "User pressed ESCAPE during DDE operation." -msgstr "在执行动态数据交换(DDE)操作过程中用户点击了ESC键。" +msgstr "在执行动态数据交换 (DDE) 操作过程中用户按了「Esc」键。" #: basic/inc/basic.hrc:77 msgctxt "RID_BASIC_START" @@ -274,7 +274,7 @@ #: basic/inc/basic.hrc:78 msgctxt "RID_BASIC_START" msgid "DDE operation without data." -msgstr "没有数据的动态数据交换(DDE)操作。" +msgstr "动态数据交换 (DDE) 操作没有数据。" #: basic/inc/basic.hrc:79 msgctxt "RID_BASIC_START" @@ -289,22 +289,22 @@ #: basic/inc/basic.hrc:81 msgctxt "RID_BASIC_START" msgid "DDE connection interrupted or modified." -msgstr "动态数据交换(DDE)连接已经被中断或修改。" +msgstr "动态数据交换 (DDE) 连接已经被中断或修改。" #: basic/inc/basic.hrc:82 msgctxt "RID_BASIC_START" msgid "DDE method invoked with no channel open." -msgstr "在没有打开交换通道的情况下调用了动态数据交换(DDE)方法。" +msgstr "在没有打开交换通道的情况下调用了动态数据交换 (DDE) 方法。" #: basic/inc/basic.hrc:83 msgctxt "RID_BASIC_START" msgid "Invalid DDE link format." -msgstr "无效的动态数据交换(DDE)链接格式。" +msgstr "无效的动态数据交换 (DDE) 链接格式。" #: basic/inc/basic.hrc:84 msgctxt "RID_BASIC_START" msgid "DDE message has been lost." -msgstr "动态数据交换(DDE)信息已丢失。" +msgstr "动态数据交换 (DDE) 信息已丢失。" #: basic/inc/basic.hrc:85 msgctxt "RID_BASIC_START" @@ -319,7 +319,7 @@ #: basic/inc/basic.hrc:87 msgctxt "RID_BASIC_START" msgid "DDE requires the DDEML.DLL file." -msgstr "动态数据交换(DDE)需要 DDEML.DLL 。" +msgstr "动态数据交换 (DDE) 需要 DDEML.DLL。" #: basic/inc/basic.hrc:88 msgctxt "RID_BASIC_START" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/chart2/messages.po libreoffice-6.2.3/translations/source/zh-CN/chart2/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/chart2/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/chart2/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-13 10:58+0000\n" -"Last-Translator: Dian LI \n" +"PO-Revision-Date: 2019-03-17 12:00+0000\n" +"Last-Translator: 锁琨珑 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552474681.000000\n" +"X-POOTLE-MTIME: 1552824046.000000\n" #: chart2/inc/chart.hrc:17 msgctxt "tp_ChartType|liststore1" @@ -24,7 +24,7 @@ #: chart2/inc/chart.hrc:18 msgctxt "tp_ChartType|liststore1" msgid "Cylinder" -msgstr "柱形图" +msgstr "柱状图" #: chart2/inc/chart.hrc:19 msgctxt "tp_ChartType|liststore1" @@ -451,7 +451,7 @@ #: chart2/inc/strings.hrc:106 msgctxt "STR_STATUS_PIE_SEGMENT_EXPLODED" msgid "Pie exploded by %PERCENTVALUE percent" -msgstr "按照 %PERCENTVALUE 百分比分解的饼图" +msgstr "按照 %PERCENTVALUE 百分比分解的饼状图" #: chart2/inc/strings.hrc:107 msgctxt "STR_OBJECT_FOR_SERIES" @@ -706,7 +706,7 @@ #: chart2/inc/strings.hrc:158 msgctxt "STR_TYPE_COLUMN" msgid "Column" -msgstr "柱形图" +msgstr "柱状图" #: chart2/inc/strings.hrc:159 msgctxt "STR_TYPE_BAR" @@ -721,12 +721,12 @@ #: chart2/inc/strings.hrc:161 msgctxt "STR_TYPE_PIE" msgid "Pie" -msgstr "饼图" +msgstr "饼状图" #: chart2/inc/strings.hrc:162 msgctxt "STR_PIE_EXPLODED" msgid "Exploded Pie Chart" -msgstr "分离型饼图" +msgstr "分离型饼状图" #: chart2/inc/strings.hrc:163 msgctxt "STR_DONUT_EXPLODED" @@ -771,7 +771,7 @@ #: chart2/inc/strings.hrc:171 msgctxt "STR_TYPE_COMBI_COLUMN_LINE" msgid "Column and Line" -msgstr "柱和线" +msgstr "线柱图" #: chart2/inc/strings.hrc:172 msgctxt "STR_LINE_COLUMN" @@ -841,7 +841,7 @@ #: chart2/inc/strings.hrc:185 msgctxt "STR_TYPE_BUBBLE" msgid "Bubble" -msgstr "气泡" +msgstr "气泡图" #: chart2/inc/strings.hrc:186 msgctxt "STR_BUBBLE_1" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/connectivity/messages.po libreoffice-6.2.3/translations/source/zh-CN/connectivity/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/connectivity/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/connectivity/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-09-03 13:23+0200\n" -"PO-Revision-Date: 2019-03-13 12:12+0000\n" +"PO-Revision-Date: 2019-03-19 07:22+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552479139.000000\n" +"X-POOTLE-MTIME: 1552980145.000000\n" #. = the mozab driver's resource strings #: connectivity/inc/strings.hrc:26 @@ -136,7 +136,7 @@ #: connectivity/inc/strings.hrc:50 msgctxt "STR_CANNOT_CONVERT_STRING" msgid "The string '$string$' cannot be converted using the encoding '$charset$'." -msgstr "无法使用编码「$charset$」转换字符串「$string$」。" +msgstr "字符串「$string$」无法使用编码「$charset$」转换。" #: connectivity/inc/strings.hrc:51 msgctxt "STR_URI_SYNTAX_ERROR" @@ -557,7 +557,7 @@ #: connectivity/inc/strings.hrc:139 msgctxt "STR_AB_ADDRESSBOOK_NOT_FOUND" msgid "No $1$ exists." -msgstr "不存在 $1$ 。" +msgstr "不存在 $1$。" #: connectivity/inc/strings.hrc:140 msgctxt "STR_DATA_CANNOT_SELECT_UNFILTERED" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/cui/messages.po libreoffice-6.2.3/translations/source/zh-CN/cui/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-13 12:06+0000\n" +"PO-Revision-Date: 2019-04-01 09:29+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478782.000000\n" +"X-POOTLE-MTIME: 1554110996.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -2301,9 +2301,7 @@ #: cui/uiconfig/ui/aboutdialog.ui:204 msgctxt "aboutdialog|description" msgid "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more." -msgstr "" -"%PRODUCTNAME 是一款现代化的、易用的、开放源代码的办公套件，\n" -"可用于文字处理、电子表格、演示文稿等工作。" +msgstr "%PRODUCTNAME 是一款易用的现代化开源生产套件，可用于文字处理、电子表格、演示文稿等工作。" #: cui/uiconfig/ui/aboutdialog.ui:227 msgctxt "aboutdialog|copyright" @@ -2316,7 +2314,7 @@ msgstr "" "LibreOffice 基于 OpenOffice.org。\n" "\n" -" (使用 QQ 的用户，可加群获取帮助: 190535062)" +"(QQ 用户可加群灌水: 190535062)" #: cui/uiconfig/ui/aboutdialog.ui:255 msgctxt "aboutdialog|derived" @@ -7254,12 +7252,12 @@ #: cui/uiconfig/ui/numberingpositionpage.ui:219 msgctxt "numberingpositionpage|at" msgid "Tab stop at:" -msgstr "制表符位于:" +msgstr "制表位在:" #: cui/uiconfig/ui/numberingpositionpage.ui:260 msgctxt "numberingpositionpage|liststore2" msgid "Tab stop" -msgstr "制表符" +msgstr "制表位" #: cui/uiconfig/ui/numberingpositionpage.ui:261 msgctxt "numberingpositionpage|liststore2" @@ -10471,7 +10469,7 @@ #: cui/uiconfig/ui/securityoptionsdialog.ui:327 msgctxt "securityoptionsdialog|blockuntrusted" msgid "Block any links from documents not among the trusted locations (see Macro Security)" -msgstr "阻止文档中非信任位置的链接 (见\"宏安全\")" +msgstr "阻止文档中非信任位置的链接 (参见「宏安全」)" #: cui/uiconfig/ui/securityoptionsdialog.ui:398 msgctxt "securityoptionsdialog|label2" @@ -11373,7 +11371,7 @@ #: cui/uiconfig/ui/textattrtabpage.ui:163 msgctxt "textattrtabpage|TSB_WORDWRAP_TEXT" msgid "_Word wrap text in shape" -msgstr "图形中的文字换行(_W)" +msgstr "图形中文字自动换行(_W)" #: cui/uiconfig/ui/textattrtabpage.ui:179 msgctxt "textattrtabpage|TSB_AUTOGROW_SIZE" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/dbaccess/messages.po libreoffice-6.2.3/translations/source/zh-CN/dbaccess/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/dbaccess/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/dbaccess/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-13 12:06+0000\n" +"PO-Revision-Date: 2019-03-23 12:04+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478783.000000\n" +"X-POOTLE-MTIME: 1553342660.000000\n" #: dbaccess/inc/query.hrc:26 msgctxt "RSC_QUERY_OBJECT_TYPE" @@ -363,7 +363,7 @@ #: dbaccess/inc/strings.hrc:87 msgctxt "RID_STR_MISSING_EXTENSION" msgid "The extension is not installed." -msgstr "扩展功能没有安装。" +msgstr "扩展没有安装。" #: dbaccess/inc/strings.hrc:89 msgctxt "STR_QUERY_AND_TABLE_DISTINCT_NAMES" @@ -700,7 +700,7 @@ #: dbaccess/inc/strings.hrc:159 msgctxt "STR_QRY_JOIN_COLUMN_COMPARE" msgid "Columns can only be compared using '='." -msgstr "要比较列，只可以使用等号 '=' 。" +msgstr "要比较列，只可以使用等号「=」。" #: dbaccess/inc/strings.hrc:160 msgctxt "STR_QRY_LIKE_LEFT_NO_COLUMN" @@ -1477,7 +1477,7 @@ #: dbaccess/inc/strings.hrc:314 msgctxt "STR_COULD_NOT_CREATE_DIRECTORY" msgid "The directory $name$ could not be created." -msgstr "无法创建目录 $name$ 。" +msgstr "无法创建目录「$name$」。" #: dbaccess/inc/strings.hrc:315 msgctxt "STR_ALREADYEXISTOVERWRITE" @@ -1652,7 +1652,7 @@ #: dbaccess/inc/strings.hrc:352 msgctxt "RID_STR_EXTENSION_NOT_PRESENT" msgid "The report, \"$file$\", requires the Report Builder feature." -msgstr "该报表, \"$file$\", 需要「报表生成器」功能。" +msgstr "报表“$file$”需要「报表生成器」功能。" #: dbaccess/inc/strings.hrc:354 msgctxt "STR_COULDNOTCREATE_DRIVERMANAGER" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/desktop/messages.po libreoffice-6.2.3/translations/source/zh-CN/desktop/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/desktop/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/desktop/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-05 17:38+0100\n" -"PO-Revision-Date: 2019-03-02 05:58+0000\n" +"PO-Revision-Date: 2019-03-19 07:27+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551506300.000000\n" +"X-POOTLE-MTIME: 1552980424.000000\n" #: desktop/inc/strings.hrc:25 msgctxt "RID_STR_COPYING_PACKAGE" @@ -34,17 +34,17 @@ #: desktop/inc/strings.hrc:28 msgctxt "RID_STR_PACKAGE_ALREADY_ADDED" msgid "Extension has already been added: " -msgstr "扩展功能已经被添加: " +msgstr "扩展已经被添加: " #: desktop/inc/strings.hrc:29 msgctxt "RID_STR_NO_SUCH_PACKAGE" msgid "There is no such extension deployed: " -msgstr "该扩展功能没有安装: " +msgstr "该扩展没有安装: " #: desktop/inc/strings.hrc:30 msgctxt "RID_STR_SYNCHRONIZING_REPOSITORY" msgid "Synchronizing repository for %NAME extensions" -msgstr "为 %NAME 扩展功能同步仓库" +msgstr "为 %NAME 扩展同步仓库" #: desktop/inc/strings.hrc:32 msgctxt "RID_STR_REGISTERING_PACKAGE" @@ -104,7 +104,7 @@ #: desktop/inc/strings.hrc:46 msgctxt "RID_STR_PACKAGE_BUNDLE" msgid "Extension" -msgstr "扩展功能" +msgstr "扩展" #: desktop/inc/strings.hrc:48 msgctxt "RID_STR_DYN_COMPONENT" @@ -149,17 +149,17 @@ #: desktop/inc/strings.hrc:58 msgctxt "RID_STR_HELPPROCESSING_GENERAL_ERROR" msgid "The extension cannot be installed because:\n" -msgstr "无法安装此扩展功能，因为: \n" +msgstr "无法安装此扩展，因为: \n" #: desktop/inc/strings.hrc:59 msgctxt "RID_STR_HELPPROCESSING_XMLPARSING_ERROR" msgid "The extension will not be installed because an error occurred in the Help files:\n" -msgstr "将不会安装该扩展功能，因为帮助文件中出错: \n" +msgstr "将不会安装该扩展，因为帮助文件中出错: \n" #: desktop/inc/strings.hrc:61 msgctxt "RID_STR_ADD_PACKAGES" msgid "Add Extension(s)" -msgstr "添加扩展功能" +msgstr "添加扩展" #: desktop/inc/strings.hrc:62 msgctxt "RID_CTX_ITEM_REMOVE" @@ -214,7 +214,7 @@ #: desktop/inc/strings.hrc:71 msgctxt "RID_STR_ERROR_UNKNOWN_STATUS" msgid "Error: The status of this extension is unknown" -msgstr "错误: 此扩展功能的状态未知" +msgstr "错误: 此扩展的状态未知" #: desktop/inc/strings.hrc:72 msgctxt "RID_STR_CLOSE_BTN" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/extensions/messages.po libreoffice-6.2.3/translations/source/zh-CN/extensions/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/extensions/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/extensions/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2019-03-13 12:06+0000\n" +"PO-Revision-Date: 2019-03-19 06:26+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478784.000000\n" +"X-POOTLE-MTIME: 1552976812.000000\n" #: extensions/inc/command.hrc:29 msgctxt "RID_RSC_ENUM_COMMAND_TYPE" @@ -764,7 +764,7 @@ #: extensions/inc/strings.hrc:50 msgctxt "RID_STR_LABEL" msgid "Label" -msgstr "标题" +msgstr "标签" #: extensions/inc/strings.hrc:51 msgctxt "RID_STR_ALIGN" @@ -899,7 +899,7 @@ #: extensions/inc/strings.hrc:77 msgctxt "RID_STR_TABSTOP" msgid "Tabstop" -msgstr "制表符" +msgstr "制表位" #: extensions/inc/strings.hrc:78 msgctxt "RID_STR_CONTROLSOURCE" @@ -1762,7 +1762,7 @@ #: extensions/inc/strings.hrc:255 msgctxt "RID_STR_PROPTITLE_RADIOBUTTON" msgid "Option Button" -msgstr "选项字段" +msgstr "单选按钮" #: extensions/inc/strings.hrc:256 msgctxt "RID_STR_PROPTITLE_CHECKBOX" @@ -1987,7 +1987,7 @@ #: extensions/inc/strings.hrc:299 msgctxt "RID_UPDATE_STR_INSTALL_ERROR" msgid "Could not run the installer application, please run %FILE_NAME in %DOWNLOAD_PATH manually." -msgstr "无法运行安装程序，请手动运行 %DOWNLOAD_PATH 目录中的 %FILE_NAME 。" +msgstr "无法运行安装程序，请手动运行 %DOWNLOAD_PATH 目录中的 %FILE_NAME。" #: extensions/inc/strings.hrc:300 msgctxt "RID_UPDATE_STR_OVERWRITE_WARNING" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/filter/messages.po libreoffice-6.2.3/translations/source/zh-CN/filter/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/filter/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/filter/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-10-21 20:57+0200\n" -"PO-Revision-Date: 2019-03-10 21:31+0000\n" +"PO-Revision-Date: 2019-03-19 07:03+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552253477.000000\n" +"X-POOTLE-MTIME: 1552978982.000000\n" #: filter/inc/strings.hrc:25 msgctxt "STR_COLUMN_HEADER_NAME" @@ -104,7 +104,7 @@ #, c-format msgctxt "STR_FILTERS_HAVE_BEEN_SAVED" msgid "%s XML filters have been saved in the package '%s'." -msgstr "%s XML 筛选器已经存入软件包 '%s' 。" +msgstr "%s XML 筛选器已经存入软件包「%s」。" #: filter/inc/strings.hrc:42 msgctxt "STR_FILTER_PACKAGE" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/forms/messages.po libreoffice-6.2.3/translations/source/zh-CN/forms/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/forms/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/forms/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-02-27 13:56+0100\n" -"PO-Revision-Date: 2019-03-04 19:41+0000\n" +"PO-Revision-Date: 2019-03-19 06:26+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551728490.000000\n" +"X-POOTLE-MTIME: 1552976812.000000\n" #: forms/inc/strings.hrc:25 msgctxt "RID_BASELISTBOX_ERROR_FILLLIST" @@ -79,7 +79,7 @@ #: forms/inc/strings.hrc:37 msgctxt "RID_STR_NEED_NON_NULL_OBJECT" msgid "The object cannot be NULL." -msgstr "这个对象不可以是 NULL 。" +msgstr "这个对象不可以是 NULL。" #: forms/inc/strings.hrc:38 msgctxt "RID_STR_OPEN_GRAPHICS" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/guide.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/guide.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-04-25 13:24+0200\n" -"PO-Revision-Date: 2019-03-02 23:23+0000\n" +"PO-Revision-Date: 2019-03-19 06:41+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551569022.000000\n" +"X-POOTLE-MTIME: 1552977663.000000\n" #: access2base.xhp msgctxt "" @@ -94,7 +94,7 @@ "par_idA2B009\n" "help.text" msgid "a simplified and extensible API for forms, dialogs and controls manipulations similar with the Microsoft Access object model," -msgstr "它是一个简化并可扩展的API，用于对 表单、「对话框」以及控件进行操作，与Microsoft Access 对象模型类似。" +msgstr "它是一个简化并可扩展的API，用于对「表单」「对话框」以及「控件」进行操作，与Microsoft Access 对象模型类似。" #: access2base.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared/02.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-05-12 14:35+0200\n" -"PO-Revision-Date: 2019-03-09 15:07+0000\n" +"PO-Revision-Date: 2019-03-19 06:32+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552144063.000000\n" +"X-POOTLE-MTIME: 1552977179.000000\n" #: 11010000.xhp msgctxt "" @@ -566,7 +566,7 @@ "par_id3155150\n" "help.text" msgid "Highlights the text that is enclosed by two corresponding brackets. Place the text cursor in front of an opening or closing bracket, and then click this icon." -msgstr "突出显示用两个相应括号括起的文字。将文字光标放到左括号或右括号之前，然后点击此图标。" +msgstr "高亮显示用两个相应括号括起的文字。将文字光标放到左括号或右括号之前，然后点击此图标。" #: 11120000.xhp msgctxt "" @@ -1038,7 +1038,7 @@ "hd_id3150486\n" "help.text" msgid "Option Button" -msgstr "选项字段" +msgstr "单选按钮" #: 20000000.xhp msgctxt "" @@ -1054,7 +1054,7 @@ "par_id3153575\n" "help.text" msgid "Adds a button that allows a user to select from a number of options. Grouped option buttons must have consecutive tab indices. They are commonly encircled by a group box. If you have two groups of option buttons, you must insert a tab index between the tab indices of the two groups on the group frame." -msgstr "添加用于在多个选项中进行选择的按钮。分组选项字段的选项卡索引必须连续，它们周围通常会有一个组框。如果有两组选项字段，则需要在组框上两个组的选项卡索引之间再插入一个选项卡索引。" +msgstr "添加用于在多个选项中进行选择的按钮。分组单选按钮的选项卡索引必须连续，它们周围通常会有一个组框。如果有两组单选按钮，则需要在组框上两个组的选项卡索引之间再插入一个选项卡索引。" #: 20000000.xhp msgctxt "" @@ -1222,7 +1222,7 @@ "par_id3159622\n" "help.text" msgid "Adds a frame that you can use to visually group similar controls, such as option buttons." -msgstr "添加用于可视化分组类似控件 (例如选项字段) 的框。" +msgstr "添加用于可视化分组类似控件 (例如单选按钮) 的框。" #: 20000000.xhp msgctxt "" @@ -1230,7 +1230,7 @@ "par_id3148820\n" "help.text" msgid "To define two different groups of option buttons, ensure that the tab index of the group frame is between the tab indices of the two groups." -msgstr "要定义选项字段的两个不同分组，请先确保组框的选项卡索引位于两个分组的选项卡索引之间。" +msgstr "要定义单选按钮的两个不同分组，请先确保组框的选项卡索引位于两个分组的选项卡索引之间。" #: 20000000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sbasic/shared.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-16 22:41+0100\n" -"PO-Revision-Date: 2019-03-14 07:38+0000\n" +"PO-Revision-Date: 2019-03-19 06:41+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549126.000000\n" +"X-POOTLE-MTIME: 1552977665.000000\n" #: 00000002.xhp msgctxt "" @@ -6006,7 +6006,7 @@ "hd_id3149538\n" "help.text" msgid "Tabstop" -msgstr "制表符" +msgstr "制表位" #: 01170101.xhp msgctxt "" @@ -11830,7 +11830,7 @@ "par_id3143267\n" "help.text" msgid "Returns a Date value for a specified year, month, or day." -msgstr "返回指定年、月或日的 日期 值。" +msgstr "返回指定年、月或日的「日期」值。" #: 03030101.xhp msgctxt "" @@ -15214,7 +15214,7 @@ "par_id05172017082409622\n" "help.text" msgid "The Empty value indicates that the variable is not initialized." -msgstr "Empty 值表明这个变量还未初始化。" +msgstr "「Empty」值表明这个变量还未初始化。" #: 03040000.xhp msgctxt "" @@ -22966,7 +22966,7 @@ "par_id3145171\n" "help.text" msgid "The following example uses the CBool function to evaluate the value that is returned by the Instr function. The function checks if the word \"and\" is found in the sentence that was entered by the user." -msgstr "下面的示例使用「CBool」函数对 Instr 函数返回的值进行求值。函数将检查用户输入的句子中是否含有「and」。" +msgstr "下面的示例使用「CBool」函数对「Instr」函数返回的值进行求值。函数将检查用户输入的句子中是否含有「and」。" #: 03100100.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/01.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/01.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/01.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/01.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: libreoffice help\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-15 15:25+0000\n" +"PO-Revision-Date: 2019-03-24 04:52+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552663539.000000\n" +"X-POOTLE-MTIME: 1553403175.000000\n" #: 01120000.xhp msgctxt "" @@ -422,7 +422,7 @@ "hd_id3149009\n" "help.text" msgid "Insert as Hyperlink" -msgstr "当作超链接插入" +msgstr "作为超链接插入" #: 02110000.xhp msgctxt "" @@ -446,7 +446,7 @@ "hd_id3154682\n" "help.text" msgid "Insert as Link" -msgstr "当作链接插入" +msgstr "作为链接插入" #: 02110000.xhp msgctxt "" @@ -462,7 +462,7 @@ "hd_id3145824\n" "help.text" msgid "Insert as Copy" -msgstr "当作副本插入" +msgstr "作为副本插入" #: 02110000.xhp msgctxt "" @@ -2606,7 +2606,7 @@ "tit\n" "help.text" msgid "Value Highlighting" -msgstr "突出显示值" +msgstr "高亮显示值" #: 03080000.xhp msgctxt "" @@ -2614,7 +2614,7 @@ "bm_id3151384\n" "help.text" msgid "spreadsheets; value highlighting values;highlighting highlighting; values in sheets colors;values" -msgstr "电子表格; 突出显示值值; 突出显示突出显示; 工作表中的值颜色;值" +msgstr "电子表格; 高亮显示值值; 高亮显示高亮显示; 工作表中的值颜色;值" #: 03080000.xhp msgctxt "" @@ -2622,7 +2622,7 @@ "hd_id3151384\n" "help.text" msgid "Value Highlighting" -msgstr "突出显示值" +msgstr "高亮显示值" #: 03080000.xhp msgctxt "" @@ -2638,7 +2638,7 @@ "par_id3125863\n" "help.text" msgid "To remove the highlighting, unmark the menu entry." -msgstr "要删除突出显示，请取消这个菜单条目标记。" +msgstr "要删除高亮显示，请取消这个菜单条目标记。" #: 03080000.xhp msgctxt "" @@ -4262,7 +4262,7 @@ "par_id3153218\n" "help.text" msgid "DCOUNT(Database; [DatabaseField]; SearchCriteria)" -msgstr "DCOUNT(数据库, [数据库字段], 搜索条件)" +msgstr "DCOUNT(数据库; [数据库字段]; 搜索条件)" #: 04060101.xhp msgctxt "" @@ -4326,7 +4326,7 @@ "par_id3146893\n" "help.text" msgid "DCOUNTA(Database; [DatabaseField]; SearchCriteria)" -msgstr "DCOUNTA(数据库; 数[据库字段]; 搜索条件)" +msgstr "DCOUNTA(数据库; [数据库字段]; 搜索条件)" #: 04060101.xhp msgctxt "" @@ -6254,7 +6254,7 @@ "par_id3152797\n" "help.text" msgid "=DISC(\"2001-01-25\";\"2001-11-15\";97;100;3) returns about 0.0372 or 3.72 per cent." -msgstr "「=DISC(\"2001-01-25\";\"2001-11-15\";97;100;3)」返回近似值 0.0372 或 3.72%。" +msgstr "「=DISC(\"2001-01-25\";\"2001-11-15\";97;100;3)」返回近似值 0.0372 或 3.72％。" #: 04060103.xhp msgctxt "" @@ -6470,7 +6470,7 @@ "par_id3158426\n" "help.text" msgid "What is the effective annual rate of interest for a 5.25% nominal rate and quarterly payment." -msgstr "名义利率为 5.25%，且每季度支付，实际年利率为多少？" +msgstr "名义利率为 5.25%，且每季度支付，实际年利率为多少。" #: 04060103.xhp msgctxt "" @@ -7134,7 +7134,7 @@ "par_id3147535\n" "help.text" msgid "FORMULA(Reference)" -msgstr "FORMULA(Reference)" +msgstr "FORMULA(引用)" #: 04060104.xhp msgctxt "" @@ -7454,7 +7454,7 @@ "par_id3143230\n" "help.text" msgid "ISFORMULA(Reference)" -msgstr "ISFORMULA(Reference)" +msgstr "ISFORMULA(引用)" #: 04060104.xhp msgctxt "" @@ -10558,7 +10558,7 @@ "par_id3154117\n" "help.text" msgid "Returns Number rounded down to the nearest integer." -msgstr "返回 Number 向下舍入到最接近整数的数值。" +msgstr "返回「Number」向下舍入到最接近整数的数值。" #: 04060106.xhp msgctxt "" @@ -11294,7 +11294,7 @@ "par_id3155000\n" "help.text" msgid "Significance is the number to whose multiple the value is to be rounded up." -msgstr "「Significance」是将数值向上舍入为其倍数的数字。" +msgstr "「有效位」是将数值向上舍入为其倍数的数字。" #: 04060106.xhp msgctxt "" @@ -11382,7 +11382,7 @@ "par_id2955000\n" "help.text" msgid "Significance (optional) is the number to whose multiple the value is to be rounded up." -msgstr "「Significance」 (可选) 「数字」将会被舍入到该Significance的倍数。" +msgstr "「有效位」(可选) 是将数值向上舍入为其倍数的数字。" #: 04060106.xhp msgctxt "" @@ -11606,7 +11606,7 @@ "par_id8955000\n" "help.text" msgid "Significance (optional) is the number to whose multiple the value is to be rounded up." -msgstr "「Significance」 (可选) 「数字」将会被舍入到该Significance的倍数。" +msgstr "「有效位」(可选) 是将数值向上舍入为其倍数的数字。" #: 04060106.xhp msgctxt "" @@ -12758,7 +12758,7 @@ "par_id3152062\n" "help.text" msgid "Criteria is the cell in which the search criterion is shown, or the search criterion itself. If the criteria is written into the formula, it has to be surrounded by double quotes." -msgstr "「Criteria」是显示搜索条件的单元格，或是搜索条件本身。如果将条件写入公式，两侧必须括有双引号。" +msgstr "「条件」是显示搜索条件的单元格，或是搜索条件本身。如果将条件写入公式，两侧必须括有双引号。" #: 04060106.xhp msgctxt "" @@ -13438,7 +13438,7 @@ "par_id2957497\n" "help.text" msgid "Significance is the value to whose multiple the number is to be rounded down." -msgstr "「Significance」「数字」将被向下舍入到该Significance的倍数。" +msgstr "「有效位」是将数字向下舍入为其倍数的数值。" #: 04060106.xhp msgctxt "" @@ -13494,7 +13494,7 @@ "par_id3157497\n" "help.text" msgid "Significance is the value to whose multiple the number is to be rounded down." -msgstr "「Significance」「数字」将被向下舍入到该Significance的倍数。" +msgstr "「有效位」是将数字向下舍入为其倍数的数值。" #: 04060106.xhp msgctxt "" @@ -15262,7 +15262,7 @@ "par_id3156380\n" "help.text" msgid "MDETERM(Array)" -msgstr "MDETERM(Array)" +msgstr "MDETERM(数组)" #: 04060107.xhp msgctxt "" @@ -15310,7 +15310,7 @@ "par_id3156085\n" "help.text" msgid "MINVERSE(Array)" -msgstr "MINVERSE(Array)" +msgstr "MINVERSE(数组)" #: 04060107.xhp msgctxt "" @@ -15414,7 +15414,7 @@ "par_id3153843\n" "help.text" msgid "TRANSPOSE(Array)" -msgstr "TRANSPOSE(Array)" +msgstr "TRANSPOSE(数组)" #: 04060107.xhp msgctxt "" @@ -16118,7 +16118,7 @@ "par_id3145845\n" "help.text" msgid "G3: The standard error of the intercept" -msgstr "G3: 交点的标准误差。" +msgstr "G3: 截断的标准误差" #: 04060107.xhp msgctxt "" @@ -17238,7 +17238,7 @@ "hd_id3147299\n" "help.text" msgid "Example:" -msgstr "示例" +msgstr "示例:" #: 04060109.xhp msgctxt "" @@ -17294,7 +17294,7 @@ "par_id3155907\n" "help.text" msgid "AREAS(Reference)" -msgstr "AREAS(reference)" +msgstr "AREAS(引用)" #: 04060109.xhp msgctxt "" @@ -17446,7 +17446,7 @@ "par_id3153775\n" "help.text" msgid "Data are retrieved as text; no conversion to numbers" -msgstr "数据只是当作文字采用，而不转化成数字。" +msgstr "数据只是当作文字采用，而不转化成数字" #: 04060109.xhp msgctxt "" @@ -17502,7 +17502,7 @@ "par_id3151322\n" "help.text" msgid "ERRORTYPE(Reference)" -msgstr "ERRORTYPE(reference)" +msgstr "ERRORTYPE(引用)" #: 04060109.xhp msgctxt "" @@ -17742,7 +17742,7 @@ "par_id3149447\n" "help.text" msgid "COLUMN(Reference)" -msgstr "COLUMN(Reference)" +msgstr "COLUMN(引用)" #: 04060109.xhp msgctxt "" @@ -17838,7 +17838,7 @@ "par_id3154047\n" "help.text" msgid "COLUMNS(Array)" -msgstr "COLUMNS(Array)" +msgstr "COLUMNS(数组)" #: 04060109.xhp msgctxt "" @@ -17902,7 +17902,7 @@ "par_id3150156\n" "help.text" msgid "=VLOOKUP(SearchCriterion; Array; Index; Sorted)" -msgstr "=VLOOKUP(SearchCriterion; Array; Index; Sorted)" +msgstr "=VLOOKUP(搜索条件; 数组; 索引; 已排序)" #: 04060109.xhp msgctxt "" @@ -17910,7 +17910,7 @@ "par_id3149289\n" "help.text" msgid "SearchCriterion is the value searched for in the first column of the array." -msgstr "「SearchCriterion」是在数组的第一列中要查找的值。" +msgstr "「搜索条件」是要在数组的第一列中查找的值。" #: 04060109.xhp msgctxt "" @@ -17966,7 +17966,7 @@ "par_id3149200\n" "help.text" msgid "As soon as you enter a number in A1 B1 will show the corresponding text contained in the second column of reference D1:E100. Entering a nonexistent number displays the text with the next number down. To prevent this, enter FALSE as the last parameter in the formula so that an error message is generated when a nonexistent number is entered." -msgstr "这样一旦您在单元格A1处输入一道菜的号码后，单元格B1处便会显示这道菜的名称(菜的名称在单元格区域 D1:E100 的第2列内)。输入一个在单元格区域 D1:E100 内不存在的号码，单元格B1处显示的便是小于等于此号码的最大值。如果您不希望这种近似匹配，可在公式的可选参数sort order处输入逻辑值FALSE，这样在输入一个单元格区域 D1:E100 内不存在的号码时，函数便会反馈一个错误值。" +msgstr "这样一旦您在单元格A1处输入一道菜的号码后，单元格B1处便会显示这道菜的名称(菜的名称在单元格区域 D1:E100 的第 2 列内)。输入一个在单元格区域 D1:E100 内不存在的号码，单元格B1处显示的便是小于等于此号码的最大值。如果您不希望这种近似匹配，可在公式的可选参数sort order处输入逻辑值FALSE，这样在输入一个单元格区域 D1:E100 内不存在的号码时，函数便会反馈一个错误值。" #: 04060109.xhp msgctxt "" @@ -17998,7 +17998,7 @@ "par_id3153095\n" "help.text" msgid "SHEET(Reference)" -msgstr "SHEET(Reference)" +msgstr "SHEET(引用)" #: 04060109.xhp msgctxt "" @@ -18046,7 +18046,7 @@ "par_id3150777\n" "help.text" msgid "SHEETS(Reference)" -msgstr "SHEETS(Reference)" +msgstr "SHEETS(引用)" #: 04060109.xhp msgctxt "" @@ -18094,7 +18094,7 @@ "par_id3159152\n" "help.text" msgid "MATCH(SearchCriterion; LookupArray; Type)" -msgstr "MATCH(SearchCriterion; LookupArray; Type)" +msgstr "MATCH(搜索条件; 查询数组; 类型)" #: 04060109.xhp msgctxt "" @@ -18102,7 +18102,7 @@ "par_id3149336\n" "help.text" msgid "SearchCriterion is the value which is to be searched for in the single-row or single-column array." -msgstr "「SearchCriterion」是在单行或单列数组中要查找的数值。" +msgstr "「搜索条件」是要在单行或单列数组中查找的数值。" #: 04060109.xhp msgctxt "" @@ -18190,7 +18190,7 @@ "par_id3156032\n" "help.text" msgid "Rows is the number of rows by which the reference was corrected up (negative value) or down. Use 0 to stay in the same row." -msgstr "「Rows」是单元格向上 (负数) 或向下移动的行数。" +msgstr "「Rows」是单元格向上 (负值) 或向下修正的行数。使用 0 可保持在当前行不变。" #: 04060109.xhp msgctxt "" @@ -18198,7 +18198,7 @@ "par_id3166458\n" "help.text" msgid "Columns is the number of columns by which the reference was corrected to the left (negative value) or to the right. Use 0 to stay in the same column" -msgstr "「Rows」是单元格向上 (负数) 或向下移动的行数。" +msgstr "「Columns」是引用向左 (负值) 或向右移动的列数。使用 0 可保持在当前列不变" #: 04060109.xhp msgctxt "" @@ -18326,7 +18326,7 @@ "par_id3154104\n" "help.text" msgid "LOOKUP(SearchCriterion; SearchVector; ResultVector)" -msgstr "LOOKUP(SearchCriterion; SearchVector; ResultVector)" +msgstr "LOOKUP(搜索条件; 搜索范围; 结果范围)" #: 04060109.xhp msgctxt "" @@ -18334,7 +18334,7 @@ "par_id3150646\n" "help.text" msgid "SearchCriterion is the value to be searched for; entered either directly or as a reference." -msgstr "「SearchCriterion」是要查找的数值；直接输入或作为引用输入。" +msgstr "「搜索条件」是要查找的数值；直接输入或作为引用输入。" #: 04060109.xhp msgctxt "" @@ -18342,7 +18342,7 @@ "par_id3154854\n" "help.text" msgid "SearchVector is the single-row or single-column area to be searched." -msgstr "「SearchVector」是要查找的单行或单列区域。" +msgstr "「搜索范围」是要查找的单行或单列区域。" #: 04060109.xhp msgctxt "" @@ -18350,7 +18350,7 @@ "par_id3149925\n" "help.text" msgid "ResultVector is another single-row or single-column range from which the result of the function is taken. The result is the cell of the result vector with the same index as the instance found in the search vector." -msgstr "「ResultVector」是另一个单行或单列区域，用于存放函数的结果。结果是结果向量单元格中的与在搜索向量中找到的向量具有相同的索引。" +msgstr "「结果范围」是另一个单行或单列区域，用于存放函数的结果。结果是结果向量单元格中的与在搜索向量中找到的向量具有相同的索引。" #: 04060109.xhp msgctxt "" @@ -18534,7 +18534,7 @@ "par_id3146070\n" "help.text" msgid "HLOOKUP(SearchCriterion; Array; Index; Sorted)" -msgstr "HLOOKUP(SearchCriterion; Array; Index; Sorted)" +msgstr "HLOOKUP(搜索条件; 数组; 索引; 已排序)" #: 04060109.xhp msgctxt "" @@ -18574,7 +18574,7 @@ "par_id3154916\n" "help.text" msgid "ROW(Reference)" -msgstr "ROW(Reference)" +msgstr "ROW(引用)" #: 04060109.xhp msgctxt "" @@ -18670,7 +18670,7 @@ "par_id3154357\n" "help.text" msgid "ROWS(Array)" -msgstr "ROWS(Array)" +msgstr "ROWS(数组)" #: 04060109.xhp msgctxt "" @@ -20934,7 +20934,7 @@ "par_id3147582\n" "help.text" msgid "SUBSTITUTE(\"Text\"; \"SearchText\"; \"NewText\"; Occurrence)" -msgstr "SUBSTITUTE(\"Text\"; \"SearchText\"; \"NewText\"; Occurrence)" +msgstr "SUBSTITUTE(\"文本\"; \"查找文本\"; \"替换文本\"; 次数)" #: 04060110.xhp msgctxt "" @@ -20966,7 +20966,7 @@ "par_id3150348\n" "help.text" msgid "Occurrence (optional) indicates which occurrence of the search text is to be replaced. If this parameter is missing the search text is replaced throughout." -msgstr "「Occurrence」 (可选) 指出要替换第几次出现的搜索文本。如果不指定此参数，则所有搜索文本都将被替换。" +msgstr "「次数」 (可选) 指出要替换第几次出现的搜索文本。如果不指定此参数，则所有搜索文本都将被替换。" #: 04060110.xhp msgctxt "" @@ -23190,7 +23190,7 @@ "par_id3154474\n" "help.text" msgid "String with closing zero byte" -msgstr "符号结果带结尾 0 字节。" +msgstr "字符串带结尾的字节 0" #: 04060112.xhp msgctxt "" @@ -26782,7 +26782,7 @@ "par_id3145350\n" "help.text" msgid "Settlement date: April 20 1999, maturity date: June 15 1999, last interest: October 15 1998. Interest rate: 3.75 per cent, price: 99.875 currency units, redemption value: 100 currency units, frequency of payments: half-yearly = 2, basis: = 0" -msgstr "成交日: 1999 年 4 月 20 日，计息日期: 1999 年 6 月 15 日，有价证券的结算日期: 1998 年 10 月 15 日。利率: 3.75%，实际价格: 99.875 货币单位，偿还价格: 100 货币单位，年付息的次数: 半年一次 = 2，基准: = 0" +msgstr "成交日: 1999 年 4 月 20 日，计息日期: 1999 年 6 月 15 日，有价证券的结算日期: 1998 年 10 月 15 日。利率: 3.75％，实际价格: 99.875 货币单位，偿还价格: 100 货币单位，年付息的次数: 半年一次 = 2，基准: = 0" #: 04060118.xhp msgctxt "" @@ -27198,7 +27198,7 @@ "par_id3150525\n" "help.text" msgid "Calculation of the net present value for the above-mentioned five payments for a notional internal rate of return of 6%." -msgstr "计算收益率为 6% 时上述五项现金流的净现值:。" +msgstr "计算假设内部收益率为 6% 时，上述五笔付款的净现值。" #: 04060118.xhp msgctxt "" @@ -27374,7 +27374,7 @@ "par_id3150706\n" "help.text" msgid "What is the constant interest rate for a payment period of 3 periods if 10 currency units are paid regularly and the present cash value is 900 currency units." -msgstr "如果现值为 900 个货币单位的一笔贷款要分三个还款周期还清，而每次的分期支付金额为 10 个货币单位，那么利率应该是多少呢？" +msgstr "如果现值为 900 个货币单位的一笔贷款要分三个还款周期还清，而每次的分期支付金额为 10 个货币单位，恒定利率应该是多少。" #: 04060118.xhp msgctxt "" @@ -28222,7 +28222,7 @@ "par_id3147378\n" "help.text" msgid "How many payment periods does a payment period cover with a periodic interest rate of 6%, a periodic payment of 153.75 currency units and a present cash value of 2.600 currency units." -msgstr "一笔贷款的当前现金值是 2600 货币单位，每个还款期的利率是 6%，还款金额是 153.75 货币单位，要用几个还款期才能偿清呢？" +msgstr "一笔贷款的当前现金值为 2600 货币单位，周期利率为 6%，定期支付金额为 153.75 货币单位，要用几个支付周期才能偿清。" #: 04060118.xhp msgctxt "" @@ -28366,7 +28366,7 @@ "par_id3154811\n" "help.text" msgid "How high is the periodic monthly payment at an annual interest rate of 8.75% over a period of 3 years? The cash value is 5,000 currency units and is always paid at the beginning of a period. The future value is 8,000 currency units." -msgstr "如果一项贷款的现值是 5,000 个货币单位，未来值是 8,000 个货币单位，年利率为 8.75%，偿还期限为 3 年，且始终在周期的开始时支付，则定期的月支付额是多少？" +msgstr "如果一项贷款的现值是 5,000 个货币单位，未来值是 8,000 个货币单位，年利率为 8.75%，偿还期限为 3 年，且始终在周期的开始时支付，则定期的月支付额是多少。" #: 04060119.xhp msgctxt "" @@ -28686,7 +28686,7 @@ "par_id3147478\n" "help.text" msgid "What are the interest payments at a yearly interest rate of 5.5 %, a payment period of monthly payments for 2 years and a current cash value of 5,000 currency units? The start period is the 4th and the end period is the 6th period. The payment is due at the beginning of each period." -msgstr "如果一项贷款的当前现金值是 5,000 货币单位，年利率为 5.5%，偿还期限为 2 年，按月支付，且分期支付额在一个周期的开始时到期，则第 4 至第 6 个周期内的利息总额是多少？" +msgstr "如果一项贷款的当前现金值是 5,000 货币单位，年利率为 5.5%，偿还期限为 2 年，按月支付，每期在周期开始时支付，则第 4 至 6 周期内的利息总额是多少。" #: 04060119.xhp msgctxt "" @@ -28790,7 +28790,7 @@ "par_id3147566\n" "help.text" msgid "Rate: 9.00 per cent per annum (9% / 12 = 0.0075), Duration: 30 years (NPER = 30 * 12 = 360), Pv: 125000 currency units." -msgstr "利率: 每年 9.00% (9% / 12 = 0.0075)，期限: 30 年 (NPER = 30 * 12 = 360)，Pv: 125000 个货币单位。" +msgstr "利率: 每年 9.00％ (9% / 12 = 0.0075)，期限: 30 年 (NPER = 30 * 12 = 360)，Pv: 125000 个货币单位。" #: 04060119.xhp msgctxt "" @@ -29510,7 +29510,7 @@ "par_id3145777\n" "help.text" msgid "What is the nominal rate of interest for a 5.3543% effective rate of interest and quarterly payment." -msgstr "实际利率为 5.354% 且每季度付息时，名义利率是多少呢？" +msgstr "实际利率为 5.3543% 且按季度支付时，名义利率是多少。" #: 04060119.xhp msgctxt "" @@ -29806,7 +29806,7 @@ "par_id3154194\n" "help.text" msgid "=YIELD(\"1999-02-15\"; \"2007-11-15\"; 0.0575 ;95.04287; 100; 2; 0) returns 0.065 or 6.50 per cent." -msgstr "=YIELD(\"1999-02-15\"; \"2007-11-15\"; 0.0575 ;95.04287; 100; 2; 0) 返回 0.065 或 6.50%。" +msgstr "=YIELD(\"1999-02-15\"; \"2007-11-15\"; 0.0575 ;95.04287; 100; 2; 0) 返回 0.065 或 6.50％。" #: 04060119.xhp msgctxt "" @@ -29886,7 +29886,7 @@ "par_id3155187\n" "help.text" msgid "=YIELDDISC(\"1999-02-15\"; \"1999-03-01\"; 99.795; 100; 2) returns 0.052823 or 5.2823 per cent." -msgstr "=YIELDDISC(\"1999-02-15\"; \"1999-03-01\"; 99.795; 100; 2) 返回 0.052823 或 5.2823%。" +msgstr "=YIELDDISC(\"1999-02-15\"; \"1999-03-01\"; 99.795; 100; 2) 返回 0.052823 或 5.2823％。" #: 04060119.xhp msgctxt "" @@ -29974,7 +29974,7 @@ "par_id3155311\n" "help.text" msgid "=YIELDMAT(\"1999-03-15\"; \"1999-11-03\"; \"1998-11-08\"; 0.0625; 100.0123; 0) returns 0.060954 or 6.0954 per cent." -msgstr "=YIELDMAT(\"1999-03-15\"; \"1999-11-03\"; \"1998-11-08\"; 0.0625; 100.0123; 0) 返回 0.060954 或 6.0954%。" +msgstr "=YIELDMAT(\"1999-03-15\"; \"1999-11-03\"; \"1998-11-08\"; 0.0625; 100.0123; 0) 返回 0.060954 或 6.0954％。" #: 04060119.xhp msgctxt "" @@ -30142,7 +30142,7 @@ "par_id3154382\n" "help.text" msgid "=TBILLEQ(\"1999-03-31\";\"1999-06-01\"; 0.0914) returns 0.094151 or 9.4151 per cent." -msgstr "=TBILLEQ(\"1999-03-31\";\"1999-06-01\"; 0.0914) 返回 0.094151 或 9.4151%。" +msgstr "=TBILLEQ(\"1999-03-31\";\"1999-06-01\"; 0.0914) 返回 0.094151 或 9.4151％。" #: 04060119.xhp msgctxt "" @@ -30302,7 +30302,7 @@ "par_id3148528\n" "help.text" msgid "=TBILLYIELD(\"1999-03-31\";\"1999-06-01\"; 98.45) returns 0.091417 or 9.1417 per cent." -msgstr "=TBILLYIELD(\"1999-03-31\";\"1999-06-01\"; 98.45) 返回 0.091417 或 9.1417%。" +msgstr "=TBILLYIELD(\"1999-03-31\";\"1999-06-01\"; 98.45) 返回 0.091417 或 9.1417％。" #: 04060119.xhp msgctxt "" @@ -31606,7 +31606,7 @@ "par_id2846897\n" "help.text" msgid "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." -msgstr "返回使累积二项式分布大于等于临界值的最小值。" +msgstr "返回使累积二项式分布大于等于条件值的最小值。" #: 04060181.xhp msgctxt "" @@ -31646,7 +31646,7 @@ "par_id285666\n" "help.text" msgid "=BINOM.INV(8;0.6;0.9) returns 7, the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." -msgstr "「=BINOM.INV(8;0.6;0.9)」返回 7, 这是累积二项分布大于或等于一个标准值的最小值。" +msgstr "「=BINOM.INV(8;0.6;0.9)」返回 7, 这是累积二项分布大于或等于条件值的最小值。" #: 04060181.xhp msgctxt "" @@ -32822,7 +32822,7 @@ "par_id3155089\n" "help.text" msgid "Returns the inverse of the F probability distribution. The F distribution is used for F tests in order to set the relation between two differing data sets." -msgstr "返回 F 概率分布函数的逆函数。F 分布函数用于 F 测试，以设置两个不同数据集之间的关系。" +msgstr "返回 F 概率分布函数的逆函数。F 分布函数用于 F 检验，以设置两个不同数据集之间的关系。" #: 04060182.xhp msgctxt "" @@ -32862,7 +32862,7 @@ "par_id3145073\n" "help.text" msgid "=FINV(0.5;5;10) yields 0.93." -msgstr "「=FINV(0.5;5;10)」等于 0.93。" +msgstr "「=FINV(0.5;5;10)」得到 0.93。" #: 04060182.xhp msgctxt "" @@ -32886,7 +32886,7 @@ "par_id2955089\n" "help.text" msgid "Returns the inverse of the cumulative F distribution. The F distribution is used for F tests in order to set the relation between two differing data sets." -msgstr "返回 F 概率分布函数的逆函数。F 分布函数用于 F 测试，以设置两个不同数据集之间的关系。" +msgstr "返回 F 概率分布函数的逆函数。F 分布函数用于 F 检验，以设置两个不同数据集之间的关系。" #: 04060182.xhp msgctxt "" @@ -32926,7 +32926,7 @@ "par_id2945073\n" "help.text" msgid "=F.INV(0.5;5;10) yields 0.9319331609." -msgstr "「=F.INV(0.5;5;10)」返回 0.9319331609。" +msgstr "「=F.INV(0.5;5;10)」得到 0.9319331609。" #: 04060182.xhp msgctxt "" @@ -32990,7 +32990,7 @@ "par_id2845073\n" "help.text" msgid "=F.INV.RT(0.5;5;10) yields 0.9319331609." -msgstr "「=F.INV.RT(0.5;5;10)」返回 0.9319331609。" +msgstr "「=F.INV.RT(0.5;5;10)」得到 0.9319331609。" #: 04060182.xhp msgctxt "" @@ -33038,7 +33038,7 @@ "par_id3149383\n" "help.text" msgid "=FISHER(0.5) yields 0.55." -msgstr "「=FISHER(0.5)」等于 0.55。" +msgstr "「=FISHER(0.5)」得到 0.55。" #: 04060182.xhp msgctxt "" @@ -33086,7 +33086,7 @@ "par_id3150432\n" "help.text" msgid "=FISHERINV(0.5) yields 0.46." -msgstr "「=FISHERINV(0.5)」等于 0.46。" +msgstr "「=FISHERINV(0.5)」得到 0.46。" #: 04060182.xhp msgctxt "" @@ -33110,7 +33110,7 @@ "par_id3150534\n" "help.text" msgid "Returns the result of an F test." -msgstr "返回 F 测试的结果。" +msgstr "返回 F 检验的结果。" #: 04060182.xhp msgctxt "" @@ -33118,7 +33118,7 @@ "par_id3153024\n" "help.text" msgid "FTEST(Data1; Data2)" -msgstr "FTEST(Data1; Data2)" +msgstr "FTEST(数据1; 数据2)" #: 04060182.xhp msgctxt "" @@ -33174,7 +33174,7 @@ "par_id2953024\n" "help.text" msgid "F.TEST(Data1; Data2)" -msgstr "F.TEST(Data1; Data2)" +msgstr "F.TEST(数据1; 数据2)" #: 04060182.xhp msgctxt "" @@ -33262,7 +33262,7 @@ "par_id3150696\n" "help.text" msgid "=FDIST(0.8;8;12) yields 0.61." -msgstr "「=FDIST(0.8;8;12)」等于 0.61。" +msgstr "「=FDIST(0.8;8;12)」得到 0.61。" #: 04060182.xhp msgctxt "" @@ -33334,7 +33334,7 @@ "par_id2950696\n" "help.text" msgid "=F.DIST(0.8;8;12;0) yields 0.7095282499." -msgstr "「=F.DIST(0.8;8;12;0)」返回 0.7095282499。" +msgstr "「=F.DIST(0.8;8;12;0)」得到 0.7095282499。" #: 04060182.xhp msgctxt "" @@ -33342,7 +33342,7 @@ "par_id2950697\n" "help.text" msgid "=F.DIST(0.8;8;12;1) yields 0.3856603563." -msgstr "「=F.DIST(0.8;8;12;1)」返回 0.3856603563。" +msgstr "「=F.DIST(0.8;8;12;1)」得到 0.3856603563。" #: 04060182.xhp msgctxt "" @@ -33406,7 +33406,7 @@ "par_id2850696\n" "help.text" msgid "=F.DIST.RT(0.8;8;12) yields 0.6143396437." -msgstr "「=F.DIST.RT(0.8;8;12)」返回 0.6143396437。" +msgstr "「=F.DIST.RT(0.8;8;12)」得到 0.6143396437。" #: 04060182.xhp msgctxt "" @@ -33502,7 +33502,7 @@ "par_id3153331\n" "help.text" msgid "=GAMMAINV(0.8;1;1) yields 1.61." -msgstr "「=GAMMAINV(0.8;1;1)」等于 1.61。" +msgstr "「=GAMMAINV(0.8;1;1)」得到 1.61。" #: 04060182.xhp msgctxt "" @@ -33574,7 +33574,7 @@ "par_id2913331\n" "help.text" msgid "=GAMMA.INV(0.8;1;1) yields 1.61." -msgstr "「=GAMMA.INV(0.8;1;1)」返回 1.61。" +msgstr "「=GAMMA.INV(0.8;1;1)」得到 1.61。" #: 04060182.xhp msgctxt "" @@ -33622,7 +33622,7 @@ "par_id3153730\n" "help.text" msgid "=GAMMALN(2) yields 0." -msgstr "「=GAMMALN(2)」等于 0。" +msgstr "「=GAMMALN(2)」得到 0。" #: 04060182.xhp msgctxt "" @@ -33670,7 +33670,7 @@ "par_id2913730\n" "help.text" msgid "=GAMMALN.PRECISE(2) yields 0." -msgstr "「=GAMMALN.PRECISE(2)」返回 0。" +msgstr "「=GAMMALN.PRECISE(2)」得到 0。" #: 04060182.xhp msgctxt "" @@ -33750,7 +33750,7 @@ "par_id3145354\n" "help.text" msgid "=GAMMADIST(2;1;1;1) yields 0.86." -msgstr "「=GAMMADIST(2;1;1;1)」等于 0.86。" +msgstr "「=GAMMADIST(2;1;1;1)」得到 0.86。" #: 04060182.xhp msgctxt "" @@ -33838,7 +33838,7 @@ "par_id2406201422392251\n" "help.text" msgid "=GAMMA.DIST(2;1;1;1) yields 0.86." -msgstr "「=GAMMA.DIST(2,1,1,1)」等于 0.86。" +msgstr "「=GAMMA.DIST(2;1;1;1)」得到 0.86。" #: 04060182.xhp msgctxt "" @@ -33982,7 +33982,7 @@ "par_id3154821\n" "help.text" msgid "TRIMMEAN(Data; Alpha)" -msgstr "TRIMMEAN(Data; Alpha)" +msgstr "TRIMMEAN(数据; α)" #: 04060182.xhp msgctxt "" @@ -33998,7 +33998,7 @@ "par_id3156304\n" "help.text" msgid "Alpha is the percentage of the marginal data that will not be taken into consideration." -msgstr "「Alpha」是计算时所要除去的临界数据的比例。" +msgstr "「α」是计算时所要除去的临界数据的比例。" #: 04060182.xhp msgctxt "" @@ -34006,7 +34006,7 @@ "par_id3156130\n" "help.text" msgid "=TRIMMEAN(A1:A50; 0.1) calculates the mean value of numbers in A1:A50, without taking into consideration the 5 percent of the values representing the highest values and the 5 percent of the values representing the lowest ones. The percentage numbers refer to the amount of the untrimmed mean value, not to the number of summands." -msgstr "=TRIMMEAN(A1:A50; 0.1) 计算 A1:A50 中数字的平均值，且不考虑代表最高值的占 5% 的值和代表最低值的占 5% 的值。百分比是指未调和平均值的数量，而非被加数的数量。" +msgstr "=TRIMMEAN(A1:A50; 0.1) 计算 A1:A50 中数字的平均值，且不考虑代表最高值的占 5％ 的值和代表最低值的占 5％ 的值。百分比是指未调和平均值的数量，而非被加数的数量。" #: 04060182.xhp msgctxt "" @@ -34134,7 +34134,7 @@ "par_id2948770\n" "help.text" msgid "=Z.TEST(A2:A20; 9; 2) returns the result of a z-test on a sample A2:A20 drawn from a population with known mean 9 and known standard deviation 2." -msgstr "「=Z.TEST(A2:A20; 9; 2)」返回 z 测试结果，样本为 已知平均值为 9、标准偏差为 2 的总体中提取的 A2:A20。" +msgstr "「=Z.TEST(A2:A20; 9; 2)」返回 z 检验结果，样本为 已知平均值为 9、标准偏差为 2 的总体中提取的 A2:A20。" #: 04060182.xhp msgctxt "" @@ -34182,7 +34182,7 @@ "par_id3146093\n" "help.text" msgid "=HARMEAN(23;46;69) = 37.64. The harmonic mean of this random sample is thus 37.64" -msgstr "=HARMEAN(23;46;69) = 37.64. 这三个随机样本的调和平均值为 37.64。" +msgstr "=HARMEAN(23;46;69) = 37.64。这三个随机样本的调和平均值为 37.64" #: 04060182.xhp msgctxt "" @@ -34254,7 +34254,7 @@ "par_id3154904\n" "help.text" msgid "=HYPGEOMDIST(2;2;90;100) yields 0.81. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first." -msgstr "「=HYPGEOMDIST(2;2;90;100)」等于 0.81. 假设有 100 片涂有黄油的烤面包片，其中有 90 片从桌子上掉落，并且涂有黄油的一面先着地，假设有 2 片涂有黄油的烤面包片从桌子上掉下，则两片面包都是涂有黄油的一面先着地的概率都是 81%。" +msgstr "「=HYPGEOMDIST(2;2;90;100)」得到 0.81。假设有 100 片涂有黄油的烤面包片，其中有 90 片从桌子上掉落，并且涂有黄油的一面先着地，假设有 2 片涂有黄油的烤面包片从桌子上掉下，则两片面包都是涂有黄油的一面先着地的概率都是 81%。" #: 04060182.xhp msgctxt "" @@ -34278,7 +34278,7 @@ "par_id2959341\n" "help.text" msgid "Returns the hypergeometric distribution." -msgstr "返回超几何分布的函数值。" +msgstr "返回超几何分布。" #: 04060182.xhp msgctxt "" @@ -34334,7 +34334,7 @@ "par_id2954904\n" "help.text" msgid "=HYPGEOM.DIST(2;2;90;100;0) yields 0.8090909091. If 90 out of 100 pieces of buttered toast fall from the table and hit the floor with the buttered side first, then if 2 pieces of buttered toast are dropped from the table, the probability is 81%, that both will strike buttered side first." -msgstr "「=HYPGEOMDIST(2;2;90;100)」等于 0.81. 假设有 100 片涂有黄油的烤面包片，其中有 90 片从桌子上掉落，并且涂有黄油的一面先着地，假设有 2 片涂有黄油的烤面包片从桌子上掉下，则两片面包都是涂有黄油的一面先着地的概率都是 81%。" +msgstr "「=HYPGEOM.DIST(2;2;90;100;0)」得到 0.8090909091。假设有 100 片涂有黄油的烤面包片，其中有 90 片从桌子上掉落，并且涂有黄油的一面先着地，假设有 2 片涂有黄油的烤面包片从桌子上掉下，则两片面包都是涂有黄油的一面先着地的概率都是 81%。" #: 04060182.xhp msgctxt "" @@ -34342,7 +34342,7 @@ "par_id2954905\n" "help.text" msgid "=HYPGEOM.DIST(2;2;90;100;1) yields 1." -msgstr "=HYPGEOM.DIST(2;2;90;100;1) 结果为 1。" +msgstr "「=HYPGEOM.DIST(2;2;90;100;1)」得到 1。" #: 04060183.xhp msgctxt "" @@ -34510,7 +34510,7 @@ "par_id3149872\n" "help.text" msgid "Alpha is the level of the confidence interval." -msgstr "alpha 计算置信区间的级别。" +msgstr "「α」为置信区间的级别。" #: 04060183.xhp msgctxt "" @@ -34558,7 +34558,7 @@ "par_id2953814\n" "help.text" msgid "Returns the (1-alpha) confidence interval for a Student's t distribution." -msgstr " 返回正态分布的 (1-alpha) 置信区间。" +msgstr "返回学生 t 分布的 (1-alpha) 置信区间。" #: 04060183.xhp msgctxt "" @@ -34574,7 +34574,7 @@ "par_id2949872\n" "help.text" msgid "Alpha is the level of the confidence interval." -msgstr "alpha 计算置信区间的级别。" +msgstr "「α」为置信区间的级别。" #: 04060183.xhp msgctxt "" @@ -34622,7 +34622,7 @@ "par_id2853814\n" "help.text" msgid "Returns the (1-alpha) confidence interval for a normal distribution." -msgstr " 返回正态分布的 (1-alpha) 置信区间。" +msgstr "返回正态分布的 (1-alpha) 置信区间。" #: 04060183.xhp msgctxt "" @@ -34638,7 +34638,7 @@ "par_id2849872\n" "help.text" msgid "Alpha is the level of the confidence interval." -msgstr "alpha 计算置信区间的级别。" +msgstr "「α」为置信区间的级别。" #: 04060183.xhp msgctxt "" @@ -34694,7 +34694,7 @@ "par_id3153023\n" "help.text" msgid "CORREL(Data1; Data2)" -msgstr "CORREL(Data1; Data2)" +msgstr "CORREL(数据1; 数据2)" #: 04060183.xhp msgctxt "" @@ -34750,7 +34750,7 @@ "par_id3150740\n" "help.text" msgid "COVAR(Data1; Data2)" -msgstr "COVAR(Data1; Data2)" +msgstr "COVAR(数据1; 数据2)" #: 04060183.xhp msgctxt "" @@ -34910,7 +34910,7 @@ "par_id3149254\n" "help.text" msgid "Returns the smallest value for which the cumulative binomial distribution is greater than or equal to a criterion value." -msgstr "返回使累积二项式分布大于等于临界值的最小值。" +msgstr "返回使累积二项式分布大于等于条件值的最小值。" #: 04060183.xhp msgctxt "" @@ -34950,7 +34950,7 @@ "par_id3148740\n" "help.text" msgid "=CRITBINOM(100;0.5;0.1) yields 44." -msgstr "「=CRITBINOM(100;0.5;0.1)」等于 44。" +msgstr "「=CRITBINOM(100;0.5;0.1)」得到 44。" #: 04060183.xhp msgctxt "" @@ -36358,7 +36358,7 @@ "par_id3153216\n" "help.text" msgid "Returns the Pearson product moment correlation coefficient r." -msgstr "返回 Pearson 乘积矩相关系数 r。" +msgstr "返回皮尔逊积矩相关系数 r。" #: 04060184.xhp msgctxt "" @@ -36366,7 +36366,7 @@ "par_id3156133\n" "help.text" msgid "PEARSON(Data1; Data2)" -msgstr "PEARSON(Data1; Data2)" +msgstr "PEARSON(数据1; 数据2)" #: 04060184.xhp msgctxt "" @@ -36390,7 +36390,7 @@ "par_id3151187\n" "help.text" msgid "=PEARSON(A1:A30;B1:B30) returns the Pearson correlation coefficient of both data sets." -msgstr "「=PEARSON(A1:A30;B1:B30)」返回两个数据集的 Pearson 相关系数。" +msgstr "「=PEARSON(A1:A30;B1:B30)」返回两个数据集的 皮尔逊相关系数。" #: 04060184.xhp msgctxt "" @@ -36526,7 +36526,7 @@ "bm_id2953985\n" "help.text" msgid "POISSON.DIST function" -msgstr "POISSON.DIST 返回" +msgstr "POISSON.DIST 函数" #: 04060184.xhp msgctxt "" @@ -36542,7 +36542,7 @@ "par_id2954298\n" "help.text" msgid "Returns the Poisson distribution." -msgstr "返回泊松分布的函数值。" +msgstr "返回泊松分布。" #: 04060184.xhp msgctxt "" @@ -36614,7 +36614,7 @@ "par_id3148813\n" "help.text" msgid "PERCENTILE(Data; Alpha)" -msgstr "PERCENTILE(Data; Alpha)" +msgstr "PERCENTILE(数据; α)" #: 04060184.xhp msgctxt "" @@ -36622,7 +36622,7 @@ "par_id3153054\n" "help.text" msgid "Data represents the array of data." -msgstr "「Data」表示数据的数组。" +msgstr "「数据」表示数据的数组。" #: 04060184.xhp msgctxt "" @@ -36630,7 +36630,7 @@ "par_id3154212\n" "help.text" msgid "Alpha represents the percentage of the scale between 0 and 1." -msgstr "「Alpha」表示 0 到 1 之间的刻度百分比。" +msgstr "「α」表示 0 到 1 之间的刻度百分比。" #: 04060184.xhp msgctxt "" @@ -36638,7 +36638,7 @@ "par_id3159147\n" "help.text" msgid "=PERCENTILE(A1:A50;0.1) represents the value in the data set, which equals 10% of the total data scale in A1:A50." -msgstr "「=PERCENTILE(A1:A50;0.1)」表示数据集中的值，即等于 A1:A50 中的整个数据刻度的 10%。" +msgstr "「=PERCENTILE(A1:A50;0.1)」表示数据集中等于 A1:A50 中的整个数据刻度的 10% 的值。" #: 04060184.xhp msgctxt "" @@ -36657,31 +36657,28 @@ msgstr "PERCENTILE.EXC" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2854940\n" "help.text" msgid "Returns the Alpha'th percentile of a supplied range of values for a given value of Alpha, within the range 0 to 1 (exclusive). A percentile returns the scale value for a data series which goes from the smallest (Alpha=0) to the largest value (Alpha=1) of a data series. For Alpha = 25%, the percentile means the first quartile; Alpha = 50% is the MEDIAN." -msgstr "< ahelp 隐藏 = \"hid _ fonc _ percentile _ exc\" > 返回 < 项目类型 = \"文本\" > alpha ' 之四, 为项目类型 = \"文本\" > alpha 的给定值提供的值范围, 在0到 1 (独占) 的范围内。百分位数返回数据系列的比例值, 该比例值从数据系列的最小值 (< 项 type=\"literal\">Alpha=0 ) 到最大值 (< 项 type=\"literal\">Alpha=1 )。对于 < 项目类型 = \"文字\" > alpha = 25%, 百分位数表示第一个四分位数;< 项目类型 = \"文字\" > alpha = 50% 是气值。" +msgstr "对于给定的介于 0 与 1 之间 (不含) 的数值「α」，返回提供的值范围的第α 个百分位数。百分位数返回数据系列的比例值, 从数据序列的最小值 (α=0) 到数据序列的最大值 (α=1)。对于 α = 25%, 百分位数表示第一个四分位数; α = 50% 是中位数 (MEDIAN)。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2754940\n" "help.text" msgid "If Alpha is not a multiple of 1/(n+1), (where n is the number of values in the supplied array), the function interpolates between the values in the supplied array, to calculate the percentile value. However, if Alpha is less than 1/(n+1) or Alpha is greater than n/(n+1), the function is unable to interpolate, and so returns an error." -msgstr "如果 < 项类型 = \"文字\" > alpha 不是 < 项 type=\"literal\">1/(n+1) (其中 n 是提供的数组中的值数) 的倍数, 则该函数将在提供的数组中的值之间进行插值, 以计算百分位值。但是, 如果 < 项目类型 = \"文字\" > alpha 小于 < 项目 type=\"literal\">1/(n+1) 或 < 项目类型 = \"文字\" > alpha 大于 < 项 type=\"literal\">n/(n+1) , 则函数无法插值, 因此返回错误。" +msgstr "如果「α」不是「1/(n+1)」(其中 n 是提供的数组的值的个数) 的倍数, 则该函数将在提供的数组的值之间进行插值, 以计算百分位值。但是, 如果「α」小于「1/(n+1)」或「α」大于 n/(n+1), 则函数无法插值, 因此返回错误。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2653976\n" "help.text" msgid "The difference between PERCENTILE.INC and PERCENTILE.EXC is that, in the PERCENTILE.INC function the value of alpha is within the range 0 to 1 inclusive, and in the PERCENTILE.EXC function, the value of alpha is within the range 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > perentile 之间的区别。inc 和 < 项类型 = \"输入\" > perm-le。exc 是, 在 < 项目类型 = \"输入\" > perm-ile 中。inc 函数 alpha 的值在0到 1 (含0到 1) 范围内, 并且在 < 项类型 = \"输入\" > perm-file 中。exc 函数, alpha 的值在0到1的范围内独占。" +msgstr "「PERCENTILE.INC」与「PERCENTILE.EXC」的区别在于，「PERCENTILE.INC」函数中的 α 值在 0 到 1 范围 (含)，而PERCENTILE.EXC 函数中的 α 在 0 到 1 之间 (不含)。" #: 04060184.xhp msgctxt "" @@ -36689,7 +36686,7 @@ "par_id2848813\n" "help.text" msgid "PERCENTILE.EXC(Data; Alpha)" -msgstr "PERCENTILE.EXC(Data; Alpha)" +msgstr "PERCENTILE.EXC(数据; α)" #: 04060184.xhp msgctxt "" @@ -36697,7 +36694,7 @@ "par_id2853054\n" "help.text" msgid "Data represents the array of data." -msgstr "「Data」表示数据的数组。" +msgstr "「数据」表示数据的数组。" #: 04060184.xhp msgctxt "" @@ -36705,7 +36702,7 @@ "par_id2854212\n" "help.text" msgid "Alpha represents the percentage of the scale between 0 and 1." -msgstr "「Alpha」表示 0 到 1 之间的刻度百分比。" +msgstr "「α」表示 0 到 1 之间的刻度百分比。" #: 04060184.xhp msgctxt "" @@ -36713,7 +36710,7 @@ "par_id2859147\n" "help.text" msgid "=PERCENTILE.EXC(A1:A50;10%) represents the value in the data set, which equals 10% of the total data scale in A1:A50." -msgstr "「=PERCENTILE(A1:A50;0.1)」表示数据集中的值，即等于 A1:A50 中的整个数据刻度的 10%。" +msgstr "「=PERCENTILE.EXC(A1:A50;10%)」表示数据集中等于 A1:A50 的整个数据刻度 10% 的值。" #: 04060184.xhp msgctxt "" @@ -36740,13 +36737,12 @@ msgstr "返回数组中数值的 ɑ 百分点。百分点指数据序列从最小值 (ɑ = 0) 到最大值 (ɑ = 1) 的刻度值。ɑ = 25% 时，百分点为第一四分位值；ɑ = 50% 时，为中位数 (MEDIAN 函数)。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2753976\n" "help.text" msgid "The difference between PERCENTILE.INC and PERCENTILE.EXC is that, in the PERCENTILE.INC function the value of alpha is within the range 0 to 1 inclusive, and in the PERCENTILE.EXC function, the value of alpha is within the range 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > perentile 之间的区别。inc 和 < 项类型 = \"输入\" > perm-le。exc 是, 在 < 项目类型 = \"输入\" > perm-ile 中。inc 函数 alpha 的值在0到 1 (含0到 1) 范围内, 并且在 < 项类型 = \"输入\" > perm-file 中。exc 函数, alpha 的值在0到1的范围内独占。" +msgstr "「PERCENTILE.INC」与「PERCENTILE.EXC」的区别在于，「PERCENTILE.INC」函数中的 ɑ 值在 0 到 1 范围 (含)，而PERCENTILE.EXC 函数中的 ɑ 在 0 到 1 之间 (不含)。" #: 04060184.xhp msgctxt "" @@ -36778,7 +36774,7 @@ "par_id2959147\n" "help.text" msgid "=PERCENTILE.INC(A1:A50;0.1) represents the value in the data set, which equals 10% of the total data scale in A1:A50." -msgstr "「=PERCENTILE(A1:A50;0.1)」表示数据集中的值，即等于 A1:A50 中的整个数据刻度的 10%。" +msgstr "「=PERCENTILE(A1:A50;0.1)」表示数据集中等于 A1:A50 中的整个数据刻度的 10% 的值。" #: 04060184.xhp msgctxt "" @@ -36869,13 +36865,12 @@ msgstr " 返回指定数值在给定数组中的相对位置，介于 0 到 1 之间 (不含)。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2553976\n" "help.text" msgid "The difference between PERCENTRANK.INC and PERCENTRANK.EXC is that PERCENTRANK.INC calculates a value in the range 0 to 1 inclusive, whereas the PERCENTRANK.EXC function calculates a value in the range 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > percentrek 之间的区别。inc 和 < 项目类型 = \"输入\" > percentrek。exc 是 \"项目类型 =\" 输入 \"> percentrek。inc 计算0到1范围内的值, 而 < 项类型 = \"输入\" > percentrek。exc 函数计算0到1范围内的值独占。" +msgstr "「PERCENTRANK.INC」与「PERCENTRANK.EXC」的区别在于，PERCENTRANK.INC 计算的值在 0 到 1 范围 (含)，而 PERCENTRANK.EXC 计算的值在 0 到 1 之间 (不含)。" #: 04060184.xhp msgctxt "" @@ -36942,13 +36937,12 @@ msgstr "返回指定数值在所提供数组中的相对位置，介于 0 到 1 之间 (含)。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2453976\n" "help.text" msgid "The difference between PERCENTRANK.INC and PERCENTRANK.EXC is that PERCENTRANK.INC calculates a value in the range 0 to 1 inclusive, whereas the PERCENTRANK.EXC function calculates a value in the range 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > percentrek 之间的区别。inc 和 < 项目类型 = \"输入\" > percentrek。exc 是 \"项目类型 =\" 输入 \"> percentrek。inc 计算0到1范围内的值, 而 < 项类型 = \"输入\" > percentrek。exc 函数计算0到1范围内的值独占。" +msgstr "「PERCENTRANK.INC」与「PERCENTRANK.EXC」的区别在于，PERCENTRANK.INC 计算的值在 0 到 1 范围 (含)，而 PERCENTRANK.EXC 计算的值在 0 到 1 之间 (不含)。" #: 04060184.xhp msgctxt "" @@ -37063,22 +37057,20 @@ msgstr "QUARTILE.EXC" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2846958\n" "help.text" msgid "Returns a requested quartile of a supplied range of values, based on a percentile range of 0 to 1 exclusive." -msgstr "< ahelp 隐藏 = \"hid _ func _ quty _ exc\" > 返回基于0到1独占的百分位数范围的所提供的值范围的请求的四分位。" +msgstr "根据 0 到 1 (不含) 的百分位数范围，返回所提供数值范围中请求的四分位数。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2353976\n" "help.text" msgid "The difference between QUARTILE.INC and QUARTILE.EXC is that the QUARTILE.INC function bases its calculation on a percentile range of 0 to 1 inclusive, whereas the QUARTILE.EXC function bases its calculation on a percentile range of 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > quarile 之间的差异。inc 和 < 项目类型 = \"输入\" > quarile。exc 是 < 项目类型 = \"输入\" > quarile。inc 函数的计算基于0到 1 (含0到 1) 的百分位范围, 而 < 项类型 = \"输入\" > quartiile。exc 函数基于0到1的百分位范围进行计算。" +msgstr "「QUARTILE.INC」与「QUARTILE.EXC」的区别在于，「QUARTILE.INC」函数的计算根据 0 到 1 范围 (含) 的百分位数，而QUARTILE.EXC 函数的计算根据 0 到 1 范围 (不含) 的百分位数。" #: 04060184.xhp msgctxt "" @@ -37097,13 +37089,12 @@ msgstr "「数据」表示要计算指定四分位数的数据值的区域。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2855589\n" "help.text" msgid "Type An integer between 1 and 3, representing the required quartile. (if type = 1 or 3, the supplied array must contain more than 2 values)" -msgstr " 类型 1到3之间的整数, 表示所需的四分位数。(如果类型 = 1 或 3, 则提供的数组必须包含2个以上的值)" +msgstr " 类型 1 到 3 之间的整数, 表示所需的四分位数。(如果类型 = 1 或 3, 则提供的数组必须包含 2 个以上的值)" #: 04060184.xhp msgctxt "" @@ -37135,16 +37126,15 @@ "par_id2946958\n" "help.text" msgid "Returns the quartile of a data set." -msgstr "返回数据集的分位数。" +msgstr "返回数据集的四分位数。" #: 04060184.xhp -#, fuzzy msgctxt "" "04060184.xhp\n" "par_id2253976\n" "help.text" msgid "The difference between QUARTILE.INC and QUARTILE.EXC is that the QUARTILE.INC function bases its calculation on a percentile range of 0 to 1 inclusive, whereas the QUARTILE.EXC function bases its calculation on a percentile range of 0 to 1 exclusive." -msgstr "项目类型 = \"输入\" > quarile 之间的差异。inc 和 < 项目类型 = \"输入\" > quarile。exc 是 < 项目类型 = \"输入\" > quarile。inc 函数的计算基于0到 1 (含0到 1) 的百分位范围, 而 < 项类型 = \"输入\" > quartiile。exc 函数基于0到1的百分位范围进行计算。" +msgstr "「QUARTILE.INC」与「QUARTILE.EXC」的区别在于，「QUARTILE.INC」函数的计算根据 0 到 1 范围 (含) 的百分位数，而QUARTILE.EXC 函数的计算根据 0 到 1 范围 (不含) 的百分位数。" #: 04060184.xhp msgctxt "" @@ -37256,7 +37246,7 @@ "par_id9305398\n" "help.text" msgid "Type = 0 means descending from the last item of the array to the first (this is the default)," -msgstr "Type = 0 表示降序排序，从数组的最后一项排列到第一项 (此为默认值)，" +msgstr "Type = 0 表示降序排序，从数组的最后一项排列到第一项 (此为默认值)," #: 04060185.xhp msgctxt "" @@ -37291,22 +37281,20 @@ msgstr "RANK.AVG" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2953976\n" "help.text" msgid "Returns the statistical rank of a given value, within a supplied array of values. If there are duplicate values in the list, the average rank is returned." -msgstr "< ahelp 隐藏 = \"hid _ 失控 _ rank _ avg\" > 返回给定值在提供的值数组中的统计排名。如果列表中存在重复的值, 则返回平均排名。" +msgstr "返回给定值在提供的值数组中的统计排名。如果列表中存在重复的值, 则返回平均排名。" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2653976\n" "help.text" msgid "The difference between RANK.AVG and RANK.EQ occurs when there are duplicates in the list of values. The RANK.EQ function returns the lower rank, whereas the RANK.AVG function returns the average rank." -msgstr "项目类型 = \"输入\" > rank 之间的差异。avg 和 < 项目类型 = \"输入\" > rank。当值列表中存在重复项时, 将发生 eq 。< 项目类型 = \"输入\" > rank。eq 函数返回较低的排名, 而 < 项类型 = \"输入\" > rank。avg 函数返回平均排名。" +msgstr "「RANK.AVG」与「RANK.EQ」的区别在于对数值列表中重复值的处理方式。、「RANK.EQ」函数返回较低的排名, 而 RANK.AVG 函数返回平均排名。" #: 04060185.xhp msgctxt "" @@ -37346,7 +37334,7 @@ "par_id0305398\n" "help.text" msgid "Type = 0 means descending from the last item of the array to the first (this is the default)," -msgstr "Type = 0 表示降序排序，从该范围的最后一项排列到第一项。" +msgstr "Type = 0 表示降序排序，从该范围的最后一项排列到第一项," #: 04060185.xhp msgctxt "" @@ -37381,22 +37369,20 @@ msgstr "RANK.EQ" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2853976\n" "help.text" msgid "Returns the statistical rank of a given value, within a supplied array of values. If there are duplicate values in the list, these are given the same rank." -msgstr "< ahelp 隐藏 = \"hid _ 失控 _ rank _ eq\" > 返回给定值在提供的值数组中的统计排名。如果列表中存在重复的值, 则为这些值分配相同的排名。" +msgstr " 返回给定值在提供的值数组中的统计排名。如果列表中存在重复的值, 则这些值的排名相同。" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2753976\n" "help.text" msgid "The difference between RANK.AVG and RANK.EQ occurs when there are duplicates in the list of values. The RANK.EQ function returns the lower rank, whereas the RANK.AVG function returns the average rank." -msgstr "项目类型 = \"输入\" > rank 之间的差异。avg 和 < 项目类型 = \"输入\" > rank。当值列表中存在重复项时, 将发生 eq 。< 项目类型 = \"输入\" > rank。eq 函数返回较低的排名, 而 < 项类型 = \"输入\" > rank。avg 函数返回平均排名。" +msgstr "「RANK.AVG」与「RANK.EQ」的区别在于对数值列表中重复值的处理方式。、「RANK.EQ」函数返回较低的排名, 而 RANK.AVG 函数返回平均排名。" #: 04060185.xhp msgctxt "" @@ -37436,7 +37422,7 @@ "par_id89305398\n" "help.text" msgid "Type = 0 means descending from the last item of the array to the first (this is the default)," -msgstr "Type = 0 表示降序排序，从该范围的最后一项排列到第一项。" +msgstr "Type = 0 表示降序排序，从该范围的最后一项排列到第一项," #: 04060185.xhp msgctxt "" @@ -37796,7 +37782,7 @@ "par_id2949187\n" "help.text" msgid "Calculates the standard deviation based on the entire population." -msgstr "根据全部项目计算标准偏差。" +msgstr "根据整个总体计算标准偏差。" #: 04060185.xhp msgctxt "" @@ -37844,7 +37830,7 @@ "par_id2849187\n" "help.text" msgid "Calculates the standard deviation based on sample of the population." -msgstr "根据全部项目计算标准偏差。" +msgstr "根据总体抽样计算标准偏差。" #: 04060185.xhp msgctxt "" @@ -38548,7 +38534,7 @@ "par_id3159184\n" "help.text" msgid "Returns the probability associated with a Student's t-Test." -msgstr "返回与 Student 的 t 测试相关的概率。" +msgstr "返回与 Student 的 t 检验相关的概率。" #: 04060185.xhp msgctxt "" @@ -38588,7 +38574,7 @@ "par_id3155327\n" "help.text" msgid "Type is the kind of t-test to perform. Type 1 means paired. Type 2 means two samples, equal variance (homoscedastic). Type 3 means two samples, unequal variance (heteroscedastic)." -msgstr "Type 代表待执行的 t-检验的类型。Type 1 表示成对检验。Type 2 表示两个样本具有方差一致性 (方差相等)。Type 3 表示两个样本不具有方差一致性 (方差不等)。" +msgstr "Type 代表待执行的 t-检验的类型。Type 1 表示配对检验。Type 2 表示两个样本具有方差一致性 (方差相等)。Type 3 表示两个样本不具有方差一致性 (方差不等)。" #: 04060185.xhp msgctxt "" @@ -38620,7 +38606,7 @@ "par_id2959184\n" "help.text" msgid "Returns the probability associated with a Student's t-Test." -msgstr "返回与 Student 的 t 测试相关的概率。" +msgstr "返回与学生的 t 检验相关的概率。" #: 04060185.xhp msgctxt "" @@ -38660,7 +38646,7 @@ "par_id2955327\n" "help.text" msgid "Type is the kind of t-test to perform. Type 1 means paired. Type 2 means two samples, equal variance (homoscedastic). Type 3 means two samples, unequal variance (heteroscedastic)." -msgstr "Type 代表待执行的 t-检验的类型。Type 1 表示成对检验。Type 2 表示两个样本具有方差一致性 (方差相等)。Type 3 表示两个样本不具有方差一致性 (方差不等)。" +msgstr "Type 代表待执行的 t-检验的类型。Type 1 表示配对检验。Type 2 表示两个样本具有方差一致性 (方差相等)。Type 3 表示两个样本不具有方差一致性 (方差不等)。" #: 04060185.xhp msgctxt "" @@ -38815,13 +38801,12 @@ msgstr "T.DIST.2T" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2853372\n" "help.text" msgid "Calculates the two-tailed Student's T Distribution, which is a continuous probability distribution that is frequently used for testing hypotheses on small sample data sets." -msgstr "ahelp hid=\"HID_FUNC_TDIST_2T\">Calculates 双尾学生的 t 分布, 这是一个连续的概率分布, 经常用于测试小样本数据集上的假设。" +msgstr "计算双尾的学生 T 分布, 这是连续的概率分布, 常用于测试小样本数据集上的假设。" #: 04060185.xhp msgctxt "" @@ -38872,13 +38857,12 @@ msgstr "T.DIST.RT" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2753372\n" "help.text" msgid "Calculates the right-tailed Student's T Distribution, which is a continuous probability distribution that is frequently used for testing hypotheses on small sample data sets." -msgstr "< ahelp 隐藏 = \"hid _ func _ tdist _ rt\" > 计算右尾学生的 t 分布, 这是一种连续的概率分布, 通常用于测试小样本数据集上的假设。" +msgstr "计算右尾的学生 T 分布, 这是连续的概率分布, 常用于测试小样本数据集上的假设。" #: 04060185.xhp msgctxt "" @@ -38982,7 +38966,7 @@ "par_id2959165\n" "help.text" msgid "Estimates the variance based on a sample." -msgstr " 根据抽样估算方差。" +msgstr "根据抽样估算方差。" #: 04060185.xhp msgctxt "" @@ -39126,7 +39110,7 @@ "par_id2959199\n" "help.text" msgid "Calculates a variance based on the entire population." -msgstr "根据总体样本计算方差。" +msgstr "根据整个总体计算方差。" #: 04060185.xhp msgctxt "" @@ -39350,7 +39334,7 @@ "par_id3154110\n" "help.text" msgid "Returns the probability that values in a range are between two limits. If there is no End value, this function calculates the probability based on the principle that the Data values are equal to the value of Start." -msgstr " 返回该值在两个极限之间的概率。如果没有 End 值，此函数会根据 Data 值等于 Start 值的原则计算概率。" +msgstr " 返回该值在两个极限之间的概率。如果没有「End」值，此函数会根据 Data 值等于「Start」值的原则计算概率。" #: 04060185.xhp msgctxt "" @@ -39385,13 +39369,12 @@ msgstr "「Start」为数值区间的开始，几率在该区间被累加。" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id3153694\n" "help.text" msgid "End (optional) is the end value of the interval whose probabilities are to be summed. If this parameter is missing, the probability for the Start value is calculated." -msgstr "「结束」(可选) 是要求和其概率的间隔的终值。如果缺少此参数, 则计算 \"开始\" 值的概率。" +msgstr "「结束」(可选) 是要计算其概率之和的区间的终值。如果缺少此参数, 则计算「开始」值的概率。" #: 04060185.xhp msgctxt "" @@ -39527,7 +39510,7 @@ "par_id2954916\n" "help.text" msgid "Returns the values of the Weibull distribution." -msgstr "返回 Weibull 分布的值。" +msgstr "返回 Weibull 分布的值。" #: 04060185.xhp msgctxt "" @@ -40290,13 +40273,12 @@ msgstr "定义名称" #: 04070100.xhp -#, fuzzy msgctxt "" "04070100.xhp\n" "par_id3154366\n" "help.text" msgid "Opens a dialog where you can specify a name for a selected area or a name for a formula expression." -msgstr "< 变量 id = \"namenfestlegentext\" > < ahelp hid = \". uno: 定义名称\" > 打开一个对话框, 您可以在其中指定选中区域的名称或公式表达式的名称. " +msgstr "打开一个对话框, 您可以在其中指定选中区域或公式表达式的名称. " #: 04070100.xhp msgctxt "" @@ -40307,13 +40289,12 @@ msgstr "使用鼠标定义区域或引用，或者在「定义名称」对话框字段中输入引用。" #: 04070100.xhp -#, fuzzy msgctxt "" "04070100.xhp\n" "par_id3155131\n" "help.text" msgid "The Sheet Area box on the Formula bar contains a list of defined names for the ranges or formula expressions and their scope between parenthesis. Click a name from this box to highlight the corresponding reference on the spreadsheet. Names given formulas or parts of a formula are not listed here." -msgstr "\"公式\" 栏上的 \" 的\" 工作表区域 \" 框中包含范围或公式表达式的定义名称及其在括号之间的作用域。点击此框中的名称以突出显示电子表格上的相应引用。此处未列出给定公式的名称或公式的各个部分。" +msgstr "「公式」栏上的「工作表区域」框中包含范围或公式表达式的定义名称及其在括号之间的作用域列表。点击此框中的名称可高亮显示电子表格上的相应引用。此处未列出给定公式的名称或公式各个部分的名称。" #: 04070100.xhp msgctxt "" @@ -40324,13 +40305,12 @@ msgstr "名称" #: 04070100.xhp -#, fuzzy msgctxt "" "04070100.xhp\n" "par_id3163712\n" "help.text" msgid "Enter the name of the area for which you want to define a reference or a formula expression. All area names already defined in the spreadsheet are listed in the text field above. If you click a name on the list, the corresponding reference in the document will be shown with a blue frame. If multiple cell ranges belong to the same area name, they are displayed with different colored frames." -msgstr "输入要为其定义引用或公式表达式的区域的名称 电子表格中已定义的所有区域名称都在上面的文本字段中列出。如果点击列表中的名称, 文档中的相应引用将显示蓝色框架。如果多个单元格区域属于同一区域名称, 则它们将显示不同颜色的帧。" +msgstr "输入要定义引用或公式表达式的区域名称。电子表格中已定义的所有区域名称都在上面的文本字段中列出。如果点击列表中的名称, 文档中的相应引用将显示蓝色框架。如果多个单元格区域属于同一区域名称, 则它们将显示不同颜色的框架。" #: 04070100.xhp msgctxt "" @@ -40850,7 +40830,7 @@ "par_id3151118\n" "help.text" msgid "Opens the Function List deck of the Sidebar, which displays all functions that can be inserted into your document. The Function List deck is similar to the Functions tab page of the Function Wizard. The functions are inserted with placeholders to be replaced with your own values." -msgstr "此命令将打开「函数列表」窗口，其中列出了可以插入到文档中的所有函数。 此函数列表窗口与函数向导中的「函数」选项卡页面类似。通过函数列表插入的函数含有占位符，在插入时，需要用相应的数值替换这些占位符。" +msgstr "打开「侧边栏」的「函数列表」窗格，其中列出了可以插入到文档中的所有函数。 此函数列表窗格与「函数向导」的「函数」选项卡页面类似。插入的函数含有占位符，可用相应的数值替换这些占位符。" #: 04080000.xhp msgctxt "" @@ -41330,7 +41310,7 @@ "par_id3145251\n" "help.text" msgid "To display hidden rows, columns or sheets" -msgstr "显示隐藏的行、列或工作表。" +msgstr "显示隐藏的行、列或工作表" #: 05030300.xhp msgctxt "" @@ -41749,31 +41729,28 @@ msgstr "有以下选项可用:" #: 05060000.xhp -#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3155879\n" "help.text" msgid "Move the contents of the hidden cells into the first cell: The actual contents of the hidden cells are concatenated to the first cell, and hidden cells are emptied; the results of formulas referring to the hidden cells or the first cell will be updated." -msgstr "「将隐藏单元格的内容移动到第一个单元格中」: < ahelp 隐藏的 = \". > 隐藏单元格的实际内容连接到第一个单元格, 并清空隐藏单元格; 引用隐藏单元格或第一个单元格的公式的结果将被更新。" +msgstr "「将隐藏单元格的内容移动到第一个单元格中」: 将隐藏单元格的实际内容连接到第一个单元格的内容之后, 并清空隐藏单元格; 引用隐藏单元格或第一个单元格的公式的结果将会更新。" #: 05060000.xhp -#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3155878\n" "help.text" msgid "Keep the contents of the hidden cells: The contents of the hidden cells are kept; the results of formulas referring to the hidden cells will not change." -msgstr "「保留隐藏单元格的内容」: < ahelp 隐藏 = \". > 隐藏单元格的内容被保留; 引用隐藏单元格的公式的结果不会更改。" +msgstr "「保留隐藏单元格的内容」: 将保留隐藏单元格的内容; 引用隐藏单元格的公式的结果不会更改。" #: 05060000.xhp -#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3155877\n" "help.text" msgid "Empty the contents of the hidden cells: The contents of the hidden cells are removed; the results of formulas referring to the hidden cells will be updated." -msgstr "「清空隐藏单元格的内容」: < ahelp 隐藏的 = \". > 隐藏单元格的内容将被删除; 引用隐藏单元格的公式的结果将被更新。" +msgstr "「清空隐藏单元格的内容」: 隐藏单元格的内容将被删除; 引用隐藏单元格的公式的结果将会更新。" #: 05060000.xhp msgctxt "" @@ -42080,13 +42057,12 @@ msgstr "缩放模式" #: 05070500.xhp -#, fuzzy msgctxt "" "05070500.xhp\n" "par_idN10971\n" "help.text" msgid "Select a scaling mode from the list box. Appropriate controls will be shown below the list box." -msgstr "< ahelp 隐藏 = \"modescalc/scitcletpagepletlepletlepletleps_ scalmode\" > 从列表框中选择缩放模式。适当的控件将显示在列表框下方。" +msgstr "从列表框中选择缩放模式。相应的控件将显示在列表框下方。" #: 05070500.xhp msgctxt "" @@ -42113,13 +42089,12 @@ msgstr "缩放因子" #: 05070500.xhp -#, fuzzy msgctxt "" "05070500.xhp\n" "par_id3152899\n" "help.text" msgid "Enter a scaling factor. Factors less than 100 reduce the pages, higher factors enlarge the pages." -msgstr "< ahelp 隐藏 = \"模特斯卡尔卡/表格页/刺接 _ scalall\" > 输入缩放系数。因素小于100减少页面, 更高的因素放大页面。" +msgstr "输入缩放系数。系数小于 100 会缩放页面, 而更高的系数会放大页面。" #: 05070500.xhp msgctxt "" @@ -42146,22 +42121,20 @@ msgstr "由于打印范围会按比例缩放，因此实际的页数可能会比指定的值小。" #: 05070500.xhp -#, fuzzy msgctxt "" "05070500.xhp\n" "par_idN109BF\n" "help.text" msgid "You may disable one of the boxes, then the unspecified dimension will use as many pages as necessary." -msgstr "您可以禁用其中一个框, 然后未指定的维度将根据需要使用尽可能多的页面。" +msgstr "您可以禁用其中一个框, 然后未指定的维度将在尽可能多的页面使用。" #: 05070500.xhp -#, fuzzy msgctxt "" "05070500.xhp\n" "par_idN109C3\n" "help.text" msgid "If you disable both boxes, this will result in a scaling factor of 100%." -msgstr "如果禁用这两个框, 则会导致100% 的缩放系数。" +msgstr "如果禁用这两个框, 则结果为 100% 的缩放系数。" #: 05070500.xhp msgctxt "" @@ -42356,13 +42329,12 @@ msgstr "用于修改自定义的打印范围。" #: 05080300.xhp -#, fuzzy msgctxt "" "05080300.xhp\n" "par_id3145174\n" "help.text" msgid "Select -none- to remove a print range definition for the current spreadsheet. Select -entire sheet- to set the current sheet as a print range. Select -selection- to define the selected area of a spreadsheet as the print range. By selecting -user-defined-, you can define a print range that you have already defined using the Format - Print Ranges - Define command. If you have given a name to a range using the Sheet - Named Ranges and Expressions - Define command, this name will be displayed and can be selected from the list box." -msgstr "选择「-非-」以删除当前电子表格的打印范围定义。选择「全页 , 将当前工作表设置为打印范围。选择 -选择-」将电子表格的选中区域定义为打印范围。通过选择「用户定义的 , 可以使用 \" 格式-打印范围-定义 \" 命令定义已定义的打印范围。如果使用 工作表-命名区域与表达式-定义」命令为区域指定了名称, 则将显示此名称, 并且可以从列表框中选择该名称。" +msgstr "选择「-无-」可以删除当前电子表格的打印范围定义。选择「-整张工作表-」可将当前工作表设为打印范围。选择「-选择-」可将电子表格中的选中区域定义为打印范围。选择「-用户定义-」可以指定一个已使用「格式 - 打印范围 - 定义」命令定义的打印范围。如果已使用「工作表 - 命名区域与表达式 - 定义」为某范围命名，则该名称将显示在列表框中并可供您选择。" #: 05080300.xhp msgctxt "" @@ -42458,7 +42430,7 @@ "bm_id3150447\n" "help.text" msgid "Stylist, see Styles window Styles window formats; Styles window formatting; Styles window paint can for applying styles" -msgstr "样式列表, 请参阅“样式”窗口“样式”窗口 格式;“样式”窗口格式化;“样式”窗口用于应用样式的油漆桶" +msgstr "样式列表, 请参阅「样式」窗口「样式」窗口 格式;「样式」窗口格式化;「样式」窗口用于应用样式的油漆桶" #: 05100000.xhp msgctxt "" @@ -42474,7 +42446,7 @@ "par_id3147434\n" "help.text" msgid "Use the Styles deck of the Sidebar to assign styles to cells and pages. You can apply, update, and modify existing styles or create new styles." -msgstr "使用“侧边栏”的“样式”窗格为单元格和页面分配样式。您可以应用、更新和修改现有样式或创建新样式。" +msgstr "使用「侧边栏」的「样式」窗格为单元格和页面分配样式。您可以应用、更新和修改现有样式或创建新样式。" #: 05100000.xhp msgctxt "" @@ -42482,7 +42454,7 @@ "par_id3149665\n" "help.text" msgid "The Styles dockable window can remain open while editing the document." -msgstr "“样式”可停靠窗口 可以在编辑文档时保持打开状态。" +msgstr "「样式」可停靠窗口 可以在编辑文档时保持打开状态。" #: 05100000.xhp msgctxt "" @@ -42506,7 +42478,7 @@ "par_id3145749\n" "help.text" msgid "Double-click the style in the Styles window." -msgstr "双击“样式”窗口中的样式。" +msgstr "双击「样式」窗口中的样式。" #: 05100000.xhp msgctxt "" @@ -42586,7 +42558,7 @@ "par_id3155531\n" "help.text" msgid "Turns the Fill Format mode on and off. Use the paint can to assign the Style selected in the Styles window." -msgstr "打开或关闭“填充格式”模式。使用油漆桶分配「样式」窗口中选中的“样式”。" +msgstr "打开或关闭「填充格式」模式。使用油漆桶分配「样式」窗口中选中的「样式」。" #: 05100000.xhp msgctxt "" @@ -42618,7 +42590,7 @@ "par_id3145078\n" "help.text" msgid "Select the desired style from the Styles window." -msgstr "从“样式和格式”窗口中选择所需的样式。" +msgstr "从「样式」窗口中选择所需的样式。" #: 05100000.xhp msgctxt "" @@ -42658,7 +42630,7 @@ "par_id3149499\n" "help.text" msgid "Creates a new style based on the formatting of a selected object. Assign a name for the style in the Create Style dialog." -msgstr "根据所选对象的格式创建新样式。 在【创建样式】对话框中为样式指定名称。" +msgstr "根据所选对象的格式创建新样式。 在「创建样式」对话框中为样式指定名称。" #: 05100000.xhp msgctxt "" @@ -42685,13 +42657,12 @@ msgstr "更新样式" #: 05100000.xhp -#, fuzzy msgctxt "" "05100000.xhp\n" "par_id3154707\n" "help.text" msgid "Updates the Style selected in the Styles window with the current formatting of the selected object." -msgstr "< ahelp hid=\"SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE\">Updates 在 \"样式\" 窗口中选择的 \"样式\" 与所选对象的当前格式。" +msgstr "用选中对象的当前格式来更新「样式」窗口中选择的样式。" #: 05100000.xhp msgctxt "" @@ -42718,13 +42689,12 @@ msgstr "样式列表" #: 05100000.xhp -#, fuzzy msgctxt "" "05100000.xhp\n" "par_idN109C2\n" "help.text" msgid "Displays the list of the styles from the selected style category." -msgstr "< ahelp hid=\"SFX2_HID_TEMPLATE_FMT\">Displays 所选样式类别中的样式列表。" +msgstr "显示选中样式类别中样式的列表。" #: 05100000.xhp msgctxt "" @@ -42743,13 +42713,12 @@ msgstr "样式组" #: 05100000.xhp -#, fuzzy msgctxt "" "05100000.xhp\n" "par_id3147299\n" "help.text" msgid "Lists the available style groups." -msgstr "< ahelp hid=\"SFX2_HID_TEMPLATE_FILTER\">Lists 可用的样式组。" +msgstr "列出可用的样式组合。" #: 05100100.xhp msgctxt "" @@ -42864,13 +42833,12 @@ msgstr "添加" #: 05110000.xhp -#, fuzzy msgctxt "" "05110000.xhp\n" "par_id3154017\n" "help.text" msgid "Allows you to add the current formatting of a range of at least 4 x 4 cells to the list of predefined AutoFormats. The Add AutoFormat dialog then appears." -msgstr "< ahelp 隐藏 = \"modescmac/autonfortatletleadsd\" > 允许您将至少 4 x 4个单元格的区域的当前格式添加到预定义的自动格式列表中 然后将出现 \"添加自动套用格式 \" 对话框。" +msgstr "允许您将至少 4 x 4 个单元格的区域的当前格式添加到预定义的「自动格式」列表中。然后将出现 添加自动套用格式对话框。" #: 05110000.xhp msgctxt "" @@ -43110,7 +43078,7 @@ "par_id31494132\n" "help.text" msgid "Specify if conditional formatting is dependent on one of the entry listed on the drop down box:" -msgstr "指定条件格式是否依赖于下拉列表中列出的项目之一。" +msgstr "指定条件格式是否依赖于下拉列表中列出的项目之一:" #: 05120000.xhp msgctxt "" @@ -43382,7 +43350,7 @@ "par_id3155907\n" "help.text" msgid "The Manage Conditional Formatting dialog box opens. Here you can add, edit or remove one or several conditional formattings." -msgstr "将打开 管理条件格式 对话框。在这里, 您可以添加、编辑或删除一个或多个条件格式。" +msgstr "将打开「管理条件格式」对话框。在这里, 您可以添加、编辑或删除一个或多个条件格式。" #: 05120000.xhp msgctxt "" @@ -43590,7 +43558,7 @@ "par_id3147265\n" "help.text" msgid "Traces are displayed in the sheet with marking arrows. At the same time, the range of all the cells contained in the formula of the current cell is highlighted with a blue frame." -msgstr "采用标记箭头在工作表中显示追踪。同时，当前单元格公式引用的所有单元格区域均以蓝色框突出显示。" +msgstr "采用标记箭头在工作表中显示追踪。同时，当前单元格公式引用的所有单元格区域均以蓝色框高亮显示。" #: 06030100.xhp msgctxt "" @@ -43670,7 +43638,7 @@ "par_id3148948\n" "help.text" msgid "The area of all cells that are used together with the active cell in a formula is highlighted by a blue frame." -msgstr "所有与当前单元格共用一个公式的单元格区域会用蓝色框突出显示。" +msgstr "所有与当前单元格共用一个公式的单元格区域会用蓝色框高亮显示。" #: 06030300.xhp msgctxt "" @@ -43902,7 +43870,7 @@ "par_id3153192\n" "help.text" msgid "Starting Tools - Detective - Update Refresh Traces" -msgstr "启动工具 - 侦探 - 更新刷新追踪箭头。" +msgstr "启动工具 - 侦探 - 更新刷新追踪箭头" #: 06030900.xhp msgctxt "" @@ -43910,7 +43878,7 @@ "par_id3151041\n" "help.text" msgid "If Tools - Detective - AutoRefresh is turned on, every time formulas are changed in the document." -msgstr "如果打开工具 - 侦探 -自动刷新，则每次公式修改都在文档中体现。" +msgstr "如果打开「工具 - 侦探 -自动刷新」，则每次公式修改都在文档中体现。" #: 06031000.xhp msgctxt "" @@ -44070,7 +44038,7 @@ "par_id3151041\n" "help.text" msgid "Defines the name for the scenario. Use a clear and unique name so you can easily identify the scenario. You can also modify a scenario name in the Navigator through the Properties context menu command." -msgstr "定义方案的名称。使用清晰且唯一的名称, 以便您可以轻松识别方案。还可以在“导航”中通过「属性」右键菜单命令修改方案名称。" +msgstr "定义方案的名称。使用清晰且唯一的名称, 以便您可以轻松识别方案。还可以在「导航」中通过「属性」右键菜单命令修改方案名称。" #: 06050000.xhp msgctxt "" @@ -44081,13 +44049,12 @@ msgstr "标注" #: 06050000.xhp -#, fuzzy msgctxt "" "06050000.xhp\n" "par_id3155411\n" "help.text" msgid "Specifies additional information about the scenario. This information will be displayed in the Navigator when you click the Scenarios icon and select the desired scenario. You can also modify this information in the Navigator through the Properties context menu command." -msgstr "指定有关方案的其他信息。当您点击 \" 方案 图标并选择所需方案时, 此信息将显示在\" 导航器 \" href=\"text/scalc/01/02110000.xhp < 链接中 \"名称 =\" 导航器 \"。还可以通过「\"属性\"」右键菜单命令在导航器中修改此信息。" +msgstr "指定有关方案的其他信息。当您点击「方案」图标并选择所需方案时, 此信息将显示在「导航」中。也可以在「导航」中通过「属性」右键菜单命令修改此信息。" #: 06050000.xhp msgctxt "" @@ -44114,13 +44081,12 @@ msgstr "显示边框" #: 06050000.xhp -#, fuzzy msgctxt "" "06050000.xhp\n" "par_id3151073\n" "help.text" msgid "Highlights the scenario in your table with a border. The color for the border is specified in the field to the right of this option. The border will have a title bar displaying the name of the last scenario. The button on the right of the scenario border offers you an overview of all the scenarios in this area, if several have been defined. You can choose any of the scenarios from this list without restrictions." -msgstr "< ahelp 隐藏 = \". > 突出显示表中带有边框的方案。边框的颜色在此选项右侧的字段中指定。边框将有一个标题栏, 显示最后一个方案的名称。方案边框右侧的按钮为您提供了此区域中所有方案的概述 (如果已定义了多个方案)。您可以不受限制地从列表中选择任何方案。" +msgstr "用边框高亮显示表中的方案。边框的颜色在此选项右侧的字段中指定。边框将有一个标题栏, 显示最后一个方案的名称。如果已定义了多个方案，方案边框右侧的按钮为您提供此区域中所有方案的概览。您可以从列表中选择任何方案，不受限制。" #: 06050000.xhp msgctxt "" @@ -44211,13 +44177,12 @@ msgstr "保护文档" #: 06060000.xhp -#, fuzzy msgctxt "" "06060000.xhp\n" "par_id3153362\n" "help.text" msgid "The Protect Sheet or Protect Spreadsheet Structure commands prevent changes from being made to cells in the sheets or to sheets in a document. As an option, you can define a password. If a password is defined, removal of the protection is only possible if the user enters the correct password." -msgstr "「保护工作表」或「保护电子表格结构」命令可防止对工作表中的单元格或文档中的工作表进行更改。作为一个选项, 您可以定义密码。如果定义了密码, 则只有在用户输入正确的密码时, 才有可能删除保护。" +msgstr "「保护工作表」或「保护电子表格结构」命令可防止对工作表中的单元格或文档中的工作表进行更改。您也可以选择定义密码。如果定义了密码, 则只有在用户输入正确的密码时, 才有可能去除保护。" #: 06060000.xhp msgctxt "" @@ -44252,13 +44217,12 @@ msgstr "保护工作表" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3148664\n" "help.text" msgid "Protects the cells in the current sheet from being modified. Choose Tools - Protect Sheet to open the Protect Sheet dialog in which you then specify sheet protection with or without a password." -msgstr "< 变量 id = \"tabelletext\" > < ahelp 隐藏 = \". uno: 保护\" > 保护当前工作表中的单元格不被修改. 选择「工具-保护工作表」打开 \" 保护工作表 对话框, 然后在其中使用或不使用密码指定工作表保护。" +msgstr "保护当前工作表中的单元格不被修改。选择「工具 - 保护工作表」打开「保护工作表」对话框, 然后在其中指定工作表保护，可使用或不使用密码。" #: 06060100.xhp msgctxt "" @@ -44269,13 +44233,12 @@ msgstr "要防止单元格被编辑，则必须选中「格式 - 单元格 - 单元格保护」选项卡页面上的「已保护」复选框。也可以通过右键菜单中的「单元格格式」打开该页面。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3154490\n" "help.text" msgid "Unprotected cells or cell ranges can be set up on a protected sheet by using the Tools - Protect Sheet and Format - Cells - Cell Protection menus:" -msgstr "通过使用 \" 工具-保护工作表 和「格式-单元格保护」菜单, 可以在受保护的工作表上设置未受保护的单元格或单元格区域:" +msgstr "通过使用「工具 - 保护工作表」和「格式 - 单元格 - 单元格保护」菜单, 可以在受保护的工作表上设置不受保护的单元格或单元格区域:" #: 06060100.xhp msgctxt "" @@ -44294,22 +44257,20 @@ msgstr "选择「格式 - 单元格 - 单元格保护」。取消选中「已保护」复选框，然后点击「确定」。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3156384\n" "help.text" msgid "On the Tools - Protect Sheet menu, activate protection for the sheet. Effective immediately, only the cell range you selected in step 1 can be edited." -msgstr "在「工具-保护工作表」菜单上, 激活工作表的保护。立即生效, 只能编辑您在步骤1中选择的单元格区域。" +msgstr "在「工具 - 保护工作表」菜单上, 激活工作表的保护。立即生效, 只有您在第一步中选择的单元格区域可以编辑。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3149566\n" "help.text" msgid "To later change an unprotected area to a protected area, select the range. Next, on the Format - Cells - Cell Protection tab page, check the Protected box. Finally, choose the Tools - Protect Sheet menu. The previously editable range is now protected." -msgstr "若要以后将未受保护的区域更改为受保护区域, 请选择该范围。接下来, 在 \" 格式-单元格-单元格保护 \" 选项卡页上, 选中 \" 受保护的 \" 框。最后, 选择「工具-保护工作表」菜单。以前可编辑的范围现在受到保护。" +msgstr "若要以后将未受保护的区域更改为受保护区域, 请选择该范围。然后在「格式 - 单元格 - 单元格保护」选项卡页上, 选中「受保护」框。最后, 选择「工具 - 保护工作表」菜单。之前可编辑的范围现在受到保护。" #: 06060100.xhp msgctxt "" @@ -44328,13 +44289,12 @@ msgstr "如果工作表受到保护，则无法修改或删除任何单元格样式。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3154656\n" "help.text" msgid "A protected sheet or cell range can no longer be modified until this protection is disabled. To disable the protection, choose the Tools - Protect Sheet command. If no password was set, the sheet protection is immediately disabled. If the sheet was password protected, the Remove Protection dialog opens, where you must enter the password." -msgstr "在禁用此保护之前, 不能再修改受保护的工作表或单元格区域。要禁用保护, 请选择「工具-保护工作表」命令。如果未设置密码, 则立即禁用工作表保护。如果工作表受密码保护, 则会打开 \" 删除保护 \" 对话框, 您必须在其中输入密码。" +msgstr "在禁用保护之前, 不能再修改受保护的工作表或单元格区域。要禁用保护, 请选择「工具 - 保护工作表」命令。如果未设置密码, 则立即禁用工作表保护。如果工作表受密码保护, 则会打开「去除保护」对话框, 您必须在其中输入密码。" #: 06060100.xhp msgctxt "" @@ -44345,31 +44305,28 @@ msgstr "受保护的工作表经过保存后，只能使用「文件 - 另存为」命令来重新保存。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "hd_id3150206\n" "help.text" msgid "Password (optional)" -msgstr "< 链接 href=\"text/shared/01/password_dlg.xhp\" 名称 = \"密码\" > 密码 (可选) " +msgstr "密码 (可选)" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3152990\n" "help.text" msgid "Allows you to enter a password to protect the sheet from unauthorized changes." -msgstr "hid=\"modules/scalc/ui/protectsheetdlg/password1\">Allows 帮助您输入密码, 以防止未经授权的更改。" +msgstr "允许您输入密码, 以防止工作表发生未经授权的更改。" #: 06060100.xhp -#, fuzzy msgctxt "" "06060100.xhp\n" "par_id3148700\n" "help.text" msgid "Complete protection of your work can be achieved by combining the options Tools - Protect Sheet and Tools - Protect Spreadsheet Structure, including password protection. To prohibit opening the document altogether, in the Save dialog mark the Save with password box before you click the Save button." -msgstr "通过将选项「工具-保护工作表」和「工具-保护电子表格结构」(包括密码保护), 可以实现对工作的全面保护。若要完全禁止完全打开文档, 请在 \" 保存 \" 对话框中, 在点击 \"保存 \" 按钮之前, 在 \"使用密码保存\" 框中标记 \"保存\"。" +msgstr "通过组合使用选项「工具 - 保护工作表」和「工具 - 保护电子表格结构」，包括密码保护，可以实现对作品的全面保护。若要完全禁止完全打开文档, 请在「保存」对话框中, 选中「使用密码保存」框，然后再点击「保存」按钮。" #: 06060200.xhp msgctxt "" @@ -44388,22 +44345,20 @@ msgstr "保护文档" #: 06060200.xhp -#, fuzzy msgctxt "" "06060200.xhp\n" "par_id3145172\n" "help.text" msgid "Protects the sheet structure of your document from modifications. It is impossible to insert, delete, rename, move or copy sheets. Open the Protect spreadsheet structure dialog with Tools - Protect Spreadsheet Structure. Optionally enter a password and click OK." -msgstr "< 变量 id = \"dokumenttext\" > < ahelp 隐藏 = \". uno: 工具保护文档\" > 保护文档的工作表结构不受修改。插入、删除、重命名、移动或复制工作表是不可能的. 打开 \" 保护电子表格结构 对话框, 其中「工具-保护电子表格结构」。(可选) 输入密码, 然后点击 \"确定\"。" +msgstr "保护文档的工作表结构不受修改。将无法插入、删除、重命名、移动或复制工作表。使用「工具 - 保护电子表格结构」打开「保护电子表格结构」对话框。可选输入密码, 然后点击「确定」。" #: 06060200.xhp -#, fuzzy msgctxt "" "06060200.xhp\n" "par_id3153188\n" "help.text" msgid "The structure of protected spreadsheet documents can be changed only if the Protect option is disabled. On the context menus for the spreadsheet tabs at the lower graphic border, only the menu item Select All Sheets can be activated. All other menu items are deactivated. To remove the protection, call up the command Tools - Protect Spreadsheet Structure again. If no password is assigned, protection is immediately removed. If you were assigned a password, the Remove Spreadsheet Protection dialog appears, in which you must enter the password. Only then can you remove the check mark specifying that protection is active." -msgstr "只有禁用「保护」选项时, 才能更改受保护的电子表格文档的结构。在较低图形边框的电子表格选项卡的右键菜单上, 只能激活菜单项「选择所有工作表」。所有其他菜单项都将被停用。若要删除保护, 请再次调用 \"工具\" \"保护电子表格结构 \" 命令。如果未分配密码, 则会立即删除保护。如果为您分配了密码, 则会出现 \" 删除电子表格保护 \" 对话框, 您必须在其中输入密码。只有这样, 才能删除指定保护处于活动状态的复选标记。" +msgstr "只有禁用「保护」选项时, 才能更改受保护的电子表格文档的结构。在图形边框下方的电子表格选项卡的右键菜单中, 只有菜单项「选择所有工作表」可以激活。所有其他菜单项都将被停用。若要去除保护, 请再次调用「工具 - 保护电子表格结构」命令。如果未指定密码, 则会立即去除保护。如果指定了密码, 则会出现 去除电子表格保护 对话框, 您必须在其中输入密码。只有这样, 才能去除表示保护活动状态的复选标记。" #: 06060200.xhp msgctxt "" @@ -44422,31 +44377,28 @@ msgstr "密码 (可选)" #: 06060200.xhp -#, fuzzy msgctxt "" "06060200.xhp\n" "par_id3155412\n" "help.text" msgid "You can create a password to protect your document against unauthorized or accidental modifications." -msgstr "< ahelp 隐藏 = \"sc _ hid _ pasdd _ doc\" > 您可以创建一个密码来保护您的文档免受未经授权或意外的修改。" +msgstr "您可以创建一个密码来保护您的文档免受未经授权或意外的修改。" #: 06060200.xhp -#, fuzzy msgctxt "" "06060200.xhp\n" "par_id3155413\n" "help.text" msgid "Re-enter the password." -msgstr "< ahelp 隐藏 = \"sc _ hid _ pasdd _ doc _ 确认\" 可见性 = \"隐藏\" > 重新输入密码。" +msgstr "重新输入密码。" #: 06060200.xhp -#, fuzzy msgctxt "" "06060200.xhp\n" "par_id3150717\n" "help.text" msgid "You can completely protect your work by combining the options Tools - Protect Sheet and Tools - Protect Spreadsheet Structure, including password entry. If you want to prevent the document from being opened by other users, select Save With Password and click the Save button. The Enter Password dialog appears. Consider carefully when choosing a password; if you forget it after you close a document you will be unable to access the document." -msgstr "您可以通过将选项「工具-保护工作表」和「工具-保护电子表格结构」(包括密码输入) 来完全保护您的工作。如果要阻止其他用户打开文档, 请选择 \" 保存\", 然后点击 \"保存 \" 按钮。将出现 \"输入密码 \" 对话框 。在选择密码时, 请仔细考虑;如果您在关闭文档后忘记了它, 您将无法访问该文档。" +msgstr "您可以通过组合使用选项「工具 - 保护工作表」和「工具 - 保护电子表格结构」，包括密码输入，来完全保护您的作品。如果要阻止其他用户打开文档, 请选择「用密码保存 , 然后点击「保存」按钮。将出现 输入密码」对话框。选择密码时, 请仔细考虑;如果您在关闭文档后忘记密码, 您将无法访问该文档。" #: 06070000.xhp msgctxt "" @@ -44537,13 +44489,12 @@ msgstr "文档重新计算后，显示也被刷新。所有图表也同时得到刷新。" #: 06080000.xhp -#, fuzzy msgctxt "" "06080000.xhp\n" "par_id315475855\n" "help.text" msgid "Volatile (delivering different results on each call) Add-In functions currently cannot respond to the Recalculate command or F9. Press Shift+CommandCtrl+F9 to recalculate all formulas, including the Add-In functions." -msgstr "可变 (在每次调用时提供不同的结果) 外接程序函数当前无法响应 \"重新计算\" 命令或 f9。按 shift + < 切换键选择 = \"sys\" > < 赌场联选择 = \"mac\" > 命令 ctrl + f9 重新计算所有公式, 包括外接程序函数。" +msgstr "可变 (在每次调用时提供不同的结果)「加载宏」函数当前无法响应「重新计算」命令或「F9」键。按「Shift+命令Ctrl+F9」可重新计算所有公式, 包括「加载宏」函数。" #: 06130000.xhp msgctxt "" @@ -44583,7 +44534,7 @@ "par_id3156422\n" "help.text" msgid "The completion text is highlighted." -msgstr "完成的文字将被突出显示。" +msgstr "完成的文字将被高亮显示。" #: 06130000.xhp msgctxt "" @@ -44602,22 +44553,20 @@ msgstr "要对完成的内容添加文字或进行编辑，请按「F2」键。" #: 06130000.xhp -#, fuzzy msgctxt "" "06130000.xhp\n" "par_idN1066D\n" "help.text" msgid "To view more completions, press CommandCtrl+Tab to scroll forward, or CommandCtrl+Shift+Tab to scroll backward." -msgstr "要查看更多的完成, 按 < 中断线选择 = \"sys\" > < caseline 选择 = \"mac\" > 项目类型 = \"keycode\" > 命令 < a0 > 项目类型 = \"keycode\" > ctrl < 项目类型 = \"键码\" > + tab 向前滚动, 或 < 切换线路选择 = \"sys\" > < caseline 选择 = \"mac\" > < 项目类型 = \"键码\" 命令 < a0 > \"键码\" > ctrl < < = \"键码\" > + shift + tab 向后滚动。" +msgstr "要查看更多的完成, 按「CommandCtrl+Tab」可向前滚动, 或按「CommandCtrl+Shift+Tab」可向后滚动。" #: 06130000.xhp -#, fuzzy msgctxt "" "06130000.xhp\n" "par_idN10679\n" "help.text" msgid "To see a list of all available AutoInput text items for the current column, press OptionAlt+Down Arrow." -msgstr "要查看当前列的所有可用自动输入文本项的列表, 请按 < 断线选择 = \"sys\" < \"caseline\" 选择 < \"mac\" 选项 < a0 > \"mac\" 选项 < < < = \"键码\" > alt 项目类型 = \"键码\" > + 向下箭头 。" +msgstr "要查看当前列所有可用的「自动输入」文本项的列表, 请按「OptionAlt+向下箭头」。" #: 06130000.xhp msgctxt "" @@ -44636,7 +44585,6 @@ msgstr "自动输入功能区分大小写。例如，在一个单元格中输入「Total」后，如果不关闭自动输入，则无法在该单元格所在列的其他单元格中输入「total」。" #: 07080000.xhp -#, fuzzy msgctxt "" "07080000.xhp\n" "tit\n" @@ -44653,13 +44601,12 @@ msgstr "拆分" #: 07080000.xhp -#, fuzzy msgctxt "" "07080000.xhp\n" "par_id3150084\n" "help.text" msgid "Divides the current window at the top left corner of the active cell." -msgstr "< ahelp 隐藏了 = \". >\" > 划分活动单元格左上角的当前窗口。" +msgstr "在活动单元格的左上角分隔当前窗口。" #: 07080000.xhp msgctxt "" @@ -45147,7 +45094,7 @@ "par_id3159236\n" "help.text" msgid "Icons on the Standard toolbar" -msgstr "「标准」工具栏上的图标:" +msgstr "「标准」工具栏上的图标" #: 12030200.xhp msgctxt "" @@ -45526,13 +45473,12 @@ msgstr "选项" #: 12040201.xhp -#, fuzzy msgctxt "" "12040201.xhp\n" "hd_id3148492\n" "help.text" msgid "Options" -msgstr "< 链接 href=\"text/scalc/01/12040201.xhp\" 名称 = \"选项\" > 选项 " +msgstr "选项" #: 12040201.xhp msgctxt "" @@ -45975,13 +45921,12 @@ msgstr "选项" #: 12050200.xhp -#, fuzzy msgctxt "" "12050200.xhp\n" "par_id3154124\n" "help.text" msgid "Specify the settings for calculating and presenting subtotals." -msgstr "指定用于计算和显示小计的设置。" +msgstr "指定有关计算和展示分类汇总的设置。" #: 12050200.xhp msgctxt "" @@ -46064,13 +46009,12 @@ msgstr "自定义的排序顺序" #: 12050200.xhp -#, fuzzy msgctxt "" "12050200.xhp\n" "par_id3149400\n" "help.text" msgid "Uses a custom sorting order that you defined in the Options dialog box at %PRODUCTNAME Calc - Sort Lists." -msgstr "< ahelp 隐藏 = \". >\" 使用在 \"选项\" 对话框中定义的自定义排序顺序, 的 \"生产卡路里-排序列表\" 。" +msgstr "使用您在「选项」对话框的「%PRODUCTNAME Calc - 排序列表」中定义的自定义排序顺序。" #: 12050200.xhp msgctxt "" @@ -46577,22 +46521,20 @@ msgstr "分组" #: 12080300.xhp -#, fuzzy msgctxt "" "12080300.xhp\n" "par_id3153821\n" "help.text" msgid "Defines the selected cell range as a group of rows or columns." -msgstr "< 变量 id = \"gruppierung\" > < ahelp 隐藏 = \"> > 将选中的单元格区域定义为一组行或列. " +msgstr "将选中的单元格区域定义为行或列的组合" #: 12080300.xhp -#, fuzzy msgctxt "" "12080300.xhp\n" "par_id3145069\n" "help.text" msgid "When you group a cell range, and outline icon appears in the margins next to the group. To hide or show the group, click the icon. To ungroup the selection, choose Data – Group and Outline - Ungroup." -msgstr "对单元格区域进行分组时, 大纲图标将显示在该组旁边的页边距中。要隐藏或显示组, 请点击该图标。若要取消对所选内容的分组, 请选择 \" 数据-组\" 和 \"大纲\" 链接 href=\"text/scalc/01/12080400.xhp\" 名称 = \"取消组\" > 取消分组 。" +msgstr "对单元格区域进行组合时, 大纲图标将显示在该组合旁边的边距中。要隐藏或显示组合, 请点击该图标。若要取消组合所选内容, 请选择「 数据 – 组合与大纲 - 取消组合」。" #: 12080300.xhp msgctxt "" @@ -46611,13 +46553,12 @@ msgstr "行" #: 12080300.xhp -#, fuzzy msgctxt "" "12080300.xhp\n" "par_id3153194\n" "help.text" msgid "Groups the selected rows." -msgstr "< ahelp 隐藏 = \"模特四郎\" > 对选中的行进行分组。" +msgstr "组合选中的行。" #: 12080300.xhp msgctxt "" @@ -46628,13 +46569,12 @@ msgstr "列" #: 12080300.xhp -#, fuzzy msgctxt "" "12080300.xhp\n" "par_id3146984\n" "help.text" msgid "Groups the selected columns." -msgstr "< ahelp 隐藏 = \"ocemescalc/funiticalic\" > 对选中的列进行分组。" +msgstr "组合选中的列。" #: 12080400.xhp msgctxt "" @@ -47533,13 +47473,12 @@ msgstr "运算符" #: 12090103.xhp -#, fuzzy msgctxt "" "12090103.xhp\n" "par_id3153093\n" "help.text" msgid "Select a logical operator for the filter." -msgstr "为筛选器选择一个逻辑运算符。" +msgstr "为筛选选择一个逻辑运算符。" #: 12090103.xhp msgctxt "" @@ -47550,13 +47489,12 @@ msgstr "字段名称" #: 12090103.xhp -#, fuzzy msgctxt "" "12090103.xhp\n" "par_id3155306\n" "help.text" msgid "Select the field that you want to use in the filter. If field names are not available, the column labels are listed." -msgstr "选择要在筛选器中使用的字段。如果字段名称不可用, 则会列出列标签。" +msgstr "选择要在筛选中使用的字段。如果字段名称不可用, 则会列出列标签。" #: 12090103.xhp msgctxt "" @@ -47567,13 +47505,12 @@ msgstr "条件" #: 12090103.xhp -#, fuzzy msgctxt "" "12090103.xhp\n" "par_id3147394\n" "help.text" msgid "Select an operator to compare the Field name and Value entries." -msgstr "选择一个运算符来比较 字段名称 和「值」条目。" +msgstr "选择一个运算符来比较 字段名称 和「值」条目。" #: 12090103.xhp msgctxt "" @@ -47696,13 +47633,12 @@ msgstr "值" #: 12090103.xhp -#, fuzzy msgctxt "" "12090103.xhp\n" "par_id3155506\n" "help.text" msgid "Select the value that you want to compare to the selected field." -msgstr "选择要与所选字段进行比较的值。" +msgstr "选择要与所选字段进行比较的值。" #: 12090103.xhp msgctxt "" @@ -47753,13 +47689,12 @@ msgstr "区分大小写" #: 12090104.xhp -#, fuzzy msgctxt "" "12090104.xhp\n" "par_id3145673\n" "help.text" msgid "Distinguishes between uppercase and lowercase letters." -msgstr "< ahelp 隐藏 = \".\" 可见 = \"可见\" > 区分大写和小写字母。" +msgstr "区分大写和小写字母。" #: 12090104.xhp msgctxt "" @@ -47770,13 +47705,12 @@ msgstr "正则表达式" #: 12090104.xhp -#, fuzzy msgctxt "" "12090104.xhp\n" "par_id3151245\n" "help.text" msgid "Allows you to use regular expressions in the filter definition." -msgstr "允许您在筛选器定义中使用正则表达式,。" +msgstr "允许您在筛选中义中使用正则表达式。" #: 12090104.xhp msgctxt "" @@ -47795,13 +47729,12 @@ msgstr "不生成复件" #: 12090104.xhp -#, fuzzy msgctxt "" "12090104.xhp\n" "par_id3154138\n" "help.text" msgid "Excludes duplicate rows in the list of filtered data." -msgstr "< ahelp 隐藏 = \".\" 可见 = \"可见\" > \"排除筛选数据列表中的重复行。" +msgstr "排除筛选数据列表中的重复行。" #: 12090104.xhp msgctxt "" @@ -47812,13 +47745,12 @@ msgstr "数据区域" #: 12090104.xhp -#, fuzzy msgctxt "" "12090104.xhp\n" "par_id3150768\n" "help.text" msgid "Displays the name of the filtered data range in the table." -msgstr "< ahelp 隐藏 = \".\" 可见性 = \"可见\" > 在表中显示已筛选数据区域的名称。" +msgstr "在表中显示已筛选数据区域的名称。" #: 12090104.xhp msgctxt "" @@ -47933,13 +47865,12 @@ msgstr "函数" #: 12090105.xhp -#, fuzzy msgctxt "" "12090105.xhp\n" "par_id3154490\n" "help.text" msgid "Click the type of subtotal that you want to calculate. This option is only available if the User-defined option is selected." -msgstr "< ahelp 隐藏 = \">\" > 点击要计算的小计类型。只有在选择了「用户定义的」选项时, 此选项才可用。" +msgstr "点击要计算的分类汇总类型。只有选择了「自定义」选项，此选项才可用。" #: 12090105.xhp msgctxt "" @@ -47950,13 +47881,12 @@ msgstr "显示没有数据的项目" #: 12090105.xhp -#, fuzzy msgctxt "" "12090105.xhp\n" "par_id3149403\n" "help.text" msgid "Includes empty columns and rows in the results table." -msgstr "在结果表中包括空列和行。" +msgstr "在结果表中包括空列与空行。" #: 12090105.xhp msgctxt "" @@ -48039,13 +47969,12 @@ msgstr "类型" #: 12090105.xhp -#, fuzzy msgctxt "" "12090105.xhp\n" "par_idN10716\n" "help.text" msgid "Select the type of calculating of the displayed value for the data field." -msgstr "< ahelp 隐藏 = \"7月/scalc/atatanitsin\" 类型 \"> 选择数据字段的显示值的计算类型。" +msgstr "选择要对数据字段中显示的值进行何种计算。" #: 12090105.xhp msgctxt "" @@ -48264,13 +48193,12 @@ msgstr "基本字段" #: 12090105.xhp -#, fuzzy msgctxt "" "12090105.xhp\n" "par_idN107BE\n" "help.text" msgid "Select the field from which the respective value is taken as base for the calculation." -msgstr "< ahelp 隐藏 = \"模压/标距对话场\" > 选择将各自的值作为计算基础的字段。" +msgstr "选择将其相关值作为计算基础的字段。" #: 12090105.xhp msgctxt "" @@ -48281,13 +48209,12 @@ msgstr "基本项" #: 12090105.xhp -#, fuzzy msgctxt "" "12090105.xhp\n" "par_idN107C5\n" "help.text" msgid "Select the item of the base field from which the respective value is taken as base for the calculation." -msgstr "< ahelp 隐藏 = \"模压/标距对话框/基础项\" > 选择将相应值作为计算基础的基字段的项。" +msgstr "选择将相应值作为计算基础的基础字段的项。" #: 12090106.xhp msgctxt "" @@ -48330,13 +48257,12 @@ msgstr "排序依据" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN1055B\n" "help.text" msgid "Select the data field that you want to sort columns or rows by." -msgstr "< ahelp 隐藏 = \"模特高标/场上\" > 选择要按列或行排序的数据字段。" +msgstr "选择对列或行进行排序所依据的数据字段。" #: 12090106.xhp msgctxt "" @@ -48347,13 +48273,12 @@ msgstr "升序" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN10562\n" "help.text" msgid "Sorts the values from the lowest value to the highest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field." -msgstr "< ahelp 隐藏 = \"模压/标距索多普\" > 将值从最小值排序到最高值。如果所选字段是为其打开对话框的字段, 则按名称对项目进行排序。如果选择了数据字段, 则项目将按所选数据字段的生成值进行排序。" +msgstr "将值从小到大排序。如果所选字段是为其打开对话框的字段, 则按名称对项目进行排序。如果选择了数据字段, 则项目将按所选数据字段的结果值进行排序。" #: 12090106.xhp msgctxt "" @@ -48364,13 +48289,12 @@ msgstr "降序" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN10569\n" "help.text" msgid "Sorts the values descending from the highest value to the lowest value. If the selected field is the field for which the dialog was opened, the items are sorted by name. If a data field was selected, the items are sorted by the resultant value of the selected data field." -msgstr "< ahelp 隐藏 = \"模压/标距\" 下降 \"> 将从最高值下降到最小值的值排序。如果所选字段是为其打开对话框的字段, 则按名称对项目进行排序。如果选择了数据字段, 则项目将按所选数据字段的生成值进行排序。" +msgstr "将值从大到小排序。如果所选字段是为其打开对话框的字段, 则按名称对项目进行排序。如果选择了数据字段, 则项目将按所选数据字段的结果值进行排序。" #: 12090106.xhp msgctxt "" @@ -48381,13 +48305,12 @@ msgstr "手动" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN10570\n" "help.text" msgid "Sorts values alphabetically." -msgstr "< ahelp 隐藏 = \"模特高/datadodandododoqualitic/dobissut\" > 按字母顺序排序值。" +msgstr "按字母顺序排序各值。" #: 12090106.xhp msgctxt "" @@ -48414,13 +48337,12 @@ msgstr "版式" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN10590\n" "help.text" msgid "Select the layout mode for the field in the list box." -msgstr "< ahelp 隐藏 = \"moitescalc/atatadododojessutontic/titsutsut\" > 在列表框中选择字段的布局模式。" +msgstr "在列表框中选择字段的布局模式。" #: 12090106.xhp msgctxt "" @@ -48431,13 +48353,12 @@ msgstr "每项后有空行" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN10597\n" "help.text" msgid "Adds an empty row after the data for each item in the pivot table." -msgstr "< ahelp 隐藏了 = \"ocbst 表中每个项的数据后, 将空行添加到。" +msgstr "在数据透视表中每项的数据后添加空行。" #: 12090106.xhp msgctxt "" @@ -48464,13 +48385,12 @@ msgstr "显示" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN105A5\n" "help.text" msgid "Turns on the automatic show feature." -msgstr "> 打开自动放映功能。" +msgstr "打开自动放映功能。" #: 12090106.xhp msgctxt "" @@ -48481,13 +48401,12 @@ msgstr "项目" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN105AC\n" "help.text" msgid "Enter the maximum number of items that you want to show automatically." -msgstr "< ahelp 隐藏 = \"模特高/缩放/datadododododochentents\" > 输入要自动显示的最大项目数。" +msgstr "输入要自动显示的最大项目数量。" #: 12090106.xhp msgctxt "" @@ -48498,13 +48417,12 @@ msgstr "从" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN105B3\n" "help.text" msgid "Shows the top or bottom items in the specified sort order." -msgstr "< ahelp 隐藏 = \"模特斯卡尔卡图特/现场\" > 按指定的排序顺序显示顶部或底部项目。" +msgstr "按指定的排序顺序显示顶部或底部项目。" #: 12090106.xhp msgctxt "" @@ -48515,13 +48433,12 @@ msgstr "使用字段" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN105BA\n" "help.text" msgid "Select the data field that you want to sort the data by." -msgstr "< ahelp 隐藏 = \"模特高/标头/字段\" > 选择要对数据进行排序的数据字段。" +msgstr "选择要对数据进行排序的数据字段。" #: 12090106.xhp msgctxt "" @@ -48532,13 +48449,12 @@ msgstr "隐藏项" #: 12090106.xhp -#, fuzzy msgctxt "" "12090106.xhp\n" "par_idN105C1\n" "help.text" msgid "Select the items that you want to hide from the calculations." -msgstr "< ahelp 隐藏 = \"7月/scalcuic/datadodo辅助到字体\" > 选择要从计算中隐藏的项目。" +msgstr "选择要从计算中隐藏的项目。" #: 12090106.xhp msgctxt "" @@ -48805,13 +48721,12 @@ msgstr "刷新区域" #: 12100000.xhp -#, fuzzy msgctxt "" "12100000.xhp\n" "par_id3153088\n" "help.text" msgid "Updates a data range that was inserted from an external database. The data in the sheet is updated to match the data in the external database." -msgstr "变量 id = \"aktualisieren\" > < ahelp 隐藏 = \". > 更新从外部数据库插入的数据范围。工作表中的数据将更新以匹配外部数据库中的数据. " +msgstr "更新从外部数据库插入的数据范围。工作表中的数据将更新以匹配外部数据库中的数据. " #: 12120000.xhp msgctxt "" @@ -49078,13 +48993,12 @@ msgstr "显示选择列表" #: 12120100.xhp -#, fuzzy msgctxt "" "12120100.xhp\n" "par_idN1070D\n" "help.text" msgid "Shows a list of all valid strings or values to select from. The list can also be opened by selecting the cell and pressing CommandCtrl+D." -msgstr "< ahelp 隐藏 = \"章程/验证标准/显示列表\" > 显示要从中选择的所有有效字符串或值的列表。还可以通过选择单元格并按 < 切换线选择 = \"sys\" > > \"赌场内联选择 =\" mac \"> 命令 ctrl + d。" +msgstr "显示要从中选择的所有有效字符串或值的列表。还可以通过选择单元格并按「命令Ctrl+D」打开该列表。" #: 12120100.xhp msgctxt "" @@ -49340,7 +49254,7 @@ "par_id3146984\n" "help.text" msgid "In both cases, if you select \"Stop\", the invalid entry is deleted and the previous value is reentered in the cell. The same applies if you close the \"Warning\" and \"Information\" dialogs by clicking the Cancel button. If you close the dialogs with the OK button, the invalid entry is not deleted." -msgstr "对于这两种情况，如果选择「停止」，将删除无效的条目且单元格被重新输入以前的数值。如果您点击「取消」按钮关闭了 [警告] 和 [信息] 对话框，也将执行相同的操作。如果您按下「确定」按钮关闭对话框，则不会删除无效的条目。" +msgstr "对于这两种情况，如果选择「停止」，将删除无效的条目且单元格被重新输入以前的数值。如果您点击「取消」按钮关闭了「警告」和「信息」对话框，也将执行相同的操作。如果您按下「确定」按钮关闭对话框，则不会删除无效的条目。" #: 12120300.xhp msgctxt "" @@ -49431,13 +49345,12 @@ msgstr "ODFF" #: ODFF.xhp -#, fuzzy msgctxt "" "ODFF.xhp\n" "hd_id1000010\n" "help.text" msgid "This function is part of the Open Document Format for Office Applications (OpenDocument) standard Version 1.2. (ISO/IEC 26300:2-2015)" -msgstr "此功能是 office 应用程序的开放文档格式 (opentoce8) 标准版本1.2 的一部分。(iso/iec 26300: 2-2015)" +msgstr "此功能是「用于 Office 应用程序的开放文档格式 (OpenDocument)」标准 1.2 版本的一部分。(ISO/IEC 26300:2-2015)" #: common_func.xhp msgctxt "" @@ -49477,7 +49390,7 @@ "par_id231020162249541102\n" "help.text" msgid "Weekend is an optional parameter – a number or a string used to specify the days of the week that are weekend days and are not considered working days. Weekend is a weekend number or string that specifies when weekends occur. Weekend number values indicate the following weekend days:" -msgstr "" +msgstr "「周末」是一个可选参数 – 用于指定一周中的哪些天是周末, 不被视为工作日。「周末」是周末数字或字符串, 指定周末发生的时间。周末数字值表示以下周末:" #: common_func_workdaysintl.xhp msgctxt "" @@ -49485,7 +49398,7 @@ "par_id231020162249545526\n" "help.text" msgid "Number 1 to 7 for two-day weekends and 11 to 17 for one-day weekends." -msgstr "" +msgstr "数字 1 到 7 代表双休日，11 到 17 代表单休日。" #: common_func_workdaysintl.xhp msgctxt "" @@ -49629,7 +49542,7 @@ "par_id231020162249555313\n" "help.text" msgid "Weekend string provides another way to define the weekly non-working days. It must have seven (7) characters – zeros (0) for working day and ones (1) for non-working day. Each character represents a day of the week, starting with Monday. Only 1 and 0 are valid. “1111111” is an invalid string and should not be used. For example, the weekend string “0000011” defines Saturday and Sunday as non-working days." -msgstr "" +msgstr "周末字符串提供了另一种定义每周非工作日的方法。它必须有七 (7) 个字符 – 工作日为零 (0), 非工作日为一 (1)。每个字符表示一周中的某一天, 从星期一开始。只有 1 和 0 是有效的。「1111111」是无效字符串, 不应使用。例如, 周末字符串「0000011」将星期六和星期日定义为非工作日。" #: common_func_workdaysintl.xhp msgctxt "" @@ -49637,7 +49550,7 @@ "par_id231020162249559739\n" "help.text" msgid "Holidays is an optional list of dates that must be counted as non-working days. The list can be given in a cell range." -msgstr "" +msgstr "「假日」是必须计为非工作日的可选日期列表。该列表可以在单元格区域中给出。" #: data_form.xhp msgctxt "" @@ -49653,7 +49566,7 @@ "bm_id240920171018528200\n" "help.text" msgid "data entry forms;for spreadsheets data entry forms;insert data in spreadsheets insert data;data entry forms for spreadsheets spreadsheet;form for inserting data" -msgstr "" +msgstr "数据输入表单;用于电子表格 数据输入表单;在电子表格中插入数据 插入数据;电子表格的数据输入表单 电子表格;插入数据的表单" #: data_form.xhp msgctxt "" @@ -49661,7 +49574,7 @@ "hd_id240920171003006302\n" "help.text" msgid "Data Entry Forms for Spreadsheets" -msgstr "" +msgstr "电子表格的数据输入表单" #: data_form.xhp msgctxt "" @@ -49669,19 +49582,17 @@ "par_id240920171003293400\n" "help.text" msgid "Data Entry Form is a tool to make table data entry easy in spreadsheets. With the Data Entry Form, you can enter, edit and delete records (or rows) of data and avoid horizontal scrolling when the table has many columns or when some columns are very wide." -msgstr "" +msgstr "「数据输入表单」是一种便于在电子表格输入表格数据的工具。使用「数据输入表单」, 您可以输入、编辑和删除数据的记录 (或行), 并在表格具有多个列或某些列非常宽的情况下避免进行水平滚动。" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "par_id240920171007389295\n" "help.text" msgid "Choose Data – Form..." -msgstr "选择 < 项目类型 = \"菜单项目\" > 数据–窗体... " +msgstr "选择「数据 – 表单...」" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "hd_id291512503277077\n" @@ -49690,58 +49601,52 @@ msgstr "准备数据输入表单" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "par_id221512503284514\n" "help.text" msgid "To be effective, the Calc data table should have a header row, where each cell contents is the label of the column. The header cells contents become the label of each data field in the form." -msgstr "为了有效, calc 数据表应该有一个标题行, 其中每个单元格内容都是列的标签。标头单元格内容将成为窗体中每个数据字段的标签。" +msgstr "为了高效, Calc 数据表应该有一个标题行, 其中每个单元格内容都是列的标签。标题单元格内容将成为表单中每个数据字段的标签。" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "hd_id531512503300666\n" "help.text" msgid "Activating the form" -msgstr "激活窗体" +msgstr "激活表单" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "par_id551512503358101\n" "help.text" msgid "Place the cursor in the header row of the table." -msgstr "将光标放在表的标题行中。" +msgstr "将光标放在表格的标题行中。" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "par_id11512503369875\n" "help.text" msgid "Choose Data - Form...." -msgstr "选择 < 项目类型 = \"菜单项\" > 数据-窗体... 。" +msgstr "选择「数据 - 表单...」。" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "hd_id361512503457039\n" "help.text" msgid "Filling the form with data" -msgstr "使用数据填充窗体" +msgstr "使用数据填充表单" #: data_form.xhp -#, fuzzy msgctxt "" "data_form.xhp\n" "par_id361512503457039\n" "help.text" msgid "Enter the data in the text fields. Press Enter or click New to add it to the table." -msgstr "在文本字段中输入数据。按 enter 或单击 < 项类型 = \"文字\" > \"新建 将其添加到表中。" +msgstr "在文本字段中输入数据。按「回车」或点击「新建」将其添加到表格中。" #: data_form.xhp msgctxt "" @@ -49749,7 +49654,7 @@ "hd_id111512507319306\n" "help.text" msgid "Form dialog buttons" -msgstr "窗体对话框按钮" +msgstr "表单对话框按钮" #: data_form.xhp msgctxt "" @@ -49757,7 +49662,7 @@ "par_id981512503964001\n" "help.text" msgid "New: fill the record (table row cells) with the form fields contents and jump to the next record or add a new record in the bottom of the table." -msgstr "" +msgstr "「新建」: 使用表单字段内容填充记录 (表格行单元格), 然后跳转到下一条记录或在表格底部添加新记录。" #: data_form.xhp msgctxt "" @@ -49765,7 +49670,7 @@ "par_id91512503864256\n" "help.text" msgid "Delete: deletes the current record." -msgstr "" +msgstr "「删除」: 删除当前记录。" #: data_form.xhp msgctxt "" @@ -49773,7 +49678,7 @@ "par_id11512503887586\n" "help.text" msgid "Restore: when a form field is edited, restore the record contents to its initial state." -msgstr "" +msgstr "「还原」: 编辑表单字段时, 将记录内容还原为其初始状态。" #: data_form.xhp msgctxt "" @@ -49781,7 +49686,7 @@ "par_id301512503881314\n" "help.text" msgid "Previous record: move to the previous record (table row)." -msgstr "" +msgstr "「上一条记录」: 移动到前一条记录 (表格行)。" #: data_form.xhp msgctxt "" @@ -49789,7 +49694,7 @@ "par_id51512503877397\n" "help.text" msgid "Next record: move to the next record." -msgstr "" +msgstr "「下一条记录」: 移动到后一条记录。" #: data_form.xhp msgctxt "" @@ -49797,7 +49702,7 @@ "par_id971512503871672\n" "help.text" msgid "Close: close the form." -msgstr "" +msgstr "「关闭」: 关闭表单。" #: data_form.xhp msgctxt "" @@ -49805,7 +49710,7 @@ "par_id951512509971073\n" "help.text" msgid " The form dialog box and header row cells as field labels " -msgstr "" +msgstr " 「表单」对话框，标题行单元格作为字段标签 " #: data_form.xhp msgctxt "" @@ -49813,7 +49718,7 @@ "par_id351512558748321\n" "help.text" msgid "Use the Tab and Shift-Tab keys to jump forth and back between text boxes of the form dialog." -msgstr "" +msgstr "使用「Tab」和「Shift-Tab」键在表单对话框的文本框之间跳转。" #: data_form.xhp msgctxt "" @@ -49821,7 +49726,7 @@ "par_id731512558741034\n" "help.text" msgid "You also can use the form scroll bar to move between text boxes." -msgstr "" +msgstr "还可以使用表单滚动条在文本框之间移动。" #: data_form.xhp msgctxt "" @@ -49829,7 +49734,7 @@ "hd_id701512558977465\n" "help.text" msgid "Reopening the form dialog" -msgstr "" +msgstr "重新打开表单对话框" #: data_form.xhp msgctxt "" @@ -49837,7 +49742,7 @@ "par_id181512558987528\n" "help.text" msgid "To reopen the form dialog, place the cursor on the header row and open the form. The displayed record in the form dialog is the first data record. Move to the last record before entering new data otherwise the current record will be edited." -msgstr "" +msgstr "若要重新打开表单对话框, 请将光标放在标题行上, 然后打开表单。表单对话框中显示的记录是第一条数据记录。在输入新数据之前移动到最后一条记录, 否则将编辑当前记录。" #: data_form.xhp msgctxt "" @@ -49845,7 +49750,7 @@ "par_id240920171007419799\n" "help.text" msgid "Document Forms" -msgstr "" +msgstr "文档表单" #: data_provider.xhp msgctxt "" @@ -49853,7 +49758,7 @@ "tit\n" "help.text" msgid "Data Provider for Spreadsheet" -msgstr "" +msgstr "电子表格的数据提供程序" #: data_provider.xhp msgctxt "" @@ -49861,7 +49766,7 @@ "bm_id240920171018528200\n" "help.text" msgid "data provider;for spreadsheets" -msgstr "" +msgstr "数据提供程序;用于电子表格" #: data_provider.xhp msgctxt "" @@ -49869,7 +49774,7 @@ "hd_id240920171003006302\n" "help.text" msgid "Data Provider for Spreadsheets" -msgstr "" +msgstr "电子表格的数据提供程序" #: data_provider.xhp msgctxt "" @@ -49877,7 +49782,7 @@ "par_id240920171003293400\n" "help.text" msgid "Data Provider for Spreadsheets" -msgstr "" +msgstr "电子表格的数据提供程序" #: data_provider.xhp msgctxt "" @@ -49885,7 +49790,7 @@ "par_id240920171007389295\n" "help.text" msgid "Menu Data – Data Provider..." -msgstr "" +msgstr "菜单「数据 – 数据提供程序...」" #: data_provider.xhp msgctxt "" @@ -49893,7 +49798,7 @@ "par_id240920171007419799\n" "help.text" msgid "Data Provider" -msgstr "" +msgstr "数据提供程序" #: ex_data_stat_func.xhp msgctxt "" @@ -49901,7 +49806,7 @@ "tit\n" "help.text" msgid "Examples Dataset for Statistical Functions" -msgstr "" +msgstr "统计函数的示例数据集" #: ex_data_stat_func.xhp msgctxt "" @@ -49909,7 +49814,7 @@ "hd_id2609201512474295\n" "help.text" msgid "Consider the following table" -msgstr "" +msgstr "考虑下表" #: ex_data_stat_func.xhp msgctxt "" @@ -49917,7 +49822,7 @@ "par_id18260631312423\n" "help.text" msgid "Product Name" -msgstr "" +msgstr "产品名称" #: ex_data_stat_func.xhp msgctxt "" @@ -49925,7 +49830,7 @@ "par_id2509201517433075\n" "help.text" msgid "Sales" -msgstr "" +msgstr "销售" #: ex_data_stat_func.xhp msgctxt "" @@ -49933,7 +49838,7 @@ "par_id2509201519383294\n" "help.text" msgid "Revenue" -msgstr "" +msgstr "收入" #: ex_data_stat_func.xhp msgctxt "" @@ -49941,7 +49846,7 @@ "par_id2855779586764\n" "help.text" msgid "pencil" -msgstr "" +msgstr "铅笔" #: ex_data_stat_func.xhp msgctxt "" @@ -49949,7 +49854,7 @@ "par_id24967262611733\n" "help.text" msgid "pen" -msgstr "" +msgstr "钢笔" #: ex_data_stat_func.xhp msgctxt "" @@ -49957,7 +49862,7 @@ "par_id252542413030532\n" "help.text" msgid "notebook" -msgstr "" +msgstr "笔记本" #: ex_data_stat_func.xhp msgctxt "" @@ -49965,7 +49870,7 @@ "par_id2509201519374677\n" "help.text" msgid "book" -msgstr "" +msgstr "图书" #: ex_data_stat_func.xhp msgctxt "" @@ -49973,7 +49878,7 @@ "par_id19479417931163\n" "help.text" msgid "pencil-case" -msgstr "" +msgstr "笔袋" #: ex_data_stat_func.xhp msgctxt "" @@ -49981,7 +49886,7 @@ "par_id85353130721737\n" "help.text" msgid "not" -msgstr "" +msgstr "not" #: ex_data_stat_func.xhp msgctxt "" @@ -49989,7 +49894,7 @@ "par_id15693941827291\n" "help.text" msgid "not" -msgstr "" +msgstr "not" #: ex_data_stat_func.xhp msgctxt "" @@ -49997,7 +49902,7 @@ "par_id1191767622119\n" "help.text" msgid "In all examples below, ranges for calculation contain the row #6, which is ignored because it contains text." -msgstr "" +msgstr "在下面的所有示例中, 计算范围都包含行 #6, 该行将被忽略, 因为它包含文本。" #: ex_data_stat_func.xhp msgctxt "" @@ -50005,7 +49910,7 @@ "par_id961527953004850\n" "help.text" msgid "Func_Range; Range1; Criterion1 [ ; Range2; Criterion2 [;...]])" -msgstr "Func_Range; 区域1; 标准1 [ ; 区域2; 标准2 [;...]])" +msgstr "Func_Range; 区域1; 条件1 [ ; 区域2; 条件2 [;...]])" #: ex_data_stat_func.xhp msgctxt "" @@ -50013,7 +49918,7 @@ "par_id94162948227556\n" "help.text" msgid "The logical relation between criteria can be defined as logical AND (conjunction). In other words, if and only if all given criteria are met, a value from the corresponding cell of the given Func_Range is taken into calculation." -msgstr "" +msgstr "条件之间的逻辑关系可以定义为逻辑「与」(联接)。换句话说, 当且仅当所有给定条件均满足的情况下, 给定「Func_Range」函数范围的相应单元格中的值才会纳入计算。" #: ex_data_stat_func.xhp msgctxt "" @@ -50021,7 +49926,7 @@ "par_id14734320631377\n" "help.text" msgid "Func_Range and Range1, Range2... must have the same size, otherwise the function returns err:502 - Invalid argument." -msgstr "" +msgstr "「Func_Range」和 区域1, 区域2... 必须具有相同的大小, 否则该函数返回错误: 502 - 无效的参数。" #: ex_data_stat_func.xhp msgctxt "" @@ -50029,7 +49934,7 @@ "par_id23526994221948\n" "help.text" msgid "Criterion1 – required argument. A string expression representing a logical condition or a cell reference to such string expression. The expression can contain text, numbers, regular expressions or wildcards (if enabled in calculation options)." -msgstr "" +msgstr " 条件1 – 必填参数。表示逻辑条件的字符串表达式，或对此类字符串表达式的单元格引用。表达式可以包含文本、数字、正则表达式或通配符 (如果在计算选项中启用)。" #: ex_data_stat_func.xhp msgctxt "" @@ -50037,7 +49942,7 @@ "par_id190621657742\n" "help.text" msgid "Range2 – Optional. Range2 and all the following mean the same as Range1." -msgstr "" +msgstr " 范围2 – 可选。「范围2」和以下所有内容的含义与「区域1」相同。" #: ex_data_stat_func.xhp msgctxt "" @@ -50045,7 +49950,7 @@ "par_id317001803813193\n" "help.text" msgid "Criterion2 – Optional. Criterion2 and all the following mean the same as Criterion1." -msgstr "" +msgstr " 条件2 – 可选。「条件2」和以下所有内容的含义与「条件1」相同。" #: ex_data_stat_func.xhp msgctxt "" @@ -50053,7 +49958,7 @@ "par_id191527781733238\n" "help.text" msgid "The function can have up to 255 arguments, meaning that you can specify 127 criteria ranges and criteria for them." -msgstr "" +msgstr "该函数最多可以有 255 个参数, 这意味着您可以为它们指定 127 组条件范围和条件。" #: ex_data_stat_func.xhp msgctxt "" @@ -50061,7 +49966,7 @@ "par_id175721789527973\n" "help.text" msgid "If a cell contains TRUE, it is treated as 1, if a cell contains FALSE – as 0 (zero)." -msgstr "" +msgstr "如果单元格内容为 TRUE，则视为 1, 如果内容为 FALSE – 则视为 0 (零)。" #: exponsmooth_embd.xhp msgctxt "" @@ -50069,7 +49974,7 @@ "tit\n" "help.text" msgid "embedded text for exponential smoothing" -msgstr "" +msgstr "指数平滑的嵌入文字" #: exponsmooth_embd.xhp msgctxt "" @@ -50077,7 +49982,7 @@ "par_id0403201618694534\n" "help.text" msgid "Exponential Smoothing is a method to smooth real values in time series in order to forecast probable future values." -msgstr "" +msgstr "「指数平滑」是一种在时间序列中平滑实际值, 以便预测可能的未来值的方法。" #: exponsmooth_embd.xhp msgctxt "" @@ -50085,7 +49990,7 @@ "par_id0403201618694535\n" "help.text" msgid "Exponential Triple Smoothing (ETS) is a set of algorithms in which both trend and periodical (seasonal) influences are processed. Exponential Double Smoothing (EDS) is an algorithm like ETS, but without the periodical influences. EDS produces linear forecasts." -msgstr "" +msgstr "「指数三重平滑」(ETS) 是一组处理趋势和周期性 (季节性) 影响的算法。「指数双重平滑」(EDS) 是一种类似 ETS 的算法, 但没有周期性的影响。EDS 生成线性预测。" #: exponsmooth_embd.xhp msgctxt "" @@ -50093,7 +49998,7 @@ "par_id0403201618694537\n" "help.text" msgid "See the Wikipedia on Exponential smoothing algorithms for more information." -msgstr "" +msgstr "更多详情请见维基百科关于「指数平滑」算法的文章。" #: exponsmooth_embd.xhp msgctxt "" @@ -50101,7 +50006,7 @@ "par_id0403201618594534\n" "help.text" msgid "target (mandatory): A date, time or numeric single value or range. The data point/range for which to calculate a forecast." -msgstr "" +msgstr "「 目标 (必填)」: 日期、时间或单个数字值或范围。要为其计算预测的数据点/范围。" #: exponsmooth_embd.xhp msgctxt "" @@ -50109,7 +50014,7 @@ "par_id040320161859459\n" "help.text" msgid "values (mandatory): A numeric array or range. values are the historical values, for which you want to forecast the next points." -msgstr "" +msgstr "「值 (必填)」:数字数组或范围。「值」是要预测下一个点的历史值。" #: exponsmooth_embd.xhp msgctxt "" @@ -50117,7 +50022,7 @@ "par_id0403201618594553\n" "help.text" msgid "timeline (mandatory): A numeric array or range. The time line (x-value) range for the historical values." -msgstr "" +msgstr "「时间线 (必填)」:数字数组或范围。历史值的时间线 (x 值) 范围。" #: exponsmooth_embd.xhp msgctxt "" @@ -50125,7 +50030,7 @@ "par_id040320161859450\n" "help.text" msgid "The time line doesn't have to to be sorted, the functions will sort it for calculations.
The time line values must have a consistent step between them.
If a constant step can't be identified in the sorted time line, the functions will return the #NUM! error.
If the ranges of the time line and historical values aren't of same size, the functions will return the #N/A error.
If the time line contains less than 2 periods of data, the functions will return the #VALUE! Error." -msgstr "" +msgstr "时间线不需要排序, 函数将对其进行排序以进行计算。
时间线值之间必须有一致的步长。
如果在排序的时间线中无法识别恒定的步长, 函数将返回 #NUM! 错误。
如果时间线和历史值的范围大小不同, 函数将返回 #N/A 错误。
如果时间线包含少于 2 个周期的数据, 函数将返回#VALUE! 错误。" #: exponsmooth_embd.xhp msgctxt "" @@ -50133,7 +50038,7 @@ "par_id0403201618594513\n" "help.text" msgid "data_completion (optional): a logical value TRUE or FALSE, a numeric 1 or 0, default is 1 (TRUE). A value of 0 (FALSE) will add missing data points with zero as historical value. A value of 1 (TRUE) will add missing data points by interpolating between the neighboring data points." -msgstr "" +msgstr "「数据补齐 (可选)」:逻辑值 TRUE 或 FALSE, 数字 1 或 0, 默认值为 1 (TRUE)。值为 0 (FALSE) 将零作为其历史值添加缺少的数据点。如果值为 1 (TRUE), 则会通过在相邻数据点之间插值来添加缺少的数据点。" #: exponsmooth_embd.xhp msgctxt "" @@ -50141,7 +50046,7 @@ "par_id0403201618594678\n" "help.text" msgid "Although the time line requires a constant step between data points, the function support up to 30% missing data points, and will add these data points." -msgstr "" +msgstr "尽管时间线需要在数据点之间保持恒定的步进, 但该函数支持最多 30% 的数据点缺失, 并将添加这些数据点。" #: exponsmooth_embd.xhp msgctxt "" @@ -50149,7 +50054,7 @@ "par_id0403201618594650\n" "help.text" msgid "aggregation (optional): A numeric value from 1 to 7, with default 1. The aggregation parameter indicates which method will be used to aggregate identical time values:" -msgstr "" +msgstr "「 聚合 (可选)」: 从 1 到 7 的数值, 默认值为 1。聚合参数决定将使用哪种方法聚合相同的时间值:" #: exponsmooth_embd.xhp msgctxt "" @@ -50157,7 +50062,7 @@ "par_id0403201618594696\n" "help.text" msgid "Aggregation" -msgstr "" +msgstr "汇总" #: exponsmooth_embd.xhp msgctxt "" @@ -50229,7 +50134,7 @@ "par_id0403201618595033\n" "help.text" msgid "Although the time line requires a constant step between data points, the functions will aggregate multiple points which have the same time stamp." -msgstr "" +msgstr "尽管时间线需要在数据点之间保持恒定的步进, 但函数将聚合具有相同时间戳的多个点。" #: exponsmooth_embd.xhp msgctxt "" @@ -50237,7 +50142,7 @@ "par_id0503201619582693\n" "help.text" msgid "stat_type (mandatory): A numerical value from 1 to 9. A value indicating which statistic will be returned for the given values and x-range." -msgstr "" +msgstr "「统计类型 (必填)」: 从 1 到 9 的数值。表示将为给定的值和 x 范围返回哪种统计信息。" #: exponsmooth_embd.xhp msgctxt "" @@ -50245,7 +50150,7 @@ "par_id0503201619582620\n" "help.text" msgid "The following statistics can be returned:" -msgstr "" +msgstr "可返回以下统计信息:" #: exponsmooth_embd.xhp msgctxt "" @@ -50253,7 +50158,7 @@ "par_id0503201619582666\n" "help.text" msgid "stat_type" -msgstr "" +msgstr "统计类型" #: exponsmooth_embd.xhp msgctxt "" @@ -50261,7 +50166,7 @@ "par_id050320161958264\n" "help.text" msgid "Statistics" -msgstr "" +msgstr "统计信息" #: exponsmooth_embd.xhp msgctxt "" @@ -50269,7 +50174,7 @@ "par_id0503201619582658\n" "help.text" msgid "Alpha smoothing parameter of ETS algorithm (base)" -msgstr "" +msgstr "ETS 算法的 α 平滑参数 (基本)" #: exponsmooth_embd.xhp msgctxt "" @@ -50277,7 +50182,7 @@ "par_id0503201619582673\n" "help.text" msgid "Gamma smoothing parameter of ETS algorithm (trend)" -msgstr "" +msgstr "ETS 算法的 γ 平滑参数 (趋势)" #: exponsmooth_embd.xhp msgctxt "" @@ -50285,7 +50190,7 @@ "par_id0503201619582780\n" "help.text" msgid "Beta smoothing parameter of ETS algorithm (periodic deviation)" -msgstr "" +msgstr "ETS 算法的 β 平滑参数 (周期偏差)" #: exponsmooth_embd.xhp msgctxt "" @@ -50293,7 +50198,7 @@ "par_id0503201619582795\n" "help.text" msgid "Mean absolute scaled error (MASE) - a measure of the accuracy of forecasts." -msgstr "" +msgstr "平均绝对缩放误差 (MASE) - 预测准确性的度量方式。" #: exponsmooth_embd.xhp msgctxt "" @@ -50301,7 +50206,7 @@ "par_id0503201619582749\n" "help.text" msgid "Symmetric mean absolute percentage error (SMAPE) - an accuracy measure based on percentage errors." -msgstr "" +msgstr "对称平均绝对百分比误差 (SMAPE) - 基于百分比误差的精度度量。" #: exponsmooth_embd.xhp msgctxt "" @@ -50309,7 +50214,7 @@ "par_id0503201619582725\n" "help.text" msgid "Mean absolute error (MAE) – a measure of the accuracy of forecasts." -msgstr "" +msgstr "平均绝对误差 (MAE) – 预测准确性的度量方式。" #: exponsmooth_embd.xhp msgctxt "" @@ -50317,7 +50222,7 @@ "par_id0503201619582750\n" "help.text" msgid "Root mean squared error (RMSE) - a measure of the differences between predicted and observed values." -msgstr "" +msgstr "根平均值平方误差 (RMSE) - 预测值和观察值之间差异的度量方式。" #: exponsmooth_embd.xhp msgctxt "" @@ -50325,7 +50230,7 @@ "par_id0503201619582771\n" "help.text" msgid "Step size detected time line (x-range). When a stepsize in months/quarters/years is detected, the stepsize is in months, otherwise the stepsize is in days in case of date(time) timeline and numeric in other cases." -msgstr "" +msgstr "检测到的步长时间线 (x 范围)。当检测到按月/季度/年的步进大小时, 步进大小以月为单位, 否则步长以日期 (时间) 时间线以及其他情况下，步进大小以天为单位。" #: exponsmooth_embd.xhp msgctxt "" @@ -50333,7 +50238,7 @@ "par_id0503201619582717\n" "help.text" msgid "Number of samples in period – this is the same as argument period_length, or the calculated number in case of argument period_length being 1." -msgstr "" +msgstr "周期中的样本数 – 这与「周期长度」的参数相同, 或者在参数「周期长度」为 1 的情况下计算出的数字。" #: exponsmooth_embd.xhp msgctxt "" @@ -50341,7 +50246,7 @@ "par_id0503201619582665\n" "help.text" msgid "confidence_level (mandatory): A numeric value between 0 and 1 (exclusive), default is 0.95. A value indicating a confidence level for the calculated prediction interval." -msgstr "" +msgstr "「置信度级别 (必填)」: 介于 0 和 1 (不含) 之间的数值, 默认值为0.95。指定计算预测间隔的置信度。" #: exponsmooth_embd.xhp msgctxt "" @@ -50349,7 +50254,7 @@ "par_id0503201619582644\n" "help.text" msgid "With values <= 0 or >= 1, the functions will return the #NUM! Error." -msgstr "" +msgstr "值 <= 0 或 >= 1 时, 函数将返回 #NUM! 错误。" #: exponsmooth_embd.xhp msgctxt "" @@ -50357,7 +50262,7 @@ "par_id0603201609412381\n" "help.text" msgid "period_length (optional): A numeric value >= 0, the default is 1. A positive integer indicating the number of samples in a period." -msgstr "" +msgstr "「周期长度 (可选)」: 数值，> = 0, 默认值为 1。一个正整数, 指定周期中的样本数。" #: exponsmooth_embd.xhp msgctxt "" @@ -50365,7 +50270,7 @@ "par_id0603201609412399\n" "help.text" msgid "A value of 1 indicates that Calc is to determine the number of samples in a period automatically.
A value of 0 indicates no periodic effects, a forecast is calculated with EDS algorithms.
For all other positive values, forecasts are calculated with ETS algorithms.
For values that not being a positive whole number, the functions will return the #NUM! Error." -msgstr "" +msgstr "值为 1 表示 Calc 将自动确定周期内的采样数。
值为 0 表示没有周期性影响, 使用 EDS 算法计算预测。
对于所有其他正值, 使用 ETS 算法计算预测。
对于不是正整数的值, 函数将返回 #NUM! 错误。" #: exponsmooth_embd.xhp msgctxt "" @@ -50373,7 +50278,7 @@ "par_id0603201608440579\n" "help.text" msgid "forecast = basevalue + trend * ∆x + periodical_aberration." -msgstr "" +msgstr "forecast = basevalue + trend * ∆x + periodical_aberration。" #: exponsmooth_embd.xhp msgctxt "" @@ -50381,7 +50286,7 @@ "par_id0603201608440675\n" "help.text" msgid "forecast = ( basevalue + trend * ∆x ) * periodical_aberration." -msgstr "" +msgstr "forecast = ( basevalue + trend * ∆x ) * periodical_aberration。" #: exponsmooth_embd.xhp msgctxt "" @@ -50389,7 +50294,7 @@ "hd_id0603201610005723\n" "help.text" msgid "The table below contains a timeline and its associated values:" -msgstr "" +msgstr "下表包含时间线及其关联的值:" #: exponsmooth_embd.xhp msgctxt "" @@ -50397,7 +50302,7 @@ "par_id0903201610312235\n" "help.text" msgid "Timeline" -msgstr "" +msgstr "时间线" #: exponsmooth_embd.xhp msgctxt "" @@ -50405,7 +50310,7 @@ "par_id0903201610312228\n" "help.text" msgid "Values" -msgstr "Value" +msgstr "数值" #: format_graphic.xhp msgctxt "" @@ -50485,7 +50390,7 @@ "par_id2595283314097\n" "help.text" msgid "A complex number is a string expression resulting in the form \"a+bi\" or \"a+bj\", where a and b are numbers." -msgstr "" +msgstr " 复数 是一个字符串表达式, 形如「a+bi」或「a+bj」, 其中 a 和 b 为数字。" #: ful_func.xhp msgctxt "" @@ -50493,7 +50398,7 @@ "par_id26516178768369\n" "help.text" msgid "If the complex number is actually a real number (b=0), then it can be either a string expression or a number value." -msgstr "" +msgstr "如果 复数 实际上是一个实数 (b=0), 那么它既可以是一个字符串表达式, 也可以是一个数字值。" #: ful_func.xhp msgctxt "" @@ -50501,7 +50406,7 @@ "par_id1566939488738\n" "help.text" msgid "The function always returns a string representing a complex number." -msgstr "" +msgstr "该函数始终返回一个表示复数的字符串。" #: ful_func.xhp msgctxt "" @@ -50509,7 +50414,7 @@ "par_id9623767621137\n" "help.text" msgid "If the result is a complex number with one of its parts (a or b) equal to zero, that part is not displayed." -msgstr "" +msgstr "如果结果是一个复数, 其一部分 (a or b) 等于零, 则不显示该部分。" #: ful_func.xhp msgctxt "" @@ -50517,7 +50422,7 @@ "par_id962376732432\n" "help.text" msgid "The imaginary part is equal to zero, so it is not displayed in the result." -msgstr "" +msgstr " 虚部等于零, 因此它不会显示在结果中。" #: ful_func.xhp msgctxt "" @@ -50525,7 +50430,7 @@ "par_id29750345314640\n" "help.text" msgid "The result is presented in the string format and has the character \"i\" or \"j\" as an imaginary unit." -msgstr "" +msgstr "结果以字符串格式显示, 并将字符「i」或「j」作为虚部的单位。" #: func_aggregate.xhp msgctxt "" @@ -50541,7 +50446,7 @@ "bm_id126123001625791\n" "help.text" msgid "AGGREGATE function" -msgstr "AREAS 函数" +msgstr "AGGREGATE 函数" #: func_aggregate.xhp msgctxt "" @@ -50557,7 +50462,7 @@ "par_id2209201514174373\n" "help.text" msgid "This function returns an aggregate result of the calculations in the range. You can use different aggregate functions listed below. The Aggregate function enables you to omit hidden rows, errors, SUBTOTAL and other AGGREGATE function results in the calculation." -msgstr "" +msgstr "此函数返回区域内计算的聚合结果。您可以使用下面列出的不同聚合函数。「聚合函数」允许您在计算中省略隐藏的行、错误、SUBTOTAL 和其他 AGGREGATE 函数的结果. " #: func_aggregate.xhp msgctxt "" @@ -50565,7 +50470,7 @@ "par_id2209201514174453\n" "help.text" msgid "AGGREGATE function is applied to vertical ranges of data with activated AutoFilter. If AutoFilter is not activated, automatic recalculation of the function result does not work for newly hidden rows. It is not supposed to work with horizontal ranges, however it can be applied to them as well, but with limitations. In particular, the AGGREGATE function applied to a horizontal data range does not recognize hiding columns, however correctly omits errors and results of SUBTOTAL and other AGGREGATE functions embedded into the row." -msgstr "" +msgstr "「自动筛选」已激活时，AGGREGATE 函数应用于数据的垂直范围。如果未激活「自动筛选」, 函数结果的自动重新计算不适用于新隐藏的行。尽管并非如此设计, 但可以应用于水平范围, 略有限制。即, 应用于水平数据范围的 AGGREGATE 函数无法识别隐藏列, 但可正确地忽略嵌入行中的 SUBTOTAL 函数和其他 AGGREGATE 函数的错误和结果。" #: func_aggregate.xhp msgctxt "" @@ -50597,7 +50502,7 @@ "par_id2209201514174378\n" "help.text" msgid "Function – obligatory argument. A function index or a reference to a cell with value from 1 to 19, in accordance with the following table." -msgstr "" +msgstr "函数 – 必填参数。函数索引或对值为 1 到 19 的单元格的引用, 如下表所示。" #: func_aggregate.xhp msgctxt "" @@ -50613,7 +50518,7 @@ "par_id2309201511454945\n" "help.text" msgid "Function applied" -msgstr "" +msgstr "应用的函数" #: func_aggregate.xhp msgctxt "" @@ -50773,7 +50678,7 @@ "par_id2209201514174372\n" "help.text" msgid "Option – obligatory argument. An option index or reference to a cell with value from 0 to 7 determines what to ignore in the range for the function." -msgstr "" +msgstr "Option – 必填参数。选项索引或对值为 0 到 7 的单元格的引用，确定函数范围中忽略的内容。" #: func_aggregate.xhp msgctxt "" @@ -50781,7 +50686,7 @@ "par_id2309201512011557\n" "help.text" msgid "Option index" -msgstr "" +msgstr "选项索引" #: func_aggregate.xhp msgctxt "" @@ -50789,7 +50694,7 @@ "par_id2309201512011551\n" "help.text" msgid "Option applied" -msgstr "" +msgstr "应用的选项" #: func_aggregate.xhp msgctxt "" @@ -50797,7 +50702,7 @@ "par_id2309201512011567\n" "help.text" msgid "Ignore only nested SUBTOTAL and AGGREGATE functions" -msgstr "" +msgstr "只忽略嵌套的 SUBTOTAL 与 AGGREGATE 函数" #: func_aggregate.xhp msgctxt "" @@ -50805,7 +50710,7 @@ "par_id315771547630277\n" "help.text" msgid "Ignore only hidden rows, nested SUBTOTAL and AGGREGATE functions" -msgstr "" +msgstr "只忽略隐藏的行、嵌套的 SUBTOTAL 与 AGGREGATE 函数" #: func_aggregate.xhp msgctxt "" @@ -50813,7 +50718,7 @@ "par_id2309201512011514\n" "help.text" msgid "Ignore only errors, nested SUBTOTAL and AGGREGATE functions" -msgstr "" +msgstr "只忽略错误、嵌套的 SUBTOTAL 与 AGGREGATE 函数" #: func_aggregate.xhp msgctxt "" @@ -50821,7 +50726,7 @@ "par_id2309201512011547\n" "help.text" msgid "Ignore hidden rows, errors, nested SUBTOTAL and AGGREGATE functions" -msgstr "" +msgstr "忽略隐藏的行、错误以及嵌套的 SUBTOTAL 与 AGGREGATE 函数" #: func_aggregate.xhp msgctxt "" @@ -50829,7 +50734,7 @@ "par_id2309201512011510\n" "help.text" msgid "Ignore nothing" -msgstr "" +msgstr "不忽略" #: func_aggregate.xhp msgctxt "" @@ -50837,7 +50742,7 @@ "par_id2309201512011592\n" "help.text" msgid "Ignore only hidden rows" -msgstr "" +msgstr "只忽略隐藏的行" #: func_aggregate.xhp msgctxt "" @@ -50845,7 +50750,7 @@ "par_id230920151201150\n" "help.text" msgid "Ignore only errors" -msgstr "" +msgstr "只忽略错误" #: func_aggregate.xhp msgctxt "" @@ -50853,7 +50758,7 @@ "par_id2309201512011539\n" "help.text" msgid "Ignore only hidden rows and errors" -msgstr "" +msgstr "只忽略隐藏的行与错误" #: func_aggregate.xhp msgctxt "" @@ -50861,7 +50766,7 @@ "par_id220402843321947\n" "help.text" msgid "Ref1 – obligatory argument. The first numeric argument (if the range is set by a list of values inside the function) or a reference to a cell that contains it." -msgstr "" +msgstr "Ref1 – 必填参数。第一个数字参数 (如果该区域由函数内的值列表设置) 或对包含该参数的单元格的引用。" #: func_aggregate.xhp msgctxt "" @@ -50869,7 +50774,7 @@ "par_id2309201514193338\n" "help.text" msgid "Ref2, 3, ... – optional. A numeric argument or a reference to a cell (up to 253 arguments), for which you need the aggregate value." -msgstr "" +msgstr "Ref2, 3, ... – 可选。需要统计的数字参数或对其单元格的引用 (最多 253 个参数)。" #: func_aggregate.xhp msgctxt "" @@ -50877,7 +50782,7 @@ "par_id99381371214702\n" "help.text" msgid "Array – obligatory argument. The array can be specified by the boundaries of the range, the name of the named range or the column label." -msgstr "" +msgstr "数组 – 必填参数。数组可以用范围的边界、命名区域的名称或列标签来指定。" #: func_aggregate.xhp msgctxt "" @@ -50885,7 +50790,7 @@ "par_id2309201515555812\n" "help.text" msgid "For using column labels “Automatically find columns and rows labels” function needs to be enabled." -msgstr "" +msgstr "对于列标签的使用, 需要启用「自动查找列和行标签」功能。" #: func_aggregate.xhp msgctxt "" @@ -50893,7 +50798,7 @@ "par_id2209201514174370\n" "help.text" msgid "k – obligatory argument for the following functions: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC. It is a numeric argument, which must correspond to the second argument of these functions." -msgstr "" +msgstr "k – 对以下函数必填: LARGE, SMALL, PERCENTILE.INC, QUARTILE.INC, PERCENTILE.EXC, QUARTILE.EXC。数字参数, 必须与这些函数的第二个参数相对应。" #: func_aggregate.xhp msgctxt "" @@ -50901,7 +50806,7 @@ "par_id2309201518454314\n" "help.text" msgid "ColumnOne" -msgstr "" +msgstr "「第一列」" #: func_aggregate.xhp msgctxt "" @@ -50909,7 +50814,7 @@ "par_id2309201518454361\n" "help.text" msgid "ColumnTwo" -msgstr "" +msgstr "「第二列」" #: func_aggregate.xhp msgctxt "" @@ -50917,7 +50822,7 @@ "par_id2309201518454323\n" "help.text" msgid "ColumnThree" -msgstr "" +msgstr "「第三列」" #: func_aggregate.xhp msgctxt "" @@ -50949,7 +50854,7 @@ "par_id230920152006414\n" "help.text" msgid "=AGGREGATE(4;2;A2:A9)
Returns maximum value for the range A2:A9 = 34, whereas =MAX(A2:A9) returns the error Err:511." -msgstr "" +msgstr "「=AGGREGATE(4;2;A2:A9)」
返回范围 A2:A9 的最大值 = 34, 而 =MAX(A2:A9) 返回错误 Err:511。" #: func_aggregate.xhp msgctxt "" @@ -50957,7 +50862,7 @@ "par_id2309201520064180\n" "help.text" msgid "=AGGREGATE(9;5;A5:C5)
Returns sum for the range A5:C5 = 29, even if some of the columns are hidden." -msgstr "" +msgstr "「=AGGREGATE(9;5;A5:C5)」
返回范围 A5:C5 的总和 = 29, 即使某些列是隐藏的。" #: func_aggregate.xhp msgctxt "" @@ -50965,7 +50870,7 @@ "par_id2309201520064118\n" "help.text" msgid "=AGGREGATE(9;5;B2:B9)
Returns sum of the column B = 115. If any row is hidden, the function omit its value, for example if the 7th row is hidden, the function returns 95." -msgstr "" +msgstr "「=AGGREGATE(9;5;B2:B9)」
返回 B 列的总和 = 115。如果任何行被隐藏, 该函数将忽略其值, 例如, 如果第 7 行处于隐藏状态, 则该函数将返回 95。" #: func_aggregate.xhp msgctxt "" @@ -50973,7 +50878,7 @@ "par_id196152404026557\n" "help.text" msgid "If you need to apply the function with a 3D range, this example shows how to do it." -msgstr "" +msgstr "如果需要将该函数应用于 3D 范围, 本示例演示如何执行此操作。" #: func_aggregate.xhp msgctxt "" @@ -50981,7 +50886,7 @@ "par_id2309201520180167\n" "help.text" msgid "=AGGREGATE(13;3;Sheet1.B2:B9:Sheet3.B2:B9)
The function returns mode of the values of second columns through sheets 1:3 (that have the same data) = 8." -msgstr "" +msgstr "「=AGGREGATE(13;3;Sheet1.B2:B9:Sheet3.B2:B9)」
函数返回工作表 1:3 中第二列值的众数 (数据相同) = 8。" #: func_aggregate.xhp msgctxt "" @@ -50989,7 +50894,7 @@ "par_id2309201520395365\n" "help.text" msgid "You can use reference to a cell or a range for every argument in the formula. The following example shows how it works. Besides, it shows that you can use column labels to specify an array." -msgstr "" +msgstr "可以对公式中的每个参数使用指向单元格或区域的引用。下面的示例演示它的工作原理。它还同时展示，可以使用列标签来指定数组。" #: func_aggregate.xhp msgctxt "" @@ -50997,7 +50902,7 @@ "par_id2309201520395380\n" "help.text" msgid "=AGGREGATE(E3;E5;'ColumnOne')
If E3 = 13 and E5 = 5, the function returns mode of the first column = 10." -msgstr "" +msgstr "「=AGGREGATE(E3;E5;'ColumnOne')」
如果 E3 = 13 且 E5 = 5, 则该函数返回第一列的众数 = 10。" #: func_aggregate.xhp msgctxt "" @@ -51013,7 +50918,7 @@ "par_id125062615028497\n" "help.text" msgid "Automatically find column and row labels" -msgstr "" +msgstr "自动查找列与行标签" #: func_averageif.xhp msgctxt "" @@ -51045,7 +50950,7 @@ "par_id7281266615152\n" "help.text" msgid "Returns the arithmetic mean of all cells in a range that satisfy a given condition. The AVERAGEIF function sums up all the results that match the logical test and divides this sum by the quantity of selected values." -msgstr "" +msgstr "返回满足给定条件的区域中所有单元格的算术平均值。AVERAGEIF 函数求与逻辑测试匹配的所有结果之和, 然后除以选中值的数量." #: func_averageif.xhp msgctxt "" @@ -51053,7 +50958,7 @@ "par_id200801176228491\n" "help.text" msgid "AVERAGEIF(Range; Criterion [; Average_Range ])" -msgstr "" +msgstr "AVERAGEIF(范围; 条件 [; 平均范围 ])" #: func_averageif.xhp msgctxt "" @@ -51061,7 +50966,7 @@ "par_id15226321619829\n" "help.text" msgid "Range – required argument. An array, a name of named range or a label of a column or a row containing numbers for averaging or numbers or text for the condition." -msgstr "" +msgstr " 范围 – 必填参数。数组、命名区域的名称或列/行的标签，包含用于求平均值但数字或构成条件的数字或文本。" #: func_averageif.xhp msgctxt "" @@ -51069,7 +50974,7 @@ "par_id24499731228013\n" "help.text" msgid "Criterion – required argument. A condition in the form of expression or a cell reference with expression that defines what cells should be used to calculate the mean. The expression can contain text, numbers, regular expressions (if enabled in calculation options) or wildcards (if enabled in calculation options)." -msgstr "" +msgstr " 条件 – 必填参数。表达式形式的条件或指向表达式的单元格引用, 定义哪些单元格应该用于计算均值。表达式可以包含文本、数字、正则表达式 (如果在计算选项中启用) 或通配符 (如果在计算选项中启用)。" #: func_averageif.xhp msgctxt "" @@ -51077,7 +50982,7 @@ "par_id174711913219765\n" "help.text" msgid "Average_Range – optional. It is a range of values for calculating the mean." -msgstr "" +msgstr " 平均范围 – 可选。用于计算平均值的值范围。" #: func_averageif.xhp msgctxt "" @@ -51085,7 +50990,7 @@ "par_id45123108916423\n" "help.text" msgid "Note that if the Average_Range is not specified, Range is used for both, the calculation of the mean and the search according to the condition. If the Average_Range is specified, the Range is used only for the condition test, while Average_Range is used for the mean calculation.
The Criterion needs to be a string expression, in particular, the Criterion needs to be enclosed in quotation marks (\"Criterion\") with the exception of the names of functions, cell references and an operation of a string concatenation (&)." -msgstr "" +msgstr "请注意, 如果未指定「平均范围, 则 范围」将同时用于平均值的计算和按条件搜索。如果指定了平均范围, 则 范围 仅用于条件测试, 而 平均范围 用于平均值计算。
「 条件」应为字符串表达式, 即， 条件 需要用引号括起来 (\"条件\"), 但函数名称、单元格引用和字符串连接操作 (&) 除外。" #: func_averageif.xhp msgctxt "" @@ -51093,7 +50998,7 @@ "par_id278275053653\n" "help.text" msgid "If a cell in a range of values for calculating the mean is empty or contains text, function AVERAGEIF ignores this cell.
If the whole range is empty, contains only text or all values of the range do not satisfy the condition (or any combination of those), the function returns the #DIV/0! error." -msgstr "" +msgstr "如果用于计算平均值的值范围内的单元格为空或包含文本, 则函数 AVERAGEIF 将忽略该单元格。
如果整个范围为空、仅包含文本或范围内的所有值均不满足条件 (或这些条件的任何组合), 则该函数将返回 #DIV/0! 错误。" #: func_averageif.xhp msgctxt "" @@ -51101,7 +51006,7 @@ "par_id38832436828097\n" "help.text" msgid "In all calculations below, range for average calculation contains the row #6, but it is ignored, because it contains text." -msgstr "" +msgstr "在下面的所有计算中, 计算平均值的范围均包含行 #6, 但它将被忽略, 因为它包含文本。" #: func_averageif.xhp msgctxt "" @@ -51109,7 +51014,7 @@ "hd_id229513120314273\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_averageif.xhp msgctxt "" @@ -51125,7 +51030,7 @@ "par_id11322891219251\n" "help.text" msgid "Calculates the average for values of the range B2:B6 that are less than 35. Returns 19, because the second row does not participate in the calculation." -msgstr "" +msgstr "计算 B2:B6 范围小于 35 的数值的平均值。返回 19, 因为第二行不参与计算。" #: func_averageif.xhp msgctxt "" @@ -51141,7 +51046,7 @@ "par_id3813266131474\n" "help.text" msgid "Calculates the average for values of the same range that are less than the maximum value of this range. Returns 19, because the largest value (the second row) does not participate in the calculation." -msgstr "" +msgstr "计算范围内小于此范围最大值的所有值的平均值。返回 19, 因为最大的值 (第二行) 不参与计算。" #: func_averageif.xhp msgctxt "" @@ -51157,7 +51062,7 @@ "par_id243522732832394\n" "help.text" msgid "Calculates the average for values of the same range that are greater than the first smallest value of this range. Returns 25, because the first smallest value (the fourth row) does not participate in the calculation." -msgstr "" +msgstr "计算范围内大于此范围第一个最小值的所有值的平均值。返回 25, 因为第一个最小值 (第四行) 不参与计算。" #: func_averageif.xhp msgctxt "" @@ -51165,7 +51070,7 @@ "hd_id2101254257133\n" "help.text" msgid "Using the Average_Range" -msgstr "" +msgstr "使用「平均范围」" #: func_averageif.xhp msgctxt "" @@ -51181,7 +51086,7 @@ "par_id148222637631350\n" "help.text" msgid "The function searches what values are less than 35 in the B2:B6 range, and calculates the average of corresponding values from the C2:C6 range. Returns 145, because the second row does not participate in the calculation." -msgstr "" +msgstr "该函数在 B2:B6 范围内搜索哪些值小于 35, 并计算 C2:C6 范围内相应值的平均值。返回 145, 因为第二行不参与计算。" #: func_averageif.xhp msgctxt "" @@ -51197,7 +51102,7 @@ "par_id2412836525208\n" "help.text" msgid "The function searches what values from the range B2:B6 are greater than the least value in the B2:B6 range, and calculates the average of corresponding values from the C2:C6 range. Returns 113.3, because the fourth row (where there is the least value in the range B2:B6) does not participate in the calculation." -msgstr "" +msgstr "该函数在 B2:B6 范围内搜索哪些值大于 B2:B6 范围中的最小值, 并计算 C2:C6 范围内的相应值的平均值。返回 113.3, 因为第四行 (B2:B6 范围内的最小值位于该行) 不参与计算。" #: func_averageif.xhp msgctxt "" @@ -51213,7 +51118,7 @@ "par_id173931101529497\n" "help.text" msgid "The function searches what values from the range B2:B6 are less than the second large value in the B2:B6 range, and calculates the average of corresponding values from the C2:C6 range. Returns 180, because only the fourth row participates in the calculation." -msgstr "" +msgstr "该函数在 B2:B6 范围内搜索哪些值小于 B2:B6 范围中第二大的值, 并计算 C2:C6 范围内相应值的平均值。返回 180, 因为只有第四行参与计算。" #: func_averageif.xhp msgctxt "" @@ -51221,7 +51126,7 @@ "hd_id30054471316969\n" "help.text" msgid "Using regular expressions" -msgstr "" +msgstr "使用正则表达式" #: func_averageif.xhp msgctxt "" @@ -51237,7 +51142,7 @@ "par_id14714860719948\n" "help.text" msgid "The function searches what cells from the range A2:A6 contain only the word “pen”, and calculates the average of corresponding values from the B2:B6 range. Returns 35, because only the second row participates in the calculation. The search is performed in the A2:A6 range, but the values are returned from the B2:B6 range." -msgstr "" +msgstr "该函数搜索 A2:A6 范围内的仅包含单词「pen」的单元格, 并计算 B2:B6 范围内相应值的平均值。返回 35, 因为只有第二行参与计算。搜索在 A2:A6 范围内执行, 但值从 B2:B6 范围返回。" #: func_averageif.xhp msgctxt "" @@ -51253,7 +51158,7 @@ "par_id26959239098104\n" "help.text" msgid "The function searches what cells from the range A2:A6 begin with “pen” ending with any quantity of other characters, and calculates the average of corresponding values from the B2:B6 range. Returns 27.5, because now also “pencil” satisfies the condition, and both, first and second rows participate in the calculation." -msgstr "" +msgstr "该函数搜索 A2:A6 范围中以「pen」开头, 以任意数量其他字符结尾的单元格, 并计算 B2:B6 范围内相应值的平均值。返回 27.5, 因为现在「pencil」也满足条件, 第一行和第二行都参与计算。" #: func_averageif.xhp msgctxt "" @@ -51269,7 +51174,7 @@ "par_id227041304619482\n" "help.text" msgid "The function searches what cells from the range A2:A6 contain “book” starting and ending with any quantity of other characters, and calculates the average of corresponding values from the B2:B6 range. Returns 18.5, because only third and fourth rows participate in the calculation." -msgstr "" +msgstr "该函数搜索 A2:A6 范围中包含「book」、以任意数量其他字符开始和结束的单元格, 并计算 B2:B6 范围内相应值的平均值。返回 18.5, 因为只有第三行和第四行参与计算。" #: func_averageif.xhp msgctxt "" @@ -51277,7 +51182,7 @@ "hd_id251309885188\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_averageif.xhp msgctxt "" @@ -51285,7 +51190,7 @@ "par_id177972099720424\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of AVERAGEIF function." -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 AVERAGEIF 函数的条件中使用对该单元格的引用。" #: func_averageif.xhp msgctxt "" @@ -51301,7 +51206,7 @@ "par_id172572288310247\n" "help.text" msgid "The function searches what cells from the range A2:A6 contain a combination of characters specified in E2 starting and ending with any quantity of other characters, and calculates the average of corresponding values from the B2:B6 range. If E2 = book, the function returns 18.5." -msgstr "" +msgstr "该函数搜索 A2:A6 范围中包含 E2 中指定的字符、以任意数量其他字符开始和结束的单元格, 并计算 B2:B6 范围内相应值的平均值。如果 E2 = book, 则该函数返回 18.5。" #: func_averageif.xhp msgctxt "" @@ -51317,7 +51222,7 @@ "par_id302181300528607\n" "help.text" msgid "The function searches what cells from the range B2:B6 are less than the value specified in E2, and calculates the average of corresponding values from the C2:C6 range. If E2 = 35, the function returns 145." -msgstr "" +msgstr "该函数搜索 B2:B6 中小于 E2 指定值的单元格, 并计算 C2:C6 范围中相应值的平均值。如果 E2 = 35, 则该函数返回 145。" #: func_averageifs.xhp msgctxt "" @@ -51349,7 +51254,7 @@ "par_id538405384053840\n" "help.text" msgid "Returns the arithmetic mean of all cells in a range that satisfy given multiple criteria. The AVERAGEIFS function sums up all the results that match the logical tests and divides this sum by the quantity of selected values." -msgstr "" +msgstr "返回满足给定多个条件的区域中所有单元格的算术平均值。AVERAGEIFS 函数求与逻辑测试匹配的所有结果之和, 然后除以选中值的数量. " #: func_averageifs.xhp msgctxt "" @@ -51357,7 +51262,7 @@ "par_id21050267713178\n" "help.text" msgid "AVERAGEIFS()" -msgstr "" +msgstr "AVERAGEIFS()" #: func_averageifs.xhp msgctxt "" @@ -51365,7 +51270,7 @@ "par_id165832700711773\n" "help.text" msgid "Func_range – required argument. It is a range of cells, a name of a named range or a label of a column or a row containing values for calculating the mean." -msgstr "" +msgstr "函数范围 – 必填参数。它是一个单元格区域、命名区域的名称或列/行标签, 包含用于计算平均值的值。" #: func_averageifs.xhp msgctxt "" @@ -51373,7 +51278,7 @@ "hd_id20733192524041\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_averageifs.xhp msgctxt "" @@ -51389,7 +51294,7 @@ "par_id30201168686268\n" "help.text" msgid "Calculates the average for values of the range B2:B6 that are greater than or equal to 20. Returns 25, because the fifth row does not meet the criterion." -msgstr "" +msgstr "计算范围 B2:B6 中大于或等于 20 的数值的平均值。返回 25, 因为第五行不符合条件。" #: func_averageifs.xhp msgctxt "" @@ -51405,7 +51310,7 @@ "par_id2930764965983\n" "help.text" msgid "Calculates the average for values of the range C2:C6 that are greater than 70 and correspond to cells of B2:B6 with values greater than or equal to 20. Returns 137.5, because the second and fifth rows do not meet at least one criterion." -msgstr "" +msgstr "计算 C2:C6 范围中大于 70 且 B2:B6 范围的对应单元格的数值大于或等于 20 的数值的平均值。返回 137.5, 因为第二行和第五行不满足至少一个条件。" #: func_averageifs.xhp msgctxt "" @@ -51413,7 +51318,7 @@ "hd_id317532515726820\n" "help.text" msgid "Using regular expressions and nested functions" -msgstr "" +msgstr "使用正则表达式和嵌套函数" #: func_averageifs.xhp msgctxt "" @@ -51421,7 +51326,7 @@ "par_id457966021670\n" "help.text" msgid "=AVERAGEIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=AVERAGEIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))」" #: func_averageifs.xhp msgctxt "" @@ -51429,7 +51334,7 @@ "par_id66091035229950\n" "help.text" msgid "Calculates the average for values of the range C2:C6 that correspond to all values of the range B2:B6 except its minimum and maximum. Returns 127.5, because the third and fifth rows do not meet at least one criterion." -msgstr "" +msgstr "计算范围 C2:C6 中对应于范围 B2:B6 的所有值 (最小值和最大值除外) 的数值的平均值。返回 127.5, 因为第三行和第五行不满足至少一个条件。" #: func_averageifs.xhp msgctxt "" @@ -51437,7 +51342,7 @@ "par_id303162761931870\n" "help.text" msgid "=AVERAGEIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=AVERAGEIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_averageifs.xhp msgctxt "" @@ -51445,7 +51350,7 @@ "par_id40031348913642\n" "help.text" msgid "Calculates the average for values of the range C2:C6 that correspond to all cells of the A2:A6 range starting with \"pen\" and to all cells of the B2:B6 range except its maximum. Returns 65, because only second row meets all criteria." -msgstr "" +msgstr "计算与 A2:A6 区域所有以「pen」开头的单元格相对应的 C2:C6 范围, 且与 B2:B6 区域所有单元格 (最大值除外) 相对应的数值的平均值。返回 65, 因为只有第二行满足所有条件。" #: func_averageifs.xhp msgctxt "" @@ -51453,7 +51358,7 @@ "hd_id31201205191857\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_averageifs.xhp msgctxt "" @@ -51461,7 +51366,7 @@ "par_id316794795433\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of AVERAGEIFS function. For example, the above function can be rewritten as follows:" -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 AVERAGEIFS 函数的条件中使用对该单元格的引用。例如, 可以按如下方式重写上述函数:" #: func_averageifs.xhp msgctxt "" @@ -51469,7 +51374,7 @@ "par_id67531072426731\n" "help.text" msgid "=AVERAGEIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=AVERAGEIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_averageifs.xhp msgctxt "" @@ -51477,7 +51382,7 @@ "par_id65612244926745\n" "help.text" msgid "If E2 = pen, the function returns 65, because the link to the cell is substituted with its content." -msgstr "" +msgstr "如果 E2 = pen, 该函数将返回 65, 因为指向单元格的链接将替换为其内容。" #: func_color.xhp msgctxt "" @@ -51493,7 +51398,7 @@ "bm_id1102201617201921\n" "help.text" msgid "colors;numerical values colors;calculating in spreadsheets COLOR function" -msgstr "" +msgstr "颜色; 数值 颜色; 在电子表格中计算 COLOR 函数" #: func_color.xhp msgctxt "" @@ -51509,7 +51414,7 @@ "par_id1102201617001848\n" "help.text" msgid "Return a numeric value calculated by a combination of three colors (red, green and blue) and the alpha channel, in the RGBA color system. The result depends on the color system used by your computer." -msgstr "" +msgstr "返回 RGBA 颜色系统中由三种颜色 (红色、绿色和蓝色) 和 alpha 通道组合计算的数值。结果与您计算机所使用的颜色系统相关。" #: func_color.xhp msgctxt "" @@ -51525,7 +51430,7 @@ "par_id242131304318587\n" "help.text" msgid "Red, Green and Blue – required arguments. The value for the red, green and blue components of the color. The values must be between 0 and 255. Zero means no color component and 255 means full color component." -msgstr "" +msgstr " 红色、绿色和蓝色 – 必填参数。颜色的红色、绿色和蓝色成分的值。值必须介于 0 和 255 之间。零表示没有该颜色成分, 255 表示完整的颜色成分。" #: func_color.xhp msgctxt "" @@ -51533,7 +51438,7 @@ "par_id242131304315587\n" "help.text" msgid "Alpha – optional argument. The value for the alpha channel or alpha composite. Alpha is a integer value between 0 and 255. The value of zero for alpha means the color is fully transparent, whereas a value of 255 in the alpha channel gives a fully opaque color." -msgstr "" +msgstr "Alpha – 可选参数。alpha 通道或 alpha 合成的值。alpha 是介于 0 和 255 之间的整数值。alpha 的值为零表示颜色完全透明, 而 alpha 通道值为 255 则给出完全不透明的颜色。" #: func_color.xhp msgctxt "" @@ -51581,7 +51486,7 @@ "bm_id452245224522\n" "help.text" msgid "COUNTIFS function counting row;satisfying criteria counting column;satisfying criteria" -msgstr "" +msgstr "COUNTIFS 函数行计数; 满足条件列计数; 满足条件" #: func_countifs.xhp msgctxt "" @@ -51597,7 +51502,7 @@ "par_id462646264626\n" "help.text" msgid "Returns the count of cells that meet criteria in multiple ranges." -msgstr "" +msgstr "返回多个范围中满足条件的单元格的计数. " #: func_countifs.xhp msgctxt "" @@ -51605,7 +51510,7 @@ "par_id27421466710275\n" "help.text" msgid "COUNTIFS(Range1; Criterion1 [; Range2; Criterion2 [; ...]])" -msgstr "COUNTIFS(区域1; 标准1 [; 区域2; 标准2 [; ...]])" +msgstr "COUNTIFS(区域1; 条件1 [; 区域2; 条件2 [; ...]])" #: func_countifs.xhp msgctxt "" @@ -51613,7 +51518,7 @@ "par_id242131304318587\n" "help.text" msgid "Range1 – required argument. It is a range of cells, a name of a named range or a label of a column or a row containing values for counting and finding the corresponding criterion." -msgstr "" +msgstr "区域1 – 必填参数。它是一个单元格区域、命名区域的名称或列/行标签, 其中包含用于计数和查找相应条件的值。" #: func_countifs.xhp msgctxt "" @@ -51621,7 +51526,7 @@ "par_id14734320631377\n" "help.text" msgid "Range1, Range2, ... and Criterion1, Criterion2, ... must have the same size, otherwise the function returns err:502 - Invalid argument." -msgstr "" +msgstr "「区域1, 区域2, ...」与 条件1, 条件2, ... 必须具有相同的大小, 否则该函数返回错误: 502 - 无效参数。" #: func_countifs.xhp msgctxt "" @@ -51629,7 +51534,7 @@ "hd_id3861259759512\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_countifs.xhp msgctxt "" @@ -51645,7 +51550,7 @@ "par_id323511393121175\n" "help.text" msgid "Counts the amount of rows of the range B2:B6 with values greater than or equal to 20. Returns 3, because the fifth and the sixth rows do not meet the criterion." -msgstr "" +msgstr "统计范围 B2:B6 中数值大于或等于 20 的行数。返回 3, 因为第五行和第六行不符合条件。" #: func_countifs.xhp msgctxt "" @@ -51661,7 +51566,7 @@ "par_id109622995127628\n" "help.text" msgid "Counts the amount of rows that contain simultaneously values greater than 70 in the C2:C6 range and values greater than or equal to 20 in the B2:B6 range. Returns 2, because the second, the fifth and the sixth rows do not meet at least one criterion." -msgstr "" +msgstr "统计同时满足 C2:C6 范围内数值大于 70 且 B2:B6 范围内数值大于或等于 20 的行数。返回 2, 因为第二行、第五行和第六行不满足至少一个条件。" #: func_countifs.xhp msgctxt "" @@ -51669,7 +51574,7 @@ "hd_id298462825526166\n" "help.text" msgid "Using regular expressions and nested functions" -msgstr "" +msgstr "使用正则表达式和嵌套函数" #: func_countifs.xhp msgctxt "" @@ -51677,7 +51582,7 @@ "par_id22736248573471\n" "help.text" msgid "=COUNTIFS(B2:B6;\"[:alpha:]*\")" -msgstr "「=AVERAGE(A1:A50)」" +msgstr "「=COUNTIFS(B2:B6;\"[:alpha:]*\")」" #: func_countifs.xhp msgctxt "" @@ -51685,7 +51590,7 @@ "par_id22137303324873\n" "help.text" msgid "Counts the amount of rows of the B2:B6 range that contain only alphabet symbols. Returns 1, because only sixth row meets the criterion." -msgstr "" +msgstr "统计 B2:B6 范围内只包含字母符号的行数。返回 1, 因为只有第六行满足条件。" #: func_countifs.xhp msgctxt "" @@ -51693,7 +51598,7 @@ "par_id82271340221411\n" "help.text" msgid "=COUNTIFS(B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=COUNTIFS(B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))」" #: func_countifs.xhp msgctxt "" @@ -51701,7 +51606,7 @@ "par_id1105320769334\n" "help.text" msgid "Counts the amount of rows of the B2:B6 range excluding rows with minimum and maximum values of this range. Returns 2, because the third, the fifth and the sixth rows do not meet at least one criterion." -msgstr "" +msgstr "计算 B2:B6 范围的行数, 排除此范围内最小值和最大值所在的行。返回 2, 因为第三行、第五行和第六行不满足至少一个条件。" #: func_countifs.xhp msgctxt "" @@ -51709,7 +51614,7 @@ "par_id267603146513224\n" "help.text" msgid "=COUNTIFS(A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=COUNTIFS(A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_countifs.xhp msgctxt "" @@ -51717,7 +51622,7 @@ "par_id111252614832220\n" "help.text" msgid "Counts the amount of rows that correspond to all cells of the A2:A6 range starting with \"pen\" and to all cells of the B2:B6 range with exception of its maximum. Returns 1, because only second row meets all criteria." -msgstr "" +msgstr "计算对应 A2:A6 区域以「pen」开头的所有单元格且对应 B2:B6 区域除最大值以外的所有单元格的行数。返回 1, 因为只有第二行满足所有条件。" #: func_countifs.xhp msgctxt "" @@ -51725,7 +51630,7 @@ "hd_id212582362610399\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_countifs.xhp msgctxt "" @@ -51733,7 +51638,7 @@ "par_id3245551524846\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of the COUNTIFS function. For example, the above function can be rewritten as follows:" -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 COUNTIFS 函数的条件中使用对该单元格的引用。例如, 可以按如下方式重写上述函数:" #: func_countifs.xhp msgctxt "" @@ -51741,7 +51646,7 @@ "par_id109501907712434\n" "help.text" msgid "=COUNTIFS(A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=COUNTIFS(A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_countifs.xhp msgctxt "" @@ -51749,7 +51654,7 @@ "par_id738533068520\n" "help.text" msgid "If E2 = pen, the function returns 1, because the link to the cell is substituted with its content and it works as a function above." -msgstr "" +msgstr "如果 E2 = pen, 则该函数返回 1, 因为指向单元格的链接将替换为其内容, 与上述函数行为类似。" #: func_date.xhp msgctxt "" @@ -51805,7 +51710,7 @@ "par_id3153222\n" "help.text" msgid "In %PRODUCTNAME - PreferencesTools - Options - $[officename] - General you can set from which year a two-digit number entry is recognized as 20xx." -msgstr "" +msgstr "您可以在「%PRODUCTNAME - 偏好设置工具 - 选项 - $[officename] - 常规 」中设置从哪一年份开始，将输入的两位数的数字识别为 20xx 年。" #: func_date.xhp msgctxt "" @@ -51837,7 +51742,7 @@ "par_id3152589\n" "help.text" msgid "=DATE(00;1;31) yields 1/31/00 if the cell format setting is MM/DD/YY." -msgstr "=DATE(00;1;31) 如果单元格格式设置为 MM/DD/YY，结果为 1/31/00。" +msgstr "=DATE(00;1;31) 如果单元格格式设置为「MM/DD/YY」，则得到「1/31/00」。" #: func_datedif.xhp msgctxt "" @@ -51981,7 +51886,7 @@ "par_id3252589\n" "help.text" msgid "=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"y\") yields 38." -msgstr "" +msgstr "「=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"y\")」得到 38。" #: func_datedif.xhp msgctxt "" @@ -51989,7 +51894,7 @@ "par_id451535132395328\n" "help.text" msgid "=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"ym\") yields 1." -msgstr "" +msgstr "「=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"ym\")」得到 1。" #: func_datedif.xhp msgctxt "" @@ -51997,7 +51902,7 @@ "par_id611535132402642\n" "help.text" msgid "=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"md\") yields 27." -msgstr "" +msgstr "「=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"md\")」得到 27。" #: func_datedif.xhp msgctxt "" @@ -52005,7 +51910,7 @@ "par_id511535132411940\n" "help.text" msgid "So he is 38 years, 1 month and 27 days old." -msgstr "" +msgstr "所以他已经 38 岁 1 个月零 27 天大了。" #: func_datedif.xhp msgctxt "" @@ -52013,7 +51918,7 @@ "par_id3352589\n" "help.text" msgid "=DATEDIF(DATE(1974,4,17);\"2012-06-13\";\"m\") yields 457, he has been living for 457 months." -msgstr "" +msgstr "「=DATEDIF(DATE(1974,4,17);\"2012-06-13\";\"m\")」得到 457, 他已存活 457 个月。" #: func_datedif.xhp msgctxt "" @@ -52021,7 +51926,7 @@ "par_id3452589\n" "help.text" msgid "=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"d\") yields 13937, he has been living for 13937 days." -msgstr "「=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"d\")」得到 13937，他已经活了 13937 天。" +msgstr "「=DATEDIF(\"1974-04-17\";\"2012-06-13\";\"d\")」得到 13937，他已存活 13937 天。" #: func_datedif.xhp msgctxt "" @@ -52029,7 +51934,7 @@ "par_id3752589\n" "help.text" msgid "=DATEDIF(\"1974-04-17\";DATE(2012;06;13);\"yd\") yields 57, his birthday was 57 days ago." -msgstr "" +msgstr "「=DATEDIF(\"1974-04-17\";DATE(2012;06;13);\"yd\")」得到 57, 他的生日是 57 天前。" #: func_datevalue.xhp msgctxt "" @@ -52101,7 +52006,7 @@ "par_id3155841\n" "help.text" msgid "=DATEVALUE(\"1954-07-20\") yields 19925." -msgstr "" +msgstr "「=DATEVALUE(\"1954-07-20\")」得到 19925。" #: func_day.xhp msgctxt "" @@ -52149,7 +52054,7 @@ "par_id3149443\n" "help.text" msgid "Number is the internal date number." -msgstr "" +msgstr "「数字」是日期的内部序数。" #: func_day.xhp msgctxt "" @@ -52157,7 +52062,7 @@ "par_id3151200\n" "help.text" msgid "=DAY(1) returns 31 (since $[officename] starts counting at zero from December 30, 1899)" -msgstr "" +msgstr "「=DAY(1)」返回 31 (因为 $[officename] 从1899年12月30日开始计数，从零开始)" #: func_day.xhp msgctxt "" @@ -52165,7 +52070,7 @@ "par_id3154130\n" "help.text" msgid "=DAY(NOW()) returns the current day." -msgstr "" +msgstr "「=DAY(NOW())」返回当天的天数。" #: func_day.xhp msgctxt "" @@ -52173,7 +52078,7 @@ "par_id3159190\n" "help.text" msgid "=DAY(C4) returns 5 if you enter 1901-08-05 in cell C4 (the date value might get formatted differently after you press Enter)." -msgstr "" +msgstr "=DAY(C4) 如果您在单元格 C4 中输入 1901-08-05，则返回 5 (按「回车」键后, 日期值可能会以不同的格式显示)。" #: func_days.xhp msgctxt "" @@ -52237,7 +52142,7 @@ "par_id3163720\n" "help.text" msgid "=DAYS(\"1990-10-10\";\"1980-10-10\") returns 3652 days." -msgstr "" +msgstr "「=DAYS(\"1990-10-10\";\"1980-10-10\")」返回 3652 天。" #: func_days360.xhp msgctxt "" @@ -52301,7 +52206,7 @@ "par_id3156348\n" "help.text" msgid "=DAYS360(\"2000-01-01\";NOW()) returns the number of interest days from January 1, 2000 until today." -msgstr "" +msgstr "「=DAYS360(\"2000-01-01\";NOW())」返回2000年1月1日至今的利息天数。" #: func_eastersunday.xhp msgctxt "" @@ -52389,7 +52294,7 @@ "par_id3154472\n" "help.text" msgid "=EASTERSUNDAY(2000) returns 2000-04-23." -msgstr "" +msgstr "「=EASTERSUNDAY(2000)」返回 2000-04-23。" #: func_eastersunday.xhp msgctxt "" @@ -52397,7 +52302,7 @@ "par_id3150940\n" "help.text" msgid "=EASTERSUNDAY(2000)+49 returns the internal serial number 36688. The result is 2000-06-11. Format the serial date number as a date, for example in the format YYYY-MM-DD." -msgstr "" +msgstr "「=EASTERSUNDAY(2000)+49」返回内部序数 36688。结果为 2000-06-11。将日期序数格式化为日期，例如格式为「YYYY-MM-DD」。" #: func_edate.xhp msgctxt "" @@ -52461,7 +52366,7 @@ "par_id3155845\n" "help.text" msgid "What date is one month prior to 2001-03-31?" -msgstr "2001-03-31 前一个月的日期是什么？" +msgstr "2001-03-31 之前一个月的日期是哪天?" #: func_edate.xhp msgctxt "" @@ -52469,7 +52374,7 @@ "par_id3155999\n" "help.text" msgid "=EDATE(\"2001-03-31\";-1) returns the serial number 36950. Formatted as a date, this is 2001-02-28." -msgstr "「=EDATE(\"2001-03-31\";-1)」返回序列数36950. 若格式化为日期，则显示2001-02-28。" +msgstr "「=EDATE(\"2001-03-31\";-1)」返回序数 36950。若格式化为日期，则显示「2001-02-28」。" #: func_eomonth.xhp msgctxt "" @@ -52541,7 +52446,7 @@ "par_id3156143\n" "help.text" msgid "=EOMONTH(DATE(2001;9;14);6) returns the serial number 37346. Formatted as a date, this is 2002-03-31." -msgstr "「=EOMONTH(DATE(2001;9;14);6)」返回序列号 37346。格式化为日期，即 2002-03-31。" +msgstr "「=EOMONTH(DATE(2001;9;14);6)」返回序数 37346。格式化为日期，即 2002-03-31。" #: func_eomonth.xhp msgctxt "" @@ -52581,7 +52486,7 @@ "par_id350283502835028\n" "help.text" msgid "Returns a number representing a specific Error type, or the error value #N/A, if there is no error. " -msgstr "" +msgstr "返回一个表示特定「错误」类型的数字, 如果没有错误, 则返回错误值「#N/A」" #: func_error_type.xhp msgctxt "" @@ -52597,7 +52502,7 @@ "par_id217737315\n" "help.text" msgid "Error_value – required argument. The error value or a reference to a cell, whose value needs to be processed." -msgstr "" +msgstr "错误值 – 必填参数。需要处理的错误值或对该类单元格的引用。" #: func_error_type.xhp msgctxt "" @@ -52605,7 +52510,7 @@ "par_id15254419018421\n" "help.text" msgid "Error value" -msgstr "" +msgstr "错误值" #: func_error_type.xhp msgctxt "" @@ -52613,7 +52518,7 @@ "par_id134093102310948\n" "help.text" msgid "Returns" -msgstr "" +msgstr "返回" #: func_error_type.xhp msgctxt "" @@ -52621,7 +52526,7 @@ "par_id121020152053105891\n" "help.text" msgid "Err:511" -msgstr "" +msgstr "错误:511" #: func_error_type.xhp msgctxt "" @@ -52693,7 +52598,7 @@ "hd_id182972884627444\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_error_type.xhp msgctxt "" @@ -52709,7 +52614,7 @@ "par_id280533214928308\n" "help.text" msgid "Returns 7, because 7 is the index number of the error value #N/A." -msgstr "" +msgstr "返回 7, 因为 7 是错误值「#N/A」的索引号。" #: func_error_type.xhp msgctxt "" @@ -52725,7 +52630,7 @@ "par_id24308515918391\n" "help.text" msgid "If A3 contains an expression equivalent to the division by zero, the function returns 2, because 2 is the index number of the error value #DIV/0!" -msgstr "" +msgstr "如果 A3 包含等效于除以零的表达式, 则该函数将返回 2, 因为 2 是错误值「#DIV/0!」的索引号" #: func_error_type.xhp msgctxt "" @@ -52733,7 +52638,7 @@ "hd_id9842206115046\n" "help.text" msgid "More advanced way" -msgstr "" +msgstr "更高级的方式" #: func_error_type.xhp msgctxt "" @@ -52741,7 +52646,7 @@ "par_id90121141327448\n" "help.text" msgid "If in division A1 by A2, A2 can turn to zero, you can handle the situation as follows:" -msgstr "" +msgstr "如果在除法「A1 除以 A2」中，A2 可能为零, 您可以这样处理此情况:" #: func_error_type.xhp msgctxt "" @@ -52749,7 +52654,7 @@ "par_id16083887218317\n" "help.text" msgid "=IF(ISERROR(A1/A2);IF(ERROR.TYPE(A1/A2)=2;\"the denominator can't be equal to zero\");A1/A2)" -msgstr "" +msgstr "「=IF(ISERROR(A1/A2);IF(ERROR.TYPE(A1/A2)=2;\"分母不能等于零\");A1/A2)」" #: func_error_type.xhp msgctxt "" @@ -52757,7 +52662,7 @@ "par_id12475201719494\n" "help.text" msgid "The ISERROR function returns TRUE or FALSE depending on whether there is an error or not. If the error takes place, the function IF addresses to the second argument, if there is no error, it returns the result of the division. The second argument checks the index number representing the specific Error type, and if it is equal to 2, it returns the specified text \"the denominator can't be zero\" or 0 otherwise. Thus, clear text would signify the division by zero, the result of the division would appear when the division is successful, or if there is, for example, an error of another type, zero would be returned." -msgstr "" +msgstr "ISERROR 函数根据是否出现错误返回 TRUE 或 FALSE。如果发生错误，函数 IF 将执行第二个参数，而如果没有错误，IF 将返回第三个参数，即除法的结果。第二个参数检查特定错误类型的索引号，如果等于 2，则返回指定文字内容「分母不能为零」，否则返回 0。因此，如果除数为零，则显示明确的文字说明情况，如果除法成功执行，则出现除法的结果，或者，假如出现其他类型的错误，则返回 0。" #: func_error_type.xhp msgctxt "" @@ -52765,7 +52670,7 @@ "par_id26251175451270\n" "help.text" msgid "If the ERROR.TYPE function is used as condition of the IF function and the ERROR.TYPE returns #N/A, the IF function returns #N/A as well. Use ISERROR to avoid it as shown in the example above." -msgstr "" +msgstr "如果 ERROR.TYPE 函数被用作 IF 函数的条件，且 ERROR.TYPE 返回 #N/A，IF 函数也将返回 #N/A。可使用 ISERROR 来避免该行为，如上例所示。" #: func_error_type.xhp msgctxt "" @@ -52773,7 +52678,7 @@ "par_id352953529535295\n" "help.text" msgid "ISERROR, NA, IF" -msgstr "" +msgstr "ISERROR, NA, IF" #: func_error_type.xhp msgctxt "" @@ -52781,7 +52686,7 @@ "par_id312932390024933\n" "help.text" msgid "Error codes" -msgstr "" +msgstr "错误代码" #: func_forecastetsadd.xhp msgctxt "" @@ -52797,7 +52702,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.ADD function" -msgstr "CONCATENATE 函数" +msgstr "FORECAST.ETS.ADD 函数" #: func_forecastetsadd.xhp msgctxt "" @@ -52805,7 +52710,7 @@ "hd_id0603201610022291\n" "help.text" msgid "FORECAST.ETS.ADD function" -msgstr "" +msgstr "FORECAST.ETS.ADD 函数" #: func_forecastetsadd.xhp msgctxt "" @@ -52813,7 +52718,7 @@ "par_id0603201610023949\n" "help.text" msgid "Calculates the additive forecast(s) (future values) based on the historical data using ETS or EDS algorithms. EDS is used when argument period_length is 0, otherwise ETS is used." -msgstr "" +msgstr "使用 ETS 或 EDS 算法根据历史数据计算加法预测 (未来值)。参数「周期长度」为 0 时使用 EDS, 否则将使用 ETS。" #: func_forecastetsadd.xhp msgctxt "" @@ -52821,7 +52726,7 @@ "par_id0603201608440530\n" "help.text" msgid "FORECAST.ETS.ADD calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.ADD 使用模型计算" #: func_forecastetsadd.xhp msgctxt "" @@ -52829,7 +52734,7 @@ "par_id0403201618594544\n" "help.text" msgid "FORECAST.ETS.ADD(targets, values, timeline, [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.ADD(targets, values, timeline, [period_length], [data_completion], [aggregation])" #: func_forecastetsadd.xhp msgctxt "" @@ -52837,7 +52742,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.ADD(DATE(2014;1;1);Values;Timeline;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.ADD(DATE(2014;1;1);Values;Timeline;1;TRUE();1)" #: func_forecastetsadd.xhp msgctxt "" @@ -52845,7 +52750,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 157.166666666667, the additive forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 157.166666666667, 基于「值」和上方「时间轴」命名区域对2014年1月进行加法预测, 每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetsadd.xhp msgctxt "" @@ -52853,7 +52758,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.ADD(DATE(2014;1;1);Values;Timeline;4;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.ADD(DATE(2014;1;1);Values;Timeline;4;TRUE();7)" #: func_forecastetsadd.xhp msgctxt "" @@ -52861,7 +52766,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 113.251442038722, the additive forecast for January 2014 based on Values and Timeline named ranges above, with period length of 4, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 113.251442038722, 基于「值」和上方「时间轴」命名区域对2014年1月进行加法预测, 周期长度为 4, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetsadd.xhp msgctxt "" @@ -52885,7 +52790,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.MULT function" -msgstr "EASTERSUNDAY 函数" +msgstr "FORECAST.ETS.MULT 函数" #: func_forecastetsmult.xhp msgctxt "" @@ -52893,7 +52798,7 @@ "hd_id0603201610022291\n" "help.text" msgid " FORECAST.ETS.MULT Function" -msgstr "" +msgstr " FORECAST.ETS.MULT 函数" #: func_forecastetsmult.xhp msgctxt "" @@ -52901,7 +52806,7 @@ "par_id0603201610023949\n" "help.text" msgid "Calculates the multiplicative forecast(s) (future values) based on the historical data using ETS or EDS algorithms. EDS is used when argument period_length is 0, otherwise ETS is used." -msgstr "" +msgstr "使用 ETS 或 EDS 算法根据历史数据计算乘法预测 (未来值)。参数「周期长度」为 0 时使用 EDS, 否则将使用 ETS。" #: func_forecastetsmult.xhp msgctxt "" @@ -52909,7 +52814,7 @@ "par_id0603201608440530\n" "help.text" msgid "FORECAST.ETS.MULT calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.MULT 使用模型计算" #: func_forecastetsmult.xhp msgctxt "" @@ -52917,7 +52822,7 @@ "par_id0403201618594544\n" "help.text" msgid "FORECAST.ETS.MULT(targets, values, timeline, [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.MULT(targets, values, timeline, [period_length], [data_completion], [aggregation])" #: func_forecastetsmult.xhp msgctxt "" @@ -52925,7 +52830,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.MULT(DATE(2014;1;1);Values;Timeline;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.MULT(DATE(2014;1;1);Values;Timeline;1;TRUE();1)" #: func_forecastetsmult.xhp msgctxt "" @@ -52933,7 +52838,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 131.71437427439, the multiplicative forecast for January 2014 based on Values and Timeline named ranges above, with one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 131.71437427439, 基于「值」和上方「时间轴」命名区域对2014年1月进行乘法预测, 每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetsmult.xhp msgctxt "" @@ -52941,7 +52846,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.MULT(DATE(2014;1;1);Values;Timeline;4;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.MULT(DATE(2014;1;1);Values;Timeline;4;TRUE();7)" #: func_forecastetsmult.xhp msgctxt "" @@ -52949,7 +52854,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 120.747806144882, the multiplicative forecast for January 2014 based on Values and Timeline named ranges above, with period length of 4, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 120.747806144882, 基于「值」和上方「时间轴」命名区域对2014年1月进行乘法预测, 周期长度为 4, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetsmult.xhp msgctxt "" @@ -52973,7 +52878,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.PI.ADD function" -msgstr "EASTERSUNDAY 函数" +msgstr "FORECAST.ETS.PI.ADD 函数" #: func_forecastetspiadd.xhp msgctxt "" @@ -52981,7 +52886,7 @@ "hd_id0603201617134175\n" "help.text" msgid "FORECAST.ETS.PI.ADD function" -msgstr "" +msgstr "FORECAST.ETS.PI.ADD 函数" #: func_forecastetspiadd.xhp msgctxt "" @@ -52989,7 +52894,7 @@ "par_id0603201617141750\n" "help.text" msgid "Calculates the prediction interval(s) for additive forecast based on the historical data using ETS or EDS algorithms.. EDS is used when argument period_length is 0, otherwise ETS is used." -msgstr "" +msgstr "使用 ETS 或 EDS 算法根据历史数据计算加法预测的预测间隔。参数「周期长度」为 0 时使用 EDS, 否则将使用 ETS。" #: func_forecastetspiadd.xhp msgctxt "" @@ -52997,7 +52902,7 @@ "par_id0603201610005998\n" "help.text" msgid "FORECAST.ETS.PI.ADD calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.PI.ADD 使用模型计算" #: func_forecastetspiadd.xhp msgctxt "" @@ -53005,7 +52910,7 @@ "par_id0603201610010044\n" "help.text" msgid "FORECAST.ETS.PI.ADD(target, values, timeline, [confidence_level], [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.PI.ADD(target, values, timeline, [confidence_level], [period_length], [data_completion], [aggregation])" #: func_forecastetspiadd.xhp msgctxt "" @@ -53013,7 +52918,7 @@ "par_id0403201618595126\n" "help.text" msgid "For example, with a 90% Confidence level, a 90% prediction interval will be computed (90% of future points are to fall within this radius from forecast)." -msgstr "" +msgstr "例如, 对于 90% 置信度级别, 将计算 90% 的预测间隔 (90% 的未来点将落入此预测的半径)。" #: func_forecastetspiadd.xhp msgctxt "" @@ -53021,7 +52926,7 @@ "par_id0403201618595143\n" "help.text" msgid "Note on prediction intervals: there is no exact mathematical way to calculate this for forecasts, there are various approximations. Prediction intervals tend to be increasingly 'over-optimistic' when increasing distance of the forecast-X from the observation data set." -msgstr "" +msgstr "关于预测间隔的说明: 没有明确的数学方法来计算预测, 但可以估算。随着预测 x 与观测数据集的距离越来越远, 预测间隔往往越来越「过于乐观」。" #: func_forecastetspiadd.xhp msgctxt "" @@ -53029,7 +52934,7 @@ "par_id0403201618595150\n" "help.text" msgid "For ETS, Calc uses an approximation based on 1000 calculations with random variations within the standard deviation of the observation data set (the historical values)." -msgstr "" +msgstr "对于 ETS, Calc 使用基于1000次计算的近似值, 每次计算在观测数据集 (历史值) 的标准偏差范围内具有随机变化。" #: func_forecastetspiadd.xhp msgctxt "" @@ -53037,7 +52942,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0.9;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0.9;1;TRUE();1)" #: func_forecastetspiadd.xhp msgctxt "" @@ -53045,7 +52950,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 18.8061295551355, the prediction interval for additive forecast for January 2014 based on Values and Timeline named ranges above, 90% (=0.9) confidence level, with one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 18.8061295551355, 基于「值」和上方「时间轴」命名区域对2014年1月进行加法预测的预测间隔, 90% (=0.9) 的置信度，每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetspiadd.xhp msgctxt "" @@ -53053,7 +52958,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.PI.ADD(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7)" #: func_forecastetspiadd.xhp msgctxt "" @@ -53061,7 +52966,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 23.4416821953741, the prediction interval for additive forecast for January 2014 based on Values and Timeline named ranges above, with confidence level of 0.8, period length of 4, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 23.4416821953741, 基于「值」和上方「时间轴」命名区域对2014年1月进行加法预测的预测间隔, 置信度为 0.8，周期长度为 4, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetspiadd.xhp msgctxt "" @@ -53085,7 +52990,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.PI.MULT function" -msgstr "EASTERSUNDAY 函数" +msgstr "FORECAST.ETS.PI.MULT 函数" #: func_forecastetspimult.xhp msgctxt "" @@ -53093,7 +52998,7 @@ "hd_id0603201617134175\n" "help.text" msgid "FORECAST.ETS.PI.MULT function" -msgstr "" +msgstr "FORECAST.ETS.PI.MULT 函数" #: func_forecastetspimult.xhp msgctxt "" @@ -53101,7 +53006,7 @@ "par_id0603201617141750\n" "help.text" msgid "Calculates the prediction interval(s) for multiplicative forecast based on the historical data using ETS or EDS algorithms.. EDS is used when argument period_length is 0, otherwise ETS is used." -msgstr "" +msgstr "使用 ETS 或 EDS 算法根据历史数据计算乘法预测的预测间隔。参数「周期长度」为 0 时使用 EDS, 否则将使用 ETS。" #: func_forecastetspimult.xhp msgctxt "" @@ -53109,7 +53014,7 @@ "par_id0603201610005998\n" "help.text" msgid "FORECAST.ETS.PI.MULT calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.PI.MULT 使用模型计算" #: func_forecastetspimult.xhp msgctxt "" @@ -53117,7 +53022,7 @@ "par_id0603201610010044\n" "help.text" msgid "FORECAST.ETS.PI.MULT(target, values, timeline, [confidence_level], [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.PI.MULT(target, values, timeline, [confidence_level], [period_length], [data_completion], [aggregation])" #: func_forecastetspimult.xhp msgctxt "" @@ -53125,7 +53030,7 @@ "par_id0403201618595126\n" "help.text" msgid "For example, with a 90% Confidence level, a 90% prediction interval will be computed (90% of future points are to fall within this radius from forecast)." -msgstr "" +msgstr "例如, 对于 90% 置信度级别, 将计算 90% 的预测间隔 (90% 的未来点将落入此预测的半径)。" #: func_forecastetspimult.xhp msgctxt "" @@ -53133,7 +53038,7 @@ "par_id0403201618595143\n" "help.text" msgid "Note on prediction intervals: there is no exact mathematical way to calculate this for forecasts, there are various approximations. Prediction intervals tend to be increasingly 'over-optimistic' when increasing distance of the forecast-X from the observation data set." -msgstr "" +msgstr "关于预测间隔的说明: 没有明确的数学方法来计算预测, 但可以估算。随着预测 x 与观测数据集的距离越来越远, 预测间隔往往越来越「过于乐观」。" #: func_forecastetspimult.xhp msgctxt "" @@ -53141,7 +53046,7 @@ "par_id0403201618595150\n" "help.text" msgid "For ETS, Calc uses an approximation based on 1000 calculations with random variations within the standard deviation of the observation data set (the historical values)." -msgstr "" +msgstr "对于 ETS, Calc 使用基于1000次计算的近似值, 每次计算在观测数据集 (历史值) 的标准偏差范围内具有随机变化。" #: func_forecastetspimult.xhp msgctxt "" @@ -53149,7 +53054,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0.9;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0.9;1;TRUE();1)" #: func_forecastetspimult.xhp msgctxt "" @@ -53157,7 +53062,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 20.1040952101013, the prediction interval for multiplicative forecast for January 2014 based on Values and Timeline named ranges above, confidence level of 90% (=0.9) with one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 20.1040952101013, 基于「值」和上方「时间轴」命名区域对2014年1月进行乘法预测的预测间隔, 置信度为 90% (=0.9)，每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetspimult.xhp msgctxt "" @@ -53165,7 +53070,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.PI.MULT(DATE(2014;1;1);Values;Timeline;0.8;4;TRUE();7)" #: func_forecastetspimult.xhp msgctxt "" @@ -53173,7 +53078,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 27.5285874381574, the prediction interval for multiplicative forecast for January 2014 based on Values and Timeline named ranges above, with confidence level of 0.8, period length of 4, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 27.5285874381574, 基于「值」和上方「时间轴」命名区域对2014年1月进行乘法预测的预测间隔, 置信度为 0.8，周期长度为 4, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetspimult.xhp msgctxt "" @@ -53197,7 +53102,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.SEASONALITY function" -msgstr "CONCATENATE 函数" +msgstr "FORECAST.ETS.SEASONALITY 函数" #: func_forecastetsseason.xhp msgctxt "" @@ -53205,7 +53110,7 @@ "hd_id0603201617435371\n" "help.text" msgid "FORECAST.ETS.SEASONALITY Function" -msgstr "" +msgstr "FORECAST.ETS.SEASONALITY 函数" #: func_forecastetsseason.xhp msgctxt "" @@ -53213,7 +53118,7 @@ "par_id0603201617510446\n" "help.text" msgid "Returns the number of samples in period as calculated by Calc in case of FORECAST.ETS functions when argument period_length equals 1. " -msgstr "" +msgstr "返回 Calc 在 FORECAST.ETS 函数的参数「周期长度」等于 1 时计算的周期内的样本数" #: func_forecastetsseason.xhp msgctxt "" @@ -53221,7 +53126,7 @@ "par_id0403201618595132\n" "help.text" msgid "The same result is returned with FORECAST.ETS.STAT functions when argument stat_type equals 9 (and period_length equals 1)." -msgstr "" +msgstr "FORECAST.ETS.STAT 函数的「统计类型」参数等于 9 (且 周期长度 等于 1) 时会返回相同的结果。" #: func_forecastetsseason.xhp msgctxt "" @@ -53229,7 +53134,7 @@ "par_id0603201618013796\n" "help.text" msgid "FORECAST.ETS.SEASONALITY (values, timeline, [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.SEASONALITY (values, timeline, [data_completion], [aggregation])" #: func_forecastetsseason.xhp msgctxt "" @@ -53237,7 +53142,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.SEASONALITY(Values;Timeline;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.SEASONALITY(Values;Timeline;TRUE();1)" #: func_forecastetsseason.xhp msgctxt "" @@ -53245,7 +53150,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 6, the number of samples in period based on Values and Timeline named ranges above, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 6, 基于「值」和上方「时间轴」命名区域的周期内样本数, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetsseason.xhp msgctxt "" @@ -53269,7 +53174,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.STAT.ADD function" -msgstr "CONCATENATE 函数" +msgstr "FORECAST.ETS.STAT.ADD 函数" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53277,7 +53182,7 @@ "hd_id0603201615483251\n" "help.text" msgid "FORECAST.ETS.STAT.ADD Function" -msgstr "" +msgstr "FORECAST.ETS.STAT.ADD 函数" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53285,7 +53190,7 @@ "par_id0603201615485387\n" "help.text" msgid "Returns statistical value(s) that are results of the ETS/EDS algorithms." -msgstr "" +msgstr "返回 ETS/EDS 算法的结果的统计值。" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53293,7 +53198,7 @@ "par_id0603201608440530\n" "help.text" msgid "FORECAST.ETS.STAT.ADD calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.STAT.ADD 使用模型计算" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53301,7 +53206,7 @@ "par_id0603201610005728\n" "help.text" msgid "FORECAST.ETS.STAT.ADD (values, timeline, stat_type, [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.STAT.ADD (values, timeline, stat_type, [period_length], [data_completion], [aggregation])" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53309,7 +53214,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.STAT.ADD(Values;Timeline;3;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.STAT.ADD(Values;Timeline;3;1;TRUE();1)" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53317,7 +53222,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 0.9990234375, the additive statistics based on Values and Timeline named ranges above, with beta smoothing, one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 0.9990234375, 基于「值」和上方「时间轴」命名区域的加法统计, 采用 beta 平滑, 每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53325,7 +53230,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.STAT.ADD(Values;Timeline;2;1;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.STAT.ADD(Values;Timeline;2;1;TRUE();7)" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53333,7 +53238,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 0.0615234375, the additive statistics based on Values and Timeline named ranges above, with gamma smoothing, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 0.0615234375, 基于「值」和上方「时间轴」命名区域的加法统计, 采用 gamma 平滑, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetsstatadd.xhp msgctxt "" @@ -53357,7 +53262,7 @@ "bm_id976559765597655\n" "help.text" msgid "FORECAST.ETS.STAT.MULT function" -msgstr "CONCATENATE 函数" +msgstr "FORECAST.ETS.STAT.MULT 函数" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53365,7 +53270,7 @@ "hd_id0603201615483251\n" "help.text" msgid "FORECAST.ETS.STAT.MULT Function" -msgstr "" +msgstr "FORECAST.ETS.STAT.MULT 函数" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53373,7 +53278,7 @@ "par_id0603201615485387\n" "help.text" msgid "Returns statistical value(s) that are results of the ETS/EDS algorithms." -msgstr "" +msgstr "返回 ETS/EDS 算法的结果的统计值。" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53381,7 +53286,7 @@ "par_id0603201608440530\n" "help.text" msgid "FORECAST.ETS.STAT.MULT calculates with the model" -msgstr "" +msgstr "FORECAST.ETS.STAT.MULT 使用模型计算" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53389,7 +53294,7 @@ "par_id0603201610005728\n" "help.text" msgid "FORECAST.ETS.STAT.MULT (values, timeline, stat_type, [period_length], [data_completion], [aggregation])" -msgstr "" +msgstr "FORECAST.ETS.STAT.MULT (values, timeline, stat_type, [period_length], [data_completion], [aggregation])" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53397,7 +53302,7 @@ "hd_id04032016185123\n" "help.text" msgid "=FORECAST.ETS.STAT.MULT(Values;Timeline;5;1;TRUE();1)" -msgstr "" +msgstr "=FORECAST.ETS.STAT.MULT(Values;Timeline;5;1;TRUE();1)" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53405,7 +53310,7 @@ "hd_id04032016112394554\n" "help.text" msgid "Returns 0.084073452803966, the multiplicative statistics based on Values and Timeline named ranges above, with symmetric mean absolute percentage error (SMAPE), one sample per period, no missing data, and AVERAGE as aggregation." -msgstr "" +msgstr "返回 0.084073452803966, 基于「值」和上方「时间轴」命名区域的乘法统计, 采用对称平均绝对百分比误差 (SMAPE), 每个样本作为一个周期, 没有缺失的数据, 使用 AVERAGE 作为聚合函数。" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53413,7 +53318,7 @@ "hd_id04032123185123\n" "help.text" msgid "=FORECAST.ETS.STAT.MULT(Values;Timeline;7;1;TRUE();7)" -msgstr "" +msgstr "=FORECAST.ETS.STAT.MULT(Values;Timeline;7;1;TRUE();7)" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53421,7 +53326,7 @@ "hd_id040312316112394554\n" "help.text" msgid "Returns 15.8372533480997, the multiplicative statistics based on Values and Timeline named ranges above, with root mean squared error, no missing data, and SUM as aggregation." -msgstr "" +msgstr "返回 15.8372533480997, 基于「值」和上方「时间轴」命名区域的乘法统计, 采用均方根误差, 没有缺失的数据, 使用 SUM 作为聚合函数。" #: func_forecastetsstatmult.xhp msgctxt "" @@ -53533,7 +53438,7 @@ "par_id1066273182723\n" "help.text" msgid "Returns the cosine of a complex number. The cosine of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的余弦。复数的余弦可以表示为:" #: func_imcos.xhp msgctxt "" @@ -53549,7 +53454,7 @@ "par_id2890729435632\n" "help.text" msgid "Complex_number is a complex number whose cosine is to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的余弦。" #: func_imcos.xhp msgctxt "" @@ -53557,7 +53462,7 @@ "par_id4581301219753\n" "help.text" msgid "=IMCOS(\"4-3i\")
returns -6.58066304055116-7.58155274274654i." -msgstr "" +msgstr "「=IMCOS(\"4-3i\")」
返回 -6.58066304055116-7.58155274274654i。" #: func_imcos.xhp msgctxt "" @@ -53565,7 +53470,7 @@ "par_id25412646522614\n" "help.text" msgid "=IMCOS(2)
returns -0.416146836547142 as a string. " -msgstr "" +msgstr "「=IMCOS(2)」
返回 -0.416146836547142 作为字符串。" #: func_imcosh.xhp msgctxt "" @@ -53597,7 +53502,7 @@ "par_id125881258812588\n" "help.text" msgid "Returns the hyperbolic cosine of a complex number. The hyperbolic cosine of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的双曲余弦。复数的双曲余弦可以表示为:" #: func_imcosh.xhp msgctxt "" @@ -53613,7 +53518,7 @@ "par_id766137661376613\n" "help.text" msgid "Complex_number is a complex number whose hyperbolic cosine is to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算其双曲余弦。" #: func_imcosh.xhp msgctxt "" @@ -53621,7 +53526,7 @@ "par_id55891471962\n" "help.text" msgid "=IMCOSH(\"4-3i\")
returns -27.0349456030742-3.85115333481178i." -msgstr "" +msgstr "「=IMCOSH(\"4-3i\")」
返回 -27.0349456030742-3.85115333481178i。" #: func_imcosh.xhp msgctxt "" @@ -53629,7 +53534,7 @@ "par_id152561887112896\n" "help.text" msgid "=IMCOSH(2)
returns 3.76219569108363 as a string. " -msgstr "" +msgstr "「=IMCOSH(2)」
返回 3.76219569108363 作为字符串。" #: func_imcot.xhp msgctxt "" @@ -53661,7 +53566,7 @@ "par_id764617646176461\n" "help.text" msgid "Returns the cotangent of a complex number. The cotangent of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的余切。复数的余切可以表示为:" #: func_imcot.xhp msgctxt "" @@ -53685,7 +53590,7 @@ "par_id766137661376613\n" "help.text" msgid "Complex_number is a complex number whose cotangent is to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的余切。" #: func_imcot.xhp msgctxt "" @@ -53693,7 +53598,7 @@ "par_id21183436423819\n" "help.text" msgid "=IMCOT(\"4-3i\")
returns 0.00490118239430447+0.999266927805902i." -msgstr "" +msgstr "「=IMCOT(\"4-3i\")」
返回 0.00490118239430447+0.999266927805902i。" #: func_imcot.xhp msgctxt "" @@ -53701,7 +53606,7 @@ "par_id18472284929530\n" "help.text" msgid "=IMCOT(2)
returns -0.457657554360286 as a string. " -msgstr "" +msgstr "「=IMCOT(2)」
返回 -0.457657554360286 作为字符串。" #: func_imcsc.xhp msgctxt "" @@ -53733,7 +53638,7 @@ "par_id932329323293232\n" "help.text" msgid "Returns the cosecant of a complex number. The cosecant of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的余割。复数的余割可以表示为:" #: func_imcsc.xhp msgctxt "" @@ -53757,7 +53662,7 @@ "par_id1899971619670\n" "help.text" msgid "Complex_number is a complex number whose cosecant needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的余割。" #: func_imcsc.xhp msgctxt "" @@ -53765,7 +53670,7 @@ "par_id25692477525537\n" "help.text" msgid "=IMCSC(\"4-3i\")
returns -0.0754898329158637-0.0648774713706355i." -msgstr "" +msgstr "「=IMCSC(\"4-3i\")」
返回 -0.0754898329158637-0.0648774713706355i。" #: func_imcsc.xhp msgctxt "" @@ -53773,7 +53678,7 @@ "par_id32572967420710\n" "help.text" msgid "=IMCSC(2)
returns 1.09975017029462 as a string. " -msgstr "" +msgstr "「=IMCSC(2)」
返回 1.09975017029462 作为字符串。 " #: func_imcsch.xhp msgctxt "" @@ -53805,7 +53710,7 @@ "par_id979369793697936\n" "help.text" msgid "Returns the hyperbolic cosecant of a complex number. The hyperbolic cosecant of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的双曲余割。复数的双曲余割可以表示为:" #: func_imcsch.xhp msgctxt "" @@ -53829,7 +53734,7 @@ "par_id1899971619670\n" "help.text" msgid "Complex_number is a complex number whose hyperbolic cosecant needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的双曲余割。" #: func_imcsch.xhp msgctxt "" @@ -53837,7 +53742,7 @@ "par_id16814232201137\n" "help.text" msgid "=IMCSCH(\"4-3i\")
returns -0.036275889628626+0.0051744731840194i." -msgstr "" +msgstr "「=IMCSCH(\"4-3i\")」
返回 -0.036275889628626+0.0051744731840194i。" #: func_imcsch.xhp msgctxt "" @@ -53845,7 +53750,7 @@ "par_id2395211576789\n" "help.text" msgid "=IMCSCH(2)
returns 0.275720564771783 as a string. " -msgstr "" +msgstr "「=IMCSCH(2)」
返回 0.275720564771783 作为字符串。" #: func_imsec.xhp msgctxt "" @@ -53877,7 +53782,7 @@ "par_id23292284928998\n" "help.text" msgid "Returns the secant of a complex number. The secant of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的正割。复数的正割可以表示为:" #: func_imsec.xhp msgctxt "" @@ -53901,7 +53806,7 @@ "par_id3186739645701\n" "help.text" msgid "Complex_number is a complex number whose secant needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的正割。" #: func_imsec.xhp msgctxt "" @@ -53909,7 +53814,7 @@ "par_id16814232201137\n" "help.text" msgid "=IMSEC(\"4-3i\")
returns -0.0652940278579471+0.0752249603027732i." -msgstr "" +msgstr "「=IMSEC(\"4-3i\")」
返回 -0.0652940278579471+0.0752249603027732i。" #: func_imsec.xhp msgctxt "" @@ -53917,7 +53822,7 @@ "par_id2395211576789\n" "help.text" msgid "=IMSEC(2)
returns -2.40299796172238 as a string. " -msgstr "" +msgstr "「=IMSEC(2)」
返回 -2.40299796172238 作为字符串。" #: func_imsech.xhp msgctxt "" @@ -53949,7 +53854,7 @@ "par_id116441182314950\n" "help.text" msgid "Returns the hyperbolic secant of a complex number. The hyperbolic secant of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的双曲正割。复数的双曲正割可以表示为:" #: func_imsech.xhp msgctxt "" @@ -53973,7 +53878,7 @@ "par_id31259109804356\n" "help.text" msgid "Complex_number is a complex number whose hyperbolic secant needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的双曲正割。" #: func_imsech.xhp msgctxt "" @@ -53981,7 +53886,7 @@ "par_id1906826088444\n" "help.text" msgid "=IMSECH(\"4-3i\")
returns -0.0362534969158689+0.00516434460775318i." -msgstr "" +msgstr "「=IMSECH(\"4-3i\")」
返回 -0.0362534969158689+0.00516434460775318i。" #: func_imsech.xhp msgctxt "" @@ -53989,7 +53894,7 @@ "par_id247492030016627\n" "help.text" msgid "=IMSECH(2)
returns 0.26580222883408 as a string. " -msgstr "" +msgstr "「=IMSECH(2)」
返回 0.26580222883408 作为字符串。" #: func_imsin.xhp msgctxt "" @@ -54021,7 +53926,7 @@ "par_id1955633330277\n" "help.text" msgid "Returns the sine of a complex number. The sine of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的正弦。复数的正弦可以表示为:" #: func_imsin.xhp msgctxt "" @@ -54029,7 +53934,7 @@ "par_id3189460120934\n" "help.text" msgid "sin(a+bi)=sin(a)cosh(b)+cos(a)sinh(b)i" -msgstr "" +msgstr "sin(a+bi)=sin(a)cosh(b)+cos(a)sinh(b)i" #: func_imsin.xhp msgctxt "" @@ -54045,7 +53950,7 @@ "par_id31206835928272\n" "help.text" msgid "Complex_number is a complex number whose sine needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的正弦。" #: func_imsin.xhp msgctxt "" @@ -54053,7 +53958,7 @@ "par_id5063188419467\n" "help.text" msgid "=IMSIN(\"4-3i\")
returns -7.61923172032141+6.548120040911i." -msgstr "" +msgstr "「=IMSIN(\"4-3i\")」
返回 -7.61923172032141+6.548120040911i。" #: func_imsin.xhp msgctxt "" @@ -54061,7 +53966,7 @@ "par_id1527387141125\n" "help.text" msgid "=IMSIN(2)
returns 0.909297426825682 as a string. " -msgstr "" +msgstr "「=IMSIN(2)」
返回 0.909297426825682 作为字符串。" #: func_imsinh.xhp msgctxt "" @@ -54093,7 +53998,7 @@ "par_id1955633330277\n" "help.text" msgid "Returns the hyperbolic sine of a complex number. The hyperbolic sine of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的双曲正弦。复数的双曲正弦可以表示为:" #: func_imsinh.xhp msgctxt "" @@ -54101,7 +54006,7 @@ "par_id3189460120934\n" "help.text" msgid "sinh(a+bi)=sinh(a)cos(b)+cosh(a)sin(b)i" -msgstr "" +msgstr "sinh(a+bi)=sinh(a)cos(b)+cosh(a)sin(b)i" #: func_imsinh.xhp msgctxt "" @@ -54117,7 +54022,7 @@ "par_id31206835928272\n" "help.text" msgid "Complex_number is a complex number whose hyperbolic sine needs to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的双曲正弦。" #: func_imsinh.xhp msgctxt "" @@ -54125,7 +54030,7 @@ "par_id5063188419467\n" "help.text" msgid "=IMSINH(\"4-3i\")
returns -27.0168132580039-3.85373803791938i." -msgstr "" +msgstr "「=IMSINH(\"4-3i\")」
返回 -27.0168132580039-3.85373803791938i。" #: func_imsinh.xhp msgctxt "" @@ -54133,7 +54038,7 @@ "par_id1527387141125\n" "help.text" msgid "=IMSINH(2)
returns 3.62686040784702 as a string. " -msgstr "" +msgstr "「=IMSINH(2)」
返回 3.62686040784702 作为字符串。" #: func_imtan.xhp msgctxt "" @@ -54165,7 +54070,7 @@ "par_id5700137827273\n" "help.text" msgid "Returns the tangent of a complex number. The tangent of a complex number can be expressed by:" -msgstr "" +msgstr "返回复数的正切。复数的正切可以表示为:" #: func_imtan.xhp msgctxt "" @@ -54189,7 +54094,7 @@ "par_id10242899132094\n" "help.text" msgid "Complex_number is a complex number whose tangent is to be calculated." -msgstr "" +msgstr "「复数」是一个复数, 将计算它的正切。" #: func_imtan.xhp msgctxt "" @@ -54197,7 +54102,7 @@ "par_id5063188419467\n" "help.text" msgid "=IMTAN(\"4-3i\")
returns 0.00490825806749606-1.00070953606723i." -msgstr "" +msgstr "「=IMTAN(\"4-3i\")」
返回 0.00490825806749606-1.00070953606723i。" #: func_imtan.xhp msgctxt "" @@ -54205,7 +54110,7 @@ "par_id1527387141125\n" "help.text" msgid "=IMTAN(2)
returns -2.18503986326152 as a string. " -msgstr "" +msgstr "「=IMTAN(2)」
返回 -2.18503986326152 作为字符串。" #: func_isoweeknum.xhp msgctxt "" @@ -54221,7 +54126,7 @@ "bm_id3159161\n" "help.text" msgid "ISOWEEKNUM function" -msgstr "WEEKNUM" +msgstr "ISOWEEKNUM 函数" #: func_isoweeknum.xhp msgctxt "" @@ -54261,7 +54166,7 @@ "par_id3147511\n" "help.text" msgid "Number is the internal date number." -msgstr "「value」是日期的内部序列数。" +msgstr "「数字」是日期的内部序数。" #: func_isoweeknum.xhp msgctxt "" @@ -54269,7 +54174,7 @@ "par_id3149792\n" "help.text" msgid "=ISOWEEKNUM(DATE(1995;1;1)) returns 52. Week 1 starts on Monday, 1995-01-02." -msgstr "" +msgstr "「=ISOWEEKNUM(DATE(1995;1;1))」返回 52。第一周开始于 1995-01-02 星期一。" #: func_isoweeknum.xhp msgctxt "" @@ -54277,7 +54182,7 @@ "par_id3149794\n" "help.text" msgid "=ISOWEEKNUM(DATE(1999;1;1)) returns 53. Week 1 starts on Monday, 1999-01-04." -msgstr "" +msgstr "「=ISOWEEKNUM(DATE(1999;1;1))」返回 53。第一周开始于 1999-01-04 星期一。" #: func_maxifs.xhp msgctxt "" @@ -54293,7 +54198,7 @@ "bm_id658066580665806\n" "help.text" msgid "MAXIFS function maximum;satisfying conditions" -msgstr "" +msgstr "MAXIFS 函数 最大值; 满足条件" #: func_maxifs.xhp msgctxt "" @@ -54301,7 +54206,7 @@ "hd_id658866588665886\n" "help.text" msgid "MAXIFS function" -msgstr "" +msgstr "MAXIFS 函数" #: func_maxifs.xhp msgctxt "" @@ -54309,7 +54214,7 @@ "par_id659756597565975\n" "help.text" msgid "Returns the maximum of the values of cells in a range that meets multiple criteria in multiple ranges." -msgstr "" +msgstr "返回多个区域中满足多个条件的区域中的单元格的最大值." #: func_maxifs.xhp msgctxt "" @@ -54317,7 +54222,7 @@ "par_id11655988824213\n" "help.text" msgid "MAXIFS()" -msgstr "" +msgstr "MAXIFS()" #: func_maxifs.xhp msgctxt "" @@ -54325,7 +54230,7 @@ "par_id59901690530236\n" "help.text" msgid "Func_Range – required argument. A range of cells, a name of a named range or a label of a column or a row containing values for calculating the maximum." -msgstr "" +msgstr "函数范围 – 必填参数。它是一个单元格区域、命名区域的名称或列/行标签, 包含用于计算最大值的值。" #: func_maxifs.xhp msgctxt "" @@ -54333,7 +54238,7 @@ "hd_id193452436229521\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_maxifs.xhp msgctxt "" @@ -54341,7 +54246,7 @@ "par_id94321051525036\n" "help.text" msgid "=MAXIFS(B2:B6;B2:B6;\"<35\")" -msgstr "" +msgstr "「=MAXIFS(B2:B6;B2:B6;\"<35\")」" #: func_maxifs.xhp msgctxt "" @@ -54349,7 +54254,7 @@ "par_id28647227259438\n" "help.text" msgid "Calculates the maximum of values of the range B2:B6 that are greater than or equal to 20. Returns 35. The fifth row does not meet the criterion." -msgstr "" +msgstr "计算范围 B2:B6 中大于或等于 20 的最大值。返回 35。因为第五行不符合条件。" #: func_maxifs.xhp msgctxt "" @@ -54357,7 +54262,7 @@ "par_id36952767622741\n" "help.text" msgid "=MAXIFS(C2:C6;B2:B6;\">=20\";C2:C6;\"<90\")" -msgstr "" +msgstr "「=MAXIFS(C2:C6;B2:B6;\">=20\";C2:C6;\"<90\")」" #: func_maxifs.xhp msgctxt "" @@ -54365,7 +54270,7 @@ "par_id189772445525114\n" "help.text" msgid "Calculates the maximum of values of the range C2:C6 that are lower than 90 and correspond to cells of the B2:B6 range with values greater than or equal to 20. Returns 85, because the fourth and fifth rows do not meet at least one criterion." -msgstr "" +msgstr "计算范围 C2:C6 中小于 90、且在 B2:B6 范围内的对应单元格的值大于或等于 20 的值的最大值。返回 85, 因为第四行和第五行不满足至少一个条件。" #: func_maxifs.xhp msgctxt "" @@ -54373,7 +54278,7 @@ "hd_id30455222431067\n" "help.text" msgid "Using regular expressions and nested functions" -msgstr "" +msgstr "使用正则表达式和嵌套函数" #: func_maxifs.xhp msgctxt "" @@ -54381,7 +54286,7 @@ "par_id307691022525348\n" "help.text" msgid "=MAXIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MAXIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))」" #: func_maxifs.xhp msgctxt "" @@ -54389,7 +54294,7 @@ "par_id27619246864839\n" "help.text" msgid "Calculates the maximum of values of the range C2:C6 that correspond to all values of the range B2:B6 except its minimum and maximum. Returns 190, because only the fourth row meet the criteria." -msgstr "" +msgstr "计算范围 C2:C6 中与范围 B2:B6 除最大值外的所有值相对应的数值的最大值。返回 190, 因为只有第四行满足条件。" #: func_maxifs.xhp msgctxt "" @@ -54397,7 +54302,7 @@ "par_id220502883332563\n" "help.text" msgid "=MAXIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<=\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MAXIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<=\"&MAX(B2:B6))」" #: func_maxifs.xhp msgctxt "" @@ -54405,7 +54310,7 @@ "par_id15342189586295\n" "help.text" msgid "Calculates the maximum of values of the range C2:C6 that correspond to all cells of the A2:A6 range starting with \"pen\" and to all cells of the B2:B6 range except its maximum. Returns 85, because only the third row meets all criteria." -msgstr "" +msgstr "计算C2:C6 范围与 A2:A6 范围的所有以「笔」开头的单元格相对应，且与 B2:B6 区域的所有单元格 (最大值除外) 相对应的数值的最大值。返回 85, 因为只有第三行满足所有条件。" #: func_maxifs.xhp msgctxt "" @@ -54413,7 +54318,7 @@ "hd_id8168283329426\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_maxifs.xhp msgctxt "" @@ -54421,7 +54326,7 @@ "par_id50762995519951\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of the MAXIFS function. For example, the above function can be rewritten as follows:" -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 MAXIFS 函数的条件中使用对该单元格的引用。例如, 可以按如下方式重写上述函数:" #: func_maxifs.xhp msgctxt "" @@ -54429,7 +54334,7 @@ "par_id135761606425300\n" "help.text" msgid "=MAXIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MAXIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_maxifs.xhp msgctxt "" @@ -54437,7 +54342,7 @@ "par_id30574750215839\n" "help.text" msgid "If E2 = \"pen\", the function returns 65, because the reference to the cell is substituted with its content." -msgstr "" +msgstr "如果 E2 = \"pen\", 函数将返回 65, 因为指向单元格的引用将替换为其内容。" #: func_minifs.xhp msgctxt "" @@ -54453,7 +54358,7 @@ "bm_id658066580665806\n" "help.text" msgid "MINIFS function minimum;satisfying conditions" -msgstr "" +msgstr "MINIFS 函数 最小值; 满足条件" #: func_minifs.xhp msgctxt "" @@ -54461,7 +54366,7 @@ "hd_id658866588665886\n" "help.text" msgid "MINIFS function" -msgstr "" +msgstr "MINIFS 函数" #: func_minifs.xhp msgctxt "" @@ -54469,7 +54374,7 @@ "par_id659756597565975\n" "help.text" msgid "Returns the minimum of the values of cells in a range that meets multiple criteria in multiple ranges." -msgstr "" +msgstr "返回多个区域中满足多个条件的区域中的单元格的最小值." #: func_minifs.xhp msgctxt "" @@ -54477,7 +54382,7 @@ "par_id11655988824213\n" "help.text" msgid "MINIFS()" -msgstr "" +msgstr "MINIFS()" #: func_minifs.xhp msgctxt "" @@ -54485,7 +54390,7 @@ "par_id59901690530236\n" "help.text" msgid "Func_Range – required argument. A range of cells, a name of a named range or a label of a column or a row containing values for calculating the minimum." -msgstr "" +msgstr "函数范围 – 必填参数。它是一个单元格区域、命名区域的名称或列/行标签, 包含用于计算最小值的值。" #: func_minifs.xhp msgctxt "" @@ -54493,7 +54398,7 @@ "hd_id193452436229521\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_minifs.xhp msgctxt "" @@ -54501,7 +54406,7 @@ "par_id94321051525036\n" "help.text" msgid "=MINIFS(B2:B6;B2:B6;\"<35\")" -msgstr "" +msgstr "「=MINIFS(B2:B6;B2:B6;\"<35\")」" #: func_minifs.xhp msgctxt "" @@ -54509,7 +54414,7 @@ "par_id28647227259438\n" "help.text" msgid "Calculates the minimum of values of the range B2:B6 that are lower than or equal to 20. Returns 17." -msgstr "" +msgstr "计算 B2:B6 范围小于或等于 20 的数值的最小值。返回 17。" #: func_minifs.xhp msgctxt "" @@ -54517,7 +54422,7 @@ "par_id36952767622741\n" "help.text" msgid "=MINIFS(C2:C6;B2:B6;\">=20\";C2:C6;\">90\")" -msgstr "" +msgstr "「=MINIFS(C2:C6;B2:B6;\">=20\";C2:C6;\">90\")」" #: func_minifs.xhp msgctxt "" @@ -54525,7 +54430,7 @@ "par_id189772445525114\n" "help.text" msgid "Calculates the minimum of values of the range C2:C6 that are lower than 90 and correspond to cells of the B2:B6 range with values greater than or equal to 20. Returns 190." -msgstr "" +msgstr "计算范围 C2:C6 中小于 90，且 B2:B6 范围内对应单元格的数值大于或等于 20 的数值的最小值。返回 190。" #: func_minifs.xhp msgctxt "" @@ -54533,7 +54438,7 @@ "hd_id30455222431067\n" "help.text" msgid "Using regular expressions and nested functions" -msgstr "" +msgstr "使用正则表达式和嵌套函数" #: func_minifs.xhp msgctxt "" @@ -54541,7 +54446,7 @@ "par_id307691022525348\n" "help.text" msgid "=MINIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MINIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))」" #: func_minifs.xhp msgctxt "" @@ -54549,7 +54454,7 @@ "par_id27619246864839\n" "help.text" msgid "Calculates the minimum of values of the range C2:C6 that correspond to all values of the range B2:B6 except its minimum and minimum. Returns 65." -msgstr "" +msgstr "计算范围 C2:C6 中与范围 B2:B6 除最小值外的所有值相对应的数值的最小值。返回 65。" #: func_minifs.xhp msgctxt "" @@ -54557,7 +54462,7 @@ "par_id220502883332563\n" "help.text" msgid "=MINIFS(C2:C6;A2:A6;\".*book\";B2:B6;\"<=\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MINIFS(C2:C6;A2:A6;\".*book\";B2:B6;\"<=\"&MAX(B2:B6))」" #: func_minifs.xhp msgctxt "" @@ -54565,7 +54470,7 @@ "par_id15342189586295\n" "help.text" msgid "Calculates the minimum of values of the range C2:C6 that correspond to all cells of the A2:A6 range starting with \"pen\" and to all cells of the B2:B6 range except its minimum. Returns 180." -msgstr "" +msgstr "计算与 A2:A6 区域所有以「pen」开头的单元格相对应的 C2:C6 范围, 且与 B2:B6 区域所有单元格 (最小值除外) 相对应的数值的最小值。返回 180。" #: func_minifs.xhp msgctxt "" @@ -54573,7 +54478,7 @@ "hd_id8168283329426\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_minifs.xhp msgctxt "" @@ -54581,7 +54486,7 @@ "par_id50762995519951\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of the MINIFS function. For example, the above function can be rewritten as follows:" -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 MINIFS 函数的条件中使用对该单元格的引用。例如, 可以按如下方式重写上述函数:" #: func_minifs.xhp msgctxt "" @@ -54589,7 +54494,7 @@ "par_id135761606425300\n" "help.text" msgid "=MINIFS(C2:C6;A2:A6;\".*\"&E2;B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=MINIFS(C2:C6;A2:A6;\".*\"&E2;B2:B6;\"<\"&MAX(B2:B6))」" #: func_minifs.xhp msgctxt "" @@ -54597,7 +54502,7 @@ "par_id30574750215839\n" "help.text" msgid "If E2 = \"book\", the function returns 180, because the reference to the cell is substituted with its content." -msgstr "" +msgstr "如果 E2 = \"book\", 函数将返回 180, 因为对单元格的引用将替换为其内容。" #: func_minute.xhp msgctxt "" @@ -54717,7 +54622,7 @@ "par_id3149485\n" "help.text" msgid "Number is the internal date number." -msgstr "" +msgstr "「数字」是日期的内部序数。" #: func_month.xhp msgctxt "" @@ -54725,7 +54630,7 @@ "par_id3149244\n" "help.text" msgid "=MONTH(NOW()) returns the current month." -msgstr "" +msgstr "「=MONTH(NOW())」返回当前月份。" #: func_month.xhp msgctxt "" @@ -54733,7 +54638,7 @@ "par_id3154790\n" "help.text" msgid "=MONTH(C4) returns 7 if you enter 2000-07-07 to cell C4 (that date value might get formatted differently after you press Enter)." -msgstr "" +msgstr "=MONTH(C4) 如果在单元格 C4 中输入 2000-07-07，则返回 7 (当您按下「回车」键后，日期值可能会以不同的格式显示)。" #: func_networkdays.intl.xhp msgctxt "" @@ -54749,7 +54654,7 @@ "bm_id231020162321219565\n" "help.text" msgid "NETWORKDAYS.INTL function" -msgstr "" +msgstr "NETWORKDAYS.INTL 函数" #: func_networkdays.intl.xhp msgctxt "" @@ -54757,7 +54662,7 @@ "hd_id231020162211573602\n" "help.text" msgid "NETWORKDAYS.INTL" -msgstr "" +msgstr "NETWORKDAYS.INTL" #: func_networkdays.intl.xhp msgctxt "" @@ -54765,7 +54670,7 @@ "par_id231020162213393086\n" "help.text" msgid "Returns the number of workdays between a start date and an end date. There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days." -msgstr "" +msgstr "返回开始日期和结束日期之间的工作日数。有定义周末和节假日的选项。可选的周末参数 (或字符串) 可用于定义周末是哪几天 (即每周中的非工作日)。此外, 用户还可以选择定义假日列表。周末和用户定义的假日不计入工作日。" #: func_networkdays.intl.xhp msgctxt "" @@ -54773,7 +54678,7 @@ "par_id231020162249539143\n" "help.text" msgid "NETWORKDAYS.INTL(StartDate; EndDate; Weekend; Holidays)" -msgstr "" +msgstr "NETWORKDAYS.INTL(开始日期; 结束日期; 周末; 假日)" #: func_networkdays.intl.xhp msgctxt "" @@ -54781,7 +54686,7 @@ "par_id231020162249533010\n" "help.text" msgid "StartDate is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation." -msgstr "" +msgstr "开始日期 开始计算的日期。如果开始日期是一个工作日，则这一天也要计算在内。" #: func_networkdays.intl.xhp msgctxt "" @@ -54789,7 +54694,7 @@ "par_id231020162249536398\n" "help.text" msgid "EndDate is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation." -msgstr "" +msgstr "结束日期 计算结束的日期。如果结束日期是一个工作日，则这一天也要计算在内。" #: func_networkdays.intl.xhp msgctxt "" @@ -54797,7 +54702,7 @@ "par_id231020162249554032\n" "help.text" msgid "How many workdays fall between December 15, 2016 and January 14, 2017? Let the start date be located in C3 and the end date in D3. Cells F3 to J3 contain five (5) holidays for Christmas and New Year in date format: December 24, 2016; December 25, 2016; December 26, 2016; December 31, 2016; and January 1, 2017." -msgstr "" +msgstr "2016年12月15日至2017年1月14日期间有多少个工作日？令开始日期位于 C3, 结束日期位于 D3。单元格 F3 至 J3 包含五 (5) 个圣诞节和新年假期，格式为日期: 2016年12月24日;2016年12月25日;2016年12月26日;2016年12月31日; 以及2017年1月1日。" #: func_networkdays.intl.xhp msgctxt "" @@ -54805,7 +54710,7 @@ "par_id231020162249551234\n" "help.text" msgid "=NETWORKDAYS.INTL(C3;D3;;F3:J3) returns 21 workdays with default for weekend days." -msgstr "" +msgstr "「=NETWORKDAYS.INTL(C3;D3;;F3:J3)」返回 21 个工作日, 周末取默认设置。" #: func_networkdays.intl.xhp msgctxt "" @@ -54813,7 +54718,7 @@ "par_id231020162249553109\n" "help.text" msgid "=NETWORKDAYS.INTL(C3;D3;11;F3:J3) returns 24 workdays with Sunday only weekends." -msgstr "" +msgstr "「=NETWORKDAYS.INTL(C3;D3;11;F3:J3)」返回 24 个工作日, 只有周日单休。" #: func_networkdays.intl.xhp msgctxt "" @@ -54821,7 +54726,7 @@ "par_id231020162249557786\n" "help.text" msgid "Alternatively, use the weekend string “0000001” to define Sunday as the non-working day of every week." -msgstr "" +msgstr "或者, 使用周末字符串「0000001」将星期日定义为每周的非工作日。" #: func_networkdays.intl.xhp msgctxt "" @@ -54829,7 +54734,7 @@ "par_id231020162249553409\n" "help.text" msgid "=NETWORKDAYS.INTL(C3;D3;“0000001”;F3:J3) returns 24 workdays with Sunday only weekend." -msgstr "" +msgstr "「=NETWORKDAYS.INTL(C3;D3;「0000001」;F3:J3)」返回 24 个工作日, 只有周日单休。" #: func_networkdays.intl.xhp msgctxt "" @@ -54837,7 +54742,7 @@ "par_id231020162249556946\n" "help.text" msgid "The function can be used without the two optional parameters – weekday and holidays – by leaving them out:" -msgstr "" +msgstr "该函数的两个可选参数 –「工作日」与「节假日」– 可以留空:" #: func_networkdays.intl.xhp msgctxt "" @@ -54845,7 +54750,7 @@ "par_id23102016224955931\n" "help.text" msgid "=NETWORKDAYS.INTL(C3;D3) gives 22 working days." -msgstr "" +msgstr "=NETWORKDAYS.INTL(C3;D3) 给出 22 个工作日。" #: func_networkdays.intl.xhp msgctxt "" @@ -54853,7 +54758,7 @@ "par_id231020162253594361\n" "help.text" msgid "NETWORKDAYS" -msgstr "" +msgstr "NETWORKDAYS" #: func_networkdays.intl.xhp msgctxt "" @@ -54861,7 +54766,7 @@ "par_id241020160012187036\n" "help.text" msgid "WORKDAY.INTL" -msgstr "" +msgstr "WORKDAY.INTL" #: func_networkdays.intl.xhp msgctxt "" @@ -54869,7 +54774,7 @@ "par_id241030160012187036\n" "help.text" msgid "WORKDAYS" -msgstr "" +msgstr "WORKDAYS" #: func_networkdays.intl.xhp msgctxt "" @@ -54877,7 +54782,7 @@ "par_id23102016225717242\n" "help.text" msgid "Date functions" -msgstr "" +msgstr "日期函数" #: func_networkdays.xhp msgctxt "" @@ -54901,7 +54806,7 @@ "hd_id3151254\n" "help.text" msgid "NETWORKDAYS" -msgstr "" +msgstr "NETWORKDAYS" #: func_networkdays.xhp msgctxt "" @@ -54909,7 +54814,7 @@ "par_id3153788\n" "help.text" msgid "Returns the number of workdays between a start date and an end date. Holidays can be deducted." -msgstr "" +msgstr "返回「开始日期和结束日期」之间的工作日天数。可以扣除假期。" #: func_networkdays.xhp msgctxt "" @@ -54917,7 +54822,7 @@ "par_id3145775\n" "help.text" msgid "NETWORKDAYS(StartDate; EndDate; Holidays; Workdays)" -msgstr "" +msgstr "NETWORKDAYS(开始日期; 结束日期; 节假日; 工作日)" #: func_networkdays.xhp msgctxt "" @@ -54925,7 +54830,7 @@ "par_id3153885\n" "help.text" msgid "StartDate is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation." -msgstr "" +msgstr "开始日期 开始计算的日期。如果开始日期是一个工作日，则这一天也要计算在内。" #: func_networkdays.xhp msgctxt "" @@ -54933,7 +54838,7 @@ "par_id3151110\n" "help.text" msgid "EndDate is the date up until when the calculation is carried out. If the end date is a workday, the day is included in the calculation." -msgstr "" +msgstr "结束日期 计算结束的日期。如果结束日期是一个工作日，则这一天也要计算在内。" #: func_networkdays.xhp msgctxt "" @@ -54941,7 +54846,7 @@ "par_id3154115\n" "help.text" msgid "Holidays is an optional list of holidays. These are non-working days. Enter a cell range in which the holidays are listed individually." -msgstr "" +msgstr "「假日」是可选的假日列表。列表中都是非工作日。输入单元格区域，其中假日分别列出。" #: func_networkdays.xhp msgctxt "" @@ -54949,7 +54854,7 @@ "par_id160920161749585013\n" "help.text" msgid "Workdays is an optional list of number values defining standard work week. This list starts by Sunday, workdays are indicated by zero and non-working days by non-zero value." -msgstr "" +msgstr "「工作日」可选列表，定义标准工作周的数字值。此列表从星期日开始, 工作日以零表示, 非工作日以非零值表示。" #: func_networkdays.xhp msgctxt "" @@ -54957,7 +54862,7 @@ "par_id3154661\n" "help.text" msgid "How many workdays fall between 2001-12-15 and 2002-01-15? The start date is located in C3 and the end date in D3. Cells F3 to J3 contain the following Christmas and New Year holidays: \"2001-12-24\", \"2001-12-25\", \"2001-12-26\", \"2001-12-31\", \"2002-01-01\"." -msgstr "" +msgstr "2001-12-15 至 2002-01-15 期间有多少个工作日？开始日期位于 C3, 结束日期位于 D3。单元 F3 至 J3 包含以下圣诞节和新年假期: \"2001-12-24\", \"2001-12-25\", \"2001-12-26\", \"2001-12-31\", \"2002-01-01\"。" #: func_networkdays.xhp msgctxt "" @@ -54965,7 +54870,7 @@ "par_id3147328\n" "help.text" msgid "=NETWORKDAYS(C3;D3;F3:J3) returns 17 workdays." -msgstr "" +msgstr "「=NETWORKDAYS(C3;D3;F3:J3)」返回 17 个工作日。" #: func_networkdays.xhp msgctxt "" @@ -54973,7 +54878,7 @@ "par_id160920161751233621\n" "help.text" msgid "How many workdays fall between September 12nd and 25th in 2016 if only Mondays, Tuesdays and Wednesdays are considered as workdays?" -msgstr "" +msgstr "如果只有周一、周二和周三被视为工作日, 2016年9月12日至25日期间有多少个工作日?" #: func_networkdays.xhp msgctxt "" @@ -54981,7 +54886,7 @@ "par_id160920161751235483\n" "help.text" msgid "=NETWORKDAYS(DATE(2016;9;12); DATE(2016;9;25); ; {1;0;0;0;1;1;1}) returns 6 workdays." -msgstr "" +msgstr "「=NETWORKDAYS(DATE(2016;9;12); DATE(2016;9;25); ; {1;0;0;0;1;1;1})」返回 6 个工作日。" #: func_networkdays.xhp msgctxt "" @@ -54989,7 +54894,7 @@ "par_id241020160012187036\n" "help.text" msgid "NETWORKDAYS.INTL" -msgstr "" +msgstr "NETWORKDAYS.INTL" #: func_networkdays.xhp msgctxt "" @@ -54997,7 +54902,7 @@ "par_id241070160012187036\n" "help.text" msgid "WORKDAY.INTL" -msgstr "" +msgstr "WORKDAY.INTL" #: func_networkdays.xhp msgctxt "" @@ -55005,7 +54910,7 @@ "par_id241030160012187036\n" "help.text" msgid "WORKDAYS" -msgstr "" +msgstr "WORKDAYS" #: func_networkdays.xhp msgctxt "" @@ -55013,7 +54918,7 @@ "par_id23102016225717242\n" "help.text" msgid "Date functions" -msgstr "" +msgstr "日期函数" #: func_now.xhp msgctxt "" @@ -55101,7 +55006,7 @@ "par_id3145087\n" "help.text" msgid "Convert text to number, in a locale-independent way." -msgstr "" +msgstr "以与区域设置无关的方式将文本转换为数字。" #: func_numbervalue.xhp msgctxt "" @@ -55109,7 +55014,7 @@ "par_id3149281\n" "help.text" msgid "Constraints: LEN(decimal_separator) = 1, decimal_separator shall not appear in group_separator" -msgstr "" +msgstr "限制: LEN(小数分隔符) = 1,「小数分隔符」不应出现在「分组分隔符」中" #: func_numbervalue.xhp msgctxt "" @@ -55117,7 +55022,7 @@ "par_id3149268\n" "help.text" msgid "NUMBERVALUE(\"Text\";decimal_separator;group_separator)" -msgstr "" +msgstr "NUMBERVALUE(\"Text\";decimal_separator;group_separator)" #: func_numbervalue.xhp msgctxt "" @@ -55133,7 +55038,7 @@ "par_id3154820\n" "help.text" msgid "decimal_separator (optional) defines the character used as the decimal separator." -msgstr "" +msgstr "「小数点分隔符」(可选) 定义用作小数点分隔符的字符。" #: func_numbervalue.xhp msgctxt "" @@ -55141,7 +55046,7 @@ "par_id3154821\n" "help.text" msgid "group_separator (optional) defines the character(s) used as the group separator." -msgstr "" +msgstr "「分组分隔符」(可选) 定义用作分组分隔符的字符。" #: func_numbervalue.xhp msgctxt "" @@ -55149,7 +55054,7 @@ "par_id3155841\n" "help.text" msgid "=NUMBERVALUE(\"123.456\";\".\";\",\") yields 123.456" -msgstr "" +msgstr "「=NUMBERVALUE(\"123.456\";\".\";\",\")」得到 123.456" #: func_rawsubtract.xhp msgctxt "" @@ -55181,7 +55086,7 @@ "par_2016112109232\n" "help.text" msgid "Subtracts a set of numbers and gives the result without eliminating small roundoff errors." -msgstr "" +msgstr "减去一组数字并给出结果, 而不消除小的舍入误差。" #: func_rawsubtract.xhp msgctxt "" @@ -55189,7 +55094,7 @@ "par_2016112109233\n" "help.text" msgid "RAWSUBTRACT(Minuend, Subtrahend1, Subtrahend2, ...)" -msgstr "" +msgstr "RAWSUBTRACT(Minuend, Subtrahend1, Subtrahend2, ...)" #: func_rawsubtract.xhp msgctxt "" @@ -55197,7 +55102,7 @@ "par_2016112109234\n" "help.text" msgid "Subtracts the subtrahend(s) from the minuend without eliminating roundoff errors. The function should be called with at least two parameters." -msgstr "" +msgstr "从「minuend」中减去「subtrahend」, 而不消除舍入错误。应至少使用两个参数调用该函数。" #: func_rawsubtract.xhp msgctxt "" @@ -55229,7 +55134,7 @@ "bm_id831542233029549\n" "help.text" msgid "REGEX function regular expressions;extracting in spreadsheets regular expressions;REGEX function" -msgstr "" +msgstr "REGEX 函数正则表达式; 在电子表格中提取正则表达式;REGEX 函数" #: func_regex.xhp msgctxt "" @@ -55237,7 +55142,7 @@ "hd_id961542230672100\n" "help.text" msgid "REGEX" -msgstr "" +msgstr "REGEX" #: func_regex.xhp msgctxt "" @@ -55245,7 +55150,7 @@ "par_id541542230672101\n" "help.text" msgid "Matches and extracts or optionally replaces text using regular expressions." -msgstr "" +msgstr "使用正则表达式匹配、提取或选择性地替换文本。" #: func_regex.xhp msgctxt "" @@ -55253,7 +55158,7 @@ "par_id701542231253817\n" "help.text" msgid "REGEX( Text ; Expression [ ; [ Replacement ] [ ; Flags|Occurrence ] ] )" -msgstr "" +msgstr "REGEX( 文本 ; 表达式 [ ; [ 替换] [ ; 标记|次数 ] ] )" #: func_regex.xhp msgctxt "" @@ -55261,7 +55166,7 @@ "par_id621542232197446\n" "help.text" msgid "Text: A text or reference to a cell where the regular expression is to be applied." -msgstr "" +msgstr "「文本」: 要应用正则表达式的文本或对单元格的引用。" #: func_regex.xhp msgctxt "" @@ -55269,7 +55174,7 @@ "par_id211542232209275\n" "help.text" msgid "Expression: A text representing the regular expression, using ICU regular expressions. If there is no match and Replacement is not given, #N/A is returned." -msgstr "" +msgstr "「表达式」: 表示正则表达式的文本, 使用「 ICU 正则表达式」愈发。如果没有匹配项, 并且未给出替换, 则返回 #N/A。" #: func_regex.xhp msgctxt "" @@ -55277,7 +55182,7 @@ "par_id581542232755604\n" "help.text" msgid "Replacement: Optional. The replacement text and references to capture groups. If there is no match, Text is returned unmodified." -msgstr "" +msgstr "「替换」: 可选。替换文本以及对捕获组的引用。如果没有匹配项, 则「文本」将原样返回。" #: func_regex.xhp msgctxt "" @@ -55285,7 +55190,7 @@ "par_id421542232246840\n" "help.text" msgid "Flags: Optional. \"g\" replaces all matches of Expression in Text, not extracted. If there is no match, Text is returned unmodified." -msgstr "" +msgstr "「标记」: 可选。「g」替换文本中「表达式」的所有匹配项, 而不是部分。如果没有匹配项, 文本将原样返回。" #: func_regex.xhp msgctxt "" @@ -55293,7 +55198,7 @@ "par_id421542232246841\n" "help.text" msgid "Occurrence: Optional. Number to indicate which match of Expression in Text is to be extracted or replaced. If there is no match and Replacement is not given, #N/A is returned. If there is no match and Replacement is given, Text is returned unmodified. If Occurrence is 0, Text is returned unmodified." -msgstr "" +msgstr "「次数」: 可选。数字，指定要提取或替换文本中「表达式」的匹配项的次数。如果没有匹配项, 并且未给出替换, 则返回 #N/A 。如果没有匹配项且给出了「替换, 则原样返回「文本」。如果次数」为 0, 则原样返回「文本」。" #: func_regex.xhp msgctxt "" @@ -55301,7 +55206,7 @@ "par_id371542291684176\n" "help.text" msgid "=REGEX(\"123456ABCDEF\";\"[:digit:]\";\"Z\") returns \"Z23456ABCDEF\", where the first match of a digit is replaced by \"Z\"." -msgstr "" +msgstr "「=REGEX(\"123456ABCDEF\";\"[:digit:]\";\"Z\")」返回「Z23456ABCDEF」, 其中匹配到到第一个数字被替换为「Z」。" #: func_regex.xhp msgctxt "" @@ -55309,7 +55214,7 @@ "par_id891542291697194\n" "help.text" msgid "=REGEX(\"123456ABCDEF\";\"[:digit:]\";\"Z\";\"g\") returns \"ZZZZZZABCDEF\", where all digits were replaced by \"Z\"." -msgstr "" +msgstr "「=REGEX(\"123456ABCDEF\";\"[:digit:]\";\"Z\";\"g\")」返回「ZZZZZZABCDEF」，其中所有数字都被替换为「Z」。" #: func_regex.xhp msgctxt "" @@ -55317,7 +55222,7 @@ "par_id21542291705695\n" "help.text" msgid "=REGEX(\"123456ABCDEF\";\"[126]\";\"\";\"g\") returns \"345ABCDEF\", where any occurrence of \"1\", \"2\" or \"6\" is replaced by the empty string, thus deleted." -msgstr "" +msgstr "「=REGEX(\"123456ABCDEF\";\"[126]\";\"\";\"g\")」返回「345ABCDEF」，其中出现的所有「1」「2」或「6」都被空字符串替换, 因此它们被删去。" #: func_regex.xhp msgctxt "" @@ -55325,7 +55230,7 @@ "par_id371542291684177\n" "help.text" msgid "=REGEX(\"axbxcxd\";\".x\";;2) returns \"bx\", the second match of \".x\"." -msgstr "" +msgstr "「=REGEX(\"axbxcxd\";\".x\";;2)」返回「bx」「.x」的第二次匹配。" #: func_regex.xhp msgctxt "" @@ -55333,7 +55238,7 @@ "par_id371542291684178\n" "help.text" msgid "=REGEX(\"axbxcxd\";\"(.)x\";\"$1y\";2) returns \"axbycxd\", the second match of \"(.)x\" (i.e. \"bx\") replaced with the captured group of one character (i.e. \"b\") followed by \"y\"." -msgstr "" +msgstr "「=REGEX(\"axbxcxd\";\"(.)x\";\"$1y\";2)」返回「axbycxd」，其中「(.)x」的第二次匹配 (即「bx」) 被替换为单字符捕获组「即「b」」后跟「y」。" #: func_regex.xhp msgctxt "" @@ -55341,7 +55246,7 @@ "par_id711542233602553\n" "help.text" msgid "List of regular expressions" -msgstr "" +msgstr "正则表达式列表" #: func_regex.xhp msgctxt "" @@ -55349,7 +55254,7 @@ "par_id431542233650614\n" "help.text" msgid "ICU regular expressions" -msgstr "" +msgstr "ICU 正则表达式" #: func_roundsig.xhp msgctxt "" @@ -55365,7 +55270,7 @@ "bm_id151519154954070\n" "help.text" msgid "ROUNDSIG Function" -msgstr "" +msgstr "ROUNDSIG 函数" #: func_roundsig.xhp msgctxt "" @@ -55373,7 +55278,7 @@ "hd_id351519154702177\n" "help.text" msgid "ROUNDSIG" -msgstr "" +msgstr "ROUNDSIG" #: func_roundsig.xhp msgctxt "" @@ -55381,7 +55286,7 @@ "par_id921519154702177\n" "help.text" msgid "Returns a number rounded to a specified number of significant decimal digits of its normalized floating point notation." -msgstr "" +msgstr "返回舍入到指定有效数位的数字，以规范化浮点表示法格式返回。" #: func_roundsig.xhp msgctxt "" @@ -55389,7 +55294,7 @@ "par_id291519155534115\n" "help.text" msgid "ROUNDSIG( Value; Digits )" -msgstr "" +msgstr "ROUNDSIG( 数值; 数位 )" #: func_roundsig.xhp msgctxt "" @@ -55397,7 +55302,7 @@ "par_id51519155217204\n" "help.text" msgid "Value: the number to be rounded." -msgstr "" +msgstr "「值」: 要舍入的数字。" #: func_roundsig.xhp msgctxt "" @@ -55405,7 +55310,7 @@ "par_id321519155209912\n" "help.text" msgid "Digits: the number of decimal places to round." -msgstr "" +msgstr "「数位」: 要舍入的小数位数。" #: func_roundsig.xhp msgctxt "" @@ -55413,7 +55318,7 @@ "par_id371519155264297\n" "help.text" msgid "Digits must be an integer greater than 0." -msgstr "" +msgstr "数位必须是大于 0 的整数。" #: func_roundsig.xhp msgctxt "" @@ -55453,7 +55358,7 @@ "par_id51519156941987\n" "help.text" msgid "See also ROUND, MROUND, ROUNDUP, ROUNDDOWN." -msgstr "" +msgstr "参见 ROUND, MROUND, ROUNDUP, ROUNDDOWN。" #: func_second.xhp msgctxt "" @@ -55597,7 +55502,7 @@ "par_id1102201618185326\n" "help.text" msgid "SKEWP(Number1; Number2) always returns zero, if Number1 and Number2 results in two numbers." -msgstr "" +msgstr "如果「数字1」和「数字2」产生两个数字, 则SKEWP(数字1; 数字2)始终返回零。" #: func_skewp.xhp msgctxt "" @@ -55613,7 +55518,7 @@ "par_id14337286612130\n" "help.text" msgid "SKEW" -msgstr "" +msgstr "SKEW" #: func_sumifs.xhp msgctxt "" @@ -55645,7 +55550,7 @@ "par_id659756597565975\n" "help.text" msgid "Returns the sum of the values of cells in a range that meets multiple criteria in multiple ranges." -msgstr "" +msgstr "返回多个区域中满足多个条件的区域中的单元格值之和。" #: func_sumifs.xhp msgctxt "" @@ -55653,7 +55558,7 @@ "par_id11655988824213\n" "help.text" msgid "SUMIFS()" -msgstr "" +msgstr "SUMIFS()" #: func_sumifs.xhp msgctxt "" @@ -55661,7 +55566,7 @@ "par_id59901690530236\n" "help.text" msgid "Func_Range – required argument. It is a range of cells, a name of a named range or a label of a column or a row containing values for calculating the sum." -msgstr "" +msgstr "函数范围 – 必填参数。它是一个单元格区域、命名区域的名称或列/行标签, 包含用于计算总和的值。" #: func_sumifs.xhp msgctxt "" @@ -55669,7 +55574,7 @@ "hd_id193452436229521\n" "help.text" msgid "Simple usage" -msgstr "" +msgstr "简单用法" #: func_sumifs.xhp msgctxt "" @@ -55685,7 +55590,7 @@ "par_id28647227259438\n" "help.text" msgid "Calculates the sum of values of the range B2:B6 that are greater than or equal to 20. Returns 75, because the fifth row does not meet the criterion." -msgstr "" +msgstr "计算范围 B2:B6 中大于或等于 20 的数值的总和。返回 75。因为第五行不符合条件。" #: func_sumifs.xhp msgctxt "" @@ -55701,7 +55606,7 @@ "par_id189772445525114\n" "help.text" msgid "Calculates the sum of values of the range C2:C6 that are greater than 70 and correspond to cells of the B2:B6 range with values greater than or equal to 20. Returns 275, because the second and the fifth rows do not meet at least one criterion." -msgstr "" +msgstr "计算 C2:C6 范围中大于 70 且 B2:B6 范围的对应单元格的数值大于或等于 20 的数值的总和。返回 275, 因为第二行和第五行不满足至少一个条件。" #: func_sumifs.xhp msgctxt "" @@ -55709,7 +55614,7 @@ "hd_id30455222431067\n" "help.text" msgid "Using regular expressions and nested functions" -msgstr "" +msgstr "使用正则表达式和嵌套函数" #: func_sumifs.xhp msgctxt "" @@ -55717,7 +55622,7 @@ "par_id307691022525348\n" "help.text" msgid "=SUMIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=SUMIFS(C2:C6;B2:B6;\">\"&MIN(B2:B6);B2:B6;\"<\"&MAX(B2:B6))」" #: func_sumifs.xhp msgctxt "" @@ -55725,7 +55630,7 @@ "par_id27619246864839\n" "help.text" msgid "Calculates the sum of values of the range C2:C6 that correspond to all values of the range B2:B6 except its minimum and maximum. Returns 255, because the third and the fifth rows do not meet at least one criterion." -msgstr "" +msgstr "计算范围 C2:C6 中对应于范围 B2:B6 的所有值 (最小值和最大值除外) 的数值的总和。返回 255, 因为第三行和第五行不满足至少一个条件。" #: func_sumifs.xhp msgctxt "" @@ -55733,7 +55638,7 @@ "par_id220502883332563\n" "help.text" msgid "=SUMIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=SUMIFS(C2:C6;A2:A6;\"pen.*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_sumifs.xhp msgctxt "" @@ -55741,7 +55646,7 @@ "par_id15342189586295\n" "help.text" msgid "Calculates the sum of values of the range C2:C6 that correspond to all cells of the A2:A6 range starting with \"pen\" and to all cells of the B2:B6 range except its maximum. Returns 65, because only second row meets all criteria." -msgstr "" +msgstr "计算与 A2:A6 区域所有以「pen」开头的单元格相对应的 C2:C6 范围, 且与 B2:B6 区域所有单元格 (最大值除外) 相对应的数值的最大值。返回 65, 因为只有第二行满足所有条件。" #: func_sumifs.xhp msgctxt "" @@ -55749,7 +55654,7 @@ "hd_id8168283329426\n" "help.text" msgid "Reference to a cell as a criterion" -msgstr "" +msgstr "引用单元格作为条件" #: func_sumifs.xhp msgctxt "" @@ -55757,7 +55662,7 @@ "par_id50762995519951\n" "help.text" msgid "If you need to change a criterion easily, you may want to specify it in a separate cell and use a reference to this cell in the condition of the SUMIFS function. For example, the above function can be rewritten as follows:" -msgstr "" +msgstr "如果您需要轻松地更改一个条件, 可以考虑在单独的单元格中指定条件, 并在 SUMIFS 函数的条件中使用对该单元格的引用。例如, 可以按如下方式重写上述函数:" #: func_sumifs.xhp msgctxt "" @@ -55765,7 +55670,7 @@ "par_id135761606425300\n" "help.text" msgid "=SUMIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))" -msgstr "" +msgstr "「=SUMIFS(C2:C6;A2:A6;E2&\".*\";B2:B6;\"<\"&MAX(B2:B6))」" #: func_sumifs.xhp msgctxt "" @@ -55773,7 +55678,7 @@ "par_id30574750215839\n" "help.text" msgid "If E2 = pen, the function returns 65, because the link to the cell is substituted with its content." -msgstr "" +msgstr "如果 E2 = pen, 该函数将返回 65, 因为指向单元格的链接将替换为其内容。" #: func_time.xhp msgctxt "" @@ -56013,7 +55918,7 @@ "hd_id3149012\n" "help.text" msgid "WEBSERVICE" -msgstr "" +msgstr "WEBSERVICE" #: func_webservice.xhp msgctxt "" @@ -56021,7 +55926,7 @@ "par_id3149893\n" "help.text" msgid "Get some web content from a URI." -msgstr "" +msgstr "从 URI 获取一些 web 内容。" #: func_webservice.xhp msgctxt "" @@ -56029,7 +55934,7 @@ "par_id3154844\n" "help.text" msgid "WEBSERVICE(URI)" -msgstr "" +msgstr "WEBSERVICE(URI)" #: func_webservice.xhp msgctxt "" @@ -56037,7 +55942,7 @@ "par_id3147469\n" "help.text" msgid "URI: URI text of the web service." -msgstr "" +msgstr "「URI」: web 服务的 URI 文本。" #: func_webservice.xhp msgctxt "" @@ -56045,7 +55950,7 @@ "par_id3146142\n" "help.text" msgid "=WEBSERVICE(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\")" -msgstr "" +msgstr "「=WEBSERVICE(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\")」" #: func_webservice.xhp msgctxt "" @@ -56053,7 +55958,7 @@ "par_id3146143\n" "help.text" msgid "Returns the web page content of \"https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\"." -msgstr "" +msgstr "返回「https://wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss」的网页内容。" #: func_webservice.xhp msgctxt "" @@ -56069,7 +55974,7 @@ "hd_id2949012\n" "help.text" msgid "FILTERXML" -msgstr "" +msgstr "FILTERXML" #: func_webservice.xhp msgctxt "" @@ -56077,7 +55982,7 @@ "par_id2949893\n" "help.text" msgid "Apply a XPath expression to a XML document." -msgstr "" +msgstr "对 XML 文档应用 XPath 表达式。" #: func_webservice.xhp msgctxt "" @@ -56085,7 +55990,7 @@ "par_id2954844\n" "help.text" msgid "FILTERXML(XML Document; XPath expression)" -msgstr "" +msgstr "FILTERXML(XML 文档; XPath 表达式)" #: func_webservice.xhp msgctxt "" @@ -56093,7 +55998,7 @@ "par_id2947469\n" "help.text" msgid "XML Document (required): String containing a valid XML stream." -msgstr "" +msgstr "「XML 文档 (必填)」: 包含有效 XML 流的字符串。" #: func_webservice.xhp msgctxt "" @@ -56101,7 +56006,7 @@ "par_id2847469\n" "help.text" msgid "XPath expression (required): String containing a valid XPath expression." -msgstr "" +msgstr "「XPath 表达式 (必填)」: 包含有效 XPath 表达式的字符串。" #: func_webservice.xhp msgctxt "" @@ -56109,7 +56014,7 @@ "par_id2946142\n" "help.text" msgid "=FILTERXML(WEBSERVICE(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\");\"//lastBuildDate\")" -msgstr "" +msgstr "「=FILTERXML(WEBSERVICE(\"wiki.documentfoundation.org/api.php?hidebots=1&days=7&limit=50&action=feedrecentchanges&feedformat=rss\");\"//lastBuildDate\")」" #: func_webservice.xhp msgctxt "" @@ -56117,7 +56022,7 @@ "par_id2946143\n" "help.text" msgid "Returns information on the last build date of the wiki." -msgstr "" +msgstr "返回有关 wiki 最新构建日期的信息。" #: func_webservice.xhp msgctxt "" @@ -56125,7 +56030,7 @@ "bm_id811517136840444\n" "help.text" msgid "ENCODEURL function" -msgstr "" +msgstr "ENCODEURL 函数" #: func_webservice.xhp msgctxt "" @@ -56133,7 +56038,7 @@ "hd_id671517132649769\n" "help.text" msgid "ENCODEURL" -msgstr "" +msgstr "ENCODEURL" #: func_webservice.xhp msgctxt "" @@ -56141,7 +56046,7 @@ "par_id51517132649769\n" "help.text" msgid "Returns a URL-encoded string." -msgstr "" +msgstr "返回 URL 编码的字符串。" #: func_webservice.xhp msgctxt "" @@ -56149,7 +56054,7 @@ "par_id721517134647880\n" "help.text" msgid "Use this function to transform text with symbols of national alphabets (for example accented characters, non-ASCII alphabets or Asian words) to a string of URL-standard symbols." -msgstr "" +msgstr "使用此函数可以将带有地区性字母表符号 (例如重音字符、非 ASCII 字母表或亚洲文字) 的文本转换为符合 URL 符号标准的字符串。" #: func_webservice.xhp msgctxt "" @@ -56213,7 +56118,7 @@ "par_id3154228\n" "help.text" msgid "Returns the day of the week for the given date value. The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. For other types, see the table below." -msgstr "" +msgstr "返回指定日期值是一周中的哪一天。如果未指定「类型」或指定「类型」= 1, 则返回的天数是介于 1 (星期日) 和 7 (星期六) 之间的整数。对于其他类型, 请参阅下表。" #: func_weekday.xhp msgctxt "" @@ -56237,7 +56142,7 @@ "par_id3154394\n" "help.text" msgid "Type is optional and determines the type of calculation." -msgstr "" +msgstr "「类型」可选, 确定计算的类型。" #: func_weekday.xhp msgctxt "" @@ -56245,7 +56150,7 @@ "par_id050220170615596613\n" "help.text" msgid "Type" -msgstr "" +msgstr "类型" #: func_weekday.xhp msgctxt "" @@ -56253,7 +56158,7 @@ "par_id05022017061559141\n" "help.text" msgid "Weekday number returned" -msgstr "" +msgstr "返回的工作日序号" #: func_weekday.xhp msgctxt "" @@ -56261,7 +56166,7 @@ "par_id050220170615599995\n" "help.text" msgid "1 or omitted" -msgstr "" +msgstr "1 或忽略" #: func_weekday.xhp msgctxt "" @@ -56269,7 +56174,7 @@ "par_id050220170615597231\n" "help.text" msgid "1 (Sunday) through 7 (Saturday). For compatibility with Microsoft Excel." -msgstr "" +msgstr "1 (星期日) 至 7 (星期六)。用于与 Microsoft Excel 的兼容性。" #: func_weekday.xhp msgctxt "" @@ -56277,7 +56182,7 @@ "par_id050220170615596260\n" "help.text" msgid "1 (Monday) through 7 (Sunday)." -msgstr "" +msgstr "1 (星期一) 至 7 (星期日)。" #: func_weekday.xhp msgctxt "" @@ -56285,7 +56190,7 @@ "par_id050220170615597630\n" "help.text" msgid "0 (Monday) through 6 (Sunday)" -msgstr "" +msgstr "0 (星期一) 至 6 (星期日)" #: func_weekday.xhp msgctxt "" @@ -56293,7 +56198,7 @@ "par_id050220170615592023\n" "help.text" msgid "1 (Monday) through 7 (Sunday)." -msgstr "" +msgstr "1 (星期一) 至 7 (星期日)。" #: func_weekday.xhp msgctxt "" @@ -56301,7 +56206,7 @@ "par_id050220170615591349\n" "help.text" msgid "1 (Tuesday) through 7 (Monday)." -msgstr "" +msgstr "1 (星期二) 至 7 (星期一)。" #: func_weekday.xhp msgctxt "" @@ -56309,7 +56214,7 @@ "par_id050220170615593664\n" "help.text" msgid "1 (Wednesday) through 7 (Tuesday)." -msgstr "" +msgstr "1 (星期三) 至 7 (星期二)。" #: func_weekday.xhp msgctxt "" @@ -56317,7 +56222,7 @@ "par_id050220170615599110\n" "help.text" msgid "1 (Thursday) through 7 (Wednesday)." -msgstr "" +msgstr "1 (星期四) 至 7 (星期三)。" #: func_weekday.xhp msgctxt "" @@ -56325,7 +56230,7 @@ "par_id05022017061600535\n" "help.text" msgid "1 (Friday) through 7 (Thursday)." -msgstr "" +msgstr "1 (星期五) 至 7 (星期四)。" #: func_weekday.xhp msgctxt "" @@ -56333,7 +56238,7 @@ "par_id050220170616003219\n" "help.text" msgid "1 (Saturday) through 7 (Friday)." -msgstr "" +msgstr "1 (星期六) 至 7 (星期五)。" #: func_weekday.xhp msgctxt "" @@ -56341,7 +56246,7 @@ "par_id050220170616002095\n" "help.text" msgid "1 (Sunday) through 7 (Saturday)." -msgstr "" +msgstr "1 (星期日) 至 7 (星期六)。" #: func_weekday.xhp msgctxt "" @@ -56349,7 +56254,7 @@ "par_id3156188\n" "help.text" msgid "These values apply only to the standard date format that you select under %PRODUCTNAME - PreferencesTools - Options- %PRODUCTNAME Calc - Calculate." -msgstr "" +msgstr "这些值仅适用于您在「%PRODUCTNAME - 偏好设置工具 - 选项- %PRODUCTNAME Calc - 计算」选择的标准日期格式。" #: func_weekday.xhp msgctxt "" @@ -56357,7 +56262,7 @@ "par_id3150317\n" "help.text" msgid "=WEEKDAY(\"2000-06-14\") returns 4 (the Type parameter is missing, therefore the standard count is used. The standard count starts with Sunday as day number 1. June 14, 2000 was a Wednesday and therefore day number 4)." -msgstr "" +msgstr "「=WEEKDAY(\"2000-06-14\")」返回 4 (「类型」参数缺失, 因此使用标准计数。标准计数将星期日作为一周的第 1 天。2000年6月14日是星期三, 因此是第 4 天)。" #: func_weekday.xhp msgctxt "" @@ -56365,7 +56270,7 @@ "par_id3153174\n" "help.text" msgid "=WEEKDAY(\"1996-07-24\";2) returns 3 (the Type parameter is 2, therefore Monday is day number 1. July 24, 1996 was a Wednesday and therefore day number 3)." -msgstr "" +msgstr "「=WEEKDAY(\"1996-07-24\";2)」返回 3 (「类型」参数为 2, 因此星期一是一周的第 1 天。1996年7月24日是星期三, 因此是第 3 天)。" #: func_weekday.xhp msgctxt "" @@ -56373,7 +56278,7 @@ "par_id3153525\n" "help.text" msgid "=WEEKDAY(\"1996-07-24\";1) returns 4 (the Type parameter is 1, therefore Sunday is day number 1. July 24, 1996 was a Wednesday and therefore day number 4)." -msgstr "" +msgstr "「=WEEKDAY(\"1996-07-24\";1)」返回 4 (「类型」参数为 1, 因此星期日是一周的第 1 天。1996年7月24日是星期三, 因此是第 4 天)。" #: func_weekday.xhp msgctxt "" @@ -56381,7 +56286,7 @@ "par_id050220170616006699\n" "help.text" msgid "=WEEKDAY(\"2017-05-02\";14) returns 6 (the Type parameter is 14, therefore Thursday is day number 1. May 2, 2017 was a Tuesday and therefore day number 6)" -msgstr "" +msgstr "「=WEEKDAY(\"2017-05-02\";14)」返回 6 (「类型」参数为 14, 因此星期四是一周的第 1 天。2017年5月2日是星期二, 因此是第 6 天)" #: func_weekday.xhp msgctxt "" @@ -56397,7 +56302,7 @@ "par_id3150588\n" "help.text" msgid "To obtain a function indicating whether a day in A1 is a business day, use the IF and WEEKDAY functions as follows:
IF(WEEKDAY(A1;2)<6;\"Business day\";\"Weekend\")" -msgstr "" +msgstr "若要知道 A1 中的某一天是否为工作日, 请使用 IF 和 WEEKDAY 函数, 如下所示:
IF(WEEKDAY(A1;2)<6;\"工作日\";\"周末\")" #: func_weeknum.xhp msgctxt "" @@ -56413,7 +56318,7 @@ "bm_id3159161\n" "help.text" msgid "WEEKNUM function" -msgstr "WEEKNUM" +msgstr "WEEKNUM 函数" #: func_weeknum.xhp msgctxt "" @@ -56429,7 +56334,7 @@ "par_id3149770\n" "help.text" msgid "WEEKNUM calculates the week number of the year for the internal date value as defined in ODF OpenFormula and compatible with other spreadsheet applications." -msgstr "" +msgstr "WEEKNUM 按 ODF OpenFormula 定义的内部日期值计算一年中的周数，与其他电子表格应用程序兼容。" #: func_weeknum.xhp msgctxt "" @@ -56437,7 +56342,7 @@ "par_id3147220\n" "help.text" msgid "Supported are two week numbering systems:" -msgstr "" +msgstr "支持两周编号系统:" #: func_weeknum.xhp msgctxt "" @@ -56445,7 +56350,7 @@ "par_id851535122363435\n" "help.text" msgid "System" -msgstr "" +msgstr "系统" #: func_weeknum.xhp msgctxt "" @@ -56453,7 +56358,7 @@ "par_id691535122363437\n" "help.text" msgid "System 1" -msgstr "" +msgstr "系统 1" #: func_weeknum.xhp msgctxt "" @@ -56461,7 +56366,7 @@ "par_id3147221\n" "help.text" msgid "The week containing January 1 is the first week of the year, and is numbered week 1." -msgstr "" +msgstr "包含1月1日的一周是一年中的第一周, 编号为第 1 周。" #: func_weeknum.xhp msgctxt "" @@ -56469,7 +56374,7 @@ "par_id741535122455285\n" "help.text" msgid "System 2" -msgstr "" +msgstr "系统 2" #: func_weeknum.xhp msgctxt "" @@ -56477,7 +56382,7 @@ "par_id3147222\n" "help.text" msgid "The week containing the first Thursday of the year is the first week of the year, and is numbered week 1. That means that week number 1 of any year is the week that contains January 4th. ISO 8601 defines this system and that the week starts on Monday." -msgstr "" +msgstr "包含一年中第一个星期四的一周是一年中的第一周，编号为第 1 周。这意味着任何一年的第 1 周都包含1月4日。ISO 8601 定义了该系统, 并且规定一周从星期一开始。" #: func_weeknum.xhp msgctxt "" @@ -56493,7 +56398,7 @@ "par_id3147511\n" "help.text" msgid "Number is the internal date number." -msgstr "「value」是日期的内部序列数。" +msgstr "「数字」是日期的内部序数。" #: func_weeknum.xhp msgctxt "" @@ -56501,7 +56406,7 @@ "par_id3154269\n" "help.text" msgid "Mode sets the start of the week and the week numbering system. This parameter is optional, if omitted the default value is 1." -msgstr "" +msgstr "「模式」设置每周开始的日子和周编号系统。此参数可选, 如果省略, 默认值为 1。" #: func_weeknum.xhp msgctxt "" @@ -56509,7 +56414,7 @@ "par_id961535122993923\n" "help.text" msgid "System" -msgstr "" +msgstr "系统" #: func_weeknum.xhp msgctxt "" @@ -56517,7 +56422,7 @@ "par_id151535122633826\n" "help.text" msgid "Mode" -msgstr "" +msgstr "模式" #: func_weeknum.xhp msgctxt "" @@ -56525,7 +56430,7 @@ "par_id231535122633827\n" "help.text" msgid "Day of the week" -msgstr "" +msgstr "星期几" #: func_weeknum.xhp msgctxt "" @@ -56533,7 +56438,7 @@ "par_id531535124180000\n" "help.text" msgid "System 1" -msgstr "" +msgstr "系统 1" #: func_weeknum.xhp msgctxt "" @@ -56541,7 +56446,7 @@ "par_id351535122633828\n" "help.text" msgid "Sunday" -msgstr "" +msgstr "星期日" #: func_weeknum.xhp msgctxt "" @@ -56549,7 +56454,7 @@ "par_id591535122756686\n" "help.text" msgid "Monday" -msgstr "" +msgstr "星期一" #: func_weeknum.xhp msgctxt "" @@ -56557,7 +56462,7 @@ "par_id881535122835126\n" "help.text" msgid "Monday" -msgstr "" +msgstr "星期一" #: func_weeknum.xhp msgctxt "" @@ -56565,7 +56470,7 @@ "par_id241535122903569\n" "help.text" msgid "Tuesday" -msgstr "" +msgstr "星期二" #: func_weeknum.xhp msgctxt "" @@ -56573,7 +56478,7 @@ "par_id31535124277973\n" "help.text" msgid "Wednesday" -msgstr "" +msgstr "星期三" #: func_weeknum.xhp msgctxt "" @@ -56581,7 +56486,7 @@ "par_id21535124310462\n" "help.text" msgid "Thursday" -msgstr "" +msgstr "星期四" #: func_weeknum.xhp msgctxt "" @@ -56589,7 +56494,7 @@ "par_id921535124365435\n" "help.text" msgid "Friday" -msgstr "" +msgstr "星期五" #: func_weeknum.xhp msgctxt "" @@ -56597,7 +56502,7 @@ "par_id211535124416253\n" "help.text" msgid "Saturday" -msgstr "" +msgstr "星期六" #: func_weeknum.xhp msgctxt "" @@ -56605,7 +56510,7 @@ "par_id461535124473824\n" "help.text" msgid "Sunday" -msgstr "" +msgstr "星期日" #: func_weeknum.xhp msgctxt "" @@ -56613,7 +56518,7 @@ "par_id471535124489997\n" "help.text" msgid "System 2" -msgstr "" +msgstr "系统 2" #: func_weeknum.xhp msgctxt "" @@ -56621,7 +56526,7 @@ "par_id391535124564520\n" "help.text" msgid "Monday (ISO 8601)" -msgstr "" +msgstr "星期一 (ISO 8601)" #: func_weeknum.xhp msgctxt "" @@ -56629,7 +56534,7 @@ "par_id661535124640643\n" "help.text" msgid "(ISO 8601, for interoperability with Gnumeric)" -msgstr "" +msgstr "(ISO 8601, 用于与 Gnumeric 的互通性)" #: func_weeknum.xhp msgctxt "" @@ -56637,7 +56542,7 @@ "par_id3150704\n" "help.text" msgid "=WEEKNUM(DATE(1995;1;1);1) returns 1" -msgstr "" +msgstr "「=WEEKNUM(DATE(1995;1;1);1)」返回 1" #: func_weeknum.xhp msgctxt "" @@ -56645,7 +56550,7 @@ "par_id3149792\n" "help.text" msgid "=WEEKNUM(DATE(1995;1;1);2) returns 52. If the week starts on Monday, Sunday belongs to the last week of the previous year." -msgstr "" +msgstr "「=WEEKNUM(DATE(1995;1;1);2)」返回 52。如果一周从星期一开始, 则星期日属于前一年的最后一周。" #: func_weeknum.xhp msgctxt "" @@ -56653,7 +56558,7 @@ "par_id3149793\n" "help.text" msgid "=WEEKNUM(DATE(1995;1;1);21) returns 52. Week 1 starts on Monday, 1995-01-02." -msgstr "" +msgstr "「=WEEKNUM(DATE(1995;1;1);21)」返回 52。第 1 周从 1995-01-02 星期一开始。" #: func_weeknum.xhp msgctxt "" @@ -56661,7 +56566,7 @@ "par_id3149794\n" "help.text" msgid "=WEEKNUM(DATE(1999;1;1);21) returns 53. Week 1 starts on Monday, 1999-01-04." -msgstr "" +msgstr "「=WEEKNUM(DATE(1999;1;1);21)」返回 53。第 1 周从 1999-01-04 星期一开始。" #: func_weeknum_ooo.xhp msgctxt "" @@ -56677,7 +56582,7 @@ "bm_id3159161\n" "help.text" msgid "WEEKNUM_OOO function" -msgstr "WEEKNUM_ADD" +msgstr "WEEKNUM_OOO 函数" #: func_weeknum_ooo.xhp msgctxt "" @@ -56701,7 +56606,7 @@ "par_idN105E4\n" "help.text" msgid "This function exists for interoperability with %PRODUCTNAME releases older than 5.1.0 and OpenOffice.org. It calculates week numbers for a week numbering system in that week number 1 is the week that contains the January 4th. This function does not provide interoperability with other spreadsheet applications. For new documents use the WEEKNUM or ISOWEEKNUM function instead." -msgstr "" +msgstr "此函数为与早于 5.1.0 版的 %PRODUCTNAME 和 OpenOffice.org 的互操作性而存在。其周编号系统计算周数的方式是, 第一周是包含1月4日的那一周。此函数不提供与其他电子表格应用程序的互操作性。对于新文档，请使用 WEEKNUM 或 ISOWEEKNUM 函数。" #: func_weeknum_ooo.xhp msgctxt "" @@ -56717,7 +56622,7 @@ "par_id3147511\n" "help.text" msgid "Number is the internal date number." -msgstr "「value」是日期的内部序列数。" +msgstr "「数字」是日期的内部序数。" #: func_weeknum_ooo.xhp msgctxt "" @@ -56741,7 +56646,7 @@ "par_id3154280\n" "help.text" msgid "2 = Monday (ISO 8601)" -msgstr "" +msgstr "2 = 星期一 (ISO 8601)" #: func_weeknum_ooo.xhp msgctxt "" @@ -56749,7 +56654,7 @@ "par_id3154281\n" "help.text" msgid "any other value = Monday (ISO 8601)" -msgstr "" +msgstr "任何其他值 = 星期一 (ISO 8601)" #: func_weeknum_ooo.xhp msgctxt "" @@ -56757,7 +56662,7 @@ "par_id3150704\n" "help.text" msgid "=WEEKNUM_OOO(DATE(1995;1;1);1) returns 1" -msgstr "" +msgstr "「=WEEKNUM_OOO(DATE(1995;1;1);1)」返回 1" #: func_weeknum_ooo.xhp msgctxt "" @@ -56765,7 +56670,7 @@ "par_id3149792\n" "help.text" msgid "=WEEKNUM_OOO(DATE(1995;1;1);2) returns 52. Week 1 starts on Monday, 1995-01-02." -msgstr "" +msgstr "「=WEEKNUM_OOO(DATE(1995;1;1);2)」返回 52。第 1 周从 1995-01-02 星期一开始。" #: func_weeknumadd.xhp msgctxt "" @@ -56781,7 +56686,7 @@ "bm_id3166443\n" "help.text" msgid "WEEKNUM_EXCEL2003 function" -msgstr "WEEKNUM_ADD" +msgstr "WEEKNUM_EXCEL2003 函数" #: func_weeknumadd.xhp msgctxt "" @@ -56789,7 +56694,7 @@ "hd_id3166443\n" "help.text" msgid "WEEKNUM_EXCEL2003" -msgstr "WEEKNUM_ADD" +msgstr "WEEKNUM_EXCEL2003" #: func_weeknumadd.xhp msgctxt "" @@ -56805,7 +56710,7 @@ "par_idN105DD\n" "help.text" msgid "The WEEKNUM_EXCEL2003 function is designed to calculate week numbers exactly as Microsoft Excel 2003 did. Use the WEEKNUM function for ODF OpenFormula and Excel 2010 compatibility, or ISOWEEKNUM function when you just need ISO 8601 week numbers. In releases prior to $[officename] 5.1 WEEKNUM_EXCEL2003 was named WEEKNUM_ADD." -msgstr "" +msgstr "WEEKNUM_EXCEL2003 函数仅仅是为了与 Microsoft Excel 2003 计算周数的方式完全一致而设计。如需与 ODF OpenFormula 或 Excel 2010 的兼容性，请使用 WEEKNUM 函数。如果只需要 ISO 8601 周数, 请使用 ISOWEEKNUM 函数。在 $[officename] 5.1 之前的版本中, WEEKNUM_EXCEL2003 名为 WEEKNUM_ADD。" #: func_weeknumadd.xhp msgctxt "" @@ -56813,7 +56718,7 @@ "par_id3153685\n" "help.text" msgid "WEEKNUM_EXCEL2003(Date; ReturnType)" -msgstr "" +msgstr "WEEKNUM_EXCEL2003(日期; 返回类型)" #: func_weeknumadd.xhp msgctxt "" @@ -56861,7 +56766,7 @@ "bm_id231020162341219565\n" "help.text" msgid "WORKDAY.INTL function" -msgstr "" +msgstr "WORKDAY.INTL 函数" #: func_workday.intl.xhp msgctxt "" @@ -56869,7 +56774,7 @@ "hd_id231020162348002143\n" "help.text" msgid "WORKDAY.INTL" -msgstr "" +msgstr "WORKDAY.INTL" #: func_workday.intl.xhp msgctxt "" @@ -56877,7 +56782,7 @@ "par_id23102016234837285\n" "help.text" msgid "The result is a date number that can be formatted as a date. User can see the date of a day that is a certain number of workdays away from the start date (before or after). There are options to define weekend days and holidays. The optional weekend parameter (or a string) can be used to define the weekend days (or the non-working days in each week). Also, optionally, the user can define a holiday list. The weekend days and user-defined holidays are not counted as working days." -msgstr "" +msgstr "结果是一个可以格式化为日期的日期数字。用户可以看到距离开始日期 (之前或之后) 一定数量工作日的那天的日期。提供用于定义周末和节假日的选项。可选的周末参数 (或字符串) 可用于定义周末是哪几天 (即每周中的非工作日)。此外, 用户还可以选择定义假日列表。周末和用户定义的假日不计入工作日。" #: func_workday.intl.xhp msgctxt "" @@ -56885,7 +56790,7 @@ "par_id241020160008306838\n" "help.text" msgid "WORKDAY.INTL(StartDate; Days; Weekend; Holidays)" -msgstr "" +msgstr "WORKDAY.INTL(StartDate; Days; Weekend; Holidays)" #: func_workday.intl.xhp msgctxt "" @@ -56893,7 +56798,7 @@ "par_id241020160008308885\n" "help.text" msgid "StartDate is the date from when the calculation is carried out. If the start date is a workday, the day is included in the calculation. This is required." -msgstr "" +msgstr "开始日期 开始计算的日期。如果开始日期是一个工作日，则这一天也要计算在内。必填。" #: func_workday.intl.xhp msgctxt "" @@ -56901,7 +56806,7 @@ "par_id241020160008305329\n" "help.text" msgid "Days is the number of workdays. Positive value for a result after the start date, negative value for a result before the start date." -msgstr "" +msgstr "「天数」工作日天数。开始日期后的结果为正值，开始日期前的为负值。" #: func_workday.intl.xhp msgctxt "" @@ -56909,7 +56814,7 @@ "par_id241020160012177196\n" "help.text" msgid "What date comes 20 workdays after December 13, 2016? Enter the start date in C3 and the number of workdays in D3." -msgstr "" +msgstr "2016年12月13日之后 20 个工作日是什么日期？在 C3 中输入开始日期, 在 D3 中输入工作日数。" #: func_workday.intl.xhp msgctxt "" @@ -56917,7 +56822,7 @@ "par_id241020160012178429\n" "help.text" msgid "The weekend parameter (number) may be left blank or defined as 1 for default weekend (non-working days) – Saturday and Sunday." -msgstr "" +msgstr "周末参数 (数字) 可以留空, 或定义为 1，即 默认周末 (非工作日) – 星期六和星期日。" #: func_workday.intl.xhp msgctxt "" @@ -56925,7 +56830,7 @@ "par_id241020160012172125\n" "help.text" msgid "Cells F3 to J3 contain five (5) holidays for Christmas and New Year in date format: December 24, 2016; December 25, 2016; December 26, 2016; December 31, 2016; and January 1, 2017." -msgstr "" +msgstr "单元格 F3 至 J3 包含五 (5) 个圣诞节和新年假期的日期格式: 2016年12月24日; 2016年12月25日; 2016年12月26日; 2016年12月31日; 以及2017年1月1日。" #: func_workday.intl.xhp msgctxt "" @@ -56933,7 +56838,7 @@ "par_id241020160012177923\n" "help.text" msgid "=WORKDAY.INTL(C3;D3;;F3:J3) returns January 11, 2017 in the result cell, say D6 (use date format for the cell)." -msgstr "" +msgstr "=WORKDAY.INTL(C3;D3;;F3:J3) 在结果单元格中返回2017年1月11日, 如 D6 (单元格应使用日期格式)。" #: func_workday.intl.xhp msgctxt "" @@ -56941,7 +56846,7 @@ "par_id24102016001217206\n" "help.text" msgid "To define Friday and Saturday as weekend days, use the weekend parameter 7." -msgstr "" +msgstr "若要将星期五和星期六定义为周末, 请使用周末参数 7。" #: func_workday.intl.xhp msgctxt "" @@ -56949,7 +56854,7 @@ "par_id241020160012178562\n" "help.text" msgid "=WORKDAY.INTL(C3;D3;7;F3:J3) returns January 15, 2017 with weekend parameter 7." -msgstr "" +msgstr "=WORKDAY.INTL(C3;D3;7;F3:J3) 周末参数为 7 时，返回 2017年1月15日。" #: func_workday.intl.xhp msgctxt "" @@ -56957,7 +56862,7 @@ "par_id241020160012176149\n" "help.text" msgid "To define Sunday only the weekend day, use the weekend parameter 11." -msgstr "" +msgstr "若要仅定义星期日为休息日, 请使用周末参数 11。" #: func_workday.intl.xhp msgctxt "" @@ -56973,7 +56878,7 @@ "par_id24102016001218469\n" "help.text" msgid "Alternatively, use the weekend string \"0000001\" for Sunday only weekend." -msgstr "" +msgstr "或者, 使用周末字符串「0000001」表示只有星期日单休。" #: func_workday.intl.xhp msgctxt "" @@ -56989,7 +56894,7 @@ "par_id241020160012181870\n" "help.text" msgid "The function can be used without the two optional parameters – Weekday and Holidays – by leaving them out:" -msgstr "" +msgstr "该函数的两个可选参数 –「工作日」与「节假日」– 可以留空:" #: func_workday.intl.xhp msgctxt "" @@ -56997,7 +56902,7 @@ "par_id241020160012182048\n" "help.text" msgid "=WORKDAY.INTL(C3;D3) gives the result: January 10, 2017." -msgstr "" +msgstr "=WORKDAY.INTL(C3;D3) 给出结果: 2017年1月10日。" #: func_workday.intl.xhp msgctxt "" @@ -57005,7 +56910,7 @@ "par_id231020162253594361\n" "help.text" msgid "NETWORKDAYS" -msgstr "" +msgstr "NETWORKDAYS" #: func_workday.intl.xhp msgctxt "" @@ -57013,7 +56918,7 @@ "par_id241020160012187036\n" "help.text" msgid "NETWORKDAYS.INTL" -msgstr "" +msgstr "NETWORKDAYS.INTL" #: func_workday.intl.xhp msgctxt "" @@ -57021,7 +56926,7 @@ "par_id241030160012187036\n" "help.text" msgid "WORKDAY" -msgstr "" +msgstr "WORKDAY" #: func_workday.intl.xhp msgctxt "" @@ -57029,7 +56934,7 @@ "par_id23102016225717242\n" "help.text" msgid "Date functions" -msgstr "" +msgstr "日期函数" #: func_workday.xhp msgctxt "" @@ -57109,7 +57014,7 @@ "par_id3146142\n" "help.text" msgid "=WORKDAY(C3;D3;F3:J3) returns 2001-12-28. Format the serial date number as a date, for example in the format YYYY-MM-DD." -msgstr "" +msgstr "「=WORKDAY(C3;D3;F3:J3)」返回 2001-12-28。将日期序数格式化为日期, 例如选择格式 YYYY-MM-DD。" #: func_workday.xhp msgctxt "" @@ -57117,7 +57022,7 @@ "par_id231020162253594361\n" "help.text" msgid "NETWORKDAYS" -msgstr "" +msgstr "NETWORKDAYS" #: func_workday.xhp msgctxt "" @@ -57125,7 +57030,7 @@ "par_id241020160012187036\n" "help.text" msgid "NETWORKDAYS.INTL" -msgstr "" +msgstr "NETWORKDAYS.INTL" #: func_workday.xhp msgctxt "" @@ -57133,7 +57038,7 @@ "par_id241030160012187036\n" "help.text" msgid "WORKDAY.INTL" -msgstr "" +msgstr "WORKDAY.INTL" #: func_workday.xhp msgctxt "" @@ -57141,7 +57046,7 @@ "par_id23102016225717242\n" "help.text" msgid "Date functions" -msgstr "" +msgstr "日期函数" #: func_year.xhp msgctxt "" @@ -57349,7 +57254,7 @@ "tit\n" "help.text" msgid "Live Data Stream" -msgstr "" +msgstr "实时数据流" #: live_data_stream.xhp msgctxt "" @@ -57357,7 +57262,7 @@ "bm_id240920171018528200\n" "help.text" msgid "Data Stream;Live data stream" -msgstr "" +msgstr "数据流;实时数据流" #: live_data_stream.xhp msgctxt "" @@ -57365,7 +57270,7 @@ "hd_id240920171003006302\n" "help.text" msgid "Live Data Stream" -msgstr "" +msgstr "实时数据流" #: live_data_stream.xhp msgctxt "" @@ -57373,7 +57278,7 @@ "par_id240920171003293400\n" "help.text" msgid "Live data stream for spreadsheets" -msgstr "" +msgstr "用于电子表格的实时数据流" #: live_data_stream.xhp msgctxt "" @@ -57381,7 +57286,7 @@ "par_id240920171007389295\n" "help.text" msgid "Menu Data – Streams..." -msgstr "" +msgstr "菜单「数据 – 流...」" #: live_data_stream.xhp msgctxt "" @@ -57389,7 +57294,7 @@ "par_id240920171007419799\n" "help.text" msgid "Data streams" -msgstr "" +msgstr "数据流" #: solver.xhp msgctxt "" @@ -57685,7 +57590,7 @@ "par_id1000010\n" "help.text" msgid "Input Range: The reference of the range of the data to analyze." -msgstr "" +msgstr "「输入范围」: 要分析的数据范围的引用。" #: stat_data.xhp msgctxt "" @@ -57693,7 +57598,7 @@ "par_id1000020\n" "help.text" msgid "Results to: The reference of the top left cell of the range where the results will be displayed." -msgstr "" +msgstr "「结果输出到」: 显示结果的区域左上角的单元格的引用。" #: stat_data.xhp msgctxt "" @@ -57701,7 +57606,7 @@ "hd_id1000020\n" "help.text" msgid "Grouped By" -msgstr "" +msgstr "分组条件" #: stat_data.xhp msgctxt "" @@ -57709,7 +57614,7 @@ "par_id1000030\n" "help.text" msgid "Select whether the input data has columns or rows layout." -msgstr "" +msgstr "选择输入数据是否具有「列」或「行」布局。" #: stat_data.xhp msgctxt "" @@ -57717,7 +57622,7 @@ "par_id1000040\n" "help.text" msgid "The following data will be used as example" -msgstr "" +msgstr "以下面的数据为例" #: stat_data.xhp msgctxt "" @@ -57749,7 +57654,7 @@ "par_id1000550\n" "help.text" msgid "The following table has two time series, one representing an impulse function at time t=0 and the other an impulse function at time t=2." -msgstr "" +msgstr "下表有两个时间序列, 一个表示时间 t=0 的脉冲函数, 另一个表示时间 t=2 的脉冲函数。" #: stat_data.xhp msgctxt "" @@ -57757,7 +57662,7 @@ "par_id1000970\n" "help.text" msgid "The following table has two data sets." -msgstr "" +msgstr "下表有两组数据集。" #: stat_data.xhp msgctxt "" @@ -57765,7 +57670,7 @@ "par_id1701201619425624\n" "help.text" msgid "The following table has samples of a physical phenomenon taken in 1 second interval." -msgstr "" +msgstr "下表中有间隔 1 秒采集的物理现象的样本。" #: statistics.xhp msgctxt "" @@ -57773,7 +57678,7 @@ "tit\n" "help.text" msgid "Data Statistics in Calc" -msgstr "" +msgstr "Calc 中的数据统计" #: statistics.xhp msgctxt "" @@ -57781,7 +57686,7 @@ "hd_id1000010\n" "help.text" msgid "Data Statistics in Calc" -msgstr "" +msgstr "Calc 中的数据统计" #: statistics.xhp msgctxt "" @@ -57789,7 +57694,7 @@ "par_id1000010\n" "help.text" msgid "Use the data statistics in Calc to perform complex data analysis" -msgstr "" +msgstr "使用 Calc 中的数据统计功能执行复杂的数据分析" #: statistics.xhp msgctxt "" @@ -57797,7 +57702,7 @@ "par_id1000020\n" "help.text" msgid "To work on a complex statistical or engineering analysis, you can save steps and time by using Calc Data Statistics. You provide the data and parameters for each analysis, and the set of tools uses the appropriate statistical or engineering functions to calculate and display the results in an output table." -msgstr "" +msgstr "要进行复杂的统计或工程分析, 可以使用「Calc 数据统计」节省步骤和时间。您可以为每次分析提供数据和参数, 这组工具可使用适当的统计或工程函数来计算和并在输出表格中显示结果。" #: statistics.xhp msgctxt "" @@ -57805,7 +57710,7 @@ "bm_id2764278\n" "help.text" msgid "Analysis toolpack;samplingsampling;Analysis toolpackData statistics;sampling" -msgstr "" +msgstr "分析工具包; 采样采样;分析工具包数据统计;采样" #: statistics.xhp msgctxt "" @@ -57813,7 +57718,7 @@ "hd_id1000020\n" "help.text" msgid "Sampling" -msgstr "" +msgstr "采样" #: statistics.xhp msgctxt "" @@ -57821,7 +57726,7 @@ "par_id1000030\n" "help.text" msgid "Create a table with data sampled from another table." -msgstr "" +msgstr "使用从另一个表格中采样的数据创建一个表格。" #: statistics.xhp msgctxt "" @@ -57829,7 +57734,7 @@ "par_id1000040\n" "help.text" msgid "Choose Data - Statistics - Sampling" -msgstr "" +msgstr "选择「数据 - 统计 - 采样」" #: statistics.xhp msgctxt "" @@ -57837,7 +57742,7 @@ "par_id1000050\n" "help.text" msgid "Sampling allows you to pick data from a source table to fill a target table. The sampling can be random or in a periodic basis." -msgstr "" +msgstr "通过采样, 您可以从「源」表格中选取数据以填充目标表格。采样可以是随机的, 也可以是周期性的。" #: statistics.xhp msgctxt "" @@ -57845,7 +57750,7 @@ "par_id1000060\n" "help.text" msgid "Sampling is done row-wise. That means, the sampled data will pick the whole line of the source table and copy into a line of the target table." -msgstr "" +msgstr "采样按行进行。这意味着, 采样的数据将选取源表格的整行，并复制到目标表格的一整行中。" #: statistics.xhp msgctxt "" @@ -57853,7 +57758,7 @@ "hd_id1000030\n" "help.text" msgid "Sampling Method" -msgstr "" +msgstr "采样方法" #: statistics.xhp msgctxt "" @@ -57861,7 +57766,7 @@ "par_id1000070\n" "help.text" msgid "Random: Picks exactly Sample Size lines of the source table in a random way." -msgstr "" +msgstr "「随机」: 以随机方式选取源表格中恰好样本大小行。" #: statistics.xhp msgctxt "" @@ -57869,7 +57774,7 @@ "par_id1000080\n" "help.text" msgid "Sample size: Number of lines sampled from the source table." -msgstr "" +msgstr "「样本大小」: 从源表格中采样的行数。" #: statistics.xhp msgctxt "" @@ -57877,7 +57782,7 @@ "par_id1000090\n" "help.text" msgid "Periodic: Picks lines in a pace defined by Period." -msgstr "" +msgstr "「周期性」: 按「周期」定义的步伐选取行。" #: statistics.xhp msgctxt "" @@ -57885,7 +57790,7 @@ "par_id1000100\n" "help.text" msgid "Period: the number of lines to skip periodically when sampling." -msgstr "" +msgstr "「周期」: 采样时周期性跳过的行数。" #: statistics.xhp msgctxt "" @@ -57893,7 +57798,7 @@ "par_id1000110\n" "help.text" msgid "The following data will be used as example of source data table for sampling:" -msgstr "" +msgstr "以下数据将用作采样的源数据表示例:" #: statistics.xhp msgctxt "" @@ -57901,7 +57806,7 @@ "par_id1000510\n" "help.text" msgid "Sampling with a period of 2 will result in the following table:" -msgstr "" +msgstr "周期为 2 的采样将产生下表:" #: statistics.xhp msgctxt "" @@ -57909,7 +57814,7 @@ "bm_id01001\n" "help.text" msgid "Analysis toolpack;descriptive statisticsdescriptive statistics;Analysis toolpackData statistics;descriptive statistics" -msgstr "" +msgstr "分析工具包; 描述性统计描述性统计;分析工具包数据统计; 描述性统计" #: statistics.xhp msgctxt "" @@ -57925,7 +57830,7 @@ "par_id1000640\n" "help.text" msgid "Fill a table in the spreadsheet with the main statistical properties of the data set." -msgstr "" +msgstr "用数据集的主要统计属性填充电子表格中的表格。" #: statistics.xhp msgctxt "" @@ -57933,7 +57838,7 @@ "par_id1000650\n" "help.text" msgid "Choose Data - Statistics - Descriptive Statistics" -msgstr "" +msgstr "选择「数据 - 统计 - 描述性统计」" #: statistics.xhp msgctxt "" @@ -57941,7 +57846,7 @@ "par_id1000660\n" "help.text" msgid "The Descriptive Statistics analysis tool generates a report of univariate statistics for data in the input range, providing information about the central tendency and variability of your data." -msgstr "" +msgstr "「描述性统计」分析工具为输入范围内的数据生成单变量统计报告, 提供有关数据的中心趋势和可变性的信息。" #: statistics.xhp msgctxt "" @@ -57949,7 +57854,7 @@ "par_id1000670\n" "help.text" msgid "For more information on descriptive statistics, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「描述性统计」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -57957,7 +57862,7 @@ "par_id1000680\n" "help.text" msgid "The following table displays the results of the descriptive statistics of the sample data above." -msgstr "" +msgstr "下表显示了上述示例数据的描述性统计结果。" #: statistics.xhp msgctxt "" @@ -57965,7 +57870,7 @@ "par_id1000690\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -57973,7 +57878,7 @@ "par_id1000700\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -57981,7 +57886,7 @@ "par_id1000710\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -57989,7 +57894,7 @@ "par_id1000720\n" "help.text" msgid "Mean" -msgstr "" +msgstr "平均值" #: statistics.xhp msgctxt "" @@ -58029,7 +57934,7 @@ "par_id1000920\n" "help.text" msgid "Standard Deviation" -msgstr "" +msgstr "标准偏差" #: statistics.xhp msgctxt "" @@ -58077,7 +57982,7 @@ "par_id1001160\n" "help.text" msgid "Sum" -msgstr "" +msgstr "总和" #: statistics.xhp msgctxt "" @@ -58085,7 +57990,7 @@ "par_id1001200\n" "help.text" msgid "Count" -msgstr "Count" +msgstr "计数" #: statistics.xhp msgctxt "" @@ -58093,7 +57998,7 @@ "bm_id02001\n" "help.text" msgid "Analysis toolpack;analysis of varianceAnalysis toolpack;ANOVAanalysis of variance;Analysis toolpackANOVA;Analysis toolpackData statistics;analysis of varianceData statistics;ANOVA" -msgstr "" +msgstr "分析工具包; 方差分析分析工具包; ANOVA方差分析;分析工具包ANOVA;分析工具包数据统计; 方差分析数据统计; ANOVA" #: statistics.xhp msgctxt "" @@ -58109,7 +58014,7 @@ "par_id1001240\n" "help.text" msgid "Produces the analysis of variance (ANOVA) of a given data set" -msgstr "" +msgstr "生成给定数据集的方差分析 (ANOVA)" #: statistics.xhp msgctxt "" @@ -58117,7 +58022,7 @@ "par_id1001250\n" "help.text" msgid "Choose Data - Statistics - Analysis of Variance (ANOVA)" -msgstr "" +msgstr "选择「数据 - 统计 - 方差分析 (ANOVA)」" #: statistics.xhp msgctxt "" @@ -58125,7 +58030,7 @@ "par_id1001260\n" "help.text" msgid "ANOVA is the acronym for ANalysis Of VAriance. This tool produces the analysis of variance of a given data set" -msgstr "" +msgstr "ANOVA 是「方差分析」 (ANalysis Of VAriance) 的缩写。该工具可对指定数据集进行方差分析" #: statistics.xhp msgctxt "" @@ -58133,7 +58038,7 @@ "par_id1001270\n" "help.text" msgid "For more information on ANOVA, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「方差分析」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58141,7 +58046,7 @@ "hd_id1000070\n" "help.text" msgid "Type" -msgstr "Type" +msgstr "类型" #: statistics.xhp msgctxt "" @@ -58149,7 +58054,7 @@ "par_id1001280\n" "help.text" msgid "Select if the analysis is for a single factor or for two factor ANOVA." -msgstr "" +msgstr "选择分析是针对「单因素」还是「双因素」方差分析。" #: statistics.xhp msgctxt "" @@ -58165,7 +58070,7 @@ "par_id1001290\n" "help.text" msgid "Alpha: the level of significance of the test." -msgstr "" +msgstr "「α」: 检测的重要性级别。" #: statistics.xhp msgctxt "" @@ -58173,7 +58078,7 @@ "par_id1001300\n" "help.text" msgid "Rows per sample: Define how many rows a sample has." -msgstr "" +msgstr "「每个采样的行数」: 定义每个采样的行数。" #: statistics.xhp msgctxt "" @@ -58181,7 +58086,7 @@ "par_id1001310\n" "help.text" msgid "The following table displays the results of the analysis of variance (ANOVA) of the sample data above." -msgstr "" +msgstr "下表显示了上述示例数据的「方差分析 (ANOVA)」结果。" #: statistics.xhp msgctxt "" @@ -58189,7 +58094,7 @@ "par_id1001320\n" "help.text" msgid "ANOVA - Single Factor" -msgstr "" +msgstr "方差分析 - 单因素" #: statistics.xhp msgctxt "" @@ -58197,7 +58102,7 @@ "par_id1001330\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -58213,7 +58118,7 @@ "par_id1001360\n" "help.text" msgid "Count" -msgstr "Count" +msgstr "计数" #: statistics.xhp msgctxt "" @@ -58237,7 +58142,7 @@ "par_id1001390\n" "help.text" msgid "Variance" -msgstr "" +msgstr "方差" #: statistics.xhp msgctxt "" @@ -58245,7 +58150,7 @@ "par_id1001400\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58253,7 +58158,7 @@ "par_id1001450\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58261,7 +58166,7 @@ "par_id1001500\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -58285,7 +58190,7 @@ "par_id1001570\n" "help.text" msgid "df" -msgstr "" +msgstr "df" #: statistics.xhp msgctxt "" @@ -58309,7 +58214,7 @@ "par_id1001600\n" "help.text" msgid "P-value" -msgstr "P-值" +msgstr "P 值" #: statistics.xhp msgctxt "" @@ -58317,7 +58222,7 @@ "par_id1001610\n" "help.text" msgid "Between Groups" -msgstr "" +msgstr "组间" #: statistics.xhp msgctxt "" @@ -58325,7 +58230,7 @@ "par_id1001670\n" "help.text" msgid "Within Groups" -msgstr "" +msgstr "组内" #: statistics.xhp msgctxt "" @@ -58333,7 +58238,7 @@ "par_id1001710\n" "help.text" msgid "Total" -msgstr "" +msgstr "总计" #: statistics.xhp msgctxt "" @@ -58341,7 +58246,7 @@ "bm_id1464278\n" "help.text" msgid "Analysis toolpack;correlationcorrelation;Analysis toolpackData statistics;correlation" -msgstr "" +msgstr "统计分析工具包;相关性相关性;统计分析工具包数据分析;相关性" #: statistics.xhp msgctxt "" @@ -58349,7 +58254,7 @@ "hd_id1000090\n" "help.text" msgid "Correlation" -msgstr "" +msgstr "相关性" #: statistics.xhp msgctxt "" @@ -58357,7 +58262,7 @@ "par_id1001740\n" "help.text" msgid "Calculates the correlation of two sets of numeric data." -msgstr "" +msgstr "计算两组数字数据的相关性。" #: statistics.xhp msgctxt "" @@ -58365,7 +58270,7 @@ "par_id1001750\n" "help.text" msgid "Choose Data - Statistics - Correlation" -msgstr "" +msgstr "选择「数据 - 统计 - 相关性」" #: statistics.xhp msgctxt "" @@ -58373,7 +58278,7 @@ "par_id1001760\n" "help.text" msgid "The correlation coefficient (a value between -1 and +1) means how strongly two variables are related to each other. You can use the CORREL function or the Data Statistics to find the correlation coefficient between two variables." -msgstr "" +msgstr "相关系数 (介于 -1 和 + 1 之间的值) 表示两个变量之间的相关性有多大。您可以使用 CORREL 函数或「数据统计」来求两个变量之间的相关系数。" #: statistics.xhp msgctxt "" @@ -58381,7 +58286,7 @@ "par_id1001770\n" "help.text" msgid "A correlation coefficient of +1 indicates a perfect positive correlation." -msgstr "" +msgstr "相关系数 +1 表示完全正相关。" #: statistics.xhp msgctxt "" @@ -58389,7 +58294,7 @@ "par_id1001780\n" "help.text" msgid "A correlation coefficient of -1 indicates a perfect negative correlation" -msgstr "" +msgstr "相关系数 -1 表示完全负相关" #: statistics.xhp msgctxt "" @@ -58397,7 +58302,7 @@ "par_id1001790\n" "help.text" msgid "For more information on statistical correlation, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「统计相关」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58405,7 +58310,7 @@ "par_id1001800\n" "help.text" msgid "The following table displays the results of the correlation of the sample data above." -msgstr "" +msgstr "下表显示了上述示例数据的相关性结果。" #: statistics.xhp msgctxt "" @@ -58413,7 +58318,7 @@ "par_id1001810\n" "help.text" msgid "Correlations" -msgstr "" +msgstr "相关性" #: statistics.xhp msgctxt "" @@ -58421,7 +58326,7 @@ "par_id1001820\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58429,7 +58334,7 @@ "par_id1001830\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58437,7 +58342,7 @@ "par_id1001840\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -58445,7 +58350,7 @@ "par_id1001850\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58453,7 +58358,7 @@ "par_id1001870\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58461,7 +58366,7 @@ "par_id1001900\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -58469,7 +58374,7 @@ "bm_id2964278\n" "help.text" msgid "Analysis toolpack;covariancecovariance;Analysis toolpackData statistics;covariance" -msgstr "" +msgstr "统计分析工具包;协方差协方差;统计分析工具包数据分析;协方差" #: statistics.xhp msgctxt "" @@ -58477,7 +58382,7 @@ "hd_id1000100\n" "help.text" msgid "Covariance" -msgstr "" +msgstr "协方差" #: statistics.xhp msgctxt "" @@ -58485,7 +58390,7 @@ "par_id1001940\n" "help.text" msgid "Calculates the covariance of two sets of numeric data." -msgstr "" +msgstr "计算两组数字数据的协方差。" #: statistics.xhp msgctxt "" @@ -58493,7 +58398,7 @@ "par_id1001950\n" "help.text" msgid "Choose Data - Statistics - Covariance" -msgstr "" +msgstr "选择「数据 - 统计 - 协方差」" #: statistics.xhp msgctxt "" @@ -58501,7 +58406,7 @@ "par_id1001960\n" "help.text" msgid "The covariance is a measure of how much two random variables change together." -msgstr "" +msgstr "协方差是衡量两个随机变量一同变化的程度的指标。" #: statistics.xhp msgctxt "" @@ -58509,7 +58414,7 @@ "par_id1001970\n" "help.text" msgid "For more information on statistical covariance, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「统计协方差」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58517,7 +58422,7 @@ "par_id1001980\n" "help.text" msgid "The following table displays the results of the covariance of the sample data above." -msgstr "" +msgstr "下表显示了上述示例数据的协方差结果。" #: statistics.xhp msgctxt "" @@ -58525,7 +58430,7 @@ "par_id1001990\n" "help.text" msgid "Covariances" -msgstr "" +msgstr "协方差" #: statistics.xhp msgctxt "" @@ -58533,7 +58438,7 @@ "par_id1002000\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58541,7 +58446,7 @@ "par_id1002010\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58549,7 +58454,7 @@ "par_id1002020\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -58557,7 +58462,7 @@ "par_id1002030\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58565,7 +58470,7 @@ "par_id1002050\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58573,7 +58478,7 @@ "par_id1002080\n" "help.text" msgid "Column 3" -msgstr "第3列" +msgstr "第 3 列" #: statistics.xhp msgctxt "" @@ -58589,7 +58494,7 @@ "hd_id1000110\n" "help.text" msgid "Exponential Smoothing" -msgstr "" +msgstr "指数平滑" #: statistics.xhp msgctxt "" @@ -58605,7 +58510,7 @@ "par_id1002130\n" "help.text" msgid "Choose Data - Statistics - Exponential Smoothing" -msgstr "" +msgstr "选择「数据 - 统计 - 指数平滑」" #: statistics.xhp msgctxt "" @@ -58613,7 +58518,7 @@ "par_id1002140\n" "help.text" msgid "Exponential smoothing is a filtering technique that when applied to a data set, produces smoothed results. It is employed in many domains such as stock market, economics and in sampled measurements." -msgstr "" +msgstr "指数平滑是一种筛选技术, 当应用于数据集时, 会产生平滑化的结果。它被应用于许多领域, 如股票市场、经济学以及抽样测量。" #: statistics.xhp msgctxt "" @@ -58621,7 +58526,7 @@ "par_id1002150\n" "help.text" msgid "For more information on exponential smoothing, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「指数平滑」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58637,7 +58542,7 @@ "par_id1002160\n" "help.text" msgid "Smoothing Factor: A parameter between 0 and 1 that represents the damping factor Alpha in the smoothing equation." -msgstr "" +msgstr "「平滑系数」: 介于 0 和 1 之间的参数, 表示平滑方程中的阻尼因子 α。" #: statistics.xhp msgctxt "" @@ -58645,7 +58550,7 @@ "par_id1002170\n" "help.text" msgid "The resulting smoothing is below with smoothing factor as 0.5:" -msgstr "" +msgstr "平滑系数为 0.5 时，产生的平滑结果如下:" #: statistics.xhp msgctxt "" @@ -58653,7 +58558,7 @@ "par_id1002180\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -58661,7 +58566,7 @@ "par_id1002200\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58669,7 +58574,7 @@ "par_id1002210\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58677,7 +58582,7 @@ "bm_id04001\n" "help.text" msgid "Analysis toolpack;moving averagemoving average;Analysis toolpackData statistics;moving average" -msgstr "" +msgstr "分析工具包; 移动平均移动平均;分析工具包数据统计; 移动平均" #: statistics.xhp msgctxt "" @@ -58685,7 +58590,7 @@ "hd_id1000130\n" "help.text" msgid "Moving Average" -msgstr "" +msgstr "移动平均" #: statistics.xhp msgctxt "" @@ -58693,7 +58598,7 @@ "par_id1002500\n" "help.text" msgid "Calculates the moving average of a time series" -msgstr "" +msgstr "计算时间序列的移动平均" #: statistics.xhp msgctxt "" @@ -58701,7 +58606,7 @@ "par_id1002510\n" "help.text" msgid "Choose Data - Statistics - Moving Average" -msgstr "" +msgstr "选择「数据 - 统计 - 移动平均」" #: statistics.xhp msgctxt "" @@ -58709,7 +58614,7 @@ "par_id1002520\n" "help.text" msgid "For more information on the moving average, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「移动平均」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58725,7 +58630,7 @@ "par_id1002530\n" "help.text" msgid "Interval: The number of samples used in the moving average calculation." -msgstr "" +msgstr "「间隔」: 移动平均计算中使用的样本数。" #: statistics.xhp msgctxt "" @@ -58741,7 +58646,7 @@ "par_id1002540\n" "help.text" msgid "Column 1" -msgstr "第1列" +msgstr "第 1 列" #: statistics.xhp msgctxt "" @@ -58749,7 +58654,7 @@ "par_id1002550\n" "help.text" msgid "Column 2" -msgstr "第2列" +msgstr "第 2 列" #: statistics.xhp msgctxt "" @@ -58789,7 +58694,7 @@ "bm_id05001\n" "help.text" msgid "Analysis toolpack;t-testAnalysis toolpack;paired t-testt-test;Analysis toolpackpaired t-test;Analysis toolpackData statistics;paired t-test" -msgstr "" +msgstr "分析工具包; t 检验分析工具包; 配对 t 检验t 检验;分析工具包配对 t 检验;分析工具包数据统计; 配对 t 检验" #: statistics.xhp msgctxt "" @@ -58797,7 +58702,7 @@ "hd_id1000150\n" "help.text" msgid "Paired t-test" -msgstr "" +msgstr "配对 t 检验" #: statistics.xhp msgctxt "" @@ -58805,7 +58710,7 @@ "par_id1002820\n" "help.text" msgid "Calculates the paired t-Test of two data samples." -msgstr "" +msgstr "计算两个数据样本的配对 t 检验。" #: statistics.xhp msgctxt "" @@ -58813,7 +58718,7 @@ "par_id1002830\n" "help.text" msgid "Choose Data - Statistics - Paired t-test" -msgstr "" +msgstr "选择「数据 - 统计 - 配对 t 检验」" #: statistics.xhp msgctxt "" @@ -58821,7 +58726,7 @@ "par_id1002840\n" "help.text" msgid "A paired t-test is any statistical hypothesis test that follows a Student's t distribution." -msgstr "" +msgstr "「配对 t 检验」是遵循学生 t 分布的任何统计假设检验。" #: statistics.xhp msgctxt "" @@ -58829,7 +58734,7 @@ "par_id1002850\n" "help.text" msgid "For more information on paired t-tests, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「配对 t 检验」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -58845,7 +58750,7 @@ "par_id1002860\n" "help.text" msgid "Variable 1 range: The reference of the range of the first data series to analyze." -msgstr "" +msgstr "「变量 1 范围」: 要分析的第一个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -58853,7 +58758,7 @@ "par_id1002870\n" "help.text" msgid "Variable 2 range: The reference of the range of the second data series to analyze." -msgstr "" +msgstr "「变量 2 范围」: 要分析的第二个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -58861,7 +58766,7 @@ "par_id1002880\n" "help.text" msgid "Results to: The reference of the top left cell of the range where the test will be displayed." -msgstr "" +msgstr "「结果输出到」: 显示检验的区域左上角的单元格的引用。" #: statistics.xhp msgctxt "" @@ -58869,7 +58774,7 @@ "hd_id1000170\n" "help.text" msgid "Results for paired t-test:" -msgstr "" +msgstr "配对 t 检验的结果:" #: statistics.xhp msgctxt "" @@ -58877,7 +58782,7 @@ "par_id1002890\n" "help.text" msgid "The following table shows the paired t-test for the data series above:" -msgstr "" +msgstr "下表显示了上述数据序列的「配对 t 检验」:" #: statistics.xhp msgctxt "" @@ -58885,7 +58790,7 @@ "par_id1002900\n" "help.text" msgid "paired t-test" -msgstr "" +msgstr "配对 t 检验" #: statistics.xhp msgctxt "" @@ -58893,7 +58798,7 @@ "par_id1002910\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -58901,7 +58806,7 @@ "par_id1002930\n" "help.text" msgid "Hypothesized Mean Difference" -msgstr "" +msgstr "假设的均差" #: statistics.xhp msgctxt "" @@ -58909,7 +58814,7 @@ "par_id1002950\n" "help.text" msgid "Variable 1" -msgstr "" +msgstr "变量 1" #: statistics.xhp msgctxt "" @@ -58917,7 +58822,7 @@ "par_id1002960\n" "help.text" msgid "Variable 2" -msgstr "" +msgstr "变量 2" #: statistics.xhp msgctxt "" @@ -58925,7 +58830,7 @@ "par_id1002970\n" "help.text" msgid "Mean" -msgstr "" +msgstr "平均值" #: statistics.xhp msgctxt "" @@ -58941,7 +58846,7 @@ "par_id1003030\n" "help.text" msgid "Observations" -msgstr "" +msgstr "观测值" #: statistics.xhp msgctxt "" @@ -58949,7 +58854,7 @@ "par_id1003060\n" "help.text" msgid "Pearson Correlation" -msgstr "" +msgstr "皮尔逊相关系数" #: statistics.xhp msgctxt "" @@ -58957,7 +58862,7 @@ "par_id1003080\n" "help.text" msgid "Observed Mean Difference" -msgstr "" +msgstr "观测的均差" #: statistics.xhp msgctxt "" @@ -58965,7 +58870,7 @@ "par_id1003100\n" "help.text" msgid "Variance of the Differences" -msgstr "" +msgstr "差异的方差" #: statistics.xhp msgctxt "" @@ -58973,7 +58878,7 @@ "par_id1003120\n" "help.text" msgid "df" -msgstr "" +msgstr "df" #: statistics.xhp msgctxt "" @@ -58981,7 +58886,7 @@ "par_id1003140\n" "help.text" msgid "t Stat" -msgstr "" +msgstr "t 统计" #: statistics.xhp msgctxt "" @@ -58997,7 +58902,7 @@ "par_id1003180\n" "help.text" msgid "t Critical one-tail" -msgstr "" +msgstr "t 临界单尾" #: statistics.xhp msgctxt "" @@ -59005,7 +58910,7 @@ "par_id1003200\n" "help.text" msgid "P (T<=t) two-tail" -msgstr "" +msgstr "P (T<=t) 双尾" #: statistics.xhp msgctxt "" @@ -59013,7 +58918,7 @@ "par_id1003220\n" "help.text" msgid "t Critical two-tail" -msgstr "" +msgstr "t 临界双尾" #: statistics.xhp msgctxt "" @@ -59021,7 +58926,7 @@ "bm_id05002\n" "help.text" msgid "Analysis toolpack;F-testF-test;Analysis toolpackData statistics;F-test" -msgstr "" +msgstr "统计分析工具包;F 检验F 检验;统计分析工具包数据分析;F 检验" #: statistics.xhp msgctxt "" @@ -59037,7 +58942,7 @@ "par_id1003240\n" "help.text" msgid "Calculates the F-Test of two data samples." -msgstr "" +msgstr "计算两个数据样本的 F 检验。" #: statistics.xhp msgctxt "" @@ -59045,7 +58950,7 @@ "par_id1003250\n" "help.text" msgid "Choose Data - Statistics - F-test" -msgstr "" +msgstr "选择「数据 - 统计 - F 检验」" #: statistics.xhp msgctxt "" @@ -59053,7 +58958,7 @@ "par_id1003260\n" "help.text" msgid "A F-test is any statistical test based on the F-distribution under the null hypothesis." -msgstr "" +msgstr "「F 检验」是基于零假设下 F 分布的任何统计检验。" #: statistics.xhp msgctxt "" @@ -59061,7 +58966,7 @@ "par_id1003270\n" "help.text" msgid "For more information on F-tests, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「F 检验」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -59077,7 +58982,7 @@ "par_id1003280\n" "help.text" msgid "Variable 1 range: The reference of the range of the first data series to analyze." -msgstr "" +msgstr "「变量 1 范围」: 要分析的第一个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -59085,7 +58990,7 @@ "par_id1003290\n" "help.text" msgid "Variable 2 range: The reference of the range of the second data series to analyze." -msgstr "" +msgstr "「变量 2 范围」: 要分析的第二个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -59093,7 +58998,7 @@ "par_id1003300\n" "help.text" msgid "Results to: The reference of the top left cell of the range where the test will be displayed." -msgstr "" +msgstr "「结果输出到」: 显示检验的区域左上角的单元格的引用。" #: statistics.xhp msgctxt "" @@ -59101,7 +59006,7 @@ "hd_id1000200\n" "help.text" msgid "Results for F-Test:" -msgstr "" +msgstr "F 检验的结果:" #: statistics.xhp msgctxt "" @@ -59109,7 +59014,7 @@ "par_id1003310\n" "help.text" msgid "The following table shows the F-Test for the data series above:" -msgstr "" +msgstr "下表显示了上述数据序列的「F 检验」:" #: statistics.xhp msgctxt "" @@ -59117,7 +59022,7 @@ "par_id1003320\n" "help.text" msgid "Ftest" -msgstr "" +msgstr "F 检验" #: statistics.xhp msgctxt "" @@ -59125,7 +59030,7 @@ "par_id1003330\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -59133,7 +59038,7 @@ "par_id1003350\n" "help.text" msgid "Variable 1" -msgstr "" +msgstr "变量 1" #: statistics.xhp msgctxt "" @@ -59141,7 +59046,7 @@ "par_id1003360\n" "help.text" msgid "Variable 2" -msgstr "" +msgstr "变量 2" #: statistics.xhp msgctxt "" @@ -59149,7 +59054,7 @@ "par_id1003370\n" "help.text" msgid "Mean" -msgstr "均值" +msgstr "平均值" #: statistics.xhp msgctxt "" @@ -59157,7 +59062,7 @@ "par_id1003400\n" "help.text" msgid "Variance" -msgstr "" +msgstr "方差" #: statistics.xhp msgctxt "" @@ -59165,7 +59070,7 @@ "par_id1003430\n" "help.text" msgid "Observations" -msgstr "" +msgstr "观测值" #: statistics.xhp msgctxt "" @@ -59173,7 +59078,7 @@ "par_id1003460\n" "help.text" msgid "df" -msgstr "" +msgstr "df" #: statistics.xhp msgctxt "" @@ -59189,7 +59094,7 @@ "par_id1003510\n" "help.text" msgid "P (F<=f) right-tail" -msgstr "" +msgstr "P (F<=f) 右尾" #: statistics.xhp msgctxt "" @@ -59197,7 +59102,7 @@ "par_id1003530\n" "help.text" msgid "F Critical right-tail" -msgstr "" +msgstr "F 临界右尾" #: statistics.xhp msgctxt "" @@ -59205,7 +59110,7 @@ "par_id1003550\n" "help.text" msgid "P (F<=f) left-tail" -msgstr "" +msgstr "P (F<=f) 左尾" #: statistics.xhp msgctxt "" @@ -59213,7 +59118,7 @@ "par_id1003570\n" "help.text" msgid "F Critical left-tail" -msgstr "" +msgstr "F 临界左尾" #: statistics.xhp msgctxt "" @@ -59221,7 +59126,7 @@ "par_id1003590\n" "help.text" msgid "P two-tail" -msgstr "" +msgstr "P 双尾" #: statistics.xhp msgctxt "" @@ -59229,7 +59134,7 @@ "par_id1003610\n" "help.text" msgid "F Critical two-tail" -msgstr "" +msgstr "F 临界双尾" #: statistics.xhp msgctxt "" @@ -59237,7 +59142,7 @@ "bm_id05003\n" "help.text" msgid "Analysis toolpack;Z-testZ-test;Analysis toolpackData statistics;Z-test" -msgstr "" +msgstr "统计分析工具包;Z 测试Z 测试;统计分析工具包数据分析;Z 测试" #: statistics.xhp msgctxt "" @@ -59245,7 +59150,7 @@ "hd_id1000210\n" "help.text" msgid "Z-test" -msgstr "" +msgstr "Z 测试" #: statistics.xhp msgctxt "" @@ -59253,7 +59158,7 @@ "par_id1003640\n" "help.text" msgid "Calculates the z-Test of two data samples." -msgstr "" +msgstr "计算两个数据样本的 z 检验。" #: statistics.xhp msgctxt "" @@ -59261,7 +59166,7 @@ "par_id1003650\n" "help.text" msgid "Choose Data - Statistics - Z-test" -msgstr "" +msgstr "选择「数据 - 统计 - Z 测试」" #: statistics.xhp msgctxt "" @@ -59269,7 +59174,7 @@ "par_id1003660\n" "help.text" msgid "For more information on Z-tests, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「Z 检验」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -59285,7 +59190,7 @@ "par_id1003670\n" "help.text" msgid "Variable 1 range: The reference of the range of the first data series to analyze." -msgstr "" +msgstr "「变量 1 范围」: 要分析的第一个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -59293,7 +59198,7 @@ "par_id1003680\n" "help.text" msgid "Variable 2 range: The reference of the range of the second data series to analyze." -msgstr "" +msgstr "「变量 2 范围」: 要分析的第二个数据序列的范围的引用。" #: statistics.xhp msgctxt "" @@ -59301,7 +59206,7 @@ "par_id1003690\n" "help.text" msgid "Results to: The reference of the top left cell of the range where the test will be displayed." -msgstr "" +msgstr "「结果输出到」: 显示检验的区域左上角的单元格的引用。" #: statistics.xhp msgctxt "" @@ -59309,7 +59214,7 @@ "hd_id1000230\n" "help.text" msgid "Results for z-Test:" -msgstr "" +msgstr "Z 测试的结果:" #: statistics.xhp msgctxt "" @@ -59317,7 +59222,7 @@ "par_id1003700\n" "help.text" msgid "The following table shows the z-Test for the data series above:" -msgstr "" +msgstr "下表显示了上述数据序列的「z 检验」:" #: statistics.xhp msgctxt "" @@ -59325,7 +59230,7 @@ "par_id1003710\n" "help.text" msgid "z-test" -msgstr "" +msgstr "z 检验" #: statistics.xhp msgctxt "" @@ -59333,7 +59238,7 @@ "par_id1003720\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -59341,7 +59246,7 @@ "par_id1003740\n" "help.text" msgid "Hypothesized Mean Difference" -msgstr "" +msgstr "假设的均差" #: statistics.xhp msgctxt "" @@ -59349,7 +59254,7 @@ "par_id1003760\n" "help.text" msgid "Variable 1" -msgstr "" +msgstr "变量 1" #: statistics.xhp msgctxt "" @@ -59357,7 +59262,7 @@ "par_id1003770\n" "help.text" msgid "Variable 2" -msgstr "" +msgstr "变量 2" #: statistics.xhp msgctxt "" @@ -59365,7 +59270,7 @@ "par_id1003780\n" "help.text" msgid "Known Variance" -msgstr "" +msgstr "已知方差" #: statistics.xhp msgctxt "" @@ -59373,7 +59278,7 @@ "par_id1003810\n" "help.text" msgid "Mean" -msgstr "均值" +msgstr "平均值" #: statistics.xhp msgctxt "" @@ -59381,7 +59286,7 @@ "par_id1003840\n" "help.text" msgid "Observations" -msgstr "" +msgstr "观测值" #: statistics.xhp msgctxt "" @@ -59389,7 +59294,7 @@ "par_id1003870\n" "help.text" msgid "Observed Mean Difference" -msgstr "" +msgstr "观测的均差" #: statistics.xhp msgctxt "" @@ -59397,7 +59302,7 @@ "par_id1003890\n" "help.text" msgid "z" -msgstr "" +msgstr "z" #: statistics.xhp msgctxt "" @@ -59429,7 +59334,7 @@ "par_id1003930\n" "help.text" msgid "z Critical one-tail" -msgstr "" +msgstr "z 临界单尾" #: statistics.xhp msgctxt "" @@ -59437,7 +59342,7 @@ "par_id1003950\n" "help.text" msgid "P (Z<=z) two-tail" -msgstr "" +msgstr "P (Z<=z) 双尾" #: statistics.xhp msgctxt "" @@ -59453,7 +59358,7 @@ "par_id1003970\n" "help.text" msgid "z Critical two-tail" -msgstr "" +msgstr "z 临界双尾" #: statistics.xhp msgctxt "" @@ -59461,7 +59366,7 @@ "bm_id05004\n" "help.text" msgid "Analysis toolpack;Chi-square testChi-square test;Analysis toolpackData statistics;Chi-square test" -msgstr "" +msgstr "统计分析工具包;卡方检验卡方检验;统计分析工具包数据分析;卡方检验" #: statistics.xhp msgctxt "" @@ -59477,7 +59382,7 @@ "par_id1003641\n" "help.text" msgid "Calculates the Chi-square test of a data sample." -msgstr "" +msgstr "计算数据样本的卡方测试。" #: statistics.xhp msgctxt "" @@ -59485,7 +59390,7 @@ "par_id1003990\n" "help.text" msgid "Choose Data - Statistics - Chi-square Test" -msgstr "" +msgstr "选择「数据 - 统计 - 卡方检验」" #: statistics.xhp msgctxt "" @@ -59493,7 +59398,7 @@ "par_id1004000\n" "help.text" msgid "For more information on chi-square tests, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「卡方检验」的更多信息，请参考阅读相应的维基百科文章。" #: statistics.xhp msgctxt "" @@ -59509,7 +59414,7 @@ "par_id1004010\n" "help.text" msgid "Input range: The reference of the range of the data series to analyze." -msgstr "" +msgstr "「输入范围」: 要分析的数据序列范围的引用。" #: statistics.xhp msgctxt "" @@ -59517,7 +59422,7 @@ "par_id1004020\n" "help.text" msgid "Results to: The reference of the top left cell of the range where the test will be displayed." -msgstr "" +msgstr "「结果输出到」: 显示检验的区域左上角的单元格的引用。" #: statistics.xhp msgctxt "" @@ -59525,7 +59430,7 @@ "hd_id1000231\n" "help.text" msgid "Results for Chi-square Test:" -msgstr "" +msgstr "卡方检验结果:" #: statistics.xhp msgctxt "" @@ -59533,7 +59438,7 @@ "par_id1004030\n" "help.text" msgid "Test of Independence (Chi-Square)" -msgstr "" +msgstr "独立性检验 (卡方检验)" #: statistics.xhp msgctxt "" @@ -59541,7 +59446,7 @@ "par_id1004040\n" "help.text" msgid "Alpha" -msgstr "" +msgstr "α" #: statistics.xhp msgctxt "" @@ -59549,7 +59454,7 @@ "par_id1004060\n" "help.text" msgid "df" -msgstr "" +msgstr "df" #: statistics.xhp msgctxt "" @@ -59557,7 +59462,7 @@ "par_id1004080\n" "help.text" msgid "P-value" -msgstr "" +msgstr "P 值" #: statistics.xhp msgctxt "" @@ -59565,7 +59470,7 @@ "par_id1004100\n" "help.text" msgid "Test Statistic" -msgstr "" +msgstr "检验统计" #: statistics.xhp msgctxt "" @@ -59573,7 +59478,7 @@ "par_id1004120\n" "help.text" msgid "Critical Value" -msgstr "" +msgstr "临界值" #: statistics.xhp msgctxt "" @@ -59581,7 +59486,7 @@ "par_id1004140\n" "help.text" msgid "Regression Analysis" -msgstr "" +msgstr "回归分析" #: statistics_regression.xhp msgctxt "" @@ -59589,7 +59494,7 @@ "tit\n" "help.text" msgid "Regression Analysis" -msgstr "" +msgstr "回归分析" #: statistics_regression.xhp msgctxt "" @@ -59597,7 +59502,7 @@ "hd_id1701201615033510\n" "help.text" msgid "Regression Analysis" -msgstr "" +msgstr "回归分析" #: statistics_regression.xhp msgctxt "" @@ -59605,7 +59510,7 @@ "par_id1001240\n" "help.text" msgid "Produces the regression analysis of a data set" -msgstr "" +msgstr "生成数据集的回归分析" #: statistics_regression.xhp msgctxt "" @@ -59613,7 +59518,7 @@ "bm_id2764278\n" "help.text" msgid "Analysis toolpack;regression analysis regression analysis;Analysis toolpack Data statistics;regression analysis" -msgstr "" +msgstr "分析工具包; 回归分析回归分析;分析工具包数据统计; 回归分析" #: statistics_regression.xhp msgctxt "" @@ -59621,7 +59526,7 @@ "par_id1000040\n" "help.text" msgid "Choose Data - Statistics - Regression" -msgstr "" +msgstr "选择「数据 - 统计 - 回归」" #: statistics_regression.xhp msgctxt "" @@ -59629,7 +59534,7 @@ "par_id1001270\n" "help.text" msgid "For more information on regression analysis, refer to the corresponding Wikipedia article." -msgstr "" +msgstr "关于「回归分析」的更多信息，请参考阅读相应的维基百科文章。" #: statistics_regression.xhp msgctxt "" @@ -59637,7 +59542,7 @@ "hd_id1000070\n" "help.text" msgid "Output Regression Type" -msgstr "" +msgstr "输出回归类型" #: statistics_regression.xhp msgctxt "" @@ -59645,7 +59550,7 @@ "par_id1001280\n" "help.text" msgid "Set the regression type. Three types are available:" -msgstr "" +msgstr "设置回归类型。有三种类型可用:" #: statistics_regression.xhp msgctxt "" @@ -59653,7 +59558,7 @@ "par_id1701201620334364\n" "help.text" msgid "Linear Regression: find a straight line in the form of y = a.x + b, where a is the slope and b is the intercept that best fits the data." -msgstr "" +msgstr "「线性回归」: 找到一条形如「y = a·x + b」的直线, 其中「a」是斜率, b是与数据最匹配的截距。" #: statistics_regression.xhp msgctxt "" @@ -59661,7 +59566,7 @@ "par_id1701201620340168\n" "help.text" msgid "Logarithmic regression: find a logarithmic curve in the form of y = a.ln(x) + b, where a is the slope, b is the intercept and ln(x) is the natural logarithm of x, that best fits the data." -msgstr "" +msgstr "「对数回归」: 找到与数据最匹配的形如「y = a·ln(x) + b」的对数曲线, 其中「a」为斜率, b 为截距, ln(x) 为「x」的自然对数。" #: statistics_regression.xhp msgctxt "" @@ -59669,7 +59574,7 @@ "par_id1701201620340139\n" "help.text" msgid "Power regression: Find a power curve in the form of y = a.x^b, where a is the coefficient, b is the power that best fits the data." -msgstr "" +msgstr "「幂回归」: 找到形如「y = a·x^b」的幂曲线, 其中「a」是系数, b 是与数据最匹配的幂。" #: statistics_regression.xhp msgctxt "" @@ -59677,7 +59582,7 @@ "par_id1001310\n" "help.text" msgid "The results of the three types of regression analysis of the measurements in the table above are shown below." -msgstr "" +msgstr "上表中测量的三种类型「回归分析」的结果如下所示。" #: statistics_regression.xhp msgctxt "" @@ -59685,7 +59590,7 @@ "par_id1701201618090526\n" "help.text" msgid "Regression" -msgstr "" +msgstr "回归" #: statistics_regression.xhp msgctxt "" @@ -59693,7 +59598,7 @@ "par_id1701201618090542\n" "help.text" msgid "Regression Model" -msgstr "" +msgstr "回归模型" #: statistics_regression.xhp msgctxt "" @@ -59709,7 +59614,7 @@ "par_id1701201618090586\n" "help.text" msgid "Logarithmic" -msgstr "" +msgstr "对数" #: statistics_regression.xhp msgctxt "" @@ -59725,7 +59630,7 @@ "par_id1701201618090553\n" "help.text" msgid "R^2" -msgstr "" +msgstr "R²" #: statistics_regression.xhp msgctxt "" @@ -59741,7 +59646,7 @@ "par_id1701201618090563\n" "help.text" msgid "Slope" -msgstr "" +msgstr "斜率" #: statistics_regression.xhp msgctxt "" @@ -59749,7 +59654,7 @@ "par_id1701201618090642\n" "help.text" msgid "Intercept" -msgstr "" +msgstr "截断" #: statistics_regression.xhp msgctxt "" @@ -59757,7 +59662,7 @@ "par_id14337286612130\n" "help.text" msgid "Sampling, Descriptive Statistics, Analysis of Variance (ANOVA), Correlation, Covariance, Exponential Smoothing, Moving Average, Paired t-test, F-test, Z-test, Chi-square test." -msgstr "" +msgstr "采样、 描述性统计、方差分析 (ANOVA)、 相关性、协方差、指数平滑、移动平均、配对 t 检验、 f 测试、z 检验、卡方测试。" #: text2columns.xhp msgctxt "" @@ -59885,7 +59790,7 @@ "bm_id240920171018528200\n" "help.text" msgid "XML Source;load XML data in spreadsheets" -msgstr "" +msgstr "XML 源;在电子表格中加载 XML 数据" #: xml_source.xhp msgctxt "" @@ -59893,7 +59798,7 @@ "hd_id240920171003006302\n" "help.text" msgid "XML Source" -msgstr "" +msgstr "XML 源" #: xml_source.xhp msgctxt "" @@ -59901,7 +59806,7 @@ "par_id240920171003293400\n" "help.text" msgid "Import XML data in a spreadsheet." -msgstr "" +msgstr "在电子表格中导入 XML 数据。" #: xml_source.xhp msgctxt "" @@ -59909,7 +59814,7 @@ "par_id861521496523519\n" "help.text" msgid "The XML Source feature allows to import data from arbitrarily structured XML content into cells in an existing spreadsheet document. It allows XML content to be imported either partially or in full, depending on the structure of the XML content and the map definitions that the user defines. The user can specify multiple non-overlapping sub-structures to be mapped to different cell positions within the same document. The user can import either element contents, attribute values or both." -msgstr "" +msgstr "「XML 源」功能允许将任意结构的 XML 内容中的数据导入到现有电子表格文档中的单元格中。它允许导入部分或全部 XML 内容, 具体取决于 XML 内容的结构和用户定义的映射定义。用户可以指定多个非重叠的子结构, 映射到同一文档中的不同单元格位置。用户可以选择导入元素内容、属性值，或两者均导入。" #: xml_source.xhp msgctxt "" @@ -59917,7 +59822,7 @@ "par_id240920171007389295\n" "help.text" msgid "Choose Data - XML Source." -msgstr "" +msgstr "选择「数据 - XML 源」。" #: xml_source.xhp msgctxt "" @@ -59925,7 +59830,7 @@ "par_id861521496523518\n" "help.text" msgid "This option is only available if Enable experimental features is selected in %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Advanced." -msgstr "" +msgstr "该选项仅在「%PRODUCTNAME - 偏好设置工具 - 选项 - %PRODUCTNAME - 高级」中已选中「启用实验性功能」时可用。" #: xml_source.xhp msgctxt "" @@ -59933,7 +59838,7 @@ "hd_id801521494731764\n" "help.text" msgid "XML Source Dialog" -msgstr "" +msgstr "「XML 源」对话框" #: xml_source.xhp msgctxt "" @@ -59949,7 +59854,7 @@ "par_id291521494762812\n" "help.text" msgid "The dialog consists of four parts." -msgstr "" +msgstr "对话框由四部分组成。" #: xml_source.xhp msgctxt "" @@ -59957,7 +59862,7 @@ "hd_id601521494755603\n" "help.text" msgid "Source file" -msgstr "" +msgstr "源文件" #: xml_source.xhp msgctxt "" @@ -59965,7 +59870,7 @@ "par_id161521494769832\n" "help.text" msgid "This lets you specify the path to the XML file that you wish to import into your document." -msgstr "" +msgstr "允许您指定要导入到文档中的 XML 文件的路径。" #: xml_source.xhp msgctxt "" @@ -59973,7 +59878,7 @@ "hd_id491521494788029\n" "help.text" msgid "Map to Document" -msgstr "" +msgstr "映射到文档" #: xml_source.xhp msgctxt "" @@ -59981,7 +59886,7 @@ "par_id211521494776007\n" "help.text" msgid "This pane shows the structure of the source XML content as a tree. This is initially empty, and gets populated when you specify the source file." -msgstr "" +msgstr "此窗格将源 XML 内容的结构显示为树。最初为空, 在指定源文件时填充。" #: xml_source.xhp msgctxt "" @@ -59989,7 +59894,7 @@ "par_id161521494796604\n" "help.text" msgid "Each element in the tree can be one of three types:" -msgstr "" +msgstr "树中的每个元素可以是以下三种类型之一:" #: xml_source.xhp msgctxt "" @@ -59997,7 +59902,7 @@ "par_id931521494810426\n" "help.text" msgid "attribute, represented by the symbol @" -msgstr "" +msgstr "属性, 以符号 @ 表示" #: xml_source.xhp msgctxt "" @@ -60005,7 +59910,7 @@ "par_id521521494825665\n" "help.text" msgid "single non-recurring element, represented by the symbol , and" -msgstr "" +msgstr "单个不重复出现的元素，以符号 表示，以及" #: xml_source.xhp msgctxt "" @@ -60013,7 +59918,7 @@ "par_id691521494844848\n" "help.text" msgid "recurring element, represented by the symbol ." -msgstr "" +msgstr "可重复出现的元素，以符号 表示。" #: xml_source.xhp msgctxt "" @@ -60021,7 +59926,7 @@ "par_id451521494864514\n" "help.text" msgid "A non-recurring element is an element that can only occur once under the same parent. It is mapped to a single cell in the document." -msgstr "" +msgstr "不重复出现的元素指在同一个父节点下只能出现一次的元素。它将映射为文档中的单个单元格。" #: xml_source.xhp msgctxt "" @@ -60029,7 +59934,7 @@ "par_id361521494872103\n" "help.text" msgid "A recurring element is an element that can appear multiple times under the same parent. It serves as an enclosing parent of a single record entry of multiple record entries. These entries are imported into a range those height equals the number of entries plus one additional header row." -msgstr "" +msgstr "重复出现的元素指同一个父节点下可多次出现的元素。对于多个记录条目，此类元素可作为单个记录条目的父节点。这些条目将导入到范围中，范围的高度与条目数目+额外的标题行一致。" #: xml_source.xhp msgctxt "" @@ -60037,7 +59942,7 @@ "hd_id581521494885433\n" "help.text" msgid "Mapped cell" -msgstr "" +msgstr "已映射的单元格" #: xml_source.xhp msgctxt "" @@ -60045,7 +59950,7 @@ "par_id661521494897796\n" "help.text" msgid "This field specifies the position of a cell in the document that an element or an attribute is linked to. If it is a non-recurring element or an attribute, it simply points to the cell where the value of the linked element/attribute will get imported. If it is a recurring element, it points to the top-left cell of the range where the whole record entries plus header will get imported." -msgstr "" +msgstr "此字段指定元素或属性链接到的文档中单元格的位置。如果是非重复出现的元素或属性, 可直接指向所链接的元素/属性的值即将导入的单元格。如果是重复出现的元素, 应指向即将导入整个记录条目加标题的区域左上角的单元格。" #: xml_source.xhp msgctxt "" @@ -60061,7 +59966,7 @@ "par_id131521553077261\n" "help.text" msgid "Pressing the Import button starts the import process based on the link definitions that the user has provided. Once the import finishes, the dialog will close." -msgstr "" +msgstr "按「导入」按钮将根据用户提供的链接定义开始导入进程。导入完成后, 对话框将关闭。" #: xml_source.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/04.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/04.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/04.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/04.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-10-04 11:48+0200\n" -"PO-Revision-Date: 2019-03-14 07:06+0000\n" +"PO-Revision-Date: 2019-03-19 06:30+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552547175.000000\n" +"X-POOTLE-MTIME: 1552977058.000000\n" #: 01020000.xhp msgctxt "" @@ -822,7 +822,7 @@ "par_id3150385\n" "help.text" msgid "Highlights cells containing values." -msgstr "突出显示含有数值的单元格。" +msgstr "高亮显示含有数值的单元格。" #: 01020000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/guide.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/guide.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/scalc/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/scalc/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-15 15:03+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552662222.000000\n" +"X-POOTLE-MTIME: 1552977060.000000\n" #: address_auto.xhp msgctxt "" @@ -438,7 +438,7 @@ "par_id3149210\n" "help.text" msgid "If you do not see any change in color of the cell contents, choose View - Value Highlighting." -msgstr "如果单元格内容的颜色没有任何变化，请选择「视图 - 突出显示值」。" +msgstr "如果单元格内容的颜色没有任何变化，请选择「视图 - 高亮显示值」。" #: autoformat.xhp msgctxt "" @@ -1174,7 +1174,7 @@ "par_id3147343\n" "help.text" msgid "The Format Cells dialog appears. On the Numbers tab, the \"Number\" category will appear already highlighted. The format is set to \"General\", which causes the result of a calculation containing date entries to be displayed as a date. To display the result as a number, set the number format to \"-1,234\" and close the dialog with the OK button." -msgstr "将显示「单元格格式」对话框。在「数字」选项卡中，已突出显示「数字」类别。此格式被设为「常规」，因此，当计算结果中含有日期条目时，结果将以日期形式显示。如果要以数字形式显示结果，请将数字格式设为 \"-1,234\"，然后点击「确定」按钮关闭对话框。" +msgstr "将显示「单元格格式」对话框。在「数字」选项卡中，已高亮显示「数字」类别。此格式被设为「常规」，因此，当计算结果中含有日期条目时，结果将以日期形式显示。如果要以数字形式显示结果，请将数字格式设为 \"-1,234\"，然后点击「确定」按钮关闭对话框。" #: calc_date.xhp msgctxt "" @@ -1886,7 +1886,7 @@ "par_id3145171\n" "help.text" msgid "If you have assigned a password, enter it in this dialog and click OK." -msgstr "如果您是通过输入密码来进行保护的，则必须在对话框中输入该密码并点击确定进行确认。" +msgstr "如果您是通过输入密码来进行保护的，则必须在对话框中输入该密码并点击「确定」进行确认。" #: cell_unprotect.xhp msgctxt "" @@ -2454,7 +2454,7 @@ "par_id3144767\n" "help.text" msgid "All cells with contents that were included in the selection are now highlighted." -msgstr "选择中所有带内容的单元格被突出显示。" +msgstr "选择中所有带内容的单元格被高亮显示。" #: cellstyle_by_formula.xhp msgctxt "" @@ -2510,7 +2510,7 @@ "par_id3154944\n" "help.text" msgid "With conditional formatting, you can, for example, highlight the totals that exceed the average value of all totals. If the totals change, the formatting changes correspondingly, without having to apply other styles manually." -msgstr "使用条件格式，可以突出显示超过总计平均值的总计。如果总计改变，则格式也相应改变，无需手动应用其他样式。" +msgstr "使用条件格式，可以高亮显示超过总计平均值的总计。如果总计改变，则格式也相应改变，无需手动应用其他样式。" #: cellstyle_conditional.xhp msgctxt "" @@ -2550,7 +2550,7 @@ "hd_id3155766\n" "help.text" msgid "Example of Conditional Formatting: Highlighting Totals Above/Under the Average Value" -msgstr "条件格式化示例: 突出显示高于/低于平均值的总计值" +msgstr "条件格式化示例: 高亮显示高于/低于平均值的总计值" #: cellstyle_conditional.xhp msgctxt "" @@ -2798,7 +2798,7 @@ "tit\n" "help.text" msgid "Highlighting Negative Numbers" -msgstr "突出显示负数" +msgstr "高亮显示负数" #: cellstyle_minusvalue.xhp msgctxt "" @@ -2806,7 +2806,7 @@ "bm_id3147434\n" "help.text" msgid "negative numbers numbers; highlighting negative numbers highlighting;negative numbers colors;negative numbers number formats;colors for negative numbers" -msgstr "负数 数字; 突出显示负数 突出显示;负数 颜色;负数 数字格式;负数的颜色" +msgstr "负数 数字; 高亮显示负数 高亮显示;负数 颜色;负数 数字格式;负数的颜色" #: cellstyle_minusvalue.xhp msgctxt "" @@ -2814,7 +2814,7 @@ "hd_id3147434\n" "help.text" msgid "Highlighting Negative Numbers" -msgstr "突出显示负数" +msgstr "高亮显示负数" #: cellstyle_minusvalue.xhp msgctxt "" @@ -2822,7 +2822,7 @@ "par_id3153878\n" "help.text" msgid "You can format cells with a number format that highlights negative numbers in red. Alternatively, you can define your own number format in which negative numbers are highlighted in other colors." -msgstr "您可以数字格式 (负数用红色突出显示) 来格式化单元格。也可以自己定义数字格式，将负数用其他颜色突出显示。" +msgstr "您可以数字格式 (负数用红色高亮显示) 来格式化单元格。也可以自己定义数字格式，将负数用其他颜色高亮显示。" #: cellstyle_minusvalue.xhp msgctxt "" @@ -2918,7 +2918,7 @@ "par_id3149209\n" "help.text" msgid "If the range is not named, click in the field next to the Source data area. A blinking text cursor appears. Type a reference for the first source data range or select the range with the mouse." -msgstr "如果该区域未命名，则点击源数据区域旁的字段。您可以看到闪动的文本光标。现在可以用键盘输入第一个源数据区域的引用，或用鼠标选中该区域。" +msgstr "如果该区域未命名，则点击「源数据区域」旁的字段。您可以看到闪动的文本光标。现在可以用键盘输入第一个源数据区域的引用，或用鼠标选中该区域。" #: consolidate.xhp msgctxt "" @@ -2926,7 +2926,7 @@ "par_id3155529\n" "help.text" msgid "Click Add to insert the selected range in the Consolidation areas field." -msgstr "点击添加将选中的区域加入到合并计算区域字段中。" +msgstr "点击「添加」将选中的区域加入到「合并计算区域」字段中。" #: consolidate.xhp msgctxt "" @@ -2950,7 +2950,7 @@ "par_id3150215\n" "help.text" msgid "If the target range is not named, click in the field next to Copy results to and enter the reference of the target range. Alternatively, you can select the range using the mouse or position the cursor in the top left cell of the target range." -msgstr "如果目标区域没有名称，可以点击复制结果到旁边的字段，然后输入目标区域的引用。也可以通过鼠标，或者将光标置于目标区域左上角的单元格处，来选择目标区域。" +msgstr "如果目标区域没有名称，可以点击「复制结果到」旁边的字段，然后输入目标区域的引用。也可以通过鼠标，或者将光标置于目标区域左上角的单元格处，来选择目标区域。" #: consolidate.xhp msgctxt "" @@ -3446,7 +3446,7 @@ "par_id3152869\n" "help.text" msgid "From the Export of text files dialog that appears, select the character set and the field and text delimiters for the data to be exported, and confirm with OK." -msgstr "在随后出现的「导出文本文件」对话框中，为要导出的数据选择字符集、字段分隔符和文字分隔符，然后点击确定进行确认。" +msgstr "在随后出现的「导出文本文件」对话框中，为要导出的数据选择字符集、字段分隔符和文字分隔符，然后点击「确定」进行确认。" #: csv_formula.xhp msgctxt "" @@ -4966,7 +4966,7 @@ "par_id9363689\n" "help.text" msgid "In spreadsheet documents you can find words, formulas, and styles. You can navigate from one result to the next, or you can highlight all matching cells at once, then apply another format or replace the cell content by other content." -msgstr "在电子表格文档中，可以找到文字、公式以及样式。您可以从一个结果浏览到下一个结果，也可以同时突出显示所有匹配单元格，然后应用另一种格式或使用其他内容替换单元格内容。" +msgstr "在电子表格文档中，可以找到文字、公式以及样式。您可以从一个结果浏览到下一个结果，也可以同时高亮显示所有匹配单元格，然后应用另一种格式或使用其他内容替换单元格内容。" #: finding.xhp msgctxt "" @@ -5774,7 +5774,7 @@ "par_id3155764\n" "help.text" msgid "If you are editing a formula with references, the references and the associated cells will be highlighted with the same color. You can now resize the reference border using the mouse, and the reference in the formula displayed in the input line also changes. Show references in color can be deactivated under %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc - View." -msgstr "当编辑含有引用的公式时，引用及其相关联的单元格将以相同的颜色突出显示。这时，您可以使用鼠标来修改引用框的大小，输入行中显示的公式中的引用也将随之改变。「用彩色显示引用内容」可以通过%PRODUCTNAME - 偏好设置工具 - 选项 - %PRODUCTNAME Calc - 视图停用。" +msgstr "当编辑含有引用的公式时，引用及其相关联的单元格将以相同的颜色高亮显示。这时，您可以使用鼠标来修改引用框的大小，输入行中显示的公式中的引用也将随之改变。「用彩色显示引用内容」可以通过%PRODUCTNAME - 偏好设置工具 - 选项 - %PRODUCTNAME Calc - 视图停用。" #: formula_enter.xhp msgctxt "" @@ -9278,7 +9278,7 @@ "par_id3153963\n" "help.text" msgid "$[officename] Calc shows the references to a formula. If, for example, you click the formula =SUM(A1:C5;D15:D24) in a cell, the two referenced areas in the sheet will be highlighted in color. For example, the formula component \"A1:C5\" may be in blue and the cell range in question bordered in the same shade of blue. The next formula component \"D15:D24\" can be marked in red in the same way." -msgstr "$[officename] Calc 还能够突出显示对公式中数据的引用。比如按击单元格中的公式「=SUM(A1:C5;D15:D24)」后，工作表中这两个被引用的区域就会用颜色高亮显示。公式中的「A1:C5」部分显示为蓝色，工作表中的这个区域也以蓝色框表示；公式中的「D15:D24」显示为红色，相应地工作表中的这个区域则以红色框表示。" +msgstr "$[officename] Calc 还能够高亮显示对公式中数据的引用。比如按击单元格中的公式「=SUM(A1:C5;D15:D24)」后，工作表中这两个被引用的区域就会用颜色高亮显示。公式中的「A1:C5」部分显示为蓝色，工作表中的这个区域也以蓝色框表示；公式中的「D15:D24」显示为红色，相应地工作表中的这个区域则以红色框表示。" #: relativ_absolut_ref.xhp msgctxt "" @@ -9982,7 +9982,7 @@ "par_id3148645\n" "help.text" msgid "For example, enter the text \"Jan\" or \"January\" in an empty cell. Select the cell and click the mouse on the lower right corner of the cell border. Then drag the selected cell a few cells to the right or downwards. When you release the mouse button, the highlighted cells will be filled with the names of the months." -msgstr "例如，在空白单元格中输入「一」或「一月」。选择该单元格并在单元格边框右下角处点击鼠标。然后向下或向右拖动选中的单元格。释放鼠标按钮时，突出显示的单元格就会按设置的月份名称填充。" +msgstr "例如，在空白单元格中输入「一」或「一月」。选择该单元格并在单元格边框右下角处点击鼠标。然后向下或向右拖动选中的单元格。释放鼠标按钮时，高亮显示的单元格就会按设置的月份名称填充。" #: sorted_list.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/schart/01.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/schart/01.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/schart/01.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/schart/01.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-02-27 13:56+0100\n" -"PO-Revision-Date: 2019-03-15 15:04+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552662274.000000\n" +"X-POOTLE-MTIME: 1552977061.000000\n" #: 03010000.xhp msgctxt "" @@ -6350,7 +6350,7 @@ "par_id1589098\n" "help.text" msgid "In Calc, click Select data range to minimize the dialog, then drag to select the data range. When you release the mouse, the data are entered. Click Select data range again to add a data range. In the input field of the minimized dialog, click after the entry and type a semicolon. Then drag to select the next range." -msgstr "在 Calc 中，点击「选择数据区域」使对话框最小化，然后拖动鼠标选择数据区域。当你松开鼠标时，数据被输入。再次点击「选择数据区域】去添加一个数据区域。在最小化的对话框的输入字段中，点击条目的后面并输入一个分号。然后拖动鼠标选择下一个区域。" +msgstr "在 Calc 中，点击「选择数据区域」使对话框最小化，然后拖动鼠标选择数据区域。当你松开鼠标时，数据被输入。再次点击「选择数据区域」去添加一个数据区域。在最小化的对话框的输入字段中，点击条目的后面并输入一个分号。然后拖动鼠标选择下一个区域。" #: type_stock.xhp msgctxt "" @@ -6486,7 +6486,7 @@ "par_id2377697\n" "help.text" msgid "The legend shows the value from the range, which you entered in the Range for Name field in the Data Range dialog. The default entry is the column header of the closing price column." -msgstr "图例显示区域的值，该区域是您在数据区域对话框的名称区域字段中所输入的。默认条目是收盘价格列的列标题。" +msgstr "图例显示区域的值，该区域是您在「数据区域」对话框的「名称区域」字段中所输入的。默认条目是收盘价格列的列标题。" #: type_stock.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sdraw/guide.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sdraw/guide.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/sdraw/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/sdraw/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-10-02 17:56+0200\n" -"PO-Revision-Date: 2019-03-14 07:06+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552547176.000000\n" +"X-POOTLE-MTIME: 1552977061.000000\n" #: align_arrange.xhp msgctxt "" @@ -1702,7 +1702,7 @@ "par_id3146971\n" "help.text" msgid "Press the Right arrow key until you reach the toolbar icon of a drawing tool." -msgstr "按下向右方向键直至到达绘图工具的工具栏图标。" +msgstr "按下「向右」方向键直至到达绘图工具的工具栏图标。" #: keyboard.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/00.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/00.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/00.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/00.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549147.000000\n" +"X-POOTLE-MTIME: 1552977063.000000\n" #: 00000001.xhp msgctxt "" @@ -806,7 +806,7 @@ "par_id3145420\n" "help.text" msgid "Hyperlinks are cross-references, highlighted in text in various colors and activated by mouse-click. With the aid of hyperlinks, readers can jump to specific information within a document as well as to related information in other documents." -msgstr "超链接是一种交叉引用，它以各种颜色的文本进行突出显示，可通过点击鼠标将其激活。借助超链接，读者可以跳转到文档中的特定信息，还可以跳转到其他文档中的相关信息。" +msgstr "超链接是一种交叉引用，它以各种颜色的文本进行高亮显示，可通过点击鼠标将其激活。借助超链接，读者可以跳转到文档中的特定信息，还可以跳转到其他文档中的相关信息。" #: 00000002.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/01.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/01.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-04-01 09:29+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549151.000000\n" +"X-POOTLE-MTIME: 1554110992.000000\n" #: 01010000.xhp msgctxt "" @@ -7030,7 +7030,7 @@ "par_id3145313\n" "help.text" msgid "The longest possible string that matches this search pattern in a paragraph is always found. If the paragraph contains the string \"AX 4 AX4\", the entire passage is highlighted." -msgstr "始终查找段落中匹配此查找模式的最长的可能字符串。如果段落包含字符串 \"AX 4 AX4\"，则突出显示整个段落。" +msgstr "始终查找段落中匹配此查找模式的最长的可能字符串。如果段落包含字符串 \"AX 4 AX4\"，则高亮显示整个段落。" #: 02100001.xhp msgctxt "" @@ -7254,7 +7254,7 @@ "par_id3156061\n" "help.text" msgid "For example, if your text contains the number 13487889 and you search using the regular expression (8)7\\1\\1, \"8788\" is found." -msgstr "例如，如果文本中包含数字「13487889」，并使用正则表达式 (8)7\\1\\1进行查找，则可以查找到「8788」。" +msgstr "例如，如果文本中包含数字「13487889」，并使用正则表达式「(8)7\\1\\1」进行查找，则可以查找到「8788」。" #: 02100001.xhp msgctxt "" @@ -19294,7 +19294,7 @@ "par_id3151114\n" "help.text" msgid "Click a color. Click No Fill to remove a background or highlighting color. Click Automatic to reset a font color." -msgstr "点击颜色。点击「无填充」以删除背景或突出显示的颜色。点击「自动」以重置字体颜色。" +msgstr "点击颜色。点击「无填充」以删除背景或高亮显示的颜色。点击「自动」以重置字体颜色。" #: 05030700.xhp msgctxt "" @@ -24558,7 +24558,7 @@ "par_idN10705\n" "help.text" msgid "Word wrap text in shape" -msgstr "图形中的文字换行" +msgstr "图形中文字自动换行" #: 05220000.xhp msgctxt "" @@ -29990,7 +29990,7 @@ "par_id3149798\n" "help.text" msgid "Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below." -msgstr "突出显示句子中拼写错误的词。编辑该单词或句子，或者点击以下文本框中的一个建议。" +msgstr "高亮显示句子中拼写错误的词。编辑该单词或句子，或者点击以下文本框中的一个建议。" #: 06010000.xhp msgctxt "" @@ -32118,7 +32118,7 @@ "par_id3147000\n" "help.text" msgid "Click the word to replace the highlighted word. Use the AutoCorrect submenu for permanent replacement." -msgstr "点击该单词可替换突出显示的单词。使用「自动更正」子菜单可进行永久性替换。" +msgstr "点击该单词可替换高亮显示的单词。使用「自动更正」子菜单可进行永久性替换。" #: 06040500.xhp msgctxt "" @@ -32182,7 +32182,7 @@ "par_id3149177\n" "help.text" msgid "To always replace the highlighted word, click a word in the list. The word pair is stored in the replacement table under Tools - AutoCorrect - AutoCorrect Options - Replace." -msgstr "要始终替换突出显示的词，请点击列表中的词。词汇对存储在「工具」-「自动更正」-「替换」中的替换表格中。" +msgstr "要始终替换高亮显示的词，请点击列表中的词。词汇对存储在「工具」-「自动更正」-「替换」中的替换表格中。" #: 06040500.xhp msgctxt "" @@ -32198,7 +32198,7 @@ "par_id3150443\n" "help.text" msgid "Changes the language settings for the highlighted word, if the word is found in another dictionary." -msgstr "如果在另一个词典中找到了突出显示的字词，可以修改这个字词的语言设置。" +msgstr "如果在另一个词典中找到了高亮显示的字词，可以修改这个字词的语言设置。" #: 06040500.xhp msgctxt "" @@ -32214,7 +32214,7 @@ "par_id3148925\n" "help.text" msgid "Changes the language setting for the paragraph that contains the highlighted word, if the word is found in another dictionary." -msgstr "如果在另一个词典中找到了突出显示的字词，可以修改这个字词所在段落的语言设置。" +msgstr "如果在另一个词典中找到了高亮显示的字词，可以修改这个字词所在段落的语言设置。" #: 06040600.xhp msgctxt "" @@ -32862,7 +32862,7 @@ "par_id3153935\n" "help.text" msgid "Select the level(s) that you want to define the formatting options for. The selected level is highlighted in the preview." -msgstr "选择要定义格式化选项的级别。选中的级别在预览中突出显示。" +msgstr "选择要定义格式化选项的级别。选中的级别在预览中高亮显示。" #: 06050500.xhp msgctxt "" @@ -41310,7 +41310,7 @@ "par_idN107F4\n" "help.text" msgid "Create PDF form" -msgstr "创建 PDF 格式" +msgstr "创建 PDF 表单" #: ref_pdf_export.xhp msgctxt "" @@ -42406,7 +42406,7 @@ "tit\n" "help.text" msgid "E-mail as PDF" -msgstr "文档当作 PDF 附件" +msgstr "以 PDF 格式发送电子邮件" #: ref_pdf_send_as.xhp msgctxt "" @@ -42414,7 +42414,7 @@ "hd_id3146902\n" "help.text" msgid "E-mail as PDF" -msgstr "文档当作 PDF 附件" +msgstr "以 PDF 格式发送电子邮件" #: ref_pdf_send_as.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/02.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/02.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/02.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/02.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-14 07:31+0000\n" +"PO-Revision-Date: 2019-03-24 04:58+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552548681.000000\n" +"X-POOTLE-MTIME: 1553403486.000000\n" #: 01110000.xhp msgctxt "" @@ -870,7 +870,7 @@ "hd_id3157844\n" "help.text" msgid "Option Button" -msgstr "选项按钮" +msgstr "单选按钮" #: 01170000.xhp msgctxt "" @@ -886,7 +886,7 @@ "par_id3149123\n" "help.text" msgid "Creates an option button. Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (Name property). Normally, they are given a group box." -msgstr "创建一个选项字段。使用选项字段，用户可以选择多个选项中的某个选项。功能相同的选项字段具有相同的名称 (「名称 属性」)。通常，这些字段具有一个组框。" +msgstr "创建一个单选按钮。使用单选按钮，用户可以选择多个选项中的某个选项。功能相同的单选按钮具有相同的名称 (「名称 属性」)。通常，这些字段具有一个组框。" #: 01170000.xhp msgctxt "" @@ -1534,7 +1534,7 @@ "par_id3154572\n" "help.text" msgid "Creates a frame to visually group several controls. Group boxes allow you to group option buttons in a frame." -msgstr "创建用于对多个控制进行可视化组合的框架。使用「组框」可以对框架中的选项按钮进行组合。" +msgstr "创建用于对多个控制进行可视化组合的框架。使用「组框」可以对框架中的单选按钮进行组合。" #: 01170000.xhp msgctxt "" @@ -1782,7 +1782,7 @@ "par_id3153369\n" "help.text" msgid "The selected control is transformed into an option button." -msgstr "选中的控件被转换成选项按钮。" +msgstr "选中的控件被转换成单选按钮。" #: 01170001.xhp msgctxt "" @@ -2262,7 +2262,7 @@ "hd_id3153062\n" "help.text" msgid "To enter the special keyboard-only edit mode for Table Controls:" -msgstr "进入仅使用键盘对表格控件进行编辑的特殊模式:" +msgstr "进入仅使用键盘对「表格控件」进行编辑的特殊模式:" #: 01170004.xhp msgctxt "" @@ -2630,7 +2630,7 @@ "par_idN107F7\n" "help.text" msgid "Enter the URL into the form's data property \"URL\" text box when you export to a PDF file." -msgstr "导出到 PDF 文件时，将 URL 输入到表单的数据属性 \"URL\" 文本框中。" +msgstr "导出到 PDF 文件时，将 URL 输入到表单的数据属性「URL」文本框中。" #: 01170101.xhp msgctxt "" @@ -3854,7 +3854,7 @@ "par_idN115AE\n" "help.text" msgid "Specifies whether Check boxes and Option buttons are displayed in a 3D look (default) or a flat look." -msgstr "指定「复选框」和「选项按钮」显示为三维 (默认值) 还是平面。" +msgstr "指定「复选框」和「单选按钮」显示为三维 (默认值) 还是平面。" #: 01170101.xhp msgctxt "" @@ -4374,7 +4374,7 @@ "hd_id3154548\n" "help.text" msgid "Tabstop" -msgstr "制表符" +msgstr "制表位" #: 01170101.xhp msgctxt "" @@ -4934,7 +4934,7 @@ "par_id3163812\n" "help.text" msgid "You can enter a reference value for the web form, which will be remitted to a server when sending the form. With database forms, the value entered is written in the database field, assigned to the control field. You can assign a reference value to option buttons and check boxes. The reference value will be remitted to a server when sending the web form. With database forms the value entered here will be written in the database assigned to the control field." -msgstr "您能够输入 Web 表单的引用值，当发送表单时，该值将被提交到服务器。在数据库表单中，该输入值将被写入到数据库字段中，并指定给控件字段。您能为选项按钮和复选框指定引用值。当发送 Web 表单时，引用值将被提交到服务器。在数据库表单中，此处输入的值将被写入到指定给控件字段的数据库中。" +msgstr "您能够输入 Web 表单的引用值，当发送表单时，该值将被提交到服务器。在数据库表单中，该输入值将被写入到数据库字段中，并指定给控件字段。您能为单选按钮和复选框指定引用值。当发送 Web 表单时，引用值将被提交到服务器。在数据库表单中，此处输入的值将被写入到指定给控件字段的数据库中。" #: 01170102.xhp msgctxt "" @@ -5870,7 +5870,7 @@ "par_idN10F58\n" "help.text" msgid "Option button (radio button) with linked cell" -msgstr "带有链接单元格的选项按钮 (单选按钮)" +msgstr "带有链接单元格的单选按钮 (单选按钮)" #: 01170102.xhp msgctxt "" @@ -5894,7 +5894,7 @@ "par_idN10F72\n" "help.text" msgid "Select the option button:" -msgstr "点击选项按钮" +msgstr "点击单选按钮" #: 01170102.xhp msgctxt "" @@ -5934,7 +5934,7 @@ "par_idN10F92\n" "help.text" msgid "If entered value is TRUE or not 0: Option button is selected.
If entered value is FALSE or 0: Option button is deselected." -msgstr "如果输入值为 TRUE 或非 0: 选中选项按钮
如果输入值为 FALSE 或 0: 取消选中选项按钮。" +msgstr "如果输入值为 TRUE 或非 0: 选中单选按钮
如果输入值为 FALSE 或 0: 取消选中单选按钮。" #: 01170102.xhp msgctxt "" @@ -5950,7 +5950,7 @@ "par_idN10FA1\n" "help.text" msgid "Option button is deselected." -msgstr "取消选中选项按钮。" +msgstr "取消选中单选按钮。" #: 01170102.xhp msgctxt "" @@ -5958,7 +5958,7 @@ "par_idN110EF\n" "help.text" msgid "Click the option button. The Reference value box contains text:" -msgstr "点击选项按钮。「引用值」框包含文本" +msgstr "点击单选按钮。「引用值」框包含文本" #: 01170102.xhp msgctxt "" @@ -5974,7 +5974,7 @@ "par_idN110FA\n" "help.text" msgid "Click another option button of the same group. The Reference value box contains text:" -msgstr "点击同组中的其他选项按钮。「引用值」框包含文本。" +msgstr "点击同组中的其他单选按钮。「引用值」框包含文本。" #: 01170102.xhp msgctxt "" @@ -5998,7 +5998,7 @@ "par_idN1110A\n" "help.text" msgid "The option button is selected." -msgstr "选中选项按钮。" +msgstr "选中单选按钮。" #: 01170102.xhp msgctxt "" @@ -6014,7 +6014,7 @@ "par_idN11115\n" "help.text" msgid "The option button is cleared." -msgstr "清除选项按钮。" +msgstr "清除单选按钮。" #: 01170102.xhp msgctxt "" @@ -7670,7 +7670,7 @@ "par_id3153192\n" "help.text" msgid "If you choose \"Table\" or \"Query\", the form will refer to the table or query that you specify under Content. If you want to create a new query or a subform, then you have to choose the \"SQL\" option. You can then enter the statement for the SQL query or the subform directly in the List content box on the Control properties Data tab page." -msgstr "如果选择「表格」或「查询」，则表单将会引用您在「数据源」中指定的表格或查询。如果希望创建一个新的查询或子表单，则需要选择「SQL」选项。然后，您可以在列表内容方框中直接输入用于 SQL 查询或子表单的语句。将基于指定的语句生成表单。" +msgstr "如果选择「表格」或「查询」，则表单将会引用您在「数据源」中指定的表格或查询。如果希望创建一个新的查询或子表单，则需要选择「SQL」选项。然后，您可以在「列表内容」方框中直接输入用于 SQL 查询或子表单的语句。将基于指定的语句生成表单。" #: 01170203.xhp msgctxt "" @@ -7950,7 +7950,7 @@ "par_id3149568\n" "help.text" msgid "The subform is based on an SQL query; more specifically, on a Parameter Query. If a field name is entered in the Link master fields box, the data contained in that field in the main form is read to a variable that you must enter in Link slave fields. In an appropriate SQL statement, this variable is compared to the table data that the subform refers to. Alternatively, you can enter the column name in the Link master fields box." -msgstr "子表单基于 SQL 查询；更为确切的说，是位于参数查询。如果在「链接主字段方框中输入一个字段名称，则该字段在主表单中所包含的数据会被读取至在链接从字段」中输入的一个变量。在相应 SQL 语句中，此变量会与子表单引用的表格数据相比较。或者，也可以在链接主字段方框中输入此列名。" +msgstr "子表单基于 SQL 查询；更为确切的说，是位于参数查询。如果在「链接主字段方框中输入一个字段名称，则该字段在主表单中所包含的数据会被读取至在「链接从字段」中输入的一个变量。在相应 SQL 语句中，此变量会与子表单引用的表格数据相比较。或者，也可以在链接主字段」方框中输入此列名。" #: 01170203.xhp msgctxt "" @@ -9998,7 +9998,7 @@ "hd_id3109850\n" "help.text" msgid "Highlight Color" -msgstr "突出显示" +msgstr "高亮显示" #: 02160000.xhp msgctxt "" @@ -10006,7 +10006,7 @@ "par_id3154927\n" "help.text" msgid "Applies the current highlight color to the background of a text selection. If no text is selected, click the Highlight Color icon, select the text that you want to highlight, and then click the Highlight Color icon again. To change the highlight color, click the arrow next to the Highlight Color icon, and then click the color that you want." -msgstr "将当前的突出显示颜色应用于所选文本的背景。如果未选择任何文本，请点击「突出显示」图标，选择要突出显示的文本，然后再次点击「突出显示」图标。要修改突出显示的颜色，点击「突出显示」图标，然后点击所需的颜色。" +msgstr "将当前的高亮显示颜色应用于所选文本的背景。如果未选择任何文本，请点击「高亮显示」图标，选择要高亮显示的文本，然后再次点击「高亮显示」图标。要修改高亮显示的颜色，点击「高亮显示」图标，然后点击所需的颜色。" #: 02160000.xhp msgctxt "" @@ -10030,7 +10030,7 @@ "par_id3166460\n" "help.text" msgid "To Apply Highlighting" -msgstr "应用突出显示" +msgstr "应用高亮显示" #: 02160000.xhp msgctxt "" @@ -10038,7 +10038,7 @@ "par_idN1072B\n" "help.text" msgid "On the Formatting bar, click the Highlight Color icon." -msgstr "点击「格式」栏上的「突出显示」图标。" +msgstr "点击「格式」栏上的「高亮显示」图标。" #: 02160000.xhp msgctxt "" @@ -10046,7 +10046,7 @@ "par_idN10736\n" "help.text" msgid "To change the highlighting color, click the arrow next to the Highlight Color icon, and then click the color that you want." -msgstr "要修改突出显示的颜色，点击「突出显示」图标，然后点击所需的颜色。" +msgstr "要修改高亮显示的颜色，点击「高亮显示」图标，然后点击所需的颜色。" #: 02160000.xhp msgctxt "" @@ -10054,7 +10054,7 @@ "par_idN1073E\n" "help.text" msgid "Select the text that you want to highlight." -msgstr "选择要突出显示的文本。" +msgstr "选择要高亮显示的文本。" #: 02160000.xhp msgctxt "" @@ -10062,7 +10062,7 @@ "par_idN10743\n" "help.text" msgid "To apply highlighting to a single word, double-click the word." -msgstr "要突出显示某个词，请双击该词。" +msgstr "要高亮显示某个词，请双击该词。" #: 02160000.xhp msgctxt "" @@ -10078,7 +10078,7 @@ "par_idN1075A\n" "help.text" msgid "To Remove Highlighting" -msgstr "要删除突出显示" +msgstr "要删除高亮显示" #: 02160000.xhp msgctxt "" @@ -10086,7 +10086,7 @@ "par_idN10760\n" "help.text" msgid "Select the highlighted text." -msgstr "选择突出显示的文本。" +msgstr "选择高亮显示的文本。" #: 02160000.xhp msgctxt "" @@ -10094,7 +10094,7 @@ "par_id3149784\n" "help.text" msgid "On the Formatting bar, click the arrow next to the Highlight Color icon, and then click No Fill." -msgstr "在「格式」栏上，点击「突出显示」图标旁的箭头，然后点击「无填充」。" +msgstr "在「格式」栏上，点击「高亮显示」图标旁的箭头，然后点击「无填充」。" #: 02170000.xhp msgctxt "" @@ -11198,7 +11198,7 @@ "hd_id3146946\n" "help.text" msgid "Export Directly as PDF" -msgstr "直接导出为 PDF" +msgstr "直接导出为 PDF" #: 07090000.xhp msgctxt "" @@ -13606,7 +13606,7 @@ "par_id3149549\n" "help.text" msgid "While the functions Sort in Ascending Order and Sort in Descending Order sort by one criterion only, you can combine several criteria in the Sort Order dialog." -msgstr "可以仅按一个条件用功能「升序排序」和「降序排序」排序，也可以在「排序顺序」对话框中组合多个条件。" +msgstr "可以仅按单个条件用「升序排序」和「降序排序」功能进行排序，也可以在「排序顺序」对话框中组合多个条件。" #: 12100100.xhp msgctxt "" @@ -13630,7 +13630,7 @@ "par_id3155941\n" "help.text" msgid "Use this area to enter sorting criteria. If you enter additional sorting criteria under and then, the data matching the content of the higher-order criterion is ordered according to the next criterion." -msgstr "在此区域中输入排序条件。如果在「之后」中输入其他排序条件，那么符合上一级排序条件的数据将按照下一个条件进行排序。" +msgstr "在此区域中输入排序条件。如果在「之后」中输入其他排序条件，那么符合更高级比诶排序条件的数据将按照下一个条件进行排序。" #: 12100100.xhp msgctxt "" @@ -14510,7 +14510,7 @@ "par_id3154368\n" "help.text" msgid "Starts or cancels the search. If the search is successfully completed, the corresponding field in the table is highlighted. You can continue the search by clicking the Search button again. You can cancel a search process by clicking the Cancel button." -msgstr "开始或取消查找。如果查找成功完成，会突出显示表格中的相应字段。再次点击「查找」按钮，可以继续查找。点击「取消」按钮，可以取消查找过程。" +msgstr "开始或取消查找。如果查找成功完成，会高亮显示表格中的相应字段。再次点击「查找」按钮，可以继续查找。点击「取消」按钮，可以取消查找过程。" #: 12100200.xhp msgctxt "" @@ -17484,7 +17484,7 @@ "par_id3149123\n" "help.text" msgid "Creates an option button. Option buttons enable the user to choose one of several options. Option buttons with the same functionality are given the same name (Nameproperty). Normally, they are given a group box." -msgstr "创建一个选项字段。使用选项字段，用户可以选择多个选项中的某个选项。功能相同的选项字段具有相同的名称 (名称属性)。通常，这些字段具有一个组框。" +msgstr "创建一个单选按钮。使用单选按钮，用户可以选择多个选项中的某个选项。功能相同的单选按钮具有相同的名称 (名称属性)。通常，这些字段具有一个组框。" msgctxt "" "18030000.xhp\n" @@ -17694,7 +17694,7 @@ "par_id3154572\n" "help.text" msgid "Creates a frame to visually group several controls. Group boxes allow you to group option buttons in a frame." -msgstr "创建用于对多个控制进行可视化组合的框架。使用组框可以对框架中的选项按钮进行组合。" +msgstr "创建用于对多个控制进行可视化组合的框架。使用组框可以对框架中的单选按钮进行组合。" msgctxt "" "01170000.xhp\n" @@ -17974,7 +17974,7 @@ "par_id3147228\n" "help.text" msgid "Sends the data that is entered in other control fields of the current form to the address that is specified in Form Properties under URL." -msgstr "将在当前表单的其他控制字段中输入的数据发送到在 URL 下的「表单属性」中指定的地址。" +msgstr "将当前表单其他控件字段中输入的数据发送到「表单属性」中「URL」下面指定的地址。" msgctxt "" "01170101.xhp\n" @@ -18590,7 +18590,7 @@ "par_idN10F72\n" "help.text" msgid "Select the option button" -msgstr "选中选项按钮" +msgstr "选中单选按钮" msgctxt "" "01170102.xhp\n" @@ -18625,7 +18625,7 @@ "par_idN10F92\n" "help.text" msgid "If entered value is TRUE or not 0: Option button is selected
If entered value is FALSE or 0: Option button is deselected" -msgstr "如果输入值为 TRUE 或非 0: 选中选项按钮
如果输入值为 FALSE 或 0: 取消选中选项按钮" +msgstr "如果输入值为 TRUE 或非 0: 选中单选按钮
如果输入值为 FALSE 或 0: 取消选中单选按钮" msgctxt "" "01170102.xhp\n" @@ -18639,14 +18639,14 @@ "par_idN10FA1\n" "help.text" msgid "Option button is deselected" -msgstr "取消选中选项按钮" +msgstr "取消选中单选按钮" msgctxt "" "01170102.xhp\n" "par_idN110EF\n" "help.text" msgid "Click the option button. The Reference value box contains text." -msgstr "点击选项按钮。引用值框包含文本。" +msgstr "点击单选按钮。引用值框包含文本。" msgctxt "" "01170102.xhp\n" @@ -18660,7 +18660,7 @@ "par_idN110FA\n" "help.text" msgid "Click another option button of the same group. The Reference value box contains text." -msgstr "点击同组中的其他选项按钮。引用值框包含文本。" +msgstr "点击同组中的其他单选按钮。引用值框包含文本。" msgctxt "" "01170102.xhp\n" @@ -19178,7 +19178,7 @@ "par_idN10757\n" "help.text" msgid "To turn off highlighting, press Esc." -msgstr "要关闭突出显示，请按 Esc 键。" +msgstr "要关闭高亮显示，请按 Esc 键。" msgctxt "" "03110000.xhp\n" @@ -19416,7 +19416,7 @@ "par_id3149549\n" "help.text" msgid "While the functions Sort in Ascending Order and Sort in Descending Order sort by one criterion only, you can combine several criteria in the Sort Order dialog." -msgstr "可以仅按一个标准用功能升序排序和降序排序排序，也可以在「排序」对话框中合并多个标准。" +msgstr "可以仅按单个条件用「升序排序」和「降序排序」功能进行排序，也可以在「排序顺序」对话框中组合多个条件。" msgctxt "" "12100100.xhp\n" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/autopi.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/autopi.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/autopi.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/autopi.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-04-24 12:21+0200\n" -"PO-Revision-Date: 2019-03-15 15:05+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552662324.000000\n" +"X-POOTLE-MTIME: 1552977071.000000\n" #: 01000000.xhp msgctxt "" @@ -6574,7 +6574,7 @@ "par_id3152999\n" "help.text" msgid "Select the cells you want to convert in this range, if you did not mark the Entire document check box. Select an option and then click the desired entries in the Templates / Currency ranges field. The selected range will be visible as such in the document. Click Convert to carry out the conversion." -msgstr "如果您没有选中整个文档复选框，请选择此区域中要转换的单元格。选择一个选项，然后在【模板 / 货币区域」字段中点击所需条目。选中区域与文档中的其他区域一样均可见。点击转换进行转换。" +msgstr "如果您没有选中「整个文档」复选框，请选择此区域中要转换的单元格。选择一个选项，然后在「模板 / 货币区域」字段中点击所需条目。选中区域与文档中的其他区域一样均可见。点击「转换」进行转换。" #: 01150000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/explorer/database.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-13 12:05+0000\n" +"PO-Revision-Date: 2019-03-24 04:58+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478741.000000\n" +"X-POOTLE-MTIME: 1553403487.000000\n" #: 02000000.xhp msgctxt "" @@ -654,7 +654,7 @@ "par_id3150715\n" "help.text" msgid "Alternatively, delete the respective entries in Fields involved in the Relations dialog. Or press Tab until the connecting vector is displayed highlighted, then press Shift+F10 to open the context menu and select Delete command." -msgstr "另外，也可以在「关系对话框中删除相关字段包含的相应条目，或者按 Tab 键找到突出显示的连结向量，然后按 Shift+F10 键打开右键菜单并选择删除」命令。" +msgstr "另外，也可以在「关系对话框中删除相关字段包含的相应条目，或者按 Tab 键找到高亮显示的连结向量，然后按 Shift+F10 键打开右键菜单并选择删除」命令。" #: 02010100.xhp msgctxt "" @@ -942,7 +942,7 @@ "par_id8760818\n" "help.text" msgid "If you are working with the embedded HSQL database, the list box in the Function row offers you the following options:" -msgstr "如果使用的是嵌入式 HSQL 数据库，函数行的列表框提供以下选项:" +msgstr "如果使用的是嵌入式 HSQL 数据库，「函数」行的列表框提供以下选项:" #: 02010100.xhp msgctxt "" @@ -1230,7 +1230,7 @@ "par_id3161652\n" "help.text" msgid "Double-click on the \"Item_No\" field from the \"Item\" table. Display the Function line using the context menu and select the Count function." -msgstr "双击表格「Item」中的「Item_No」字段。使用右键菜单显示函数行，然后选择「Count」函数。" +msgstr "双击表格「Item」中的「Item_No」字段。使用右键菜单显示「函数」行，然后选择「Count」函数。" #: 02010100.xhp msgctxt "" @@ -1238,7 +1238,7 @@ "par_id3151009\n" "help.text" msgid "Enter >3 as a criterion and disable the Visible field." -msgstr "输入条件 >3，然后关闭可见的字段。" +msgstr "输入条件「>3」，然后禁用「可见」字段。" #: 02010100.xhp msgctxt "" @@ -1286,7 +1286,7 @@ "par_id3153554\n" "help.text" msgid "Enable the Function line and select the Average function from the \"Price\" field." -msgstr "打开函数行，然后在 \"price\" 字段中选择平均值函数。" +msgstr "打开「函数」行，然后在 \"price\" 字段中选择平均值函数。" #: 02010100.xhp msgctxt "" @@ -2190,7 +2190,7 @@ "par_id191120151905518123\n" "help.text" msgid "In the simplest case, where the user enters a value which is matched for equality, the parameter name with its preceding colon is simply entered in the Criterion row. In SQL mode this should be typed as WHERE \"Field\" = :Parameter_name" -msgstr "最简单的情况，当用户输入用于比较的值时，参数名称及其空格前缀可直接输入在「条件」行。在「SQL 模式」下，应这样输入:「WHERE \"字段\" = :参数名称」" +msgstr "最简单的情况，当用户输入用于比较的值时，参数名称及其冒号前缀可直接在「条件」行输入。在「SQL 模式」下，应这样输入:「WHERE \"字段\" = :参数名称」" #: 02010100.xhp msgctxt "" @@ -2206,7 +2206,7 @@ "par_id191120151931441881\n" "help.text" msgid "A useful construction for selecting records based on parts of a text field's content is to add a hidden column with \"LIKE '%' || :Part_of_field || '%'\" as the criterion. This will select records with an exact match. If a case-insensitive test is wanted, one solution is to use LOWER (Field_Name) as the field and LIKE LOWER ( '%' || :Part_of_field || '%' ) as the criterion. Note that the spaces in the criterion are important; if they are left out the SQL parser interprets the entire criterion as a string to be matched. In SQL mode this should be typed as LOWER ( \"Field_Name\" ) LIKE LOWER ( '%' || :Part_of_field || '%' )." -msgstr "用于根据文字字段内容的一部分构造选择条件时，可以这样「\"LIKE '%' || :字段的部分 || '%'\"」将隐藏列作为条件添加。这将选择精确匹配的记录。如果需要大小写不敏感的测试，一种解决方案是用「LOWER (字段名称) 作为字段，用「LIKE LOWER ( '%' || :字段部分 || '%' )」作为条件。注意条件中的空格很重要; 如果省略，SQL 解析器将把整个条件作为待匹配的字符串来解析。「SQL 模式」下应这样输入: LOWER ( \"字段名称\" ) LIKE LOWER ( '%' || :字段部分 || '%' )」。" +msgstr "用于根据文字字段内容的一部分构造选择条件时，可以这样「\"LIKE '%' || :字段部分 || '%'\"」将隐藏列作为条件添加。这将选择精确匹配的记录。如果需要大小写不敏感的测试，一种解决方案是用「LOWER (字段名称) 作为字段，用「LIKE LOWER ( '%' || :字段部分 || '%' )」作为条件。注意条件中的空格很重要; 如果省略，SQL 解析器将把整个条件作为待匹配的字符串来解析。「SQL 模式」下应这样输入: LOWER ( \"字段名称\" ) LIKE LOWER ( '%' || :字段部分 || '%' )」。" #: 02010100.xhp msgctxt "" @@ -10862,7 +10862,7 @@ "par_id8581804\n" "help.text" msgid "Click the option button in front of the entry to enable this JRE version for use in %PRODUCTNAME." -msgstr "点击条目前方的选项按钮启用此 JRE 版本，以在 %PRODUCTNAME 中使用。" +msgstr "点击条目前方的单选按钮启用此 JRE 版本，以在 %PRODUCTNAME 中使用。" #: rep_main.xhp msgctxt "" @@ -10974,7 +10974,7 @@ "par_id6042664\n" "help.text" msgid "Click the \"-\" icon in front of an area name to collapse that area to one line in the Report Builder view. The \"-\" icon changes to a \"+\" icon, and you can click this to expand the area again." -msgstr "点击区域名称前的 \"-\" 图标，在「报表构建器」视图中将此区域折叠为一行。\"-\" 图标变为 \"+\" 图标，并且您可以点击它来再次展开此区域。" +msgstr "在「报表构建器」视图中点击区域名称前的「-」图标，可将区域折叠为一行。「-」图标会变为「+」图标，再次点击可展开区域。" #: rep_main.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/guide.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/guide.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-03-19 06:41+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549155.000000\n" +"X-POOTLE-MTIME: 1552977673.000000\n" #: aaa_start.xhp msgctxt "" @@ -6134,7 +6134,7 @@ "par_idN10698\n" "help.text" msgid "After saving, you see the Digital Signatures dialog. Click Add to add a public key to the document." -msgstr "保存后，将出现数字签名对话框。点击添加向文档添加一个公钥。" +msgstr "保存后，将出现数字签名对话框。点击「添加」向文档添加一个公钥。" #: digitalsign_send.xhp msgctxt "" @@ -9806,7 +9806,7 @@ "par_id3153126\n" "help.text" msgid "Click the Link box if you want a link to the original file." -msgstr "如果想要一个对原始文件的链接，请点击链接方框。" +msgstr "如果想要一个对原始文件的链接，请点击「链接」方框。" #: insert_bitmap.xhp msgctxt "" @@ -10110,7 +10110,7 @@ "par_id224616\n" "help.text" msgid "To scale a draw object using the keyboard, first select the object, then press CommandCtrl+Tab repeatedly to highlight one of the handles. Then press an arrow key. To scale in smaller steps, hold down the OptionAlt key while pressing an arrow key. Press Esc to leave the point edit mode." -msgstr "要使用键盘调整一个绘图对象的大小，请首先选中该对象，然后重复按 命令Ctrl+Tab 组合键以突出显示其中一个控点。然后按方向键。要在更小的范围内调整，请在按方向键时同时按住 选项 Alt 键。按 Esc 键退出控点编辑模式。" +msgstr "要使用键盘调整一个绘图对象的大小，请首先选中该对象，然后重复按 命令Ctrl+Tab 组合键以高亮显示其中一个控点。然后按方向键。要在更小的范围内调整，请在按方向键时同时按住 选项 Alt 键。按 Esc 键退出控点编辑模式。" #: insert_graphic_drawit.xhp msgctxt "" @@ -15126,7 +15126,7 @@ "par_id3154307\n" "help.text" msgid "When either of these options is selected, all presentations or drawings will be printed without color. If you only want to print in black for the current print job, select the option in File - Print - %PRODUCTNAME Draw/Impress." -msgstr "如果选择了其中任意一个选项，则打印出的所有演示文稿或绘图均不带颜色。如果只想对当前打印作业进行黑色打印，请在「文件 - 打印 - %PRODUCTNAME Draw/Impres」中选择相应的选项。" +msgstr "如果选择了其中任意一个选项，则打印出的所有演示文稿或绘图均不带颜色。如果只想对「当前」打印作业进行黑色打印，请在「文件 - 打印 - %PRODUCTNAME Draw/Impres」中选择相应的选项。" #: print_blackwhite.xhp msgctxt "" @@ -15606,7 +15606,7 @@ "bm_id3150499\n" "help.text" msgid "marking changes highlighting changes changes; review function review function; recording changes example Track Changes, see review function" -msgstr "标记变更 突出显示变更 变更; 审校功能 审校功能; 记录变更示例 追踪修订, 参见审校功能" +msgstr "标记变更 高亮显示变更 变更; 审校功能 审校功能; 记录变更示例 追踪修订, 参见审校功能" #: redlining.xhp msgctxt "" @@ -16030,7 +16030,7 @@ "par_id3156119\n" "help.text" msgid "Changes in a spreadsheet document are highlighted by a border around the cells; when you point to the cell you can see more detailed information on this change in the Help Tip." -msgstr "在电子表格文档中，内容有修改的单元格四周的边框会突出显示；当您指向该单元格时，可以在帮助提示中看到有关此修改的更加详细的信息。" +msgstr "在电子表格文档中，内容有修改的单元格四周的边框会高亮显示；当您指向该单元格时，可以在帮助提示中看到有关此修改的更加详细的信息。" #: redlining_enter.xhp msgctxt "" @@ -16054,7 +16054,7 @@ "par_id3153627\n" "help.text" msgid "In a text document, you can highlight all lines that you have changed with an additional colored marking. This can be in the form of a red line in the margin, for example." -msgstr "在文本文档中，您可以使用附加的彩色标记来突出显示所有已修改的行。例如，可以在边距中使用红色线条进行标记。" +msgstr "在文本文档中，您可以使用附加的彩色标记来高亮显示所有已修改的行。例如，可以在边距中使用红色线条进行标记。" #: redlining_enter.xhp msgctxt "" @@ -16478,7 +16478,7 @@ "par_idN10A71\n" "help.text" msgid "Click the option button for %PRODUCTNAME or Writer (or whichever application is currently open)." -msgstr "点击 %PRODUCTNAME 或 Writer (或当前打开的应用程序) 的选项按钮。" +msgstr "点击 %PRODUCTNAME 或 Writer (或当前打开的应用程序) 的单选按钮。" #: scripting.xhp msgctxt "" @@ -16486,7 +16486,7 @@ "par_idN10A74\n" "help.text" msgid "Selecting the option button sets the scope of the new key combination to be applicable in all of %PRODUCTNAME or only in documents of the current module." -msgstr "选择选项按钮以设置新组合键的适用范围，是适用于所有 %PRODUCTNAME 还是只适用于当前模块的文档。" +msgstr "选择单选按钮以设置新组合键的适用范围，是适用于所有 %PRODUCTNAME 还是只适用于当前模块的文档。" #: scripting.xhp msgctxt "" @@ -19886,7 +19886,7 @@ "par_idN10A32\n" "help.text" msgid "In the XSLT for export box, enter the path and file name of the XSLT stylesheet that defines the transformation from OpenDocument format to the external format." -msgstr "在要导出的 XSLT 方框中，输入用于定义从 OpenDocument 格式到外部格式转换的 XSLT 样式表的路径和文件名。" +msgstr "在「要导出的 XSLT」方框中，输入用于定义从 OpenDocument 格式到外部格式转换的 XSLT 样式表的路径和文件名。" #: xsltfilter_create.xhp msgctxt "" @@ -19894,7 +19894,7 @@ "par_idN10A38\n" "help.text" msgid "In the XSLT for import box, enter the path and file name to the XSLT stylesheet that defines the transformation from the external format to OpenDocument format." -msgstr "在要导入的 XSLT 方框中，输入用于定义从外部格式到 OpenDocument 格式转换的 XSLT 样式表的路径和文件名。" +msgstr "在「要导入的 XSLT」方框中，输入用于定义从外部格式到 OpenDocument 格式转换的 XSLT 样式表的路径和文件名。" #: xsltfilter_create.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/menu.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/menu.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/menu.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/menu.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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-05-23 21:37+0200\n" -"PO-Revision-Date: 2019-03-02 06:23+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551507802.000000\n" +"X-POOTLE-MTIME: 1552977075.000000\n" #: insert_chart.xhp msgctxt "" @@ -62,7 +62,7 @@ "par_id03072016061205929\n" "help.text" msgid "This submenu contains form controls like a textbox, checkbox, option button, and listbox that can be inserted into the document." -msgstr "这个子菜单包含了可插入到文档中的表单控件，比如文本框、复选框、选项按钮、列表框等。" +msgstr "这个子菜单包含了可插入到文档中的表单控件，比如文本框、复选框、单选按钮、列表框等。" #: insert_shape.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/optionen.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/optionen.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared/optionen.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared/optionen.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-16 22:41+0100\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-03-19 06:41+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549156.000000\n" +"X-POOTLE-MTIME: 1552977675.000000\n" #: 01000000.xhp msgctxt "" @@ -1814,7 +1814,7 @@ "par_id3156291\n" "help.text" msgid "Typing errors are highlighted in the document with a red underline. If you place the cursor over a word marked in this way, you can open the context menu to obtain a list of corrections. Select a correction to replace the word. If you make the same mistake again while editing the document, it will be marked as an error again." -msgstr "文档中出现的拼写错误用红色下划线突出显示。如果将光标置于以此方式标记的某个单词上，则可以打开右键菜单以获取修改建议列表。可选择一条修改建议来替换该单词。如果在编辑文档时再次出现同样的错误，则会将其重新标记为错误。" +msgstr "文档中出现的拼写错误用红色下划线高亮显示。如果将光标置于以此方式标记的某个单词上，则可以打开右键菜单以获取修改建议列表。可选择一条修改建议来替换该单词。如果在编辑文档时再次出现同样的错误，则会将其重新标记为错误。" #: 01010400.xhp msgctxt "" @@ -3446,7 +3446,7 @@ "par_id3159154\n" "help.text" msgid "If you mark this field the transparent objects will be printed like normal, non-transparent objects, depending on your selection in the following two option buttons." -msgstr "如果启用此项，则透明的对象将会像常规的、不透明对象那样进行打印，这取决于下面紧跟的两个选项。" +msgstr "如果选中了此字段，透明对象将像普通的不透明对象那样打印，取决于您在下面两个单选按钮中的选择。" #: 01010900.xhp msgctxt "" @@ -7886,7 +7886,7 @@ "par_id3145345\n" "help.text" msgid "Defines various settings for spreadsheets, contents to be displayed, and the cursor direction after a cell entry. You can also define sorting lists, determine the number of decimal places and the settings for recording and highlighting changes. " -msgstr "定义电子表格的各种设置、要显示的内容，以及输入单元格条目后光标的移动方向。还可以定义排序列表，确定小数点位数以及进行有关记录和突出显示修改的设置。" +msgstr "定义电子表格的各种设置、要显示的内容，以及输入单元格条目后光标的移动方向。还可以定义排序列表，确定小数点位数以及进行有关记录和高亮显示修改的设置。" #: 01060100.xhp msgctxt "" @@ -7918,7 +7918,7 @@ "par_id3153988\n" "help.text" msgid "Defines which elements of the %PRODUCTNAME Calc main window are displayed. You can also show or hide highlighting of values in tables." -msgstr "指定显示 %PRODUCTNAME Calc 主窗口的哪些元素。还可以指定是否要在表格中突出显示数值。" +msgstr "指定显示 %PRODUCTNAME Calc 主窗口的哪些元素。还可以指定是否要在表格中高亮显示数值。" #: 01060100.xhp msgctxt "" @@ -8086,7 +8086,7 @@ "hd_id3150872\n" "help.text" msgid "Value highlighting" -msgstr "突出显示数值" +msgstr "高亮显示数值" #: 01060100.xhp msgctxt "" @@ -8350,7 +8350,7 @@ "bm_id3151110\n" "help.text" msgid "metrics;in sheetstab stops; setting in sheetscells; cursor positions after input (Calc)edit mode; through Enter key (Calc)formatting; expanding (Calc)expanding formatting (Calc)references; expanding (Calc)column headers; highlighting (Calc)row headers; highlighting (Calc)" -msgstr "量度; 在工作表中制表位; 在工作表中设置单元格; 输入后的光标位置 (Calc)编辑模式; 通过 Enter 键 (Calc)格式; 扩展 (Calc)扩展格式 (Calc)引用; 扩展 (Calc)列标题; 突出显示 (Calc)行标题; 突出显示 (Calc)" +msgstr "量度; 在工作表中制表位; 在工作表中设置单元格; 输入后的光标位置 (Calc)编辑模式; 通过 Enter 键 (Calc)格式; 扩展 (Calc)扩展格式 (Calc)引用; 扩展 (Calc)列标题; 高亮显示 (Calc)行标题; 高亮显示 (Calc)" #: 01060300.xhp msgctxt "" @@ -8502,7 +8502,7 @@ "hd_id3151176\n" "help.text" msgid "Highlight selection in column/row headings" -msgstr "突出显示行列标题的选中" +msgstr "高亮显示行列标题的选中" #: 01060300.xhp msgctxt "" @@ -8510,7 +8510,7 @@ "par_id3145171\n" "help.text" msgid "Specifies whether to highlight column and row headers in the selected columns or rows." -msgstr "指定是否在选中列和行中突出显示列和行标题。" +msgstr "指定是否在选中列和行中高亮显示列和行标题。" #: 01060300.xhp msgctxt "" @@ -9390,7 +9390,7 @@ "par_id3155390\n" "help.text" msgid "The Changes dialog specifies various options for highlighting recorded changes in documents." -msgstr "在「修改」对话框中，可以指定各种选项，以突出显示文档中已记录的修改。" +msgstr "在「修改」对话框中，可以指定各种选项，以高亮显示文档中已记录的修改。" #: 01060600.xhp msgctxt "" @@ -11926,7 +11926,7 @@ "par_id3157909\n" "help.text" msgid "A change in Default currency field will be transmitted to all open documents and will lead to corresponding changes in the dialogs and icons that control the currency format in these documents." -msgstr "对默认货币字段的修改将传送到所有打开的文档中，从而使这些文档中用于控制货币格式的对话框和图标发生相应的修改。" +msgstr "对「默认货币」字段的修改将传送到所有打开的文档中，从而使这些文档中用于控制货币格式的对话框和图标发生相应的修改。" #: 01140000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/shared.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/shared.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-07 11:14+0100\n" -"PO-Revision-Date: 2019-03-13 12:05+0000\n" +"PO-Revision-Date: 2019-03-18 08:10+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478732.000000\n" +"X-POOTLE-MTIME: 1552896614.000000\n" #: 3dsettings_toolbar.xhp msgctxt "" @@ -510,7 +510,7 @@ "par_id230120170827196850\n" "help.text" msgid "Opens the community support page in the web browser. Use this page to ask questions on using %PRODUCTNAME. For professional support with service level agreement, refer to the page of professional %PRODUCTNAME support." -msgstr "在浏览器中打开社区帮助页面。您可以在帮助页面中对使用 %PRODUCTNAME 中出现的问题进行提问。QQ 用户可加群获取帮助: 190535062。若要获得具有服务级协议约束的专业支持，请访问 %PRODUCTNAME 专业支持页面。" +msgstr "在浏览器中打开社区支持页面。您可以在社区支持页面对使用 %PRODUCTNAME 中出现的问题进行提问。QQ 用户也可加群咨询: 190535062。若要获得具有服务级协议约束的专业支持，请访问 %PRODUCTNAME 专业支持页面。" #: main0108.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/simpress/02.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/simpress/02.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/simpress/02.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/simpress/02.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-10-04 11:48+0200\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549157.000000\n" +"X-POOTLE-MTIME: 1552977077.000000\n" #: 04010000.xhp msgctxt "" @@ -2398,7 +2398,7 @@ "par_id3153083\n" "help.text" msgid "Closed shapes automatically receive the fill that is displayed in the Area Style/Filling box on Line and Filling bar." -msgstr "封闭形状将自动采用「线条和填充」栏中的平面样式/平面填充方框内的设置进行填充。" +msgstr "封闭形状将自动采用「线条和填充」栏中的「平面样式/平面填充」方框内的设置进行填充。" #: 10080000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/smath/02.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/smath/02.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/smath/02.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/smath/02.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-05-09 16:45+0200\n" -"PO-Revision-Date: 2019-03-02 06:51+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551509501.000000\n" +"X-POOTLE-MTIME: 1552977078.000000\n" #: 03010000.xhp msgctxt "" @@ -62,4 +62,4 @@ "par_id3146966\n" "help.text" msgid "Double-clicking a character or symbol in the document moves the focus of the cursor to the Commands window and highlights its respective position." -msgstr "双击文档中的字符或图标，可以将光标焦点移到「命令」窗口并突出显示其相应的位置。" +msgstr "双击文档中的字符或图标，可以将光标焦点移到「命令」窗口并高亮显示其相应的位置。" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-10-21 20:57+0200\n" -"PO-Revision-Date: 2019-03-14 07:39+0000\n" +"PO-Revision-Date: 2019-03-22 12:06+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552549160.000000\n" +"X-POOTLE-MTIME: 1553256413.000000\n" #: 01120000.xhp msgctxt "" @@ -5782,7 +5782,7 @@ "par_id3145188\n" "help.text" msgid "If you want, you can enter an Offset for the displayed page number. With an Offset value of 1, the field will display a number that is 1 more than the current page number, but only if a page with that number exists. On the last page of the document, this same field will be empty." -msgstr "如果需要，可以输入所显示页码的偏移值。当偏移值为 1 时，字段将显示一个比当前页码大 1 的数字，前提是该页码的页面存在。因此，在文档的最后一页上，此字段为空。" +msgstr "如果需要，可以输入所显示页码的「偏移」值。当偏移值为 1 时，字段将显示一个比当前页码大 1 的数字，前提是该页码的页面存在。因此，在文档的最后一页上，此字段为空。" #: 04090001.xhp msgctxt "" @@ -8246,7 +8246,7 @@ "par_id3148863\n" "help.text" msgid "Description" -msgstr "说明" +msgstr "描述" #: 04090007.xhp msgctxt "" @@ -11246,7 +11246,7 @@ "par_id3154638\n" "help.text" msgid "The Structure line defines how the entries in the index are composed. To change the appearance of an entry you can enter codes or text in the empty boxes on this line. You can also click in an empty box or on a code, and then click a code button." -msgstr "结构行定义索引中的条目如何组成。要更改某个条目的外观，您可以在此行的空白框中输入代码或者文本。也可以在空白框中或在代码上点击，然后点击代码按钮。" +msgstr "「结构」行定义索引中的条目如何组成。要更改某个条目的外观，您可以在此行的空白框中输入代码或者文本。也可以在空白框中或在代码上点击，然后点击代码按钮。" #: 04120221.xhp msgctxt "" @@ -11254,7 +11254,7 @@ "par_id3149292\n" "help.text" msgid "Displays the remainder of the Structure line." -msgstr "显示结构行的剩余部分。" +msgstr "显示「结构」行的剩余部分。" #: 04120221.xhp msgctxt "" @@ -11262,7 +11262,7 @@ "par_id3147512\n" "help.text" msgid "To delete a code from the Structure line, click the code, and then press the Delete key." -msgstr "要删除结构行中的代码，请点击代码，然后按「Delete」键。" +msgstr "要删除「结构」行中的代码，请点击代码，然后按「Delete」键。" #: 04120221.xhp msgctxt "" @@ -11278,7 +11278,7 @@ "par_id3154480\n" "help.text" msgid "To add a code to the Structure line, click in an empty box, and then click a code button." -msgstr "要在结构行上添加代码，请在空白框中点击，然后点击代码按钮。" +msgstr "要在「结构」行上添加代码，请在空白框中点击，然后点击代码按钮。" #: 04120221.xhp msgctxt "" @@ -11358,7 +11358,7 @@ "par_id3153631\n" "help.text" msgid "Creates a hyperlink for the part of the entry that you enclose by the opening (LS) and the closing (LE) hyperlink tags. On the Structure line, click in the empty box in front of the part that you want to create a hyperlink for, and then click this button. Click in the empty box after the part that you want to hyperlink, and then click this button again. All hyperlinks must be unique. Available only for a table of contents." -msgstr "为条目中包含在起始 (LS) 与终止 (LE) 超链接标记中的部分创建超级链接。在结构行上，点击您想要创建超级链接的部分前面的空白框，然后点击此按钮。点击您想要创建超级链接的部分后面的空白框，然后再次点击此按钮。所有超级链接必须是唯一的。只对目录可用。" +msgstr "为条目中包含在起始 (LS) 与终止 (LE) 超链接标记中的部分创建超级链接。在「结构」行上，点击您想要创建超级链接的部分前面的空白框，然后点击此按钮。点击您想要创建超级链接的部分后面的空白框，然后再次点击此按钮。所有超级链接必须是唯一的。只对目录可用。" #: 04120221.xhp msgctxt "" @@ -11390,7 +11390,7 @@ "par_id3156277\n" "help.text" msgid "Specify the formatting style for the selected part on the Structure line." -msgstr "指定结构行中选中部分的格式样式。" +msgstr "指定「结构」行中选中部分的格式样式。" #: 04120221.xhp msgctxt "" @@ -14342,7 +14342,7 @@ "par_id3149485\n" "help.text" msgid "Select the vertical alignment of the separator line. This option is only available if Height value of the line is less than 100%." -msgstr "选择分隔线的垂直对齐方式。仅当分隔线的高度值小于 100% 时，该选项才可用。" +msgstr "选择分隔线的垂直对齐方式。仅当分隔线的「高度」值小于 100% 时，该选项才可用。" #: 05040500.xhp msgctxt "" @@ -21230,7 +21230,7 @@ "par_id3147567\n" "help.text" msgid "To highlight the screen display of chapter and outline numbers, choose View - Field Shadings." -msgstr "要在屏幕上突出显示章节与大纲编号，请选择「视图 - 字段阴影」。" +msgstr "要在屏幕上高亮显示章节与大纲编号，请选择「视图 - 字段阴影」。" #: 06060000.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/swriter/guide.po libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/swriter/guide.po --- libreoffice-6.2.2/translations/source/zh-CN/helpcontent2/source/text/swriter/guide.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/helpcontent2/source/text/swriter/guide.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-05 17:38+0100\n" -"PO-Revision-Date: 2019-03-14 08:22+0000\n" +"PO-Revision-Date: 2019-03-19 06:31+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552551734.000000\n" +"X-POOTLE-MTIME: 1552977082.000000\n" #: anchor_object.xhp msgctxt "" @@ -3686,7 +3686,7 @@ "bm_id3145576\n" "help.text" msgid "fields;updating/viewing updating;fields Help tips;fields properties;fields disabling;field highlighting changing;field shadings viewing;fields" -msgstr "字段; 更新/查看更新; 字段帮助提示; 字段属性; 字段禁用; 字段突出显示修改; 字段阴影查看; 字段" +msgstr "字段; 更新/查看更新; 字段帮助提示; 字段属性; 字段禁用; 字段高亮显示修改; 字段阴影查看; 字段" #: fields.xhp msgctxt "" @@ -3726,7 +3726,7 @@ "par_id3150536\n" "help.text" msgid "To display or hide field highlighting in a document, choose View - Field Shadings. To permanently disable this feature, choose %PRODUCTNAME - PreferencesTools - Options - $[officename] - Application Colors, and clear the check box in front of Field shadings." -msgstr "要在文档中显示或隐藏突出显示字段，选择「视图 - 字段阴影」。要永久禁用此功能，请选择「%PRODUCTNAME - 偏好设置工具 - 选项 - $[officename] - 应用程序颜色」，然后取消选择「字段阴影」前的复选框。" +msgstr "要在文档中显示或隐藏高亮显示字段，选择「视图 - 字段阴影」。要永久禁用此功能，请选择「%PRODUCTNAME - 偏好设置工具 - 选项 - $[officename] - 应用程序颜色」，然后取消选择「字段阴影」前的复选框。" #: fields.xhp msgctxt "" @@ -4446,7 +4446,7 @@ "par_id611285\n" "help.text" msgid "In text documents you can find words, formatting, styles, and more. You can navigate from one result to the next, or you can highlight all results at once, then apply another format or replace the words by other text." -msgstr "在文本文档中，可以找到文字、格式、样式以及其他内容。您可以从一个结果浏览到下一个结果，也可以同时突出显示所有结果，然后应用另一种格式或使用其他文本替换这些文字。" +msgstr "在文本文档中，可以找到文字、格式、样式以及其他内容。您可以从一个结果浏览到下一个结果，也可以同时高亮显示所有结果，然后应用另一种格式或使用其他文本替换这些文字。" #: finding.xhp msgctxt "" @@ -4582,7 +4582,7 @@ "par_id703451\n" "help.text" msgid "When you click Replace, Writer will search the whole document for the text in the Find box, starting at the current cursor position. When text is found, Writer highlights the text and waits for your response. Click Replace to replace the highlighted text in the document with the text in the Replace text box. Click Find Next to advance to the next found text without replacing the current selection." -msgstr "点击「替换」时，Writer 将从当前光标位置开始，在整个文档中查找查找框中的文本。找到文本后，Writer 将突出显示文本并等待您的响应。点击「替换」可使用「替换文本框中的文本替换文档中突出显示的文本。点击查找下一个」可前进到下一个找到的文本，而不替换当前选择的内容。" +msgstr "点击「替换」时，Writer 将从当前光标位置开始，在整个文档中查找查找框中的文本。找到文本后，Writer 将高亮显示文本并等待您的响应。点击「替换」可使用「替换文本框中的文本替换文档中高亮显示的文本。点击查找下一个」可前进到下一个找到的文本，而不替换当前选择的内容。" #: finding.xhp msgctxt "" @@ -9110,7 +9110,7 @@ "par_id3155527\n" "help.text" msgid "Choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Table, and select or clear the Number recognition check box." -msgstr "选择【%PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - 表格】，然后选择或清除「数字识别」复选框。" +msgstr "选择「%PRODUCTNAME - 偏好设置工具 - 选项 - %PRODUCTNAME Writer - 表格」，然后选择或清除「数字识别」复选框。" #: number_date_conv.xhp msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-6.2.3/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-6.2.2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2019-03-07 20:34+0000\n" +"PO-Revision-Date: 2019-03-19 06:26+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551990852.000000\n" +"X-POOTLE-MTIME: 1552976813.000000\n" #: ActionTe.ulf msgctxt "" @@ -1854,7 +1854,7 @@ "OOO_CONTROL_154\n" "LngText.text" msgid "The highlighted volumes do not have enough disk space available for the currently selected features. You can remove files from the highlighted volumes, choose to install less features onto local drives, or select different destination drives." -msgstr "突出显示的卷中没有足够的磁盘空间用于安装所选的功能。您可从突出显示的卷中删除一些文件、在本地驱动器上少安装一些功能，或者选择另外的目标驱动器。" +msgstr "高亮显示的卷中没有足够的磁盘空间用于安装所选的功能。您可从高亮显示的卷中删除一些文件、在本地驱动器上少安装一些功能，或者选择另外的目标驱动器。" #: Control.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-13 12:06+0000\n" +"PO-Revision-Date: 2019-03-23 10:04+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478787.000000\n" +"X-POOTLE-MTIME: 1553335489.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -6773,7 +6773,7 @@ "Label\n" "value.text" msgid "~Record" -msgstr "开始修订记录(~R)" +msgstr "记录修订(~R)" #: DbuCommands.xcu msgctxt "" @@ -11282,7 +11282,7 @@ "Label\n" "value.text" msgid "Vertical Highlight" -msgstr "垂直突出显示" +msgstr "垂直高亮显示" #: Effects.xcu msgctxt "" @@ -17458,7 +17458,7 @@ "Label\n" "value.text" msgid "Option Button" -msgstr "选项按钮" +msgstr "单选按钮" #: GenericCommands.xcu msgctxt "" @@ -20932,7 +20932,7 @@ "Label\n" "value.text" msgid "Option Button" -msgstr "选项按钮" +msgstr "单选按钮" #: GenericCommands.xcu msgctxt "" @@ -25666,7 +25666,7 @@ "TooltipLabel\n" "value.text" msgid "Reject Track Change" -msgstr "拒绝追踪修订" +msgstr "拒绝修订" #: WriterCommands.xcu msgctxt "" @@ -25675,7 +25675,7 @@ "PopupLabel\n" "value.text" msgid "Reject Change" -msgstr "拒绝更改" +msgstr "拒绝修订" #: WriterCommands.xcu msgctxt "" @@ -25684,7 +25684,7 @@ "Label\n" "value.text" msgid "Reject All" -msgstr "全部拒绝" +msgstr "拒绝全部" #: WriterCommands.xcu msgctxt "" @@ -25693,7 +25693,7 @@ "TooltipLabel\n" "value.text" msgid "Reject All Tracked Changes" -msgstr "拒绝全部追踪修订" +msgstr "拒绝全部的追踪修订" #: WriterCommands.xcu msgctxt "" @@ -25702,7 +25702,7 @@ "PopupLabel\n" "value.text" msgid "Reject All Changes" -msgstr "拒绝全部更改" +msgstr "拒绝全部修订" #: WriterCommands.xcu msgctxt "" @@ -25720,7 +25720,7 @@ "TooltipLabel\n" "value.text" msgid "Accept Track Change" -msgstr "接受追踪修订" +msgstr "接受修订" #: WriterCommands.xcu msgctxt "" @@ -25729,7 +25729,7 @@ "PopupLabel\n" "value.text" msgid "Accept Change" -msgstr "接受更改" +msgstr "接受修订" #: WriterCommands.xcu msgctxt "" @@ -25738,7 +25738,7 @@ "Label\n" "value.text" msgid "Accept All" -msgstr "全部接受" +msgstr "接受全部" #: WriterCommands.xcu msgctxt "" @@ -25747,7 +25747,7 @@ "TooltipLabel\n" "value.text" msgid "Accept All Tracked Changes" -msgstr "接受全部追踪修订" +msgstr "接受全部的修订" #: WriterCommands.xcu msgctxt "" @@ -25756,7 +25756,7 @@ "PopupLabel\n" "value.text" msgid "Accept All Changes" -msgstr "接受全部更改" +msgstr "接受全部修订" #: WriterCommands.xcu msgctxt "" @@ -25765,7 +25765,7 @@ "Label\n" "value.text" msgid "Next" -msgstr "下一个" +msgstr "下一处" #: WriterCommands.xcu msgctxt "" @@ -25774,7 +25774,7 @@ "TooltipLabel\n" "value.text" msgid "Next Track Change" -msgstr "下一个追踪修订" +msgstr "下一处修订" #: WriterCommands.xcu msgctxt "" @@ -25783,7 +25783,7 @@ "Label\n" "value.text" msgid "Pr~evious" -msgstr "上一个(~E)" +msgstr "上一处(~E)" #: WriterCommands.xcu msgctxt "" @@ -25792,7 +25792,7 @@ "TooltipLabel\n" "value.text" msgid "Previous Track Change" -msgstr "上一个追踪修订" +msgstr "上一处修订" #: WriterCommands.xcu msgctxt "" @@ -25810,7 +25810,7 @@ "Label\n" "value.text" msgid "~Record" -msgstr "开始修订记录(~R)" +msgstr "记录修订(~R)" #: WriterCommands.xcu msgctxt "" @@ -25828,7 +25828,7 @@ "Label\n" "value.text" msgid "Track Changes Functions" -msgstr "追踪修订功能" +msgstr "「追踪修订」功能" #: WriterCommands.xcu msgctxt "" @@ -25837,7 +25837,7 @@ "TooltipLabel\n" "value.text" msgid "Show Track Changes Functions" -msgstr "显示追踪修订功能" +msgstr "显示「追踪修订」功能" #: WriterCommands.xcu msgctxt "" @@ -29257,7 +29257,7 @@ "Label\n" "value.text" msgid "Hide Whitespac~e" -msgstr "隐藏页面之间的空白(~E)" +msgstr "隐藏页间空白(~E)" #: WriterCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po libreoffice-6.2.3/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-6.2.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2019-03-04 19:41+0000\n" +"PO-Revision-Date: 2019-03-23 10:04+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551728492.000000\n" +"X-POOTLE-MTIME: 1553335487.000000\n" #: Addons.xcu msgctxt "" @@ -1346,7 +1346,7 @@ "STR_INFO_1\n" "value.text" msgid "The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to %NEWFILESIZE MB." -msgstr "演示文稿优化大师已经成功的优化了演示文稿'%TITLE'。文件大小从 %OLDFILESIZE MB 变成了 %NEWFILESIZE MB。" +msgstr "「演示文稿优化大师」已成功优化演示文稿「%TITLE」。文件大小从 %OLDFILESIZE MB 变成了 %NEWFILESIZE MB。" #: PresentationMinimizer.xcu msgctxt "" @@ -1355,7 +1355,7 @@ "STR_INFO_2\n" "value.text" msgid "The Presentation Minimizer has successfully updated the presentation '%TITLE'. The file size has changed from %OLDFILESIZE MB to approximated %NEWFILESIZE MB." -msgstr "演示文稿优化大师已经成功的优化了演示文稿「%TITLE」。文件大小从 %OLDFILESIZE MB 变成了约 %NEWFILESIZE MB。" +msgstr "「演示文稿优化大师」已成功优化演示文稿「%TITLE」。文件大小从 %OLDFILESIZE MB 变成了约 %NEWFILESIZE MB。" #: PresentationMinimizer.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/readlicense_oo/docs.po libreoffice-6.2.3/translations/source/zh-CN/readlicense_oo/docs.po --- libreoffice-6.2.2/translations/source/zh-CN/readlicense_oo/docs.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/readlicense_oo/docs.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-11-12 12:23+0100\n" -"PO-Revision-Date: 2019-03-09 13:20+0000\n" +"PO-Revision-Date: 2019-03-23 10:04+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552137650.000000\n" +"X-POOTLE-MTIME: 1553335489.000000\n" #: readme.xrm msgctxt "" @@ -646,7 +646,7 @@ "pji76w1\n" "readmeitem.text" msgid "When sending a document via 'File - Send - Document as E-mail' or 'Document as PDF Attachment' problems might occur (program crashes or hangs). This is due to the Windows system file \"Mapi\" (Messaging Application Programming Interface) which causes problems in some file versions. Unfortunately, the problem cannot be narrowed down to a certain version number. For more information visit https://www.microsoft.com to search the Microsoft Knowledge Base for \"mapi dll\"." -msgstr "当通过「文件」-「发送」-「文档作为电子邮件」或「文档作为 PDF 附件」发送文档时可能会发生问题 (程序崩溃或中止)。这是由于 Windows 系统文件 \"Mapi\" (Messaging Application Programming Interface) 导致了一些文件版本上的问题。不幸的是，我们无法确定哪些版本有问题。有关详细信息，请访问 https://www.microsoft.com 以在知识库中搜索 \"mapi dll\"。" +msgstr "通过「文件」-「发送」-「文档作为电子邮件」或「文档作为 PDF 附件」发送文档时可能会出现问题 (程序崩溃或中止)。这是由于 Windows 系统文件「Mapi」(消息应用程序编程接口) 部分文件版本导致的问题。不幸的是，我们无法确定哪些版本有问题。有关详细信息，请访问 https://www.microsoft.com 并在知识库中搜索「mapi dll」。" #: readme.xrm msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/sc/messages.po libreoffice-6.2.3/translations/source/zh-CN/sc/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/sc/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/sc/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2019-03-14 02:44+0000\n" +"PO-Revision-Date: 2019-03-23 10:25+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552531494.000000\n" +"X-POOTLE-MTIME: 1553336749.000000\n" #: sc/inc/compiler.hrc:27 msgctxt "RID_FUNCTION_CATEGORIES" @@ -2000,7 +2000,7 @@ #: sc/inc/globstr.hrc:412 msgctxt "STR_FORM_OPTIONBUTTON" msgid "Option Button" -msgstr "选项按钮" +msgstr "单选按钮" #: sc/inc/globstr.hrc:413 msgctxt "STR_FORM_LABEL" @@ -4863,7 +4863,7 @@ #: sc/inc/scfuncs.hrc:724 msgctxt "SC_OPCODE_IS_REF" msgid "Returns TRUE if value is a reference." -msgstr "若某个值是一个引用，则返回TRUE 。" +msgstr "若值是一个引用，则返回 TRUE。" #: sc/inc/scfuncs.hrc:725 msgctxt "SC_OPCODE_IS_REF" @@ -4893,7 +4893,7 @@ #: sc/inc/scfuncs.hrc:740 msgctxt "SC_OPCODE_IS_ERROR" msgid "Returns TRUE if the value is an error value." -msgstr "若该值是一个错误值，则返回 TRUE 。" +msgstr "若该值是一个错误值，则返回 TRUE。" #: sc/inc/scfuncs.hrc:741 msgctxt "SC_OPCODE_IS_ERROR" @@ -4908,7 +4908,7 @@ #: sc/inc/scfuncs.hrc:748 msgctxt "SC_OPCODE_IS_EMPTY" msgid "Returns TRUE if value refers to an empty cell." -msgstr "若该值是对一个空白单元格的引用，则返回 TRUE 。" +msgstr "若该值是对一个空白单元格的引用，则返回 TRUE。" #: sc/inc/scfuncs.hrc:749 msgctxt "SC_OPCODE_IS_EMPTY" @@ -4923,7 +4923,7 @@ #: sc/inc/scfuncs.hrc:756 msgctxt "SC_OPCODE_IS_LOGICAL" msgid "Returns TRUE if the value carries a logical number format." -msgstr "如果这个数值是一个逻辑值，那就反馈TRUE 。" +msgstr "如果值包含逻辑数字格式，则返回 TRUE。" #: sc/inc/scfuncs.hrc:757 msgctxt "SC_OPCODE_IS_LOGICAL" @@ -4938,7 +4938,7 @@ #: sc/inc/scfuncs.hrc:764 msgctxt "SC_OPCODE_IS_NV" msgid "Returns TRUE if value equals #N/A." -msgstr "如果这个数值等于 #NV ，那就反馈TRUE 。" +msgstr "如果值等于 #NV ，则返回 TRUE。" #: sc/inc/scfuncs.hrc:765 msgctxt "SC_OPCODE_IS_NV" @@ -4953,7 +4953,7 @@ #: sc/inc/scfuncs.hrc:772 msgctxt "SC_OPCODE_IS_NON_STRING" msgid "Returns TRUE if the value is not text." -msgstr "如果这个数值不是文字，那就反馈 TRUE 。" +msgstr "如果值不是文本，则返回 TRUE。" #: sc/inc/scfuncs.hrc:773 msgctxt "SC_OPCODE_IS_NON_STRING" @@ -4968,7 +4968,7 @@ #: sc/inc/scfuncs.hrc:780 msgctxt "SC_OPCODE_IS_STRING" msgid "Returns TRUE if value is text." -msgstr "如果数值是一个文字，那就反馈 TRUE 。" +msgstr "如果值是文本，则返回 TRUE。" #: sc/inc/scfuncs.hrc:781 msgctxt "SC_OPCODE_IS_STRING" @@ -4983,7 +4983,7 @@ #: sc/inc/scfuncs.hrc:788 msgctxt "SC_OPCODE_IS_VALUE" msgid "Returns TRUE if value is a number." -msgstr "如果这个数值是一个数字，那就反馈 TRUE 。" +msgstr "如果值是数字，则返回 TRUE。" #: sc/inc/scfuncs.hrc:789 msgctxt "SC_OPCODE_IS_VALUE" @@ -4998,7 +4998,7 @@ #: sc/inc/scfuncs.hrc:796 msgctxt "SC_OPCODE_IS_FORMULA" msgid "Returns TRUE if the cell is a formula cell." -msgstr "如果这个单元格是一个公式单元格，那就反馈 TRUE 。" +msgstr "如果单元格是公式单元格，则返回 TRUE。" #: sc/inc/scfuncs.hrc:797 msgctxt "SC_OPCODE_IS_FORMULA" @@ -5013,7 +5013,7 @@ #: sc/inc/scfuncs.hrc:804 msgctxt "SC_OPCODE_FORMULA" msgid "Returns the formula of a formula cell." -msgstr "反馈一个公式单元格的公式。" +msgstr "返回公式单元格的公式。" #: sc/inc/scfuncs.hrc:805 msgctxt "SC_OPCODE_FORMULA" @@ -5043,7 +5043,7 @@ #: sc/inc/scfuncs.hrc:820 msgctxt "SC_OPCODE_NO_VALUE" msgid "Not available. Returns the error value #N/A." -msgstr "不存在。反馈一个错误数值 #NV 。" +msgstr "不存在。返回错误值 #N/A。" #: sc/inc/scfuncs.hrc:826 msgctxt "SC_OPCODE_TYPE" @@ -5138,7 +5138,7 @@ #: sc/inc/scfuncs.hrc:874 msgctxt "SC_OPCODE_IF" msgid "The result of the function if the logical test returns a TRUE." -msgstr "如果逻辑测试结果为 TRUE ，则反馈函数值。" +msgstr "如果逻辑测试结果为 TRUE ，则返回函数结果。" #: sc/inc/scfuncs.hrc:875 msgctxt "SC_OPCODE_IF" @@ -5148,7 +5148,7 @@ #: sc/inc/scfuncs.hrc:876 msgctxt "SC_OPCODE_IF" msgid "The result of the function if the logical test returns FALSE." -msgstr "如果逻辑测试结果为 FALSE ，则反馈函数值。" +msgstr "如果逻辑测试结果为 FALSE ，则返回函数结果。" #: sc/inc/scfuncs.hrc:882 msgctxt "SC_OPCODE_IF_ERROR" @@ -5203,7 +5203,7 @@ #: sc/inc/scfuncs.hrc:902 msgctxt "SC_OPCODE_OR" msgid "Returns TRUE if an argument is TRUE." -msgstr "如果一个参数的逻辑值为 TRUE，即反馈 TRUE。" +msgstr "如果有一个参数为 TRUE，则返回 TRUE。" #: sc/inc/scfuncs.hrc:903 msgctxt "SC_OPCODE_OR" @@ -5233,7 +5233,7 @@ #: sc/inc/scfuncs.hrc:918 msgctxt "SC_OPCODE_AND" msgid "Returns TRUE if all arguments are TRUE." -msgstr "设定成 TRUE ，如果所有元素是 TRUE 。" +msgstr "设定成 TRUE ，如果所有元素是 TRUE。" #: sc/inc/scfuncs.hrc:919 msgctxt "SC_OPCODE_AND" @@ -5563,7 +5563,7 @@ #: sc/inc/scfuncs.hrc:1063 msgctxt "SC_OPCODE_IS_EVEN" msgid "Returns TRUE if value is an even integer." -msgstr "如果数值是一个偶数整数，那就反馈 TRUE 。" +msgstr "如果值是偶整数，则返回 TRUE。" #: sc/inc/scfuncs.hrc:1064 msgctxt "SC_OPCODE_IS_EVEN" @@ -5578,7 +5578,7 @@ #: sc/inc/scfuncs.hrc:1071 msgctxt "SC_OPCODE_IS_ODD" msgid "Returns TRUE if value is an odd integer." -msgstr "如果是奇整数，则返回TRUE。" +msgstr "如果值是奇整数，则返回 TRUE。" #: sc/inc/scfuncs.hrc:1072 msgctxt "SC_OPCODE_IS_ODD" @@ -10571,7 +10571,7 @@ #: sc/inc/scfuncs.hrc:3032 msgctxt "SC_OPCODE_RSQ" msgid "Returns the square of the Pearson product moment correlation coefficient." -msgstr "计算皮尔森(Pearson)乘积矩相关系数的平方。" +msgstr "返回皮尔逊积矩相关系数的平方。" #: sc/inc/scfuncs.hrc:3033 msgctxt "SC_OPCODE_RSQ" @@ -10671,7 +10671,7 @@ #: sc/inc/scfuncs.hrc:3072 msgctxt "SC_OPCODE_PEARSON" msgid "Returns the Pearson product moment correlation coefficient." -msgstr "计算皮尔生相关系数。" +msgstr "返回皮尔逊积矩相关系数。" #: sc/inc/scfuncs.hrc:3073 msgctxt "SC_OPCODE_PEARSON" @@ -10881,7 +10881,7 @@ #: sc/inc/scfuncs.hrc:3144 msgctxt "SC_OPCODE_FORECAST_ETS_ADD" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3145 msgctxt "SC_OPCODE_FORECAST_ETS_ADD" @@ -10946,7 +10946,7 @@ #: sc/inc/scfuncs.hrc:3162 msgctxt "SC_OPCODE_FORECAST_ETS_MUL" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3163 msgctxt "SC_OPCODE_FORECAST_ETS_MUL" @@ -11022,7 +11022,7 @@ #: sc/inc/scfuncs.hrc:3182 msgctxt "SC_OPCODE_FORECAST_ETS_PIA" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3183 msgctxt "SC_OPCODE_FORECAST_ETS_PIA" @@ -11098,7 +11098,7 @@ #: sc/inc/scfuncs.hrc:3202 msgctxt "SC_OPCODE_FORECAST_ETS_PIM" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3203 msgctxt "SC_OPCODE_FORECAST_ETS_PIM" @@ -11143,7 +11143,7 @@ #: sc/inc/scfuncs.hrc:3216 msgctxt "SC_OPCODE_FORECAST_ETS_SEA" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3217 msgctxt "SC_OPCODE_FORECAST_ETS_SEA" @@ -11208,7 +11208,7 @@ #: sc/inc/scfuncs.hrc:3234 msgctxt "SC_OPCODE_FORECAST_ETS_STA" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3235 msgctxt "SC_OPCODE_FORECAST_ETS_STA" @@ -11273,7 +11273,7 @@ #: sc/inc/scfuncs.hrc:3252 msgctxt "SC_OPCODE_FORECAST_ETS_STM" msgid "Data completion (default 1); 0 treats missing points as zero, 1 interpolates." -msgstr "数据完整性 (默认为1)；0将缺失的数据点当做零值对待，1进行插值处理。" +msgstr "数据补全 (默认为 1); 0 将缺失的数据点当做零值对待，1 进行插值处理。" #: sc/inc/scfuncs.hrc:3253 msgctxt "SC_OPCODE_FORECAST_ETS_STM" @@ -12153,7 +12153,7 @@ #: sc/inc/scfuncs.hrc:3598 msgctxt "SC_OPCODE_IFS_MS" msgid "Any value or expression which can be either TRUE or FALSE." -msgstr "任何的值或能返回TRUE会FALSE的表达式。" +msgstr "逻辑值为 TRUE 或 FALSE 的任意值或表达式。" #: sc/inc/scfuncs.hrc:3599 msgctxt "SC_OPCODE_IFS_MS" @@ -14527,7 +14527,7 @@ #: sc/inc/strings.hrc:230 msgctxt "STR_ANOVA_LABEL_DF" msgid "df" -msgstr "自由度" +msgstr "df" #: sc/inc/strings.hrc:231 msgctxt "STR_ANOVA_LABEL_MS" @@ -14563,12 +14563,12 @@ #: sc/inc/strings.hrc:238 msgctxt "STR_CORRELATION_UNDO_NAME" msgid "Correlation" -msgstr "相关系数" +msgstr "相关性" #: sc/inc/strings.hrc:239 msgctxt "STR_CORRELATION_LABEL" msgid "Correlations" -msgstr "相关" +msgstr "相关性" #. CovarianceDialog #: sc/inc/strings.hrc:241 @@ -14869,7 +14869,7 @@ #: sc/inc/strings.hrc:304 msgctxt "STR_DEGREES_OF_FREEDOM_LABEL" msgid "df" -msgstr "自由度" +msgstr "df" #: sc/inc/strings.hrc:305 msgctxt "STR_P_VALUE_LABEL" @@ -15037,7 +15037,7 @@ #: sc/inc/strings.hrc:340 msgctxt "STR_TTEST_PEARSON_CORRELATION" msgid "Pearson Correlation" -msgstr "皮尔森相关系数" +msgstr "皮尔逊相关系数" #: sc/inc/strings.hrc:341 msgctxt "STR_TTEST_VARIANCE_OF_THE_DIFFERENCES" @@ -16341,7 +16341,7 @@ #: sc/uiconfig/scalc/ui/correlationdialog.ui:9 msgctxt "correlationdialog|CorrelationDialog" msgid "Correlation" -msgstr "相关分析" +msgstr "相关性" #: sc/uiconfig/scalc/ui/correlationdialog.ui:100 msgctxt "correlationdialog|input-range-label" @@ -20046,12 +20046,12 @@ #: sc/uiconfig/scalc/ui/optchangespage.ui:137 msgctxt "optchangespage|label1" msgid "Colors for Changes" -msgstr "修订记录的颜色" +msgstr "修订处的颜色" #: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:43 msgctxt "optcompatibilitypage|label2" msgid "Select desired _key binding type. Changing the key binding type may overwrite some of the existing key bindings." -msgstr "选择您想要的组合键类型。更改组合键类型可能会覆盖一些已有的组合键。(_K)" +msgstr "选择您想要的组合键类型(_K)。更改组合键类型可能会覆盖一些现有的组合键。" #: sc/uiconfig/scalc/ui/optcompatibilitypage.ui:62 msgctxt "optcompatibilitypage|keybindings" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/sd/messages.po libreoffice-6.2.3/translations/source/zh-CN/sd/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/sd/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/sd/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-01-08 11:49+0100\n" -"PO-Revision-Date: 2019-03-10 20:57+0000\n" +"PO-Revision-Date: 2019-04-04 03:36+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552251430.000000\n" +"X-POOTLE-MTIME: 1554348994.000000\n" #: sd/inc/DocumentRenderer.hrc:27 msgctxt "STR_IMPRESS_PRINT_UI_CONTENT_CHOICES" @@ -2499,7 +2499,7 @@ #: sd/inc/strings.hrc:475 msgctxt "STR_IMPRESS_PRINT_UI_PAGE_SIDES" msgid "Page sides" -msgstr "页面正反" +msgstr "左右页面" #: sd/inc/strings.hrc:476 msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/svx/messages.po libreoffice-6.2.3/translations/source/zh-CN/svx/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/svx/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/svx/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:28+0100\n" -"PO-Revision-Date: 2019-03-13 12:06+0000\n" +"PO-Revision-Date: 2019-04-01 09:29+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552478791.000000\n" +"X-POOTLE-MTIME: 1554110999.000000\n" #: include/svx/strings.hrc:25 msgctxt "STR_ObjNameSingulNONE" @@ -1902,7 +1902,7 @@ #: include/svx/strings.hrc:404 msgctxt "SIP_SA_WORDWRAP" msgid "Word wrap text in shape" -msgstr "图形中的文字换行" +msgstr "图形中文字自动换行" #: include/svx/strings.hrc:405 msgctxt "SIP_SA_CHAINNEXTNAME" @@ -7928,7 +7928,7 @@ #: include/svx/svxitems.hrc:35 msgctxt "RID_ATTR_NAMES" msgid "Tab stops" -msgstr "制表符" +msgstr "制表位" #: include/svx/svxitems.hrc:36 msgctxt "RID_ATTR_NAMES" @@ -13410,7 +13410,7 @@ "\n" "The proposed changes get more radical from top down so it is recommended to try them successively one after another." msgstr "" -"%PRODUCTNAME 正在安全模式下运行，该模式下您的用户配置以及扩展功能已被暂时禁用。\n" +"%PRODUCTNAME 正在安全模式下运行，该模式下您的用户配置以及扩展已被暂时禁用。\n" "\n" "您可以对用户配置文件进行以下列出的一项或多项更改，以使 %PRODUCTNAME 回到正常工作的状态。\n" "\n" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/sw/messages.po libreoffice-6.2.3/translations/source/zh-CN/sw/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/sw/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/sw/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2019-03-14 01:29+0000\n" +"PO-Revision-Date: 2019-04-04 03:36+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1552526993.000000\n" +"X-POOTLE-MTIME: 1554348997.000000\n" #: sw/inc/app.hrc:29 msgctxt "RID_PARAGRAPHSTYLEFAMILY" @@ -3395,7 +3395,7 @@ #: sw/inc/strings.hrc:601 msgctxt "STR_PRINTOPTUI_PAGE_SIDES" msgid "Page sides" -msgstr "页面" +msgstr "左右页面" #: sw/inc/strings.hrc:602 msgctxt "STR_PRINTOPTUI_ALL_PAGES" @@ -5103,7 +5103,7 @@ #: sw/inc/strings.hrc:990 msgctxt "FMT_REF_UPDOWN" msgid "Above/Below" -msgstr "之上/之下" +msgstr "上文/下文" #: sw/inc/strings.hrc:991 msgctxt "FMT_REF_PAGE_PGDSC" @@ -5133,12 +5133,12 @@ #: sw/inc/strings.hrc:996 msgctxt "FMT_REF_NUMBER_NO_CONTEXT" msgid "Number (no context)" -msgstr "编号 (无上下文)" +msgstr "编号 (当前层级)" #: sw/inc/strings.hrc:997 msgctxt "FMT_REF_NUMBER_FULL_CONTEXT" msgid "Number (full context)" -msgstr "编号 (完整上下文)" +msgstr "编号 (完整层级)" #: sw/inc/strings.hrc:999 msgctxt "FMT_REF_WITH_LOWERCASE_HU_ARTICLE" @@ -6349,7 +6349,7 @@ #: sw/inc/strings.hrc:1258 msgctxt "STR_TOKEN_HELP_TAB_STOP" msgid "Tab stop" -msgstr "制表符" +msgstr "制表位" #: sw/inc/strings.hrc:1259 msgctxt "STR_TOKEN_HELP_TEXT" @@ -14058,7 +14058,7 @@ #: sw/uiconfig/swriter/ui/outlinepositionpage.ui:354 msgctxt "outlinepositionpage|at" msgid "Tab stop at:" -msgstr "制表符位置:" +msgstr "制表位在:" #: sw/uiconfig/swriter/ui/outlinepositionpage.ui:382 msgctxt "outlinepositionpage|liststore2" @@ -16642,7 +16642,7 @@ #: sw/uiconfig/swriter/ui/tocentriespage.ui:291 msgctxt "tocentriespage|tabstopposft" msgid "Tab stop position:" -msgstr "制表符位置:" +msgstr "制表位位置:" #: sw/uiconfig/swriter/ui/tocentriespage.ui:317 msgctxt "tocentriespage|alignright" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/sysui/desktop/share.po libreoffice-6.2.3/translations/source/zh-CN/sysui/desktop/share.po --- libreoffice-6.2.2/translations/source/zh-CN/sysui/desktop/share.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/sysui/desktop/share.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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-05-07 21:35+0200\n" -"PO-Revision-Date: 2017-02-21 03:01+0000\n" -"Last-Translator: 锁琨珑 \n" +"PO-Revision-Date: 2019-03-19 07:06+0000\n" +"Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1487646115.000000\n" +"X-POOTLE-MTIME: 1552979190.000000\n" #: documents.ulf msgctxt "" @@ -430,7 +430,7 @@ "startcenter\n" "LngText.text" msgid "The office productivity suite compatible to the open and standardized ODF document format. Supported by The Document Foundation." -msgstr "本办公生产套件与开放的 ODF 文档格式标准兼容。由 The Document Foundation 提供支持。" +msgstr "办公生产套件与开放、标准化的 ODF 文档格式兼容。由 The Document Foundation 提供支持。" #: launcher_genericname.ulf msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/vcl/messages.po libreoffice-6.2.3/translations/source/zh-CN/vcl/messages.po --- libreoffice-6.2.2/translations/source/zh-CN/vcl/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/vcl/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2018-12-17 16:29+0100\n" -"PO-Revision-Date: 2019-02-26 18:57+0000\n" +"PO-Revision-Date: 2019-04-04 03:36+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551207470.000000\n" +"X-POOTLE-MTIME: 1554349001.000000\n" #. To translators: This is the first entry of a sequence of paper size names #: vcl/inc/print.hrc:28 @@ -1635,7 +1635,7 @@ #: vcl/uiconfig/ui/printdialog.ui:1446 msgctxt "printdialog|label3" msgid "Page Sides" -msgstr "页边" +msgstr "左右页面" #: vcl/uiconfig/ui/printdialog.ui:1468 msgctxt "printdialog|label2" diff -Nru libreoffice-6.2.2/translations/source/zh-CN/wizards/source/resources.po libreoffice-6.2.3/translations/source/zh-CN/wizards/source/resources.po --- libreoffice-6.2.2/translations/source/zh-CN/wizards/source/resources.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-CN/wizards/source/resources.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2017-10-04 11:47+0200\n" -"PO-Revision-Date: 2019-03-04 19:41+0000\n" +"PO-Revision-Date: 2019-03-19 08:17+0000\n" "Last-Translator: Dian LI \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1551728503.000000\n" +"X-POOTLE-MTIME: 1552983444.000000\n" #: resources_en_US.properties msgctxt "" @@ -3158,7 +3158,7 @@ "MESSAGES_11\n" "property.text" msgid "Protection for the sheets will not be removed." -msgstr "对工作表的保护将不会被取消。" +msgstr "不会去除对工作表的保护。" #: resources_en_US.properties msgctxt "" @@ -3430,7 +3430,7 @@ "STEP_LASTPAGE_1\n" "property.text" msgid "Retrieving the relevant documents..." -msgstr "检索相关文档..." +msgstr "正在检索相关文档..." #: resources_en_US.properties msgctxt "" @@ -3438,7 +3438,7 @@ "STEP_LASTPAGE_2\n" "property.text" msgid "Converting the documents..." -msgstr "转换文档..." +msgstr "正在转换文档..." #: resources_en_US.properties msgctxt "" @@ -3654,7 +3654,7 @@ "CorrespondenceDialog_2\n" "property.text" msgid "Several recipients (address database)" -msgstr "多个收件人(地址数据库)" +msgstr "多个收件人 (地址数据库)" #: resources_en_US.properties msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-TW/cui/messages.po libreoffice-6.2.3/translations/source/zh-TW/cui/messages.po --- libreoffice-6.2.2/translations/source/zh-TW/cui/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-TW/cui/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2018-12-24 16:47+0000\n" +"PO-Revision-Date: 2019-03-18 03:37+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: LANGUAGE \n" "Language: zh_TW\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1545670021.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1552880243.000000\n" #: cui/inc/numcategories.hrc:17 msgctxt "numberingformatpage|liststore1" @@ -2308,7 +2308,7 @@ #: cui/uiconfig/ui/aboutdialog.ui:227 msgctxt "aboutdialog|copyright" msgid "Copyright © 2000–2019 LibreOffice contributors." -msgstr "" +msgstr "著作權 © 2000–2019 LibreOffice 貢獻者。" #: cui/uiconfig/ui/aboutdialog.ui:241 msgctxt "aboutdialog|libreoffice" @@ -11370,7 +11370,7 @@ #: cui/uiconfig/ui/textattrtabpage.ui:163 msgctxt "textattrtabpage|TSB_WORDWRAP_TEXT" msgid "_Word wrap text in shape" -msgstr "形狀中字詞環繞文字(_W)" +msgstr "形狀中的環繞文字(_W)" #: cui/uiconfig/ui/textattrtabpage.ui:179 msgctxt "textattrtabpage|TSB_AUTOGROW_SIZE" diff -Nru libreoffice-6.2.2/translations/source/zh-TW/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-6.2.3/translations/source/zh-TW/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-6.2.2/translations/source/zh-TW/officecfg/registry/data/org/openoffice/Office/UI.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-TW/officecfg/registry/data/org/openoffice/Office/UI.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2018-12-18 19:46+0100\n" -"PO-Revision-Date: 2018-12-25 02:15+0000\n" +"PO-Revision-Date: 2019-03-18 03:36+0000\n" "Last-Translator: Cheng-Chia Tseng \n" "Language-Team: \n" "Language: zh_TW\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" "X-Generator: Pootle 2.8\n" -"X-POOTLE-MTIME: 1545704134.000000\n" +"X-POOTLE-MTIME: 1552880194.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -1382,7 +1382,7 @@ "Label\n" "value.text" msgid "Wrap Text" -msgstr "環繞文字" +msgstr "文字折行" #: CalcCommands.xcu msgctxt "" diff -Nru libreoffice-6.2.2/translations/source/zh-TW/sfx2/messages.po libreoffice-6.2.3/translations/source/zh-TW/sfx2/messages.po --- libreoffice-6.2.2/translations/source/zh-TW/sfx2/messages.po 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/translations/source/zh-TW/sfx2/messages.po 2019-04-10 10:10:51.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2019-02-11 12:12+0100\n" -"PO-Revision-Date: 2018-12-21 14:38+0000\n" -"Last-Translator: Cheng-Chia Tseng \n" +"PO-Revision-Date: 2019-03-19 15:13+0000\n" +"Last-Translator: pan93412 \n" "Language-Team: LANGUAGE \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -13,8 +13,8 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Accelerator-Marker: ~\n" -"X-Generator: LibreOffice\n" -"X-POOTLE-MTIME: 1545403113.000000\n" +"X-Generator: Pootle 2.8\n" +"X-POOTLE-MTIME: 1553008419.000000\n" #: include/sfx2/strings.hrc:25 msgctxt "STR_TEMPLATE_FILTER" @@ -2290,6 +2290,15 @@ "\n" "This product was created by %OOOVENDOR, based on OpenOffice.org, which is Copyright 2000, 2011 Oracle and/or its affiliates. %OOOVENDOR acknowledges all community members, please see http://www.libreoffice.org/ for more details." msgstr "" +"%PRODUCTNAME 根據 Mozilla Public License v. 2.0 授權條款發布給大眾使用。MPL 條文副本可由 http://mozilla.org/MPL/2.0/ 取得。\n" +"\n" +"本軟體中適用《第三方額外代碼》著作權聲明與條款細則之部份，其條款列於 LICENSE.html 檔案中；請點選「顯示授權條款」查看以英文書寫的切確細節。\n" +"\n" +"所有於此提及的商標與註冊商標，皆為其各自對應擁有者之財產。\n" +"\n" +"著作權所有 © 2000-2019 LibreOffice 貢獻者與/或其附屬機構。保留所有權利。\n" +"\n" +"本產品由 %OOOVENDOR 基於 OpenOffice.org 所建立。OpenOffice.org 著作權所有 2000, 2001 Oracle 與/或其附屬機構。%OOOVENDOR 謹向所有社群成員致謝，若要瞭解更多細節請見 http://www.libreoffice.org/ 。" #: sfx2/uiconfig/ui/linkeditdialog.ui:8 msgctxt "linkeditdialog|title" diff -Nru libreoffice-6.2.2/ucb/source/ucp/tdoc/tdoc_provider.cxx libreoffice-6.2.3/ucb/source/ucp/tdoc/tdoc_provider.cxx --- libreoffice-6.2.2/ucb/source/ucp/tdoc/tdoc_provider.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/ucb/source/ucp/tdoc/tdoc_provider.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -88,6 +88,7 @@ static_cast< lang::XTypeProvider* >(this), static_cast< lang::XServiceInfo* >(this), static_cast< ucb::XContentProvider* >(this), + static_cast< frame::XTransientDocumentsDocumentContentIdentifierFactory* >(this), static_cast< frame::XTransientDocumentsDocumentContentFactory* >(this) ); return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ); @@ -96,10 +97,11 @@ // XTypeProvider methods. -XTYPEPROVIDER_IMPL_4( ContentProvider, +XTYPEPROVIDER_IMPL_5( ContentProvider, lang::XTypeProvider, lang::XServiceInfo, ucb::XContentProvider, + frame::XTransientDocumentsDocumentContentIdentifierFactory, frame::XTransientDocumentsDocumentContentFactory ); @@ -164,13 +166,11 @@ } -// XTransientDocumentsDocumentContentFactory methods. - +// XTransientDocumentsDocumentContentIdentifierFactory methods. -// virtual -uno::Reference< ucb::XContent > SAL_CALL -ContentProvider::createDocumentContent( - const uno::Reference< frame::XModel >& Model ) +uno::Reference SAL_CALL +ContentProvider::createDocumentContentIdentifier( + uno::Reference const& xModel) { // model -> id -> content identifier -> queryContent if ( !m_xDocsMgr.is() ) @@ -181,7 +181,7 @@ 1 ); } - OUString aDocId = tdoc_ucp::OfficeDocumentsManager::queryDocumentId( Model ); + OUString aDocId = tdoc_ucp::OfficeDocumentsManager::queryDocumentId(xModel); if ( aDocId.isEmpty() ) { throw lang::IllegalArgumentException( @@ -196,6 +196,17 @@ uno::Reference< ucb::XContentIdentifier > xId = new ::ucbhelper::ContentIdentifier( aBuffer.makeStringAndClear() ); + return xId; +} + +// XTransientDocumentsDocumentContentFactory methods. + +uno::Reference< ucb::XContent > SAL_CALL +ContentProvider::createDocumentContent( + uno::Reference const& xModel) +{ + uno::Reference const xId( + createDocumentContentIdentifier(xModel)); osl::MutexGuard aGuard( m_aMutex ); diff -Nru libreoffice-6.2.2/ucb/source/ucp/tdoc/tdoc_provider.hxx libreoffice-6.2.3/ucb/source/ucp/tdoc/tdoc_provider.hxx --- libreoffice-6.2.2/ucb/source/ucp/tdoc/tdoc_provider.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/ucb/source/ucp/tdoc/tdoc_provider.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -53,9 +54,10 @@ class StorageElementFactory; -class ContentProvider : - public ::ucbhelper::ContentProviderImplHelper, - public css::frame::XTransientDocumentsDocumentContentFactory +class ContentProvider + : public ::ucbhelper::ContentProviderImplHelper + , public css::frame::XTransientDocumentsDocumentContentIdentifierFactory + , public css::frame::XTransientDocumentsDocumentContentFactory { public: explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); @@ -88,6 +90,11 @@ virtual css::uno::Reference< css::ucb::XContent > SAL_CALL queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) override; + // XTransientDocumentsDocumentContentIdentifierFactory + virtual css::uno::Reference SAL_CALL + createDocumentContentIdentifier( + css::uno::Reference const& xModel) override; + // XTransientDocumentsDocumentContentFactory virtual css::uno::Reference< css::ucb::XContent > SAL_CALL createDocumentContent( const css::uno::Reference< diff -Nru libreoffice-6.2.2/vcl/CppunitTest_vcl_gen.mk libreoffice-6.2.3/vcl/CppunitTest_vcl_gen.mk --- libreoffice-6.2.2/vcl/CppunitTest_vcl_gen.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/vcl/CppunitTest_vcl_gen.mk 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,42 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,vcl_gen)) + +$(eval $(call gb_CppunitTest_add_exception_objects,vcl_gen, \ + vcl/qa/cppunit/gen/gen \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,vcl_gen, \ + comphelper \ + cppu \ + cppuhelper \ + sal \ + sfx \ + subsequenttest \ + test \ + tl \ + unotest \ + vcl \ +)) + +$(eval $(call gb_CppunitTest_use_external,vcl_gen,boost_headers)) + +$(eval $(call gb_CppunitTest_use_sdk_api,vcl_gen)) + +$(eval $(call gb_CppunitTest_use_ure,vcl_gen)) +$(eval $(call gb_CppunitTest_use_vcl_non_headless,vcl_gen)) + +$(eval $(call gb_CppunitTest_use_rdb,vcl_gen,services)) + +$(eval $(call gb_CppunitTest_use_configuration,vcl_gen)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-6.2.2/vcl/inc/qt5/Qt5Frame.hxx libreoffice-6.2.3/vcl/inc/qt5/Qt5Frame.hxx --- libreoffice-6.2.2/vcl/inc/qt5/Qt5Frame.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/inc/qt5/Qt5Frame.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -81,6 +81,7 @@ bool m_bDefaultSize; bool m_bDefaultPos; bool m_bFullScreen; + QRect m_aRestoreGeometry; void Center(); Size CalcDefaultSize(); @@ -101,6 +102,7 @@ QScreen* screen() const; bool isMinimized() const; bool isMaximized() const; + void SetWindowStateImpl(Qt::WindowStates eState); void TriggerPaintEvent(); void TriggerPaintEvent(QRect aRect); @@ -137,7 +139,8 @@ virtual void deregisterDragSource(Qt5DragSource const* pDragSource); virtual void registerDropTarget(Qt5DropTarget* pDropTarget); virtual void deregisterDropTarget(Qt5DropTarget const* pDropTarget); - void draggingStarted(const int x, const int y, const QMimeData* pQMimeData); + void draggingStarted(const int x, const int y, Qt::DropActions eActions, + const QMimeData* pQMimeData); void dropping(const int x, const int y, const QMimeData* pQMimeData); virtual void SetExtendedFrameStyle(SalExtStyle nExtStyle) override; diff -Nru libreoffice-6.2.2/vcl/inc/qt5/Qt5Instance.hxx libreoffice-6.2.3/vcl/inc/qt5/Qt5Instance.hxx --- libreoffice-6.2.2/vcl/inc/qt5/Qt5Instance.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/inc/qt5/Qt5Instance.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -50,10 +50,12 @@ private Q_SLOTS: bool ImplYield(bool bWait, bool bHandleAllCurrentEvents); + static void deleteObjectLater(QObject* pObject); Q_SIGNALS: bool ImplYieldSignal(bool bWait, bool bHandleAllCurrentEvents); std::unique_ptr createMenuSignal(bool, Menu*); + void deleteObjectLaterSignal(QObject* pObject); public: explicit Qt5Instance(bool bUseCairo = false); diff -Nru libreoffice-6.2.2/vcl/inc/qt5/Qt5Menu.hxx libreoffice-6.2.3/vcl/inc/qt5/Qt5Menu.hxx --- libreoffice-6.2.2/vcl/inc/qt5/Qt5Menu.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/inc/qt5/Qt5Menu.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -51,6 +51,7 @@ virtual void SetSubMenu(SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos) override; virtual void SetFrame(const SalFrame* pFrame) override; const Qt5Frame* GetFrame() const; + virtual void ShowMenuBar(bool bVisible) override; Qt5Menu* GetTopLevel(); virtual void SetItemBits(unsigned nPos, MenuItemBits nBits) override; virtual void CheckItem(unsigned nPos, bool bCheck) override; diff -Nru libreoffice-6.2.2/vcl/inc/qt5/Qt5Tools.hxx libreoffice-6.2.3/vcl/inc/qt5/Qt5Tools.hxx --- libreoffice-6.2.2/vcl/inc/qt5/Qt5Tools.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/inc/qt5/Qt5Tools.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -30,6 +30,7 @@ #include #include +#include #include @@ -64,6 +65,10 @@ 255 - rColor.GetTransparency()); } +Qt::DropActions toQtDropActions(sal_Int8 dragOperation); +sal_Int8 toVclDropActions(Qt::DropActions dragOperation); +Qt::DropAction getPreferredDropAction(sal_Int8 dragOperation); + inline QList toQList(const css::uno::Sequence& aSequence) { QList aList; @@ -118,6 +123,8 @@ } } +static const QString sInternalMimeType = "application/x-libreoffice-dnditem"; + typedef struct _cairo_surface cairo_surface_t; struct CairoDeleter { diff -Nru libreoffice-6.2.2/vcl/inc/qt5/Qt5Widget.hxx libreoffice-6.2.3/vcl/inc/qt5/Qt5Widget.hxx --- libreoffice-6.2.2/vcl/inc/qt5/Qt5Widget.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/inc/qt5/Qt5Widget.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -66,15 +66,13 @@ void inputMethodEvent(QInputMethodEvent*) override; QVariant inputMethodQuery(Qt::InputMethodQuery) const override; - const QString m_InternalMimeType = "application/x-libreoffice-dnditem"; - public slots: static void showTooltip(const OUString& rTip); public: Qt5Widget(Qt5Frame& rFrame, Qt::WindowFlags f = Qt::WindowFlags()); Qt5Frame* m_pFrame; - void startDrag(); + void startDrag(sal_Int8 nSourceActions); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/vcl/Module_vcl.mk libreoffice-6.2.3/vcl/Module_vcl.mk --- libreoffice-6.2.2/vcl/Module_vcl.mk 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/Module_vcl.mk 2019-04-10 10:10:51.000000000 +0000 @@ -251,4 +251,10 @@ CppunitTest_vcl_dialogs_test \ )) +ifneq ($(DISPLAY),) +$(eval $(call gb_Module_add_slowcheck_targets,vcl,\ + CppunitTest_vcl_gen \ +)) +endif + # vim: set noet sw=4 ts=4: diff -Nru libreoffice-6.2.2/vcl/opengl/gdiimpl.cxx libreoffice-6.2.3/vcl/opengl/gdiimpl.cxx --- libreoffice-6.2.2/vcl/opengl/gdiimpl.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/opengl/gdiimpl.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1746,7 +1746,19 @@ VCL_GL_INFO( "::drawBitmap" ); PreDraw(); - DrawTexture( rTexture, rPosAry ); + if (rPosAry.mnSrcWidth != rPosAry.mnDestWidth || + rPosAry.mnSrcHeight != rPosAry.mnDestHeight) + { + basegfx::B2DPoint aNull(rPosAry.mnDestX,rPosAry.mnDestY); + basegfx::B2DPoint aX(rPosAry.mnDestX + rPosAry.mnDestWidth, rPosAry.mnDestY); + basegfx::B2DPoint aY(rPosAry.mnDestX, rPosAry.mnDestY + rPosAry.mnDestHeight); + OpenGLTexture mask; // no mask set + DrawTransformedTexture(rTexture, mask, aNull, aX, aY); + } + else + { + DrawTexture( rTexture, rPosAry ); + } PostDraw(); } diff -Nru libreoffice-6.2.2/vcl/opengl/salbmp.cxx libreoffice-6.2.3/vcl/opengl/salbmp.cxx --- libreoffice-6.2.2/vcl/opengl/salbmp.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/opengl/salbmp.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -496,13 +496,6 @@ determineTextureFormat(mnBits, nFormat, nType); } - else if( mnBits == 8 && maPalette.IsGreyPalette() ) - { - // no conversion needed for grayscale - pData = mpUserBuffer.get(); - nFormat = GL_LUMINANCE; - nType = GL_UNSIGNED_BYTE; - } else { VCL_GL_INFO( "::CreateTexture - convert from " << mnBits << " to 24 bits" ); Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/vcl/qa/cppunit/gen/data/tdf121120.png and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/vcl/qa/cppunit/gen/data/tdf121120.png differ diff -Nru libreoffice-6.2.2/vcl/qa/cppunit/gen/gen.cxx libreoffice-6.2.3/vcl/qa/cppunit/gen/gen.cxx --- libreoffice-6.2.2/vcl/qa/cppunit/gen/gen.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-6.2.3/vcl/qa/cppunit/gen/gen.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +using namespace com::sun::star; + +/// This test uses the gen backend (i.e. intentionally not the svp one, which is the default.) +class GenTest : public UnoApiTest +{ +public: + GenTest() + : UnoApiTest("/vcl/qa/cppunit/gen/data/") + { + } + + virtual void setUp() override + { + UnoApiTest::setUp(); + mxDesktop.set( + frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory()))); + SfxApplication::GetOrCreate(); + }; + + virtual void tearDown() override + { + if (mxComponent.is()) + { + closeDocument(mxComponent); + mxComponent->dispose(); + } + UnoApiTest::tearDown(); + }; + + Bitmap load(const char* pName) + { + OUString aFileURL; + createFileURL(OUString::createFromAscii(pName), aFileURL); + mxComponent = loadFromDesktop(aFileURL, "com.sun.star.drawing.DrawingDocument"); + SfxBaseModel* pModel = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(pModel); + SfxObjectShell* pShell = pModel->GetObjectShell(); + std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile(); + BitmapEx aResultBitmap; + CPPUNIT_ASSERT(xMetaFile->CreateThumbnail(aResultBitmap)); + return aResultBitmap.GetBitmap(); + } + + uno::Reference mxComponent; +}; + +CPPUNIT_TEST_FIXTURE(GenTest, testTdf121120) +{ + Bitmap aBitmap = load("tdf121120.png"); + Bitmap::ScopedReadAccess pAccess(aBitmap); + const Size& rSize = aBitmap.GetPrefSize(); + Color aColor(pAccess->GetPixel(rSize.getWidth() / 2, rSize.getHeight() / 2).GetColor()); + // Without the accompanying fix in place, this test would have failed with 'Expected: 255; + // Actual : 1'. I.e. center if the preview (which has the background color) was ~black, not + // white. + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetRed())); + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetBlue())); + CPPUNIT_ASSERT_EQUAL(0xff, int(aColor.GetGreen())); +} + +CPPUNIT_PLUGIN_IMPLEMENT(); + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/vcl/qa/cppunit/pdfexport/data/tdf121615.odt and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/vcl/qa/cppunit/pdfexport/data/tdf121615.odt differ diff -Nru libreoffice-6.2.2/vcl/qa/cppunit/pdfexport/pdfexport.cxx libreoffice-6.2.3/vcl/qa/cppunit/pdfexport/pdfexport.cxx --- libreoffice-6.2.2/vcl/qa/cppunit/pdfexport/pdfexport.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qa/cppunit/pdfexport/pdfexport.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +34,15 @@ using namespace ::com::sun::star; +static std::ostream& operator<<(std::ostream& rStrm, const Color& rColor) +{ + rStrm << "Color: R:" << static_cast(rColor.GetRed()) + << " G:" << static_cast(rColor.GetGreen()) + << " B:" << static_cast(rColor.GetBlue()) + << " A:" << static_cast(rColor.GetTransparency()); + return rStrm; +} + namespace { @@ -118,6 +128,7 @@ void testTdf113143(); void testTdf115262(); void testTdf121962(); + void testTdf121615(); CPPUNIT_TEST_SUITE(PdfExportTest); CPPUNIT_TEST(testTdf106059); @@ -152,6 +163,7 @@ CPPUNIT_TEST(testTdf113143); CPPUNIT_TEST(testTdf115262); CPPUNIT_TEST(testTdf121962); + CPPUNIT_TEST(testTdf121615); CPPUNIT_TEST_SUITE_END(); }; @@ -1670,6 +1682,52 @@ } } +void PdfExportTest::testTdf121615() +{ + vcl::filter::PDFDocument aDocument; + load("tdf121615.odt", aDocument); + + // The document has one page. + std::vector aPages = aDocument.GetPages(); + CPPUNIT_ASSERT_EQUAL(static_cast(1), aPages.size()); + + // Get access to the only image on the only page. + vcl::filter::PDFObjectElement* pResources = aPages[0]->LookupObject("Resources"); + CPPUNIT_ASSERT(pResources); + auto pXObjects = dynamic_cast(pResources->Lookup("XObject")); + CPPUNIT_ASSERT(pXObjects); + CPPUNIT_ASSERT_EQUAL(static_cast(1), pXObjects->GetItems().size()); + vcl::filter::PDFObjectElement* pXObject = pXObjects->LookupObject(pXObjects->GetItems().begin()->first); + CPPUNIT_ASSERT(pXObject); + vcl::filter::PDFStreamElement* pStream = pXObject->GetStream(); + CPPUNIT_ASSERT(pStream); + SvMemoryStream& rObjectStream = pStream->GetMemory(); + + // Load the embedded image. + rObjectStream.Seek( 0 ); + GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); + Graphic aGraphic; + sal_uInt16 format; + ErrCode bResult = rFilter.ImportGraphic(aGraphic, OUString( "import" ), rObjectStream, + GRFILTER_FORMAT_DONTKNOW, &format); + CPPUNIT_ASSERT_EQUAL(ERRCODE_NONE, bResult); + + // The image should be grayscale 8bit JPEG. + sal_uInt16 jpegFormat = rFilter.GetImportFormatNumberForShortName( JPG_SHORTNAME ); + CPPUNIT_ASSERT( jpegFormat != GRFILTER_FORMAT_NOTFOUND ); + CPPUNIT_ASSERT_EQUAL( jpegFormat, format ); + BitmapEx aBitmap = aGraphic.GetBitmapEx(); + CPPUNIT_ASSERT_EQUAL( 200L, aBitmap.GetSizePixel().Width()); + CPPUNIT_ASSERT_EQUAL( 300L, aBitmap.GetSizePixel().Height()); + CPPUNIT_ASSERT_EQUAL( 8, int(aBitmap.GetBitCount())); + // tdf#121615 was caused by broken handling of data width with 8bit color, + // so the test image has some black in the bottomright corner, check it's there + CPPUNIT_ASSERT_EQUAL( COL_WHITE, aBitmap.GetPixelColor( 0, 0 )); + CPPUNIT_ASSERT_EQUAL( COL_WHITE, aBitmap.GetPixelColor( 0, 299 )); + CPPUNIT_ASSERT_EQUAL( COL_WHITE, aBitmap.GetPixelColor( 199, 0 )); + CPPUNIT_ASSERT_EQUAL( COL_BLACK, aBitmap.GetPixelColor( 199, 299 )); +} + CPPUNIT_TEST_SUITE_REGISTRATION(PdfExportTest); } diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5DragAndDrop.cxx libreoffice-6.2.3/vcl/qt5/Qt5DragAndDrop.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5DragAndDrop.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5DragAndDrop.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -128,7 +128,7 @@ } void Qt5DragSource::startDrag( - const datatransfer::dnd::DragGestureEvent& /*rEvent*/, sal_Int8 /*sourceActions*/, + const datatransfer::dnd::DragGestureEvent& /*rEvent*/, sal_Int8 sourceActions, sal_Int32 /*cursor*/, sal_Int32 /*image*/, const css::uno::Reference& rTrans, const css::uno::Reference& rListener) @@ -140,7 +140,7 @@ { Qt5Widget* qw = static_cast(m_pFrame->GetQWidget()); m_ActiveDragSource = this; - qw->startDrag(); + qw->startDrag(sourceActions); } else dragFailed(); diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5Frame.cxx libreoffice-6.2.3/vcl/qt5/Qt5Frame.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5Frame.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5Frame.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -93,6 +94,11 @@ { if (nStyle & SalFrameStyleFlags::INTRO) aWinFlags |= Qt::SplashScreen; + // floating toolbars are frameless tool windows + // + they must be able to receive keyboard focus + else if ((nStyle & SalFrameStyleFlags::FLOAT) + && (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION)) + aWinFlags |= Qt::Tool | Qt::FramelessWindowHint; else if (nStyle & (SalFrameStyleFlags::FLOAT | SalFrameStyleFlags::TOOLTIP)) aWinFlags |= Qt::ToolTip; else if ((nStyle & SalFrameStyleFlags::FLOAT) @@ -102,8 +108,6 @@ aWinFlags |= Qt::Dialog; else if (nStyle & SalFrameStyleFlags::TOOLWINDOW) aWinFlags |= Qt::Tool; - else if (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) - aWinFlags |= Qt::Window | Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus; else aWinFlags |= Qt::Window; } @@ -158,6 +162,8 @@ //m_aSystemData.pWidget = m_pQWidget; //m_aSystemData.nScreen = m_nXScreen.getXScreen(); m_aSystemData.pToolkit = "qt5"; + + SetIcon(SV_ICON_ID_OFFICE); } Qt5Frame::~Qt5Frame() @@ -288,6 +294,14 @@ return m_pQWidget->isMaximized(); } +void Qt5Frame::SetWindowStateImpl(Qt::WindowStates eState) +{ + if (m_pTopLevel) + m_pTopLevel->setWindowState(eState); + else + m_pQWidget->setWindowState(eState); +} + void Qt5Frame::SetTitle(const OUString& rTitle) { m_pQWidget->window()->setWindowTitle(toQString(rTitle)); @@ -514,7 +528,19 @@ if ((pState->mnMask & WindowStateMask::State) && (pState->mnState & WindowStateState::Maximized) && !isMaximized() && (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask) - m_pQWidget->showMaximized(); + { + if (m_pTopLevel) + { + m_pTopLevel->resize(pState->mnWidth, pState->mnHeight); + m_pTopLevel->move(pState->mnX, pState->mnY); + } + else + { + m_pQWidget->resize(pState->mnWidth, pState->mnHeight); + m_pQWidget->move(pState->mnX, pState->mnY); + } + SetWindowStateImpl(Qt::WindowMaximized); + } else if (pState->mnMask & (WindowStateMask::X | WindowStateMask::Y | WindowStateMask::Width | WindowStateMask::Height)) @@ -542,16 +568,12 @@ } else if (pState->mnMask & WindowStateMask::State && !isChild()) { - if (pState->mnState & WindowStateState::Maximized && m_pTopLevel) - { - m_pTopLevel->showMaximized(); - return; - } - - if ((pState->mnState & WindowStateState::Minimized) && isWindow()) - m_pQWidget->showMinimized(); + if (pState->mnState & WindowStateState::Maximized) + SetWindowStateImpl(Qt::WindowMaximized); + else if ((pState->mnState & WindowStateState::Minimized)) + SetWindowStateImpl(Qt::WindowMinimized); else - m_pQWidget->showNormal(); + SetWindowStateImpl(Qt::WindowNoState); } } @@ -590,9 +612,19 @@ if (!isWindow()) m_pTopLevel->show(); - // do that before going fullscreen - SetScreenNumber(nScreen); - m_bFullScreen ? windowHandle()->showFullScreen() : windowHandle()->showNormal(); + if (m_bFullScreen) + { + m_aRestoreGeometry = m_pTopLevel->geometry(); + // do that before going fullscreen + SetScreenNumber(nScreen); + windowHandle()->showFullScreen(); + } + else + { + windowHandle()->showNormal(); + m_pTopLevel->setGeometry(m_aRestoreGeometry); + m_aRestoreGeometry = QRect(); + } } void Qt5Frame::StartPresentation(bool) @@ -610,7 +642,6 @@ pWidget->setWindowFlags(flags | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint); else pWidget->setWindowFlags(flags & ~(Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint)); - pWidget->show(); } void Qt5Frame::ToTop(SalFrameToTop nFlags) @@ -619,8 +650,10 @@ if (isWindow() && !(nFlags & SalFrameToTop::GrabFocusOnly)) pWidget->raise(); - pWidget->setFocus(); - pWidget->activateWindow(); + if ((nFlags & SalFrameToTop::RestoreWhenMin) || (nFlags & SalFrameToTop::ForegroundTask)) + pWidget->activateWindow(); + else if ((nFlags & SalFrameToTop::GrabFocus) || (nFlags & SalFrameToTop::GrabFocusOnly)) + m_pQWidget->setFocus(); } void Qt5Frame::SetPointer(PointerStyle ePointerStyle) @@ -1076,7 +1109,8 @@ m_pDropTarget = nullptr; } -void Qt5Frame::draggingStarted(const int x, const int y, const QMimeData* pQMimeData) +void Qt5Frame::draggingStarted(const int x, const int y, Qt::DropActions eActions, + const QMimeData* pQMimeData) { assert(m_pDropTarget); @@ -1085,11 +1119,11 @@ aEvent.Context = static_cast(m_pDropTarget); aEvent.LocationX = x; aEvent.LocationY = y; - aEvent.DropAction = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; - aEvent.SourceActions = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; + aEvent.DropAction = getPreferredDropAction(eActions); + aEvent.SourceActions = toVclDropActions(eActions); css::uno::Reference xTransferable; - if (pQMimeData) + if (!pQMimeData->hasFormat(sInternalMimeType)) xTransferable = new Qt5DnDTransferable(pQMimeData); else xTransferable = Qt5DragSource::m_ActiveDragSource->GetTransferable(); @@ -1121,7 +1155,7 @@ aEvent.SourceActions = css::datatransfer::dnd::DNDConstants::ACTION_MOVE; css::uno::Reference xTransferable; - if (pQMimeData) + if (!pQMimeData->hasFormat(sInternalMimeType)) xTransferable = new Qt5DnDTransferable(pQMimeData); else xTransferable = Qt5DragSource::m_ActiveDragSource->GetTransferable(); diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5Instance.cxx libreoffice-6.2.3/vcl/qt5/Qt5Instance.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5Instance.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5Instance.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -67,6 +67,12 @@ Qt::BlockingQueuedConnection); connect(this, &Qt5Instance::createMenuSignal, this, &Qt5Instance::CreateMenu, Qt::BlockingQueuedConnection); + + // this one needs to be queued non-blocking + // in order to have this event arriving to correct event processing loop + connect(this, &Qt5Instance::deleteObjectLaterSignal, this, + [](QObject* pObject) { Qt5Instance::deleteObjectLater(pObject); }, + Qt::QueuedConnection); } Qt5Instance::~Qt5Instance() @@ -78,6 +84,8 @@ free(m_pFakeArgvFreeable[i]); } +void Qt5Instance::deleteObjectLater(QObject* pObject) { pObject->deleteLater(); } + SalFrame* Qt5Instance::CreateChildFrame(SystemParentData* /*pParent*/, SalFrameStyleFlags nStyle) { return new Qt5Frame(nullptr, nStyle, m_bUseCairo); @@ -94,7 +102,7 @@ if (pFrame) { assert(dynamic_cast(pFrame)); - static_cast(pFrame)->deleteLater(); + Q_EMIT deleteObjectLaterSignal(static_cast(pFrame)); } } @@ -109,7 +117,7 @@ if (pObject) { assert(dynamic_cast(pObject)); - static_cast(pObject)->deleteLater(); + Q_EMIT deleteObjectLaterSignal(static_cast(pObject)); } } diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5Menu.cxx libreoffice-6.2.3/vcl/qt5/Qt5Menu.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5Menu.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5Menu.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -541,6 +541,12 @@ return pMenu; } +void Qt5Menu::ShowMenuBar(bool bVisible) +{ + if (mpQMenuBar && (bVisible != mpQMenuBar->isVisible())) + bVisible ? mpQMenuBar->show() : mpQMenuBar->hide(); +} + const Qt5Frame* Qt5Menu::GetFrame() const { SolarMutexGuard aGuard; diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5Tools.cxx libreoffice-6.2.3/vcl/qt5/Qt5Tools.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5Tools.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5Tools.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -51,4 +51,42 @@ return nCode; } +Qt::DropActions toQtDropActions(sal_Int8 dragOperation) +{ + Qt::DropActions eRet = Qt::IgnoreAction; + if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_COPY) + eRet |= Qt::CopyAction; + if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_MOVE) + eRet |= Qt::MoveAction; + if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_LINK) + eRet |= Qt::LinkAction; + return eRet; +} + +sal_Int8 toVclDropActions(Qt::DropActions dragOperation) +{ + sal_Int8 nRet(0); + if (dragOperation & Qt::CopyAction) + nRet |= css::datatransfer::dnd::DNDConstants::ACTION_COPY; + if (dragOperation & Qt::MoveAction) + nRet |= css::datatransfer::dnd::DNDConstants::ACTION_MOVE; + if (dragOperation & Qt::LinkAction) + nRet |= css::datatransfer::dnd::DNDConstants::ACTION_LINK; + return nRet; +} + +Qt::DropAction getPreferredDropAction(sal_Int8 dragOperation) +{ + Qt::DropAction eAct = Qt::IgnoreAction; + + if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_MOVE) + eAct = Qt::MoveAction; + else if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_COPY) + eAct = Qt::CopyAction; + else if (dragOperation & css::datatransfer::dnd::DNDConstants::ACTION_LINK) + eAct = Qt::LinkAction; + + return eAct; +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-6.2.2/vcl/qt5/Qt5Widget.cxx libreoffice-6.2.3/vcl/qt5/Qt5Widget.cxx --- libreoffice-6.2.2/vcl/qt5/Qt5Widget.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/qt5/Qt5Widget.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -188,20 +188,20 @@ pEvent->accept(); } -void Qt5Widget::startDrag() +void Qt5Widget::startDrag(sal_Int8 nSourceActions) { // internal drag source QMimeData* mimeData = new QMimeData; - mimeData->setData(m_InternalMimeType, nullptr); + mimeData->setData(sInternalMimeType, nullptr); QDrag* drag = new QDrag(this); drag->setMimeData(mimeData); - drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::MoveAction); + drag->exec(toQtDropActions(nSourceActions), Qt::MoveAction); } void Qt5Widget::dragEnterEvent(QDragEnterEvent* event) { - if (event->mimeData()->hasFormat(m_InternalMimeType)) + if (event->mimeData()->hasFormat(sInternalMimeType)) event->accept(); else event->acceptProposedAction(); @@ -211,7 +211,7 @@ { QPoint point = event->pos(); - m_pFrame->draggingStarted(point.x(), point.y(), event->mimeData()); + m_pFrame->draggingStarted(point.x(), point.y(), event->possibleActions(), event->mimeData()); QWidget::dragMoveEvent(event); } diff -Nru libreoffice-6.2.2/vcl/source/app/salvtables.cxx libreoffice-6.2.3/vcl/source/app/salvtables.cxx --- libreoffice-6.2.2/vcl/source/app/salvtables.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/source/app/salvtables.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -2559,7 +2559,10 @@ m_xButton->SetLoseFocusHdl(LINK(this, SalInstanceSpinButton, LoseFocusHdl)); m_xButton->SetOutputHdl(LINK(this, SalInstanceSpinButton, OutputHdl)); m_xButton->SetInputHdl(LINK(this, SalInstanceSpinButton, InputHdl)); - m_xButton->GetSubEdit()->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl)); + if (Edit* pEdit = m_xButton->GetSubEdit()) + pEdit->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl)); + else + m_xButton->SetActivateHdl(LINK(this, SalInstanceSpinButton, ActivateHdl)); } virtual int get_value() const override @@ -2621,6 +2624,8 @@ { if (Edit* pEdit = m_xButton->GetSubEdit()) pEdit->SetActivateHdl(Link()); + else + m_xButton->SetActivateHdl(Link()); m_xButton->SetInputHdl(Link()); m_xButton->SetOutputHdl(Link()); m_xButton->SetLoseFocusHdl(Link()); diff -Nru libreoffice-6.2.2/vcl/source/edit/textundo.cxx libreoffice-6.2.3/vcl/source/edit/textundo.cxx --- libreoffice-6.2.2/vcl/source/edit/textundo.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/source/edit/textundo.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -163,14 +163,19 @@ void TextUndoDelPara::Redo() { + auto & rDocNodes = GetDoc()->GetNodes(); // pNode is not valid anymore in case an Undo joined paragraphs - mpNode = GetDoc()->GetNodes()[ mnPara ].get(); + mpNode = rDocNodes[ mnPara ].get(); GetTEParaPortions()->Remove( mnPara ); // do not delete Node because of Undo! - GetDoc()->GetNodes().erase( ::std::find_if( GetDoc()->GetNodes().begin(), GetDoc()->GetNodes().end(), - [&] (std::unique_ptr const & p) { return p.get() == mpNode; } ) ); + auto it = ::std::find_if( rDocNodes.begin(), rDocNodes.end(), + [&] (std::unique_ptr const & p) { return p.get() == mpNode; } ); + assert(it != rDocNodes.end()); + it->release(); + GetDoc()->GetNodes().erase( it ); + GetTextEngine()->ImpParagraphRemoved( mnPara ); mbDelObject = true; // belongs again to the Undo diff -Nru libreoffice-6.2.2/vcl/source/filter/jpeg/JpegWriter.cxx libreoffice-6.2.3/vcl/source/filter/jpeg/JpegWriter.cxx --- libreoffice-6.2.2/vcl/source/filter/jpeg/JpegWriter.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/source/filter/jpeg/JpegWriter.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -228,7 +228,10 @@ if( mpExpWasGrey ) *mpExpWasGrey = mbGreys; - mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N24BitTcRgb ); + if ( mbGreys ) + mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N8BitPal ); + else + mbNative = ( mpReadAccess->GetScanlineFormat() == ScanlineFormat::N24BitTcRgb ); if( !mbNative ) mpBuffer = new sal_uInt8[ AlignedWidth4Bytes( mbGreys ? mpReadAccess->Width() * 8L : mpReadAccess->Width() * 24L ) ]; diff -Nru libreoffice-6.2.2/vcl/source/gdi/bitmapex.cxx libreoffice-6.2.3/vcl/source/gdi/bitmapex.cxx --- libreoffice-6.2.2/vcl/source/gdi/bitmapex.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/source/gdi/bitmapex.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -757,7 +757,7 @@ aColor.SetTransparency( pAlphaReadAccess->GetPixel( nY, nX ).GetIndex() ); } else - aColor.SetTransparency(255); + aColor.SetTransparency( 0 ); return aColor; } diff -Nru libreoffice-6.2.2/vcl/source/window/dialog.cxx libreoffice-6.2.3/vcl/source/window/dialog.cxx --- libreoffice-6.2.2/vcl/source/window/dialog.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/source/window/dialog.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1097,6 +1097,8 @@ const bool bModal = GetType() != WindowType::MODELESSDIALOG; + Hide(); + if (bModal) { SetModalInputMode(false); @@ -1121,8 +1123,6 @@ } } - Hide(); - if (bModal && GetParent()) { NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this ); diff -Nru libreoffice-6.2.2/vcl/unx/gtk3/gtk3gtkinst.cxx libreoffice-6.2.3/vcl/unx/gtk3/gtk3gtkinst.cxx --- libreoffice-6.2.2/vcl/unx/gtk3/gtk3gtkinst.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/unx/gtk3/gtk3gtkinst.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1222,11 +1222,12 @@ GtkWidget* m_pWidget; GtkInstanceBuilder* m_pBuilder; - static void signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget) + static gboolean signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget) { GtkInstanceWidget* pThis = static_cast(widget); SolarMutexGuard aGuard; pThis->signal_focus_in(); + return false; } void signal_focus_in() @@ -1234,11 +1235,12 @@ m_aFocusInHdl.Call(*this); } - static void signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget) + static gboolean signalFocusOut(GtkWidget*, GdkEvent*, gpointer widget) { GtkInstanceWidget* pThis = static_cast(widget); SolarMutexGuard aGuard; pThis->signal_focus_out(); + return false; } void signal_focus_out() @@ -3068,6 +3070,13 @@ void signal_switch_page(int nNewPage) { + if (m_bOverFlowBoxIsStart) + { + auto nOverFlowLen = m_bOverFlowBoxActive ? gtk_notebook_get_n_pages(m_pOverFlowNotebook) - 1 : 0; + // add count of overflow pages, minus the extra tab + nNewPage += nOverFlowLen; + } + bool bAllow = !m_aLeavePageHdl.IsSet() || m_aLeavePageHdl.Call(get_current_page_ident()); if (!bAllow) { @@ -3122,6 +3131,11 @@ return; } + // check if we are allowed leave before attempting to resplit the notebooks + bool bAllow = !m_aLeavePageHdl.IsSet() || m_aLeavePageHdl.Call(get_current_page_ident()); + if (!bAllow) + return; + disable_notify_events(); // take the overflow pages, and put them back at the end of the normal one @@ -3134,6 +3148,10 @@ gtk_notebook_set_current_page(m_pNotebook, nNewPage); enable_notify_events(); + + // trigger main notebook switch-page callback + OString sNewIdent(get_page_ident(m_pNotebook, nNewPage)); + m_aEnterPageHdl.Call(sNewIdent); } static OString get_page_ident(GtkNotebook *pNotebook, guint nPage) @@ -6978,20 +6996,31 @@ // tweak the cell render to get a narrower size to stick GList* cells = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(m_pComboBox)); GtkCellRenderer* cell = static_cast(cells->data); - GtkRequisition size; - gtk_cell_renderer_get_preferred_size(cell, m_pWidget, &size, nullptr); - if (nWidth < size.width) + + if (nWidth != -1) { // this bit isn't great, I really want to be able to ellipse the text in the comboboxtext itself and let - // the popup menu render them in full, in the interim ellipse both + // the popup menu render them in full, in the interim ellipse both of them g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_MIDDLE, nullptr); - gtk_cell_renderer_set_fixed_size(cell, nWidth, size.height); + + // to find out how much of the width of the combobox belongs to the cell, set + // the cell and widget to the min cell width and see what the difference is + int min; + gtk_cell_renderer_get_preferred_width(cell, m_pWidget, &min, nullptr); + gtk_cell_renderer_set_fixed_size(cell, min, -1); + gtk_widget_set_size_request(m_pWidget, min, -1); + int nNonCellWidth = get_preferred_size().Width() - min; + + // now set the cell to the max width which it can be within the + // requested widget width + gtk_cell_renderer_set_fixed_size(cell, nWidth - nNonCellWidth, -1); } else { g_object_set(G_OBJECT(m_pTextRenderer), "ellipsize", PANGO_ELLIPSIZE_NONE, nullptr); - gtk_cell_renderer_set_fixed_size(cell, -1, size.height); + gtk_cell_renderer_set_fixed_size(cell, -1, -1); } + g_list_free(cells); gtk_widget_set_size_request(m_pWidget, nWidth, nHeight); diff -Nru libreoffice-6.2.2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx libreoffice-6.2.3/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx --- libreoffice-6.2.2/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/unx/gtk3_kde5/gtk3_kde5_filepicker_ipc.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -58,7 +58,7 @@ const auto utf8Path = applicationSystemPath.toUtf8(); auto ret = boost::filesystem::path(utf8Path.getStr(), utf8Path.getStr() + utf8Path.getLength()); ret.remove_filename(); - return OUString::fromUtf8(OString(ret.c_str(), ret.size())); + return OUString::fromUtf8(OString(ret.c_str(), strlen(ret.c_str()))); } OUString findPickerExecutable() diff -Nru libreoffice-6.2.2/vcl/unx/kde4/KDEXLib.cxx libreoffice-6.2.3/vcl/unx/kde4/KDEXLib.cxx --- libreoffice-6.2.2/vcl/unx/kde4/KDEXLib.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/unx/kde4/KDEXLib.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -210,8 +210,15 @@ static gint gpoll_wrapper( GPollFD* ufds, guint nfds, gint timeout ) { - SolarMutexReleaser aReleaser; - return old_gpoll( ufds, nfds, timeout ); + if (GetSalData()->m_pInstance->GetYieldMutex()->IsCurrentThread()) + { + SolarMutexReleaser aReleaser; + return old_gpoll( ufds, nfds, timeout ); + } + else + { + return old_gpoll( ufds, nfds, timeout ); + } } #endif diff -Nru libreoffice-6.2.2/vcl/win/gdi/salnativewidgets-luna.cxx libreoffice-6.2.3/vcl/win/gdi/salnativewidgets-luna.cxx --- libreoffice-6.2.2/vcl/win/gdi/salnativewidgets-luna.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/vcl/win/gdi/salnativewidgets-luna.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -503,18 +503,21 @@ { tools::Rectangle aRet; - const MenupopupValue& rMVal(static_cast(rValue)); - aRet.SetTop(rMVal.maItemRect.Top()); - aRet.SetBottom(rMVal.maItemRect.Bottom() + 1); // see below in drawNativeControl + auto pMVal = dynamic_cast(&rValue); + if (!pMVal) + return aRet; + + aRet.SetTop(pMVal->maItemRect.Top()); + aRet.SetBottom(pMVal->maItemRect.Bottom() + 1); // see below in drawNativeControl if (AllSettings::GetLayoutRTL()) { - aRet.SetRight(rMVal.maItemRect.Right() + 1); - aRet.SetLeft(aRet.Right() - (rMVal.getNumericVal() - rMVal.maItemRect.Left())); + aRet.SetRight(pMVal->maItemRect.Right() + 1); + aRet.SetLeft(aRet.Right() - (pMVal->getNumericVal() - pMVal->maItemRect.Left())); } else { - aRet.SetRight(rMVal.getNumericVal()); - aRet.SetLeft(rMVal.maItemRect.Left()); + aRet.SetRight(pMVal->getNumericVal()); + aRet.SetLeft(pMVal->maItemRect.Left()); } return aRet; @@ -1180,9 +1183,13 @@ if (pImpl && nType == ControlType::MenuPopup && (nPart == ControlPart::MenuItemCheckMark || nPart == ControlPart::MenuItemRadioMark)) { - cacheRect = GetMenuPopupMarkRegion(aValue); - buttonRect = cacheRect; - keySize = cacheRect.GetSize(); + tools::Rectangle aRectangle = GetMenuPopupMarkRegion(aValue); + if (!aRectangle.IsEmpty()) + { + cacheRect = GetMenuPopupMarkRegion(aValue); + buttonRect = cacheRect; + keySize = cacheRect.GetSize(); + } } diff -Nru libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapper.cxx libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapper.cxx --- libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapper.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapper.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -128,7 +128,9 @@ uno::Reference xDocumentMetadataAccess(xModel, uno::UNO_QUERY_THROW); uno::Reference xStorage = comphelper::OStorageHelper::GetTemporaryStorage(); OUString aBaseURL = rMediaDesc.getUnpackedValueOrDefault("URL", OUString()); - const uno::Reference xBaseURI(sfx2::createBaseURI(xContext, xStorage, aBaseURL, OUString())); + const uno::Reference xModel_(xModel, + uno::UNO_QUERY_THROW); + const uno::Reference xBaseURI(sfx2::createBaseURI(xContext, xModel_, aBaseURL, OUString())); const uno::Reference xHandler; xDocumentMetadataAccess->loadMetadataFromStorage(xStorage, xBaseURI, xHandler); } diff -Nru libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapper_Impl.cxx libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapper_Impl.cxx --- libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapper_Impl.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapper_Impl.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -515,7 +515,7 @@ { m_bSdt = bSdt; - if (m_bSdt) + if (m_bSdt && !m_aTextAppendStack.empty()) { m_xStdEntryStart = GetTopTextAppend()->getEnd(); } @@ -3856,6 +3856,9 @@ { if (aTocTitle.isEmpty() || bTableOfFigures) { + // reset marker of the TOC title + m_xStdEntryStart = uno::Reference< text::XTextRange >(); + xTOC.set( m_xTextFactory->createInstance ( bTableOfFigures ? diff -Nru libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapperTableManager.cxx libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapperTableManager.cxx --- libreoffice-6.2.2/writerfilter/source/dmapper/DomainMapperTableManager.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/writerfilter/source/dmapper/DomainMapperTableManager.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -679,7 +679,8 @@ for ( sal_Int32 nGridCount = *aSpansIter; nGridCount > 0; --nGridCount ) fGridWidth += (*pTableGrid.get())[nBorderGridIndex++]; - sal_Int16 nRelPos = rtl::math::round((fGridWidth * 10000) / nFullWidthRelative); + sal_Int16 nRelPos = + sal::static_int_cast< sal_Int16 >((fGridWidth * 10000) / nFullWidthRelative); pSeparators[nBorder].Position = nRelPos + nLastRelPos; pSeparators[nBorder].IsVisible = true; diff -Nru libreoffice-6.2.2/writerfilter/source/dmapper/PropertyMap.cxx libreoffice-6.2.3/writerfilter/source/dmapper/PropertyMap.cxx --- libreoffice-6.2.2/writerfilter/source/dmapper/PropertyMap.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/writerfilter/source/dmapper/PropertyMap.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -1242,8 +1242,9 @@ std::vector& rAnchoredObjectAnchors = rDM_Impl.m_aAnchoredObjectAnchors; for (auto& rAnchor : rAnchoredObjectAnchors) { - // Ignore this paragraph when there is a single shape only. - if (rAnchor.m_aAnchoredObjects.size() < 2) + // Ignore this paragraph when there are not enough shapes to trigger the Word bug we + // emulate. + if (rAnchor.m_aAnchoredObjects.size() < 4) continue; // Analyze the anchored objects of this paragraph, now that we know the diff -Nru libreoffice-6.2.2/xmlsecurity/inc/xsecctl.hxx libreoffice-6.2.3/xmlsecurity/inc/xsecctl.hxx --- libreoffice-6.2.2/xmlsecurity/inc/xsecctl.hxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/inc/xsecctl.hxx 2019-04-10 10:10:51.000000000 +0000 @@ -89,10 +89,10 @@ xReferenceResolvedListener = xListener; } - void addReference( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri, sal_Int32 keeperId ) + void addReference( SignatureReferenceType type, sal_Int32 digestID, const OUString& uri, sal_Int32 keeperId, const OUString& rType ) { signatureInfor.vSignatureReferenceInfors.push_back( - SignatureReferenceInformation(type, digestID, uri)); + SignatureReferenceInformation(type, digestID, uri, rType)); vKeeperIds.push_back( keeperId ); } }; @@ -261,7 +261,8 @@ void switchGpgSignature(); void addReference( const OUString& ouUri, - sal_Int32 nDigestID ); + sal_Int32 nDigestID, + const OUString& ouType ); void addStreamReference( const OUString& ouUri, bool isBinary, Binary files /tmp/tmpZN8U2X/RmgsOoGSFu/libreoffice-6.2.2/xmlsecurity/qa/unit/signing/data/notype-xades.odt and /tmp/tmpZN8U2X/PflUUpOvY0/libreoffice-6.2.3/xmlsecurity/qa/unit/signing/data/notype-xades.odt differ diff -Nru libreoffice-6.2.2/xmlsecurity/qa/unit/signing/signing.cxx libreoffice-6.2.3/xmlsecurity/qa/unit/signing/signing.cxx --- libreoffice-6.2.2/xmlsecurity/qa/unit/signing/signing.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/qa/unit/signing/signing.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -101,6 +101,7 @@ #endif void test96097Calc(); void test96097Doc(); + void testXAdESNotype(); /// Creates a XAdES signature from scratch. void testXAdES(); /// Works with an existing good XAdES signature. @@ -144,6 +145,7 @@ #endif CPPUNIT_TEST(test96097Calc); CPPUNIT_TEST(test96097Doc); + CPPUNIT_TEST(testXAdESNotype); CPPUNIT_TEST(testXAdES); CPPUNIT_TEST(testXAdESGood); CPPUNIT_TEST(testSignatureLineOOXML); @@ -781,6 +783,65 @@ } } +void SigningTest::testXAdESNotype() +{ + // Create a working copy. + utl::TempFile aTempFile; + aTempFile.EnableKillingFile(); + OUString aURL = aTempFile.GetURL(); + CPPUNIT_ASSERT_EQUAL( + osl::File::RC::E_None, + osl::File::copy(m_directories.getURLFromSrc(DATA_DIRECTORY) + "notype-xades.odt", aURL)); + + // Read existing signature. + DocumentSignatureManager aManager(mxComponentContext, DocumentSignatureMode::Content); + CPPUNIT_ASSERT(aManager.init()); + uno::Reference xStorage + = comphelper::OStorageHelper::GetStorageOfFormatFromURL( + ZIP_STORAGE_FORMAT_STRING, aTempFile.GetURL(), embed::ElementModes::READWRITE); + CPPUNIT_ASSERT(xStorage.is()); + aManager.mxStore = xStorage; + aManager.maSignatureHelper.SetStorage(xStorage, "1.2"); + aManager.read(/*bUseTempStream=*/false); + + // Create a new signature. + uno::Reference xCertificate + = getCertificate(aManager, svl::crypto::SignatureMethodAlgorithm::RSA); + if (!xCertificate.is()) + return; + sal_Int32 nSecurityId; + aManager.add(xCertificate, mxSecurityContext, /*rDescription=*/OUString(), nSecurityId, + /*bAdESCompliant=*/true); + + // Write to storage. + aManager.read(/*bUseTempStream=*/true); + aManager.write(/*bXAdESCompliantIfODF=*/true); + uno::Reference xTransactedObject(xStorage, uno::UNO_QUERY); + xTransactedObject->commit(); + + // Parse the resulting XML. + uno::Reference xMetaInf + = xStorage->openStorageElement("META-INF", embed::ElementModes::READ); + uno::Reference xInputStream( + xMetaInf->openStreamElement("documentsignatures.xml", embed::ElementModes::READ), + uno::UNO_QUERY); + std::shared_ptr pStream(utl::UcbStreamHelper::CreateStream(xInputStream, true)); + xmlDocPtr pXmlDoc = parseXmlStream(pStream.get()); + + // Without the accompanying fix in place, this test would have failed with "unexpected 'Type' + // attribute", i.e. the signature without such an attribute was not preserved correctly. + assertXPathNoAttribute(pXmlDoc, + "/odfds:document-signatures/dsig:Signature[1]/dsig:SignedInfo/" + "dsig:Reference[@URI='#idSignedProperties']", + "Type"); + + // New signature always has the Type attribute. + assertXPath(pXmlDoc, + "/odfds:document-signatures/dsig:Signature[2]/dsig:SignedInfo/" + "dsig:Reference[@URI='#idSignedProperties']", + "Type", "http://uri.etsi.org/01903#SignedProperties"); +} + void SigningTest::testXAdES() { // Create an empty document, store it to a tempfile and load it as a storage. diff -Nru libreoffice-6.2.2/xmlsecurity/source/helper/ooxmlsecparser.cxx libreoffice-6.2.3/xmlsecurity/source/helper/ooxmlsecparser.cxx --- libreoffice-6.2.2/xmlsecurity/source/helper/ooxmlsecparser.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/source/helper/ooxmlsecparser.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -72,7 +72,7 @@ { OUString aURI = xAttribs->getValueByName("URI"); if (aURI.startsWith("#")) - m_pXSecController->addReference(aURI.copy(1), xml::crypto::DigestID::SHA1); + m_pXSecController->addReference(aURI.copy(1), xml::crypto::DigestID::SHA1, OUString()); else { m_aReferenceURI = aURI; diff -Nru libreoffice-6.2.2/xmlsecurity/source/helper/xsecctl.cxx libreoffice-6.2.3/xmlsecurity/source/helper/xsecctl.cxx --- libreoffice-6.2.2/xmlsecurity/source/helper/xsecctl.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/source/helper/xsecctl.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -662,12 +662,12 @@ "URI", "#" + refInfor.ouURI); - if (bXAdESCompliantIfODF && refInfor.ouURI == "idSignedProperties") + if (bXAdESCompliantIfODF && refInfor.ouURI == "idSignedProperties" && !refInfor.ouType.isEmpty()) { // The reference which points to the SignedProperties // shall have this specific type. pAttributeList->AddAttribute("Type", - "http://uri.etsi.org/01903#SignedProperties"); + refInfor.ouType); } } diff -Nru libreoffice-6.2.2/xmlsecurity/source/helper/xsecparser.cxx libreoffice-6.2.3/xmlsecurity/source/helper/xsecparser.cxx --- libreoffice-6.2.2/xmlsecurity/source/helper/xsecparser.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/source/helper/xsecparser.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -129,12 +129,14 @@ { OUString ouUri = xAttribs->getValueByName("URI"); SAL_WARN_IF( ouUri.isEmpty(), "xmlsecurity.helper", "URI is empty" ); + // Remember the type of this reference. + OUString ouType = xAttribs->getValueByName("Type"); if (ouUri.startsWith("#")) { /* * remove the first character '#' from the attribute value */ - m_pXSecController->addReference( ouUri.copy(1), m_nReferenceDigestID ); + m_pXSecController->addReference( ouUri.copy(1), m_nReferenceDigestID, ouType ); } else { diff -Nru libreoffice-6.2.2/xmlsecurity/source/helper/xsecsign.cxx libreoffice-6.2.3/xmlsecurity/source/helper/xsecsign.cxx --- libreoffice-6.2.2/xmlsecurity/source/helper/xsecsign.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/source/helper/xsecsign.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -138,12 +138,13 @@ { internalSignatureInfor.signatureInfor.ouSignatureId = createId(); internalSignatureInfor.signatureInfor.ouPropertyId = createId(); - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, internalSignatureInfor.signatureInfor.ouPropertyId, -1 ); + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, internalSignatureInfor.signatureInfor.ouPropertyId, -1, OUString() ); size++; if (bXAdESCompliantIfODF) { - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idSignedProperties", -1); + // We write a new reference, so it's possible to use the correct type URI. + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idSignedProperties", -1, "http://uri.etsi.org/01903#SignedProperties"); size++; } @@ -151,17 +152,17 @@ { // Only mention the hash of the description in the signature if it's non-empty. internalSignatureInfor.signatureInfor.ouDescriptionPropertyId = createId(); - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, internalSignatureInfor.signatureInfor.ouDescriptionPropertyId, -1); + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, internalSignatureInfor.signatureInfor.ouDescriptionPropertyId, -1, OUString()); size++; } } else { - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idPackageObject", -1); + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idPackageObject", -1, OUString()); size++; - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idOfficeObject", -1); + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idOfficeObject", -1, OUString()); size++; - internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idSignedProperties", -1); + internalSignatureInfor.addReference(SignatureReferenceType::SAMEDOCUMENT, digestID, "idSignedProperties", -1, OUString()); size++; } @@ -189,7 +190,7 @@ if (index == -1) { InternalSignatureInformation isi(securityId, nullptr); - isi.addReference(type, digestID, uri, -1); + isi.addReference(type, digestID, uri, -1, OUString()); m_vInternalSignatureInformations.push_back( isi ); } else @@ -197,7 +198,7 @@ // use sha512 for gpg signing unconditionally if (!m_vInternalSignatureInformations[index].signatureInfor.ouGpgCertificate.isEmpty()) digestID = cssxc::DigestID::SHA512; - m_vInternalSignatureInformations[index].addReference(type, digestID, uri, -1); + m_vInternalSignatureInformations[index].addReference(type, digestID, uri, -1, OUString()); } } diff -Nru libreoffice-6.2.2/xmlsecurity/source/helper/xsecverify.cxx libreoffice-6.2.3/xmlsecurity/source/helper/xsecverify.cxx --- libreoffice-6.2.2/xmlsecurity/source/helper/xsecverify.cxx 2019-03-15 19:58:40.000000000 +0000 +++ libreoffice-6.2.3/xmlsecurity/source/helper/xsecverify.cxx 2019-04-10 10:10:51.000000000 +0000 @@ -148,7 +148,7 @@ #endif } -void XSecController::addReference( const OUString& ouUri, sal_Int32 nDigestID ) +void XSecController::addReference( const OUString& ouUri, sal_Int32 nDigestID, const OUString& ouType ) { if (m_vInternalSignatureInformations.empty()) { @@ -156,7 +156,7 @@ return; } InternalSignatureInformation &isi = m_vInternalSignatureInformations.back(); - isi.addReference(SignatureReferenceType::SAMEDOCUMENT, nDigestID, ouUri, -1 ); + isi.addReference(SignatureReferenceType::SAMEDOCUMENT, nDigestID, ouUri, -1, ouType ); } void XSecController::addStreamReference( @@ -189,7 +189,7 @@ } } - isi.addReference(type, nDigestID, ouUri, -1); + isi.addReference(type, nDigestID, ouUri, -1, OUString()); } void XSecController::setReferenceCount() const