diff -Nru libreoffice-5.0.2/basctl/source/basicide/baside3.cxx libreoffice-5.0.5~rc2/basctl/source/basicide/baside3.cxx --- libreoffice-5.0.2/basctl/source/basicide/baside3.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/basctl/source/basicide/baside3.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -98,6 +98,12 @@ SetReadOnly(true); } +void DialogWindow::dispose() +{ + pEditor.reset(); + BaseWindow::dispose(); +} + void DialogWindow::LoseFocus() { if ( IsModified() ) diff -Nru libreoffice-5.0.2/basctl/source/inc/baside3.hxx libreoffice-5.0.5~rc2/basctl/source/inc/baside3.hxx --- libreoffice-5.0.2/basctl/source/inc/baside3.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/basctl/source/inc/baside3.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -56,13 +56,14 @@ { private: DialogWindowLayout& rLayout; - boost::scoped_ptr pEditor; // never nullptr + boost::scoped_ptr pEditor; boost::scoped_ptr pUndoMgr; // never nullptr OUString aCurPath; protected: virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/basic/source/classes/sbxmod.cxx libreoffice-5.0.5~rc2/basic/source/classes/sbxmod.cxx --- libreoffice-5.0.2/basic/source/classes/sbxmod.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/basic/source/classes/sbxmod.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -77,6 +77,8 @@ #include "sbxmod.hxx" #include "parser.hxx" +#include + using namespace com::sun::star; using namespace com::sun::star::lang; using namespace com::sun::star::reflection; @@ -1068,6 +1070,7 @@ void SbModule::Run( SbMethod* pMeth ) { SAL_INFO("basic","About to run " << OUStringToOString( pMeth->GetName(), RTL_TEXTENCODING_UTF8 ).getStr() << ", vba compatmode is " << mbVBACompat ); + static sal_uInt16 nMaxCallLevel = 0; bool bDelInst = ( GetSbData()->pInst == NULL ); @@ -1175,7 +1178,9 @@ { GetSbData()->pInst->EnableCompatibility( true ); } + while( pRt->Step() ) {} + if( pRt->pNext ) pRt->pNext->unblock(); @@ -2035,14 +2040,35 @@ { if( !SbxMethod::LoadData( rStrm, 1 ) ) return false; - sal_Int16 n; - rStrm.ReadInt16( n ); + + sal_uInt16 nFlag; + rStrm.ReadUInt16( nFlag ); + sal_Int16 nTempStart = (sal_Int16)nStart; + if( nVer == 2 ) + { rStrm.ReadUInt16( nLine1 ).ReadUInt16( nLine2 ).ReadInt16( nTempStart ).ReadCharAsBool( bInvalid ); + //tdf#94617 + if (nFlag & 0x8000) + { + sal_uInt16 nMult = nFlag & 0x7FFF; + sal_Int16 nMax = std::numeric_limits::max(); + nStart = nMult * nMax + nTempStart; + } + else + { + nStart = nTempStart; + } + } + else + { + nStart = nTempStart; + } + // HACK ue to 'Referenz could not be saved' SetFlag( SBX_NO_MODIFY ); - nStart = nTempStart; + return true; } @@ -2050,11 +2076,19 @@ { if( !SbxMethod::StoreData( rStrm ) ) return false; - rStrm.WriteInt16( nDebugFlags ) + + //tdf#94617 + sal_Int16 nMax = std::numeric_limits::max(); + sal_Int16 nStartTemp = nStart % nMax; + sal_uInt16 nDebugFlagsTemp = nStart / nMax; + nDebugFlagsTemp |= 0x8000; + + rStrm.WriteUInt16( nDebugFlagsTemp ) .WriteInt16( nLine1 ) .WriteInt16( nLine2 ) - .WriteInt16( nStart ) + .WriteInt16( nStartTemp ) .WriteBool( bInvalid ); + return true; } diff -Nru libreoffice-5.0.2/basic/source/inc/filefmt.hxx libreoffice-5.0.5~rc2/basic/source/inc/filefmt.hxx --- libreoffice-5.0.2/basic/source/inc/filefmt.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/basic/source/inc/filefmt.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -40,11 +40,12 @@ // Version 11: #29955 force anew compilation because of build-inconsistences // Version 12: aoo#64377 increase code size that basic can handle // tdf#75973 support user defined types B_USERTYPES in password protected macros +// Version 13: tdf#94617 store methods nStart information greater than sal_Int16 limit // #define B_LEGACYVERSION 0x00000011L #define B_EXT_IMG_VERSION 0x00000012L -#define B_CURVERSION 0x00000012L +#define B_CURVERSION 0x00000013L // The file contains either a module- or a library-record. // Those records contain further records. Every record's got diff -Nru libreoffice-5.0.2/bean/BUCK libreoffice-5.0.5~rc2/bean/BUCK --- libreoffice-5.0.2/bean/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/bean/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,23 @@ + +java_sources( + name = 'officebean-src', + srcs = glob(['com/**']), + visibility = ['PUBLIC'], +) + +java_doc( + name = 'officebean-javadoc', + title = 'LibreOffice API', + pkgs = [ + 'com.sun.star.comp.beans', + ], + paths = ['.'], + srcs = glob(['com/**']), + deps = [ + '//:juh', + '//:officebean', + '//:unoil', + '//:ridl', + ], + visibility = ['PUBLIC'], +) diff -Nru libreoffice-5.0.2/bean/com/sun/star/comp/beans/LocalOfficeWindow.java libreoffice-5.0.5~rc2/bean/com/sun/star/comp/beans/LocalOfficeWindow.java --- libreoffice-5.0.2/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/bean/com/sun/star/comp/beans/LocalOfficeWindow.java 2016-02-04 16:41:28.000000000 +0000 @@ -91,7 +91,7 @@ * Receives a notification about the connection has been closed. * This method has to set the connection to null. * - * @source The event object. + * @param source The event object. */ public void disposing(EventObject source) { diff -Nru libreoffice-5.0.2/bean/com/sun/star/comp/beans/OOoBean.java libreoffice-5.0.5~rc2/bean/com/sun/star/comp/beans/OOoBean.java --- libreoffice-5.0.2/bean/com/sun/star/comp/beans/OOoBean.java 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/bean/com/sun/star/comp/beans/OOoBean.java 2016-02-04 16:41:28.000000000 +0000 @@ -23,11 +23,9 @@ // @requirement FUNC.PERF.LRN/0.6 // @requirement FUNC.PERF.LOC/0.6 // @requirement FUNC.PERF.FIX/0.6 +// @requirement FUNC.RES.OTH/0.2 +// No other resources are needed yet. /** This is the basic JavaBean for all OOo application modules. - - @requirement FUNC.RES.OTH/0.2 - No other resources are needed yet. - @since OOo 2.0.0 */ public class OOoBean @@ -80,7 +78,8 @@ } // @requirement FUNC.PER/0.2 - /** @internal + // @internal + /** */ @Deprecated public void writeExternal( java.io.ObjectOutput aObjOut ) @@ -89,7 +88,8 @@ } // @requirement FUNC.PER/0.2 - /** @internal + // @internal + /** */ @Deprecated public void readExternal( java.io.ObjectInput aObjIn ) @@ -155,9 +155,8 @@ nOOoCheckCycle = nMilliSecs; } + // @internal /** Sets a connection to an OOo instance. - - @internal */ private synchronized void setOOoConnection(OfficeConnection iNewConnection) throws HasConnectionException, NoConnectionException { @@ -927,7 +926,7 @@ /** returns the Frame of the bean. - @returns + @return a Java class which implements all interfaces which the service Frame implements. Thus, methods can be called directly without queryInterface. @@ -950,7 +949,7 @@ // @requirement API.SIM.SEAP/0.2 /** returns the of the bean. - @returns + @return a Java class which implements all interfaces which the service Controller implements. Thus, methods can be called directly without queryInterface. @@ -978,7 +977,7 @@ /** returns the of the bean. - @returns + @return a Java class which implements all interfaces which the service OfficeDocument implements. @@ -1363,10 +1362,9 @@ // Helper Classes - + // @internal /** Helper class to listen on the connection to learn when it dies. - @internal */ private class EventListener extends Thread diff -Nru libreoffice-5.0.2/bean/pom.officebean.xml libreoffice-5.0.5~rc2/bean/pom.officebean.xml --- libreoffice-5.0.2/bean/pom.officebean.xml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/bean/pom.officebean.xml 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,44 @@ + + 4.0.0 + org.libreoffice + officebean + @version@ + jar + LibreOffice - LOKit4Java + LOKit4Java + https://www.libreoffice.org + + + + Mozilla Public License, Version 2.0 + https://www.mozilla.org/en-US/MPL/2.0 + repo + + + + + http://cgit.freedesktop.org/libreoffice/core + https://gerrit.libreoffice.org/#/admin/projects/core + + + + + The Document Foundation + + + + + + LibreOffice Development Mailing List + libreoffice@lists.freedesktop.org + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/archives/libreoffice + + + + + https://bugs.documentfoundation.org + LibreOffice Issue Tracker + + diff -Nru libreoffice-5.0.2/bin/mvn.py libreoffice-5.0.5~rc2/bin/mvn.py --- libreoffice-5.0.2/bin/mvn.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/bin/mvn.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -#!/usr/bin/python -# 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/. - -from __future__ import print_function -from optparse import OptionParser -from os import path -from sys import stderr -try: - from subprocess import check_output -except ImportError: - from subprocess import Popen, PIPE - def check_output(*cmd): - return Popen(*cmd, stdout=PIPE).communicate()[0] -opts = OptionParser() -opts.add_option('--repository', help='maven repository id') -opts.add_option('--url', help='maven repository url') -opts.add_option('-a', help='action (valid actions are: install,deploy)') -opts.add_option('-v', help='libreoffice version') -opts.add_option('-s', action='append', help='triplet of artifactId:type:path') - -args, ctx = opts.parse_args() -if not args.v: - print('version is empty', file=stderr) - exit(1) - -common = [ - '-DgroupId=org.libreoffice', - '-Dversion=%s' % args.v, -] - -self = path.dirname(path.abspath(__file__)) -mvn = ['mvn', '--file', path.join(self, 'fake_pom.xml')] - -if 'install' == args.a: - cmd = mvn + ['install:install-file'] + common -elif 'deploy' == args.a: - cmd = mvn + [ - 'deploy:deploy-file', - '-DrepositoryId=%s' % args.repository, - '-Durl=%s' % args.url, - ] + common -else: - print("unknown action -a %s" % args.a, file=stderr) - exit(1) - -for spec in args.s: - artifact, packaging_type, src = spec.split(':') - try: - check_output(cmd + [ - '-DartifactId=%s' % artifact, - '-Dpackaging=%s' % packaging_type, - '-Dfile=%s' % src, - ]) - except Exception as e: - print('%s command failed: %s' % (args.a, e), file=stderr) - exit(1) diff -Nru libreoffice-5.0.2/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx libreoffice-5.0.5~rc2/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx --- libreoffice-5.0.2/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -609,8 +609,8 @@ // 2.Pass: Get the total needed memory for class ExceptionType // (with embedded type_info) and keep the sizes for each instance - // is stored in alloced int array - int *excecptionTypeSizeArray = new int[nLen]; + // is stored in allocated int array + int *exceptionTypeSizeArray = new int[nLen]; nLen = 0; for (pCompTD = (typelib_CompoundTypeDescription*)pTD; @@ -625,14 +625,14 @@ n++; typeInfoLen = n*4; } - excecptionTypeSizeArray[nLen++] = typeInfoLen + sizeof(ExceptionType); + exceptionTypeSizeArray[nLen++] = typeInfoLen + sizeof(ExceptionType); } // Total ExceptionType related mem int excTypeAddLen = 0; for (int i = 0; i < nLen; i++) { - excTypeAddLen += excecptionTypeSizeArray[i]; + excTypeAddLen += exceptionTypeSizeArray[i]; } // Allocate mem for code and all dynamic data in one chunk to guarantee @@ -684,7 +684,7 @@ // Next trampoline entry offset pCodeOffset += codeSnippetSize; // Next ExceptionType placement offset - etMemOffset += excecptionTypeSizeArray[nPos - 1]; + etMemOffset += exceptionTypeSizeArray[nPos - 1]; // Keep offset of addresses of ET for D-Tor call in ~RaiseInfo types[nPos++] @@ -694,7 +694,7 @@ assert(etMem + etMemOffset == pCode + totalSize); // remove array - delete excecptionTypeSizeArray; + delete[] exceptionTypeSizeArray; } RaiseInfo::~RaiseInfo() throw () diff -Nru libreoffice-5.0.2/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx libreoffice-5.0.5~rc2/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx --- libreoffice-5.0.2/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/bridges/source/cpp_uno/msvc_win32_x86-64/uno2cpp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include #include @@ -77,16 +80,21 @@ void * pAdjustedThisPtr = (void **)( pThis->getCppI() ) + aVtableSlot.offset; aCppParams[nCppParamIndex++].p = pAdjustedThisPtr; - bool bSimpleReturn = true; - if ( pReturnTD ) - { - if ( !bridges::cpp_uno::shared::isSimpleType( pReturnTD ) ) + enum class ReturnKind { Void, Simple, Complex, ComplexConvert }; + ReturnKind retKind; + if (pUnoReturn == nullptr) { + retKind = ReturnKind::Void; + } else { + assert(pReturnTD != nullptr); + if (bridges::cpp_uno::shared::isSimpleType(pReturnTD)) { + retKind = ReturnKind::Simple; + } else if (bridges::cpp_uno::shared::relatesToInterfaceType(pReturnTD)) { - // Complex return via ptr - bSimpleReturn = false; - aCppParams[nCppParamIndex++].p = - bridges::cpp_uno::shared::relatesToInterfaceType( pReturnTD )? - alloca( pReturnTD->nSize ) : pUnoReturn; + retKind = ReturnKind::ComplexConvert; + aCppParams[nCppParamIndex++].p = alloca(pReturnTD->nSize); + } else { + retKind = ReturnKind::Complex; + aCppParams[nCppParamIndex++].p = pUnoReturn; } } @@ -267,16 +275,24 @@ } // Return value - if ( !bSimpleReturn ) - { + switch (retKind) { + case ReturnKind::Void: + break; + case ReturnKind::Simple: + *(sal_Int64*)pUnoReturn = uRetVal.i; + break; + case ReturnKind::Complex: + assert(uRetVal.p == pUnoReturn); + break; + case ReturnKind::ComplexConvert: + assert(uRetVal.p == aCppParams[1].p); ::uno_copyAndConvertData( pUnoReturn, uRetVal.p, pReturnTD, pThis->getBridge()->getCpp2Uno() ); ::uno_destructData( - aCppParams[1].p, pReturnTD, cpp_release ); + uRetVal.p, pReturnTD, cpp_release ); + break; } - else if ( pUnoReturn ) - *(sal_Int64*)pUnoReturn = uRetVal.i; if ( pReturnTD ) TYPELIB_DANGER_RELEASE( pReturnTD ); diff -Nru libreoffice-5.0.2/BUCK libreoffice-5.0.5~rc2/BUCK --- libreoffice-5.0.2/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,59 @@ +prebuilt_jar( + name = 'juh', + binary_jar = 'instdir/program/classes/juh.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'jurt', + binary_jar = 'instdir/program/classes/jurt.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'officebean', + binary_jar = 'instdir/program/classes/officebean.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'ridl', + binary_jar = 'instdir/program/classes/ridl.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'unoil', + binary_jar = 'instdir/program/classes/unoil.jar', + visibility = ['PUBLIC'], +) + +prebuilt_jar( + name = 'unoloader', + binary_jar = 'instdir/program/classes/unoloader.jar', + visibility = ['PUBLIC'], +) + +zip_file( + name = 'api', + srcs = [ + ':juh', + '//javaunohelper:juh-src', + '//javaunohelper:juh-javadoc', + ':jurt', + '//jurt:jurt-src', + '//jurt:jurt-javadoc', + ':officebean', + '//bean:officebean-src', + '//bean:officebean-javadoc', + ':ridl', + '//ridljar:ridl-src', + '//ridljar:ridl-javadoc', + ':unoil', + '//unoil:unoil-src', + '//unoil:unoil-javadoc', + ':unoloader', + '//ridljar/source/unoloader:unoloader-src', + '//ridljar/source/unoloader:unoloader-javadoc', + ] +) diff -Nru libreoffice-5.0.2/.buckconfig libreoffice-5.0.5~rc2/.buckconfig --- libreoffice-5.0.2/.buckconfig 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/.buckconfig 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,13 @@ +[alias] + api = //:api + api_install = //solenv/maven:api_install + api_deploy = //solenv/maven:api_deploy + +[buildfile] + includes = //solenv/buck/build.defs + +[project] + ignore = .git,workdir,instdir + +[cache] + mode = dir diff -Nru libreoffice-5.0.2/.buckversion libreoffice-5.0.5~rc2/.buckversion --- libreoffice-5.0.2/.buckversion 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/.buckversion 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1 @@ +6659a474fb2ba6e921bb38c1b55d4c9ba6073cfa diff -Nru libreoffice-5.0.2/canvas/source/cairo/cairo_textlayout.cxx libreoffice-5.0.5~rc2/canvas/source/cairo/cairo_textlayout.cxx --- libreoffice-5.0.2/canvas/source/cairo/cairo_textlayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/canvas/source/cairo/cairo_textlayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -497,6 +497,14 @@ if (cairo_glyphs.empty()) continue; + vcl::Font aFont = rOutDev.GetFont(); + long nWidth = aFont.GetWidth(); + long nHeight = aFont.GetHeight(); + if (nWidth == 0) + nWidth = nHeight; + if (nWidth == 0 || nHeight == 0) + continue; + /** * Setup font **/ @@ -548,17 +556,12 @@ // Font rotation and scaling cairo_matrix_t m; - vcl::Font aFont = rOutDev.GetFont(); cairo_matrix_init_identity(&m); if (aSysLayoutData.orientation) cairo_matrix_rotate(&m, (3600 - aSysLayoutData.orientation) * M_PI / 1800.0); - long nWidth = aFont.GetWidth(); - long nHeight = aFont.GetHeight(); - if (nWidth == 0) - nWidth = nHeight; cairo_matrix_scale(&m, nWidth, nHeight); //faux italics diff -Nru libreoffice-5.0.2/canvas/source/directx/dx_surfacebitmap.cxx libreoffice-5.0.5~rc2/canvas/source/directx/dx_surfacebitmap.cxx --- libreoffice-5.0.2/canvas/source/directx/dx_surfacebitmap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/canvas/source/directx/dx_surfacebitmap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -19,6 +19,8 @@ #include +#include + #include "dx_surfacebitmap.hxx" #include "dx_impltools.hxx" #include "dx_surfacegraphics.hxx" @@ -438,7 +440,7 @@ // DXSurfaceBitmap::getData - uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( rendering::IntegerBitmapLayout& /*bitmapLayout*/, + uno::Sequence< sal_Int8 > DXSurfaceBitmap::getData( rendering::IntegerBitmapLayout& rBitmapLayout, const geometry::IntegerRectangle2D& rect ) { if(hasAlpha()) @@ -483,6 +485,11 @@ D3DLOCKED_RECT aLockedRect; if(FAILED(mpSurface->LockRect(&aLockedRect,NULL,D3DLOCK_NOSYSLOCK|D3DLOCK_READONLY))) return uno::Sequence< sal_Int8 >(); + D3DSURFACE_DESC aDesc; + if(FAILED(mpSurface->GetDesc(&aDesc))) + return uno::Sequence< sal_Int8 >(); + + assert(aDesc.Format == D3DFMT_A8R8G8B8 || aDesc.Format == D3DFMT_X8R8G8B8); sal_uInt8 *pSrc = (sal_uInt8 *)((((BYTE *)aLockedRect.pBits)+(rect.Y1*aLockedRect.Pitch))+rect.X1); sal_uInt8 *pDst = (sal_uInt8 *)aRes.getArray(); @@ -494,6 +501,24 @@ pSrc += aLockedRect.Pitch; } + if(rBitmapLayout.ColorSpace->getComponentTags().getArray()[0] == rendering::ColorComponentTag::RGB_RED && + rBitmapLayout.ColorSpace->getComponentTags().getArray()[2] == rendering::ColorComponentTag::RGB_BLUE) + { + pDst = (sal_uInt8 *)aRes.getArray(); + for(sal_uInt32 y=0; yUnlockRect(); return aRes; } diff -Nru libreoffice-5.0.2/chart2/qa/extras/chart2export.cxx libreoffice-5.0.5~rc2/chart2/qa/extras/chart2export.cxx --- libreoffice-5.0.2/chart2/qa/extras/chart2export.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/chart2/qa/extras/chart2export.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1277,7 +1277,7 @@ assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "formatCode", "0.00E+000"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[1]/c:numFmt", "sourceLinked", "0"); - assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", "[$$-409]#,##0;-[$$-409]#,##0"); + assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "formatCode", "[$$-409]#,##0;\\-[$$-409]#,##0"); assertXPath(pXmlDoc, "/c:chartSpace/c:chart/c:plotArea/c:valAx[2]/c:numFmt", "sourceLinked", "1"); } diff -Nru libreoffice-5.0.2/cli_ure/source/climaker/climaker_app.cxx libreoffice-5.0.5~rc2/cli_ure/source/climaker/climaker_app.cxx --- libreoffice-5.0.2/cli_ure/source/climaker/climaker_app.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cli_ure/source/climaker/climaker_app.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -462,7 +462,8 @@ ::System::String ^ sKeyFile = ustring_to_String(keyfile); try { System::IO::FileStream^ fs = gcnew System::IO::FileStream( - sKeyFile, System::IO::FileMode::Open); + sKeyFile, System::IO::FileMode::Open, + System::IO::FileAccess::Read, System::IO::FileShare::Read); kp = gcnew StrongNameKeyPair(fs); fs->Close(); } diff -Nru libreoffice-5.0.2/comphelper/source/container/embeddedobjectcontainer.cxx libreoffice-5.0.5~rc2/comphelper/source/container/embeddedobjectcontainer.cxx --- libreoffice-5.0.2/comphelper/source/container/embeddedobjectcontainer.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/comphelper/source/container/embeddedobjectcontainer.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -296,7 +296,9 @@ return OUString(); } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::GetEmbeddedObject( const OUString& rName ) +uno::Reference< embed::XEmbeddedObject> +EmbeddedObjectContainer::GetEmbeddedObject( + const OUString& rName, OUString const*const pBaseURL) { SAL_WARN_IF( rName.isEmpty(), "comphelper.container", "Empty object name!"); @@ -319,12 +321,15 @@ if ( aIt != pImpl->maObjectContainer.end() ) xObj = (*aIt).second; else - xObj = Get_Impl( rName, uno::Reference < embed::XEmbeddedObject >() ); + xObj = Get_Impl(rName, uno::Reference(), pBaseURL); return xObj; } -uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::Get_Impl( const OUString& rName, const uno::Reference < embed::XEmbeddedObject >& xCopy ) +uno::Reference EmbeddedObjectContainer::Get_Impl( + const OUString& rName, + const uno::Reference& xCopy, + rtl::OUString const*const pBaseURL) { uno::Reference < embed::XEmbeddedObject > xObj; try @@ -344,13 +349,20 @@ // object was not added until now - should happen only by calling this method from "inside" //TODO/LATER: it would be good to detect an error when an object should be created already, but isn't (not an "inside" call) uno::Reference < embed::XEmbeddedObjectCreator > xFactory = embed::EmbeddedObjectCreator::create( ::comphelper::getProcessComponentContext() ); - uno::Sequence< beans::PropertyValue > aObjDescr( xCopy.is() ? 2 : 1 ); + uno::Sequence< beans::PropertyValue > aObjDescr(1 + (xCopy.is() ? 1 : 0) + (pBaseURL ? 1 : 0)); aObjDescr[0].Name = "Parent"; aObjDescr[0].Value <<= pImpl->m_xModel.get(); + sal_Int32 i = 1; + if (pBaseURL) + { + aObjDescr[i].Name = "DefaultParentBaseURL"; + aObjDescr[i].Value <<= *pBaseURL; + ++i; + } if ( xCopy.is() ) { - aObjDescr[1].Name = "CloneFrom"; - aObjDescr[1].Value <<= xCopy; + aObjDescr[i].Name = "CloneFrom"; + aObjDescr[i].Value <<= xCopy; } uno::Sequence< beans::PropertyValue > aMediaDescr( 1 ); diff -Nru libreoffice-5.0.2/configure.ac libreoffice-5.0.5~rc2/configure.ac --- libreoffice-5.0.2/configure.ac 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/configure.ac 2016-02-04 16:41:28.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],[5.0.2.2],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[5.0.5.2],[],[],[http://documentfoundation.org/]) AC_PREREQ([2.59]) @@ -11318,6 +11318,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define SAL_OVERRIDE +#include #include "tst_exclude_socket_notifiers.moc" int main(int argc, char *argv[]) @@ -11351,6 +11352,7 @@ AC_RUN_IFELSE([AC_LANG_SOURCE([[ #define SAL_OVERRIDE +#include #include "tst_exclude_posted_events.moc" int main(int argc, char *argv[]) diff -Nru libreoffice-5.0.2/connectivity/source/commontools/FValue.cxx libreoffice-5.0.5~rc2/connectivity/source/commontools/FValue.cxx --- libreoffice-5.0.2/connectivity/source/commontools/FValue.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/commontools/FValue.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -103,6 +103,74 @@ } return bIsCompatible; } + + static bool isStorageComparable(sal_Int32 _eType1, sal_Int32 _eType2) + { + bool bIsComparable = true; + + if (_eType1 != _eType2) + { + SAL_INFO( "connectivity.commontools", "ORowSetValue::isStorageCompatible _eType1 != _eType2" ); + switch (_eType1) + { + case DataType::CHAR: + case DataType::VARCHAR: + case DataType::LONGVARCHAR: + bIsComparable = (DataType::CHAR == _eType2) + || (DataType::VARCHAR == _eType2) + || (DataType::LONGVARCHAR == _eType2); + break; + + case DataType::DECIMAL: + case DataType::NUMERIC: + bIsComparable = (DataType::DECIMAL == _eType2) + || (DataType::NUMERIC == _eType2); + break; + + case DataType::DOUBLE: + case DataType::REAL: + bIsComparable = (DataType::DOUBLE == _eType2) + || (DataType::REAL == _eType2); + break; + + case DataType::BINARY: + case DataType::VARBINARY: + case DataType::LONGVARBINARY: + bIsComparable = (DataType::BINARY == _eType2) + || (DataType::VARBINARY == _eType2) + || (DataType::LONGVARBINARY == _eType2); + break; + + case DataType::INTEGER: + bIsComparable = (DataType::SMALLINT == _eType2) + || (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); + break; + case DataType::SMALLINT: + bIsComparable = (DataType::TINYINT == _eType2) + || (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); + break; + case DataType::TINYINT: + bIsComparable = (DataType::BIT == _eType2) + || (DataType::BOOLEAN == _eType2); + break; + + case DataType::BLOB: + case DataType::CLOB: + case DataType::OBJECT: + bIsComparable = (DataType::BLOB == _eType2) + || (DataType::CLOB == _eType2) + || (DataType::OBJECT == _eType2); + break; + + default: + bIsComparable = false; + } + } + return bIsComparable; + } } @@ -775,7 +843,7 @@ if(m_bNull && _rRH.isNull()) return true; - if ( m_eTypeKind != _rRH.m_eTypeKind ) + if ( !isStorageComparable(m_eTypeKind, _rRH.m_eTypeKind )) { switch(m_eTypeKind) { diff -Nru libreoffice-5.0.2/connectivity/source/drivers/firebird/PreparedStatement.cxx libreoffice-5.0.5~rc2/connectivity/source/drivers/firebird/PreparedStatement.cxx --- libreoffice-5.0.2/connectivity/source/drivers/firebird/PreparedStatement.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/drivers/firebird/PreparedStatement.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -706,13 +706,13 @@ bool bSetNull) { XSQLVAR* pVar = m_pInSqlda->sqlvar + (nParameterIndex - 1); - if (pVar->sqltype & 1) + if (bSetNull) { - if (bSetNull) - *pVar->sqlind = -1; - else - *pVar->sqlind = 0; + pVar->sqltype |= 1; + *pVar->sqlind = -1; } + else + *pVar->sqlind = 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/connectivity/source/drivers/firebird/Util.cxx libreoffice-5.0.5~rc2/connectivity/source/drivers/firebird/Util.cxx --- libreoffice-5.0.2/connectivity/source/drivers/firebird/Util.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/drivers/firebird/Util.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -254,11 +254,8 @@ assert(false); break; } - if (pVar->sqltype & 1) - { - /* allocate variable to hold NULL status */ - pVar->sqlind = static_cast(malloc(sizeof(short))); - } + /* allocate variable to hold NULL status */ + pVar->sqlind = static_cast(malloc(sizeof(short))); } } @@ -302,13 +299,10 @@ break; } - if (pVar->sqltype & 1) + if(pVar->sqlind) { - if(pVar->sqlind) - { - free(pVar->sqlind); - pVar->sqlind = NULL; - } + free(pVar->sqlind); + pVar->sqlind = NULL; } } } diff -Nru libreoffice-5.0.2/connectivity/source/drivers/mork/MConnection.cxx libreoffice-5.0.5~rc2/connectivity/source/drivers/mork/MConnection.cxx --- libreoffice-5.0.2/connectivity/source/drivers/mork/MConnection.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/drivers/mork/MConnection.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -143,7 +143,9 @@ if (!m_pBook->open(strPath.getStr())) { SAL_WARN("connectivity.mork", "Can not parse abook mork file: " << strPath); - throwGenericSQLException( STR_COULD_NOT_LOAD_FILE, *this ); + const OUString sError( getResources().getResourceStringWithSubstitution( + STR_COULD_NOT_LOAD_FILE, "$filename$", abook)); + ::dbtools::throwGenericSQLException( sError, *this ); } // read history only in production @@ -153,7 +155,9 @@ if (!m_pHistory->open(strPath.getStr())) { SAL_WARN("connectivity.mork", "Can not parse history mork file: " << strPath); - throwGenericSQLException( STR_COULD_NOT_LOAD_FILE, *this ); + const OUString sError( getResources().getResourceStringWithSubstitution( + STR_COULD_NOT_LOAD_FILE, "$filename$", history)); + ::dbtools::throwGenericSQLException( sError, *this ); } } diff -Nru libreoffice-5.0.2/connectivity/source/drivers/odbc/OPreparedStatement.cxx libreoffice-5.0.5~rc2/connectivity/source/drivers/odbc/OPreparedStatement.cxx --- libreoffice-5.0.2/connectivity/source/drivers/odbc/OPreparedStatement.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/drivers/odbc/OPreparedStatement.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -291,6 +291,12 @@ template void OPreparedStatement::setScalarParameter(const sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, const T i_Value) { + setScalarParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, i_Value); +} + + +template void OPreparedStatement::setScalarParameter(const sal_Int32 parameterIndex, const sal_Int32 i_nType, const SQLULEN i_nColSize, sal_Int32 i_nScale, const T i_Value) +{ ::osl::MutexGuard aGuard( m_aMutex ); setParameterPre(parameterIndex); @@ -299,7 +305,7 @@ TnoRef *bindBuf = static_cast< TnoRef* >( allocBindBuf(parameterIndex, sizeof(i_Value)) ); *bindBuf = i_Value; - setParameter(parameterIndex, i_nType, i_nColSize, invalid_scale, bindBuf, sizeof(i_Value), sizeof(i_Value)); + setParameter(parameterIndex, i_nType, i_nColSize, i_nScale, bindBuf, sizeof(i_Value), sizeof(i_Value)); } @@ -443,7 +449,7 @@ else nColSize = 18; TIME_STRUCT x(OTools::TimeToOdbcTime(aVal)); - setScalarParameter(parameterIndex, DataType::TIME, nColSize, x); + setScalarParameter(parameterIndex, DataType::TIME, nColSize, (nColSize == 8)? 0 : nColSize-9, x); } @@ -477,7 +483,7 @@ nColSize = 29; TIMESTAMP_STRUCT x(OTools::DateTimeToTimestamp(aVal)); - setScalarParameter(parameterIndex, DataType::TIMESTAMP, nColSize, x); + setScalarParameter(parameterIndex, DataType::TIMESTAMP, nColSize, (nColSize <= 19)? 0 : nColSize-20, x); } diff -Nru libreoffice-5.0.2/connectivity/source/inc/odbc/OPreparedStatement.hxx libreoffice-5.0.5~rc2/connectivity/source/inc/odbc/OPreparedStatement.hxx --- libreoffice-5.0.2/connectivity/source/inc/odbc/OPreparedStatement.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/connectivity/source/inc/odbc/OPreparedStatement.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -81,6 +81,7 @@ void initBoundParam () throw(::com::sun::star::sdbc::SQLException); void setParameterPre(sal_Int32 parameterIndex); template void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, const T i_Value); + template void setScalarParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const T i_Value); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, SQLULEN _nColumnSize, sal_Int32 _nScale, const void* _pData, SQLULEN _nDataLen, SQLLEN _nDataAllocLen); void setParameter(sal_Int32 parameterIndex, sal_Int32 _nType, sal_Int32 _nColumnSize, sal_Int32 _nByteSize, void* _pData); // Wrappers for special cases diff -Nru libreoffice-5.0.2/cppuhelper/source/shlib.cxx libreoffice-5.0.5~rc2/cppuhelper/source/shlib.cxx --- libreoffice-5.0.2/cppuhelper/source/shlib.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cppuhelper/source/shlib.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -40,17 +40,19 @@ css::uno::Environment cppuhelper::detail::getEnvironment( rtl::OUString const & name, rtl::OUString const & implementation) { - assert(!implementation.isEmpty()); rtl::OUString n(name); - static char const * log = std::getenv("UNO_ENV_LOG"); - if (log != 0 && *log != 0) { - rtl::OString imps(log); - for (sal_Int32 i = 0; i != -1;) { - rtl::OString imp(imps.getToken(0, ';', i)); - //TODO: this assumes UNO_ENV_LOG only contains ASCII characters: - if (implementation.equalsAsciiL(imp.getStr(), imp.getLength())) { - n += ":log"; - break; + if (!implementation.isEmpty()) { + static char const * log = std::getenv("UNO_ENV_LOG"); + if (log != 0 && *log != 0) { + rtl::OString imps(log); + for (sal_Int32 i = 0; i != -1;) { + rtl::OString imp(imps.getToken(0, ';', i)); + //TODO: this assumes UNO_ENV_LOG only contains ASCII characters: + if (implementation.equalsAsciiL(imp.getStr(), imp.getLength())) + { + n += ":log"; + break; + } } } } diff -Nru libreoffice-5.0.2/cui/source/customize/cfg.cxx libreoffice-5.0.5~rc2/cui/source/customize/cfg.cxx --- libreoffice-5.0.2/cui/source/customize/cfg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/source/customize/cfg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2298,9 +2298,9 @@ m_pMoveUpButton->Enable( false ); m_pMoveDownButton->Enable( false ); - pPopup->EnableItem( ID_BEGIN_GROUP, true ); - pPopup->EnableItem( ID_RENAME, false ); - pPopup->EnableItem( ID_DELETE, false ); + pPopup->EnableItem( "addseparator", true ); + pPopup->EnableItem( "modrename", false ); + pPopup->EnableItem( "moddelete", false ); m_pDescriptionField->SetText(""); @@ -2318,17 +2318,17 @@ if ( pEntryData->IsSeparator() ) { - pPopup->EnableItem( ID_DELETE, true ); - pPopup->EnableItem( ID_BEGIN_GROUP, false ); - pPopup->EnableItem( ID_RENAME, false ); + pPopup->EnableItem( "moddelete", true ); + pPopup->EnableItem( "addseparator", false ); + pPopup->EnableItem( "modrename", false ); m_pDescriptionField->SetText(""); } else { - pPopup->EnableItem( ID_BEGIN_GROUP, true ); - pPopup->EnableItem( ID_DELETE, true ); - pPopup->EnableItem( ID_RENAME, true ); + pPopup->EnableItem( "addseparator", true ); + pPopup->EnableItem( "moddelete", true ); + pPopup->EnableItem( "modrename", true ); m_pDescriptionField->SetText(pEntryData->GetHelpText()); } @@ -2409,9 +2409,9 @@ PopupMenu* pPopup = m_pModifyTopLevelButton->GetPopupMenu(); if ( pMenuData ) { - pPopup->EnableItem( ID_DELETE, pMenuData->IsDeletable() ); - pPopup->EnableItem( ID_RENAME, pMenuData->IsRenamable() ); - pPopup->EnableItem( ID_MOVE, pMenuData->IsMovable() ); + pPopup->EnableItem( "delete", pMenuData->IsDeletable() ); + pPopup->EnableItem( "rename", pMenuData->IsRenamable() ); + pPopup->EnableItem( "move", pMenuData->IsMovable() ); SvxEntries* pEntries = pMenuData->GetEntries(); SvxEntries::const_iterator iter = pEntries->begin(); diff -Nru libreoffice-5.0.2/cui/source/customize/macropg.cxx libreoffice-5.0.5~rc2/cui/source/customize/macropg.cxx --- libreoffice-5.0.2/cui/source/customize/macropg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/source/customize/macropg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -327,7 +327,7 @@ aDisplayNames.push_back( EventDisplayName( "approveCursorMove", RID_SVXSTR_EVENT_POSITIONING ) ); aDisplayNames.push_back( EventDisplayName( "cursorMoved", RID_SVXSTR_EVENT_POSITIONED ) ); aDisplayNames.push_back( EventDisplayName( "approveParameter", RID_SVXSTR_EVENT_APPROVEPARAMETER ) ); - aDisplayNames.push_back( EventDisplayName( "errorOccurred", RID_SVXSTR_EVENT_ERROROCCURRED ) ); + aDisplayNames.push_back( EventDisplayName( "errorOccured", RID_SVXSTR_EVENT_ERROROCCURRED ) ); aDisplayNames.push_back( EventDisplayName( "adjustmentValueChanged", RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED ) ); } diff -Nru libreoffice-5.0.2/cui/source/dialogs/iconcdlg.cxx libreoffice-5.0.5~rc2/cui/source/dialogs/iconcdlg.cxx --- libreoffice-5.0.2/cui/source/dialogs/iconcdlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/source/dialogs/iconcdlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -333,8 +333,6 @@ { sal_uInt16 nOldPageId = GetCurPageId(); bool bInvalidate = nOldPageId != nId; - SetCurPageId(nId); - ActivatePageImpl(); if (bInvalidate) { IconChoicePageData* pOldData = GetPageData(nOldPageId); @@ -346,6 +344,8 @@ Invalidate(); } + SetCurPageId(nId); + ActivatePageImpl(); IconChoicePageData* pNewData = GetPageData(nId); if (pNewData && pNewData->pPage) ShowPageImpl(pNewData); diff -Nru libreoffice-5.0.2/cui/source/inc/autocdlg.hxx libreoffice-5.0.5~rc2/cui/source/inc/autocdlg.hxx --- libreoffice-5.0.2/cui/source/inc/autocdlg.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/source/inc/autocdlg.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -183,21 +183,39 @@ class AutoCorrEdit : public Edit { Link<> aActionLink; - bool bSpaces; + VclPtr m_xReplaceTLB; + sal_Int32 m_nCol; + bool bSpaces; - public: - AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) : - Edit(pParent, rResId), bSpaces(false){} - AutoCorrEdit(vcl::Window* pParent) : - Edit(pParent), bSpaces(false){} + void dispose() SAL_OVERRIDE; + +public: + AutoCorrEdit(vcl::Window* pParent, const ResId& rResId) + : Edit(pParent, rResId) + , m_nCol(0) + , bSpaces(false) + { + } + + AutoCorrEdit(vcl::Window* pParent) + : Edit(pParent) + , m_nCol(0) + , bSpaces(false) + { + } + + virtual ~AutoCorrEdit(); void SetActionHdl( const Link<>& rLink ) { aActionLink = rLink;} + void ConnectColumn(const VclPtr& rTable, sal_Int32 nCol); + void SetSpaces(bool bSet) {bSpaces = bSet;} virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE; + virtual void Resize() SAL_OVERRIDE; }; // class OfaAutocorrReplacePage ------------------------------------------ @@ -259,7 +277,6 @@ LanguageType eOldLanguage, LanguageType eNewLanguage); - void setTabs(); public: OfaAutocorrReplacePage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~OfaAutocorrReplacePage(); @@ -271,8 +288,6 @@ virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE; virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - virtual void Resize() SAL_OVERRIDE; - virtual void StateChanged(StateChangedType nStateChange) SAL_OVERRIDE; void SetLanguage(LanguageType eSet); void DeleteEntry(const OUString& sShort, const OUString& sLong); diff -Nru libreoffice-5.0.2/cui/source/tabpages/autocdlg.cxx libreoffice-5.0.5~rc2/cui/source/tabpages/autocdlg.cxx --- libreoffice-5.0.2/cui/source/tabpages/autocdlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/source/tabpages/autocdlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -906,28 +906,9 @@ m_pReplaceED->SetSpaces(true); m_pShortED->SetSpaces(true); -} - -void OfaAutocorrReplacePage::setTabs() -{ - m_pReplaceTLB->SetTab(0, m_pShortED->GetPosPixel().X(), MAP_PIXEL); - m_pReplaceTLB->SetTab(1, m_pReplaceED->GetPosPixel().X(), MAP_PIXEL); -} - -void OfaAutocorrReplacePage::StateChanged(StateChangedType nStateChange) -{ - SfxTabPage::StateChanged(nStateChange); - if (nStateChange == StateChangedType::InitShow) - { - setTabs(); - } -} - -void OfaAutocorrReplacePage::Resize() -{ - SfxTabPage::Resize(); - setTabs(); + m_pShortED->ConnectColumn(m_pReplaceTLB, 0); + m_pReplaceED->ConnectColumn(m_pReplaceTLB, 1); } OfaAutocorrReplacePage::~OfaAutocorrReplacePage() @@ -1752,6 +1733,22 @@ VCL_BUILDER_FACTORY(AutoCorrEdit) +void AutoCorrEdit::dispose() +{ + m_xReplaceTLB.disposeAndClear(); + Edit::dispose(); +} + +AutoCorrEdit::~AutoCorrEdit() { + disposeOnce(); +} + +void AutoCorrEdit::ConnectColumn(const VclPtr& rTable, sal_Int32 nCol) +{ + m_xReplaceTLB = rTable; + m_nCol = nCol; +} + void AutoCorrEdit::KeyInput( const KeyEvent& rKEvt ) { const vcl::KeyCode aKeyCode = rKEvt.GetKeyCode(); @@ -1767,6 +1764,14 @@ Edit::KeyInput(rKEvt); } +void AutoCorrEdit::Resize() +{ + Edit::Resize(); + if (!m_xReplaceTLB) + return; + m_xReplaceTLB->SetTab(m_nCol, GetPosPixel().X(), MAP_PIXEL); +} + enum OfaQuoteOptions { ADD_NONBRK_SPACE, diff -Nru libreoffice-5.0.2/cui/uiconfig/ui/aboutdialog.ui libreoffice-5.0.5~rc2/cui/uiconfig/ui/aboutdialog.ui --- libreoffice-5.0.2/cui/uiconfig/ui/aboutdialog.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/uiconfig/ui/aboutdialog.ui 2016-02-04 16:41:28.000000000 +0000 @@ -197,7 +197,7 @@ 12 12 True - Copyright © 2000 - 2015 LibreOffice contributors. + Copyright © 2000–2016 LibreOffice contributors. center True diff -Nru libreoffice-5.0.2/cui/uiconfig/ui/pageformatpage.ui libreoffice-5.0.5~rc2/cui/uiconfig/ui/pageformatpage.ui --- libreoffice-5.0.2/cui/uiconfig/ui/pageformatpage.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/uiconfig/ui/pageformatpage.ui 2016-02-04 16:41:28.000000000 +0000 @@ -434,6 +434,7 @@ True False vertical + center False @@ -475,6 +476,7 @@ True False vertical + center False diff -Nru libreoffice-5.0.2/cui/uiconfig/ui/spelloptionsdialog.ui libreoffice-5.0.5~rc2/cui/uiconfig/ui/spelloptionsdialog.ui --- libreoffice-5.0.2/cui/uiconfig/ui/spelloptionsdialog.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/cui/uiconfig/ui/spelloptionsdialog.ui 2016-02-04 16:41:28.000000000 +0000 @@ -6,7 +6,6 @@ False 6 Options - False dialog diff -Nru libreoffice-5.0.2/dbaccess/source/core/api/KeySet.cxx libreoffice-5.0.5~rc2/dbaccess/source/core/api/KeySet.cxx --- libreoffice-5.0.2/dbaccess/source/core/api/KeySet.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/core/api/KeySet.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -797,7 +797,18 @@ for(;aIter != aEnd;++aIter) { if ( !(_rInsertRow->get())[aIter->second.nPosition].isModified() ) - (_rInsertRow->get())[aIter->second.nPosition] = aIter->second.sDefaultValue; + { + if(aIter->second.bNullable && aIter->second.sDefaultValue.isEmpty()) + { + (_rInsertRow->get())[aIter->second.nPosition].setTypeKind(aIter->second.nType); + (_rInsertRow->get())[aIter->second.nPosition].setNull(); + } + else + { + (_rInsertRow->get())[aIter->second.nPosition] = aIter->second.sDefaultValue; + (_rInsertRow->get())[aIter->second.nPosition].setTypeKind(aIter->second.nType); + } + } } try { diff -Nru libreoffice-5.0.2/dbaccess/source/core/misc/dsntypes.cxx libreoffice-5.0.5~rc2/dbaccess/source/core/misc/dsntypes.cxx --- libreoffice-5.0.2/dbaccess/source/core/misc/dsntypes.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/core/misc/dsntypes.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -405,6 +405,7 @@ KnownPrefix( "sdbc:mysql:jdbc:", DST_MYSQL_JDBC, false ), KnownPrefix( "sdbc:mysql:mysqlc:", DST_MYSQL_NATIVE, false ), KnownPrefix( "sdbc:mysqlc:", DST_MYSQL_NATIVE_DIRECT,false ), + KnownPrefix( "sdbc:postgresql:", DST_POSTGRES,false ), KnownPrefix( "sdbc:address:mozilla:", DST_MOZILLA, true ), KnownPrefix( "sdbc:address:thunderbird:", DST_THUNDERBIRD, true ), diff -Nru libreoffice-5.0.2/dbaccess/source/inc/dsntypes.hxx libreoffice-5.0.5~rc2/dbaccess/source/inc/dsntypes.hxx --- libreoffice-5.0.2/dbaccess/source/inc/dsntypes.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/inc/dsntypes.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -61,6 +61,7 @@ DST_MYSQL_NATIVE_DIRECT = 25, DST_FIREBIRD = 26, DST_EMBEDDED_FIREBIRD = 27, + DST_POSTGRES = 28, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, diff -Nru libreoffice-5.0.2/dbaccess/source/ui/inc/WTypeSelect.hxx libreoffice-5.0.5~rc2/dbaccess/source/ui/inc/WTypeSelect.hxx --- libreoffice-5.0.2/dbaccess/source/ui/inc/WTypeSelect.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/ui/inc/WTypeSelect.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -72,7 +72,7 @@ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; VclPtr m_pParentTabPage; public: - OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER ) + OWizTypeSelectList( vcl::Window* pParent, WinBits nStyle = WB_BORDER | WB_SIMPLEMODE ) : MultiListBox(pParent,nStyle) , m_bPKey(false) , m_pParentTabPage(NULL) diff -Nru libreoffice-5.0.2/dbaccess/source/ui/misc/WTypeSelect.cxx libreoffice-5.0.5~rc2/dbaccess/source/ui/misc/WTypeSelect.cxx --- libreoffice-5.0.2/dbaccess/source/ui/misc/WTypeSelect.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/ui/misc/WTypeSelect.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -430,23 +430,45 @@ ptWhere = pComEvt->GetMousePosPixel(); PopupMenu aContextMenu(ModuleRes(RID_SBA_RTF_PKEYPOPUP)); + // Should primary key checkbox be checked? + const sal_Int32 nCount = GetEntryCount(); + bool bCheckOk = false; + for(sal_Int32 j = 0 ; j < nCount ; ++j) + { + OFieldDescription* pFieldDescr = static_cast(GetEntryData(j)); + // if at least one of the fields is selected but not in the primary key, + // or is in the primary key but not selected, then don't check the + // primary key checkbox. + if( pFieldDescr && pFieldDescr->IsPrimaryKey() != IsEntryPosSelected(j) ) + { + bCheckOk = false; + break; + } + if (!bCheckOk && IsEntryPosSelected(j)) + bCheckOk = true; + } + + if (bCheckOk) + aContextMenu.CheckItem( SID_TABLEDESIGN_TABED_PRIMARYKEY, true ); + switch( aContextMenu.Execute( this, ptWhere ) ) { case SID_TABLEDESIGN_TABED_PRIMARYKEY: { - sal_uInt16 nCount = GetEntryCount(); - for(sal_uInt16 j = 0 ; j < nCount ; ++j) + for(sal_Int32 j = 0 ; j < nCount ; ++j) { OFieldDescription* pFieldDescr = static_cast(GetEntryData(j)); if( pFieldDescr ) { - if(pFieldDescr->IsPrimaryKey() && !IsEntryPosSelected(j)) - setPrimaryKey(pFieldDescr,j); - else if(IsEntryPosSelected(j)) + if(!bCheckOk && IsEntryPosSelected(j)) { - setPrimaryKey(pFieldDescr,j,!pFieldDescr->IsPrimaryKey()); + setPrimaryKey(pFieldDescr,j,true); SelectEntryPos(j); } + else + { + setPrimaryKey(pFieldDescr,j); + } } } GetSelectHdl().Call(this); diff -Nru libreoffice-5.0.2/dbaccess/source/ui/querydesign/TableWindowTitle.cxx libreoffice-5.0.5~rc2/dbaccess/source/ui/querydesign/TableWindowTitle.cxx --- libreoffice-5.0.2/dbaccess/source/ui/querydesign/TableWindowTitle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/dbaccess/source/ui/querydesign/TableWindowTitle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -110,7 +110,11 @@ { GrabFocus(); if ( m_pTabWin ) - m_pTabWin->Command( rEvt ); + { + // tdf#94709 - protect shutdown code-path. + VclPtr xTabWin(m_pTabWin); + xTabWin->Command( rEvt ); + } else Control::Command(rEvt); } diff -Nru libreoffice-5.0.2/debian/changelog libreoffice-5.0.5~rc2/debian/changelog --- libreoffice-5.0.2/debian/changelog 2015-10-01 13:25:13.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/changelog 2016-02-12 23:21:03.000000000 +0000 @@ -1,3 +1,48 @@ +libreoffice (1:5.0.5~rc2-0ubuntu2) wily-security; urgency=medium + + * adjust kde integration for upstream cb37698884c6f7af97c5fa9a0404a5893aa73c9d + + -- Bjoern Michaelsen Tue, 09 Feb 2016 11:21:12 +0100 + +libreoffice (1:5.0.5~rc2-0ubuntu1) wily; urgency=medium + + * new upstream rc + + -- Bjoern Michaelsen Mon, 08 Feb 2016 18:48:55 +0100 + +libreoffice (1:5.0.4~rc2-0ubuntu1) wily; urgency=medium + + * new upstream rc + + -- Bjoern Michaelsen Tue, 15 Dec 2015 18:07:30 +0100 + +libreoffice (1:5.0.3~rc2-0ubuntu1) wily; urgency=medium + + * new upstream rc + + -- Bjoern Michaelsen Wed, 28 Oct 2015 00:39:00 +0100 + +libreoffice (1:5.0.2-0ubuntu3) wily; urgency=medium + + * fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty + * substitute xfonts-mathml with fonts-stix (lp: #1487148) + * cherry-pick from Debian: + - readd conflicts against openoffice-unbundled to libreoffice-common. + openoffice*-debian-menus contains /usr/bin/soffice + * fix gug language description (thanks Rene) + * add build version for "About LibreOffice" + * create profile defaulting to human style on unity (lp: #1508177) + * reenable Ubuntu palette + * handle integral translations + + -- Bjoern Michaelsen Fri, 23 Oct 2015 00:23:47 +0200 + +libreoffice (1:5.0.2-0ubuntu2) xenial; urgency=medium + + * No-change rebuild for python3 defaults change. + + -- Matthias Klose Fri, 23 Oct 2015 15:04:41 +0000 + libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium * new upstream release diff -Nru libreoffice-5.0.2/debian/control libreoffice-5.0.5~rc2/debian/control --- libreoffice-5.0.2/debian/control 2015-10-01 13:53:37.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/control 2016-02-12 23:42:08.000000000 +0000 @@ -22,8 +22,8 @@ flex (>= 2.3.35), fontconfig, fonts-liberation, - g++- [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], - gcc- [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], + g++-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], + gcc-5 [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], gcj-jdk [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], gcj-native-helper [hppa ia64 s390 sparc kfreebsd-amd64 kfreebsd-i386], gdb, @@ -419,11 +419,12 @@ libreoffice-style-oxygen, libreoffice-style-sifr, libreoffice-style-tango -Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends} +Recommends: fonts-stix, ${pyuno-depends}, ${textcat-data-recommends} Conflicts: broffice, libreoffice-filter-mobiledev, libreoffice-l10n-4.3, - libreoffice-l10n-4.4 + libreoffice-l10n-4.4, + openoffice-unbundled Provides: libreoffice-l10n-en-us Breaks: libreoffice-core (<< 1:${oover}~), libreoffice-core (>= 1:${next-oover}~), diff -Nru libreoffice-5.0.2/debian/control.in libreoffice-5.0.5~rc2/debian/control.in --- libreoffice-5.0.2/debian/control.in 2015-10-01 13:25:13.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/control.in 2016-02-09 10:22:05.000000000 +0000 @@ -277,8 +277,9 @@ libreoffice-style-breeze, libreoffice-style-sifr, libreoffice-style-tango -Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends} -Conflicts: broffice, +Recommends: fonts-stix, ${pyuno-depends}, ${textcat-data-recommends} +Conflicts: openoffice-unbundled, + broffice, libreoffice-filter-mobiledev, libreoffice-l10n-4.3, libreoffice-l10n-4.4 diff -Nru libreoffice-5.0.2/debian/patches/debian-hardened-buildflags-CPPFLAGS.diff libreoffice-5.0.5~rc2/debian/patches/debian-hardened-buildflags-CPPFLAGS.diff --- libreoffice-5.0.2/debian/patches/debian-hardened-buildflags-CPPFLAGS.diff 2015-10-01 13:25:13.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/patches/debian-hardened-buildflags-CPPFLAGS.diff 2016-02-09 10:22:05.000000000 +0000 @@ -1,18 +1,37 @@ From: Debian LibreOffice Maintainers Date: Sat, 9 Nov 2013 02:00:34 +0100 -Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS.diff Change-Id: I2ba4dc925a66ecca5c7cc4af87224511a3bc88d9 - --- - config_host.mk.in | 1 + - configure.ac | 5 +++++ - solenv/gbuild/gbuild.mk | 2 ++ - 3 files changed, 8 insertions(+) + config_host.mk.in | 2 +- + configure.ac | 17 ++++++----------- + solenv/gbuild/gbuild.mk | 2 ++ + solenv/gbuild/platform/com_GCC_defs.mk | 5 ----- + 4 files changed, 9 insertions(+), 17 deletions(-) ---- a/configure.ac-old 2012-03-02 21:48:47.000000000 +0000 -+++ b/configure.ac 2012-03-02 21:51:29.000000000 +0000 -@@ -5751,17 +5751,6 @@ if test "$GCC" = "yes"; then +diff --git a/config_host.mk.in b/config_host.mk.in +--- a/config_host.mk.in ++++ b/config_host.mk.in +@@ -75,6 +75,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ + export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ + export CPUNAME=@CPUNAME@ + export CDEFAULTOPT=@CDEFAULTOPT@ ++export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ + export CROSS_COMPILING=@CROSS_COMPILING@ + export CURL=@CURL@ + export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ +@@ -245,7 +246,6 @@ export GUIBASE=@GUIBASE@ + export HAMCREST_JAR=@HAMCREST_JAR@ + export HARDLINKDELIVER=@HARDLINKDELIVER@ + export HAVE_GCC_AVX=@HAVE_GCC_AVX@ +-export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ + export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ + export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ + export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@ +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -5852,17 +5852,6 @@ if test "$GCC" = "yes"; then AC_MSG_RESULT([no]) fi @@ -30,7 +49,7 @@ AC_MSG_CHECKING([whether $CC supports atomic functions]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ int v = 0; -@@ -10225,6 +10225,11 @@ else +@@ -10321,6 +10310,12 @@ else fi AC_SUBST(ENABLE_VLC) @@ -39,31 +58,14 @@ +fi +AC_SUBST(HARDEN_CPPFLAGS) + ++ # this is for opengl transitions in impress slideshow ENABLE_OPENGL= if test $_os = iOS -o $_os = Android; then ---- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200 -+++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200 -@@ -70,6 +70,7 @@ - export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ - export CPUNAME=@CPUNAME@ - export CDEFAULTOPT=@CDEFAULTOPT@ -+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ - export CROSS_COMPILING=@CROSS_COMPILING@ - export CURL=@CURL@ - export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ -@@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@ - export HAMCREST_JAR=@HAMCREST_JAR@ - export HARDLINKDELIVER=@HARDLINKDELIVER@ - export HAVE_GCC_AVX=@HAVE_GCC_AVX@ --export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@ - export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@ - export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@ - export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk -@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \ +@@ -262,6 +262,8 @@ gb_GLOBALDEFS += \ ENABLE_LTO \ ) @@ -73,10 +75,9 @@ # This is used to detect whether LibreOffice is being built (as opposed to building diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk -index 7acd068..b6d9735 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk -@@ -103,12 +103,6 @@ endif +@@ -106,11 +106,6 @@ endif endif gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX) @@ -85,7 +86,9 @@ -gb_CXXFLAGS_COMMON += -fstack-protector-strong -gb_LinkTarget_LDFLAGS += -fstack-protector-strong -endif -- - gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror) - # This is the default in non-C++11 mode + gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror -Wno-error=deprecated-declarations) + +-- +2.5.0 + diff -Nru libreoffice-5.0.2/debian/patches/integraltrans.diff libreoffice-5.0.5~rc2/debian/patches/integraltrans.diff --- libreoffice-5.0.2/debian/patches/integraltrans.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/patches/integraltrans.diff 2016-02-09 10:22:05.000000000 +0000 @@ -0,0 +1,23 @@ +From: Bjoern Michaelsen +Date: Fri, 23 Oct 2015 00:01:16 +0200 +Subject: [PATCH] use different var for inseparatable translations + +--- + sysui/CustomTarget_share.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk +--- a/sysui/CustomTarget_share.mk ++++ b/sysui/CustomTarget_share.mk +@@ -227,7 +227,7 @@ $(share_WORKDIR)/%/build.flag: $(share_SRCDIR)/share/brand.pl $(LAUNCHERS) \ + $(eval $(call gb_CustomTarget_ulfex_rule,\ + $(share_WORKDIR)/%.ulf,\ + $(share_SRCDIR)/share/%.ulf,\ +- $(foreach lang,$(gb_TRANS_LANGS),\ ++ $(foreach lang,$(gb_TRANS_LANGS_INTEGRAL),\ + $(gb_POLOCATION)/$(lang)/sysui/desktop/share.po))) + + # vim: set noet sw=4 ts=4: +-- +2.1.4 + diff -Nru libreoffice-5.0.2/debian/patches/quicklistfix.diff libreoffice-5.0.5~rc2/debian/patches/quicklistfix.diff --- libreoffice-5.0.2/debian/patches/quicklistfix.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/patches/quicklistfix.diff 2016-02-09 10:22:05.000000000 +0000 @@ -0,0 +1,89 @@ +From: Bjoern Michaelsen +Date: Fri, 23 Oct 2015 10:26:11 +0200 +Subject: [PATCH] lp#1170035: Fix l10n for quicklist + +--- + solenv/bin/desktop-translate.pl | 2 +- + sysui/desktop/menus/base.desktop | 2 +- + sysui/desktop/menus/calc.desktop | 2 +- + sysui/desktop/menus/draw.desktop | 2 +- + sysui/desktop/menus/impress.desktop | 2 +- + sysui/desktop/menus/math.desktop | 2 +- + sysui/desktop/menus/writer.desktop | 2 +- + 7 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/solenv/bin/desktop-translate.pl b/solenv/bin/desktop-translate.pl +--- a/solenv/bin/desktop-translate.pl ++++ b/solenv/bin/desktop-translate.pl +@@ -66,7 +66,7 @@ if (!defined $template_dir) { + + # hack for unity section + my $outkey = $key; +-if ( $outkey eq "UnityQuicklist" ) { ++if ( $outkey eq "UnityQuickList" ) { + $outkey = "Name"; + } + +diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop +--- a/sysui/desktop/menus/base.desktop ++++ b/sysui/desktop/menus/base.desktop +@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Database ++UnityQuickList=New Database + Exec=${UNIXBASISROOTNAME} --base +diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop +--- a/sysui/desktop/menus/calc.desktop ++++ b/sysui/desktop/menus/calc.desktop +@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Spreadsheet ++UnityQuickList=New Spreadsheet + Exec=${UNIXBASISROOTNAME} --calc +diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop +--- a/sysui/desktop/menus/draw.desktop ++++ b/sysui/desktop/menus/draw.desktop +@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Drawing ++UnityQuickList=New Drawing + Exec=${UNIXBASISROOTNAME} --draw +diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop +--- a/sysui/desktop/menus/impress.desktop ++++ b/sysui/desktop/menus/impress.desktop +@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Presentation ++UnityQuickList=New Presentation + Exec=${UNIXBASISROOTNAME} --impress +diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop +--- a/sysui/desktop/menus/math.desktop ++++ b/sysui/desktop/menus/math.desktop +@@ -36,5 +36,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Formula ++UnityQuickList=New Formula + Exec=${UNIXBASISROOTNAME} --math +diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop +--- a/sysui/desktop/menus/writer.desktop ++++ b/sysui/desktop/menus/writer.desktop +@@ -35,5 +35,5 @@ X-KDE-Protocols=file,http,ftp,webdav + + Actions=NewDocument; + [Desktop Action NewDocument] +-Name=New Document ++UnityQuickList=New Document + Exec=${UNIXBASISROOTNAME} --writer +-- +2.1.4 + diff -Nru libreoffice-5.0.2/debian/patches/series libreoffice-5.0.5~rc2/debian/patches/series --- libreoffice-5.0.2/debian/patches/series 2015-10-01 13:25:13.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/patches/series 2016-02-09 10:22:05.000000000 +0000 @@ -28,5 +28,8 @@ rsc-no-error-about-unknown-switch.diff liborcus-0.9.1.diff disable-tiledrendering-test.diff -#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff +lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff #mailmerge-base.diff +unity-default-human.diff +integraltrans.diff +quicklistfix.diff diff -Nru libreoffice-5.0.2/debian/patches/unity-default-human.diff libreoffice-5.0.5~rc2/debian/patches/unity-default-human.diff --- libreoffice-5.0.2/debian/patches/unity-default-human.diff 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/patches/unity-default-human.diff 2016-02-09 10:22:05.000000000 +0000 @@ -0,0 +1,24 @@ +From: Bjoern Michaelsen +Date: Tue, 20 Oct 2015 23:10:36 +0200 +Subject: [PATCH] on unity, default to human if possible + +--- + vcl/source/app/IconThemeSelector.cxx | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx +--- a/vcl/source/app/IconThemeSelector.cxx ++++ b/vcl/source/app/IconThemeSelector.cxx +@@ -65,6 +65,9 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi + else if ( desktopEnvironment.equalsIgnoreAsciiCase("MacOSX") ) { + r = "breeze"; + } ++ else if ( desktopEnvironment.equalsIgnoreAsciiCase("unity") ) { ++ r = "human"; ++ } + else { + r = FALLBACK_ICON_THEME_ID; + } +-- +2.1.4 + diff -Nru libreoffice-5.0.2/debian/rules libreoffice-5.0.5~rc2/debian/rules --- libreoffice-5.0.2/debian/rules 2015-10-01 13:25:13.000000000 +0000 +++ libreoffice-5.0.5~rc2/debian/rules 2016-02-09 10:22:05.000000000 +0000 @@ -71,11 +71,11 @@ 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=5.0.2.2 +lo_sources_ver=5.0.5.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-5-0-2 +GIT_BRANCH=libreoffice-5-0-5 endif ifeq "$(USE_SOURCE_TARBALLS)" "y" lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2) @@ -510,6 +510,7 @@ # Default flags to pass to configure CONFIGURE_FLAGS= \ --with-vendor='$(OOO_VENDOR)' \ + --with-build-version='$(shell dpkg-parsechangelog |grep ^Version:|cut -f2 -d\ )' \ --prefix=/usr --mandir=/usr/share/man \ --docdir=/usr/share/doc/libreoffice \ --enable-lockdown \ @@ -730,6 +731,14 @@ ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH))) ENABLE_HELP=n endif + # set SYSTEM_GCJ_VERSION to something nonempty + ifeq (,$(strip $(SYSTEM_GCJ_VERSION))) + $(warning SYSTEM_GCJ_VERSION empty, falling back to SYSTEM_GCC_VERSION) + SYSTEM_GCJ_VERSION = $(SYSTEM_GCC_VERSION) + ifeq (5.,$(shell echo "$(SYSTEM_GCJ_VERSION)"|cut -b1-2)) + SYSTEM_GCJ_VERSION = 5 + endif + endif endif CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i)) @@ -1757,10 +1766,6 @@ python debian/scripts/joinctrl.py < debian/control > debian/control.tmp mv debian/control.tmp debian/control - # no conflict with "universal Linux packages" as they have the version in their - # names thankfully now - perl -pi -e 's/libreoffice-unbundled, //' debian/control - # make -l10n-fi suggest libreoffice-spellcheck-fi to # match myspell-fi and libreoffice-soikko/-voikko perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control @@ -1827,6 +1832,7 @@ config_host.mk: rm -f config.status autogen.lastrun PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) PYTHON=/usr/bin/python3 ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG) + echo "export gb_TRANS_LANGS_INTEGRAL=$(filter-out en-US,$(BUILD_ISOS))" >> config_host.mk build: $(CURDIR)/debian/rules build-arch @@ -1851,6 +1857,7 @@ --disable-report-builder --disable-scripting-javascript \ --disable-scripting-beanshell \ --with-galleries=no + echo "export gb_TRANS_LANGS_INTEGRAL=$(filter-out en-US,$(BUILD_ISOS))" >> config_host.mk PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-non-l10n-only @@ -2057,14 +2064,6 @@ $(PKGDIR)-gnome/$(OODIR)/share/xdg endif -ifeq "$(BUILD_KDE)" "y" - mkdir -p $(PKGDIR)-kde/$(OODIR)/program - mv $(PKGDIR)-common/$(OODIR)/program/kde4-open-url \ - $(PKGDIR)-kde/$(OODIR)/program -else - rm -f $(PKGDIR)-common/$(OODIR)/kde4-open-url -endif - ifeq "$(PACKAGE_SDK)" "y" # move SDK documentation into own package rm -rf $(PKGDIR)-dev-doc @@ -3280,12 +3279,16 @@ dh_testdir rm -rf src mkdir -p src + patch -p1 conversionProperties( 0 < nFilterOptionsIndex ? 3 : 2 ); - conversionProperties[0].Name = "Overwrite"; - conversionProperties[0].Value <<= sal_True; - - conversionProperties[1].Name = "FilterName"; - if( 0 < nFilterOptionsIndex ) + if (aFilter.isEmpty()) { - conversionProperties[1].Value <<= aFilter.copy( 0, nFilterOptionsIndex ); - - conversionProperties[2].Name = "FilterOptions"; - conversionProperties[2].Value <<= aFilter.copy( nFilterOptionsIndex+1 ); + std::cerr << "Error: no export filter" << std::endl; } else { - conversionProperties[1].Value <<= aFilter; - } + sal_Int32 nFilterOptionsIndex = aFilter.indexOf(':'); + Sequence conversionProperties( 0 < nFilterOptionsIndex ? 3 : 2 ); + conversionProperties[0].Name = "Overwrite"; + conversionProperties[0].Value <<= sal_True; - OUString aTempName; - FileBase::getSystemPathFromFileURL( aName, aTempName ); - OString aSource8 = OUStringToOString ( aTempName, osl_getThreadTextEncoding() ); - FileBase::getSystemPathFromFileURL( aOutFile, aTempName ); - OString aTargetURL8 = OUStringToOString(aTempName, osl_getThreadTextEncoding() ); - if( aDispatchRequest.aRequestType != REQUEST_CAT ) - { - std::cout << "convert " << aSource8 << " -> " << aTargetURL8; - std::cout << " using filter : " << OUStringToOString( aFilter, osl_getThreadTextEncoding() ) << std::endl; - if( FStatHelper::IsDocument( aOutFile ) ) - std::cout << "Overwriting: " << OUStringToOString( aTempName, osl_getThreadTextEncoding() ) << std::endl ; - } - try - { - xStorable->storeToURL( aOutFile, conversionProperties ); - } - catch (const Exception& rException) - { - std::cerr << "Error: Please verify input parameters..."; - if (!rException.Message.isEmpty()) - std::cerr << " (" << rException.Message << ")"; - std::cerr << std::endl; - } - - if( aDispatchRequest.aRequestType == REQUEST_CAT ) - { - osl::File aFile( fileForCat ); - osl::File::RC aRC = aFile.open( osl_File_OpenFlag_Read ); - if( aRC != osl::File::E_None ) + conversionProperties[1].Name = "FilterName"; + if( 0 < nFilterOptionsIndex ) { - std::cerr << "Error: Cannot read from temp file" << std::endl; + conversionProperties[1].Value <<= aFilter.copy(0, nFilterOptionsIndex); + + conversionProperties[2].Name = "FilterOptions"; + conversionProperties[2].Value <<= aFilter.copy(nFilterOptionsIndex + 1); } else { - sal_Bool eof; - for( ;; ) + conversionProperties[1].Value <<= aFilter; + } + + OUString aTempName; + FileBase::getSystemPathFromFileURL(aName, aTempName); + OString aSource8 = OUStringToOString(aTempName, osl_getThreadTextEncoding()); + FileBase::getSystemPathFromFileURL(aOutFile, aTempName); + OString aTargetURL8 = OUStringToOString(aTempName, osl_getThreadTextEncoding()); + if (aDispatchRequest.aRequestType != REQUEST_CAT) + { + std::cout << "convert " << aSource8 << " -> " << aTargetURL8; + std::cout << " using filter : " << OUStringToOString(aFilter, osl_getThreadTextEncoding()) << std::endl; + if (FStatHelper::IsDocument(aOutFile)) + std::cout << "Overwriting: " << OUStringToOString(aTempName, osl_getThreadTextEncoding()) << std::endl ; + } + try + { + xStorable->storeToURL(aOutFile, conversionProperties); + } + catch (const Exception& rException) + { + std::cerr << "Error: Please verify input parameters..."; + if (!rException.Message.isEmpty()) + std::cerr << " (" << rException.Message << ")"; + std::cerr << std::endl; + } + + if (aDispatchRequest.aRequestType == REQUEST_CAT) + { + osl::File aFile(fileForCat); + osl::File::RC aRC = aFile.open(osl_File_OpenFlag_Read); + if (aRC != osl::File::E_None) + { + std::cerr << "Error: Cannot read from temp file" << std::endl; + } + else { - aFile.isEndOfFile( &eof ); - if( eof ) - break; - rtl::ByteSequence bseq; - aFile.readLine( bseq ); - unsigned const char * aStr = reinterpret_cast< unsigned char const * >( bseq.getConstArray() ); - for( sal_Int32 i = 0; i < bseq.getLength(); i++ ) + sal_Bool eof; + for (;;) { - std::cout << aStr[i]; + aFile.isEndOfFile( &eof ); + if (eof) + break; + rtl::ByteSequence bseq; + aFile.readLine(bseq); + unsigned const char * aStr = reinterpret_cast(bseq.getConstArray()); + for (sal_Int32 i = 0; i < bseq.getLength(); ++i) + { + std::cout << aStr[i]; + } + std::cout << std::endl; } - std::cout << std::endl; + aFile.close(); + osl::File::remove(fileForCat); } - aFile.close(); - osl::File::remove( fileForCat ); } } } diff -Nru libreoffice-5.0.2/desktop/unx/source/splashx.c libreoffice-5.0.5~rc2/desktop/unx/source/splashx.c --- libreoffice-5.0.2/desktop/unx/source/splashx.c 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/desktop/unx/source/splashx.c 2016-02-04 16:41:28.000000000 +0000 @@ -481,6 +481,10 @@ splash->gc = XCreateGC( splash->display, splash->win, value_mask, &values ); size_hints.flags = PPosition | PSize | PMinSize | PMaxSize; + size_hints.x = display_x_pos; + size_hints.y = display_y_pos; + size_hints.width = splash->width; + size_hints.height = splash->height; size_hints.min_width = splash->width; size_hints.max_width = splash->width; size_hints.min_height = splash->height; diff -Nru libreoffice-5.0.2/download.lst libreoffice-5.0.5~rc2/download.lst --- libreoffice-5.0.2/download.lst 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/download.lst 2016-02-04 16:41:28.000000000 +0000 @@ -27,7 +27,7 @@ export COLLADA2GLTF_TARBALL := 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 export CPPUNIT_MD5SUM := d1c6bdd5a76c66d2c38331e2d287bc01 export CPPUNIT_TARBALL := cppunit-1.13.2.tar.gz -export CT2N_TARBALL := 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt +export CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt export CURL_MD5SUM := 11bddbb452a8b766b932f859aaeeed39 export CURL_TARBALL := curl-7.43.0.tar.bz2 export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll @@ -82,8 +82,8 @@ export JPEG_TARBALL := jpegsrc.v9a.tar.gz export JPEG_TURBO_MD5SUM := 2c3a68129dac443a72815ff5bb374b05 export JPEG_TURBO_TARBALL := libjpeg-turbo-1.3.1.tar.gz -export LANGTAGREG_MD5SUM := d431bd8a70455be1fa8523fa633c005b -export LANGTAGREG_TARBALL := language-subtag-registry-2015-06-08.tar.bz2 +export LANGTAGREG_MD5SUM := bf5986dbfa1c9a0f26cf1b00ed369484 +export LANGTAGREG_TARBALL := language-subtag-registry-2015-08-04.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := f4c08d38ceade4a664ebff7228910a33 export LCMS2_TARBALL := lcms2-2.6.tar.gz @@ -96,7 +96,7 @@ export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2 export LIBLANGTAG_TARBALL := 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 export LIBXMLSEC_TARBALL := 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz -export LIBXML_TARBALL := 9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz +export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz export LIBXSLT_TARBALL := 9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz export MARIADB_TARBALL := a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz @@ -110,7 +110,7 @@ export MYSQLCPPCONN_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz export NEON_TARBALL := ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz -export NSS_TARBALL := 2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz +export NSS_TARBALL := 478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz export ODFGEN_MD5SUM := 8716be5c22ae8353f9aaa380d74840dc export ODFGEN_VERSION_MICRO := 4 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2 @@ -123,8 +123,8 @@ export PAGEMAKER_MD5SUM := 795cc7a59ace4db2b12586971d668671 export PAGEMAKER_TARBALL := libpagemaker-0.0.2.tar.bz2 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 -export PNG_MD5SUM := 5266905cef49d1224437465ad4d67fd9 -export PNG_TARBALL := libpng-1.5.18.tar.gz +export PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b +export PNG_TARBALL := libpng-1.5.24.tar.gz export POPPLER_MD5SUM := 35c0660065d023365e9854c13e289d12 export POPPLER_TARBALL := poppler-0.26.4.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 diff -Nru libreoffice-5.0.2/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx libreoffice-5.0.5~rc2/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx --- libreoffice-5.0.2/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/drawinglayer/source/processor2d/vclhelperbufferdevice.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -27,6 +27,8 @@ #include #include +#include + // buffered VDev usage @@ -43,6 +45,11 @@ // allocated/used buffers (remembered to allow deleting them in destructor) aBuffers maUsedBuffers; + // remember what outputdevice was the template passed to VirtualDevice::Create + // so we can test if that OutputDevice was disposed before reusing a + // virtualdevice because that isn't safe to do at least for Gtk2 + std::map< VclPtr, VclPtr > maDeviceTemplates; + public: VDevBuffer(); virtual ~VDevBuffer(); @@ -88,14 +95,14 @@ if (nBits == 0) nBits = rOutDev.GetBitCount(); + bool bOkay(false); if(!maFreeBuffers.empty()) { - bool bOkay(false); aBuffers::iterator aFound(maFreeBuffers.end()); for(aBuffers::iterator a(maFreeBuffers.begin()); a != maFreeBuffers.end(); ++a) { - OSL_ENSURE(*a, "Empty pointer in VDevBuffer (!)"); + assert(*a && "Empty pointer in VDevBuffer (!)"); if(nBits == (*a)->GetBitCount()) { @@ -145,10 +152,25 @@ { pRetval = *aFound; maFreeBuffers.erase(aFound); + } + } - if(bOkay) + if (pRetval) + { + // found a suitable cached virtual device, but the + // outputdevice it was based on has been disposed, + // drop it and create a new one instead as reusing + // such devices is unsafe under at least Gtk2 + if (maDeviceTemplates[pRetval]->isDisposed()) + { + maDeviceTemplates.erase(pRetval); + pRetval = nullptr; + } + else + { + if (bOkay) { - if(bClear) + if (bClear) { pRetval->Erase(Rectangle(0, 0, rSizePixel.getWidth(), rSizePixel.getHeight())); } @@ -164,6 +186,7 @@ if(!pRetval) { pRetval = VclPtr::Create(rOutDev, nBits); + maDeviceTemplates[pRetval] = &rOutDev; pRetval->SetOutputSizePixel(rSizePixel, bClear); } else @@ -197,7 +220,9 @@ while(!maFreeBuffers.empty()) { - (*(maFreeBuffers.end() - 1)).disposeAndClear(); + aBuffers::iterator aLastOne(maFreeBuffers.end() - 1); + maDeviceTemplates.erase(*aLastOne); + aLastOne->disposeAndClear(); maFreeBuffers.pop_back(); } } diff -Nru libreoffice-5.0.2/editeng/source/editeng/editundo.hxx libreoffice-5.0.5~rc2/editeng/source/editeng/editundo.hxx --- libreoffice-5.0.2/editeng/source/editeng/editundo.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/editeng/editundo.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -126,7 +126,7 @@ EditUndoRemoveChars(EditEngine* pEE, const EPaM& rEPaM, const OUString& rStr); const EPaM& GetEPaM() { return aEPaM; } - OUString GetStr() const { return aText; } + OUString & GetStr() { return aText; } virtual void Undo() SAL_OVERRIDE; virtual void Redo() SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/editeng/source/editeng/edtspell.cxx libreoffice-5.0.5~rc2/editeng/source/editeng/edtspell.cxx --- libreoffice-5.0.2/editeng/source/editeng/edtspell.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/editeng/edtspell.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -743,9 +743,13 @@ pCurNode->GetString(), rSttPos, nEndPos, *this, aLanguageTag); if( pFnd && pFnd->IsTextOnly() ) { + + // replace also last colon of keywords surrounded by colons (for example, ":name:") + bool replaceLastChar = pFnd->GetShort()[0] == ':' && pFnd->GetShort().endsWith(":"); + // then replace EditSelection aSel( EditPaM( pCurNode, rSttPos ), - EditPaM( pCurNode, nEndPos ) ); + EditPaM( pCurNode, nEndPos + (replaceLastChar ? 1 : 0) )); aSel = mpEditEngine->DeleteSelection(aSel); SAL_WARN_IF(nCursor < nEndPos, "editeng", "Cursor in the heart of the action?!"); diff -Nru libreoffice-5.0.2/editeng/source/editeng/eerdll.cxx libreoffice-5.0.5~rc2/editeng/source/editeng/eerdll.cxx --- libreoffice-5.0.2/editeng/source/editeng/eerdll.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/editeng/eerdll.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -101,8 +101,9 @@ ppDefItems = new SfxPoolItem*[EDITITEMCOUNT]; // Paragraph attributes: - SvxNumRule aDefaultNumRule( SvxNumRuleFlags::BULLET_REL_SIZE | SvxNumRuleFlags::BULLET_COLOR | SvxNumRuleFlags::CHAR_TEXT_DISTANCE, - SVX_MAX_NUM, false ); + SvxNumRule aDefaultNumRule( SvxNumRuleFlags::NONE, 0, false ); + + // SvxNumRule aDefaultNumRule(SvxNumRuleFlags::NONE, SVX_MAX_NUM, false); ppDefItems[0] = new SvxFrameDirectionItem( FRMDIR_HORI_LEFT_TOP, EE_PARA_WRITINGDIR ); ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS ); diff -Nru libreoffice-5.0.2/editeng/source/editeng/impedit3.cxx libreoffice-5.0.5~rc2/editeng/source/editeng/impedit3.cxx --- libreoffice-5.0.2/editeng/source/editeng/impedit3.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/editeng/impedit3.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -289,12 +289,7 @@ { // convert to window coordinates .... aClipRect = pView->pImpEditView->GetWindowPos( aClipRect ); - - // For tiled rendering, we have to always go via Invalidate(). - if ( pView == pCurView && !pView->isTiledRendering()) - Paint( pView->pImpEditView, aClipRect, 0, true ); - else - pView->GetWindow()->Invalidate( aClipRect ); + pView->GetWindow()->Invalidate( aClipRect ); } } diff -Nru libreoffice-5.0.2/editeng/source/misc/svxacorr.cxx libreoffice-5.0.5~rc2/editeng/source/misc/svxacorr.cxx --- libreoffice-5.0.2/editeng/source/misc/svxacorr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/misc/svxacorr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1729,10 +1729,8 @@ } // If it still could not be found here, then keep on searching - LanguageType eLang = aLanguageTag.getLanguageType(); - LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE - nTmpKey2 = eLang & 0x3ff; // otherwise for example EN + LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE if(nTmpKey1 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey1)) != pLangTable->end() || CreateLanguageFile(aLanguageTag, false))) { @@ -1746,8 +1744,12 @@ } } - if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) != pLangTable->end() || - CreateLanguageFile(aLanguageTag, false))) + // otherwise for example EN + aLanguageTag.reset(aLanguageTag.getLanguage()); + LanguageType nTmpKey2 = aLanguageTag.getLanguageType(false); + if (nTmpKey2 != eLang && nTmpKey2 != LANGUAGE_UNDETERMINED && + (pLangTable->find(aLanguageTag) != pLangTable->end() || + CreateLanguageFile(aLanguageTag, false))) { //the language is available - so bring it on SvxAutoCorrectLanguageLists* pList = pLangTable->find(aLanguageTag)->second; @@ -1783,8 +1785,7 @@ // First search for eLang, then US-English -> English // and last in LANGUAGE_UNDETERMINED - LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE - nTmpKey2 = eLang & 0x3ff; // otherwise for example EN + LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE OUString sTemp(sWord); if(pLangTable->find(aLanguageTag) != pLangTable->end() || CreateLanguageFile(aLanguageTag, false)) @@ -1806,8 +1807,12 @@ return true; } - if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) != pLangTable->end() || - CreateLanguageFile(aLanguageTag, false))) + // otherwise for example EN + aLanguageTag.reset(aLanguageTag.getLanguage()); + LanguageType nTmpKey2 = aLanguageTag.getLanguageType(false); + if (nTmpKey2 != eLang && nTmpKey2 != LANGUAGE_UNDETERMINED && + (pLangTable->find(aLanguageTag) != pLangTable->end() || + CreateLanguageFile(aLanguageTag, false))) { //the language is available - so bring it on SvxAutoCorrectLanguageLists* pList = pLangTable->find(aLanguageTag)->second; @@ -1869,8 +1874,7 @@ // First search for eLang, then US-English -> English // and last in LANGUAGE_UNDETERMINED - LanguageType nTmpKey1 = eLang & 0x7ff, // the main language in many cases DE - nTmpKey2 = eLang & 0x3ff; // otherwise for example EN + LanguageType nTmpKey1 = eLang & 0x7ff; // the main language in many cases DE OUString sTemp( sWord ); if(pLangTable->find(aLanguageTag) != pLangTable->end() || CreateLanguageFile(aLanguageTag, false)) @@ -1890,8 +1894,12 @@ return true; } - if(nTmpKey2 != eLang && (pLangTable->find(aLanguageTag.reset(nTmpKey2)) != pLangTable->end() || - CreateLanguageFile(aLanguageTag, false))) + // otherwise for example EN + aLanguageTag.reset(aLanguageTag.getLanguage()); + LanguageType nTmpKey2 = aLanguageTag.getLanguageType(false); + if (nTmpKey2 != eLang && nTmpKey2 != LANGUAGE_UNDETERMINED && + (pLangTable->find(aLanguageTag) != pLangTable->end() || + CreateLanguageFile(aLanguageTag, false))) { //the language is available - so bring it on const SvStringsISortDtor* pList = pLangTable->find(aLanguageTag)->second->GetCplSttExceptList(); diff -Nru libreoffice-5.0.2/editeng/source/rtf/svxrtf.cxx libreoffice-5.0.5~rc2/editeng/source/rtf/svxrtf.cxx --- libreoffice-5.0.2/editeng/source/rtf/svxrtf.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/editeng/source/rtf/svxrtf.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -300,6 +300,7 @@ { int nToken, bSaveChkStyleAttr = bChkStyleAttr ? 1 : 0; sal_uInt16 nStyleNo = 0; + bool bHasStyleNo = false; int _nOpenBrakets = 1; // the first was already detected earlier!! SvxRTFStyleType* pStyle = new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] ); pStyle->aAttrSet.Put( GetRTFDefaults() ); @@ -340,12 +341,16 @@ case RTF_SNEXT: pStyle->nNext = sal_uInt16(nTokenValue); break; case RTF_OUTLINELEVEL: case RTF_SOUTLVL: pStyle->nOutlineNo = sal_uInt8(nTokenValue); break; - case RTF_S: nStyleNo = (short)nTokenValue; break; + case RTF_S: nStyleNo = (short)nTokenValue; + bHasStyleNo = true; + break; case RTF_CS: nStyleNo = (short)nTokenValue; + bHasStyleNo = true; pStyle->bIsCharFmt = true; break; case RTF_TEXTTOKEN: + if (bHasStyleNo) { pStyle->sName = DelCharAtEnd( aToken, ';' ); @@ -358,6 +363,7 @@ pStyle = new SvxRTFStyleType( *pAttrPool, &aWhichMap[0] ); pStyle->aAttrSet.Put( GetRTFDefaults() ); nStyleNo = 0; + bHasStyleNo = false; } break; default: diff -Nru libreoffice-5.0.2/extensions/source/abpilot/typeselectionpage.cxx libreoffice-5.0.5~rc2/extensions/source/abpilot/typeselectionpage.cxx --- libreoffice-5.0.2/extensions/source/abpilot/typeselectionpage.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extensions/source/abpilot/typeselectionpage.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -219,7 +219,7 @@ loop != m_aAllTypes.end(); ++loop ) { ButtonItem aItem = (*loop); - if ( aItem.m_pItem->IsChecked() ) + if ( aItem.m_pItem->IsChecked() && aItem.m_bVisible ) return aItem.m_eType; } diff -Nru libreoffice-5.0.2/extensions/source/plugin/base/xplugin.cxx libreoffice-5.0.5~rc2/extensions/source/plugin/base/xplugin.cxx --- libreoffice-5.0.2/extensions/source/plugin/base/xplugin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extensions/source/plugin/base/xplugin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -548,9 +548,14 @@ return; #elif defined WNT - PluginComm* pComm = new PluginComm_Impl( m_aDescription.Mimetype, - m_aDescription.PluginName, - (HWND)pEnvData->hWnd ); + PluginComm* pComm; + try { + pComm = new PluginComm_Impl( + m_aDescription.Mimetype, m_aDescription.PluginName, + (HWND)pEnvData->hWnd); + } catch (PluginComm_Impl::CannotInitializeException &) { + return; + } #endif setPluginComm( pComm ); diff -Nru libreoffice-5.0.2/extensions/source/plugin/inc/plugin/win/sysplug.hxx libreoffice-5.0.5~rc2/extensions/source/plugin/inc/plugin/win/sysplug.hxx --- libreoffice-5.0.2/extensions/source/plugin/inc/plugin/win/sysplug.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extensions/source/plugin/inc/plugin/win/sysplug.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -86,6 +86,8 @@ virtual long doIt(); public: + struct CannotInitializeException {}; + PluginComm_Impl( const OUString& rMIME, const OUString& rName, HWND hWnd ); virtual ~PluginComm_Impl(); @@ -114,6 +116,7 @@ virtual NPError NPP_SetValue( NPP instance, NPNVariable variable, void *ret_alue ); private: + void shutdown(); BOOL retrieveFunction( TCHAR const * pName, void** ppFunc ) const; private: diff -Nru libreoffice-5.0.2/extensions/source/plugin/win/sysplug.cxx libreoffice-5.0.5~rc2/extensions/source/plugin/win/sysplug.cxx --- libreoffice-5.0.2/extensions/source/plugin/win/sysplug.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extensions/source/plugin/win/sysplug.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -98,12 +98,20 @@ "### version failure!" ); m_eCall = eNP_Initialize; - execute(); + if (execute() != NPERR_NO_ERROR) { + shutdown(); + throw CannotInitializeException(); + } } PluginComm_Impl::~PluginComm_Impl() { + shutdown(); +} + +void PluginComm_Impl::shutdown() +{ if (_plDLL) { // NPP_Shutdown(); diff -Nru libreoffice-5.0.2/external/boost/boost.system.error_code_header_only_fix.patch.1 libreoffice-5.0.5~rc2/external/boost/boost.system.error_code_header_only_fix.patch.1 --- libreoffice-5.0.2/external/boost/boost.system.error_code_header_only_fix.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/boost/boost.system.error_code_header_only_fix.patch.1 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,21 @@ +bundled boost 1.55 error_code.cpp breaks when compiled with BOOST_ERROR_CODE_HEADER_ONLY + +--- boost/libs/system/src/error_code.cpp.orig 2015-09-08 16:37:11.595528207 +0200 ++++ boost/libs/system/src/error_code.cpp 2015-09-08 16:39:12.696518815 +0200 +@@ -17,6 +17,10 @@ + #define BOOST_SYSTEM_SOURCE + + #include ++ ++#ifndef BOOST_ERROR_CODE_CPP ++#define BOOST_ERROR_CODE_CPP ++ + #include + #include + #include +@@ -477,3 +480,5 @@ + + } // namespace system + } // namespace boost ++ ++#endif // BOOST_ERROR_CODE_CPP diff -Nru libreoffice-5.0.2/external/boost/UnpackedTarball_boost.mk libreoffice-5.0.5~rc2/external/boost/UnpackedTarball_boost.mk --- libreoffice-5.0.2/external/boost/UnpackedTarball_boost.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/boost/UnpackedTarball_boost.mk 2016-02-04 16:41:28.000000000 +0000 @@ -110,6 +110,9 @@ boost_patches += ubsan.patch.0 boost_patches += rtti.patch.0 +# 5.0 branch fix +boost_patches += boost.system.error_code_header_only_fix.patch.1 + $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) $(eval $(call gb_UnpackedTarball_set_tarball,boost,$(BOOST_TARBALL))) diff -Nru libreoffice-5.0.2/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch libreoffice-5.0.5~rc2/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch --- libreoffice-5.0.2/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/ct2n/ConvertTextToNumber-1.3.2-no-license.patch 2016-02-04 16:41:28.000000000 +0000 @@ -4,7 +4,7 @@ @@ -5,12 +5,4 @@ xmlns:xlink="http://www.w3.org/1999/xlink"> - + - diff -Nru libreoffice-5.0.2/external/firebird/firebird-macosx.patch.1 libreoffice-5.0.5~rc2/external/firebird/firebird-macosx.patch.1 --- libreoffice-5.0.2/external/firebird/firebird-macosx.patch.1 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/firebird/firebird-macosx.patch.1 2016-02-04 16:41:28.000000000 +0000 @@ -27,6 +27,15 @@ PLATFORM_POSTBUILD_TARGET=darwin_postbuild_target +@@ -57,7 +57,7 @@ + + LINK_TRACE = $(LIB_LINK) $(LIB_BUNDLE_OPTIONS) + +-LINK_CLIENT = $(LIB_LINK) -nodefaultlibs $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\ ++LINK_CLIENT = $(LIB_LINK) $(LINK_FIREBIRD_CLIENT_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_IMPLIB)\ + $(LIB_CLIENT_LINK_OPTIONS) $(LIB_LINK_SONAME) + + ifeq (@VOID_PTR_SIZE@,8) diff -ur firebird.org/builds/posix/postfix.darwin firebird/builds/posix/postfix.darwin --- firebird.org/builds/posix/postfix.darwin 2013-07-12 20:55:46.000000000 +0200 +++ firebird/builds/posix/postfix.darwin 2013-07-15 12:07:36.000000000 +0200 diff -Nru libreoffice-5.0.2/external/hunspell/hunspell-1.3.3-rhbz1261421.patch libreoffice-5.0.5~rc2/external/hunspell/hunspell-1.3.3-rhbz1261421.patch --- libreoffice-5.0.2/external/hunspell/hunspell-1.3.3-rhbz1261421.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/hunspell/hunspell-1.3.3-rhbz1261421.patch 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,191 @@ +From 97e079a23d459aeb6e64435350d7710c90dbca85 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Fri, 11 Sep 2015 13:28:52 +0100 +Subject: [PATCH] Resolves: rhbz#1261421 crash on mashing hangul korean + keyboard + +--- + src/hunspell/hunspell.cxx | 69 +++++++++++++++++++++++++++++++++++------------ + src/hunspell/hunspell.hxx | 4 ++- + src/hunspell/replist.cxx | 18 ++++++++++--- + src/hunspell/replist.hxx | 2 ++ + src/tools/hunspell.cxx | 2 +- + 6 files changed, 78 insertions(+), 24 deletions(-) + +diff --git a/src/hunspell/hunspell.cxx b/src/hunspell/hunspell.cxx +index 7fae54b..d8ef357 100644 +--- misc/hunspell-1.3.3/src/hunspell/hunspell.cxx ++++ misc/build/hunspell-1.3.3/src/hunspell/hunspell.cxx +@@ -12,6 +12,7 @@ + #endif + #include "csutil.hxx" + ++#include + #include + + Hunspell::Hunspell(const char * affpath, const char * dpath, const char * key) +@@ -349,8 +350,13 @@ int Hunspell::spell(const char * word, int * info, char ** root) + + // input conversion + RepList * rl = (pAMgr) ? pAMgr->get_iconvtable() : NULL; +- if (rl && rl->conv(word, wspace)) wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); +- else wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); ++ int convstatus = rl ? rl->conv(word, wspace, MAXWORDUTF8LEN) : 0; ++ if (convstatus < 0) ++ return 0; ++ else if (convstatus > 0) ++ wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); ++ else ++ wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); + + if (wl == 0 || maxdic == 0) return 1; + if (root) *root = NULL; +@@ -702,8 +708,13 @@ int Hunspell::suggest(char*** slst, const char * word) + + // input conversion + RepList * rl = (pAMgr) ? pAMgr->get_iconvtable() : NULL; +- if (rl && rl->conv(word, wspace)) wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); +- else wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); ++ int convstatus = rl ? rl->conv(word, wspace, MAXWORDUTF8LEN) : 0; ++ if (convstatus < 0) ++ return 0; ++ else if (convstatus > 0) ++ wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); ++ else ++ wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); + + if (wl == 0) return 0; + int ns = 0; +@@ -1020,7 +1031,7 @@ int Hunspell::suggest(char*** slst, const char * word) + // output conversion + rl = (pAMgr) ? pAMgr->get_oconvtable() : NULL; + for (int j = 0; rl && j < ns; j++) { +- if (rl->conv((*slst)[j], wspace)) { ++ if (rl->conv((*slst)[j], wspace, MAXWORDUTF8LEN) > 0) { + free((*slst)[j]); + (*slst)[j] = mystrdup(wspace); + } +@@ -1395,8 +1406,13 @@ int Hunspell::analyze(char*** slst, const char * word) + + // input conversion + RepList * rl = (pAMgr) ? pAMgr->get_iconvtable() : NULL; +- if (rl && rl->conv(word, wspace)) wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); +- else wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); ++ int convstatus = rl ? rl->conv(word, wspace, MAXWORDUTF8LEN) : 0; ++ if (convstatus < 0) ++ return 0; ++ else if (convstatus > 0) ++ wl = cleanword2(cw, wspace, unicw, &nc, &captype, &abbv); ++ else ++ wl = cleanword2(cw, word, unicw, &nc, &captype, &abbv); + + if (wl == 0) { + if (abbv) { +@@ -1684,12 +1700,16 @@ int Hunspell::get_langnum() const + return langnum; + } + +-int Hunspell::input_conv(const char * word, char * dest) ++int Hunspell::input_conv(const char * word, char * dest, size_t destsize) + { + RepList * rl = (pAMgr) ? pAMgr->get_iconvtable() : NULL; +- return (rl && rl->conv(word, dest)); ++ return (rl && rl->conv(word, dest, destsize) > 0); + } + ++int Hunspell::input_conv(const char * word, char * dest) ++{ ++ return input_conv(word, dest, std::numeric_limits::max()); ++} + + // return the beginning of the element (attr == NULL) or the attribute + const char * Hunspell::get_xml_pos(const char * s, const char * attr) +diff --git a/src/hunspell/hunspell.hxx b/src/hunspell/hunspell.hxx +index e62f0dd..0b5ad2e 100644 +--- misc/hunspell-1.3.3/src/hunspell/hunspell.hxx ++++ misc/build/hunspell-1.3.3/src/hunspell/hunspell.hxx +@@ -226,7 +226,9 @@ public: + + /* need for putdic */ + int input_conv(const char * word, char * dest); +- ++ // ^^-deprecated, use this-vv" ++ int input_conv(const char * word, char * dest, size_t destsize); ++ + /* experimental and deprecated functions */ + + #ifdef HUNSPELL_EXPERIMENTAL +diff --git a/src/hunspell/replist.cxx b/src/hunspell/replist.cxx +index b9b1255..bac3e06 100644 +--- misc/hunspell-1.3.3/src/hunspell/replist.cxx ++++ misc/build/hunspell-1.3.3/src/hunspell/replist.cxx +@@ -74,6 +74,7 @@ + #include + #include + #include ++#include + + #include "replist.hxx" + #include "csutil.hxx" +@@ -139,19 +140,30 @@ int RepList::add(char * pat1, char * pat2) { + return 0; + } + +-int RepList::conv(const char * word, char * dest) { ++int RepList::conv(const char * word, char * dest, size_t destsize) { + int stl = 0; + int change = 0; + for (size_t i = 0; i < strlen(word); i++) { + int n = near(word + i); + int l = match(word + i, n); + if (l) { ++ size_t replen = strlen(dat[n]->pattern2); ++ if (stl+replen >= destsize) ++ return -1; + strcpy(dest + stl, dat[n]->pattern2); +- stl += strlen(dat[n]->pattern2); ++ stl += replen; + i += l - 1; + change = 1; +- } else dest[stl++] = word[i]; ++ } else { ++ if (stl+1 >= destsize) ++ return -1; ++ dest[stl++] = word[i]; ++ } + } + dest[stl] = '\0'; + return change; + } ++ ++int RepList::conv(const char * word, char * dest) { ++ return conv(word, dest, std::numeric_limits::max()); ++} +diff --git a/src/hunspell/replist.hxx b/src/hunspell/replist.hxx +index 1e3d6e4..e418298 100644 +--- misc/hunspell-1.3.3/src/hunspell/replist.hxx ++++ misc/build/hunspell-1.3.3/src/hunspell/replist.hxx +@@ -99,5 +99,7 @@ public: + int near(const char * word); + int match(const char * word, int n); + int conv(const char * word, char * dest); ++ // ^^-deprecated, use this-vv" ++ int conv(const char * word, char * dest, size_t destsize); + }; + #endif +diff --git a/src/tools/hunspell.cxx b/src/tools/hunspell.cxx +index 6124ac4..1b50fe1 100644 +--- misc/hunspell-1.3.3/src/tools/hunspell.cxx ++++ misc/build/hunspell-1.3.3/src/tools/hunspell.cxx +@@ -524,7 +524,7 @@ int putdic(char * word, Hunspell * pMS) + + word = chenc(word, ui_enc, dic_enc[0]); + +- if(pMS->input_conv(word, buf)) word = buf; ++ if(pMS->input_conv(word, buf, MAXLNLEN)) word = buf; + + int ret; + +-- +2.4.0 + diff -Nru libreoffice-5.0.2/external/hunspell/hunspell-tdf95024-compound.patch libreoffice-5.0.5~rc2/external/hunspell/hunspell-tdf95024-compound.patch --- libreoffice-5.0.2/external/hunspell/hunspell-tdf95024-compound.patch 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/hunspell/hunspell-tdf95024-compound.patch 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,108 @@ +From 42807f970ac2d65f0d13a7c57eb454b210e92240 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= + +Date: Mon, 12 Oct 2015 08:43:12 +0200 +Subject: [PATCH] fix compound handling for new Hungarian orthography + +The frequent cases of this compound limitation are handled by +the extended dictionary, but not these ones with both derivative +and inflectional suffixes. +--- + src/hunspell/affixmgr.cxx | 19 +++++++++++++++---- + src/hunspell/affixmgr.hxx | 1 + + 2 files changed, 16 insertions(+), 4 deletions(-) + +diff --git a/src/hunspell/affixmgr.cxx b/src/hunspell/affixmgr.cxx +index 0992e6e..0950425 100644 +--- misc/hunspell-1.3.3/src/hunspell/affixmgr.cxx ++++ misc/build/hunspell-1.3.3/src/hunspell/affixmgr.cxx +@@ -139,8 +139,9 @@ AffixMgr::AffixMgr(const char * affpath, HashMgr** ptr, int * md, const char * k + cpdvowels=NULL; // vowels (for calculating of Hungarian compounding limit, O(n) search! XXX) + cpdvowels_utf16=NULL; // vowels for UTF-8 encoding (bsearch instead of O(n) search) + cpdvowels_utf16_len=0; // vowels +- pfxappnd=NULL; // previous prefix for counting the syllables of prefix BUG +- sfxappnd=NULL; // previous suffix for counting a special syllables BUG ++ pfxappnd=NULL; // previous prefix for counting syllables of the prefix BUG ++ sfxappnd=NULL; // previous suffix for counting syllables of the suffix BUG ++ sfxextra=0; // modifier for syllable count of sfxappnd BUG + cpdsyllablenum=NULL; // syllable count incrementing flag + checknum=0; // checking numbers, and word with numbers + wordchars=NULL; // letters + spec. word characters +@@ -1201,6 +1202,7 @@ struct hentry * AffixMgr::prefix_check(const char * word, int len, char in_compo + pfx = NULL; + pfxappnd = NULL; + sfxappnd = NULL; ++ sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1261,6 +1263,7 @@ struct hentry * AffixMgr::prefix_check_twosfx(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++ sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1302,6 +1305,7 @@ char * AffixMgr::prefix_check_morph(const char * word, int len, char in_compound + + pfx = NULL; + sfxappnd = NULL; ++ sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1353,6 +1357,7 @@ char * AffixMgr::prefix_check_twosfx_morph(const char * word, int len, + + pfx = NULL; + sfxappnd = NULL; ++ sfxextra = 0; + + // first handle the special case of 0 length prefixes + PfxEntry * pe = pStart[0]; +@@ -1993,7 +1998,7 @@ struct hentry * AffixMgr::compound_check(const char * word, int len, + // XXX only second suffix (inflections, not derivations) + if (sfxappnd) { + char * tmp = myrevstrdup(sfxappnd); +- numsyllable -= get_syllable(tmp, strlen(tmp)); ++ numsyllable -= get_syllable(tmp, strlen(tmp)) + sfxextra; + free(tmp); + } + +@@ -2512,7 +2517,7 @@ int AffixMgr::compound_check_morph(const char * word, int len, + // XXX only second suffix (inflections, not derivations) + if (sfxappnd) { + char * tmp = myrevstrdup(sfxappnd); +- numsyllable -= get_syllable(tmp, strlen(tmp)); ++ numsyllable -= get_syllable(tmp, strlen(tmp)) + sfxextra; + free(tmp); + } + +@@ -2696,6 +2701,12 @@ struct hentry * AffixMgr::suffix_check (const char * word, int len, + sfx=sptr; // BUG: sfx not stateless + sfxflag = sptr->getFlag(); // BUG: sfxflag not stateless + if (!sptr->getCont()) sfxappnd=sptr->getKey(); // BUG: sfxappnd not stateless ++// LANG_hu section: spec. Hungarian rule ++ else if (langnum == LANG_hu && sptr->getKeyLen() && sptr->getKey()[0] == 'i' && ++ sptr->getKey()[1] != 'y' && sptr->getKey()[1] != 't') { ++ sfxextra = 1; ++ } ++// END of LANG_hu section + return rv; + } + } +diff --git a/src/hunspell/affixmgr.hxx b/src/hunspell/affixmgr.hxx +index 2679b7f..8839814 100644 +--- misc/hunspell-1.3.3/src/hunspell/affixmgr.hxx ++++ misc/build/hunspell-1.3.3/src/hunspell/affixmgr.hxx +@@ -155,6 +155,7 @@ class LIBHUNSPELL_DLL_EXPORTED AffixMgr + char * cpdsyllablenum; + const char * pfxappnd; // BUG: not stateless + const char * sfxappnd; // BUG: not stateless ++ int sfxextra; // BUG: not stateless + FLAG sfxflag; // BUG: not stateless + char * derived; // BUG: not stateless + SfxEntry * sfx; // BUG: not stateless +-- +1.9.1 + diff -Nru libreoffice-5.0.2/external/hunspell/UnpackedTarball_hunspell.mk libreoffice-5.0.5~rc2/external/hunspell/UnpackedTarball_hunspell.mk --- libreoffice-5.0.2/external/hunspell/UnpackedTarball_hunspell.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/hunspell/UnpackedTarball_hunspell.mk 2016-02-04 16:41:28.000000000 +0000 @@ -20,6 +20,8 @@ external/hunspell/hunspell-fdo48017-wfopen.patch \ external/hunspell/hunspell-morph-overflow.patch \ external/hunspell/ubsan.patch.0 \ + external/hunspell/hunspell-1.3.3-rhbz1261421.patch \ + external/hunspell/hunspell-tdf95024-compound.patch \ )) ifeq ($(COM),MSC) diff -Nru libreoffice-5.0.2/external/libebook/ExternalProject_libebook.mk libreoffice-5.0.5~rc2/external/libebook/ExternalProject_libebook.mk --- libreoffice-5.0.2/external/libebook/ExternalProject_libebook.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libebook/ExternalProject_libebook.mk 2016-02-04 16:41:28.000000000 +0000 @@ -38,7 +38,8 @@ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ --disable-weffc \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ XML_CFLAGS="$(LIBXML_CFLAGS)" \ XML_LIBS="$(LIBXML_LIBS)" \ REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \ diff -Nru libreoffice-5.0.2/external/libmspub/ExternalProject_libmspub.mk libreoffice-5.0.5~rc2/external/libmspub/ExternalProject_libmspub.mk --- libreoffice-5.0.2/external/libmspub/ExternalProject_libmspub.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libmspub/ExternalProject_libmspub.mk 2016-02-04 16:41:28.000000000 +0000 @@ -35,7 +35,8 @@ --disable-werror \ --disable-weffc \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff -Nru libreoffice-5.0.2/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 libreoffice-5.0.5~rc2/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 --- libreoffice-5.0.2/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,56 @@ +From 2d178367e7029a98fb555a084c1c946c8826ff06 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Tue, 24 Nov 2015 15:15:36 +0100 +Subject: [PATCH] if ptr to member var. is defined, ensure the class is + complete + +... because MSVC represents pointers to member as variable size, +depending on context (e.g., multiple inheritance). So it can happen that +the size of the pointer in the header (where the class is only +forward-declared) differs from the size of the same pointer in an impl. +file (where the class is complete). +--- + src/lib/ClarisWksDocument.hxx | 1 + + src/lib/GreatWksDocument.hxx | 1 + + src/lib/MsWksDocument.hxx | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/lib/ClarisWksDocument.hxx b/src/lib/ClarisWksDocument.hxx +index 2b70860..3003b6a 100644 +--- a/src/lib/ClarisWksDocument.hxx ++++ b/src/lib/ClarisWksDocument.hxx +@@ -42,6 +42,7 @@ + + #include "libmwaw_internal.hxx" + ++#include "MWAWParser.hxx" + #include "MWAWPosition.hxx" + + #include "ClarisWksStruct.hxx" +diff --git a/src/lib/GreatWksDocument.hxx b/src/lib/GreatWksDocument.hxx +index 2e00451..2e13dc2 100644 +--- a/src/lib/GreatWksDocument.hxx ++++ b/src/lib/GreatWksDocument.hxx +@@ -41,6 +41,7 @@ + + #include "MWAWCell.hxx" + #include "MWAWDebug.hxx" ++#include "MWAWParser.hxx" + + namespace GreatWksDocumentInternal + { +diff --git a/src/lib/MsWksDocument.hxx b/src/lib/MsWksDocument.hxx +index a212e7f..e96f5dd 100644 +--- a/src/lib/MsWksDocument.hxx ++++ b/src/lib/MsWksDocument.hxx +@@ -44,6 +44,7 @@ + + #include "MWAWDebug.hxx" + #include "MWAWCell.hxx" ++#include "MWAWParser.hxx" + + namespace MsWksDocumentInternal + { +-- +2.5.0 + diff -Nru libreoffice-5.0.2/external/libmwaw/UnpackedTarball_libmwaw.mk libreoffice-5.0.5~rc2/external/libmwaw/UnpackedTarball_libmwaw.mk --- libreoffice-5.0.2/external/libmwaw/UnpackedTarball_libmwaw.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libmwaw/UnpackedTarball_libmwaw.mk 2016-02-04 16:41:28.000000000 +0000 @@ -35,4 +35,8 @@ )) endif +$(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ + external/libmwaw/0001-if-ptr-to-member-var.-is-defined-ensure-the-class-is.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.0.2/external/liborcus/ExternalProject_liborcus.mk libreoffice-5.0.5~rc2/external/liborcus/ExternalProject_liborcus.mk --- libreoffice-5.0.2/external/liborcus/ExternalProject_liborcus.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/liborcus/ExternalProject_liborcus.mk 2016-02-04 16:41:28.000000000 +0000 @@ -63,7 +63,7 @@ endif endif -liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) +liborcus_CXXFLAGS=$(CXXFLAGS) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX) $(CXXFLAGS_CXX11) -DBOOST_SYSTEM_NO_DEPRECATED $(if $(filter-out WNT,$(OS)),-DBOOST_ERROR_CODE_HEADER_ONLY) liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS) ifeq ($(COM),MSC) liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS) diff -Nru libreoffice-5.0.2/external/liborcus/UnpackedTarball_liborcus.mk libreoffice-5.0.5~rc2/external/liborcus/UnpackedTarball_liborcus.mk --- libreoffice-5.0.2/external/liborcus/UnpackedTarball_liborcus.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/liborcus/UnpackedTarball_liborcus.mk 2016-02-04 16:41:28.000000000 +0000 @@ -30,6 +30,7 @@ # f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>: liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0 +liborcus_patches += unusedheader.patch.0 $(eval $(call gb_UnpackedTarball_add_patches,liborcus,\ $(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \ diff -Nru libreoffice-5.0.2/external/liborcus/unusedheader.patch.0 libreoffice-5.0.5~rc2/external/liborcus/unusedheader.patch.0 --- libreoffice-5.0.2/external/liborcus/unusedheader.patch.0 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/liborcus/unusedheader.patch.0 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,11 @@ +--- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000 ++++ ./src/parser/pstring.cpp 2015-12-02 14:38:50.449658497 +0000 +@@ -13,8 +13,6 @@ + #include + #include + +-#include +- + using namespace std; + + namespace orcus { diff -Nru libreoffice-5.0.2/external/libpagemaker/ExternalProject_libpagemaker.mk libreoffice-5.0.5~rc2/external/libpagemaker/ExternalProject_libpagemaker.mk --- libreoffice-5.0.2/external/libpagemaker/ExternalProject_libpagemaker.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libpagemaker/ExternalProject_libpagemaker.mk 2016-02-04 16:41:28.000000000 +0000 @@ -33,7 +33,8 @@ --disable-werror \ --disable-weffc \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff -Nru libreoffice-5.0.2/external/libpng/configs/pnglibconf.h libreoffice-5.0.5~rc2/external/libpng/configs/pnglibconf.h --- libreoffice-5.0.2/external/libpng/configs/pnglibconf.h 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libpng/configs/pnglibconf.h 2016-02-04 16:41:28.000000000 +0000 @@ -1,9 +1,9 @@ -/* 1.5.18 STANDARD API DEFINITION */ +/* 1.5.24 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.18 - February 6, 2014 */ +/* libpng version 1.5.24 - November 12, 2015 */ -/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ +/* Copyright (c) 1998-2015 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -95,8 +95,6 @@ #define PNG_SAVE_INT_32_SUPPORTED #define PNG_SEQUENTIAL_READ_SUPPORTED #define PNG_SETJMP_SUPPORTED -#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED -#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED /*#undef PNG_SET_OPTION_SUPPORTED*/ #define PNG_SET_USER_LIMITS_SUPPORTED #define PNG_STDIO_SUPPORTED @@ -114,6 +112,7 @@ #define PNG_WRITE_BGR_SUPPORTED #define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED #define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED #define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED #define PNG_WRITE_FILLER_SUPPORTED #define PNG_WRITE_FILTER_SUPPORTED @@ -172,15 +171,16 @@ /* end of options */ /* settings */ #define PNG_API_RULE 0 -#define PNG_CALLOC_SUPPORTED -#define PNG_COST_SHIFT 3 #define PNG_DEFAULT_READ_MACROS 1 #define PNG_GAMMA_THRESHOLD_FIXED 5000 #define PNG_MAX_GAMMA_8 11 #define PNG_QUANTIZE_BLUE_BITS 5 #define PNG_QUANTIZE_GREEN_BITS 5 #define PNG_QUANTIZE_RED_BITS 5 -#define PNG_WEIGHT_SHIFT 8 +#define PNG_USER_CHUNK_CACHE_MAX 1000 +#define PNG_USER_CHUNK_MALLOC_MAX 8000000 +#define PNG_USER_HEIGHT_MAX 1000000 +#define PNG_USER_WIDTH_MAX 1000000 #define PNG_ZBUF_SIZE 8192 #define PNG_sCAL_PRECISION 5 /* end of settings */ diff -Nru libreoffice-5.0.2/external/librevenge/ExternalProject_librevenge.mk libreoffice-5.0.5~rc2/external/librevenge/ExternalProject_librevenge.mk --- libreoffice-5.0.2/external/librevenge/ExternalProject_librevenge.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/librevenge/ExternalProject_librevenge.mk 2016-02-04 16:41:28.000000000 +0000 @@ -34,7 +34,8 @@ --disable-generators \ --without-docs \ $(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ && $(MAKE) \ diff -Nru libreoffice-5.0.2/external/libxml2/ExternalPackage_xml2.mk libreoffice-5.0.5~rc2/external/libxml2/ExternalPackage_xml2.mk --- libreoffice-5.0.2/external/libxml2/ExternalPackage_xml2.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxml2/ExternalPackage_xml2.mk 2016-02-04 16:41:28.000000000 +0000 @@ -21,7 +21,7 @@ $(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll)) endif else # OS!=WNT -$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.1)) +$(eval $(call gb_ExternalPackage_add_file,xml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.9.3)) endif endif # DISABLE_DYNLOADING diff -Nru libreoffice-5.0.2/external/libxml2/libxml2-freebsd.patch.1 libreoffice-5.0.5~rc2/external/libxml2/libxml2-freebsd.patch.1 --- libreoffice-5.0.2/external/libxml2/libxml2-freebsd.patch.1 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxml2/libxml2-freebsd.patch.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -Usual patch to produce Linux-like .so files on FreeBSD - ---- a/ltmain.sh 2009-10-06 17:39:54.000000000 +0100 -+++ b/ltmain.sh 2009-12-17 11:43:56.000000000 +0000 -@@ -6271,8 +6271,8 @@ - ;; - - freebsd-elf) -- major=".$current" -- versuffix=".$current" -+ major=.`expr $current - $age` -+ versuffix=".$major.$age.$revision"; - ;; - - irix | nonstopux) diff -Nru libreoffice-5.0.2/external/libxml2/libxml2-icu.patch.0 libreoffice-5.0.5~rc2/external/libxml2/libxml2-icu.patch.0 --- libreoffice-5.0.2/external/libxml2/libxml2-icu.patch.0 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxml2/libxml2-icu.patch.0 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ +++ win32/Makefile.msvc 2014-07-18 19:01:39.347982929 +0200 @@ -45,6 +45,7 @@ CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" CC = cl.exe - CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME) + CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "NOLIBTOOL" /W1 $(CRUNTIME) CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX) +CFLAGS = $(CFLAGS) /I$(WORKDIR)/UnpackedTarball/icu/source/i18n /I$(WORKDIR)/UnpackedTarball/icu/source/common !if "$(WITH_THREADS)" != "no" diff -Nru libreoffice-5.0.2/external/libxml2/libxml2-vc10.patch libreoffice-5.0.5~rc2/external/libxml2/libxml2-vc10.patch --- libreoffice-5.0.2/external/libxml2/libxml2-vc10.patch 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxml2/libxml2-vc10.patch 2016-02-04 16:41:28.000000000 +0000 @@ -1,3 +1,5 @@ +Add SOLARINC, and disable SSE2 default for MSVC2012 + --- build/libxml2-2.7.6/win32/Makefile.msvc.old 2010-09-20 20:22:41.500000000 +0200 +++ build/libxml2-2.7.6/win32/Makefile.msvc 2010-09-20 20:23:00.250000000 +0200 @@ -59,6 +59,7 @@ diff -Nru libreoffice-5.0.2/external/libxml2/UnpackedTarball_xml2.mk libreoffice-5.0.5~rc2/external/libxml2/UnpackedTarball_xml2.mk --- libreoffice-5.0.2/external/libxml2/UnpackedTarball_xml2.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxml2/UnpackedTarball_xml2.mk 2016-02-04 16:41:28.000000000 +0000 @@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,xml2,\ external/libxml2/libxml2-config.patch.1 \ - external/libxml2/libxml2-freebsd.patch.1 \ external/libxml2/libxml2-global-symbols.patch \ external/libxml2/libxml2-vc10.patch \ $(if $(filter ANDROID,$(OS)),external/libxml2/libxml2-android.patch) \ diff -Nru libreoffice-5.0.2/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 libreoffice-5.0.5~rc2/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 --- libreoffice-5.0.2/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,29 @@ +From 7ca19df892ca22d9314e95d59ce2abdeff46b617 Mon Sep 17 00:00:00 2001 +From: Daniel Veillard +Date: Thu, 29 Oct 2015 19:33:23 +0800 +Subject: [PATCH] Fix for type confusion in preprocessing attributes + +CVE-2015-7995 http://www.openwall.com/lists/oss-security/2015/10/27/10 +We need to check that the parent node is an element before dereferencing +its namespace +--- + libxslt/preproc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libxslt/preproc.c b/libxslt/preproc.c +index 0eb80a0..7f69325 100644 +--- a/libxslt/preproc.c ++++ b/libxslt/preproc.c +@@ -2249,7 +2249,8 @@ xsltStylePreCompute(xsltStylesheetPtr style, xmlNodePtr inst) { + } else if (IS_XSLT_NAME(inst, "attribute")) { + xmlNodePtr parent = inst->parent; + +- if ((parent == NULL) || (parent->ns == NULL) || ++ if ((parent == NULL) || ++ (parent->type != XML_ELEMENT_NODE) || (parent->ns == NULL) || + ((parent->ns != inst->ns) && + (!xmlStrEqual(parent->ns->href, inst->ns->href))) || + (!xmlStrEqual(parent->name, BAD_CAST "attribute-set"))) { +-- +2.4.3 + diff -Nru libreoffice-5.0.2/external/libxslt/UnpackedTarball_xslt.mk libreoffice-5.0.5~rc2/external/libxslt/UnpackedTarball_xslt.mk --- libreoffice-5.0.2/external/libxslt/UnpackedTarball_xslt.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/external/libxslt/UnpackedTarball_xslt.mk 2016-02-04 16:41:28.000000000 +0000 @@ -21,6 +21,7 @@ $(if $(filter ANDROID,$(OS)),external/libxslt/libxslt-android.patch) \ external/libxslt/libxslt-config-guess.patch.0 \ external/libxslt/rpath.patch.0 \ + external/libxslt/0001-Fix-for-type-confusion-in-preprocessing-attributes.patch.1 \ )) # vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/cs/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/cs/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/cs/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/cs/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -572,56 +572,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/es/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/es/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/es/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/es/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -501,8 +501,6 @@ - - @@ -565,6 +563,7 @@ + @@ -588,6 +587,7 @@ + @@ -630,8 +630,10 @@ + + @@ -644,6 +646,9 @@ + + + @@ -726,6 +731,7 @@ + @@ -733,6 +739,7 @@ + @@ -741,7 +748,12 @@ + + + + + @@ -764,6 +776,7 @@ + @@ -788,12 +801,14 @@ + + @@ -808,8 +823,10 @@ + + @@ -851,6 +868,7 @@ + @@ -862,10 +880,13 @@ + + + @@ -873,6 +894,10 @@ + + + + @@ -886,6 +911,7 @@ + @@ -893,6 +919,8 @@ + + @@ -901,10 +929,10 @@ + - @@ -929,6 +957,7 @@ + @@ -939,15 +968,19 @@ + + + + @@ -965,8 +998,11 @@ + + + @@ -977,7 +1013,15 @@ + + + + + + + + @@ -991,13 +1035,15 @@ - + + + @@ -1062,6 +1108,7 @@ + @@ -1084,6 +1131,8 @@ + + @@ -1096,12 +1145,13 @@ - + + @@ -1122,10 +1172,12 @@ + + @@ -1141,6 +1193,7 @@ + @@ -1152,16 +1205,21 @@ + + + + + @@ -1182,6 +1240,8 @@ + + @@ -1191,7 +1251,7 @@ - + @@ -1202,6 +1262,7 @@ + @@ -1232,6 +1293,7 @@ + @@ -1244,6 +1306,7 @@ + @@ -1272,15 +1335,18 @@ + + + @@ -1301,6 +1367,7 @@ + @@ -1317,12 +1384,20 @@ + + - + + + + + + + @@ -1331,6 +1406,7 @@ + @@ -1363,9 +1439,12 @@ + + + @@ -1374,6 +1453,7 @@ + @@ -1408,7 +1488,11 @@ + + + + @@ -1418,15 +1502,21 @@ + + + + + + @@ -1446,11 +1536,13 @@ - + - + + + @@ -1459,6 +1551,7 @@ + @@ -1471,6 +1564,7 @@ + @@ -1484,6 +1578,7 @@ + @@ -1519,6 +1614,7 @@ + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/fi/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/fi/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/fi/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/fi/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -18,56 +18,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/is/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/is/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/is/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/is/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -1,28 +1,144 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -30,167 +146,1006 @@ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/pt-BR/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/pt-BR/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/pt-BR/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/pt-BR/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -1833,56 +1833,56 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/sv/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/sv/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/sv/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/sv/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -108,12 +108,22 @@ + + + + + + + + + + @@ -135,6 +145,8 @@ + + @@ -150,22 +162,42 @@ + + + + + + + + + + + + + + + + + + + + @@ -180,21 +212,36 @@ + + + + + + + + + + + + + + + @@ -202,20 +249,34 @@ + + + + + + + + + + + + + + @@ -232,15 +293,20 @@ + + + + + @@ -248,34 +314,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -294,19 +395,37 @@ + + + + + + + + + + + + + + + + + + diff -Nru libreoffice-5.0.2/extras/source/autocorr/lang/zh-CN/DocumentList.xml libreoffice-5.0.5~rc2/extras/source/autocorr/lang/zh-CN/DocumentList.xml --- libreoffice-5.0.2/extras/source/autocorr/lang/zh-CN/DocumentList.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/autocorr/lang/zh-CN/DocumentList.xml 2016-02-04 16:41:28.000000000 +0000 @@ -813,6 +813,8 @@ + + @@ -835,12 +837,15 @@ + + + @@ -849,6 +854,8 @@ + + @@ -865,30 +872,37 @@ + + + + + + + @@ -904,6 +918,7 @@ + @@ -916,11 +931,13 @@ + + @@ -932,35 +949,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -972,23 +1017,43 @@ + + + + + + + + + + + + + + + + + + + + @@ -997,8 +1062,14 @@ + + + + + + @@ -1008,14 +1079,31 @@ + + + + + + + + + + + + + + + + + @@ -1033,21 +1121,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/extras/source/templates/presnt/Alizarin.otp and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/extras/source/templates/presnt/Alizarin.otp differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/extras/source/truetype/symbol/opens___.ttf and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/extras/source/truetype/symbol/opens___.ttf differ diff -Nru libreoffice-5.0.2/extras/source/truetype/symbol/OpenSymbol.sfd libreoffice-5.0.5~rc2/extras/source/truetype/symbol/OpenSymbol.sfd --- libreoffice-5.0.2/extras/source/truetype/symbol/OpenSymbol.sfd 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/extras/source/truetype/symbol/OpenSymbol.sfd 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ FullName: OpenSymbol FamilyName: OpenSymbol Weight: Book -Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> TRIPLE PRIME (c) 2013 Mathias Hasselmann -Version: 102.6 +Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot\nPRIME <-> TRIPLE PRIME (c) 2013 Mathias Hasselmann\nphi <-> phi1 (c) 2015 Khaled Hosny +Version: 102.7 ItalicAngle: 0 UnderlinePosition: -143 UnderlineWidth: 20 @@ -773,7 +773,7 @@ 0 0 EndShort -LangName: 1033 "" "" "Regular" "OpenSymbol" "" "Version 102.6" +LangName: 1033 "" "" "Regular" "OpenSymbol" GaspTable: 1 65535 2 0 Encoding: Custom UnicodeInterp: none @@ -105039,8 +105039,8 @@ Validated: 16385 EndChar -StartChar: phi -Encoding: 954 966 954 +StartChar: phi1 +Encoding: 954 981 954 Width: 1067 Flags: W HStem: 892.524 48.4775<480.52 486.132 580.854 586.484> @@ -105980,8 +105980,8 @@ Validated: 16385 EndChar -StartChar: phi1 -Encoding: 960 981 960 +StartChar: phi +Encoding: 960 966 960 Width: 1235 Flags: W HStem: -18.1895 52.1895<714 854.086> 869 62<321.383 492.494 803.829 998.555> Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/filter/qa/cppunit/data/psd/pass/hang-1.psd and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/filter/qa/cppunit/data/psd/pass/hang-1.psd differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/filter/qa/cppunit/data/ras/fail/hang-1.ras and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/filter/qa/cppunit/data/ras/fail/hang-1.ras differ diff -Nru libreoffice-5.0.2/filter/source/config/cache/typedetection.cxx libreoffice-5.0.5~rc2/filter/source/config/cache/typedetection.cxx --- libreoffice-5.0.2/filter/source/config/cache/typedetection.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/config/cache/typedetection.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1040,14 +1040,14 @@ sDeepType = xDetector->detect(lDescriptor); rDescriptor << lDescriptor; } - catch(const css::uno::Exception&) - { - // We should ignore errors here. - // Thrown exceptions mostly will end in crash recovery ... - // But might be we find another deep detection service which can detect the same - // document without a problem .-) - sDeepType.clear(); - } + catch (...) + { + // We should ignore errors here. + // Thrown exceptions mostly will end in crash recovery ... + // But might be we find another deep detection service which can detect the same + // document without a problem .-) + sDeepType.clear(); + } // seek to 0 is an optional feature to be more robust against // "simple implemented detect services" .-) diff -Nru libreoffice-5.0.2/filter/source/graphic/GraphicExportFilter.cxx libreoffice-5.0.5~rc2/filter/source/graphic/GraphicExportFilter.cxx --- libreoffice-5.0.2/filter/source/graphic/GraphicExportFilter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/graphic/GraphicExportFilter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -112,7 +112,10 @@ Size aTargetSizePixel(mTargetWidth, mTargetHeight); - Graphic aGraphic = aRenderer.renderToGraphic( aCurrentPage, aDocumentSizePixel, aTargetSizePixel ); + if (mTargetWidth == 0 || mTargetHeight == 0) + aTargetSizePixel = aDocumentSizePixel; + + Graphic aGraphic = aRenderer.renderToGraphic(aCurrentPage, aDocumentSizePixel, aTargetSizePixel, COL_WHITE); GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter(); diff -Nru libreoffice-5.0.2/filter/source/graphicfilter/ipsd/ipsd.cxx libreoffice-5.0.5~rc2/filter/source/graphicfilter/ipsd/ipsd.cxx --- libreoffice-5.0.2/filter/source/graphicfilter/ipsd/ipsd.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/graphicfilter/ipsd/ipsd.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -172,9 +172,6 @@ bool PSDReader::ImplReadHeader() { - sal_uInt16 nCompression; - sal_uInt32 nColorLength, nResourceLength, nLayerMaskLength; - mpFileHeader = new PSDFileHeader; m_rPSD.ReadUInt32( mpFileHeader->nSignature ).ReadUInt16( mpFileHeader->nVersion ).ReadUInt32( mpFileHeader->nPad1 ). ReadUInt16( mpFileHeader->nPad2 ).ReadUInt16( mpFileHeader->nChannels ).ReadUInt32( mpFileHeader->nRows ). ReadUInt32( mpFileHeader->nColumns ).ReadUInt16( mpFileHeader->nDepth ).ReadUInt16( mpFileHeader->nMode ); @@ -194,6 +191,7 @@ mnDestBitDepth = ( nDepth == 16 ) ? 8 : nDepth; + sal_uInt32 nColorLength(0); m_rPSD.ReadUInt32( nColorLength ); if ( mpFileHeader->nMode == PSD_CMYK ) { @@ -270,7 +268,10 @@ default: return false; } - m_rPSD.ReadUInt32( nResourceLength ); + sal_uInt32 nResourceLength(0); + m_rPSD.ReadUInt32(nResourceLength); + if (nResourceLength > m_rPSD.remainingSize()) + return false; sal_uInt32 nLayerPos = m_rPSD.Tell() + nResourceLength; // this is a loop over the resource entries to get the resolution info @@ -291,8 +292,8 @@ if ( nResEntryLen & 1 ) nResEntryLen++; // the resource entries are padded sal_uInt32 nCurrentPos = m_rPSD.Tell(); - if ( ( nResEntryLen + nCurrentPos ) > nLayerPos ) // check if size - break; // is possible + if (nResEntryLen > (nLayerPos - nCurrentPos)) // check if size + break; // is possible switch( nUniqueID ) { case 0x3ed : // UID for the resolution info @@ -307,10 +308,12 @@ m_rPSD.Seek( nCurrentPos + nResEntryLen ); // set the stream to the next } // resource entry m_rPSD.Seek( nLayerPos ); + sal_uInt32 nLayerMaskLength(0); m_rPSD.ReadUInt32( nLayerMaskLength ); m_rPSD.SeekRel( nLayerMaskLength ); - m_rPSD.ReadUInt16( nCompression ); + sal_uInt16 nCompression(0); + m_rPSD.ReadUInt16(nCompression); if ( nCompression == 0 ) { mbCompression = false; @@ -326,8 +329,6 @@ return true; } - - bool PSDReader::ImplReadBody() { sal_uLong nX, nY; diff -Nru libreoffice-5.0.2/filter/source/graphicfilter/iras/iras.cxx libreoffice-5.0.5~rc2/filter/source/graphicfilter/iras/iras.cxx --- libreoffice-5.0.2/filter/source/graphicfilter/iras/iras.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/graphicfilter/iras/iras.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -222,31 +222,43 @@ case 1 : for (y = 0; y < mnHeight && mbStatus; ++y) { - for ( x = 0; x < mnWidth; x++ ) + for (x = 0; x < mnWidth && mbStatus; ++x) { if (!(x & 7)) + { nDat = ImplGetByte(); + if (!m_rRAS.good()) + mbStatus = false; + } pAcc->SetPixelIndex( y, x, sal::static_int_cast< sal_uInt8 >( nDat >> ( ( x & 7 ) ^ 7 )) ); } - if (!( ( x - 1 ) & 0x8 ) ) ImplGetByte(); // WORD ALIGNMENT ??? - if (!m_rRAS.good()) - mbStatus = false; + if (!( ( x - 1 ) & 0x8 ) ) + { + ImplGetByte(); // WORD ALIGNMENT ??? + if (!m_rRAS.good()) + mbStatus = false; + } } break; case 8 : for (y = 0; y < mnHeight && mbStatus; ++y) { - for ( x = 0; x < mnWidth; x++ ) + for (x = 0; x < mnWidth && mbStatus; ++x) { nDat = ImplGetByte(); pAcc->SetPixelIndex( y, x, nDat ); + if (!m_rRAS.good()) + mbStatus = false; + } + if ( x & 1 ) + { + ImplGetByte(); // WORD ALIGNMENT ??? + if (!m_rRAS.good()) + mbStatus = false; } - if ( x & 1 ) ImplGetByte(); // WORD ALIGNMENT ??? - if (!m_rRAS.good()) - mbStatus = false; } break; @@ -257,7 +269,7 @@ case 24 : for (y = 0; y < mnHeight && mbStatus; ++y) { - for ( x = 0; x < mnWidth; x++ ) + for (x = 0; x < mnWidth && mbStatus; ++x) { if ( mnType == RAS_TYPE_RGB_FORMAT ) { @@ -272,17 +284,22 @@ nRed = ImplGetByte(); } pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); + if (!m_rRAS.good()) + mbStatus = false; + } + if ( x & 1 ) + { + ImplGetByte(); // WORD ALIGNMENT ??? + if (!m_rRAS.good()) + mbStatus = false; } - if ( x & 1 ) ImplGetByte(); // WORD ALIGNMENT ??? - if (!m_rRAS.good()) - mbStatus = false; } break; case 32 : for (y = 0; y < mnHeight && mbStatus; ++y) { - for ( x = 0; x < mnWidth; x++ ) + for (x = 0; x < mnWidth && mbStatus; ++x) { nDat = ImplGetByte(); // pad byte > nil if ( mnType == RAS_TYPE_RGB_FORMAT ) @@ -298,9 +315,9 @@ nRed = ImplGetByte(); } pAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) ); + if (!m_rRAS.good()) + mbStatus = false; } - if (!m_rRAS.good()) - mbStatus = false; } break; } diff -Nru libreoffice-5.0.2/filter/source/msfilter/svdfppt.cxx libreoffice-5.0.5~rc2/filter/source/msfilter/svdfppt.cxx --- libreoffice-5.0.2/filter/source/msfilter/svdfppt.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/msfilter/svdfppt.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -4934,82 +4934,179 @@ aSet.mpArry[ PPT_ParaAttr_BuHardFont ] = ( nBulFlg & 2 ) ? 1 : 0; aSet.mpArry[ PPT_ParaAttr_BuHardColor ] = ( nBulFlg & 4 ) ? 1 : 0; + // NOTE: one might think that the hard-coded numbers here are the + // same as the PPT_ParaAttr_* constants, but it's NOT always true! if ( nMask & 0x0080 ) // buChar + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_BulletChar ] ); + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_BulletChar); + } + } if ( nMask & 0x0010 ) // buTypeface + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_BulletFont ] ); + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_BulletFont); + } + } if ( nMask & 0x0040 ) // buSize { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_BulletHeight ] ); - if ( ! ( ( nMask & ( 1 << PPT_ParaAttr_BuHardHeight ) ) - && ( nBulFlg & ( 1 << PPT_ParaAttr_BuHardHeight ) ) ) ) - aSet.mnAttrSet ^= 0x40; + if (!rIn.good() + || !((nMask & (1 << PPT_ParaAttr_BuHardHeight)) + && (nBulFlg & (1 << PPT_ParaAttr_BuHardHeight)))) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_BulletHeight); + } } if ( nMask & 0x0020 ) // buColor { sal_uInt32 nVal32, nHiByte; rIn.ReadUInt32( nVal32 ); - nHiByte = nVal32 >> 24; - if ( nHiByte <= 8 ) - nVal32 = nHiByte | PPT_COLSCHEME; - aSet.mnBulletColor = nVal32; + if (!rIn.good()) + { + aSet.mnBulletColor = 0; // no flag for this? default it + } + else + { + nHiByte = nVal32 >> 24; + if ( nHiByte <= 8 ) + nVal32 = nHiByte | PPT_COLSCHEME; + aSet.mnBulletColor = nVal32; + } } if ( nMask & 0x0800 ) // pfAlignment { rIn.ReadUInt16( nDummy16 ); - aSet.mpArry[ PPT_ParaAttr_Adjust ] = nDummy16 & 3; + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_Adjust); + } + else + { + aSet.mpArry[ PPT_ParaAttr_Adjust ] = nDummy16 & 3; + } } if ( nMask & 0x1000 ) // pfLineSpacing + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_LineFeed ] ); + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_LineFeed); + } + } if ( nMask & 0x2000 ) // pfSpaceBefore + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_UpperDist ] ); + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_UpperDist); + } + } if ( nMask & 0x4000 ) // pfSpaceAfter + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_LowerDist ] ); + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_LowerDist); + } + } if ( nMask & 0x100 ) // pfLeftMargin { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_TextOfs ] ); - aSet.mnAttrSet |= 1 << PPT_ParaAttr_TextOfs; + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_TextOfs); + } + else + { + aSet.mnAttrSet |= 1 << PPT_ParaAttr_TextOfs; + } } if ( nMask & 0x400 ) // pfIndent { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_BulletOfs ] ); - aSet.mnAttrSet |= 1 << PPT_ParaAttr_BulletOfs; + if (!rIn.good()) + { + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_BulletOfs); + } + else + { + aSet.mnAttrSet |= 1 << PPT_ParaAttr_BulletOfs; + } } if ( nMask & 0x8000 ) // pfDefaultTabSize + { rIn.ReadUInt16( nDummy16 ); + if (!rIn.good()) + { + // TODO? + } + } if ( nMask & 0x100000 ) // pfTabStops { sal_uInt16 i, nDistance, nAlignment, nNumberOfTabStops = 0; rIn.ReadUInt16( nNumberOfTabStops ); - const size_t nMinRecordSize = 4; - const size_t nMaxRecords = rIn.remainingSize() / nMinRecordSize; - if (nNumberOfTabStops > nMaxRecords) - { - SAL_WARN("filter.ms", "Parsing error: " << nMaxRecords << - " max possible entries, but " << nNumberOfTabStops << " claimed, truncating"); - nNumberOfTabStops = nMaxRecords; + if (!rIn.good()) + { + // TODO? } - for ( i = 0; i < nNumberOfTabStops; i++ ) + else { - rIn.ReadUInt16( nDistance ) - .ReadUInt16( nAlignment ); + const size_t nMinRecordSize = 4; + const size_t nMaxRecords = rIn.remainingSize() / nMinRecordSize; + if (nNumberOfTabStops > nMaxRecords) + { + SAL_WARN("filter.ms", "Parsing error: " << nMaxRecords << + " max possible entries, but " << nNumberOfTabStops << " claimed, truncating"); + nNumberOfTabStops = nMaxRecords; + } + for (i = 0; i < nNumberOfTabStops; ++i) + { + rIn.ReadUInt16( nDistance ) + .ReadUInt16( nAlignment ); + } } } if ( nMask & 0x10000 ) // pfBaseLine + { rIn.ReadUInt16( nDummy16 ); + if (!rIn.good()) + { + // TODO? + } + } if ( nMask & 0xe0000 ) // pfCharWrap, pfWordWrap, pfOverflow { rIn.ReadUInt16( nDummy16 ); - if ( nMask & 0x20000 ) - aSet.mpArry[ PPT_ParaAttr_AsianLB_1 ] = nDummy16 & 1; - if ( nMask & 0x40000 ) - aSet.mpArry[ PPT_ParaAttr_AsianLB_2 ] = ( nDummy16 >> 1 ) & 1; - if ( nMask & 0x80000 ) - aSet.mpArry[ PPT_ParaAttr_AsianLB_3 ] = ( nDummy16 >> 2 ) & 1; - aSet.mnAttrSet |= ( ( nMask >> 17 ) & 7 ) << PPT_ParaAttr_AsianLB_1; + if (!rIn.good()) + { // clear flag to avoid invalid access + aSet.mnAttrSet &= ~((1 << PPT_ParaAttr_AsianLB_1) + | (1 << PPT_ParaAttr_AsianLB_2) + | (1 << PPT_ParaAttr_AsianLB_3)); + } + else + { + if (nMask & 0x20000) + aSet.mpArry[PPT_ParaAttr_AsianLB_1] = nDummy16 & 1; + if (nMask & 0x40000) + aSet.mpArry[PPT_ParaAttr_AsianLB_2] = (nDummy16 >> 1) & 1; + if (nMask & 0x80000) + aSet.mpArry[PPT_ParaAttr_AsianLB_3] = (nDummy16 >> 2) & 1; + aSet.mnAttrSet |= ((nMask >> 17) & 7) << PPT_ParaAttr_AsianLB_1; + } } if ( nMask & 0x200000 ) // pfTextDirection + { rIn.ReadUInt16( aSet.mpArry[ PPT_ParaAttr_BiDi ] ); + if (!rIn.good()) + { // clear flag to avoid invalid access + aSet.mnAttrSet &= ~(1 << PPT_ParaAttr_BiDi); + } + } } else nCharCount = nStringLen; @@ -5067,7 +5164,7 @@ sal_uInt16 nStringLen = aString.getLength(); rIn.ReadUInt16( nDummy16 ); - nCharCount = nDummy16; + nCharCount = (rIn.good()) ? nDummy16 : 0; rIn.ReadUInt16( nDummy16 ); nCharsToRead = nStringLen - ( nCharAnzRead + nCharCount ); if ( nCharsToRead < 0 ) diff -Nru libreoffice-5.0.2/filter/source/odfflatxml/OdfFlatXml.cxx libreoffice-5.0.5~rc2/filter/source/odfflatxml/OdfFlatXml.cxx --- libreoffice-5.0.2/filter/source/odfflatxml/OdfFlatXml.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/odfflatxml/OdfFlatXml.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -147,6 +147,10 @@ saxParser->setDocumentHandler(docHandler); try { + css::uno::Reference< css::io::XSeekable > xSeekable( inputStream, css::uno::UNO_QUERY ); + if ( xSeekable.is() ) + xSeekable->seek( 0 ); + saxParser->parseStream(inputSource); } catch (const Exception &exc) diff -Nru libreoffice-5.0.2/filter/source/pdf/pdfexport.cxx libreoffice-5.0.5~rc2/filter/source/pdf/pdfexport.cxx --- libreoffice-5.0.2/filter/source/pdf/pdfexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/pdf/pdfexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -115,7 +115,6 @@ mbAllowDuplicateFieldNames ( false ), mnProgressValue ( 0 ), mbRemoveTransparencies ( false ), - mbWatermark ( false ), mbHideViewerToolbar ( false ), mbHideViewerMenubar ( false ), @@ -503,10 +502,7 @@ else if ( rFilterData[ nData ].Name == "IsAddStream" ) rFilterData[ nData ].Value >>= mbAddStream; else if ( rFilterData[ nData ].Name == "Watermark" ) - { - maWatermark = rFilterData[ nData ].Value; - mbWatermark = true; - } + rFilterData[ nData ].Value >>= msWatermark; //now all the security related properties... else if ( rFilterData[ nData ].Name == "EncryptFile" ) rFilterData[ nData ].Value >>= mbEncrypt; @@ -1032,7 +1028,7 @@ rPDFExtOutDevData.ResetSyncData(); - if( mbWatermark ) + if (!msWatermark.isEmpty()) ImplWriteWatermark( rWriter, aSizePDF ); return bRet; @@ -1042,7 +1038,6 @@ void PDFExport::ImplWriteWatermark( vcl::PDFWriter& rWriter, const Size& rPageSize ) { - OUString aText( "Watermark" ); vcl::Font aFont( OUString( "Helvetica" ), Size( 0, 3*rPageSize.Height()/4 ) ); aFont.SetItalic( ITALIC_NONE ); aFont.SetWidthType( WIDTH_NORMAL ); @@ -1055,18 +1050,13 @@ aFont.SetOrientation( 2700 ); } - if( ! ( maWatermark >>= aText ) ) - { - // more complicated watermark ? - } - // adjust font height for text to fit OutputDevice* pDev = rWriter.GetReferenceDevice(); pDev->Push( PushFlags::ALL ); pDev->SetFont( aFont ); pDev->SetMapMode( MapMode( MAP_POINT ) ); int w = 0; - while( ( w = pDev->GetTextWidth( aText ) ) > nTextWidth ) + while( ( w = pDev->GetTextWidth( msWatermark ) ) > nTextWidth ) { if (w == 0) break; @@ -1108,7 +1098,7 @@ } rWriter.SetClipRegion(); rWriter.BeginTransparencyGroup(); - rWriter.DrawText( aTextPoint, aText ); + rWriter.DrawText( aTextPoint, msWatermark ); rWriter.EndTransparencyGroup( aTextRect, 50 ); rWriter.Pop(); } diff -Nru libreoffice-5.0.2/filter/source/pdf/pdfexport.hxx libreoffice-5.0.5~rc2/filter/source/pdf/pdfexport.hxx --- libreoffice-5.0.2/filter/source/pdf/pdfexport.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/pdf/pdfexport.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -66,8 +66,7 @@ sal_Int32 mnProgressValue; bool mbRemoveTransparencies; - bool mbWatermark; - uno::Any maWatermark; + OUString msWatermark; //these variable are here only to have a location in filter/pdf to set the default //to be used by the macro (when the FilterData are set by the macro itself) diff -Nru libreoffice-5.0.2/filter/source/svg/presentation_engine.js libreoffice-5.0.5~rc2/filter/source/svg/presentation_engine.js --- libreoffice-5.0.2/filter/source/svg/presentation_engine.js 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/svg/presentation_engine.js 2016-02-04 16:41:28.000000000 +0000 @@ -741,6 +741,7 @@ var aOOOAttrStartSlideNumber= 'start-slide-number'; var aOOOAttrNumberingType = 'page-numbering-type'; var aOOOAttrListItemNumberingType= 'numbering-type'; +var aOOOAttrUsePositionedChars = 'use-positioned-chars'; var aOOOAttrSlide = 'slide'; var aOOOAttrMaster = 'master'; @@ -774,6 +775,9 @@ NSS['xlink']='http://www.w3.org/1999/xlink'; NSS['xml']='http://www.w3.org/XML/1998/namespace'; NSS['ooo'] = 'http://xml.openoffice.org/svg/export'; +NSS['presentation'] = 'http://sun.com/xmlns/staroffice/presentation'; +NSS['smil'] = 'http://www.w3.org/2001/SMIL20/'; +NSS['anim'] = 'urn:oasis:names:tc:opendocument:xmlns:animation:1.0'; // Presentation modes. var SLIDE_MODE = 1; @@ -1185,6 +1189,8 @@ this.nStartSlideNumber = parseInt( aMetaDocElem.getAttributeNS( NSS['ooo'], aOOOAttrStartSlideNumber ) ) || 0; // - the numbering type used in the presentation, default type is arabic. this.sPageNumberingType = aMetaDocElem.getAttributeNS( NSS['ooo'], aOOOAttrNumberingType ) || 'arabic'; + // - the way text is exported + this.bIsUsePositionedChars = ( aMetaDocElem.getAttributeNS( NSS['ooo'], aOOOAttrUsePositionedChars ) === 'true' ); // The element used for wrapping . this.aClipPathGroup = getElementByClassName( ROOT_NODE, aClipPathGroupClassName ); @@ -1434,7 +1440,7 @@ // created by an other slide that target the same master page. if( !this.theMetaDoc.aMasterPageSet.hasOwnProperty( sMasterPageId ) ) { - this.theMetaDoc.aMasterPageSet[ sMasterPageId ] = new MasterPage( sMasterPageId ); + this.theMetaDoc.aMasterPageSet[ sMasterPageId ] = new MasterPage( sMasterPageId, this ); // We initialize aTextFieldHandlerSet[ sMasterPageId ] to an empty // collection. @@ -1623,9 +1629,10 @@ * A string representing the value of the id attribute of the master page * element to be handled. */ -function MasterPage( sMasterPageId ) +function MasterPage( sMasterPageId, aMetaSlide ) { this.id = sMasterPageId; + this.metaSlide = aMetaSlide; // The master page element to be handled. this.element = document.getElementById( this.id ); @@ -1771,12 +1778,10 @@ // We exploit such a feature and the exported text adjust attribute // value in order to set up correctly the position and text // adjustment for the placeholder element. - var aSVGRectElemSet = aTextFieldElement.getElementsByTagName( 'rect' ); - // As far as text field element exporting is implemented it should - // be only one element! - if( aSVGRectElemSet.length === 1) + var aSVGRectElem = getElementByClassName( aTextFieldElement, 'BoundingBox' ); + if( aSVGRectElem ) { - var aRect = new Rectangle( aSVGRectElemSet[0] ); + var aRect = new Rectangle( aSVGRectElem ); var sTextAdjust = getOOOAttribute( aTextFieldElement, aOOOAttrTextAdjust ) || 'left'; var sTextAnchor, sX; if( sTextAdjust == 'left' ) @@ -1801,26 +1806,29 @@ aPlaceholderElement.setAttribute( 'x', sX ); } - this.element = aTextFieldElement; - this.textElement = aPlaceholderElement; - - // We remove all text lines but the first one used as placeholder. - var aTextLineGroupElem = this.textElement.parentNode.parentNode; - if( aTextLineGroupElem ) - { - // Just to be sure it is the element we are looking for. - var sFontFamilyAttr = aTextLineGroupElem.getAttribute( 'font-family' ); - if( sFontFamilyAttr ) + // date/time fields were not exported correctly when positioned chars are used + if( this.masterPage.metaSlide.theMetaDoc.bIsUsePositionedChars ) + { + // We remove all text lines but the first one used as placeholder. + var aTextLineGroupElem = aPlaceholderElement.parentNode.parentNode; + if( aTextLineGroupElem ) { - var aChildSet = getElementChildren( aTextLineGroupElem ); - if( aChildSet.length > 1 ) - var i = 1; - for( ; i < aChildSet.length; ++i ) + // Just to be sure it is the element we are looking for. + var sFontFamilyAttr = aTextLineGroupElem.getAttribute( 'font-family' ); + if( sFontFamilyAttr ) { - aTextLineGroupElem.removeChild( aChildSet[i] ); + var aChildSet = getElementChildren( aTextLineGroupElem ); + if( aChildSet.length > 1 ) + var i = 1; + for( ; i < aChildSet.length; ++i ) + { + aTextLineGroupElem.removeChild( aChildSet[i] ); + } } } } + this.element = aTextFieldElement; + this.textElement = aPlaceholderElement; } } }; @@ -3768,16 +3776,27 @@ { this.aSequence = new Array(); this.aCompareFunc = aCompareFunc; - this.bSorted = true; } -PriorityQueue.prototype.top = function() +PriorityQueue.prototype.clone = function() { - if( !this.bSorted ) + var aCopy = new PriorityQueue( this.aCompareFunc ); + var src = this.aSequence; + var dest = []; + var i, l; + for( i = 0, l = src.length; i < l; ++i ) { - this.aSequence.sort(this.aCompareFunc) - this.bSorted = true; + if( i in src ) + { + dest.push( src[i] ); + } } + aCopy.aSequence = dest; + return aCopy; +}; + +PriorityQueue.prototype.top = function() +{ return this.aSequence[this.aSequence.length - 1]; }; @@ -3788,28 +3807,23 @@ PriorityQueue.prototype.push = function( aValue ) { - this.bSorted = false; - this.aSequence.push( aValue ); + this.aSequence.unshift( aValue ); + this.aSequence.sort(this.aCompareFunc); }; PriorityQueue.prototype.clear = function() { - this.bSorted = true; this.aSequence = new Array(); }; PriorityQueue.prototype.pop = function() { - if( !this.bSorted ) - { - this.aSequence.sort(this.aCompareFunc) - this.bSorted = true; - } - return this.aSequence.pop(); }; + + /********************************************************************************************** * AnimationNode Class Hierarchy **********************************************************************************************/ @@ -5089,13 +5103,13 @@ // begin attribute this.aBegin = null; - var sBeginAttr = aAnimElem.getAttribute( 'begin' ); + var sBeginAttr = aAnimElem.getAttributeNS( NSS['smil'], 'begin' ); this.aBegin = new Timing( this, sBeginAttr ); this.aBegin.parse(); // end attribute this.aEnd = null; - var sEndAttr = aAnimElem.getAttribute( 'end' ); + var sEndAttr = aAnimElem.getAttributeNS( NSS['smil'], 'end' ); if( sEndAttr ) { this.aEnd = new Timing( this, sEndAttr ); @@ -5104,7 +5118,7 @@ // dur attribute this.aDuration = null; - var sDurAttr = aAnimElem.getAttribute( 'dur' ); + var sDurAttr = aAnimElem.getAttributeNS( NSS['smil'], 'dur' ); this.aDuration = new Duration( sDurAttr ); if( !this.aDuration.isSet() ) { @@ -5115,21 +5129,21 @@ } // fill attribute - var sFillAttr = aAnimElem.getAttribute( 'fill' ); + var sFillAttr = aAnimElem.getAttributeNS( NSS['smil'], 'fill' ); if( sFillAttr && aFillModeInMap[ sFillAttr ]) this.eFillMode = aFillModeInMap[ sFillAttr ]; else this.eFillMode = FILL_MODE_DEFAULT; // restart attribute - var sRestartAttr = aAnimElem.getAttribute( 'restart' ); + var sRestartAttr = aAnimElem.getAttributeNS( NSS['smil'], 'restart' ); if( sRestartAttr && aRestartModeInMap[ sRestartAttr ] ) this.eRestartMode = aRestartModeInMap[ sRestartAttr ]; else this.eRestartMode = RESTART_MODE_DEFAULT; // repeatCount attribute - var sRepeatCount = aAnimElem.getAttribute( 'repeatCount' ); + var sRepeatCount = aAnimElem.getAttributeNS( NSS['smil'], 'repeatCount' ); if( !sRepeatCount ) this.nReapeatCount = 1; else @@ -5139,7 +5153,7 @@ // accelerate attribute this.nAccelerate = 0.0; - var sAccelerateAttr = aAnimElem.getAttribute( 'accelerate' ); + var sAccelerateAttr = aAnimElem.getAttributeNS( NSS['smil'], 'accelerate' ); if( sAccelerateAttr ) this.nAccelerate = parseFloat( sAccelerateAttr ); if( this.nAccelerate == NaN ) @@ -5147,7 +5161,7 @@ // decelerate attribute this.nDecelerate = 0.0; - var sDecelerateAttr = aAnimElem.getAttribute( 'decelerate' ); + var sDecelerateAttr = aAnimElem.getAttributeNS( NSS['smil'], 'decelerate' ); if( sDecelerateAttr ) this.nDecelerate = parseFloat( sDecelerateAttr ); if( this.nDecelerate == NaN ) @@ -5155,7 +5169,7 @@ // autoReverse attribute this.bAutoreverse = false; - var sAutoReverseAttr = aAnimElem.getAttribute( 'autoReverse' ); + var sAutoReverseAttr = aAnimElem.getAttributeNS( NSS['smil'], 'autoReverse' ); if( sAutoReverseAttr == 'true' ) this.bAutoreverse = true; @@ -5613,7 +5627,7 @@ // targetElement attribute this.aTargetElement = null; - var sTargetElementAttr = aAnimElem.getAttribute( 'targetElement' ); + var sTargetElementAttr = aAnimElem.getAttributeNS( NSS['smil'], 'targetElement' ); if( sTargetElementAttr ) this.aTargetElement = document.getElementById( sTargetElementAttr ); @@ -5624,11 +5638,11 @@ } // sub-item attribute for text animated element - var sSubItemAttr = aAnimElem.getAttribute( 'sub-item' ); + var sSubItemAttr = aAnimElem.getAttributeNS( NSS['anim'], 'sub-item' ); this.bIsTargetTextElement = ( sSubItemAttr && ( sSubItemAttr === 'text' ) ); // additive attribute - var sAdditiveAttr = aAnimElem.getAttribute( 'additive' ); + var sAdditiveAttr = aAnimElem.getAttributeNS( NSS['smil'], 'additive' ); if( sAdditiveAttr && aAddittiveModeInMap[sAdditiveAttr] ) this.eAdditiveMode = aAddittiveModeInMap[sAdditiveAttr]; else @@ -5647,9 +5661,9 @@ if( this.aTargetElement ) { // set up target element initial visibility - if( aAnimElem.getAttribute( 'attributeName' ) === 'visibility' ) + if( aAnimElem.getAttributeNS( NSS['smil'], 'attributeName' ) === 'visibility' ) { - if( aAnimElem.getAttribute( 'to' ) === 'visible' ) + if( aAnimElem.getAttributeNS( NSS['smil'], 'to' ) === 'visible' ) this.aTargetElement.setAttribute( 'visibility', 'hidden' ); } @@ -5855,7 +5869,7 @@ var aAnimElem = this.aElement; // attributeName attribute - this.sAttributeName = aAnimElem.getAttribute( 'attributeName' ); + this.sAttributeName = aAnimElem.getAttributeNS( NSS['smil'], 'attributeName' ); if( !this.sAttributeName ) { this.eCurrentState = INVALID_NODE; @@ -5863,7 +5877,7 @@ } // to attribute - this.aToValue = aAnimElem.getAttribute( 'to' ); + this.aToValue = aAnimElem.getAttributeNS( NSS['smil'], 'to' ); return bRet; }; @@ -5921,25 +5935,25 @@ // accumulate attribute this.eAccumulate = ACCUMULATE_MODE_NONE; - var sAccumulateAttr = aAnimElem.getAttribute( 'accumulate' ); + var sAccumulateAttr = aAnimElem.getAttributeNS( NSS['smil'], 'accumulate' ); if( sAccumulateAttr == 'sum' ) this.eAccumulate = ACCUMULATE_MODE_SUM; // calcMode attribute this.eCalcMode = CALC_MODE_LINEAR; - var sCalcModeAttr = aAnimElem.getAttribute( 'calcMode' ); + var sCalcModeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'calcMode' ); if( sCalcModeAttr && aCalcModeInMap[ sCalcModeAttr ] ) this.eCalcMode = aCalcModeInMap[ sCalcModeAttr ]; // from attribute - this.aFromValue = aAnimElem.getAttribute( 'from' ); + this.aFromValue = aAnimElem.getAttributeNS( NSS['smil'], 'from' ); // by attribute - this.aByValue = aAnimElem.getAttribute( 'by' ); + this.aByValue = aAnimElem.getAttributeNS( NSS['smil'], 'by' ); // keyTimes attribute this.aKeyTimes = new Array(); - var sKeyTimesAttr = aAnimElem.getAttribute( 'keyTimes' ); + var sKeyTimesAttr = aAnimElem.getAttributeNS( NSS['smil'], 'keyTimes' ); sKeyTimesAttr = removeWhiteSpaces( sKeyTimesAttr ); if( sKeyTimesAttr ) { @@ -5949,7 +5963,7 @@ } // values attribute - var sValuesAttr = aAnimElem.getAttribute( 'values' ); + var sValuesAttr = aAnimElem.getAttributeNS( NSS['smil'], 'values' ); if( sValuesAttr ) { this.aValues = sValuesAttr.split( ';' ); @@ -6054,7 +6068,7 @@ // node-type attribute this.eImpressNodeType = IMPRESS_DEFAULT_NODE; - var sNodeTypeAttr = aAnimElem.getAttribute( 'node-type' ); + var sNodeTypeAttr = aAnimElem.getAttributeNS( NSS['presentation'], 'node-type' ); if( sNodeTypeAttr && aImpressNodeTypeInMap[ sNodeTypeAttr ] ) this.eImpressNodeType = aImpressNodeTypeInMap[ sNodeTypeAttr ]; this.bMainSequenceRootNode = ( this.eImpressNodeType == IMPRESS_MAIN_SEQUENCE_NODE ); @@ -6062,13 +6076,13 @@ // preset-class attribute this.ePresetClass = undefined; - var sPresetClassAttr = aAnimElem.getAttribute( 'preset-class' ); + var sPresetClassAttr = aAnimElem.getAttributeNS( NSS['presentation'], 'preset-class' ); if( sPresetClassAttr && aPresetClassInMap[ sPresetClassAttr ] ) this.ePresetClass = aPresetClassInMap[ sPresetClassAttr ]; // preset-id attribute this.ePresetId = undefined; - var sPresetIdAttr = aAnimElem.getAttribute( 'preset-id' ); + var sPresetIdAttr = aAnimElem.getAttributeNS( NSS['presentation'], 'preset-id' ); if( sPresetIdAttr && aPresetIdInMap[ sPresetIdAttr ] ) this.ePresetId = aPresetIdInMap[ sPresetIdAttr ]; @@ -6770,13 +6784,13 @@ // color-interpolation attribute this.eColorInterpolation = COLOR_SPACE_RGB; - var sColorInterpolationAttr = aAnimElem.getAttribute( 'color-interpolation' ); + var sColorInterpolationAttr = aAnimElem.getAttributeNS( NSS['anim'], 'color-interpolation' ); if( sColorInterpolationAttr && aColorSpaceInMap[ sColorInterpolationAttr ] ) this.eColorInterpolation = aColorSpaceInMap[ sColorInterpolationAttr ]; // color-interpolation-direction attribute this.eColorInterpolationDirection = CLOCKWISE; - var sColorInterpolationDirectionAttr = aAnimElem.getAttribute( 'color-interpolation-direction' ); + var sColorInterpolationDirectionAttr = aAnimElem.getAttributeNS( NSS['anim'], 'color-interpolation-direction' ); if( sColorInterpolationDirectionAttr && aClockDirectionInMap[ sColorInterpolationDirectionAttr ] ) this.eColorInterpolationDirection = aClockDirectionInMap[ sColorInterpolationDirectionAttr ]; @@ -6939,7 +6953,7 @@ // type attribute this.eTransitionType = undefined; - var sTypeAttr = aAnimElem.getAttribute( 'type' ); + var sTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'type' ); if( sTypeAttr && aTransitionTypeInMap[ sTypeAttr ] ) { this.eTransitionType = aTransitionTypeInMap[ sTypeAttr ]; @@ -6952,7 +6966,7 @@ // subtype attribute this.eTransitionSubType = undefined; - var sSubTypeAttr = aAnimElem.getAttribute( 'subtype' ); + var sSubTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'subtype' ); if( sSubTypeAttr && aTransitionSubtypeInMap[ sSubTypeAttr ] ) { this.eTransitionSubType = aTransitionSubtypeInMap[ sSubTypeAttr ]; @@ -6965,13 +6979,13 @@ // direction attribute this.bReverseDirection = false; - var sDirectionAttr = aAnimElem.getAttribute( 'direction' ); + var sDirectionAttr = aAnimElem.getAttributeNS( NSS['smil'], 'direction' ); if( sDirectionAttr == 'reverse' ) this.bReverseDirection = true; // mode attribute: this.eTransitionMode = TRANSITION_MODE_IN; - var sModeAttr = aAnimElem.getAttribute( 'mode' ); + var sModeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'mode' ); if( sModeAttr === 'out' ) this.eTransitionMode = TRANSITION_MODE_OUT; @@ -9171,7 +9185,7 @@ var aBulletCharGroupElem = getElementByClassName( aTextShapeGroup, 'BulletChars' ); if( aBulletCharGroupElem ) { - var aBulletPlaceholderElem = getElementByClassName( aElement.firstElementChild, 'BulletPlaceholder' ); + var aBulletPlaceholderElem = getElementByClassName( aElement, 'BulletPlaceholder' ); if( aBulletPlaceholderElem ) { var sId = aBulletPlaceholderElem.getAttribute( 'id' ); @@ -9431,7 +9445,7 @@ if( aAnimationsRootElement ) { if( aAnimationsRootElement.firstElementChild && - ( aAnimationsRootElement.firstElementChild.getAttribute( 'begin' ) === (this.sSlideId + '.begin') ) ) + ( aAnimationsRootElement.firstElementChild.getAttributeNS( NSS['smil'], 'begin' ) === (this.sSlideId + '.begin') ) ) { var aTransitionFilterElement = aAnimationsRootElement.firstElementChild.firstElementChild; if( aTransitionFilterElement && ( aTransitionFilterElement.localName === 'transitionFilter' ) ) @@ -9569,7 +9583,7 @@ // type attribute this.eTransitionType = undefined; - var sTypeAttr = aAnimElem.getAttribute( 'type' ); + var sTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'type' ); if( sTypeAttr && aTransitionTypeInMap[ sTypeAttr ] ) { this.eTransitionType = aTransitionTypeInMap[ sTypeAttr ]; @@ -9581,7 +9595,7 @@ // subtype attribute this.eTransitionSubType = undefined; - var sSubTypeAttr = aAnimElem.getAttribute( 'subtype' ); + var sSubTypeAttr = aAnimElem.getAttributeNS( NSS['smil'], 'subtype' ); if( sSubTypeAttr && aTransitionSubtypeInMap[ sSubTypeAttr ] ) { this.eTransitionSubType = aTransitionSubtypeInMap[ sSubTypeAttr ]; @@ -9594,7 +9608,7 @@ // direction attribute this.bReverseDirection = false; - var sDirectionAttr = aAnimElem.getAttribute( 'direction' ); + var sDirectionAttr = aAnimElem.getAttributeNS( NSS['smil'], 'direction' ); if( sDirectionAttr == 'reverse' ) this.bReverseDirection = true; @@ -9605,7 +9619,7 @@ this.eTransitionSubType == FADEOVERCOLOR_TRANS_SUBTYPE || this.eTransitionSubType == FADETOCOLOR_TRANS_SUBTYPE ) ) { - var sColorAttr = aAnimElem.getAttribute( 'fadeColor' ); + var sColorAttr = aAnimElem.getAttributeNS( NSS['smil'], 'fadeColor' ); if( sColorAttr ) this.sFadeColor = sColorAttr; else @@ -9615,7 +9629,7 @@ // dur attribute this.aDuration = null; - var sDurAttr = aAnimElem.getAttribute( 'dur' ); + var sDurAttr = aAnimElem.getAttributeNS( NSS['smil'], 'dur' ); this.aDuration = new Duration( sDurAttr ); if( !this.aDuration.isSet() ) { @@ -10326,17 +10340,30 @@ * An instance of type PriorityEntry. * @param aRhsEntry * An instance of type PriorityEntry. - * @return {Boolean} - * True if the first entry has higher priority of the second entry, - * false otherwise. + * @return {Integer} + * -1 if the left entry has lower priority of the right entry, + * 1 if the left entry has higher priority of the right entry, + * 0 if the two entry have the same priority */ PriorityEntry.compare = function( aLhsEntry, aRhsEntry ) { - return ( aLhsEntry.nPriority < aRhsEntry.nPriority ); + if ( aLhsEntry.nPriority < aRhsEntry.nPriority ) + { + return -1; + } + else if (aLhsEntry.nPriority > aRhsEntry.nPriority) + { + return 1; + } + else + { + return 0; + } }; + function EventMultiplexer( aTimerEventQueue ) { this.nId = EventMultiplexer.getUniqueId(); @@ -12880,7 +12907,18 @@ EventEntry.compare = function( aLhsEventEntry, aRhsEventEntry ) { - return ( aLhsEventEntry.nActivationTime > aRhsEventEntry.nActivationTime ); + if ( aLhsEventEntry.nActivationTime > aRhsEventEntry.nActivationTime ) + { + return -1; + } + else if ( aLhsEventEntry.nActivationTime < aRhsEventEntry.nActivationTime ) + { + return 1; + } + else + { + return 0; + } }; diff -Nru libreoffice-5.0.2/filter/source/svg/svgexport.cxx libreoffice-5.0.5~rc2/filter/source/svg/svgexport.cxx --- libreoffice-5.0.2/filter/source/svg/svgexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/filter/source/svg/svgexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -43,6 +43,9 @@ #include #include #include +#include +#include +#include #include #include @@ -51,7 +54,7 @@ using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::geometry; using namespace ::com::sun::star; - +using namespace ::xmloff::token; // - ooo elements and attributes - @@ -67,6 +70,7 @@ static const char aOOOAttrNumberOfSlides[] = NSPREFIX "number-of-slides"; static const char aOOOAttrStartSlideNumber[] = NSPREFIX "start-slide-number"; static const char aOOOAttrNumberingType[] = NSPREFIX "page-numbering-type"; +static const char aOOOAttrUsePositionedChars[] = NSPREFIX "use-positioned-chars"; // ooo xml attributes for meta_slide static const char aOOOAttrSlide[] = NSPREFIX "slide"; @@ -353,9 +357,24 @@ // Tiny Opacity (supported from SVG Tiny 1.2) mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, true); - // Positioned Characters (Seems to be experimental, as it was always initialized with false) + // Positioned Characters (The old method) mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, false); + // add namespaces + _GetNamespaceMap().Add( + GetXMLToken(XML_NP_PRESENTATION), + GetXMLToken(XML_N_PRESENTATION), + XML_NAMESPACE_PRESENTATION); + + _GetNamespaceMap().Add( + GetXMLToken(XML_NP_SMIL), + GetXMLToken(XML_N_SMIL_COMPAT), + XML_NAMESPACE_SMIL); + + _GetNamespaceMap().Add( + GetXMLToken(XML_NP_ANIMATION), + GetXMLToken(XML_N_ANIMATION), + XML_NAMESPACE_ANIMATION); } @@ -366,7 +385,6 @@ } - // - ObjectRepresentation - @@ -805,6 +823,9 @@ mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns", constSvgNamespace ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:ooo", "http://xml.openoffice.org/svg/export" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:xlink", "http://www.w3.org/1999/xlink" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:presentation", "http://sun.com/xmlns/staroffice/presentation" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:smil", "http://www.w3.org/2001/SMIL20/" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xmlns:anim", "urn:oasis:names:tc:opendocument:xmlns:animation:1.0" ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xml:space", "preserve" ); mpSVGDoc = new SvXMLElementExport( *mpSVGExport, XML_NAMESPACE_NONE, "svg", true, true ); @@ -935,6 +956,11 @@ mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrNumberOfSlides, OUString::number( nCount ) ); mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrStartSlideNumber, OUString::number( mnVisiblePage ) ); + if( mpSVGExport->IsUsePositionedCharacters() ) + { + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, aOOOAttrUsePositionedChars, "true" ); + } + /* * Add a (global) Page Numbering Type attribute for the document */ @@ -1810,6 +1836,19 @@ } SvXMLElementExport aExp2( *mpSVGExport, XML_NAMESPACE_NONE, "g", true, true ); + + // export the shape bounding box + { + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "class", "BoundingBox" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "stroke", "none" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "fill", "none" ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "x", OUString::number( aBoundRect.X ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "y", OUString::number( aBoundRect.Y ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "width", OUString::number( aBoundRect.Width ) ); + mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "height", OUString::number( aBoundRect.Height ) ); + SvXMLElementExport aBB( *mpSVGExport, XML_NAMESPACE_NONE, "rect", true, true ); + } + if( !aBookmark.isEmpty() ) { mpSVGExport->AddAttribute( XML_NAMESPACE_NONE, "xlink:href", aBookmark); diff -Nru libreoffice-5.0.2/formula/source/core/api/FormulaCompiler.cxx libreoffice-5.0.5~rc2/formula/source/core/api/FormulaCompiler.cxx --- libreoffice-5.0.2/formula/source/core/api/FormulaCompiler.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/formula/source/core/api/FormulaCompiler.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -532,6 +532,7 @@ FormulaCompiler::FormulaCompiler( FormulaTokenArray& rArr ) : + nCurrentFactorParam(0), pArr( &rArr ), pCode( NULL ), pStack( NULL ), @@ -550,6 +551,7 @@ FormulaCompiler::FormulaCompiler() : + nCurrentFactorParam(0), pArr( NULL ), pCode( NULL ), pStack( NULL ), @@ -1169,6 +1171,7 @@ { // range list (A1;A2) converted to (A1~A2) pFacToken = mpToken; NextToken(); + CheckSetForceArrayParameter( mpToken, 0); eOp = Expression(); // Do not ignore error here, regardless of bIgnoreErrors, otherwise // errors like =(1;) would also result in display of =(1~) @@ -1254,6 +1257,7 @@ if (eOp == ocOpen) { NextToken(); + CheckSetForceArrayParameter( mpToken, 0); eOp = Expression(); } else @@ -1285,7 +1289,10 @@ if (eOp == ocClose) bNoParam = true; else + { + CheckSetForceArrayParameter( mpToken, 0); eOp = Expression(); + } } else if (eMyLastOp == ocBad) { @@ -1302,8 +1309,9 @@ nSepCount++; while ((eOp == ocSep) && (!pArr->GetCodeError() || !mbStopOnError)) { - nSepCount++; NextToken(); + CheckSetForceArrayParameter( mpToken, nSepCount); + nSepCount++; eOp = Expression(); } } @@ -1343,6 +1351,7 @@ if (eOp == ocOpen) { NextToken(); + CheckSetForceArrayParameter( mpToken, 0); eOp = Expression(); } else @@ -1377,6 +1386,7 @@ if ( ++nJumpCount <= nJumpMax ) pFacToken->GetJump()[nJumpCount] = pc-1; NextToken(); + CheckSetForceArrayParameter( mpToken, nJumpCount - 1); eOp = Expression(); // ocSep or ocClose terminate the subexpression PutCode( mpToken ); @@ -2138,7 +2148,7 @@ } if (pArr->GetCodeError() && mbJumpCommandReorder) return; - ForceArrayOperator( p, pCurrentFactorToken); + ForceArrayOperator( p); p->IncRef(); *pCode++ = p.get(); pc++; @@ -2194,6 +2204,40 @@ { } +bool FormulaCompiler::IsForceArrayParameter( const FormulaToken* /*pToken*/, sal_uInt16 /*nParam*/ ) const +{ + return false; +} + +void FormulaCompiler::ForceArrayOperator( FormulaTokenRef& rCurr ) +{ + if (!pCurrentFactorToken || (pCurrentFactorToken.get() == rCurr.get())) + return; + + if (!(rCurr->GetOpCode() != ocPush && (rCurr->GetType() == svByte || rCurr->GetType() == svJump))) + return; + + if (pCurrentFactorToken->HasForceArray()) + { + rCurr->SetForceArray( true); + return; + } + + if (nCurrentFactorParam && IsForceArrayParameter( pCurrentFactorToken.get(), + static_cast(nCurrentFactorParam - 1))) + rCurr->SetForceArray( true); +} + +void FormulaCompiler::CheckSetForceArrayParameter( FormulaTokenRef& rCurr, sal_uInt8 nParam ) +{ + if (!pCurrentFactorToken) + return; + + nCurrentFactorParam = nParam + 1; + + ForceArrayOperator( rCurr); +} + void FormulaCompiler::PushTokenArray( FormulaTokenArray* pa, bool bTemp ) { if ( bAutoCorrect && !pStack ) diff -Nru libreoffice-5.0.2/formula/source/core/api/token.cxx libreoffice-5.0.5~rc2/formula/source/core/api/token.cxx --- libreoffice-5.0.2/formula/source/core/api/token.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/formula/source/core/api/token.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -204,6 +204,11 @@ return svl::SharedString(); // invalid string } +void FormulaToken::SetString( const svl::SharedString& ) +{ + SAL_WARN( "formula.core", "FormulaToken::SetString: virtual dummy called" ); +} + sal_uInt16 FormulaToken::GetIndex() const { SAL_WARN( "formula.core", "FormulaToken::GetIndex: virtual dummy called" ); @@ -1523,6 +1528,21 @@ return AddToken( *pRet ); } +void FormulaTokenArray::ReinternStrings( svl::SharedStringPool& rPool ) +{ + for (sal_uInt16 i=0; i < nLen; ++i) + { + switch (pCode[i]->GetType()) + { + case svString: + pCode[i]->SetString( rPool.intern( pCode[i]->GetString().getString())); + break; + default: + ; // nothing + } + } +} + /*----------------------------------------------------------------------*/ @@ -1653,6 +1673,11 @@ return maString; } +void FormulaStringToken::SetString( const svl::SharedString& rStr ) +{ + maString = rStr; +} + bool FormulaStringToken::operator==( const FormulaToken& r ) const { return FormulaToken::operator==( r ) && maString == r.GetString(); @@ -1674,6 +1699,11 @@ return maString; } +void FormulaStringOpToken::SetString( const svl::SharedString& rStr ) +{ + maString = rStr; +} + bool FormulaStringOpToken::operator==( const FormulaToken& r ) const { return FormulaByteToken::operator==( r ) && maString == r.GetString(); diff -Nru libreoffice-5.0.2/formula/source/core/resource/core_resource.src libreoffice-5.0.5~rc2/formula/source/core/resource/core_resource.src --- libreoffice-5.0.2/formula/source/core/resource/core_resource.src 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/formula/source/core/resource/core_resource.src 2016-02-04 16:41:28.000000000 +0000 @@ -378,7 +378,7 @@ String SC_OPCODE_T_INV_2T { Text = "COM.MICROSOFT.T.INV.2T" ; }; String SC_OPCODE_T_INV_MS { Text = "COM.MICROSOFT.T.INV" ; }; String SC_OPCODE_F_INV { Text = "LEGACY.FINV" ; }; - String SC_OPCODE_F_INV_LT { Text = "COM.MICROSOFT.F.INV" ; }; + String SC_OPCODE_F_INV_LT { Text = "FINV" ; }; String SC_OPCODE_F_INV_RT { Text = "COM.MICROSOFT.F.INV.RT" ; }; String SC_OPCODE_CHI_TEST { Text = "LEGACY.CHITEST" ; }; String SC_OPCODE_CHI_TEST_MS { Text = "COM.MICROSOFT.CHISQ.TEST" ; }; diff -Nru libreoffice-5.0.2/formula/source/ui/dlg/funcutl.cxx libreoffice-5.0.5~rc2/formula/source/ui/dlg/funcutl.cxx --- libreoffice-5.0.2/formula/source/ui/dlg/funcutl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/formula/source/ui/dlg/funcutl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -519,8 +519,14 @@ } else { +#if 0 + // Setting background color has no effect here so we'd end up with + // white on white! SetControlForeground(COL_WHITE); SetControlBackground(0xff6563); +#else + SetControlForeground( ::Color( RGB_COLORDATA( 0xf0, 0, 0))); +#endif } } diff -Nru libreoffice-5.0.2/formula/source/ui/dlg/parawin.cxx libreoffice-5.0.5~rc2/formula/source/ui/dlg/parawin.cxx --- libreoffice-5.0.2/formula/source/ui/dlg/parawin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/formula/source/ui/dlg/parawin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -118,7 +118,7 @@ if ( nArgs < VAR_ARGS ) { - sal_uInt16 nRealArg = (aVisibleArgMapping.size() < nArg) ? aVisibleArgMapping[nArg] : nArg; + sal_uInt16 nRealArg = (nArg < aVisibleArgMapping.size()) ? aVisibleArgMapping[nArg] : nArg; aArgDesc = pFuncDesc->getParameterDescription(nRealArg); aArgName = pFuncDesc->getParameterName(nRealArg); aArgName += " "; diff -Nru libreoffice-5.0.2/fpicker/source/office/iodlg.cxx libreoffice-5.0.5~rc2/fpicker/source/office/iodlg.cxx --- libreoffice-5.0.2/fpicker/source/office/iodlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/fpicker/source/office/iodlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -347,16 +347,31 @@ class CustomContainer : public vcl::Window { + enum FocusState + { + Prev = 0, + Places, + Add, + Delete, + FileView, + Next, + FocusCount + }; + SvtExpFileDlg_Impl* _pImp; VclPtr _pFileView; VclPtr _pSplitter; + int m_nCurrentFocus; + VclPtr m_pFocusWidgets[FocusState::FocusCount]; + public: CustomContainer(vcl::Window *pParent) : Window(pParent) , _pImp(NULL) , _pFileView(NULL) , _pSplitter(NULL) + , m_nCurrentFocus(FocusState::Prev) { } virtual ~CustomContainer() { disposeOnce(); } @@ -369,11 +384,20 @@ void init(SvtExpFileDlg_Impl* pImp, SvtFileView* pFileView, - Splitter* pSplitter) + Splitter* pSplitter, + vcl::Window* pPrev, + vcl::Window* pNext) { _pImp = pImp; _pFileView = pFileView; _pSplitter = pSplitter; + + m_pFocusWidgets[FocusState::Prev] = pPrev; + m_pFocusWidgets[FocusState::Places] = _pImp->_pPlaces->GetPlacesListBox(); + m_pFocusWidgets[FocusState::Add] = _pImp->_pPlaces->GetAddButton(); + m_pFocusWidgets[FocusState::Delete] = _pImp->_pPlaces->GetDeleteButton(); + m_pFocusWidgets[FocusState::FileView] = pFileView; + m_pFocusWidgets[FocusState::Next] = pNext; } virtual void Resize() SAL_OVERRIDE @@ -403,9 +427,78 @@ _pImp->_pPlaces->SetSizePixel( placesNewSize ); } + void changeFocus( bool bReverse ) + { + if( !_pFileView || !_pImp || !_pImp->_pPlaces ) + return; + + if( bReverse && m_nCurrentFocus > FocusState::Prev && m_nCurrentFocus <= FocusState::Next ) + { + m_pFocusWidgets[m_nCurrentFocus]->SetFakeFocus(false); + m_pFocusWidgets[m_nCurrentFocus]->LoseFocus(); + + m_pFocusWidgets[--m_nCurrentFocus]->SetFakeFocus( true ); + m_pFocusWidgets[m_nCurrentFocus]->GrabFocus(); + } + else if( !bReverse && m_nCurrentFocus >= FocusState::Prev && m_nCurrentFocus < FocusState::Next ) + { + m_pFocusWidgets[m_nCurrentFocus]->SetFakeFocus(false); + m_pFocusWidgets[m_nCurrentFocus]->LoseFocus(); + + m_pFocusWidgets[++m_nCurrentFocus]->SetFakeFocus( true ); + m_pFocusWidgets[m_nCurrentFocus]->GrabFocus(); + } + } + virtual void GetFocus() SAL_OVERRIDE { - _pFileView->GrabFocus(); + if( !_pFileView || !_pImp || !_pImp->_pPlaces ) + return; + + sal_uInt16 aFlags = GetGetFocusFlags(); + + if( aFlags & GETFOCUS_FORWARD ) + m_nCurrentFocus = FocusState::Places; + else if( aFlags & GETFOCUS_BACKWARD ) + m_nCurrentFocus = FocusState::FileView; + + if( m_nCurrentFocus >= FocusState::Prev && m_nCurrentFocus <= FocusState::Next ) + { + m_pFocusWidgets[m_nCurrentFocus]->SetFakeFocus( true ); + m_pFocusWidgets[m_nCurrentFocus]->GrabFocus(); + } + } + + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE + { + if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) + { + // we must also update counter when user change focus using mouse + for(int i = FocusState::Prev; i <= FocusState::Next; i++) + { + if( rNEvt.GetWindow() == m_pFocusWidgets[i] ) + { + m_nCurrentFocus = i; + return true; + } + } + + // GETFOCUS for one of FileView's subcontrols + m_nCurrentFocus = FocusState::FileView; + return true; + } + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) + { + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode(); + bool bShift = rCode.IsShift(); + if( rCode.GetCode() == KEY_TAB ) + { + changeFocus( bShift ); + return true; + } + } + return Window::Notify( rNEvt ); } }; @@ -668,7 +761,7 @@ OUString( "/org.openoffice.Office.UI/FilePicker" ) ); - _pContainer->init(_pImp, _pFileView, _pSplitter); + _pContainer->init(_pImp, _pFileView, _pSplitter, _pImp->_pBtnNewFolder, _pImp->_pEdFileName); _pContainer->Show(); Resize(); diff -Nru libreoffice-5.0.2/fpicker/source/office/PlacesListBox.cxx libreoffice-5.0.5~rc2/fpicker/source/office/PlacesListBox.cxx --- libreoffice-5.0.2/fpicker/source/office/PlacesListBox.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/fpicker/source/office/PlacesListBox.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -167,6 +167,23 @@ mpDelBtn->SetPosPixel( Point( 6 + 24, nBtnY ) ); } +bool PlacesListBox::Notify( NotifyEvent& rNEvt ) +{ + if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) + { + const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent(); + const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode(); + + if( rCode.GetCode() == KEY_RETURN ) + { + mbSelectionChanged = true; + updateView(); + return true; + } + } + return Control::Notify( rNEvt ); +} + Image PlacesListBox::getEntryIcon( PlacePtr pPlace ) { Image theImage = mpDlg->GetButtonImage( IMG_FILEDLG_PLACE_LOCAL ); diff -Nru libreoffice-5.0.2/fpicker/source/office/PlacesListBox.hxx libreoffice-5.0.5~rc2/fpicker/source/office/PlacesListBox.hxx --- libreoffice-5.0.2/fpicker/source/office/PlacesListBox.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/fpicker/source/office/PlacesListBox.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -66,6 +66,12 @@ void SetSizePixel( const Size& rNewSize ) SAL_OVERRIDE; void updateView( ); + VclPtr GetAddButton() const { return mpAddBtn; } + VclPtr GetDeleteButton() const { return mpDelBtn; } + VclPtr GetPlacesListBox() const { return mpImpl; } + + virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; + private: Image getEntryIcon( PlacePtr pPlace ); diff -Nru libreoffice-5.0.2/fpicker/source/win32/filepicker/VistaFilePicker.cxx libreoffice-5.0.5~rc2/fpicker/source/win32/filepicker/VistaFilePicker.cxx --- libreoffice-5.0.2/fpicker/source/win32/filepicker/VistaFilePicker.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/fpicker/source/win32/filepicker/VistaFilePicker.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -246,7 +246,7 @@ RequestRef rRequest(new Request()); rRequest->setRequest (VistaFilePickerImpl::E_GET_DIRECTORY); m_aAsyncExecute.triggerRequestThreadAware(rRequest, AsyncRequests::BLOCKED); - const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_FILENAME, OUString()); + const OUString sDirectory = rRequest->getArgumentOrDefault(PROP_DIRECTORY, OUString()); return sDirectory; } diff -Nru libreoffice-5.0.2/fpicker/uiconfig/ui/explorerfiledialog.ui libreoffice-5.0.5~rc2/fpicker/uiconfig/ui/explorerfiledialog.ui --- libreoffice-5.0.2/fpicker/uiconfig/ui/explorerfiledialog.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/fpicker/uiconfig/ui/explorerfiledialog.ui 2016-02-04 16:41:28.000000000 +0000 @@ -59,6 +59,7 @@ True True True + 40 False @@ -279,6 +280,7 @@ True False True + 40 1 diff -Nru libreoffice-5.0.2/framework/source/services/autorecovery.cxx libreoffice-5.0.5~rc2/framework/source/services/autorecovery.cxx --- libreoffice-5.0.2/framework/source/services/autorecovery.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/framework/source/services/autorecovery.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2480,6 +2480,8 @@ return; css::uno::Reference< css::frame::XFrame > xFrame = xController->getFrame(); + if (!xFrame.is()) + return; css::uno::Reference< css::frame::XDesktop > xDesktop (xFrame->getCreator(), css::uno::UNO_QUERY); if (!xDesktop.is()) return; diff -Nru libreoffice-5.0.2/framework/source/uielement/generictoolbarcontroller.cxx libreoffice-5.0.5~rc2/framework/source/uielement/generictoolbarcontroller.cxx --- libreoffice-5.0.2/framework/source/uielement/generictoolbarcontroller.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/framework/source/uielement/generictoolbarcontroller.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -244,6 +244,7 @@ aStrValue = aTmp; } m_pToolbar->SetItemText( m_nID, aStrValue ); + m_pToolbar->SetQuickHelpText( m_nID, aStrValue ); } if ( m_bMadeInvisible ) diff -Nru libreoffice-5.0.2/framework/source/uielement/menubarmanager.cxx libreoffice-5.0.5~rc2/framework/source/uielement/menubarmanager.cxx --- libreoffice-5.0.2/framework/source/uielement/menubarmanager.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/framework/source/uielement/menubarmanager.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -76,6 +76,7 @@ #include #include #include +#include // Be careful removing this "bad" construct. There are serious problems // with #define STRICT and including windows.h. Changing this needs some @@ -436,29 +437,45 @@ } else if ( Event.State >>= aItemText ) { - // Replacement for place holders - if ( aItemText.startsWith("($1)") ) + INetURLObject aURL( aFeatureURL ); + OUString aEnumPart = aURL.GetURLPath().getToken( 1, '.' ); + if ( !aEnumPart.isEmpty() && aURL.GetProtocol() == INetProtocol::Uno ) { - OUString aTmp(FWK_RESSTR(STR_UPDATEDOC)); - aTmp += " "; - aTmp += aItemText.copy( 4 ); - aItemText = aTmp; + // Checkmark or RadioButton + m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); + m_pVCLMenu->CheckItem( pMenuItemHandler->nItemId, aItemText == aEnumPart ); + + MenuItemBits nBits = m_pVCLMenu->GetItemBits( pMenuItemHandler->nItemId ); + //If not already designated RadioButton set as CheckMark + if (!(nBits & MenuItemBits::RADIOCHECK)) + m_pVCLMenu->SetItemBits( pMenuItemHandler->nItemId, nBits | MenuItemBits::CHECKABLE ); } - else if ( aItemText.startsWith("($2)") ) + else { - OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN)); - aTmp += aItemText.copy( 4 ); - aItemText = aTmp; - } - else if ( aItemText.startsWith("($3)") ) - { - OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC)); - aTmp += aItemText.copy( 4 ); - aItemText = aTmp; - } + // Replacement for place holders + if ( aItemText.startsWith("($1)") ) + { + OUString aTmp(FWK_RESSTR(STR_UPDATEDOC)); + aTmp += " "; + aTmp += aItemText.copy( 4 ); + aItemText = aTmp; + } + else if ( aItemText.startsWith("($2)") ) + { + OUString aTmp(FWK_RESSTR(STR_CLOSEDOC_ANDRETURN)); + aTmp += aItemText.copy( 4 ); + aItemText = aTmp; + } + else if ( aItemText.startsWith("($3)") ) + { + OUString aTmp(FWK_RESSTR(STR_SAVECOPYDOC)); + aTmp += aItemText.copy( 4 ); + aItemText = aTmp; + } - m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); - m_pVCLMenu->SetItemText( pMenuItemHandler->nItemId, aItemText ); + m_pVCLMenu->ShowItem( pMenuItemHandler->nItemId, true ); + m_pVCLMenu->SetItemText( pMenuItemHandler->nItemId, aItemText ); + } } else if ( Event.State >>= aVisibilityStatus ) { @@ -1138,7 +1155,8 @@ { sal_uInt16 nItemId = pMenu->GetItemId( nPos ); OUString aCommand = pMenu->GetItemCommand( nItemId ); - if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand) + if ( nItemId == SID_MDIWINDOWLIST || aCommand == aSpecialWindowCommand || + nItemId == SID_HELPMENU || aCommand == aCmdHelpMenu ) { // Retrieve addon popup menus and add them to our menu bar framework::AddonMenuManager::MergeAddonPopupMenus( rFrame, nPos, static_cast(pMenu), m_xContext ); diff -Nru libreoffice-5.0.2/.gitignore libreoffice-5.0.5~rc2/.gitignore --- libreoffice-5.0.2/.gitignore 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/.gitignore 2016-02-04 16:41:28.000000000 +0000 @@ -20,6 +20,7 @@ # # where stuff is built +/buck-out /instdir /instdir_for_build /workdir @@ -76,6 +77,7 @@ \#* *.kdev4 .kdev_include_paths +.buckd .directory # things below this point are targeted for elimination diff -Nru libreoffice-5.0.2/.gitreview libreoffice-5.0.5~rc2/.gitreview --- libreoffice-5.0.2/.gitreview 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/.gitreview 2016-02-04 16:41:28.000000000 +0000 @@ -3,5 +3,5 @@ port=29418 project=core defaultremote=logerrit -defaultbranch=libreoffice-5-0-2 +defaultbranch=libreoffice-5-0-5 diff -Nru libreoffice-5.0.2/i18nlangtag/qa/cppunit/test_languagetag.cxx libreoffice-5.0.5~rc2/i18nlangtag/qa/cppunit/test_languagetag.cxx --- libreoffice-5.0.2/i18nlangtag/qa/cppunit/test_languagetag.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18nlangtag/qa/cppunit/test_languagetag.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -665,6 +665,7 @@ if (rStr1 == "ku-SY" ) return rStr2 == "kmr-Latn-SY"; if (rStr1 == "ku-IQ" ) return rStr2 == "ckb-IQ"; if (rStr1 == "ku-IR" ) return rStr2 == "ckb-IR"; + if (rStr1 == "eu-ES" ) return rStr2 == "eu"; return rStr1 == rStr2; } diff -Nru libreoffice-5.0.2/i18nlangtag/source/isolang/isolang.cxx libreoffice-5.0.5~rc2/i18nlangtag/source/isolang/isolang.cxx --- libreoffice-5.0.2/i18nlangtag/source/isolang/isolang.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18nlangtag/source/isolang/isolang.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -240,6 +240,7 @@ { LANGUAGE_USER_ARABIC_SUDAN, "ar", "SD", 0 }, { LANGUAGE_ARABIC_PRIMARY_ONLY, "ar", "" , 0 }, { LANGUAGE_BASQUE, "eu", "" , 0 }, + { LANGUAGE_BASQUE, "eu", "ES", kSAME }, { LANGUAGE_BULGARIAN, "bg", "BG", 0 }, { LANGUAGE_CZECH, "cs", "CZ", 0 }, { LANGUAGE_CZECH, "cz", "" , kSAME }, diff -Nru libreoffice-5.0.2/i18npool/qa/cppunit/test_textsearch.cxx libreoffice-5.0.5~rc2/i18npool/qa/cppunit/test_textsearch.cxx --- libreoffice-5.0.2/i18npool/qa/cppunit/test_textsearch.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18npool/qa/cppunit/test_textsearch.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -123,6 +124,16 @@ CPPUNIT_ASSERT( aRes.subRegExpressions > 0 ); CPPUNIT_ASSERT( aRes.startOffset[0] == bStartRes ); CPPUNIT_ASSERT( aRes.endOffset[0] == bEndRes ); + + aOptions.transliterateFlags = ::css::i18n::TransliterationModules::TransliterationModules_IGNORE_CASE + | ::css::i18n::TransliterationModules::TransliterationModules_IGNORE_WIDTH; + aOptions.searchString = "([^ ]*)[ ]*([^ ]*)"; + m_xSearch->setOptions(aOptions); + aRes = m_xSearch->searchForward("11 22 33", 2, 7); + CPPUNIT_ASSERT(aRes.subRegExpressions == 3); + CPPUNIT_ASSERT((aRes.startOffset[0] == 2) && (aRes.endOffset[0] == 5)); + CPPUNIT_ASSERT((aRes.startOffset[1] == 2) && (aRes.endOffset[1] == 2)); + CPPUNIT_ASSERT((aRes.startOffset[2] == 3) && (aRes.endOffset[2] == 5)); } void TestTextSearch::setUp() diff -Nru libreoffice-5.0.2/i18npool/source/collator/collator_unicode.cxx libreoffice-5.0.5~rc2/i18npool/source/collator/collator_unicode.cxx --- libreoffice-5.0.2/i18npool/source/collator/collator_unicode.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18npool/source/collator/collator_unicode.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -156,20 +156,20 @@ aBuf.appendAscii("get_").append(rLocale.Language).appendAscii("_"); if ( rLocale.Language == "zh" ) { OUString func_base = aBuf.makeStringAndClear(); - OUString funclen_base = func_base + "_length"; + OUString funclen_base = func_base; if (OUString("TW HK MO").indexOf(rLocale.Country) >= 0) { func = reinterpret_cast(osl_getFunctionSymbol(hModule, OUString(func_base + "TW_" + rAlgorithm).pData)); funclen = reinterpret_cast(osl_getFunctionSymbol(hModule, - OUString(funclen_base + "TW_" + rAlgorithm).pData)); + OUString(funclen_base + "TW_" + rAlgorithm + "_length").pData)); } if (!func) { func = reinterpret_cast(osl_getFunctionSymbol( hModule, OUString(func_base + rAlgorithm).pData)); funclen = reinterpret_cast(osl_getFunctionSymbol( - hModule, OUString(funclen_base + rAlgorithm).pData)); + hModule, OUString(funclen_base + rAlgorithm + "_length").pData)); } } else { if ( rLocale.Language == "ja" ) { diff -Nru libreoffice-5.0.2/i18npool/source/localedata/data/vec_IT.xml libreoffice-5.0.5~rc2/i18npool/source/localedata/data/vec_IT.xml --- libreoffice-5.0.2/i18npool/source/localedata/data/vec_IT.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18npool/source/localedata/data/vec_IT.xml 2016-02-04 16:41:28.000000000 +0000 @@ -1,5 +1,22 @@ + @@ -11,16 +28,16 @@ Italy - + / - , - . - : - . + . + , + . + , ; - , - , + + @@ -30,154 +47,153 @@ “ ” - AM - PM + m. + p. metric - M/D + D/M - General + Standard 0 - 0.00 + 0,00 - #,##0 + #.##0 - #,##0.00 + #.##0,00 - #,###.00 + #.###,00 - - 0.00E+00 + + 0,00E+000 - - 0.00E+000 + + 0,00E+00 + + + ##0,00E+00 0% - 0.00% + 0,00% - [CURRENCY] #,##0;-[CURRENCY] #,##0 + [CURRENCY] #.##0;-[CURRENCY] #.##0 - [CURRENCY] #,##0.00;-[CURRENCY] #,##0.00 + [CURRENCY] #.##0;-[CURRENCY] #.##0 - [CURRENCY] #,##0;[RED]-[CURRENCY] #,##0 + [CURRENCY] #.##0;[RED]-[CURRENCY] #.##0 - [CURRENCY] #,##0.00;[RED]-[CURRENCY] #,##0.00 + [CURRENCY] #.##0;[RED]-[CURRENCY] #.##0 - #,##0.00 CCC + #.##0 CCC - [CURRENCY] #,##0.--;[RED]-[CURRENCY] #,##0.-- + [CURRENCY] #.##0;[RED]-[CURRENCY] #.##0 - - YY/MM/DD + + DD/MM/YY - - NNNNDD, MMMM YYYY + + NNNNDD MMMM YYYY - - YY/MM/DD + + DD/MM/YY - - YYYY/MM/DD + + DD/MM/YYYY - - D, MMM YY + + D MMM YY - - D, MMM YYYY + + D MMM YYYY - - D, MMM YYYY + + D. MMM. YYYY - - D, MMMM YYYY + + D MMMM YYYY - - D, MMMM YYYY + + D. MMMM YYYY - - NN, DD/MMM/YY + + NN D MMM YY - - NN, D, MMM YY + + NN DD/MMM YY - - NN, D, MMMM YYYY + + NN D MMMM YYYY - - NNNND, MMMM YYYY + + NNNND MMMM YYYY - - MM/DD + + MM-DD - + YY-MM-DD - ISO 8601 - + YYYY-MM-DD - ISO 8601 + ISO 8601 (EN 28601) - - YY/MM + + MM/YY - - MMM/DD + + DD/MMM - + MMMM - + QQ YY - + WW - - HH:MM + + HH.MM - - HH:MM:SS + + HH.MM.SS - - HH:MM AM/PM + + HH.MM AM/PM - - HH:MM:SS AM/PM + + HH.MM.SS AM/PM - [HH]:MM:SS + [HH].MM.SS - MM:SS.00 + MM.SS,00 - [HH]:MM:SS.00 + [HH].MM.SS,00 - YY/MM/DD HH:MM + DD/MM/YY HH.MM - YYYY/MM/DD HH:MM:SS AM/PM - - - ##0.00E+00 + DD/MM/YYYY HH.MM.SS @@ -347,16 +363,7 @@ C4 - - - - - - - - - - - + + diff -Nru libreoffice-5.0.2/i18npool/source/search/textsearch.cxx libreoffice-5.0.5~rc2/i18npool/source/search/textsearch.cxx --- libreoffice-5.0.2/i18npool/source/search/textsearch.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/i18npool/source/search/textsearch.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -301,15 +301,22 @@ for ( sal_Int32 k = 0; k < nGroups; k++ ) { const sal_Int32 nStart = sres.startOffset[k] - nExtraOffset; - if (startPos > 0 || nStart > 0) + // Result offsets are negative (-1) if a group expression was + // not matched. + if (nStart >= 0) sres.startOffset[k] = (nStart < nOffsets ? offset[nStart] : (offset[nOffsets - 1] + 1)); // JP 20.6.2001: end is ever exclusive and then don't return // the position of the next character - return the // next position behind the last found character! // "a b c" find "b" must return 2,3 and not 2,4!!! const sal_Int32 nStop = sres.endOffset[k] - nExtraOffset; - if (startPos > 0 || nStop > 0) - sres.endOffset[k] = offset[(nStop <= nOffsets ? nStop : nOffsets) - 1] + 1; + if (nStop >= 0) + { + if (nStop > 0) + sres.endOffset[k] = offset[(nStop <= nOffsets ? nStop : nOffsets) - 1] + 1; + else + sres.endOffset[k] = offset[0]; + } } } } @@ -401,14 +408,21 @@ for ( sal_Int32 k = 0; k < nGroups; k++ ) { const sal_Int32 nStart = sres.startOffset[k]; - if (endPos > 0 || nStart > 0) - sres.startOffset[k] = offset[(nStart <= nOffsets ? nStart : nOffsets) - 1] + 1; + // Result offsets are negative (-1) if a group expression was + // not matched. + if (nStart >= 0) + { + if (nStart > 0) + sres.startOffset[k] = offset[(nStart <= nOffsets ? nStart : nOffsets) - 1] + 1; + else + sres.startOffset[k] = offset[0]; + } // JP 20.6.2001: end is ever exclusive and then don't return // the position of the next character - return the // next position behind the last found character! // "a b c" find "b" must return 2,3 and not 2,4!!! const sal_Int32 nStop = sres.endOffset[k]; - if (endPos > 0 || nStop > 0) + if (nStop >= 0) sres.endOffset[k] = (nStop < nOffsets ? offset[nStop] : (offset[nOffsets - 1] + 1)); } } Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areas3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areas3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areas_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areas_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areasfull3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areasfull3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areasfull_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areasfull_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areaspiled3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areaspiled3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/areaspiled_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/areaspiled_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/bar3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/bar3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/bar3ddeep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/bar3ddeep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/bar_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/bar_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/barpercent3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/barpercent3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/barpercent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/barpercent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/barstack3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/barstack3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/barstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/barstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/bubble_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/bubble_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnline_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnline_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnpercent3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnpercent3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnpercent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnpercent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columns3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columns3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columns3ddeep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columns3ddeep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columns_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columns_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnstack3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnstack3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/columnstackline_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/columnstackline_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conedeep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conedeep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conehorideep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conehorideep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conehoripercent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conehoripercent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conehoristack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conehoristack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conepercent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conepercent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/conestack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/conestack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinder_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinder_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderdeep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderdeep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderhori_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderhori_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderhorideep_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderhorideep_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderhoriprocent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderhoriprocent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderhoristack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderhoristack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderpercent_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderpercent_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/cylinderstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/cylinderstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/donut3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/donut3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/donut3dexploded_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/donut3dexploded_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/donut_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/donut_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/donutexploded_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/donutexploded_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/net_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/net_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netfill_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netfill_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netlinepoint_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netlinepoint_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netlinepointstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netlinepointstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netpoint_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netpoint_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netpointstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netpointstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netstack_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netstack_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/netstackfill_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/netstackfill_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostackdirect3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostackdirectboth_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostackdirectlines_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostackdirectpoints_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostackstepped3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostacksteppedboth_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/nostacksteppedlines_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/pie3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/pie3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/pie3dexploded_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/pie3dexploded_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/pie_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/pie_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/pieexploded_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/pieexploded_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/typebar_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/typebar_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/typecolumn_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/typecolumn_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/valueaxisdirect3d_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/valueaxisdirect3d_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/valueaxisdirectboth_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/valueaxisdirectboth_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/valueaxisdirectlines_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/valueaxisdirectlines_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/chart2/res/valueaxisdirectpoints_52x60.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/chart2/res/valueaxisdirectpoints_52x60.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_addprintarea.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_addprintarea.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_addtable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_addtable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_bezierinsert.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_bezierinsert.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_borderdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_borderdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_changecasetolower.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_changecasetolower.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_changecasetoupper.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_changecasetoupper.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_combobox.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_combobox.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_config.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_config.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_contourdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_contourdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_datadatapilotrun.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_datadatapilotrun.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dataranges.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dataranges.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbdtableedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbdtableedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbnewform.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbnewform.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbnewquery.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbnewquery.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbnewreport.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbnewreport.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbnewtable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbnewtable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_dbtableedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_dbtableedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_deletetable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_deletetable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_designerdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_designerdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramarea.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramarea.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramaxisx.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramaxisx.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramaxisxyz.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramaxisxyz.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramaxisy.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramaxisy.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramaxisz.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramaxisz.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramdata.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramdata.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_diagramwall.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_diagramwall.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_drawchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_drawchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_draw.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_draw.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_drawtext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_drawtext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_edithyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_edithyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_editstyle.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_editstyle.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_fontdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_fontdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_fontheight.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_fontheight.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_fontworkgalleryfloater.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_formatselection.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_formatselection.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_formdesigntools.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_formdesigntools.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_freezepanes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_freezepanes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_goalseekdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_goalseekdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_grow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_grow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_hideslide.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_hideslide.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_hyperlinkdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_hyperlinkdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_iconsetformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_iconsetformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_importdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_importdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_importfromfile.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_importfromfile.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_inscellsctrl.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_inscellsctrl.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertbookmark.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertbookmark.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertcolumns.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertcolumns.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertctrl.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertctrl.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertdraw.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertdraw.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertendnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertendnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertformcombo.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertformcombo.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertgraphic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertgraphic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_inserthyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_inserthyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertmath.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertmath.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertmenutitles.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertmenutitles.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertobjectchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertobjectchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertobjectdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertobjectdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertobject.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertobject.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_insertsymbol.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_insertsymbol.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_inserttable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_inserttable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_legend.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_legend.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_modifypage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_modifypage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_moduledialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_moduledialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_morecontrols.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_morecontrols.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_movepagedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_movepagedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_movepagefirst.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_movepagefirst.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_movepagelast.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_movepagelast.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_movepageup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_movepageup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_newdoc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_newdoc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_numberformatpercent.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_numberformatpercent.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_objectcatalog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_objectcatalog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_ordercrit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_ordercrit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_outlinedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_outlinedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_outlineformat.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_outlineformat.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_outlineleft.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_outlineleft.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_outlineright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_outlineright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_outlineup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_outlineup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_overline.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_overline.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_paragraphdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_paragraphdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_presentationcurrentslide.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_presentationcurrentslide.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_printdefault.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_printdefault.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_printersetup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_printersetup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_print.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_print.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_protect.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_protect.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_removehyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_removehyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_scaletext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_scaletext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_shadowed.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_shadowed.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_shrink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_shrink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_sortascending.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_sortascending.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_sortdescending.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_sortdescending.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_spacepara15.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_spacepara15.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_spacepara1.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_spacepara1.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_spacepara2.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_spacepara2.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_splittable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_splittable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_starchartdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_starchartdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_starshapes.signet.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_starshapes.signet.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_stylenewbyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_stylenewbyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_styleupdatebyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_styleupdatebyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_subscript.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_subscript.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_symbolcatalogue.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_symbolcatalogue.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_tabdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_tabdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_tablenumberformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_tablenumberformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_text.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_text.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_texttoolbox.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_texttoolbox.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_thesaurusdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_thesaurusdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_togglelegend.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_togglelegend.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_transformdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_transformdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_unsetcellsreadonly.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_unsetcellsreadonly.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_verticaltext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_verticaltext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/lc_wraptext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/lc_wraptext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_borderdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_borderdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_changecasetolower.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_changecasetolower.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_config.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_config.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_contourdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_contourdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_datadatapilotrun.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_datadatapilotrun.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dataranges.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dataranges.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbdtableedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbdtableedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbformopen.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbformopen.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbnewform.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbnewform.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbnewquery.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbnewquery.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbnewreport.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbnewreport.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbqueryedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbqueryedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbqueryopen.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbqueryopen.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbquerypropertiesdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbquerypropertiesdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbreportopen.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbreportopen.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbtableedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbtableedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_dbtableopen.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_dbtableopen.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_designerdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_designerdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_diagramarea.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_diagramarea.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_diagramaxisxyz.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_diagramaxisxyz.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_diagramaxisz.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_diagramaxisz.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_diagramwall.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_diagramwall.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_doubleclicktextedit.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_doubleclicktextedit.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_drawchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_drawchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_draw.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_draw.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_drawtext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_drawtext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_editstyled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_editstyled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_exportdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_exportdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_fontheight.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_fontheight.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_formatselection.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_formatselection.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_formdesigntools.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_formdesigntools.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_framedialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_framedialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_goalseekdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_goalseekdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_hideslide.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_hideslide.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_imagemapdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_imagemapdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_importdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_importdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertcolumns.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertcolumns.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertendnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertendnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertmenutitles.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertmenutitles.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertobjectchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertobjectchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertobjectdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertobjectdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertobject.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertobject.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_legend.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_legend.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_modifypage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_modifypage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_moduledialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_moduledialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_morecontrols.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_morecontrols.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_movepagedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_movepagedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_movepagefirst.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_movepagefirst.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_movepagelast.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_movepagelast.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_movepageup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_movepageup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_newdoc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_newdoc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_objectcatalog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_objectcatalog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_outlineleft.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_outlineleft.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_outlineright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_outlineright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_overline.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_overline.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_pagedialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_pagedialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_paragraphdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_paragraphdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_printdefault.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_printdefault.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_printersetup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_printersetup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_print.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_print.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_removehyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_removehyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_scaletext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_scaletext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_shadowed.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_shadowed.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_spacepara15.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_spacepara15.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_spacepara1.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_spacepara1.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_spacepara2.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_spacepara2.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_splittable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_splittable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_starchartdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_starchartdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_starshapes.signet.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_starshapes.signet.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_styleupdatebyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_styleupdatebyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_tabledialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_tabledialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_tablenumberformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_tablenumberformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_text.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_text.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_texttoolbox.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_texttoolbox.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_thesaurusdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_thesaurusdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_togglelegend.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_togglelegend.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_underlinedouble.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_underlinedouble.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_unsetcellsreadonly.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_unsetcellsreadonly.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/cmd/sc_wraptext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/cmd/sc_wraptext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/dbaccess/res/db.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/dbaccess/res/db.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/fpicker/res/fp014.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/fpicker/res/fp014.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/framework/res/folder_32.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/framework/res/folder_32.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/framework/res/info_26.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/framework/res/info_26.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/framework/res/recent-documents.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/framework/res/recent-documents.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/framework/res/remote-documents.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/framework/res/remote-documents.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/helping/note.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/helping/note.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/helping/tip.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/helping/tip.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/helping/warning.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/helping/warning.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/im30827.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/im30827.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/lx03250.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/lx03250.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/lx03251.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/lx03251.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/odb_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/odb_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/odf_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/odf_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/odg_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/odg_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/odp_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/odp_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/odt_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/odt_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/otp_48_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/otp_48_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/recentdoc_remove_highlighted.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/recentdoc_remove_highlighted.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/res/recentdoc_remove.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/res/recentdoc_remove.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/imglst/nc05.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/imglst/nc05.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/date.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/date.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/dropcopy.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/dropcopy.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/droplink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/droplink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/dropurl.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/dropurl.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/file.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/file.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sc/res/fx.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sc/res/fx.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/click_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/click_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/effect_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/effect_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/effectfade_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/effectfade_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/effectole_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/effectole_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/effectpath_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/effectpath_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/effectshape_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/effectshape_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/fade_effect_indicator.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/fade_effect_indicator.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/foilh03.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/foilh03.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/foilh06.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/foilh06.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/foilh09.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/foilh09.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/foiln01.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/foiln01.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/getallob.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/getallob.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/hlplhorz.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/hlplhorz.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/hlppoint.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/hlppoint.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/layout_head03.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/layout_head03.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/layout_head04.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/layout_head04.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/layout_head06.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/layout_head06.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/layout_vertical01.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/layout_vertical01.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/layout_vertical02.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/layout_vertical02.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/ole.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/ole.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sd/res/page.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sd/res/page.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sfx2/res/symphony/sidebar-style-large.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sfx2/res/symphony/sidebar-style-large.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sfx2/res/symphony/sidebar-style-small.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sfx2/res/symphony/sidebar-style-small.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/svx/res/markers.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/svx/res/markers.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/svx/res/ole.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/svx/res/ole.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sw/imglst/nc20004.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sw/imglst/nc20004.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/sw/imglst/sr20010.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/sw/imglst/sr20010.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/breeze/vcl/res/index.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/breeze/vcl/res/index.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/cmd/lc_autosum.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/cmd/lc_autosum.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/cmd/lc_grid.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/cmd/lc_grid.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/cmd/lc_styleapply.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/cmd/lc_styleapply.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/cmd/sc_animationmode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/cmd/sc_animationmode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/cmd/sc_switchxformsdesignmode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/cmd/sc_switchxformsdesignmode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/crystal/sc/imglst/lc26048.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/crystal/sc/imglst/lc26048.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/cmd/sc_freezepanes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/cmd/sc_freezepanes.png differ diff -Nru libreoffice-5.0.2/icon-themes/galaxy/links.txt libreoffice-5.0.5~rc2/icon-themes/galaxy/links.txt --- libreoffice-5.0.2/icon-themes/galaxy/links.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/icon-themes/galaxy/links.txt 2016-02-04 16:41:28.000000000 +0000 @@ -26,6 +26,8 @@ cmd/sc_graphicdialog.png cmd/sc_insertgraphic.png cmd/sc_templatemenu.png cmd/sc_newdoc.png +cmd/lc_pagesetup.png cmd/lc_setdocumentproperties.png +cmd/sc_pagesetup.png cmd/sc_setdocumentproperties.png # paragraph line spacing cmd/lc_linespacing.png cmd/lc_spacepara15.png Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/res/helpimg/rechenlt.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/res/helpimg/rechenlt.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/res/recentdoc_remove_highlighted.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/res/recentdoc_remove_highlighted.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/res/recentdoc_remove.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/res/recentdoc_remove.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/sfx2/res/logo.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/sfx2/res/logo.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/galaxy/sfx2/res/startcenter-logo.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/galaxy/sfx2/res/startcenter-logo.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_fontworkshapetype.fontwork-arch-right-curve.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_fontworkshapetype.fontwork-arch-right-curve.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_moveupsubitems.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_moveupsubitems.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_starshapes.star4.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_starshapes.star4.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_symbolshapes.forbidden.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_symbolshapes.forbidden.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_symbolshapes.moon.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_symbolshapes.moon.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/lc_symbolshapes.sun.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/lc_symbolshapes.sun.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_arrowshapes.circular-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_arrowshapes.circular-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_browsebackward.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_browsebackward.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_downsearch.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_downsearch.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_incrementlevel.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_incrementlevel.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_movedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_movedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_navigateback.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_navigateback.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_outlinedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_outlinedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_outlineleft.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_outlineleft.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_setdocumentproperties.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_setdocumentproperties.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_starshapes.star6.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_starshapes.star6.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_symbolshapes.lightning.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_symbolshapes.lightning.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/cmd/sc_symbolshapes.moon.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/cmd/sc_symbolshapes.moon.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/reportdesign/res/sc30769.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/reportdesign/res/sc30769.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/res/sc06301.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/res/sc06301.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/res/sx10715.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/res/sx10715.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/starmath/res/al21811.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/starmath/res/al21811.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/svtools/res/back_small.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/svtools/res/back_small.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/svx/res/fontworkalignjustified_26.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/svx/res/fontworkalignjustified_26.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/human/sw/res/one_left.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/human/sw/res/one_left.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_fontworkshapetype.fontwork-arch-right-curve.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_fontworkshapetype.fontwork-arch-right-curve.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_starshapes.star4.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_starshapes.star4.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_symbolshapes.forbidden.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_symbolshapes.forbidden.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_symbolshapes.moon.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_symbolshapes.moon.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/lc_symbolshapes.sun.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/lc_symbolshapes.sun.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/sc_arrowshapes.circular-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/sc_arrowshapes.circular-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/sc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/sc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/sc_starshapes.star6.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/sc_starshapes.star6.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/sc_symbolshapes.lightning.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/sc_symbolshapes.lightning.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/industrial/cmd/sc_symbolshapes.moon.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/industrial/cmd/sc_symbolshapes.moon.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/avmedia/res/av02050.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/avmedia/res/av02050.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/avmedia/res/av02051.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/avmedia/res/av02051.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/bg/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/bg/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/bg/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/bg/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ca/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ca/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ca/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ca/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/de/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/de/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/de/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/de/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/es/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/es/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/es/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/es/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/fr/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/fr/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/hu/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/hu/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/hu/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/hu/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/it/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/it/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/it/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/it/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/km/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/km/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/km/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/km/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ko/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ko/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ko/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ko/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_autosum.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_autosum.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_grid.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_grid.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_inserttimefield.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_inserttimefield.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_styleapply.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_styleapply.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/lc_timefield.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/lc_timefield.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/nl/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/nl/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/nl/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/nl/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/pl/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/pl/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/pl/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/pl/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/pt/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/pt/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/pt-BR/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/pt-BR/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ru/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ru/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/ru/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/ru/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sc_animationmode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sc_animationmode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sc_switchxformsdesignmode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sc_switchxformsdesignmode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sl/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sl/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sl/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sl/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sv/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sv/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/sv/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/sv/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/tr/lc_bold.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/tr/lc_bold.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/cmd/tr/sc_italic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/cmd/tr/sc_italic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/res/sx10715.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/res/sx10715.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/res/sx10769.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/res/sx10769.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/sc/imglst/lc26048.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/sc/imglst/lc26048.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/sd/res/breakplayingblue_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/sd/res/breakplayingblue_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/sd/res/stopplayingblue_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/sd/res/stopplayingblue_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/starmath/res/al21811.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/starmath/res/al21811.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/oxygen/svx/res/fontworkalignjustified_26.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/oxygen/svx/res/fontworkalignjustified_26.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/32/selectall.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/32/selectall.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/32/selectobject.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/32/selectobject.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.chevron.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.circular-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.corner-right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.down-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.left-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.left-right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.notched-left-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.notched-left-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.notched-right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.notched-right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.pentagon-right.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.pentagon-right.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.quad-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.split-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.split-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.split-round-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.split-round-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.s-sharped-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.s-sharped-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.striped-right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.striped-right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-down-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-down-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_arrowshapes.up-right-down-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_autopilotmenu.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_autopilotmenu.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_basicshapes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_basicshapes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_bulletsandnumberingdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_bulletsandnumberingdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.cloud-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.cloud-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-1.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-2.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.line-callout-3.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.rectangular-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.round-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.round-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_calloutshapes.round-rectangular-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circlearc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circlearc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circlecut.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circlecut.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circlecut_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circlecut_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circlepie.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circlepie.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circlepie_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circlepie_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_circle_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_circle_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_colorscaleformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_colorscaleformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_colorview.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_colorview.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_conditionalformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_conditionalformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_conditionalformatmenu.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_conditionalformatmenu.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_crop.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_crop.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_currencyfield.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_currencyfield.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_databarformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_databarformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_decrementlevel.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_decrementlevel.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_decrementsublevels.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_decrementsublevels.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_defaultbullet.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_defaultbullet.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_defaultnumbering.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_defaultnumbering.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_deletepage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_deletepage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_drawchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_drawchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_duplicatepage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_duplicatepage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_ellipsecut.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_ellipsecut.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_ellipse.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_ellipse.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_ellipse_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_ellipse_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_entirecolumn.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_entirecolumn.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_entirerow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_entirerow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_euroconverter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_euroconverter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_exportto.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_exportto.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_fillcolor.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_fillcolor.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_fliphorizontal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_fliphorizontal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_flipvertical.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_flipvertical.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_freeline.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_freeline.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_freeline_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_freeline_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_iconsetformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_iconsetformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_importfromfile.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_importfromfile.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_incrementlevel.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_incrementlevel.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_incrementsublevels.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_incrementsublevels.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertbookmark.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertbookmark.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertendnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertendnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertfootnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertfootnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_inserthyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_inserthyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_insertrowsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_insertrowsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linearrowcircle.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linearrowcircle.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linearrowend.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linearrowend.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linearrows.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linearrows.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linearrowsquare.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linearrowsquare.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linearrowstart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linearrowstart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linecirclearrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linecirclearrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_line_diagonal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_line_diagonal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_line.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_line.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_linesquarearrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_linesquarearrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_measureline.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_measureline.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_movedown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_movedown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_movedownsubitems.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_movedownsubitems.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_moveup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_moveup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_moveupsubitems.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_moveupsubitems.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_numberformatdecimal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_numberformatdecimal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_numberformatpercent.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_numberformatpercent.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_pagesetup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_pagesetup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_pie.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_pie.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_pie_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_pie_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_presentationcurrentslide.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_presentationcurrentslide.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_presentation.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_presentation.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_resetattributes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_resetattributes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_searchdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_searchdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_selectall.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_selectall.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_showbookview.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_showbookview.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_showmultiplepages.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_showmultiplepages.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_showtwopages.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_showtwopages.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_slidemasterpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_slidemasterpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_spacing.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_spacing.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_stylenewbyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_stylenewbyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_styleupdatebyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_styleupdatebyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_text.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_text.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_trackchanges.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_trackchanges.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_verticaltext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_verticaltext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_wraptext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_wraptext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/lc_zoommode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/lc_zoommode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_arc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_arc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_assignlayout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_assignlayout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_autopilotmenu.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_autopilotmenu.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_basicshapes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_basicshapes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_bulletsandnumberingdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_bulletsandnumberingdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.cloud-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-1.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-2.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.line-callout-3.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.rectangular-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.round-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_calloutshapes.round-rectangular-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circlearc.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circlearc.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circlecut.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circlecut.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circlecut_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circlecut_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circlepie.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circlepie.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circlepie_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circlepie_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_circle_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_circle_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_colorscaleformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_colorscaleformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_conditionalformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_conditionalformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_conditionalformatmenu.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_conditionalformatmenu.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_crop.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_crop.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_currencyfield.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_currencyfield.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_databarformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_databarformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_deletepage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_deletepage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_drawchart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_drawchart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_duplicatepage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_duplicatepage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_ellipsecut.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_ellipsecut.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_ellipsecut_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_ellipsecut_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_ellipse.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_ellipse.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_ellipse_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_ellipse_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_entirecolumn.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_entirecolumn.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_entirerow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_entirerow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_euroconverter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_euroconverter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_exportto.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_exportto.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_fillcolor.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_fillcolor.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_fliphorizontal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_fliphorizontal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_iconsetformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_iconsetformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_importfromfile.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_importfromfile.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertbookmark.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertbookmark.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertendnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertendnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertfootnote.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertfootnote.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertgraphic.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertgraphic.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_inserthyperlink.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_inserthyperlink.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_insertrowsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_insertrowsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_linearrowcircle.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_linearrowcircle.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_linearrows.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_linearrows.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_linearrowsquare.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_linearrowsquare.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_linearrowstart.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_linearrowstart.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_linecirclearrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_linecirclearrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_line_diagonal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_line_diagonal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_line.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_line.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_measureline.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_measureline.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_numberformatdecimal.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_numberformatdecimal.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_numberformatpercent.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_numberformatpercent.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_pagesetup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_pagesetup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_pie.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_pie.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_pie_unfilled.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_pie_unfilled.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_presentationcurrentslide.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_presentationcurrentslide.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_presentationlayout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_presentationlayout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_presentation.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_presentation.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_resetattributes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_resetattributes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_searchdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_searchdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_selectall.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_selectall.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_showbookview.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_showbookview.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_showmultiplepages.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_showmultiplepages.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_showtwopages.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_showtwopages.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_slidemasterpage.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_slidemasterpage.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_spacing.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_spacing.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_stylenewbyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_stylenewbyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_styleupdatebyexample.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_styleupdatebyexample.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_text.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_text.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_verticaltext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_verticaltext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_wraptext.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_wraptext.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/cmd/sc_zoommode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/cmd/sc_zoommode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/framework/res/folder_32.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/framework/res/folder_32.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/framework/res/recent-documents.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/framework/res/recent-documents.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/framework/res/templates_32.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/framework/res/templates_32.png differ diff -Nru libreoffice-5.0.2/icon-themes/sifr/links.txt libreoffice-5.0.5~rc2/icon-themes/sifr/links.txt --- libreoffice-5.0.2/icon-themes/sifr/links.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/icon-themes/sifr/links.txt 2016-02-04 16:41:28.000000000 +0000 @@ -1,3 +1,59 @@ +# Navigator - Writer +sw/res/all_left.png cmd/sc_firstpage.png +sw/res/all_right.png cmd/sc_lastpage.png +sw/res/one_left.png cmd/sc_navigateback.png +sw/res/one_right.png cmd/sc_navigateforward.png +sw/res/styfamnu.png cmd/sc_defaultbullet.png +sw/imglst/nc20001.png cmd/sc_inserttable.png +sw/imglst/nc20002.png cmd/sc_text.png +sw/imglst/nc20003.png cmd/sc_insertgraphic.png +sw/imglst/nc20004.png cmd/sc_drawchart.png +sw/imglst/nc20005.png cmd/sc_insertbookmark.png +sw/imglst/nc20006.png cmd/sc_insertsection.png +sw/imglst/nc20007.png cmd/sc_inserthyperlink.png +sw/imglst/nc20008.png cmd/sc_insertreferencefield.png +sw/imglst/nc20009.png cmd/sc_insertindexesentry.png +sw/imglst/nc20010.png cmd/sc_insertannotation.png +sw/imglst/nc20011.png cmd/sc_insertdraw.png +sw/imglst/sc20171.png cmd/sc_downsearch.png +sw/imglst/sc20172.png cmd/sc_navigateback.png +sw/imglst/sc20173.png cmd/sc_navigateforward.png +sw/imglst/sc20174.png cmd/sc_upsearch.png +sw/imglst/sc20175.png cmd/sc_flowchartshapes.flowchart-merge.png +sw/imglst/sc20186.png cmd/sc_flowchartshapes.flowchart-extract.png +sw/imglst/sc20235.png cmd/sc_inserthyperlink.png +sw/imglst/sc20239.png cmd/sc_copy.png +sw/imglst/sc20249.png cmd/sc_navigator.png +sw/imglst/sf01.png cmd/sc_controlcodes.png +sw/imglst/sf02.png cmd/sc_bold.png +sw/imglst/sf04.png cmd/sc_adddirect.png +sw/imglst/sf05.png cmd/sc_defaultbullet.png +sw/imglst/sr20000.png cmd/sc_downsearch.png +sw/imglst/sr20001.png cmd/sc_upsearch.png +sw/imglst/sr20002.png cmd/sc_inserttable.png +sw/imglst/sr20003.png cmd/sc_text.png +sw/imglst/sr20004.png cmd/sc_adddirect.png +sw/imglst/sr20005.png cmd/sc_insertdraw.png +sw/imglst/sr20006.png cmd/sc_choosecontrols.png +sw/imglst/sr20007.png cmd/sc_insertsection.png +sw/imglst/sr20008.png cmd/sc_insertbookmark.png +sw/imglst/sr20009.png cmd/sc_insertgraphic.png +sw/imglst/sr20010.png cmd/sc_drawchart.png +sw/imglst/sr20015.png cmd/sc_insertannotation.png +sw/imglst/sr20016.png cmd/sc_searchdialog.png +sw/imglst/sr20013.png cmd/sc_insertfootnote.png +sw/imglst/sr20014.png sw/imglst/sc20183.png +sw/imglst/sr20017.png cmd/sc_insertindexesentry.png +# Navigator - Calc +sc/imglst/na05.png cmd/sc_upsearch.png +sc/imglst/na06.png cmd/sc_downsearch.png +sc/imglst/nc01.png cmd/sc_inserttable.png +sc/imglst/nc04.png cmd/sc_insertgraphic.png +sc/imglst/nc05.png cmd/sc_drawchart.png +sc/imglst/nc06.png cmd/sc_insertannotation.png +sc/imglst/nc08.png cmd/sc_insertdraw.png +sc/res/table.png cmd/sc_inserttable.png + # File Menu cmd/sc_exporttopdf.png cmd/sc_exportdirecttopdf.png Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/lx03253.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/lx03253.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/lx03254.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/lx03254.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/lx03255.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/lx03255.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odb_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odb_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odf_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odf_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odg_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odg_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odm_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odm_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odp_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odp_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/ods_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/ods_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/odt_32_8.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/odt_32_8.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/sx03253.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/sx03253.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/sx03254.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/sx03254.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/res/sx03255.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/res/sx03255.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_All_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_All_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_Double_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Bottom_Thick_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Empty_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Empty_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_FourBorders_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_FourBorders_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_FourBorders_Thick_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Left_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Left_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_LeftAndRight_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_LeftDiagonal_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_005.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_005.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_110.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_110.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_250.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_250.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_260.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_260.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_400.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_400.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_450.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_450.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_500.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_500.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_505.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_505.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_750.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorderLineStyle_750.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Right_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Right_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_RightDiagonal_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_Top_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_Top_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopAndBottom_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopSingle_BottomDouble_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sc/res/sidebar/CellBorder_TopThin_BottomThick_18x18.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/svx/res/doc_modified_feedback.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/svx/res/doc_modified_feedback.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/svx/res/selection_10x22.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/svx/res/selection_10x22.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/imglst/sf03.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/imglst/sf03.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/doublepage_10x22.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/doublepage_10x22.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/emptypage_10x14.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/emptypage_10x14.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA3_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA4_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeA5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeB4_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeB5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizeC5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsizecopy_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A3_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A4_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_A5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_B4_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_B5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_C5_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/documentsize_L_copy_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_mirror_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_narrow_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_nomal_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/format_L_wide_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatmirror_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatmirror_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatnarrow_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatnormal_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatnormal_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatwide_24x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/sidebar/pageproppanel/formatwide_24x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/sifr/sw/res/twopages_10x24.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/sifr/sw/res/twopages_10x24.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/chart2/res/typearea_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/chart2/res/typearea_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/chart2/res/typebubble_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/chart2/res/typebubble_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/chart2/res/typenet_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/chart2/res/typenet_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/chart2/res/typepointline_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/chart2/res/typepointline_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/chart2/res/typestock_16.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/chart2/res/typestock_16.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_aligncenter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_aligncenter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_aligndown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_aligndown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_alignmiddle.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_alignmiddle.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_aligntop.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_aligntop.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_alignup.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_alignup.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_alignverticalcenter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_alignverticalcenter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_bezierdelete.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_bezierdelete.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_crop.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_crop.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_datadatapilotrun.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_datadatapilotrun.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_deletetable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_deletetable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_entirecolumn.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_entirecolumn.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_entirerow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_entirerow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_flipvertical.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_flipvertical.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertcellsdown.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertcellsdown.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertcellsright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertcellsright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertcolumnsafter-lc_insertcolumnsbefore.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertrowsafter-lc_insertrowsbefore.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertrowsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertrowsbefore.png differ diff -Nru libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertrowsdown.svg libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertrowsdown.svg --- libreoffice-5.0.2/icon-themes/tango/cmd/lc_insertrowsdown.svg 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_insertrowsdown.svg 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,3551 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_inserttable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_inserttable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_mergecells.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_mergecells.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_objectalignleft.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_objectalignleft.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_objectalign.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_objectalign.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_objectalignright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_objectalignright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_optimizetable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_optimizetable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_protect-lc_unsetcellsreadonly.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_protect-lc_unsetcellsreadonly.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_protect.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_protect.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_selecttable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_selecttable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_splittable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_splittable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_splittable.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_splittable.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_tablenumberformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_tablenumberformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_tablenumberformatdialog.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_tablenumberformatdialog.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_textdirectionlefttoright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_textdirectionlefttoright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_togglemergecells.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_togglemergecells.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_toggleobjectrotatemode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_toggleobjectrotatemode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_togglesheetgrid.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_togglesheetgrid.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/lc_unsetcellsreadonly.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/lc_unsetcellsreadonly.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_arrowshapes.circular-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_arrowshapes.circular-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_arrowshapes.quad-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_arrowshapes.quad-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_arrowshapes.right-arrow-callout.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_arrowshapes.right-arrow-callout.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_crop.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_crop.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_datafilterstandardfilter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_datafilterstandardfilter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_deletetable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_deletetable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_deletetable.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_deletetable.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_entirecell.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_entirecell.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_entirecell-sc_entirerow-sc_entirecolumn-sc_selecttable.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_entirecell-sc_entirerow-sc_entirecolumn-sc_selecttable.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_entirecolumn.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_entirecolumn.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_entirerow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_entirerow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_flipvertical.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_flipvertical.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_freezepanes.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_freezepanes.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertcolumnsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertcolumnsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertcolumnsafter-sc_insertcolumnsbefore.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertcolumnsafter-sc_insertcolumnsbefore.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertcolumnsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertcolumnsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertrowsafter.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertrowsafter.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertrowsafter-sc_insertrowsbefore.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertrowsafter-sc_insertrowsbefore.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_insertrowsbefore.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_insertrowsbefore.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_inserttable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_inserttable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_linewidth.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_linewidth.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_objectalignleft.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_objectalignleft.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_objectalign.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_objectalign.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_objectalignright.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_objectalignright.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_outlinefont.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_outlinefont.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_selecttable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_selecttable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_splittable.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_splittable.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_splittable.xcf.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_splittable.xcf.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_tablenumberformatdialog.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_tablenumberformatdialog.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_tablenumberformatdialog.xcf and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_tablenumberformatdialog.xcf differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_toggleobjectrotatemode.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_toggleobjectrotatemode.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/cmd/sc_unsetcellsreadonly.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/cmd/sc_unsetcellsreadonly.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/res/helpimg/note.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/res/helpimg/note.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/res/helpimg/tip.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/res/helpimg/tip.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/res/helpimg/warning.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/res/helpimg/warning.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/sd/res/layout_vertical01.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/sd/res/layout_vertical01.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/sd/res/layout_vertical02.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/sd/res/layout_vertical02.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/sfx2/res/minus.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/sfx2/res/minus.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango/sfx2/res/plus.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango/sfx2/res/plus.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango_testing/cmd/sc_arrowshapes.circular-arrow.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango_testing/cmd/sc_arrowshapes.circular-arrow.png differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/icon-themes/tango_testing/cmd/sc_basicshapes.cross.png and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/icon-themes/tango_testing/cmd/sc_basicshapes.cross.png differ diff -Nru libreoffice-5.0.2/include/comphelper/embeddedobjectcontainer.hxx libreoffice-5.0.5~rc2/include/comphelper/embeddedobjectcontainer.hxx --- libreoffice-5.0.2/include/comphelper/embeddedobjectcontainer.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/comphelper/embeddedobjectcontainer.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -43,6 +43,7 @@ virtual com::sun::star::uno::Reference < com::sun::star::embed::XStorage > getStorage() const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler > getInteractionHandler() const = 0; virtual bool isEnableSetModified() const = 0; + virtual OUString getDocumentBaseURL() const = 0; protected: ~IEmbeddedHelper() {} @@ -54,7 +55,8 @@ EmbedImpl* pImpl; ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > Get_Impl( const OUString&, - const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy); + const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xCopy, + OUString const* pBaseURL = nullptr); public: // add an embedded object to the container storage @@ -92,7 +94,7 @@ OUString GetEmbeddedObjectName( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ); // retrieve an embedded object by name that either has been added already or is available in the container storage - ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString& ); + ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > GetEmbeddedObject( const OUString&, OUString const* pBaseURL = nullptr ); // create an object from a ClassId ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > diff -Nru libreoffice-5.0.2/include/formula/FormulaCompiler.hxx libreoffice-5.0.5~rc2/include/formula/FormulaCompiler.hxx --- libreoffice-5.0.2/include/formula/FormulaCompiler.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/formula/FormulaCompiler.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -298,6 +298,10 @@ virtual void CreateStringFromIndex( OUStringBuffer& rBuffer, const FormulaToken* pToken ) const; virtual void LocalizeString( OUString& rName ) const; // modify rName - input: exact name + /** Whether parameter nParam (0-based) is forced to array for OpCode eOp. + Calc: ForceArray or ReferenceOrForceArray type. */ + virtual bool IsForceArrayParameter( const FormulaToken* pToken, sal_uInt16 nParam ) const; + void AppendErrorConstant( OUStringBuffer& rBuffer, sal_uInt16 nError ) const; bool GetToken(); @@ -328,6 +332,7 @@ FormulaTokenRef mpToken; // current token FormulaTokenRef pCurrentFactorToken; // current factor token (of Factor() method) + sal_uInt16 nCurrentFactorParam; // current factor token's parameter, 1-based FormulaTokenArray* pArr; FormulaToken** pCode; @@ -358,32 +363,38 @@ void loadSymbols( sal_uInt16 nSymbols, FormulaGrammar::Grammar eGrammar, NonConstOpCodeMapPtr& rxMap, SeparatorType eSepType = SEMICOLON_BASE ) const; - static inline void ForceArrayOperator( FormulaTokenRef& rCurr, const FormulaTokenRef& rPrev ) - { - if ( rPrev && rPrev->HasForceArray() && rCurr->GetOpCode() != ocPush && - (rCurr->GetType() == svByte || rCurr->GetType() == svJump) && - !rCurr->HasForceArray() ) - rCurr->SetForceArray( true); - } + /** Check pCurrentFactorToken for nParam's (0-based) ForceArray types and + set ForceArray at rCurr if so. Set nParam+1 as 1-based + nCurrentFactorParam for subsequent ForceArrayOperator() calls. + */ + void CheckSetForceArrayParameter( FormulaTokenRef& rCurr, sal_uInt8 nParam ); + + void ForceArrayOperator( FormulaTokenRef& rCurr ); class CurrentFactor { FormulaTokenRef pPrevFac; + sal_uInt16 nPrevParam; FormulaCompiler* pCompiler; CurrentFactor( const CurrentFactor& ) SAL_DELETED_FUNCTION; CurrentFactor& operator=( const CurrentFactor& ) SAL_DELETED_FUNCTION; public: explicit CurrentFactor( FormulaCompiler* pComp ) : pPrevFac( pComp->pCurrentFactorToken ) + , nPrevParam( pComp->nCurrentFactorParam ) , pCompiler( pComp ) {} ~CurrentFactor() - { pCompiler->pCurrentFactorToken = pPrevFac; } + { + pCompiler->pCurrentFactorToken = pPrevFac; + pCompiler->nCurrentFactorParam = nPrevParam; + } // yes, this operator= may modify the RValue void operator=( FormulaTokenRef& r ) { - ForceArrayOperator( r, pPrevFac); + pCompiler->ForceArrayOperator( r ); pCompiler->pCurrentFactorToken = r; + pCompiler->nCurrentFactorParam = 0; } void operator=( FormulaToken* p ) { diff -Nru libreoffice-5.0.2/include/formula/tokenarray.hxx libreoffice-5.0.5~rc2/include/formula/tokenarray.hxx --- libreoffice-5.0.2/include/formula/tokenarray.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/formula/tokenarray.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -314,6 +314,9 @@ /** Determines if this formula may be followed by a reference. */ bool MayReferenceFollow(); + + /** Re-intern SharedString in case the SharedStringPool differs. */ + void ReinternStrings( svl::SharedStringPool& rPool ); }; inline OpCode FormulaTokenArray::GetOuterFuncOpCode() diff -Nru libreoffice-5.0.2/include/formula/token.hxx libreoffice-5.0.5~rc2/include/formula/token.hxx --- libreoffice-5.0.2/include/formula/token.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/formula/token.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -150,7 +150,8 @@ virtual void SetForceArray( bool b ); virtual double GetDouble() const; virtual double& GetDoubleAsReference(); - virtual svl::SharedString GetString() const; + virtual svl::SharedString GetString() const; + virtual void SetString( const svl::SharedString& rStr ); virtual sal_uInt16 GetIndex() const; virtual void SetIndex( sal_uInt16 n ); virtual bool IsGlobal() const; @@ -288,6 +289,7 @@ virtual FormulaToken* Clone() const SAL_OVERRIDE; virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual void SetString( const svl::SharedString& rStr ) SAL_OVERRIDE; virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; DECL_FIXEDMEMPOOL_NEWDEL_DLL( FormulaStringToken ) @@ -305,6 +307,7 @@ virtual FormulaToken* Clone() const SAL_OVERRIDE; virtual svl::SharedString GetString() const SAL_OVERRIDE; + virtual void SetString( const svl::SharedString& rStr ) SAL_OVERRIDE; virtual bool operator==( const FormulaToken& rToken ) const SAL_OVERRIDE; }; diff -Nru libreoffice-5.0.2/include/oox/export/drawingml.hxx libreoffice-5.0.5~rc2/include/oox/export/drawingml.hxx --- libreoffice-5.0.2/include/oox/export/drawingml.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/oox/export/drawingml.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -74,6 +74,10 @@ virtual void WriteOutliner(const OutlinerParaObject& rParaObj) = 0; /// Write the contents of the textbox that is associated to this shape. virtual void WriteTextBox(css::uno::Reference xShape) = 0; + /// Look up the RelId of a graphic based on its checksum. + virtual OUString FindRelId(BitmapChecksum nChecksum) = 0; + /// Store the RelId of a graphic based on its checksum. + virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) = 0; protected: DMLTextExport() {} virtual ~DMLTextExport() {} @@ -99,12 +103,13 @@ ::oox::core::XmlFilterBase* mpFB; /// If set, this is the parent of the currently handled shape. com::sun::star::uno::Reference m_xParent; + bool mbIsBackgroundDark; bool GetProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, const OUString& aName ); bool GetPropertyAndState( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > rXPropSet, ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyState > rXPropState, const OUString& aName, ::com::sun::star::beans::PropertyState& eState ); - const char* GetFieldType( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsField ); + OUString GetFieldValue( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > rRun, bool& bIsURLField ); /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship @@ -118,7 +123,7 @@ public: DrawingML( ::sax_fastparser::FSHelperPtr pFS, ::oox::core::XmlFilterBase* pFB = NULL, DocumentType eDocumentType = DOCUMENT_PPTX, DMLTextExport* pTextExport = 0 ) - : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ) {} + : meDocumentType( eDocumentType ), mpTextExport(pTextExport), mpFS( pFS ), mpFB( pFB ), mbIsBackgroundDark( false ) {} void SetFS( ::sax_fastparser::FSHelperPtr pFS ) { mpFS = pFS; } ::sax_fastparser::FSHelperPtr GetFS() { return mpFS; } ::oox::core::XmlFilterBase* GetFB() { return mpFB; } @@ -126,6 +131,7 @@ /// The application-specific text exporter callback, if there is one. DMLTextExport* GetTextExport() { return mpTextExport; } + void SetBackgroundDark(bool bIsDark) { mbIsBackgroundDark = bIsDark; } /// If bRelPathToMedia is true add "../" to image folder path while adding the image relationship OUString WriteImage( const Graphic &rGraphic , bool bRelPathToMedia = false); diff -Nru libreoffice-5.0.2/include/oox/export/vmlexport.hxx libreoffice-5.0.5~rc2/include/oox/export/vmlexport.hxx --- libreoffice-5.0.2/include/oox/export/vmlexport.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/oox/export/vmlexport.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -39,6 +39,10 @@ virtual oox::drawingml::DrawingML& GetDrawingML() = 0; /// Write the contents of the textbox that is associated to this shape in VML format. virtual void WriteVMLTextBox(css::uno::Reference xShape) = 0; + /// Look up the RelId of a graphic based on its checksum. + virtual OUString FindRelId(BitmapChecksum nChecksum) = 0; + /// Store the RelId of a graphic based on its checksum. + virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) = 0; protected: VMLTextExport() {} virtual ~VMLTextExport() {} diff -Nru libreoffice-5.0.2/include/sax/tools/converter.hxx libreoffice-5.0.5~rc2/include/sax/tools/converter.hxx --- libreoffice-5.0.2/include/sax/tools/converter.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/sax/tools/converter.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -139,6 +139,12 @@ /** convert string to double number (using ::rtl::math) without unit conversion */ static bool convertDouble(double& rValue, const OUString& rString); + /** convert number, 10th of degrees with range [0..3600] to SVG angle */ + static void convertAngle(OUStringBuffer& rBuffer, sal_Int16 nAngle); + + /** convert SVG angle to number, 10th of degrees with range [0..3600] */ + static bool convertAngle(sal_Int16& rAngle, OUString const& rString); + /** convert double to ISO "duration" string; negative durations allowed */ static void convertDuration(OUStringBuffer& rBuffer, const double fTime); diff -Nru libreoffice-5.0.2/include/sfx2/objsh.hxx libreoffice-5.0.5~rc2/include/sfx2/objsh.hxx --- libreoffice-5.0.2/include/sfx2/objsh.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/sfx2/objsh.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -582,6 +582,8 @@ { return IsEnableSetModified(); } + virtual OUString getDocumentBaseURL() const SAL_OVERRIDE; + comphelper::EmbeddedObjectContainer& GetEmbeddedObjectContainer() const; void ClearEmbeddedObjects(); diff -Nru libreoffice-5.0.2/include/svl/style.hxx libreoffice-5.0.5~rc2/include/svl/style.hxx --- libreoffice-5.0.2/include/svl/style.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svl/style.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -143,6 +143,11 @@ virtual void SetHelpId( const OUString& r, sal_uLong nId ); virtual SfxItemSet& GetItemSet(); + /// Due to writer's usual lack of sanity this is a separate function for + /// preview only; it shall not create the style in case it does not exist. + /// If the style has parents, it is _not_ required that the returned item + /// set has parents (i.e. use it for display purposes only). + virtual std::unique_ptr GetItemSetForPreview(); }; /* Class to iterate and search on a SfxStyleSheetBasePool */ diff -Nru libreoffice-5.0.2/include/svl/zforlist.hxx libreoffice-5.0.5~rc2/include/svl/zforlist.hxx --- libreoffice-5.0.2/include/svl/zforlist.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svl/zforlist.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -766,6 +766,20 @@ /// Fill a NfKeywordIndex table with keywords of a language/country void FillKeywordTable( NfKeywordTable& rKeywords, LanguageType eLang ); + /** Fill a NfKeywordIndex table with keywords usable in Excel export with + GetFormatStringForExcel() or SvNumberformat::GetMappedFormatstring() */ + void FillKeywordTableForExcel( NfKeywordTable& rKeywords ); + + /** Return a format code string suitable for Excel export. + + @param rTempFormatter + SvNumberFormatter to use if a non-en-US format code needs to be + converted and put, should not be the same formatter to not + pollute the entries of this one here. + */ + OUString GetFormatStringForExcel( sal_uInt32 nKey, const NfKeywordTable& rKeywords, + SvNumberFormatter& rTempFormatter ) const; + /** Return a keyword for a language/country and NfKeywordIndex for XML import, to generate number format strings. */ OUString GetKeyword( LanguageType eLnge, sal_uInt16 nIndex ); diff -Nru libreoffice-5.0.2/include/svtools/DocumentToGraphicRenderer.hxx libreoffice-5.0.5~rc2/include/svtools/DocumentToGraphicRenderer.hxx --- libreoffice-5.0.2/include/svtools/DocumentToGraphicRenderer.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svtools/DocumentToGraphicRenderer.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -49,7 +49,8 @@ Size getDocumentSizeIn100mm( sal_Int32 aCurrentPage ); - Graphic renderToGraphic(sal_Int32 aCurrentPage, Size aDocumentSizePixel, Size aTargetSizePixel); + Graphic renderToGraphic(sal_Int32 aCurrentPage, Size aDocumentSizePixel, + Size aTargetSizePixel, Color aPageColor = COL_TRANSPARENT); }; #endif diff -Nru libreoffice-5.0.2/include/svtools/fmtfield.hxx libreoffice-5.0.5~rc2/include/svtools/fmtfield.hxx --- libreoffice-5.0.2/include/svtools/fmtfield.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svtools/fmtfield.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -66,10 +66,11 @@ bool m_bStrictFormat : 1; - bool m_bValueDirty : 1; bool m_bEnableEmptyField : 1; bool m_bAutoColor : 1; bool m_bEnableNaN : 1; + enum valueState { valueDirty, valueString, valueDouble }; + valueState m_ValueState; double m_dCurrentValue; double m_dDefaultValue; @@ -121,7 +122,7 @@ void EnableEmptyField(bool bEnable); // If disabled, the value will be resetted to the last valid value on leave - void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_bValueDirty = true; } + void SetDefaultValue(double dDefault) { m_dDefaultValue = dDefault; m_ValueState = valueDirty; } // If the current String is invalid, GetValue() returns this value double GetDefaultValue() const { return m_dDefaultValue; } diff -Nru libreoffice-5.0.2/include/svx/CommonStylePreviewRenderer.hxx libreoffice-5.0.5~rc2/include/svx/CommonStylePreviewRenderer.hxx --- libreoffice-5.0.2/include/svx/CommonStylePreviewRenderer.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svx/CommonStylePreviewRenderer.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -22,7 +22,7 @@ class SVX_DLLPUBLIC CommonStylePreviewRenderer : public sfx2::StylePreviewRenderer { - SvxFont maFont; + std::unique_ptr m_pFont; Color maFontColor; Color maBackgroundColor; Size maPixelSize; diff -Nru libreoffice-5.0.2/include/svx/dialogs.hrc libreoffice-5.0.5~rc2/include/svx/dialogs.hrc --- libreoffice-5.0.2/include/svx/dialogs.hrc 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svx/dialogs.hrc 2016-02-04 16:41:28.000000000 +0000 @@ -1044,7 +1044,6 @@ #define RID_SVXSTR_RECOVERYONLY_FINISH_DESCR (RID_SVX_START + 1289) #define RID_SVXSTR_RECOVERYONLY_FINISH (RID_SVX_START + 1290) #define RID_SVXSTR_ZOOMTOOL_HINT (RID_SVX_START + 1291) -#define RID_SVXSTR_ZOOM (RID_SVX_START + 1292) #define RID_SVXSTR_ZOOM_IN (RID_SVX_START + 1293) #define RID_SVXSTR_ZOOM_OUT (RID_SVX_START + 1294) #define RID_SVXSTR_CUSTOM (RID_SVX_START + 1295) diff -Nru libreoffice-5.0.2/include/svx/sdtacitm.hxx libreoffice-5.0.5~rc2/include/svx/sdtacitm.hxx --- libreoffice-5.0.2/include/svx/sdtacitm.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/svx/sdtacitm.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -26,7 +26,13 @@ class SdrTextAniCountItem: public SfxUInt16Item { public: SdrTextAniCountItem(sal_uInt16 nVal=0): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,nVal) {} - SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {} + SdrTextAniCountItem(SvStream& rIn): SfxUInt16Item(SDRATTR_TEXT_ANICOUNT,rIn) {} + + virtual SfxPoolItem * Create(SvStream & rStream, sal_uInt16) const SAL_OVERRIDE + { return new SdrTextAniCountItem(rStream); } + + virtual SfxPoolItem * Clone(SfxItemPool * = 0) const SAL_OVERRIDE + { return new SdrTextAniCountItem(*this); } }; #endif diff -Nru libreoffice-5.0.2/include/toolkit/awt/vclxaccessiblecomponent.hxx libreoffice-5.0.5~rc2/include/toolkit/awt/vclxaccessiblecomponent.hxx --- libreoffice-5.0.2/include/toolkit/awt/vclxaccessiblecomponent.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/toolkit/awt/vclxaccessiblecomponent.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -63,15 +63,16 @@ ,public VCLXAccessibleComponent_BASE { private: - ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow> mxWindow; - VCLXWindow* mpVCLXindow; + rtl::Reference m_xVCLXWindow; + VclPtr m_xEventSource; VCLExternalSolarLock* m_pSolarLock; -protected: - DECL_LINK( WindowEventListener, VclSimpleEvent* ); - DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); + DECL_LINK( WindowEventListener, VclSimpleEvent* ); + DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); + void DisconnectEvents(); +protected: virtual void ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ); virtual void ProcessWindowChildEvent( const VclWindowEvent& rVclWindowEvent ); virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ); @@ -80,10 +81,10 @@ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetChildAccessible( const VclWindowEvent& rVclWindowEvent ); public: - VCLXAccessibleComponent( VCLXWindow* pVCLXindow ); + VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ); virtual ~VCLXAccessibleComponent(); - VCLXWindow* GetVCLXWindow() const { return mpVCLXindow; } + VCLXWindow* GetVCLXWindow() const; VclPtr GetWindow() const; template< class derived_type > VclPtr< derived_type > GetAs() const { return VclPtr< derived_type >( static_cast< derived_type * >( GetWindow().get() ) ); } diff -Nru libreoffice-5.0.2/include/vcl/field.hxx libreoffice-5.0.5~rc2/include/vcl/field.hxx --- libreoffice-5.0.2/include/vcl/field.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/field.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -489,6 +489,7 @@ virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual void Modify() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -518,6 +519,7 @@ virtual void First() SAL_OVERRIDE; virtual void Last() SAL_OVERRIDE; virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -588,6 +590,7 @@ { return ConvertDoubleValue( static_cast(nValue), nDecDigits, eInUnit, eOutUnit ); } virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -610,6 +613,7 @@ virtual void Down() SAL_OVERRIDE; virtual void First() SAL_OVERRIDE; virtual void Last() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -644,6 +648,7 @@ Date GetFirst() const { return maFirst; } void SetLast( const Date& rNewLast ) { maLast = rNewLast; } Date GetLast() const { return maLast; } + virtual void dispose() SAL_OVERRIDE; }; @@ -679,6 +684,7 @@ tools::Time GetLast() const { return maLast; } void SetExtFormat( ExtTimeFieldFormat eFormat ); + virtual void dispose() SAL_OVERRIDE; }; @@ -697,6 +703,7 @@ virtual void Modify() SAL_OVERRIDE; virtual void ReformatAll() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -720,6 +727,7 @@ virtual void ReformatAll() SAL_OVERRIDE; void InsertValue( sal_Int64 nValue, sal_Int32 nPos = COMBOBOX_APPEND ); + virtual void dispose() SAL_OVERRIDE; }; @@ -752,6 +760,8 @@ // Needed, because GetValue() with nPos hide these functions virtual sal_Int64 GetValue( FieldUnit eOutUnit ) const SAL_OVERRIDE; virtual sal_Int64 GetValue() const SAL_OVERRIDE; + + virtual void dispose() SAL_OVERRIDE; }; @@ -773,6 +783,7 @@ virtual void ReformatAll() SAL_OVERRIDE; virtual sal_Int64 GetValue() const SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -791,6 +802,7 @@ virtual void Modify() SAL_OVERRIDE; virtual void ReformatAll() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; @@ -810,6 +822,7 @@ virtual void Modify() SAL_OVERRIDE; virtual void ReformatAll() SAL_OVERRIDE; + virtual void dispose() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_FIELD_HXX diff -Nru libreoffice-5.0.2/include/vcl/implimagetree.hxx libreoffice-5.0.5~rc2/include/vcl/implimagetree.hxx --- libreoffice-5.0.2/include/vcl/implimagetree.hxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/implimagetree.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,121 @@ +/* -*- 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/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_INCLUDE_VCL_IMPLIMAGETREE_HXX +#define INCLUDED_INCLUDE_VCL_IMPLIMAGETREE_HXX + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include + +namespace com { namespace sun { namespace star { namespace container { + class XNameAccess; +} } } } + +class ImplImageTree { +public: + VCL_DLLPUBLIC static ImplImageTree & get(); + + ImplImageTree(); + + ~ImplImageTree(); + + VCL_DLLPUBLIC OUString getImageUrl( + OUString const & name, OUString const & style, OUString const & lang); + + bool loadImage( + OUString const & name, OUString const & style, + BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); + + bool loadDefaultImage( + OUString const & style, + BitmapEx& bitmap); + + /** a crude form of life cycle control (called from DeInitVCL; otherwise, + * if the ImplImageTree singleton were destroyed during exit that would + * be too late for the destructors of the bitmaps in maIconCache)*/ + void shutDown(); + + css::uno::Reference< css::container::XNameAccess > getNameAccess(); + +private: + ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION; + ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION; + + typedef std::unordered_map, OUStringHash> IconCache; + typedef std::unordered_map IconLinkHash; + + struct IconSet { + OUString maURL; + css::uno::Reference maNameAccess; + IconCache maIconCache; + IconLinkHash maLinkHash; + + IconSet() {} + IconSet(const OUString &aURL) : maURL(aURL) {} + }; + + /// Map between the theme name(s) and the content. + typedef std::unordered_map StyleIconSet; + + /// Remember all the (used) icon styles and individual icons in them. + StyleIconSet maIconSet; + + /// Styly used for the current operations; switches switch several times during fallback search. + OUString maCurrentStyle; + + bool doLoadImage( + OUString const & name, OUString const & style, + BitmapEx & bitmap, bool localized); + + bool checkPathAccess(); + + void setStyle(OUString const & style ); + + void createStyle(); + + bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); + + bool findImage(std::vector< OUString > const & paths, BitmapEx & bitmap ); + + void loadImageLinks(); + + void parseLinkFile(std::shared_ptr stream); + + /// Return name of a real .png according to links.txt. + OUString const & getRealImageName(OUString const & name); + + /** Rerurn name of the fallback style for the provided one. + + Must not be cyclic :-) The last theme in the chain returns an empty string. + */ + static OUString fallbackStyle(const OUString &style); +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/include/vcl/layout.hxx libreoffice-5.0.5~rc2/include/vcl/layout.hxx --- libreoffice-5.0.2/include/vcl/layout.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/layout.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -559,7 +559,7 @@ class VCL_DLLPUBLIC VclScrolledWindow : public VclBin { public: - VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL); + VclScrolledWindow(vcl::Window *pParent, WinBits nStyle = WB_HIDE | WB_CLIPCHILDREN | WB_AUTOHSCROLL | WB_AUTOVSCROLL | WB_TABSTOP ); virtual ~VclScrolledWindow() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; virtual vcl::Window *get_child() SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/include/vcl/metric.hxx libreoffice-5.0.5~rc2/include/vcl/metric.hxx --- libreoffice-5.0.2/include/vcl/metric.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/metric.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -72,6 +72,7 @@ long GetExtLeading() const; long GetLineHeight() const; long GetSlant() const; + bool IsFullstopCentered() const; FontMetric& operator=( const FontMetric& rMetric ); bool operator==( const FontMetric& rMetric ) const; diff -Nru libreoffice-5.0.2/include/vcl/opengl/OpenGLContext.hxx libreoffice-5.0.5~rc2/include/vcl/opengl/OpenGLContext.hxx --- libreoffice-5.0.2/include/vcl/opengl/OpenGLContext.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/opengl/OpenGLContext.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -142,6 +142,9 @@ GLWindow() : #if defined( _WIN32 ) + hWnd(NULL), + hDC(NULL), + hRC(NULL), #elif defined( MACOSX ) #elif defined( IOS ) #elif defined( ANDROID ) diff -Nru libreoffice-5.0.2/include/vcl/ppdparser.hxx libreoffice-5.0.5~rc2/include/vcl/ppdparser.hxx --- libreoffice-5.0.2/include/vcl/ppdparser.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/vcl/ppdparser.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -71,6 +71,7 @@ const PPDValue* m_pDefaultValue; bool m_bQueryValue; PPDValue m_aQueryValue; + OUString m_aGroup; public: enum UIType { PickOne, PickMany, Boolean }; @@ -96,6 +97,7 @@ const PPDValue* getValueCaseInsensitive( const OUString& rOption ) const; const PPDValue* getDefaultValue() const { return m_pDefaultValue; } const PPDValue* getQueryValue() const { return m_bQueryValue ? &m_aQueryValue : NULL; } + const OUString& getGroup() const { return m_aGroup; } const OUString& getKey() const { return m_aKey; } bool isUIKey() const { return m_bUIOption; } @@ -184,7 +186,7 @@ ~PPDParser(); void parseOrderDependency(const OString& rLine); - void parseOpenUI(const OString& rLine); + void parseOpenUI(const OString& rLine, const OString& rPPDGroup); void parseConstraint(const OString& rLine); void parse( std::list< OString >& rLines ); diff -Nru libreoffice-5.0.2/include/xmloff/PageMasterStyleMap.hxx libreoffice-5.0.5~rc2/include/xmloff/PageMasterStyleMap.hxx --- libreoffice-5.0.2/include/xmloff/PageMasterStyleMap.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/xmloff/PageMasterStyleMap.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -96,6 +96,7 @@ #define CTF_PM_FILLHATCHNAME (XML_PM_CTF_START + 0x0040) #define CTF_PM_FILLBITMAPNAME (XML_PM_CTF_START + 0x0041) #define CTF_PM_FILLTRANSNAME (XML_PM_CTF_START + 0x0042) +#define CTF_PM_FILLBITMAPMODE (XML_PM_CTF_START + 0x0043) #define CTF_PM_SCALETO (XML_PM_CTF_START + 0x0051) // calc specific #define CTF_PM_SCALETOPAGES (XML_PM_CTF_START + 0x0052) diff -Nru libreoffice-5.0.2/include/xmloff/txtimp.hxx libreoffice-5.0.5~rc2/include/xmloff/txtimp.hxx --- libreoffice-5.0.2/include/xmloff/txtimp.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/xmloff/txtimp.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -733,6 +733,9 @@ void SetCellParaStyleDefault(OUString const& rNewValue); OUString const& GetCellParaStyleDefault(); + + void AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo); + void MapCrossRefHeadingFieldsHorribly(); }; #endif diff -Nru libreoffice-5.0.2/include/xmloff/txtprmap.hxx libreoffice-5.0.5~rc2/include/xmloff/txtprmap.hxx --- libreoffice-5.0.2/include/xmloff/txtprmap.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/xmloff/txtprmap.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -197,9 +197,10 @@ #define CTF_RELWIDTHREL (XML_TEXT_CTF_START + 168) #define CTF_RELHEIGHTREL (XML_TEXT_CTF_START + 169) #define CTF_CHAR_BACKGROUND (XML_TEXT_CTF_START + 170) -#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 171) -#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 172) -#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 173) +#define CTF_CHAR_BACKGROUND_TRANSPARENCY (XML_TEXT_CTF_START + 171) +#define CTF_CHAR_HIGHLIGHT (XML_TEXT_CTF_START + 172) +#define CTF_FILLSTYLE (XML_TEXT_CTF_START + 173) +#define CTF_FILLCOLOR (XML_TEXT_CTF_START + 174) enum class TextPropMap { diff -Nru libreoffice-5.0.2/include/xmloff/xmlimp.hxx libreoffice-5.0.5~rc2/include/xmloff/xmlimp.hxx --- libreoffice-5.0.2/include/xmloff/xmlimp.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/include/xmloff/xmlimp.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -480,9 +480,11 @@ static const sal_uInt16 LO_3x = 30 | LO_flag; static const sal_uInt16 LO_41x = 41 | LO_flag; static const sal_uInt16 LO_42x = 42 | LO_flag; - /// @ATTENTION: when adding a new value more specific than "4x", grep for + static const sal_uInt16 LO_43x = 43 | LO_flag; + static const sal_uInt16 LO_44x = 44 | LO_flag; + /// @ATTENTION: when adding a new value more specific than "5x", grep for /// all current uses and adapt them!!! - static const sal_uInt16 LO_4x = 43 | LO_flag; + static const sal_uInt16 LO_5x = 50 | LO_flag; static const sal_uInt16 ProductVersionUnknown = SAL_MAX_UINT16; /** depending on whether the generator version indicates LO, compare diff -Nru libreoffice-5.0.2/instsetoo_native/CustomTarget_install.mk libreoffice-5.0.5~rc2/instsetoo_native/CustomTarget_install.mk --- libreoffice-5.0.2/instsetoo_native/CustomTarget_install.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/instsetoo_native/CustomTarget_install.mk 2016-02-04 16:41:28.000000000 +0000 @@ -65,7 +65,7 @@ TEMPLATE_DIR=$(dir $@)msi_templates \ && rm -rf $${TEMPLATE_DIR} \ && mkdir -p $${TEMPLATE_DIR}/Binary \ -&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do $(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` ; done \ +&& for I in $(SRCDIR)/instsetoo_native/inc_$(1)/windows/msi_templates/*.* ; do $(GREP) -v '^#' "$$I" > $${TEMPLATE_DIR}/`basename $$I` || true ; done \ && $(GNUCOPY) $(SRCDIR)/instsetoo_native/inc_common/windows/msi_templates/Binary/*.* $${TEMPLATE_DIR}/Binary endef else diff -Nru libreoffice-5.0.2/instsetoo_native/CustomTarget_setup.mk libreoffice-5.0.5~rc2/instsetoo_native/CustomTarget_setup.mk --- libreoffice-5.0.2/instsetoo_native/CustomTarget_setup.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/instsetoo_native/CustomTarget_setup.mk 2016-02-04 16:41:28.000000000 +0000 @@ -103,6 +103,7 @@ && echo 'buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H)' \ ) > $@ +# for release-builds (building installers) adjust values in openoffice.lst.in $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,soffice) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff -Nru libreoffice-5.0.2/instsetoo_native/util/openoffice.lst.in libreoffice-5.0.5~rc2/instsetoo_native/util/openoffice.lst.in --- libreoffice-5.0.2/instsetoo_native/util/openoffice.lst.in 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/instsetoo_native/util/openoffice.lst.in 2016-02-04 16:41:28.000000000 +0000 @@ -16,11 +16,11 @@ SOLSUREPACKAGEPREFIX libreoffice REGISTRATION_HOST https://registration.libreoffice.org/RegistrationWeb REGISTRATIONURL http://survey.libreoffice.org/user/index.php - PROGRESSBARCOLOR 128,128,128 - PROGRESSSIZE 409,8 - PROGRESSPOSITION 72,189 - PROGRESSFRAMECOLOR 245,245,245 - PROGRESSTEXTBASELINE 170 + PROGRESSBARCOLOR 0,0,0 + PROGRESSSIZE 444,8 + PROGRESSPOSITION 35,153 + PROGRESSFRAMECOLOR 102,102,102 + PROGRESSTEXTBASELINE 145 PROGRESSTEXTCOLOR 255,255,255 NATIVEPROGRESS false REGISTRYLAYERNAME Layers diff -Nru libreoffice-5.0.2/javaunohelper/BUCK libreoffice-5.0.5~rc2/javaunohelper/BUCK --- libreoffice-5.0.2/javaunohelper/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/javaunohelper/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,20 @@ + +java_sources( + name = 'juh-src', + srcs = glob(['com/**']), + visibility = ['PUBLIC'], +) + +java_doc( + name = 'juh-javadoc', + title = 'LibreOffice Makes it easier to use UNO with Java', + pkgs = [ + 'com.sun.star', + ], + paths = ['.'], + srcs = glob(['com/**']), + deps = [ + '//:juh', + ], + visibility = ['PUBLIC'], +) diff -Nru libreoffice-5.0.2/javaunohelper/com/sun/star/comp/helper/Bootstrap.java libreoffice-5.0.5~rc2/javaunohelper/com/sun/star/comp/helper/Bootstrap.java --- libreoffice-5.0.2/javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/javaunohelper/com/sun/star/comp/helper/Bootstrap.java 2016-02-04 16:41:28.000000000 +0000 @@ -91,6 +91,34 @@ } /** + * Returns an array of default commandline options to start bootstrapped + * instance of soffice with. You may use it in connection with bootstrap + * method for example like this: + * 
+     *     List list = Arrays.asList( Bootstrap.getDefaultOptions() );
+     *     list.remove("--nologo");
+     *     list.remove("--nodefault");
+     *     list.add("--invisible");
+     *
+     *     Bootstrap.bootstrap( list.toArray( new String[list.size()] );
+     *
+ * + * @return an array of default commandline options + * @see #bootstrap( String[] ) + * @since LibreOffice 5.1 + */ + public static final String[] getDefaultOptions() + { + return new String[] + { + "--nologo", + "--nodefault", + "--norestore", + "--nolockcheck" + }; + } + + /** * backwards compatibility stub. */ static public XComponentContext createInitialComponentContext( Hashtable context_entries ) @@ -247,6 +275,24 @@ public static final XComponentContext bootstrap() throws BootstrapException { + String[] defaultArgArray = getDefaultOptions(); + return bootstrap( defaultArgArray ); + } + + /** + * Bootstraps the component context from a UNO installation. + * + * @param argArray + * an array of strings - commandline options to start instance of + * soffice with + * @see #getDefaultOptions() + * @return a bootstrapped component context. + * + * @since LibreOffice 5.1 + */ + public static final XComponentContext bootstrap( String[] argArray ) + throws BootstrapException { + XComponentContext xContext = null; try { @@ -270,13 +316,11 @@ Long.toString( (new Random()).nextLong() & 0x7fffffffffffffffL ); // create call with arguments - String[] cmdArray = new String[] { - fOffice.getPath(), - "--nologo", - "--nodefault", - "--norestore", - "--nolockcheck", - "--accept=pipe,name=" + sPipeName + ";urp;" }; + String[] cmdArray = new String[ argArray.length + 2 ]; + cmdArray[0] = fOffice.getPath(); + cmdArray[1] = ( "--accept=pipe,name=" + sPipeName + ";urp;" ); + + System.arraycopy( argArray, 0, cmdArray, 2, argArray.length ); // start office process Process p = Runtime.getRuntime().exec( cmdArray ); diff -Nru libreoffice-5.0.2/javaunohelper/pom.juh.xml libreoffice-5.0.5~rc2/javaunohelper/pom.juh.xml --- libreoffice-5.0.2/javaunohelper/pom.juh.xml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/javaunohelper/pom.juh.xml 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,44 @@ + + 4.0.0 + org.libreoffice + juh + @version@ + jar + LibreOffice - Java UNO helper + Java UNO helper + https://www.libreoffice.org + + + + Mozilla Public License, Version 2.0 + https://www.mozilla.org/en-US/MPL/2.0 + repo + + + + + http://cgit.freedesktop.org/libreoffice/core + https://gerrit.libreoffice.org/#/admin/projects/core + + + + + The Document Foundation + + + + + + LibreOffice Development Mailing List + libreoffice@lists.freedesktop.org + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/archives/libreoffice + + + + + https://bugs.documentfoundation.org + LibreOffice Issue Tracker + + diff -Nru libreoffice-5.0.2/javaunohelper/source/javaunohelper.cxx libreoffice-5.0.5~rc2/javaunohelper/source/javaunohelper.cxx --- libreoffice-5.0.2/javaunohelper/source/javaunohelper.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/javaunohelper/source/javaunohelper.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -69,8 +69,6 @@ osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL); if (lib.is()) { - lib.release(); - // ========================= LATEST VERSION ========================= OUString aGetEnvName( COMPONENT_GETENV ); oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName); @@ -126,6 +124,7 @@ } } } + lib.release(); } #endif return bRet ? JNI_TRUE : JNI_FALSE; @@ -161,8 +160,6 @@ osl::Module lib(aLibName, SAL_LOADMODULE_LAZY | SAL_LOADMODULE_GLOBAL); if (lib.is()) { - lib.release(); - // ========================= LATEST VERSION ========================= OUString aGetEnvName( COMPONENT_GETENV ); oslGenericFunction pSym = lib.getFunctionSymbol(aGetEnvName); @@ -232,6 +229,7 @@ } } } + lib.release(); } #endif return joSLL_cpp; diff -Nru libreoffice-5.0.2/jurt/BUCK libreoffice-5.0.5~rc2/jurt/BUCK --- libreoffice-5.0.2/jurt/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/jurt/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,21 @@ + +java_sources( + name = 'jurt-src', + srcs = glob(['com/**']), + visibility = ['PUBLIC'], +) + +java_doc( + name = 'jurt-javadoc', + title = 'LibreOffice Java Uno Runtime', + pkgs = [ + 'com.sun.star', + ], + paths = ['.'], + srcs = glob(['com/**']), + deps = [ + '//:jurt', + '//:unoloader', + ], + visibility = ['PUBLIC'], +) diff -Nru libreoffice-5.0.2/jurt/pom.jurt.xml libreoffice-5.0.5~rc2/jurt/pom.jurt.xml --- libreoffice-5.0.2/jurt/pom.jurt.xml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/jurt/pom.jurt.xml 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,44 @@ + + 4.0.0 + org.libreoffice + jurt + @version@ + jar + LibreOffice - Java Uno Runtime + Java Uno Runtime + https://www.libreoffice.org + + + + Mozilla Public License, Version 2.0 + https://www.mozilla.org/en-US/MPL/2.0 + repo + + + + + http://cgit.freedesktop.org/libreoffice/core + https://gerrit.libreoffice.org/#/admin/projects/core + + + + + The Document Foundation + + + + + + LibreOffice Development Mailing List + libreoffice@lists.freedesktop.org + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/archives/libreoffice + + + + + https://bugs.documentfoundation.org + LibreOffice Issue Tracker + + diff -Nru libreoffice-5.0.2/l10ntools/source/xmlparse.cxx libreoffice-5.0.5~rc2/l10ntools/source/xmlparse.cxx --- libreoffice-5.0.2/l10ntools/source/xmlparse.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/l10ntools/source/xmlparse.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1144,7 +1144,7 @@ icu::UnicodeString sReturn; int32_t nEndPos = 0; int32_t nStartPos = 0; - while( aRegexMatcher.find(nStartPos, nIcuErr) && nIcuErr == U_ZERO_ERROR ) + while( aRegexMatcher.find(nStartPos, nIcuErr) && U_SUCCESS(nIcuErr) ) { nStartPos = aRegexMatcher.start(nIcuErr); if ( nEndPos < nStartPos ) diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/bencont.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/bencont.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/bencont.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/bencont.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -231,7 +231,7 @@ */ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream) { - CBenPropertyName * pPropertyName; + CBenPropertyName * pPropertyName(nullptr); RegisterPropertyName(sPropertyName, &pPropertyName); // Get property name object if (NULL == pPropertyName) diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwp9reader.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwp9reader.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwp9reader.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwp9reader.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -192,7 +192,7 @@ //Register Styles RegisteArrowStyles(); - doc->RegisterStyle(); + doc->DoRegisterStyle(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); pXFStyleManager->ToXml(m_pStream); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpcelllayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcelllayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpcelllayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcelllayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -121,8 +121,9 @@ */ void LwpCellLayout::SetCellMap() { - // this function is called from LwpTableLayout, so it can't be NULL - GetTableLayout()->SetWordProCellMap(crowid, ccolid, this); + LwpTableLayout * pTableLayout = GetTableLayout(); + if (pTableLayout) + pTableLayout->SetWordProCellMap(crowid, ccolid, this); } /** * @short Get actual width of this cell layout @@ -269,7 +270,7 @@ if (!pLayoutNumerics) { // if current layout doesn't have format, go to based on layout - LwpCellLayout* pCellLayout = dynamic_cast(m_BasedOnStyle.obj().get()); + LwpCellLayout* pCellLayout = dynamic_cast(GetBasedOnStyle().get()); if (pCellLayout) { pLayoutNumerics = dynamic_cast(pCellLayout->GetNumericsObject().obj().get()); @@ -327,7 +328,7 @@ // we should judt its style by current position if (pTable->GetDefaultCellStyle() == GetObjectID()) { - aStyleName = GetCellStyleName(nRow, nCol, pTable->GetTableLayout()); + aStyleName = GetCellStyleName(nRow, nCol, pTable->GetTableLayout().get()); } // content of cell @@ -422,10 +423,7 @@ LwpCellBorderType LwpCellLayout::GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) { if (!pTableLayout) - { - assert(false); return enumWholeBorder; - } // get left cell and judge if neighbour border is different XFBorders * pBorders = GetXFBorders(); @@ -571,8 +569,8 @@ */ void LwpCellLayout::RegisterStyle() { - LwpVirtualLayout * pParent = dynamic_cast(GetParent().obj().get()); - if (!pParent || pParent->GetLayoutType() != LWP_ROW_LAYOUT) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (!xParent.is() || xParent->GetLayoutType() != LWP_ROW_LAYOUT) { // default cell layout, we must register 4 styles for it RegisterDefaultCell(); @@ -598,7 +596,7 @@ if (pObj.is()) { pObj->SetFoundry(m_pFoundry); - pObj->RegisterStyle(); + pObj->DoRegisterStyle(); } //register child layout style @@ -649,15 +647,15 @@ { bool bProtected = false; // judge current cell - if (IsProtected()) + if (GetIsProtected()) { bProtected = true; } else { // judge base on - LwpCellLayout * pBase = dynamic_cast(m_BasedOnStyle.obj().get()); - if (pBase && pBase->IsProtected()) + LwpCellLayout * pBase = dynamic_cast(GetBasedOnStyle().get()); + if (pBase && pBase->GetIsProtected()) { bProtected = true; } @@ -665,9 +663,9 @@ { // judge whole table LwpTable * pTable = dynamic_cast(aTableID.obj().get()); - LwpTableLayout * pTableLayout = pTable ? static_cast(pTable->GetTableLayout()) : NULL; - LwpSuperTableLayout * pSuper = pTableLayout ? pTableLayout->GetSuperTableLayout() : NULL; - if (pSuper && pSuper->IsProtected()) + rtl::Reference xTableLayout(pTable ? pTable->GetTableLayout() : nullptr); + LwpSuperTableLayout * pSuper = xTableLayout.is() ? xTableLayout->GetSuperTableLayout() : nullptr; + if (pSuper && pSuper->GetIsProtected()) { bProtected = true; } @@ -695,8 +693,10 @@ */ void LwpConnectedCellLayout::SetCellMap() { - // this function is called from LwpTableLayout, so it can't be NULL LwpTableLayout * pTableLayout = GetTableLayout(); + if (!pTableLayout) + return; + sal_uInt16 nRowSpan = m_nRealrowspan; for (sal_uInt16 iLoop = 0; iLoop < nRowSpan; iLoop ++) @@ -761,7 +761,11 @@ } } - if ( (nRow + nRowSpan) == pTableLayout->GetTable()->GetRow() ) + LwpTable* pTable = pTableLayout->GetTable(); + if (!pTable) + throw std::runtime_error("missing table"); + + if ( (nRow + nRowSpan) == pTable->GetRow()) { bNoBottomBorder = false; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpcontent.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcontent.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpcontent.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcontent.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -125,17 +125,20 @@ pStrm->SkipExtra(); } -LwpVirtualLayout* LwpContent::GetLayout(LwpVirtualLayout* pStartLayout) +rtl::Reference LwpContent::GetLayout(LwpVirtualLayout* pStartLayout) { return m_LayoutsWithMe.GetLayout(pStartLayout); } bool LwpContent::HasNonEmbeddedLayouts() { - LwpVirtualLayout* pLayout = NULL; - while( (pLayout = GetLayout(pLayout)) ) + rtl::Reference xLayout; + while (true) { - if(!pLayout->NoContentReference()) + xLayout = GetLayout(xLayout.get()); + if (!xLayout.is()) + break; + if (!xLayout->NoContentReference()) return true; } return false; @@ -143,10 +146,13 @@ bool LwpContent::IsStyleContent() { - LwpVirtualLayout* pLayout = NULL; - while( (pLayout = GetLayout(pLayout)) ) + rtl::Reference xLayout; + while (true) { - if(pLayout->IsStyleLayout()) + xLayout = GetLayout(xLayout.get()); + if (!xLayout.is()) + break; + if (xLayout->IsStyleLayout()) return true; } return false; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpcontent.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcontent.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpcontent.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpcontent.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -110,7 +110,7 @@ void Read() SAL_OVERRIDE; public: inline LwpAssociatedLayouts& GetLayoutsWithMe(); - LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout); + rtl::Reference GetLayout(LwpVirtualLayout* pStartLayout); inline bool IsActive(); virtual bool IsTable(); inline OUString GetClassName(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpdivinfo.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdivinfo.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpdivinfo.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdivinfo.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -166,10 +166,10 @@ LwpDocument* pDiv = GetDivision(); if(!pDiv) return 0; - LwpDLVListHeadTailHolder* pHeadTail = static_cast(pDiv->GetPageHintsID().obj().get()); + LwpDLVListHeadTailHolder* pHeadTail = dynamic_cast(pDiv->GetPageHintsID().obj().get()); if(pHeadTail) { - LwpPageHint* pPageHint =static_cast(pHeadTail->GetTail().obj().get()); + LwpPageHint* pPageHint = dynamic_cast(pHeadTail->GetTail().obj().get()); if(pPageHint && !pPageHint->GetPageLayoutID().IsNull()) { return pPageHint->GetPageNumber(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpdoc.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdoc.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpdoc.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdoc.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -70,7 +70,8 @@ LwpDocument::LwpDocument(LwpObjectHeader& objHdr, LwpSvStream* pStrm) : LwpDLNFPVList(objHdr, pStrm) - , m_pOwnedFoundry(NULL) + , m_pOwnedFoundry(nullptr) + , m_bGettingFirstDivisionWithContentsThatIsNotOLE(false) , m_nFlags(0) , m_nPersistentFlags(0) , m_pLnOpts(NULL) @@ -166,7 +167,7 @@ rtl::Reference pDocSock = GetSocket().obj( VO_DOCSOCK ); if(pDocSock.is()) { - pDocSock->Parse(pOutputStream); + pDocSock->DoParse(pOutputStream); } } @@ -224,7 +225,7 @@ rtl::Reference pDocSock = GetSocket().obj(); if(pDocSock.is()) { - pDocSock->RegisterStyle(); + pDocSock->DoRegisterStyle(); } } /** @@ -233,7 +234,9 @@ void LwpDocument::RegisterTextStyles() { //Register all text styles: para styles, character styles - LwpDLVListHeadHolder* pParaStyleHolder = dynamic_cast(m_pFoundry->GetTextStyleHead().obj().get()); + LwpDLVListHeadHolder* pParaStyleHolder = m_pFoundry + ? dynamic_cast(m_pFoundry->GetTextStyleHead().obj().get()) + : nullptr; if(pParaStyleHolder) { LwpTextStyle* pParaStyle = dynamic_cast (pParaStyleHolder->GetHeadID().obj().get()); @@ -252,12 +255,15 @@ */ void LwpDocument::RegisterLayoutStyles() { - //Register all layout styles, before register all styles in para - m_pFoundry->RegisterAllLayouts(); + if (m_pFoundry) + { + //Register all layout styles, before register all styles in para + m_pFoundry->RegisterAllLayouts(); + } //set initial pagelayout in story for parsing pagelayout LwpDivInfo* pDivInfo = dynamic_cast (m_DivInfo.obj( VO_DIVISIONINFO).get()); - if(pDivInfo) + if (pDivInfo) { LwpPageLayout* pPageLayout = dynamic_cast(pDivInfo->GetInitialLayoutID().obj(VO_PAGELAYOUT).get()); if(pPageLayout) @@ -279,16 +285,18 @@ void LwpDocument::RegisterStylesInPara() { //Register all automatic styles in para - LwpHeadContent* pContent = dynamic_cast (m_pFoundry->GetContentManager().GetContentList().obj().get()); - if(pContent) + rtl::Reference xContent(m_pFoundry + ? dynamic_cast (m_pFoundry->GetContentManager().GetContentList().obj().get()) + : nullptr); + if (xContent.is()) { - LwpStory* pStory = dynamic_cast(pContent->GetChildHead().obj(VO_STORY).get()); - while(pStory) + rtl::Reference xStory(dynamic_cast(xContent->GetChildHead().obj(VO_STORY).get())); + while (xStory.is()) { //Register the child para - pStory->SetFoundry(m_pFoundry); - pStory->RegisterStyle(); - pStory = dynamic_cast(pStory->GetNext().obj(VO_STORY).get()); + xStory->SetFoundry(m_pFoundry); + xStory->DoRegisterStyle(); + xStory.set(dynamic_cast(xStory->GetNext().obj(VO_STORY).get())); } } } @@ -297,19 +305,20 @@ */ void LwpDocument::RegisterBulletStyles() { + if (!m_pFoundry) + return; //Register bullet styles LwpDLVListHeadHolder* mBulletHead = dynamic_cast (m_pFoundry->GetBulletManagerID().obj(VO_HEADHOLDER).get()); - if( mBulletHead ) - { - LwpSilverBullet* pBullet = dynamic_cast - (mBulletHead->GetHeadID().obj().get()); - while(pBullet) - { - pBullet->SetFoundry(m_pFoundry); - pBullet->RegisterStyle(); - pBullet = dynamic_cast (pBullet->GetNext().obj().get()); - } + if (!mBulletHead) + return; + LwpSilverBullet* pBullet = dynamic_cast + (mBulletHead->GetHeadID().obj().get()); + while(pBullet) + { + pBullet->SetFoundry(m_pFoundry); + pBullet->RegisterStyle(); + pBullet = dynamic_cast (pBullet->GetNext().obj().get()); } } /** @@ -317,13 +326,14 @@ */ void LwpDocument::RegisterGraphicsStyles() { + if (!m_pFoundry) + return; //Register all graphics styles, the first object should register the next; rtl::Reference pGraphic = m_pFoundry->GetGraphicListHead().obj(VO_GRAPHIC); - if(pGraphic.is()) - { - pGraphic->SetFoundry(m_pFoundry); - pGraphic->RegisterStyle(); - } + if (!pGraphic.is()) + return; + pGraphic->SetFoundry(m_pFoundry); + pGraphic->DoRegisterStyle(); } /** * @descr Register line number styles @@ -412,7 +422,7 @@ return; } pLayoutObj->SetFoundry(m_pFoundry); - pLayoutObj->Parse(pOutputStream); + pLayoutObj->DoParse(pOutputStream); } /** @@ -540,7 +550,7 @@ LwpDocument* pDivision = GetLastDivision(); - while(pDivision) + while (pDivision && pDivision != this) { LwpDocument* pContentDivision = pDivision->GetLastDivisionWithContents(); if(pContentDivision) @@ -610,7 +620,7 @@ /** * @descr Get first division with contents that is not ole, copy from lwp-source code */ - LwpDocument* LwpDocument::GetFirstDivisionWithContentsThatIsNotOLE() + LwpDocument* LwpDocument::ImplGetFirstDivisionWithContentsThatIsNotOLE() { LwpDivInfo* pDivInfo = dynamic_cast(GetDivInfoID().obj().get()); if(pDivInfo && pDivInfo->HasContents() @@ -634,10 +644,10 @@ LwpDocument* LwpDocument::GetLastDivisionThatHasEndnote() { LwpDocument* pRoot = GetRootDocument(); - LwpDocument *pLastDoc = pRoot->GetLastDivisionWithContents(); - while(pLastDoc) + LwpDocument *pLastDoc = pRoot ? pRoot->GetLastDivisionWithContents() : nullptr; + while (pLastDoc) { - if(pLastDoc->GetEnSuperTableLayout()) + if (pLastDoc->GetEnSuperTableLayout().is()) return pLastDoc; pLastDoc = pLastDoc->GetPreviousDivisionWithContents(); } @@ -647,14 +657,14 @@ /** * @descr Get endnote supertable layout, every division has only one endnote supertable layout. */ - LwpVirtualLayout* LwpDocument::GetEnSuperTableLayout() +rtl::Reference LwpDocument::GetEnSuperTableLayout() { LwpHeadLayout* pHeadLayout = dynamic_cast(GetFoundry()->GetLayout().obj().get()); if(pHeadLayout) { return pHeadLayout->FindEnSuperTableLayout(); } - return NULL; + return rtl::Reference(); } /** @@ -782,11 +792,11 @@ { rtl::Reference pDoc = GetNext().obj(); if(pDoc.is()) - pDoc->RegisterStyle(); + pDoc->DoRegisterStyle(); pDoc = GetChildHead().obj(); if(pDoc.is()) - pDoc->RegisterStyle(); + pDoc->DoRegisterStyle(); } /** * @descr parse contents of documents plugged @@ -795,11 +805,11 @@ { rtl::Reference pDoc = GetChildHead().obj(); if(pDoc.is()) - pDoc->Parse(pOutputStream); + pDoc->DoParse(pOutputStream); pDoc = GetNext().obj(); if(pDoc.is()) - pDoc->Parse(pOutputStream); + pDoc->DoParse(pOutputStream); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpdoc.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdoc.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpdoc.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpdoc.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -89,6 +89,7 @@ private: LwpFoundry* m_pOwnedFoundry; + bool m_bGettingFirstDivisionWithContentsThatIsNotOLE; //Data members in file format LwpObjectID m_DocSockID; @@ -137,8 +138,7 @@ void RegisterStyle() SAL_OVERRIDE; inline bool IsChildDoc(); - inline bool HonorProtection(); - inline LwpObjectID& GetContentList(); + inline bool GetHonorProtection(); inline LwpObjectID& GetDocData(); inline LwpObjectID& GetSocket(); @@ -160,12 +160,20 @@ LwpDocument* GetLastDivisionWithContents(); LwpDocument* GetLastInGroupWithContents(); LwpDocument* GetRootDocument(); - LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE(); + LwpDocument* GetFirstDivisionWithContentsThatIsNotOLE() + { + if (m_bGettingFirstDivisionWithContentsThatIsNotOLE) + throw std::runtime_error("recursion in page divisions"); + m_bGettingFirstDivisionWithContentsThatIsNotOLE = true; + LwpDocument* pRet = ImplGetFirstDivisionWithContentsThatIsNotOLE(); + m_bGettingFirstDivisionWithContentsThatIsNotOLE = false; + return pRet; + } LwpDocument* GetLastDivisionThatHasEndnote(); LwpDocument* GetLastDivision(); LwpDocument* GetFirstDivision(); - LwpVirtualLayout* GetEnSuperTableLayout(); + rtl::Reference GetEnSuperTableLayout(); bool GetNumberOfPages(LwpDocument* pEndDivision, sal_uInt16& nCount); sal_uInt16 GetNumberOfPagesBefore(); @@ -173,6 +181,7 @@ private: void MaxNumberOfPages(sal_uInt16& nNumPages); + LwpDocument* ImplGetFirstDivisionWithContentsThatIsNotOLE(); void XFConvertFrameInPage(XFContentContainer* pCont); static void ChangeStyleName(); bool IsSkippedDivision(); @@ -182,14 +191,10 @@ { return (m_nPersistentFlags & DOC_CHILDDOC) != 0; } -inline bool LwpDocument::HonorProtection() +inline bool LwpDocument::GetHonorProtection() { return (m_nPersistentFlags & DOC_PROTECTED) != 0; } -inline LwpObjectID& LwpDocument::GetContentList() -{ - return m_pFoundry->GetContentManager().GetContentList(); -} inline LwpObjectID& LwpDocument::GetSocket() { return m_DocSockID; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfilter.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfilter.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfilter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfilter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -148,8 +148,8 @@ { SvStream * pDecompressed = NULL; - sal_uInt32 nTag; pStream->Seek(0x10); + sal_uInt32 nTag(0); pStream->ReadUInt32( nTag ); if (nTag != 0x3750574c) // "LWP7" { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfnlayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfnlayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfnlayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfnlayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -119,14 +119,14 @@ { // register cells' style LwpObjectID& rCellID = GetChildHead(); - LwpCellLayout * pCellLayout = static_cast(rCellID.obj().get()); + LwpCellLayout * pCellLayout = dynamic_cast(rCellID.obj().get()); while(pCellLayout) { pCellLayout->SetFoundry(m_pFoundry); pCellLayout->RegisterStyle(); rCellID = pCellLayout->GetNext(); - pCellLayout = static_cast(rCellID.obj().get()); + pCellLayout = dynamic_cast(rCellID.obj().get()); } } @@ -164,7 +164,7 @@ if (pObj.is()) { pObj->SetFoundry(m_pFoundry); - pObj->RegisterStyle(); + pObj->DoRegisterStyle(); } } @@ -199,14 +199,14 @@ { // register style of rows LwpObjectID& rRowID = GetChildHead(); - LwpRowLayout * pRowLayout = static_cast(rRowID.obj().get()); + LwpRowLayout * pRowLayout = dynamic_cast(rRowID.obj().get()); while (pRowLayout) { pRowLayout->SetFoundry(m_pFoundry); pRowLayout->RegisterStyle(); rRowID = pRowLayout->GetNext(); - pRowLayout = static_cast(rRowID.obj().get()); + pRowLayout = dynamic_cast(rRowID.obj().get()); } } @@ -241,7 +241,7 @@ if (pTableLayout != NULL) { pTableLayout->SetFoundry(m_pFoundry); - pTableLayout->RegisterStyle(); + pTableLayout->DoRegisterStyle(); } } @@ -262,7 +262,7 @@ while(!rID.IsNull()) { - LwpVirtualLayout * pLayout = static_cast(rID.obj().get()); + LwpVirtualLayout * pLayout = dynamic_cast(rID.obj().get()); if(!pLayout) { break; @@ -318,7 +318,7 @@ while(!rID.IsNull()) { - LwpVirtualLayout * pLayout = static_cast(rID.obj().get()); + LwpVirtualLayout * pLayout = dynamic_cast(rID.obj().get()); if(!pLayout) { break; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfont.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfont.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfont.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfont.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -399,8 +399,13 @@ if(m_pFontNames[index-1].IsAltFaceNameOverridden()) pFont->SetFontNameAsia(m_FontTbl.GetFaceName(m_pFontNames[index-1].GetAltFaceID())); } + OUString LwpFontNameManager::GetNameByIndex(sal_uInt16 index) + //index: start from 1 { + if (index > m_nCount || index < 1) + return OUString(); + sal_uInt16 nameindex = m_pFontNames[index-1].GetFaceID(); return (m_FontTbl.GetFaceName(nameindex)); } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfootnote.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfootnote.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfootnote.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfootnote.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -181,7 +181,7 @@ if(pContent) { pContent->SetFoundry(m_pFoundry); - pContent->RegisterStyle(); + pContent->DoRegisterStyle(); } } } @@ -206,7 +206,7 @@ LwpEnSuperTableLayout* pEnSuperLayout = FindFootnoteTableLayout(); if(pEnSuperLayout) { - LwpTableLayout* pTableLayout = static_cast(pEnSuperLayout->GetMainTableLayout()); + LwpTableLayout* pTableLayout = dynamic_cast(pEnSuperLayout->GetMainTableLayout()); if(pTableLayout) { LwpRowLayout* pRowLayout = pTableLayout->GetRowLayout(m_nRow); @@ -372,7 +372,7 @@ while ((pContent = pFoundry->EnumContents(pContent)) != NULL) if (pContent->IsTable() && (strClassName.equals(pContent->GetClassName())) && - pContent->IsActive() && pContent->GetLayout(NULL)) + pContent->IsActive() && pContent->GetLayout(nullptr).is()) { // Found it! return static_cast( @@ -390,7 +390,7 @@ LwpContent* pContent = dynamic_cast(m_Content.obj().get()); //if the content has layout, the content has footnote contents; //or looking for the celllayout and return the footnote contents. - if(pContent && pContent->GetLayout(NULL)) + if (pContent && pContent->GetLayout(nullptr).is()) return pContent; LwpCellLayout* pCellLayout = GetCellLayout(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfoundry.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfoundry.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfoundry.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfoundry.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -202,7 +202,7 @@ if( pStyle.is() ) { pStyle->SetFoundry(this); - pStyle->RegisterStyle(); + pStyle->DoRegisterStyle(); } //register content page layout list: Layout @@ -210,7 +210,7 @@ if( pStyle.is() ) { pStyle->SetFoundry(this); - pStyle->RegisterStyle(); + pStyle->DoRegisterStyle(); } //Register page style layout list: PageStyle, such as "Default Page" @@ -218,7 +218,7 @@ if( pStyle.is() ) { pStyle->SetFoundry(this); - pStyle->RegisterStyle(); + pStyle->DoRegisterStyle(); } //Register FrameStyle @@ -226,25 +226,28 @@ if( pStyle.is() ) { pStyle->SetFoundry(this); - pStyle->RegisterStyle(); + pStyle->DoRegisterStyle(); } } LwpBookMark* LwpFoundry::GetBookMark(LwpObjectID objMarker) { - LwpDLVListHeadHolder* pHeadHolder= static_cast + LwpDLVListHeadHolder* pHeadHolder= dynamic_cast (m_BookMarkHead.obj().get()); + + if (!pHeadHolder) + return nullptr; + LwpObjectID& rObjID = pHeadHolder->GetHeadID(); - LwpBookMark* pBookMark; - pBookMark = static_cast(rObjID.obj().get()); + LwpBookMark* pBookMark = dynamic_cast(rObjID.obj().get()); while (pBookMark) { if (pBookMark->IsRightMarker(objMarker)) return pBookMark; rObjID = pBookMark->GetNext(); - pBookMark = static_cast(rObjID.obj().get()); + pBookMark = dynamic_cast(rObjID.obj().get()); } return NULL; } @@ -273,7 +276,7 @@ */ LwpObjectID * LwpFoundry::GetDefaultTextStyle() { - LwpVersionedPointer * pPointer = static_cast(m_DefaultTextStyle.obj().get()); + LwpVersionedPointer * pPointer = dynamic_cast(m_DefaultTextStyle.obj().get()); if (!pPointer) return NULL; @@ -287,16 +290,16 @@ LwpObjectID * LwpFoundry::FindParaStyleByName(const OUString& name) { //Register all text styles: para styles, character styles - LwpDLVListHeadHolder* pParaStyleHolder = static_cast(GetTextStyleHead().obj().get()); + LwpDLVListHeadHolder* pParaStyleHolder = dynamic_cast(GetTextStyleHead().obj().get()); if(pParaStyleHolder) { - LwpTextStyle* pParaStyle = static_cast (pParaStyleHolder->GetHeadID().obj().get()); + LwpTextStyle* pParaStyle = dynamic_cast (pParaStyleHolder->GetHeadID().obj().get()); while(pParaStyle) { OUString strName = pParaStyle->GetName().str(); if(strName == name) return &pParaStyle->GetObjectID(); - pParaStyle = static_cast(pParaStyle->GetNext().obj().get()); + pParaStyle = dynamic_cast(pParaStyle->GetNext().obj().get()); } } @@ -405,8 +408,8 @@ { if(pContent) return pContent->GetNextEnumerated(); - LwpVersionedPointer* pPointer = static_cast(m_EnumHead.obj().get()); - return pPointer ? static_cast(pPointer->GetPointer().obj().get()) : NULL; + LwpVersionedPointer* pPointer = dynamic_cast(m_EnumHead.obj().get()); + return pPointer ? dynamic_cast(pPointer->GetPointer().obj().get()) : nullptr; } void LwpPieceManager::Read(LwpObjectStream *pStrm) @@ -457,14 +460,14 @@ { // If Last has a next, return it. if(pLast && !pLast->GetNext().IsNull()) - return static_cast(pLast->GetNext().obj().get()); + return dynamic_cast(pLast->GetNext().obj().get()); LwpListList* pList = NULL; if(pLast) { // We're at the end of Last's list (not Liszt's list). // Start with the next active list - pList = static_cast(pLast->GetListList().obj().get()); + pList = dynamic_cast(pLast->GetListList().obj().get()); pList= GetNextActiveListList(pList); } else @@ -475,7 +478,7 @@ if(pList) { - return static_cast(pList->GetHead().obj().get()); + return dynamic_cast(pList->GetHead().obj().get()); } return NULL; @@ -489,23 +492,22 @@ { LwpListList* pList = NULL; if(pLast) - pList = static_cast(pLast->GetNext().obj().get()); + pList = dynamic_cast(pLast->GetNext().obj().get()); else { - LwpDLVListHeadHolder* pHeadHolder= static_cast(m_Head.obj().get()); + LwpDLVListHeadHolder* pHeadHolder= dynamic_cast(m_Head.obj().get()); if(pHeadHolder) { - pList = static_cast(pHeadHolder->GetHeadID().obj().get()); + pList = dynamic_cast(pHeadHolder->GetHeadID().obj().get()); } } while(pList) { - LwpContent* pContent = static_cast(pList->GetObject().obj().get()); - if(pContent && pContent->HasNonEmbeddedLayouts() && - !pContent->IsStyleContent()) + LwpContent* pContent = dynamic_cast(pList->GetObject().obj().get()); + if (pContent && pContent->HasNonEmbeddedLayouts() && !pContent->IsStyleContent()) return pList; - pList = static_cast(pList->GetNext().obj().get()); + pList = dynamic_cast(pList->GetNext().obj().get()); } return NULL; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpframelayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpframelayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpframelayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpframelayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -189,34 +189,36 @@ */ void LwpFrame::XFConvert(XFContentContainer* pCont) { - //parse the frame which anchor to page - LwpVirtualLayout* pParent = m_pLayout->GetParentLayout(); - if(pParent->IsPage()&& pParent->GetParentLayout()->IsPage()) + // parse the frame which anchor to page + rtl::Reference xParent = m_pLayout->GetParentLayout(); + if (!xParent.is()) + throw std::runtime_error("missing Parent Layout"); + if (xParent->IsPage() && xParent->GetParentLayout().is() && xParent->GetParentLayout()->IsPage()) { //for mirror page, problems exist if the parent layout is header or footer layout, - pParent = pParent->GetParentLayout(); + xParent = xParent->GetParentLayout(); } - if(m_pLayout->IsAnchorPage()&& pParent->IsPage()) + if(m_pLayout->IsAnchorPage()&& xParent->IsPage()) { //get parent layout if(m_pLayout->IsUseOnPage()) { - sal_Int32 nPageNo = pParent->GetPageNumber(m_pLayout->GetUsePage()); + sal_Int32 nPageNo = xParent->GetPageNumber(m_pLayout->GetUsePage()); if(nPageNo>0) m_pLayout->XFConvertFrame(pCont, nPageNo); } else if(m_pLayout->IsUseOnAllPages()) { - sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO); - sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO); + sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO); + sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO); if(nLast > 0) m_pLayout->XFConvertFrame(pCont, nFirst, nLast, true); } else if(m_pLayout->IsUseOnAllOddPages()||m_pLayout->IsUseOnAllEvenPages()) { - sal_Int32 nFirst = pParent->GetPageNumber(FIRST_LAYOUTPAGENO); - sal_Int32 nLast = pParent->GetPageNumber(LAST_LAYOUTPAGENO); + sal_Int32 nFirst = xParent->GetPageNumber(FIRST_LAYOUTPAGENO); + sal_Int32 nLast = xParent->GetPageNumber(LAST_LAYOUTPAGENO); if(nLast > 0) { sal_uInt16 first = static_cast(nFirst); @@ -255,7 +257,8 @@ //between the frame object and page margins eWrap = enumXFWrapBest; - LwpMiddleLayout* pParent = static_cast(m_pLayout->GetContainerLayout()); + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + LwpMiddleLayout* pParent = dynamic_cast(xContainer.get()); if(pParent) { if(IsLeftWider()) @@ -273,7 +276,7 @@ case LwpPlacableLayout::LAY_NO_WRAP_AROUND: { eWrap = enumXFWrapRunThrough; - if(!m_pLayout->GetBackColor() && !m_pLayout->GetWaterMarkLayout()) + if(!m_pLayout->GetBackColor() && !m_pLayout->GetWaterMarkLayout().is()) { //pFrameStyle->SetBackGround(sal_True); XFColor aXFColor(0xffffff); //white color @@ -398,7 +401,7 @@ */ void LwpFrame::ApplyProtect(XFFrameStyle* pFrameStyle) { - if(m_pLayout->IsProtected()) + if(m_pLayout->GetIsProtected()) { pFrameStyle->SetProtect(true,true,true); } @@ -435,8 +438,8 @@ //set vertical position if(m_pLayout->IsAnchorPage())//in page { - LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout(); - if(pContainer && (pContainer->IsHeader() || pContainer->IsFooter())) + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + if (xContainer.is() && (xContainer->IsHeader() || xContainer->IsFooter())) { //Only anchor to para, the frame can display in header and footer of each page eYPos = enumXFFrameYPosFromTop; //from top @@ -468,15 +471,15 @@ eYPos = enumXFFrameYPosBelow; //below eYRel = enumXFFrameYRelChar; //from char //set vertical position - LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout(); - if(pContainer && pContainer->IsPage())//in page + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + if (xContainer.is() && xContainer->IsPage())//in page { //eYPos = enumXFFrameYPosFromTop; //eYRel = enumXFFrameYRelPage; eYPos = enumXFFrameYPosBelow; eYRel = enumXFFrameYRelChar; } - else if(pContainer && pContainer->IsFrame()) //in frame + else if (xContainer.is() && xContainer->IsFrame()) //in frame { eYPos = enumXFFrameYPosFromTop; eYRel = enumXFFrameYRelPage; @@ -537,12 +540,13 @@ { pFrameStyle->SetBackImage(pBGImage); //set watermark transparent - LwpMiddleLayout* pLay = static_cast(m_pLayout->GetWaterMarkLayout()); - LwpBackgroundStuff* pBackgroundStuff = pLay->GetBackgroundStuff(); - if(pBackgroundStuff && !pBackgroundStuff->IsTransparent()) - { - pFrameStyle->SetTransparency(100); - } + rtl::Reference xWaterMarkLayout(m_pLayout->GetWaterMarkLayout()); + LwpMiddleLayout* pLay = dynamic_cast(xWaterMarkLayout.get()); + LwpBackgroundStuff* pBackgroundStuff = pLay ? pLay->GetBackgroundStuff() : nullptr; + if(pBackgroundStuff && !pBackgroundStuff->IsTransparent()) + { + pFrameStyle->SetTransparency(100); + } } } @@ -615,11 +619,11 @@ //anchor to page, frame and cell if(m_pLayout->IsAnchorPage())//in page { - LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout(); - if(pContainer && (pContainer->IsHeader() || pContainer->IsFooter())) + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + if (xContainer.is() && (xContainer->IsHeader() || xContainer->IsFooter())) { eAnchor = enumXFAnchorPara; - fYOffset -= pContainer->GetMarginsValue(MARGIN_TOP); + fYOffset -= xContainer->GetMarginsValue(MARGIN_TOP); } else eAnchor = enumXFAnchorPage; @@ -632,8 +636,9 @@ { //eAnchor = enumXFAnchorChar; eAnchor = enumXFAnchorPara; - LwpMiddleLayout* pContainer = static_cast(m_pLayout->GetContainerLayout()); - if(pContainer) + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + LwpMiddleLayout* pContainer = dynamic_cast(xContainer.get()); + if (pContainer) { fYOffset -= pContainer->GetMarginsValue(MARGIN_TOP); } @@ -643,26 +648,26 @@ case LwpLayoutRelativityGuts::LAY_PARA_RELATIVE: //same page as text { eAnchor = enumXFAnchorChar; - LwpVirtualLayout* pContainer = m_pLayout->GetContainerLayout(); - if(pContainer && pContainer->IsPage())//in page + rtl::Reference xContainer(m_pLayout->GetContainerLayout()); + if (xContainer.is() && xContainer->IsPage())//in page { //eAnchor = enumXFAnchorPage; eAnchor = enumXFAnchorChar;// to character } - else if(pContainer && pContainer->IsFrame()) //in frame + else if (xContainer.is() && xContainer->IsFrame()) //in frame { eAnchor = enumXFAnchorFrame; } - else if(pContainer && pContainer->IsCell()) //in cell + else if (xContainer.is() && xContainer->IsCell()) //in cell { //eAnchor = enumXFAnchorChar; eAnchor = enumXFAnchorPara; - fYOffset -= pContainer->GetMarginsValue(MARGIN_TOP); + fYOffset -= xContainer->GetMarginsValue(MARGIN_TOP); } - else if(pContainer && (pContainer->IsHeader() || pContainer->IsFooter()))//in header or footer + else if (xContainer.is() && (xContainer->IsHeader() || xContainer->IsFooter()))//in header or footer { eAnchor = enumXFAnchorPara; - fYOffset -= pContainer->GetMarginsValue(MARGIN_TOP); + fYOffset -= xContainer->GetMarginsValue(MARGIN_TOP); } break; } @@ -690,7 +695,6 @@ //because of the different feature between Word Pro and SODC, I simulate the vertical base offset //between anchor and frame origin using the font height. - //LwpPara* pPara = static_cast(m_pLayout->GetPosition()->obj()); rtl::Reference pFont = m_pLayout->GetFont(); if(pFont.is()) { @@ -715,9 +719,9 @@ */ bool LwpFrame::IsLeftWider() { - //LwpMiddleLayout* pParent = static_cast(m_pLayout->GetContainerLayout()); - LwpVirtualLayout* pParent = static_cast(m_pLayout->GetContainerLayout()); - if(pParent) + rtl::Reference xLayout(m_pLayout->GetContainerLayout()); + LwpVirtualLayout* pParent = dynamic_cast(xLayout.get()); + if (pParent) { LwpPoint aPoint = m_pLayout->GetOrigin(); double fXOffset = LwpTools::ConvertFromUnitsToMetric(aPoint.GetX()); @@ -867,7 +871,7 @@ if (content.is()) { content->SetFoundry(m_pFoundry); - content->RegisterStyle(); + content->DoRegisterStyle(); } //register child frame style @@ -915,10 +919,13 @@ { if(m_nBuoyancy >=LAY_BUOYLAYER) { - if(!m_Content.IsNull() && (m_Content.obj()->GetTag()==VO_GRAPHIC) ) - { + if (m_Content.IsNull()) + return false; + rtl::Reference content = m_Content.obj(); + if (!content.is()) + return false; + if (content->GetTag() == VO_GRAPHIC) return true; - } } return false; } @@ -945,8 +952,9 @@ double LwpFrameLayout::GetMaxWidth() { double fActualWidth = 0; - LwpMiddleLayout* pParent = static_cast(GetContainerLayout()); - if(pParent) + rtl::Reference xLayout(GetContainerLayout()); + LwpMiddleLayout* pParent = dynamic_cast(xLayout.get()); + if (pParent) { LwpPoint aPoint = GetOrigin(); double fXOffset = LwpTools::ConvertFromUnitsToMetric(aPoint.GetX()); @@ -1096,11 +1104,11 @@ m_pFrame->Parse(pXFFrame, nStart); //add child frame into group - LwpVirtualLayout* pLayout = static_cast(GetChildHead().obj().get()); + LwpVirtualLayout* pLayout = dynamic_cast(GetChildHead().obj().get()); while(pLayout) { pLayout->XFConvert(pXFFrame); - pLayout = static_cast(pLayout->GetNext().obj().get()); + pLayout = dynamic_cast(pLayout->GetNext().obj().get()); } pCont ->Add(pXFFrame); @@ -1153,7 +1161,7 @@ if(pPara.is()) { pPara->SetFoundry(m_pFoundry); - pPara->Parse(pOutputStream); + pPara->DoParse(pOutputStream); } } @@ -1179,12 +1187,12 @@ { pStory->SetDropcapFlag(true); pStory->SetFoundry(pFoundry); - LwpPara* pPara = static_cast(pStory->GetFirstPara().obj().get()); + LwpPara* pPara = dynamic_cast(pStory->GetFirstPara().obj().get()); while(pPara) { pPara->SetFoundry(pFoundry); pPara->RegisterStyle(); - pPara = static_cast(pPara->GetNext().obj().get()); + pPara = dynamic_cast(pPara->GetNext().obj().get()); } } } @@ -1240,6 +1248,8 @@ void LwpRubyLayout::RegisterStyle() { LwpRubyMarker* pMarker = GetMarker(); + if (!pMarker) + throw std::runtime_error("missing Ruby Marker"); XFRubyStyle* pRubyStyle = new XFRubyStyle; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribbreaks.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribbreaks.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribbreaks.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribbreaks.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -80,12 +80,9 @@ *pOverStyle = *pBaseStyle; pOverStyle->SetStyleName(""); - //Old code - //if (static_cast(pPara->GetStoryID()->obj()) - // ->GetCurrentLayout()->GetNumCols() == 1) //New code - LwpStory* pStory = static_cast(pPara->GetStoryID().obj().get()); - LwpPageLayout* pCurLayout = pStory ? pStory->GetCurrentLayout() : NULL; + LwpStory* pStory = dynamic_cast(pPara->GetStoryID().obj().get()); + LwpPageLayout* pCurLayout = pStory ? pStory->GetCurrentLayout() : nullptr; if( pCurLayout && (pCurLayout->GetNumCols() == 1) ) { @@ -129,7 +126,7 @@ XFParaStyle* pBaseStyle = pPara->GetXFParaStyle(); if (pBaseStyle == NULL) return; - LwpPageLayout* pLayout = static_cast(m_Layout.obj().get()); + LwpPageLayout* pLayout = dynamic_cast(m_Layout.obj().get()); if(pLayout) { m_pMasterPage = new LwpMasterPage(pPara, pLayout); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfrib.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfrib.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfrib.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfrib.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -249,15 +249,21 @@ XFTextStyle* pStyle = NULL; m_StyleName.clear(); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - if (m_pModifiers->HasCharStyle) + XFTextStyle* pNamedStyle = nullptr; + if (m_pModifiers->HasCharStyle && pFoundry) { - XFTextStyle* pNamedStyle = static_cast + pNamedStyle = static_cast (pFoundry->GetStyleManager()->GetStyle(m_pModifiers->CharStyleID)); - if (m_pModifiers->FontID) + } + if (pNamedStyle) + { + LwpCharacterStyle* pCharStyle = nullptr; + if (m_pModifiers->FontID && pFoundry) + pCharStyle = dynamic_cast(m_pModifiers->CharStyleID.obj().get()); + if (pCharStyle) { pStyle = new XFTextStyle(); *pStyle = *pNamedStyle; - LwpCharacterStyle* pCharStyle = static_cast(m_pModifiers->CharStyleID.obj().get()); pStyle->SetStyleName(""); pFont = pFoundry->GetFontManger().CreateOverrideFont(pCharStyle->GetFinalFontID(),m_pModifiers->FontID); @@ -273,7 +279,7 @@ } else { - if (m_pModifiers->FontID) + if (m_pModifiers->FontID && pFoundry) { pStyle = new XFTextStyle(); pFont = pFoundry->GetFontManger().CreateFont(m_pModifiers->FontID); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribframe.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribframe.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribframe.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribframe.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -108,7 +108,7 @@ if (!pLayout) return; pLayout->SetFoundry(pFoundry); - pLayout->RegisterStyle(); + pLayout->DoRegisterStyle(); //register next frib text style sal_uInt8 nType = pLayout->GetRelativeType(); @@ -156,13 +156,13 @@ sal_uInt8 nType = pLayout->GetRelativeType(); if( LwpLayoutRelativityGuts::LAY_PARA_RELATIVE == nType) { - LwpVirtualLayout* pContainerLayout = pLayout->GetContainerLayout(); - if(pContainerLayout && pContainerLayout->IsFrame()) + rtl::Reference xContainerLayout(pLayout->GetContainerLayout()); + if (xContainerLayout.is() && xContainerLayout->IsFrame()) { //same page as text and in frame pXFContentContainer = m_pPara->GetXFContainer(); } - else if(pContainerLayout && pContainerLayout->IsCell()) + else if (xContainerLayout.is() && xContainerLayout->IsCell()) { //same page as text and in cell, get the first xfpara rtl::Reference first( diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribmark.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribmark.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribmark.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribmark.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -136,12 +136,12 @@ void LwpFribBookMark::RegisterStyle(LwpFoundry* pFoundry) { OUString name; - LwpBookMark* pBook = pFoundry->GetBookMark(GetMarkerID()); + LwpBookMark* pBook = pFoundry ? pFoundry->GetBookMark(GetMarkerID()) : nullptr; if (pBook) name = pBook->GetName(); OUString sDivision; - LwpDocument* pDoc = pFoundry->GetDocument(); + LwpDocument* pDoc = pFoundry ? pFoundry->GetDocument() : nullptr; if (pDoc) { LwpObjectID& rID = pDoc->GetDivInfoID(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribptr.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribptr.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribptr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribptr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -269,9 +269,9 @@ case FRIB_TAG_HARDSPACE: { OUString sHardSpace(sal_Unicode(0x00a0)); - LwpHyperlinkMgr* pHyperlink = - m_pPara->GetStory()->GetHyperlinkMgr(); - if (pHyperlink->GetHyperlinkFlag()) + LwpStory *pStory = m_pPara->GetStory(); + LwpHyperlinkMgr* pHyperlink = pStory ? pStory->GetHyperlinkMgr() : nullptr; + if (pHyperlink && pHyperlink->GetHyperlinkFlag()) pFrib->ConvertHyperLink(m_pXFPara,pHyperlink,sHardSpace); else pFrib->ConvertChars(m_pXFPara,sHardSpace); @@ -288,10 +288,15 @@ LwpFribFrame* frameFrib= static_cast(pFrib); rtl::Reference pLayout = frameFrib->GetLayout(); if (pLayout.is() && pLayout->GetTag() == VO_DROPCAPLAYOUT) - m_pPara->GetFoundry()->GetDropcapMgr()->SetXFPara(m_pXFPara); + { + LwpFoundry* pFoundry = m_pPara->GetFoundry(); + LwpDropcapMgr* pMgr = pFoundry ? pFoundry->GetDropcapMgr() : nullptr; + if (pMgr) + pMgr->SetXFPara(m_pXFPara); + } frameFrib->XFConvert(m_pXFPara); - } break; + } case FRIB_TAG_CHBLOCK: { LwpFribCHBlock* chbFrib = static_cast(pFrib); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribsection.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribsection.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribsection.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribsection.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -102,7 +102,7 @@ */ LwpSection* LwpFribSection::GetSection() { - return static_cast(m_Section.obj().get()); + return dynamic_cast(m_Section.obj().get()); } /** @@ -126,11 +126,12 @@ void LwpFribSection::SetSectionName() { LwpSection* pSection = GetSection(); - if(pSection) - { - LwpStory* pStory = static_cast(m_pPara->GetStoryID().obj().get()); - pStory->SetSectionName(pSection->GetSectionName()); - } + if (!pSection) + return; + LwpStory* pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); + if (!pStory) + return; + pStory->SetSectionName(pSection->GetSectionName()); } /** @@ -164,24 +165,14 @@ m_pMasterPage->ParseSection(this); } } - else + else if (LwpStory* pStory = dynamic_cast(m_pPara->GetStoryID().obj().get())) { - LwpStory* pStory = static_cast ( m_pPara->GetStoryID().obj().get() ); - if (m_Section.obj()->GetTag() == VO_INDEXSECTION) + rtl::Reference xObj(m_Section.obj()); + if (xObj.is() && xObj->GetTag() == VO_INDEXSECTION) { //create a new section and add it to container XFIndex* pIndex = new XFIndex; pIndex->SetIndexType(enumXFIndexAlphabetical); - /* - sal_Bool bRunin = sal_False; - sal_Bool bSeparator = sal_False; - LwpIndexSection* pIndexSection = static_cast(m_Section.obj()); - if (pIndexSection->IsFormatRunin()) - bRunin = sal_True; - if (pIndexSection->IsFormatSeparator()) - bSeparator = sal_True; - pIndex->SetDefaultAlphaIndex("",bRunin,bSeparator); - */ SetDefaultAlphaIndex(pIndex); pStory->AddXFContent( pIndex ); @@ -200,9 +191,9 @@ LwpFoundry* pFoundry = m_pPara->GetFoundry(); OUString styleName = pFoundry->FindActuralStyleName("Separator"); - LwpIndexSection* pIndexSection = static_cast(m_Section.obj().get()); + LwpIndexSection* pIndexSection = dynamic_cast(m_Section.obj().get()); XFIndexTemplate * pTemplateSep = new XFIndexTemplate(); - if (pIndexSection->IsFormatSeparator()) + if (pIndexSection && pIndexSection->IsFormatSeparator()) { pXFIndex->SetSeparator(true); pTemplateSep->AddEntry(enumXFIndexTemplateText,""); @@ -228,7 +219,7 @@ pTemplate3->AddEntry(enumXFIndexTemplateTab,""); pTemplate3->AddEntry(enumXFIndexTemplatePage,""); - if (pIndexSection->IsFormatRunin()) + if (pIndexSection && pIndexSection->IsFormatRunin()) { //pXFIndex->AddTemplate(OUString::number(2),"Primary",pTemplate2); //pXFIndex->AddTemplate(OUString::number(3),"Primary",pTemplate3); @@ -256,10 +247,13 @@ */ bool LwpMasterPage::RegisterMasterPage(LwpFrib* pFrib) { - //if there is no other frib after current firb, register master page in starting para of next page - if(IsNextPageType()&&(!pFrib->HasNextFrib())) + //if there is no other frib after current frib, register master page in starting para of next page + LwpStory* pStory = nullptr; + if (IsNextPageType()&&(!pFrib->HasNextFrib())) + pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); + + if (pStory) { - LwpStory* pStory = static_cast(m_pPara->GetStoryID().obj().get()); pStory->SetCurrentLayout(m_pLayout); RegisterFillerPageStyle(); return false; @@ -290,14 +284,17 @@ case LwpLayout::StartOnOddPage: //fall through case LwpLayout::StartOnEvenPage: { - LwpStory* pStory = static_cast(m_pPara->GetStoryID().obj().get()); - pStory->SetCurrentLayout(m_pLayout); - //get odd page layout when the current pagelayout is mirror - m_pLayout = pStory->GetCurrentLayout(); - m_bNewSection = IsNeedSection(); - //bSectionColumns = m_bNewSection; - pOverStyle->SetMasterPage( m_pLayout->GetStyleName()); - RegisterFillerPageStyle(); + pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); + if (pStory) + { + pStory->SetCurrentLayout(m_pLayout); + //get odd page layout when the current pagelayout is mirror + m_pLayout = pStory->GetCurrentLayout(); + m_bNewSection = IsNeedSection(); + //bSectionColumns = m_bNewSection; + pOverStyle->SetMasterPage( m_pLayout->GetStyleName()); + RegisterFillerPageStyle(); + } break; } default: @@ -305,7 +302,10 @@ } //register tab style; - LwpStory* pStory = static_cast(m_pPara->GetStoryID().obj().get()); + pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); + if (!pStory) + return false; + pStory->SetTabLayout(m_pLayout); m_pPara->RegisterTabStyle(pOverStyle); @@ -316,8 +316,8 @@ { XFSectionStyle* pSectStyle= new XFSectionStyle(); //set margin - pStory = static_cast(m_pPara->GetStoryID().obj().get()); - if(pStory) + pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); + if (pStory) { LwpPageLayout* pCurrentLayout = pStory->GetCurrentLayout(); double fLeft = m_pLayout->GetMarginsValue(MARGIN_LEFT)- pCurrentLayout->GetMarginsValue(MARGIN_LEFT); @@ -348,9 +348,9 @@ { bool bNewSection = false; //get story - LwpStory* pStory = static_cast(m_pPara->GetStoryID().obj().get()); + LwpStory* pStory = dynamic_cast(m_pPara->GetStoryID().obj().get()); //if pagelayout is modified, register the pagelayout - if(pStory->IsPMModified()) + if (pStory && pStory->IsPMModified()) { bNewSection = pStory->IsNeedSection(); } @@ -396,8 +396,8 @@ XFContentContainer* pContent = CreateXFSection(); if(pContent) { - LwpStory* pStory = static_cast ( m_pPara->GetStoryID().obj().get() ); - //delete the additional blank para, 06/28/2005 + LwpStory* pStory = dynamic_cast ( m_pPara->GetStoryID().obj().get() ); + //delete the additional blank para XFParagraph* pCurrPara = rFribPtr.GetXFPara(); if(!pCurrPara->HasContents()) { @@ -407,13 +407,13 @@ pCurrContainer->RemoveLastContent(); } } - //end,06/28/2005 - pStory->AddXFContent( pContent ); + if (pStory) + pStory->AddXFContent( pContent ); } else { - LwpStory* pStory = static_cast ( m_pPara->GetStoryID().obj().get() ); - pContent = pStory->GetXFContent(); + LwpStory* pStory = dynamic_cast ( m_pPara->GetStoryID().obj().get() ); + pContent = pStory ? pStory->GetXFContent() : nullptr; } if(pContent) { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribtable.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribtable.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpfribtable.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpfribtable.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -73,12 +73,14 @@ LwpSuperTableLayout* LwpFribTable::GetSuperTable() { - return static_cast(m_objTable.obj().get()); + return dynamic_cast(m_objTable.obj().get()); } void LwpFribTable::RegisterNewStyle() { - GetSuperTable()->RegisterNewStyle(); + LwpSuperTableLayout* pSuper = GetSuperTable(); + if (pSuper) + pSuper->RegisterNewStyle(); XFParaStyle* pOldStyle = m_pPara->GetXFParaStyle(); if(HasNextFrib()) { @@ -98,17 +100,19 @@ { XFContentContainer* pXFContentContainer = pCont; LwpSuperTableLayout* pSuper = GetSuperTable(); + if (!pSuper) + return; sal_uInt8 nType = pSuper->GetRelativeType(); - LwpVirtualLayout* pContainer = pSuper->GetContainerLayout(); - if (!pContainer) + rtl::Reference xContainer(pSuper->GetContainerLayout()); + if (!xContainer.is()) return; if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType - && !pContainer->IsCell()) + && !xContainer->IsCell()) { pXFContentContainer = m_pPara->GetXFContainer(); //delete the additional blank para, 06/28/2005 XFParagraph* pCurrPara = m_pPara->GetFribs().GetXFPara(); - if(!pCurrPara->HasContents()) + if (pXFContentContainer && !pCurrPara->HasContents()) { if(pXFContentContainer->GetLastContent() == pCurrPara) { @@ -120,11 +124,11 @@ else if( LwpLayoutRelativityGuts::LAY_PARA_RELATIVE == nType) { //same page as text and in frame - if(pContainer->IsFrame()) + if (xContainer->IsFrame()) { pXFContentContainer = m_pPara->GetXFContainer(); } - else if(pContainer->IsCell()) + else if (xContainer->IsCell()) { //same page as text and in cell, get the first xfpara rtl::Reference first( @@ -140,18 +144,20 @@ LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); LwpChangeMgr* pChangeMgr = pGlobal->GetLwpChangeMgr(); sChangeID = pChangeMgr->GetChangeID(this); - if (!sChangeID.isEmpty()) + if (!sChangeID.isEmpty() && pXFContentContainer) { XFChangeStart* pChangeStart = new XFChangeStart; pChangeStart->SetChangeID(sChangeID); pXFContentContainer->Add(pChangeStart); } } - pSuper->XFConvert(pXFContentContainer); + + if (pXFContentContainer) + pSuper->XFConvert(pXFContentContainer); if(m_bRevisionFlag) { - if (!sChangeID.isEmpty()) + if (!sChangeID.isEmpty() && pXFContentContainer) { XFChangeEnd* pChangeEnd = new XFChangeEnd; pChangeEnd->SetChangeID(sChangeID); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpgrfobj.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpgrfobj.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpgrfobj.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpgrfobj.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -203,7 +203,7 @@ pCont->Add(iter->get()); } } - else if (this->IsGrafFormatValid()) + else if (this->IsGrafFormatValid() && !m_vXFDrawObjects.empty()) { XFImage* pImage = static_cast(m_vXFDrawObjects.front().get()); @@ -277,8 +277,8 @@ if (m_sServerContextFormat[1]=='l'&&m_sServerContextFormat[2]=='c'&&m_sServerContextFormat[3]=='h') { - LwpVirtualLayout* pMyLayout = GetLayout(NULL); - if (pMyLayout && pMyLayout->IsFrame()) + rtl::Reference xMyLayout(GetLayout(nullptr)); + if (xMyLayout.is() && xMyLayout->IsFrame()) { XFFrameStyle* pXFFrameStyle = new XFFrameStyle(); pXFFrameStyle->SetXPosType(enumXFFrameXPosFromLeft, enumXFFrameXRelFrame); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpidxmgr.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpidxmgr.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpidxmgr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpidxmgr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -154,7 +154,10 @@ sal_uInt16 KeyCount = pObjStrm->QuickReaduInt16(); m_nLeafCount = KeyCount ? KeyCount + 1 : 0; - if(KeyCount) + if (m_nLeafCount > SAL_N_ELEMENTS(m_ChildIndex)) + throw std::range_error("corrupt RootData"); + + if (KeyCount) { //read object keys LwpKey* akey = new LwpKey(); @@ -212,7 +215,7 @@ vObjIndexs[k]->offset = pObjStrm->QuickReaduInt32(); for (k = 0; k < LeafCount; k++) - m_TempVec[k] = pObjStrm->QuickReaduInt32(); + m_TempVec.at(k) = pObjStrm->QuickReaduInt32(); } for( sal_uInt16 j=0; j (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { - return pParent->HonorProtection(); + return xParent->GetHonorProtection(); } if(m_pFoundry)//is null now { LwpDocument* pDoc = m_pFoundry->GetDocument(); - /*if(pDoc) - { - return pDoc->HonorProtection(); - }*/ if(pDoc && pDoc->GetRootDocument()) - return pDoc->GetRootDocument()->HonorProtection(); + return pDoc->GetRootDocument()->GetHonorProtection(); } return true; @@ -171,10 +172,10 @@ { bool bProtected = (m_nAttributes & STYLE_PROTECTED)!=0; - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { - if(pParent->HonorProtection()&&(pParent->HasProtection()||bProtected)) + if (xParent->GetHonorProtection() && (xParent->GetHasProtection()||bProtected)) { return true; } @@ -184,7 +185,7 @@ LwpDocument* pDoc = m_pFoundry->GetDocument(); if(pDoc) { - if (pDoc->HonorProtection() && bProtected) + if (pDoc->GetHonorProtection() && bProtected) { return true; } @@ -203,10 +204,10 @@ if(m_nAttributes & STYLE_PROTECTED) return true; - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { - return pParent->HasProtection(); + return xParent->GetHasProtection(); } return false; @@ -234,9 +235,9 @@ if(GetLayoutType()!=LWP_PAGE_LAYOUT) { //get parent - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()&& (pParent->GetLayoutType()!=LWP_PAGE_LAYOUT)) - return pParent->GetUseWhen(); + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader() && (xParent->GetLayoutType() != LWP_PAGE_LAYOUT)) + return xParent->GetUseWhen(); } @@ -344,9 +345,9 @@ * @descr: Get parent layout * */ -LwpVirtualLayout* LwpVirtualLayout::GetParentLayout() +rtl::Reference LwpVirtualLayout::GetParentLayout() { - return dynamic_cast (GetParent().obj().get()); + return rtl::Reference(dynamic_cast(GetParent().obj().get())); } /** @@ -356,12 +357,12 @@ void LwpVirtualLayout::RegisterChildStyle() { //Register all children styles - LwpVirtualLayout* pLayout = dynamic_cast(GetChildHead().obj().get()); - while(pLayout) + rtl::Reference xLayout(dynamic_cast(GetChildHead().obj().get())); + while (xLayout.is()) { - pLayout->SetFoundry(m_pFoundry); - pLayout->RegisterStyle(); - pLayout = dynamic_cast(pLayout->GetNext().obj().get()); + xLayout->SetFoundry(m_pFoundry); + xLayout->RegisterStyle(); + xLayout.set(dynamic_cast(xLayout->GetNext().obj().get())); } } @@ -375,9 +376,9 @@ if (m_nAttributes3 & STYLE3_STYLELAYOUT) return true; - LwpVirtualLayout* pParent = dynamic_cast(GetParent().obj().get()); - if (pParent) - return pParent->IsStyleLayout(); + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is()) + return xParent->IsStyleLayout(); return false; } @@ -445,42 +446,40 @@ * @descr: Looking for the layout which follows the pStartLayout * @param: pStartLayout - the layout which is used for looking for its following layout */ -LwpVirtualLayout* LwpAssociatedLayouts::GetLayout(LwpVirtualLayout *pStartLayout) +rtl::Reference LwpAssociatedLayouts::GetLayout(LwpVirtualLayout *pStartLayout) { if (!pStartLayout && !m_OnlyLayout.IsNull()) /* Looking for the first layout and there's only one layout in the list.*/ - return dynamic_cast(m_OnlyLayout.obj().get()); + return rtl::Reference(dynamic_cast(m_OnlyLayout.obj().get())); - LwpObjectHolder* pObjHolder = dynamic_cast(m_Layouts.GetHead().obj().get()); - if(pObjHolder) + rtl::Reference xObjHolder(dynamic_cast(m_Layouts.GetHead().obj().get())); + if (xObjHolder.is()) { - LwpVirtualLayout* pLayout = dynamic_cast(pObjHolder->GetObject().obj().get()); - if(!pStartLayout ) - return pLayout; + rtl::Reference xLayout(dynamic_cast(xObjHolder->GetObject().obj().get())); + if (!pStartLayout) + return xLayout; - while(pObjHolder && pStartLayout != pLayout) + while (xObjHolder.is() && pStartLayout != xLayout.get()) { - pObjHolder = dynamic_cast(pObjHolder->GetNext().obj().get()); - if(pObjHolder) + xObjHolder.set(dynamic_cast(xObjHolder->GetNext().obj().get())); + if (xObjHolder.is()) { - pLayout = dynamic_cast(pObjHolder->GetObject().obj().get()); + xLayout.set(dynamic_cast(xObjHolder->GetObject().obj().get())); } } - if(pObjHolder) + if (xObjHolder.is()) { - pObjHolder = dynamic_cast(pObjHolder->GetNext().obj().get()); - if(pObjHolder) + xObjHolder.set(dynamic_cast(xObjHolder->GetNext().obj().get())); + if (xObjHolder.is()) { - pLayout = dynamic_cast(pObjHolder->GetObject().obj().get()); - return pLayout; + xLayout.set(dynamic_cast(xObjHolder->GetObject().obj().get())); + return xLayout; } } - - //return pLayout; } - return NULL; + return rtl::Reference(); } LwpHeadLayout::LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) @@ -499,27 +498,27 @@ void LwpHeadLayout::RegisterStyle() { //Register all children styles - LwpVirtualLayout* pLayout = dynamic_cast(GetChildHead().obj().get()); - while(pLayout) + rtl::Reference xLayout(dynamic_cast(GetChildHead().obj().get())); + while (xLayout.is()) { - pLayout->SetFoundry(m_pFoundry); + xLayout->SetFoundry(m_pFoundry); //if the layout is relative to para, the layout will be registered in para - if(!pLayout->IsRelativeAnchored()) + if (!xLayout->IsRelativeAnchored()) { - if (pLayout == this) + if (xLayout.get() == this) { OSL_FAIL("Layout points to itself"); break; } - pLayout->RegisterStyle(); + xLayout->DoRegisterStyle(); } - LwpVirtualLayout *pNext = dynamic_cast(pLayout->GetNext().obj().get()); - if (pNext == pLayout) + rtl::Reference xNext(dynamic_cast(xLayout->GetNext().obj().get())); + if (xNext.get() == xLayout.get()) { OSL_FAIL("Layout points to itself"); break; } - pLayout = pNext; + xLayout = xNext; } } @@ -527,18 +526,18 @@ * @descr find endnote supertable layout from the child layout list. Suppose that there is only one endnote supertablelayout in one division * @return pointer to endnote supertable layout */ -LwpVirtualLayout* LwpHeadLayout::FindEnSuperTableLayout() +rtl::Reference LwpHeadLayout::FindEnSuperTableLayout() { - LwpVirtualLayout* pLayout = dynamic_cast(GetChildHead().obj().get()); - while(pLayout) + rtl::Reference xLayout(dynamic_cast(GetChildHead().obj().get())); + while (xLayout.get()) { - if(pLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT) + if (xLayout->GetLayoutType() == LWP_ENDNOTE_SUPERTABLE_LAYOUT) { - return pLayout; + return xLayout; } - pLayout = dynamic_cast(pLayout->GetNext().obj().get()); + xLayout.set(dynamic_cast(xLayout->GetNext().obj().get())); } - return NULL; + return rtl::Reference(); } LwpLayoutStyle::LwpLayoutStyle() @@ -587,9 +586,12 @@ } LwpMiddleLayout::LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ) - : LwpVirtualLayout(objHdr, pStrm), - m_pStyleStuff(new LwpLayoutStyle), m_pMiscStuff(new LwpLayoutMisc) -{} + : LwpVirtualLayout(objHdr, pStrm) + , m_pStyleStuff(new LwpLayoutStyle) + , m_pMiscStuff(new LwpLayoutMisc) + , m_bGettingGeometry(false) +{ +} LwpMiddleLayout::~LwpMiddleLayout() { @@ -648,22 +650,36 @@ //end } +rtl::Reference LwpMiddleLayout::GetBasedOnStyle() +{ + rtl::Reference xRet(m_BasedOnStyle.obj()); + if (xRet.get() == this) + { + SAL_WARN("lwp", "style based on itself"); + return rtl::Reference(); + } + return xRet; +} + #include "lwplaypiece.hxx" /** * @descr: Get the geometry of current layout * */ -LwpLayoutGeometry* LwpMiddleLayout::GetGeometry() +LwpLayoutGeometry* LwpMiddleLayout::Geometry() { if( !m_LayGeometry.IsNull() ) { return ( dynamic_cast (m_LayGeometry.obj().get()) ); } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetGeometry() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetGeometry(); + } } return NULL; } @@ -708,31 +724,29 @@ { return LwpVirtualLayout::MarginsSameAsParent(); } - if(!m_BasedOnStyle.IsNull()) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpVirtualLayout* pLay = dynamic_cast(xBase.get())) { - LwpVirtualLayout* pLay = dynamic_cast (m_BasedOnStyle.obj().get()); - if (pLay) - pLay->MarginsSameAsParent(); + pLay->GetMarginsSameAsParent(); } return LwpVirtualLayout::MarginsSameAsParent(); - } /** * @descr: Get margin * @param: nWhichSide - 0: left, 1: right, 2:top, 3: bottom */ -double LwpMiddleLayout::GetMarginsValue(const sal_uInt8 &nWhichSide) +double LwpMiddleLayout::MarginsValue(const sal_uInt8 &nWhichSide) { double fValue = 0; if((nWhichSide==MARGIN_LEFT)||(nWhichSide==MARGIN_RIGHT)) { - if ( MarginsSameAsParent() ) + if ( GetMarginsSameAsParent() ) { - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { - fValue = pParent->GetMarginsValue(nWhichSide); + fValue = xParent->GetMarginsValue(nWhichSide); return fValue; } } @@ -747,13 +761,14 @@ return fValue; } } - LwpVirtualLayout* pStyle = dynamic_cast (m_BasedOnStyle.obj().get()); - if(pStyle) + rtl::Reference xBase(GetBasedOnStyle()); + LwpVirtualLayout* pStyle = dynamic_cast(xBase.get()); + if (pStyle) { fValue = pStyle->GetMarginsValue(nWhichSide); return fValue; } - return LwpVirtualLayout::GetMarginsValue(nWhichSide); + return LwpVirtualLayout::MarginsValue(nWhichSide); } /** * @descr: Get extmargin value @@ -773,7 +788,7 @@ return fValue; } } - LwpVirtualLayout* pStyle = dynamic_cast (m_BasedOnStyle.obj().get()); + LwpVirtualLayout* pStyle = dynamic_cast(GetBasedOnStyle().get()); if(pStyle) { fValue = pStyle->GetExtMarginsValue(nWhichSide); @@ -794,10 +809,13 @@ LwpLayoutBorder* pLayoutBorder = dynamic_cast(m_LayBorderStuff.obj().get()); return pLayoutBorder ? &pLayoutBorder->GetBorderStuff() : NULL; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetBorderStuff() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetBorderStuff(); + } } return NULL; } @@ -815,10 +833,13 @@ LwpLayoutBackground* pLayoutBackground = dynamic_cast(m_LayBackgroundStuff.obj().get()); return pLayoutBackground ? &pLayoutBackground->GetBackgoudStuff() : NULL; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetBackgroundStuff() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetBackgroundStuff(); + } } return NULL; } @@ -925,10 +946,13 @@ } return NULL; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetTabOverride() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetTabOverride(); + } } return NULL; } @@ -941,62 +965,70 @@ */ sal_uInt16 LwpMiddleLayout::GetScaleMode() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) return GetLayoutScale()->GetScaleMode(); - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScaleMode(); + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScaleMode(); else return (LwpLayoutScale::FIT_IN_FRAME | LwpLayoutScale::MAINTAIN_ASPECT_RATIO); } sal_uInt16 LwpMiddleLayout::GetScaleTile() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::TILED) ? 1 : 0; - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScaleTile(); + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScaleTile(); else return 0; } sal_uInt16 LwpMiddleLayout::GetScaleCenter() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) + { return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED) ? 1 : 0; - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScaleCenter(); + } + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScaleCenter(); else return 0; } sal_uInt32 LwpMiddleLayout::GetScalePercentage() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 1000 = 100% - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScalePercentage(); + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScalePercentage(); else return 100; } double LwpMiddleLayout::GetScaleWidth() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth()); - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScaleWidth(); + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScaleWidth(); else return 0; } double LwpMiddleLayout::GetScaleHeight() { - if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) + if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is() && GetLayoutScale()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight()); - else if (m_BasedOnStyle.obj().is()) - return dynamic_cast(m_BasedOnStyle.obj().get())->GetScaleHeight(); + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) + return dynamic_cast(*xBase.get()).GetScaleHeight(); else return 0; } @@ -1033,10 +1065,10 @@ { assert(false); } - else + else if (LwpLayoutGeometry* pGeo = GetGeometry()) { m_nAttributes3 |= STYLE3_WIDTHVALID; - return GetGeometry()->GetWidth(); + return pGeo->GetWidth(); } return 0; } @@ -1051,9 +1083,10 @@ << SHIFT_RIGHT)) == ((LAY_USEDIRECTION | LAY_TOCONTAINER | LAY_AUTOSIZE) << SHIFT_RIGHT); } - else if (m_BasedOnStyle.obj().is()) + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) { - LwpMiddleLayout * pLayout = dynamic_cast(m_BasedOnStyle.obj().get()); + LwpMiddleLayout * pLayout = dynamic_cast(xBase.get()); return pLayout && pLayout->IsSizeRightToContainer(); } else @@ -1070,9 +1103,10 @@ << SHIFT_RIGHT)) == ((LAY_USEDIRECTION | LAY_AUTOSIZE) << SHIFT_RIGHT); } - else if (m_BasedOnStyle.obj().is()) + rtl::Reference xBase(GetBasedOnStyle()); + if (xBase.is()) { - LwpMiddleLayout * pLayout = dynamic_cast(m_BasedOnStyle.obj().get()); + LwpMiddleLayout * pLayout = dynamic_cast(xBase.get()); return pLayout && pLayout->IsSizeRightToContent(); } else @@ -1162,10 +1196,13 @@ ((LAY_AUTOGROW << SHIFT_UP) | (LAY_AUTOGROW << SHIFT_DOWN) | (LAY_AUTOGROW << SHIFT_RIGHT) | (LAY_AUTOGROW << SHIFT_LEFT))) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay && pLay->IsAutoGrow(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->IsAutoGrow(); + } } return LwpVirtualLayout::IsAutoGrow(); } @@ -1180,10 +1217,13 @@ { return (m_nDirection & (LAY_AUTOGROW << SHIFT_DOWN)) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay && pLay->IsAutoGrowDown(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->IsAutoGrowDown(); + } } return LwpVirtualLayout::IsAutoGrowDown(); } @@ -1198,10 +1238,13 @@ { return (m_nDirection & (LAY_AUTOGROW << SHIFT_UP)) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay && pLay->IsAutoGrowUp(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->IsAutoGrowUp(); + } } return LwpVirtualLayout::IsAutoGrowUp(); } @@ -1216,11 +1259,13 @@ { return (m_nDirection & (LAY_AUTOGROW << SHIFT_LEFT)) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->IsAutoGrowLeft(); + } } return LwpVirtualLayout::IsAutoGrowLeft(); } @@ -1235,10 +1280,13 @@ { return (m_nDirection & (LAY_AUTOGROW << SHIFT_RIGHT)) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay && pLay->IsAutoGrowRight(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->IsAutoGrowRight(); + } } return LwpVirtualLayout::IsAutoGrowRight(); } @@ -1256,11 +1304,13 @@ if (pLayGeometry) return pLayGeometry->GetContentOrientation(); } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->GetContentOrientation(); + } } return LwpVirtualLayout::GetContentOrientation(); } @@ -1276,26 +1326,28 @@ if(!(m_nAttributes2 & STYLE2_HONORPROTECTION)) return false; - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { - return pParent->HonorProtection(); + return xParent->GetHonorProtection(); } if(m_pFoundry)//is null now { LwpDocument* pDoc = m_pFoundry->GetDocument(); - if(pDoc) + if (pDoc) { - return pDoc->HonorProtection(); + return pDoc->GetHonorProtection(); } } } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) - return pLay->HonorProtection(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetHonorProtection(); + } } return LwpVirtualLayout::HonorProtection(); @@ -1312,22 +1364,25 @@ { bProtected = (m_nAttributes & STYLE_PROTECTED)!=0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - bProtected = pLay && pLay->IsProtected(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + bProtected = pLay->GetIsProtected(); + } + else + bProtected = LwpVirtualLayout::IsProtected(); } - else - bProtected = LwpVirtualLayout::IsProtected(); - LwpVirtualLayout* pParent = dynamic_cast (GetParent().obj().get()); - if(pParent && !pParent->IsHeader()) + rtl::Reference xParent(dynamic_cast(GetParent().obj().get())); + if (xParent.is() && !xParent->IsHeader()) { /* If a parent's protected then none of its children can be accessed. */ - if(pParent->IsProtected()) + if (xParent->GetIsProtected()) return true; - if(pParent->HonorProtection()) + if (xParent->GetHonorProtection()) return bProtected; /* If our parent isn't honoring protection then we aren't protected. */ @@ -1339,7 +1394,7 @@ LwpDocument* pDoc = m_pFoundry->GetDocument(); if(pDoc) { - if (pDoc->HonorProtection()) + if (pDoc->GetHonorProtection()) return bProtected; /* If the document isn't honoring protection then we aren't protected.*/ @@ -1354,18 +1409,18 @@ * @descr: Get watermark layout * */ -LwpVirtualLayout* LwpMiddleLayout::GetWaterMarkLayout() +rtl::Reference LwpMiddleLayout::GetWaterMarkLayout() { - LwpVirtualLayout* pLay = dynamic_cast(GetChildHead().obj().get()); - while(pLay) + rtl::Reference xLay(dynamic_cast(GetChildHead().obj().get())); + while (xLay.is()) { - if( pLay->IsForWaterMark()) + if (xLay->IsForWaterMark()) { - return pLay; + return xLay; } - pLay = dynamic_cast (pLay->GetNext().obj().get()); + xLay.set(dynamic_cast(xLay->GetNext().obj().get())); } - return NULL; + return rtl::Reference(); } /** @@ -1374,7 +1429,8 @@ */ XFBGImage* LwpMiddleLayout::GetXFBGImage() { - LwpMiddleLayout* pLay = static_cast(GetWaterMarkLayout()); + rtl::Reference xWaterMarkLayout(GetWaterMarkLayout()); + LwpMiddleLayout* pLay = dynamic_cast(xWaterMarkLayout.get()); if(pLay) { //test BGImage @@ -1438,10 +1494,13 @@ { return (m_nAttributes3 & STYLE3_USEPRINTERSETTINGS) != 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpMiddleLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay && pLay->GetUsePrinterSettings(); + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpMiddleLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetUsePrinterSettings(); + } } return false; } @@ -1518,8 +1577,9 @@ } } - LwpVirtualLayout* pStyle = dynamic_cast (m_BasedOnStyle.obj().get()); - if(pStyle) + rtl::Reference xBase(GetBasedOnStyle()); + LwpVirtualLayout* pStyle = dynamic_cast(xBase.get()); + if (pStyle) { return pStyle->GetNumCols(); } @@ -1543,8 +1603,9 @@ } } - LwpVirtualLayout* pStyle = dynamic_cast (m_BasedOnStyle.obj().get()); - if(pStyle) + rtl::Reference xBase(GetBasedOnStyle()); + LwpVirtualLayout* pStyle = dynamic_cast(xBase.get()); + if (pStyle) { return pStyle->GetColWidth(nIndex); } @@ -1568,8 +1629,9 @@ } } - LwpVirtualLayout* pStyle = dynamic_cast (m_BasedOnStyle.obj().get()); - if(pStyle) + rtl::Reference xBase(GetBasedOnStyle()); + LwpVirtualLayout* pStyle = dynamic_cast(xBase.get()); + if (pStyle) { return pStyle->GetColGap(nIndex); } @@ -1713,10 +1775,13 @@ else return 0; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetUsePage() : 0; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetUsePage(); + } } return 0; } @@ -1731,10 +1796,13 @@ { return m_pUseWhen; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->VirtualGetUseWhen() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->VirtualGetUseWhen(); + } } return LwpVirtualLayout::VirtualGetUseWhen(); } @@ -1753,11 +1821,13 @@ else return false; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->IsUseOnAllPages(); + } } return LwpVirtualLayout::IsUseOnAllPages(); } @@ -1776,11 +1846,13 @@ else return false; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->IsUseOnAllEvenPages(); + } } return LwpVirtualLayout::IsUseOnAllEvenPages(); } @@ -1799,11 +1871,13 @@ else return false; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->IsUseOnAllOddPages(); + } } return LwpVirtualLayout::IsUseOnAllOddPages(); } @@ -1822,11 +1896,13 @@ else return false; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->IsUseOnPage(); + } } return LwpVirtualLayout::IsUseOnPage(); } @@ -1844,10 +1920,13 @@ LwpLayoutShadow* pLayoutShadow = dynamic_cast(m_LayShadow.obj().get()); return pLayoutShadow ? &pLayoutShadow->GetShadow() : NULL; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetShadow() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetShadow(); + } } return NULL; } @@ -1910,7 +1989,7 @@ * @descr get the layout that containers the current frame layout * */ -LwpVirtualLayout* LwpLayout::GetContainerLayout() +rtl::Reference LwpLayout::GetContainerLayout() { if(IsRelativeAnchored()) { @@ -1991,11 +2070,13 @@ { return m_nWrapType; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpPlacableLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - if (pLay) + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpPlacableLayout* pLay = dynamic_cast(xBase.get())) + { return pLay->GetWrapType(); + } } return LAY_WRAP_AROUND; } @@ -2014,10 +2095,13 @@ return dynamic_cast(m_LayRelativity.obj().get()); } } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpPlacableLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetRelativityPiece() : NULL; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpPlacableLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetRelativityPiece(); + } } return NULL; } @@ -2056,10 +2140,13 @@ { return m_nBaseLineOffset; } - else if( !m_BasedOnStyle.IsNull() ) + else { - LwpPlacableLayout* pLay = dynamic_cast ( m_BasedOnStyle.obj().get() ); - return pLay ? pLay->GetBaseLineOffset() : 0; + rtl::Reference xBase(GetBasedOnStyle()); + if (LwpPlacableLayout* pLay = dynamic_cast(xBase.get())) + { + return pLay->GetBaseLineOffset(); + } } return 0; @@ -2073,9 +2160,8 @@ if(IsRelativeAnchored()) return false; - LwpVirtualLayout* pLayout = GetParentLayout(); - if(pLayout && (pLayout->IsPage() || pLayout->IsHeader() || pLayout->IsFooter())) - //if(pLayout && pLayout->IsPage()) + rtl::Reference xLayout = GetParentLayout(); + if (xLayout.is() && (xLayout->IsPage() || xLayout->IsHeader() || xLayout->IsFooter())) { return true; } @@ -2090,8 +2176,8 @@ if(IsRelativeAnchored()) return false; - LwpVirtualLayout* pLayout = GetParentLayout(); - if(pLayout && (pLayout->IsFrame()||pLayout->IsGroupHead())) + rtl::Reference xLayout = GetParentLayout(); + if (xLayout.is() && (xLayout->IsFrame() || xLayout->IsGroupHead())) { return true; } @@ -2106,8 +2192,8 @@ if(IsRelativeAnchored()) return false; - LwpVirtualLayout* pLayout = GetParentLayout(); - if(pLayout && pLayout->IsCell()) + rtl::Reference xLayout = GetParentLayout(); + if (xLayout.is() && xLayout->IsCell()) { return true; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwplayout.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwplayout.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwplayout.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwplayout.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -100,11 +100,9 @@ public: LwpVirtualLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); virtual ~LwpVirtualLayout(){} - virtual bool MarginsSameAsParent(); inline virtual sal_uInt16 GetNumCols(){return 1;} virtual double GetColWidth(sal_uInt16 nIndex); virtual double GetColGap(sal_uInt16 nIndex); - virtual double GetMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;} virtual double GetExtMarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;} virtual bool IsAutoGrow(){ return false;} virtual bool IsAutoGrowUp(){ return false;} @@ -115,9 +113,51 @@ bool IsAutoGrowWidth(); bool IsInlineToMargin(); virtual sal_uInt8 GetContentOrientation(){ return TEXT_ORIENT_LRTB;} - virtual bool HonorProtection(); - virtual bool IsProtected(); - bool HasProtection(); + bool GetHonorProtection() + { + if (m_bGettingHonorProtection) + throw std::runtime_error("recursion in layout"); + m_bGettingHonorProtection = true; + bool bRet = HonorProtection(); + m_bGettingHonorProtection = false; + return bRet; + } + bool GetMarginsSameAsParent() + { + if (m_bGettingMarginsSameAsParent) + throw std::runtime_error("recursion in layout"); + m_bGettingMarginsSameAsParent = true; + bool bRet = MarginsSameAsParent(); + m_bGettingMarginsSameAsParent = false; + return bRet; + } + bool GetIsProtected() + { + if (m_bGettingIsProtected) + throw std::runtime_error("recursion in layout"); + m_bGettingIsProtected = true; + bool bRet = IsProtected(); + m_bGettingIsProtected = false; + return bRet; + } + bool GetHasProtection() + { + if (m_bGettingHasProtection) + throw std::runtime_error("recursion in layout"); + m_bGettingHasProtection = true; + bool bRet = HasProtection(); + m_bGettingHasProtection = false; + return bRet; + } + double GetMarginsValue(const sal_uInt8& nWhichSide) + { + if (m_bGettingMarginsValue) + throw std::runtime_error("recursion in layout"); + m_bGettingMarginsValue = true; + auto fRet = MarginsValue(nWhichSide); + m_bGettingMarginsValue = false; + return fRet; + } OUString GetStyleName(){ return m_StyleName;} bool IsComplex(); virtual bool IsAnchorPage(){ return false;} @@ -141,9 +181,9 @@ virtual sal_Int32 GetPageNumber(sal_uInt16 /*nLayoutNumber*/ = 0){ return -1;} bool IsMinimumHeight(); virtual bool IsForWaterMark(){ return false;} - virtual LwpPara* GetLastParaOfPreviousStory() { return NULL; } - LwpVirtualLayout* GetParentLayout(); - virtual LwpVirtualLayout* GetContainerLayout(){ return NULL;} + virtual LwpPara* GetLastParaOfPreviousStory() { return nullptr; } + rtl::Reference GetParentLayout(); + virtual rtl::Reference GetContainerLayout() { return rtl::Reference(); } void RegisterChildStyle(); bool NoContentReference(); bool IsStyleLayout(); @@ -167,7 +207,17 @@ //End by protected: void Read() SAL_OVERRIDE; + bool HasProtection(); + virtual bool HonorProtection(); + virtual bool IsProtected(); + virtual double MarginsValue(const sal_uInt8& /*nWhichSide*/){return 0;} + virtual bool MarginsSameAsParent(); protected: + bool m_bGettingHonorProtection; + bool m_bGettingMarginsSameAsParent; + bool m_bGettingHasProtection; + bool m_bGettingIsProtected; + bool m_bGettingMarginsValue; sal_uInt32 m_nAttributes; sal_uInt32 m_nAttributes2; sal_uInt32 m_nAttributes3; @@ -229,8 +279,7 @@ public: void Read(LwpObjectStream* pStrm); LwpObjectID& GetOnlyLayout() { return m_OnlyLayout;} - LwpDLVListHeadTail& GetLayouts() { return m_Layouts;} - LwpVirtualLayout* GetLayout(LwpVirtualLayout* pStartLayout); + rtl::Reference GetLayout(LwpVirtualLayout* pStartLayout); protected: LwpObjectID m_OnlyLayout; //LwpVirtualLayout LwpDLVListHeadTail m_Layouts; @@ -242,7 +291,7 @@ LwpHeadLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm); virtual ~LwpHeadLayout(){} void RegisterStyle() SAL_OVERRIDE; - LwpVirtualLayout* FindEnSuperTableLayout(); + rtl::Reference FindEnSuperTableLayout(); protected: void Read() SAL_OVERRIDE; virtual LWP_LAYOUT_TYPE GetLayoutType () SAL_OVERRIDE { return LWP_HEAD_LAYOUT;} @@ -279,10 +328,17 @@ public: LwpMiddleLayout( LwpObjectHeader &objHdr, LwpSvStream* pStrm ); virtual ~LwpMiddleLayout(); - virtual bool MarginsSameAsParent() SAL_OVERRIDE; - virtual double GetMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE; + virtual double MarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE; virtual double GetExtMarginsValue(const sal_uInt8& nWhichSide) SAL_OVERRIDE; - LwpLayoutGeometry* GetGeometry(); + LwpLayoutGeometry* GetGeometry() + { + if (m_bGettingGeometry) + throw std::runtime_error("recursion in layout"); + m_bGettingGeometry = true; + auto pRet = Geometry(); + m_bGettingGeometry = false; + return pRet; + } double GetGeometryHeight(); double GetGeometryWidth(); LwpBorderStuff* GetBorderStuff(); @@ -298,7 +354,7 @@ virtual sal_uInt8 GetContentOrientation() SAL_OVERRIDE; virtual bool HonorProtection() SAL_OVERRIDE; virtual bool IsProtected() SAL_OVERRIDE; - LwpVirtualLayout* GetWaterMarkLayout(); + rtl::Reference GetWaterMarkLayout(); XFBGImage* GetXFBGImage(); bool GetUsePrinterSettings(); @@ -328,6 +384,10 @@ protected: void Read() SAL_OVERRIDE; + virtual bool MarginsSameAsParent() SAL_OVERRIDE; +private: + LwpObjectID m_BasedOnStyle; + LwpLayoutGeometry* Geometry(); protected: enum { @@ -336,8 +396,7 @@ }; LwpObjectID m_Content; - LwpObjectID m_BasedOnStyle; - + rtl::Reference GetBasedOnStyle(); LwpObjectID m_TabPiece; LwpLayoutStyle* m_pStyleStuff; LwpLayoutMisc* m_pMiscStuff; @@ -347,6 +406,7 @@ LwpObjectID m_LayBorderStuff; LwpObjectID m_LayBackgroundStuff; LwpObjectID m_LayExtBorderStuff; + bool m_bGettingGeometry; public: LwpObjectID& GetContent() { return m_Content; } LwpTabOverride* GetTabOverride(); @@ -394,7 +454,7 @@ virtual bool IsUseOnAllOddPages() SAL_OVERRIDE; virtual bool IsUseOnPage() SAL_OVERRIDE; LwpObjectID& GetPosition(){ return m_Positon;} - virtual LwpVirtualLayout* GetContainerLayout() SAL_OVERRIDE; + virtual rtl::Reference GetContainerLayout() SAL_OVERRIDE; }; class LwpPlacableLayout : public LwpLayout diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpnotes.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpnotes.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpnotes.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpnotes.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -92,7 +92,7 @@ LwpFrib::RegisterStyle(m_pPara->GetFoundry()); //register foonote style pLayout->SetFoundry(m_pPara->GetFoundry()); - pLayout->RegisterStyle(); + pLayout->DoRegisterStyle(); } } @@ -101,7 +101,7 @@ */ void LwpFribNote::XFConvert(XFContentContainer* pCont) { - LwpNoteLayout* pLayout =static_cast(m_Layout.obj().get()); + LwpNoteLayout* pLayout = dynamic_cast(m_Layout.obj().get()); if(pLayout) { XFAnnotation* pXFNote = new XFAnnotation; @@ -172,7 +172,7 @@ if(pTextLayout) { pTextLayout->SetFoundry(GetFoundry()); - pTextLayout->RegisterStyle(); + pTextLayout->DoRegisterStyle(); } } @@ -217,10 +217,10 @@ LwpNoteHeaderLayout* pTextLayout = static_cast(FindChildByType(LWP_NOTEHEADER_LAYOUT)); if(pTextLayout) { - LwpStory* pStory = static_cast(pTextLayout->GetContent().obj().get()); + LwpStory* pStory = dynamic_cast(pTextLayout->GetContent().obj().get()); if(pStory) { - LwpPara* pFirst = static_cast(pStory->GetFirstPara().obj().get()); + LwpPara* pFirst = dynamic_cast(pStory->GetFirstPara().obj().get()); if(pFirst) return pFirst->GetContentText(true); } @@ -284,7 +284,7 @@ if(pContent.is()) { pContent->SetFoundry(GetFoundry()); - pContent->RegisterStyle(); + pContent->DoRegisterStyle(); } } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobj.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobj.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobj.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobj.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -64,7 +64,8 @@ * @descr construct lwpobject from stream */ LwpObject::LwpObject(LwpObjectHeader objHdr, LwpSvStream* pStrm) - : m_ObjHdr(objHdr), m_pObjStrm(NULL), m_pFoundry(NULL), m_pStrm(pStrm) + : m_ObjHdr(objHdr), m_pObjStrm(nullptr), m_pFoundry(nullptr) + , m_pStrm(pStrm), m_bRegisteringStyle(false), m_bParsingStyle(false) { m_pObjStrm = new LwpObjectStream(pStrm, m_ObjHdr.IsCompressed(), static_cast(m_ObjHdr.GetSize()) ); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjfactory.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjfactory.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjfactory.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjfactory.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -670,10 +670,15 @@ break; } } - if(newObj.is()) + if (newObj.is()) { newObj->QuickRead(); - m_IdToObjList.insert(LwpIdToObjMap::value_type(objHdr.GetID(), newObj)); + auto result = m_IdToObjList.insert(LwpIdToObjMap::value_type(objHdr.GetID(), newObj)); + if (!result.second) + { + SAL_WARN("lwp", "clearing duplicate object"); + newObj.clear(); + } } return newObj; @@ -706,7 +711,12 @@ return NULL; } + if (std::find(m_aObjsIDInCreation.begin(), m_aObjsIDInCreation.end(), objID) != m_aObjsIDInCreation.end()) + throw std::runtime_error("recursion in object creation"); + + m_aObjsIDInCreation.push_back(objID); obj = CreateObject(objHdr.GetTag(), objHdr); + m_aObjsIDInCreation.pop_back(); } return obj; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjfactory.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjfactory.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjfactory.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjfactory.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -76,6 +76,7 @@ #include "lwpidxmgr.hxx" #include +#include /** * @brief object factory used for lwp object creation and maintenance @@ -90,9 +91,9 @@ //For object Factory and object manager private: -// static LwpObjectFactory *m_pMgr; sal_uInt32 m_nNumObjs; LwpSvStream* m_pSvStream; + std::vector m_aObjsIDInCreation; struct hashFunc { size_t operator()( const LwpObjectID& rName ) const diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobj.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobj.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobj.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobj.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -67,6 +67,8 @@ #include +#include + #include #include "lwpheader.hxx" @@ -92,12 +94,35 @@ LwpObjectStream* m_pObjStrm; LwpFoundry* m_pFoundry; LwpSvStream* m_pStrm; + bool m_bRegisteringStyle; + bool m_bParsingStyle; protected: virtual void Read(); -public: - void QuickRead(); virtual void RegisterStyle(); virtual void Parse(IXFStream* pOutputStream); +public: + void QuickRead(); + //calls RegisterStyle but bails if DoRegisterStyle is called + //on the same object recursively + void DoRegisterStyle() + { + if (m_bRegisteringStyle) + throw std::runtime_error("recursion in styles"); + m_bRegisteringStyle = true; + RegisterStyle(); + m_bRegisteringStyle = false; + } + //calls Parse but bails if DoParse is called + //on the same object recursively + void DoParse(IXFStream* pOutputStream) + { + if (m_bParsingStyle) + throw std::runtime_error("recursion in parsing"); + m_bParsingStyle = true; + Parse(pOutputStream); + m_bParsingStyle = false; + } + virtual void XFConvert(XFContentContainer* pCont); LwpFoundry* GetFoundry(){return m_pFoundry;} diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjid.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjid.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjid.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjid.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -187,12 +187,12 @@ */ rtl::Reference LwpObjectID::obj(VO_TYPE tag) const { - LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); - LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory(); - if(IsNull()) + if (IsNull()) { return NULL; } + LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); + LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory(); rtl::Reference pObj = pObjMgr->QueryObject(*this); if( tag!=VO_INVALID && (pObj.is()) ) { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjstrm.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjstrm.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpobjstrm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpobjstrm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -170,7 +170,7 @@ memset(buf, 0, len); if( len > m_nBufSize - m_nReadPos ) { - assert(false); + SAL_WARN("lwp", "read request longer than buffer"); len = m_nBufSize - m_nReadPos; } if( m_pContentBuf && len) diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpoleobject.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpoleobject.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpoleobject.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpoleobject.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -116,10 +116,10 @@ double fSclGrafWidth = fWidth;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleWidth()); double fSclGrafHeight = fHeight;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleHeight()); - LwpVirtualLayout* pLayout = GetLayout(NULL); - if (pLayout && pLayout->IsFrame()) + rtl::Reference xLayout(GetLayout(nullptr)); + if (xLayout.is() && xLayout->IsFrame()) { - LwpFrameLayout* pMyFrameLayout = static_cast(pLayout); + LwpFrameLayout* pMyFrameLayout = static_cast(xLayout.get()); LwpLayoutScale* pMyScale = pMyFrameLayout->GetLayoutScale(); LwpLayoutGeometry* pFrameGeo = pMyFrameLayout->GetGeometry(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwppagelayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppagelayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwppagelayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppagelayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -127,7 +127,7 @@ if(pStory.is()) { pStory->SetFoundry(m_pFoundry); - pStory->Parse(pOutputStream); //Do not parse the next story + pStory->DoParse(pOutputStream); //Do not parse the next story } } @@ -267,8 +267,8 @@ void LwpPageLayout::ParseFootNoteSeparator(XFPageMaster * pm1) { //Get the footnoteoptions for the root document - LwpDocument* pDocument = m_pFoundry->GetDocument(); - if(pDocument) + LwpDocument* pDocument = m_pFoundry ? m_pFoundry->GetDocument() : nullptr; + if (pDocument) { LwpObjectID* pFontnodeId = pDocument->GetValidFootnoteOpts(); @@ -506,24 +506,24 @@ LwpHeaderLayout* LwpPageLayout::GetHeaderLayout() { - LwpVirtualLayout* pLay = dynamic_cast(GetChildHead().obj().get()); - while(pLay) + rtl::Reference xLay(dynamic_cast(GetChildHead().obj().get())); + while (xLay.is()) { - if( pLay->GetLayoutType() == LWP_HEADER_LAYOUT ) - return ( static_cast (pLay) ); - pLay = dynamic_cast (pLay->GetNext().obj().get()); + if (xLay->GetLayoutType() == LWP_HEADER_LAYOUT) + return dynamic_cast(xLay.get()); + xLay.set(dynamic_cast(xLay->GetNext().obj().get())); } return NULL; } LwpFooterLayout* LwpPageLayout::GetFooterLayout() { - LwpVirtualLayout* pLay = dynamic_cast(GetChildHead().obj().get()); - while(pLay) + rtl::Reference xLay(dynamic_cast(GetChildHead().obj().get())); + while (xLay.is()) { - if( pLay->GetLayoutType() == LWP_FOOTER_LAYOUT ) - return ( static_cast (pLay) ); - pLay = dynamic_cast (pLay->GetNext().obj().get()); + if (xLay->GetLayoutType() == LWP_FOOTER_LAYOUT) + return dynamic_cast(xLay.get()); + xLay.set(dynamic_cast(xLay->GetNext().obj().get())); } return NULL; } @@ -536,19 +536,19 @@ { if(IsComplex()) { - LwpVirtualLayout* pLay = dynamic_cast(GetChildHead().obj().get()); - while(pLay) + rtl::Reference xLay(dynamic_cast(GetChildHead().obj().get())); + while (xLay.is()) { - if( pLay->GetLayoutType() == LWP_PAGE_LAYOUT ) + if (xLay->GetLayoutType() == LWP_PAGE_LAYOUT) { - LwpPageLayout* pPageLayout = static_cast (pLay); + LwpPageLayout* pPageLayout = static_cast(xLay.get()); LwpUseWhen* pUseWhen = pPageLayout->GetUseWhen(); if(pUseWhen && pUseWhen->IsUseOnAllOddPages()) { return pPageLayout; } } - pLay = dynamic_cast (pLay->GetNext().obj().get()); + xLay.set(dynamic_cast(xLay->GetNext().obj().get())); } } return NULL; @@ -579,6 +579,8 @@ { sal_Int16 nPageNumber = -1; LwpFoundry* pFoundry = this->GetFoundry(); + if (!pFoundry) + return nPageNumber; LwpDocument* pDoc = pFoundry->GetDocument(); LwpDLVListHeadTailHolder* pHeadTail = dynamic_cast(pDoc->GetPageHintsID().obj().get()); if(!pHeadTail) return nPageNumber; @@ -884,7 +886,7 @@ //Call the RegisterStyle first to register the styles in header paras, and then XFConvert() pStory->SetFoundry(m_pFoundry); - pStory->RegisterStyle(); + pStory->DoRegisterStyle(); //, 06/27/2005 //register child layout style for framelayout, RegisterChildStyle(); @@ -1037,8 +1039,7 @@ pChangeMgr->SetHeadFootFribMap(true); pStory->SetFoundry(m_pFoundry); - pStory->RegisterStyle(); - //, 06/27/2005 + pStory->DoRegisterStyle(); //register child layout style for framelayout, RegisterChildStyle(); //End diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwppara1.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara1.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwppara1.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara1.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -224,7 +224,7 @@ if (pPreFrib) { if ((pPreFrib->GetType() == FRIB_TAG_TEXT) && - (pPreFrib->GetModifiers()->aTxtAttrOverride.GetHideLevels() == nHideLevels)) + (pPreFrib->GetModifiers() && pPreFrib->GetModifiers()->aTxtAttrOverride.GetHideLevels() == nHideLevels)) { pParaNumbering->pPrefix = static_cast(pPreFrib); } @@ -241,7 +241,7 @@ { if ( (pFrib->GetNext() && pFrib->GetNext()->GetType() == FRIB_TAG_TEXT) || - (pFrib->GetModifiers()->aTxtAttrOverride.GetHideLevels() == nHideLevels) + (pFrib->GetModifiers() && pFrib->GetModifiers()->aTxtAttrOverride.GetHideLevels() == nHideLevels) ) { pParaNumbering->pSuffix = static_cast(pFrib); @@ -628,8 +628,10 @@ bool LwpPara::IsInCell() { LwpStory *pStory = GetStory(); - LwpVirtualLayout* pLayout = pStory ? pStory->GetLayout(NULL) : NULL; - if(pLayout && pLayout->IsCell()) + if (!pStory) + return false; + rtl::Reference xLayout(pStory->GetLayout(nullptr)); + if (xLayout.is() && xLayout->IsCell()) return true; return false; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwppara.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwppara.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -253,6 +253,8 @@ { m_pXFContainer = new XFContentContainer; XFConvert(m_pXFContainer); + if (!m_pXFContainer) + return; m_pXFContainer->ToXml(pOutputStream); m_pXFContainer->Reset(); delete m_pXFContainer; @@ -277,6 +279,7 @@ //Create an XFPara for this VO_PARA XFParagraph *pPara = new XFParagraph; + rtl::Reference xHolder(pPara); pPara->SetStyleName(m_StyleName); if(!m_SectionStyleName.isEmpty()) @@ -288,7 +291,7 @@ m_pXFContainer = pSection; } - if (m_bHasBullet && m_pSilverBullet) + if (m_bHasBullet && m_pSilverBullet) { XFContentContainer* pListItem = AddBulletList(m_pXFContainer); if (pListItem) @@ -296,7 +299,7 @@ pListItem->Add(pPara); } } - else + else if (m_pXFContainer) { LwpBulletStyleMgr* pBulletStyleMgr = this->GetBulletStyleMgr(); if (pBulletStyleMgr) @@ -310,7 +313,7 @@ m_Fribs.SetXFPara(pPara); m_Fribs.XFConvert(); - if (m_pBreaks) + if (m_pBreaks && m_pXFContainer) AddBreakAfter(m_pXFContainer); } @@ -353,13 +356,14 @@ //2 reg para style if (!m_pFoundry) return; - XFParaStyle* pBaseStyle = static_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle)); - if (pBaseStyle == NULL) return; + XFParaStyle* pBaseStyle = dynamic_cast(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle)); + if (pBaseStyle == nullptr) return; m_StyleName = pBaseStyle->GetStyleName();//such intf to be added m_ParentStyleName = m_StyleName; XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); - if (GetParaStyle()->GetIndent()) + LwpParaStyle* pParaStyle = GetParaStyle(); + if (pParaStyle && pParaStyle->GetIndent()) { std::unique_ptr pIndentOverride(GetParaStyle()->GetIndent()->clone()); delete m_pIndentOverride; @@ -386,45 +390,52 @@ { case PP_LOCAL_ALIGN: { - if (!rParaStyle.GetAlignment()) - OverrideAlignment(NULL,static_cast(pProps)->GetAlignment(),pOverStyle); - else + LwpAlignmentOverride *pAlignment = static_cast(pProps)->GetAlignment(); + if (pAlignment) { - boost::scoped_ptr const pAlign( - rParaStyle.GetAlignment()->clone()); - OverrideAlignment(pAlign.get(), - static_cast(pProps)->GetAlignment(), - pOverStyle); + if (!rParaStyle.GetAlignment()) + OverrideAlignment(nullptr, pAlignment, pOverStyle); + else + { + std::unique_ptr const pAlign( + rParaStyle.GetAlignment()->clone()); + OverrideAlignment(pAlign.get(), + pAlignment, + pOverStyle); + } } - } break; + } case PP_LOCAL_INDENT: { noIndent = false; - if (!rParaStyle.GetIndent()) - OverrideIndent(NULL,static_cast(pProps)->GetIndent(),pOverStyle); - - else + LwpIndentOverride *pIndent = static_cast(pProps)->GetIndent(); + if (pIndent) { - OverrideIndent(m_pIndentOverride,static_cast(pProps)->GetIndent(),pOverStyle); + if (!rParaStyle.GetIndent()) + OverrideIndent(nullptr, pIndent, pOverStyle); + else + OverrideIndent(m_pIndentOverride, pIndent, pOverStyle); } - } break; + } case PP_LOCAL_SPACING: { noSpacing = false; - if (!rParaStyle.GetSpacing()) - OverrideSpacing(NULL,static_cast(pProps)->GetSpacing(),pOverStyle); - else + LwpSpacingOverride *pSpacing = static_cast(pProps)->GetSpacing(); + if (pSpacing) { - boost::scoped_ptr const - pSpacing(rParaStyle.GetSpacing()->clone()); - OverrideSpacing(pSpacing.get(), - static_cast(pProps)->GetSpacing(), - pOverStyle); + if (!rParaStyle.GetSpacing()) + OverrideSpacing(nullptr, pSpacing, pOverStyle); + else + { + std::unique_ptr const + pNewSpacing(rParaStyle.GetSpacing()->clone()); + OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle); + } } - } break; + } case PP_LOCAL_BORDER: { OverrideParaBorder(pProps, pOverStyle); @@ -692,7 +703,7 @@ if (!pPrePara) { LwpStory* pStory = pPara->GetStory(); - pPrePara = pStory->GetLastParaOfPreviousStory(); + pPrePara = pStory ? pStory->GetLastParaOfPreviousStory() : nullptr; if (!pPrePara) { @@ -760,13 +771,13 @@ //register tab style if(m_Fribs.HasFrib(FRIB_TAG_TAB)) { - XFParaStyle* pParaStyle = new XFParaStyle; - *pParaStyle = *GetXFParaStyle(); + XFParaStyle* pNewParaStyle = new XFParaStyle; + *pNewParaStyle = *GetXFParaStyle(); //pOverStyle->SetStyleName(""); - this->RegisterTabStyle(pParaStyle); + this->RegisterTabStyle(pNewParaStyle); if (!m_ParentStyleName.isEmpty()) - pParaStyle->SetParentStyleName(m_ParentStyleName); - m_StyleName = pXFStyleManager->AddStyle(pParaStyle).m_pStyle->GetStyleName(); + pNewParaStyle->SetParentStyleName(m_ParentStyleName); + m_StyleName = pXFStyleManager->AddStyle(pNewParaStyle).m_pStyle->GetStyleName(); } //register master page; @@ -871,7 +882,7 @@ */ void LwpPara::AddBreakBefore(XFContentContainer* pCont) { - if (!m_pBreaks) + if (!m_pBreaks || !pCont) return; if (m_pBreaks->IsPageBreakBefore()) { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwppara.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwppara.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwppara.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -345,6 +345,8 @@ } inline void LwpPara::AddXFContent(XFContent* pCont) { + if (!m_pXFContainer) + throw std::runtime_error("paragraph lacks container"); m_pXFContainer->Add(pCont); } inline void LwpPara::SetXFContainer(XFContentContainer* pCont) diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpparaproperty.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpparaproperty.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpparaproperty.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpparaproperty.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -146,8 +146,8 @@ LwpObjectID align; align.ReadIndexed(pFile); - LwpAlignmentPiece *pAlignmentPiece = dynamic_cast(align.obj(VO_ALIGNMENTPIECE).get()); - m_pAlignment = pAlignmentPiece ? dynamic_cast(pAlignmentPiece->GetOverride()) : NULL; + rtl::Reference xAlignmentPiece(dynamic_cast(align.obj(VO_ALIGNMENTPIECE).get())); + m_pAlignment = xAlignmentPiece.is() ? dynamic_cast(xAlignmentPiece->GetOverride()) : nullptr; } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpparastyle.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpparastyle.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpparastyle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpparastyle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -679,6 +679,9 @@ void LwpParaStyle::RegisterStyle() { + if (!m_pFoundry) + throw std::runtime_error("missing Foundry"); + XFParaStyle* pStyle = new XFParaStyle(); //Set name diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpproplist.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpproplist.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpproplist.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpproplist.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -71,7 +71,7 @@ LwpPropListElement* LwpPropListElement::GetNext() { - return static_cast(LwpDLVList::GetNext().obj().get()); + return dynamic_cast(LwpDLVList::GetNext().obj().get()); } void LwpPropListElement::Read() @@ -117,7 +117,7 @@ LwpPropListElement* LwpPropList::GetFirst() { - return static_cast(LwpDLVListHead::GetFirst().obj().get()); + return dynamic_cast(LwpDLVListHead::GetFirst().obj().get()); } OUString LwpPropList::EnumNamedProperty(OUString& name,OUString& value) @@ -131,11 +131,10 @@ value = pElement->GetValue().str(); name = pElement->GetName().str(); pElement = pElement->GetNext(); - return pElement->GetName().str(); + if(pElement) + return pElement->GetName().str(); } - else - return OUString(""); - + return OUString(""); } else { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwprowlayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwprowlayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwprowlayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwprowlayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -366,11 +366,14 @@ */ void LwpRowLayout::ConvertCommonRow(XFTable* pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol) { + LwpTableLayout* pTableLayout = GetParentTableLayout(); + if (!pTableLayout) + return; + XFRow* pRow = new XFRow; pRow->SetStyleName(m_StyleName); - XFCell * pCell = NULL; - LwpTableLayout* pTableLayout = GetParentTableLayout(); + XFCell * pCell = nullptr; LwpTable* pTable = pTableLayout->GetTable(); sal_uInt8 nCellStartCol,nCellEndCol; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -131,11 +131,11 @@ m_pStream->SeekRel(2); //for calculating transformation params. - LwpFrameLayout* pMyFrameLayout = static_cast(m_pGraphicObj->GetLayout(NULL)); - if (pMyFrameLayout) + rtl::Reference xMyFrameLayout(dynamic_cast(m_pGraphicObj->GetLayout(nullptr).get())); + if (xMyFrameLayout.is()) { - LwpLayoutScale* pMyScale = pMyFrameLayout->GetLayoutScale(); - LwpLayoutGeometry* pFrameGeo = pMyFrameLayout->GetGeometry(); + LwpLayoutScale* pMyScale = xMyFrameLayout->GetLayoutScale(); + LwpLayoutGeometry* pFrameGeo = xMyFrameLayout->GetGeometry(); if (pMyScale && pFrameGeo) { // original drawing size @@ -145,10 +145,8 @@ double fGrafOrgHeight = (double)nHeight/TWIPS_PER_CM; // get margin values - double fLeftMargin = pMyFrameLayout->GetMarginsValue(MARGIN_LEFT); -// double fRightMargin = pMyFrameLayout->GetMarginsValue(MARGIN_RIGHT); - double fTopMargin = pMyFrameLayout->GetMarginsValue(MARGIN_TOP); -// double fBottomMargin = pMyFrameLayout->GetMarginsValue(MARGIN_BOTTOM); + double fLeftMargin = xMyFrameLayout->GetMarginsValue(MARGIN_LEFT); + double fTopMargin = xMyFrameLayout->GetMarginsValue(MARGIN_TOP); // frame size double fFrameWidth = LwpTools::ConvertFromUnitsToMetric(pFrameGeo->GetWidth()); @@ -199,7 +197,7 @@ } // placement: centered - if (pMyFrameLayout->GetScaleCenter()) + if (xMyFrameLayout->GetScaleCenter()) { Rectangle aBoundRect(static_cast(left*m_aTransformData.fScaleX + fLeftMargin), static_cast(top * m_aTransformData.fScaleY + fTopMargin), diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpsilverbullet.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpsilverbullet.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpsilverbullet.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpsilverbullet.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -97,7 +97,10 @@ sal_uInt16 nNumPos = m_pObjStrm->QuickReaduInt16(); - for (sal_uInt8 nC = 0; nC < nNumPos; nC++) + if (nNumPos > SAL_N_ELEMENTS(m_pResetPositionFlags)) + throw std::range_error("corrupt SilverBullet"); + + for (sal_uInt16 nC = 0; nC < nNumPos; nC++) m_pResetPositionFlags[nC] = m_pObjStrm->QuickReaduInt8(); m_nUseCount = m_pObjStrm->QuickReaduInt32(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpstory.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpstory.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpstory.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpstory.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -105,15 +105,15 @@ XFConvertFrameInFrame(pCont); //process para list XFContentContainer* pParaCont = pCont; - LwpPara* pPara = dynamic_cast ( GetFirstPara().obj().get() ); - while(pPara) + rtl::Reference xPara(dynamic_cast(GetFirstPara().obj().get())); + while (xPara.is()) { - pPara->SetFoundry(m_pFoundry); - pPara->XFConvert(pParaCont); + xPara->SetFoundry(m_pFoundry); + xPara->XFConvert(pParaCont); //Get the xfcontainer for the next para - pParaCont = pPara->GetXFContainer(); - pPara = dynamic_cast ( pPara->GetNext().obj().get() ); + pParaCont = xPara->GetXFContainer(); + xPara.set(dynamic_cast(xPara->GetNext().obj().get())); } //process frame which anchor is to cell after converter all the para @@ -121,26 +121,26 @@ XFConvertFrameInHeaderFooter(pCont); //Release Lwp Objects - LwpPara* pCur = dynamic_cast (GetFirstPara().obj().get()); - LwpPara* pNext; - while(pCur) + rtl::Reference xCur(dynamic_cast(GetFirstPara().obj().get())); + rtl::Reference xNext; + while (xCur.is()) { - pNext = dynamic_cast ( pCur->GetNext().obj().get() ); + xNext.set(dynamic_cast(xCur->GetNext().obj().get())); LwpGlobalMgr* pGlobal = LwpGlobalMgr::GetInstance(); LwpObjectFactory* pObjMgr = pGlobal->GetLwpObjFactory(); - pObjMgr->ReleaseObject(pCur->GetObjectID()); - pCur = pNext; + pObjMgr->ReleaseObject(xCur->GetObjectID()); + xCur = xNext; } } void LwpStory::RegisterStyle() { - LwpPara* pPara = dynamic_cast( GetFirstPara().obj().get() ); - while(pPara) + rtl::Reference xPara(dynamic_cast(GetFirstPara().obj().get())); + while (xPara.is()) { - pPara->SetFoundry(m_pFoundry); - pPara->RegisterStyle(); - pPara = dynamic_cast(pPara->GetNext().obj().get()); + xPara->SetFoundry(m_pFoundry); + xPara->DoRegisterStyle(); + xPara.set(dynamic_cast(xPara->GetNext().obj().get())); } } @@ -150,24 +150,7 @@ XFConvert(m_pXFContainer); m_pXFContainer->ToXml(pOutputStream); delete m_pXFContainer; - m_pXFContainer = NULL; - - //It seems that, currently, we do not need to process the child story - /*LwpObject* pChildStory = GetFirstStory()->obj(); - if(pChildStory) - { - pChildStory->SetFoundry(m_pFoundry); - pChildStory->Parse(pOutputStream); - }*/ - - //Don't process the next story -/* LwpObject* pNextStory = GetNextStory()->obj(); - if(pNextStory) - { - pNextStory->SetFoundry(m_pFoundry); - pNextStory->Parse(pOutputStream); - }*/ - + m_pXFContainer = nullptr; } #include "lwppagelayout.hxx" @@ -229,20 +212,23 @@ { //Get all the pagelayout and store in list std::vector aLayoutList; - LwpVirtualLayout* pLayout = GetLayout(NULL); - while(pLayout) + rtl::Reference xLayout(GetLayout(nullptr)); + while (xLayout.get()) { - if(pLayout->IsPage()) + LwpPageLayout *pLayout = xLayout->IsPage() + ? dynamic_cast(xLayout.get()) + : nullptr; + if (pLayout) { - LwpLayout::UseWhenType eSectionType = static_cast(pLayout)->GetUseWhenType(); - //for mirror page, the child is pagelayout - LwpVirtualLayout* pParent = pLayout->GetParentLayout(); - if(eSectionType != LwpLayout::StartWithinColume && pParent && !pParent->IsPage()) + LwpLayout::UseWhenType eSectionType = pLayout->GetUseWhenType(); + //for mirror page, the child is pagelayout + rtl::Reference xParent = xLayout->GetParentLayout(); + if(eSectionType != LwpLayout::StartWithinColume && xParent.is() && !xParent->IsPage()) { - aLayoutList.push_back(static_cast(pLayout)); + aLayoutList.push_back(pLayout); } } - pLayout = GetLayout(pLayout); + xLayout = GetLayout(xLayout.get()); } // sort the pagelayout according to their position std::vector::iterator aIt; @@ -335,26 +321,24 @@ **************************************************************************/ void LwpStory::XFConvertFrameInCell(XFContentContainer* pCont) { - LwpVirtualLayout* pLayout = GetLayout(NULL); - while(pLayout) + rtl::Reference xLayout(GetLayout(nullptr)); + while (xLayout.is()) { - LwpVirtualLayout* pFrameLayout = dynamic_cast(pLayout->GetChildHead().obj().get()); - while(pFrameLayout) + rtl::Reference xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get())); + while (xFrameLayout.is()) { - - //if(pFrameLayout->IsAnchorCell()) - if(pFrameLayout->IsAnchorCell() && pFrameLayout->HasContent()) + if (xFrameLayout->IsAnchorCell() && xFrameLayout->HasContent()) { //get the first xfpara rtl::Reference first( pCont->FindFirstContent(enumXFContentPara)); XFContentContainer* pXFFirtPara = static_cast(first.get()); if(pXFFirtPara) - pFrameLayout->XFConvert(pXFFirtPara); + xFrameLayout->XFConvert(pXFFirtPara); } - pFrameLayout = dynamic_cast(pFrameLayout->GetNext().obj().get()); + xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get())); } - pLayout = GetLayout(pLayout); + xLayout = GetLayout(xLayout.get()); } } @@ -366,22 +350,22 @@ **************************************************************************/ void LwpStory::XFConvertFrameInPage(XFContentContainer* pCont) { - LwpVirtualLayout* pLayout = GetLayout(NULL); - while(pLayout) + rtl::Reference xLayout(GetLayout(nullptr)); + while (xLayout.is()) { - LwpVirtualLayout* pFrameLayout = dynamic_cast(pLayout->GetChildHead().obj().get()); - while(pFrameLayout) + rtl::Reference xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get())); + while (xFrameLayout.is()) { - if((pFrameLayout->IsAnchorPage() - &&(pFrameLayout->IsFrame() - ||pFrameLayout->IsSuperTable() - ||pFrameLayout->IsGroupHead()))) + if((xFrameLayout->IsAnchorPage() + &&(xFrameLayout->IsFrame() + || xFrameLayout->IsSuperTable() + || xFrameLayout->IsGroupHead()))) { - pFrameLayout->XFConvert(pCont); + xFrameLayout->XFConvert(pCont); } - pFrameLayout = dynamic_cast(pFrameLayout->GetNext().obj().get()); + xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get())); } - pLayout = GetLayout(pLayout); + xLayout = GetLayout(xLayout.get()); } } /************************************************************************** @@ -392,19 +376,19 @@ **************************************************************************/ void LwpStory::XFConvertFrameInFrame(XFContentContainer* pCont) { - LwpVirtualLayout* pLayout = GetLayout(NULL); - while(pLayout) + rtl::Reference xLayout(GetLayout(nullptr)); + while (xLayout.get()) { - LwpVirtualLayout* pFrameLayout = dynamic_cast(pLayout->GetChildHead().obj().get()); - while(pFrameLayout) + rtl::Reference xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get())); + while (xFrameLayout.is()) { - if(pFrameLayout->IsAnchorFrame()) + if (xFrameLayout->IsAnchorFrame()) { - pFrameLayout->XFConvert(pCont); + xFrameLayout->XFConvert(pCont); } - pFrameLayout = dynamic_cast(pFrameLayout->GetNext().obj().get()); + xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get())); } - pLayout = GetLayout(pLayout); + xLayout = GetLayout(xLayout.get()); } } /************************************************************************** @@ -415,24 +399,24 @@ **************************************************************************/ void LwpStory::XFConvertFrameInHeaderFooter(XFContentContainer* pCont) { - LwpVirtualLayout* pLayout = GetLayout(NULL); - while(pLayout) + rtl::Reference xLayout(GetLayout(nullptr)); + while (xLayout.is()) { - LwpVirtualLayout* pFrameLayout = dynamic_cast(pLayout->GetChildHead().obj().get()); - while(pFrameLayout) + rtl::Reference xFrameLayout(dynamic_cast(xLayout->GetChildHead().obj().get())); + while (xFrameLayout.is()) { - if(pFrameLayout->IsAnchorPage() && (pLayout->IsHeader() || pLayout->IsFooter())) + if (xFrameLayout->IsAnchorPage() && (xLayout->IsHeader() || xLayout->IsFooter())) { //The frame must be included by rtl::Reference first( pCont->FindFirstContent(enumXFContentPara)); XFContentContainer* pXFFirtPara = static_cast(first.get()); if(pXFFirtPara) - pFrameLayout->XFConvert(pXFFirtPara); + xFrameLayout->XFConvert(pXFFirtPara); } - pFrameLayout = dynamic_cast(pFrameLayout->GetNext().obj().get()); + xFrameLayout.set(dynamic_cast(xFrameLayout->GetNext().obj().get())); } - pLayout = GetLayout(pLayout); + xLayout = GetLayout(xLayout.get()); } } @@ -452,10 +436,10 @@ LwpPara* LwpStory::GetLastParaOfPreviousStory() { - LwpVirtualLayout* pVLayout = this->GetLayout(NULL); - if (pVLayout) + rtl::Reference xVLayout(this->GetLayout(nullptr)); + if (xVLayout.is()) { - return pVLayout->GetLastParaOfPreviousStory(); + return xVLayout->GetLastParaOfPreviousStory(); } return NULL; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpstory.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpstory.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpstory.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpstory.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -155,7 +155,7 @@ { if(m_pTabLayout) return m_pTabLayout; - return static_cast(GetLayout(NULL)); + return dynamic_cast(GetLayout(nullptr).get()); } void LwpStory::SetPMModified(bool bPMModified) { diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptable.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptable.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptable.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptable.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -124,7 +124,10 @@ LwpObjectID& GetDefaultCellStyle() {return m_DefaultCellStyle;} sal_uInt16 GetRow() {return m_nRow;} sal_uInt16 GetColumn() {return m_nColumn;} - LwpTableLayout * GetTableLayout(){return static_cast(GetLayout(NULL));} + rtl::Reference GetTableLayout() + { + return rtl::Reference(dynamic_cast(GetLayout(nullptr).get())); + } bool IsNumberDown(); virtual bool IsTable() SAL_OVERRIDE { return true;} LwpSuperTableLayout* GetSuperTableLayout(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptablelayout.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptablelayout.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptablelayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptablelayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -355,7 +355,7 @@ void LwpSuperTableLayout::XFConvert(XFContentContainer* pCont) { if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == GetRelativeType() - && !GetContainerLayout()->IsCell()) + && (!GetContainerLayout().is() || !GetContainerLayout()->IsCell()) ) { LwpTableLayout * pTableLayout = GetTableLayout(); if (pTableLayout) @@ -451,6 +451,7 @@ return m_WordProCellsMap[static_cast(nRow)*m_nCols + nCol]; } + /** * @short traverse all table cells * @param @@ -581,10 +582,16 @@ LwpColumnLayout * pColumnLayout = dynamic_cast(rColumnID.obj().get()); while (pColumnLayout) { - m_pColumns[pColumnLayout->GetColumnID()] = pColumnLayout; + auto nColId = pColumnLayout->GetColumnID(); + if (nColId >= nCols) + { + delete [] pWidthCalculated; + throw std::range_error("corrupt LwpTableLayout"); + } + m_pColumns[nColId] = pColumnLayout; if (!pColumnLayout->IsJustifiable()) { - pWidthCalculated[pColumnLayout->GetColumnID()] = sal_True; + pWidthCalculated[nColId] = sal_True; dTableWidth -= pColumnLayout->GetWidth(); nJustifiableColumn --; } @@ -594,7 +601,7 @@ } // if all columns are not justifiable, the rightmost column will be changed to justifiable - if(nJustifiableColumn == 0) + if (nJustifiableColumn == 0 && nCols != 0) { nJustifiableColumn ++; if (m_pColumns[nCols - 1]) @@ -611,7 +618,7 @@ } // justifiable columns will share the remain width averagely - dDefaultColumn = dTableWidth/nJustifiableColumn; + dDefaultColumn = nJustifiableColumn ? dTableWidth/nJustifiableColumn : 0; // register default column style XFColStyle *pColStyle = new XFColStyle(); @@ -687,11 +694,8 @@ { // get super table layout LwpSuperTableLayout * pSuper = GetSuperTableLayout(); - if(!pSuper) - { - assert(false); + if (!pSuper) return; - } // get table LwpTable * pTable = GetTable(); @@ -719,7 +723,7 @@ // If the table is not "with paragraph above" placement, create an frame style // by supertable layout if ( LwpLayoutRelativityGuts::LAY_INLINE_NEWLINE == nType - && !pSuper->GetContainerLayout()->IsCell()) + && (!pSuper->GetContainerLayout().is() || !pSuper->GetContainerLayout()->IsCell()) ) { //with para above // pSuper->ApplyBackColor(pTableStyle); @@ -1107,9 +1111,9 @@ try{ - LwpDLVListHeadHolder* pHolder = static_cast(pFoundry->GetNumberManager().GetTableRangeID().obj().get()); + LwpDLVListHeadHolder* pHolder = dynamic_cast(pFoundry->GetNumberManager().GetTableRangeID().obj().get()); - LwpTableRange* pTableRange = static_cast(pHolder->GetHeadID().obj().get()); + LwpTableRange* pTableRange = pHolder ? dynamic_cast(pHolder->GetHeadID().obj().get()) : nullptr; //Look up the table while (NULL!=pTableRange) @@ -1122,44 +1126,50 @@ pTableRange = pTableRange->GetNext(); } - if (pTableRange) - { - LwpCellRange* pRange = static_cast(pTableRange->GetCellRangeID().obj().get()); - LwpFolder* pFolder = static_cast(pRange->GetFolderID().obj().get()); - LwpObjectID aRowListID = pFolder->GetChildHeadID(); - LwpRowList* pRowList = static_cast(aRowListID.obj().get()); + if (!pTableRange) + return; - //loop the rowlist - while( NULL!=pRowList) + LwpCellRange* pRange = dynamic_cast(pTableRange->GetCellRangeID().obj().get()); + if (!pRange) + return; + + LwpFolder* pFolder = dynamic_cast(pRange->GetFolderID().obj().get()); + if (!pFolder) + return; + + LwpObjectID aRowListID = pFolder->GetChildHeadID(); + LwpRowList* pRowList = dynamic_cast(aRowListID.obj().get()); + + //loop the rowlist + while( nullptr!=pRowList) + { + sal_uInt16 nRowID = pRowList->GetRowID(); { - sal_uInt16 nRowID = pRowList->GetRowID(); + LwpCellList* pCellList = dynamic_cast(pRowList->GetChildHeadID().obj().get()); + //loop the cellList + while( nullptr!=pCellList) { - LwpCellList* pCellList = static_cast(pRowList->GetChildHeadID().obj().get()); - //loop the celllist - while( NULL!=pCellList) - { - {//put cell - sal_uInt16 nColID = pCellList->GetColumnID(); + {//put cell + sal_uInt16 nColID = pCellList->GetColumnID(); + + XFCell* pCell = GetCellsMap(nRowID,static_cast(nColID)); + if (pCell) + { + pCellList->Convert(pCell, this); - XFCell* pCell = GetCellsMap(nRowID,static_cast(nColID)); - if (pCell) - { - pCellList->Convert(pCell, this); - - //process paragraph - PostProcessParagraph(pCell, nRowID, nColID); - } - else - { - //Hidden cell would not be in cellsmap - assert(false); - } + //process paragraph + PostProcessParagraph(pCell, nRowID, nColID); + } + else + { + //Hidden cell would not be in cellsmap + assert(false); } - pCellList = static_cast(pCellList->GetNextID().obj().get()); } + pCellList = dynamic_cast(pCellList->GetNextID().obj().get()); } - pRowList = static_cast(pRowList->GetNextID().obj().get()); } + pRowList = dynamic_cast(pRowList->GetNextID().obj().get()); } }catch (...) { @@ -1215,14 +1225,17 @@ if (bColorMod) { - rtl::Reference pFont = pOverStyle->GetFont(); - XFColor aColor = pFont->GetColor(); - if ( aColor == aNullColor ) + rtl::Reference xFont = pOverStyle->GetFont(); + if (xFont.is()) { - rtl::Reference pNewFont = new XFFont; - aColor = pNumStyle->GetColor(); - pNewFont->SetColor(aColor); - pOverStyle->SetFont(pNewFont); + XFColor aColor = xFont->GetColor(); + if ( aColor == aNullColor ) + { + rtl::Reference pNewFont = new XFFont; + aColor = pNumStyle->GetColor(); + pNewFont->SetColor(aColor); + pOverStyle->SetFont(pNewFont); + } } } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptabrack.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptabrack.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptabrack.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptabrack.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -61,6 +61,8 @@ #include "lwpobjstrm.hxx" #include "lwpslvlist.hxx" +#include + LwpTab::LwpTab() { m_nX = 0; @@ -86,11 +88,12 @@ void LwpTabRack::Read() { -// LwpObjectID m_NextID; m_NextID.ReadIndexed(m_pObjStrm); m_nNumTabs = m_pObjStrm->QuickReaduInt16(); - for( int i=0; i MaxTabs) + throw std::range_error("corrupt LwpTabRack"); + for (int i=0; iSkipExtra(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptblcell.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblcell.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptblcell.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblcell.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -107,7 +107,7 @@ void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/) { LwpObjectID aValueID = GetValueID(); - LwpNumericValue* pValue = static_cast(aValueID.obj().get()); + LwpNumericValue* pValue = dynamic_cast(aValueID.obj().get()); if (pValue) { pCell->SetValue( pValue->GetValue() ); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptblcell.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblcell.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptblcell.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblcell.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -152,7 +152,7 @@ void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; LwpObjectID GetCellRangeID(){return cpCellRange;} LwpObjectID GetTableID(){ return cqTable;} - LwpTableRange* GetNext() { return static_cast(LwpDLVList::GetNext().obj().get());} + LwpTableRange* GetNext() { return dynamic_cast(LwpDLVList::GetNext().obj().get());} protected: LwpObjectID cqTable; LwpObjectID cpCellRange; diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptblformula.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblformula.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptblformula.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptblformula.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -201,8 +201,13 @@ // Len = m_pObjStrm->QuickReaduInt16(); m_pObjStrm->SeekRel(2); - while ((TokenType = m_pObjStrm->QuickReaduInt16()) != TK_END) + bool bError = false; + while ((TokenType = m_pObjStrm->QuickReaduInt16(&bError)) != TK_END) { + + if (bError) + throw std::runtime_error("error reading expression"); + // Get the disk length of this token DiskLength = m_pObjStrm->QuickReaduInt16(); @@ -252,19 +257,29 @@ case TK_NOT: m_pObjStrm->SeekRel(DiskLength); // extensible for future + if (m_aStack.size() >= 2) {//binary operator LwpFormulaOp* pOp = new LwpFormulaOp(TokenType); pOp->AddArg(m_aStack.back()); m_aStack.pop_back(); pOp->AddArg(m_aStack.back()); m_aStack.pop_back(); m_aStack.push_back(pOp); } + else + { + readSucceeded = false; + } break; case TK_UNARY_MINUS: + if (!m_aStack.empty()) { LwpFormulaUnaryOp* pOp = new LwpFormulaUnaryOp(TokenType); pOp->AddArg(m_aStack.back()); m_aStack.pop_back(); m_aStack.push_back(pOp); } + else + { + readSucceeded = false; + } break; default: // We don't know what to do with this token, so eat it. @@ -367,7 +382,7 @@ { LwpCellList::Read(); { - LwpRowList* pRowList = static_cast(cParent.obj().get()); + LwpRowList* pRowList = dynamic_cast(cParent.obj().get()); if (pRowList) { m_nFormulaRow = pRowList->GetRowID(); diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwptoc.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptoc.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwptoc.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwptoc.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -106,17 +106,22 @@ m_SearchItems.Read(m_pObjStrm); - sal_uInt16 i; sal_uInt16 count = m_pObjStrm->QuickReaduInt16(); - for (i = 0; (i < MAX_LEVELS) && (count > 0); i++, count--) + if (count > MAX_LEVELS) + throw std::range_error("corrupt LwpTocSuperLayout"); + for (sal_uInt16 i = 0; i < count; ++i) m_DestName[i].Read(m_pObjStrm); count = m_pObjStrm->QuickReaduInt16(); - for (i = 0; (i < MAX_LEVELS) && (count > 0); i++, count--) + if (count > MAX_LEVELS) + throw std::range_error("corrupt LwpTocSuperLayout"); + for (sal_uInt16 i = 0; i < count; ++i) m_DestPGName[i].Read(m_pObjStrm); count = m_pObjStrm->QuickReaduInt16(); - for (i = 0; i < count; i++) + if (count > MAX_LEVELS) + throw std::range_error("corrupt LwpTocSuperLayout"); + for (sal_uInt16 i = 0; i < count; ++i) m_nFlags[i] = m_pObjStrm->QuickReaduInt32(); m_pObjStrm->SkipExtra(); @@ -130,9 +135,11 @@ LwpSuperTableLayout::RegisterStyle(); // Get font info of default text style and set into tab style - XFParaStyle* pBaseStyle = static_cast(m_pFoundry->GetStyleManager()->GetStyle(*m_pFoundry->GetDefaultTextStyle())); + const LwpObjectID *pDefaultTextStyle = m_pFoundry ? m_pFoundry->GetDefaultTextStyle() : nullptr; + XFParaStyle* pBaseStyle = pDefaultTextStyle ? dynamic_cast(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle)) : nullptr; XFTextStyle*pTextStyle = new XFTextStyle; - pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this font????? + if (pBaseStyle) + pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this font????? XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); m_TabStyleName = pXFStyleManager->AddStyle(pTextStyle).m_pStyle->GetStyleName(); @@ -241,8 +248,12 @@ // add TOC content LwpSuperTableLayout::XFConvert(pToc); + rtl::Reference xContainer(GetContainerLayout()); + if (!xContainer.is()) + return; + // if current TOC is located in a cell, we must add a frame between upper level container and TOC - if ( !GetContainerLayout()->IsCell() ) + if (!xContainer->IsCell()) { pCont->Add(pToc); } @@ -276,7 +287,10 @@ XFContentContainer * pTableContainer = pXFFrame; // if *this is a TOCSuperTableLayout and it's located in a cell // add the frame to upper level and add TOCSuperTableLayout into the frame - if ( GetContainerLayout()->IsCell() ) + rtl::Reference xContainer(GetContainerLayout()); + if (!xContainer.is()) + return; + if (xContainer->IsCell()) { pTableContainer = pCont; // TOC contain table directly pXFFrame->Add(pCont); @@ -285,7 +299,7 @@ else { //add frame to the container - pCont ->Add(pXFFrame); + pCont->Add(pXFFrame); } pTableLayout->XFConvert(pTableContainer); } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/lwpvpointer.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpvpointer.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/lwpvpointer.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/lwpvpointer.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -77,7 +77,7 @@ if( pObj.is() ) { pObj->SetFoundry(m_pFoundry); - pObj->RegisterStyle(); + pObj->DoRegisterStyle(); } } diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/tocread.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/tocread.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/tocread.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/tocread.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -118,6 +118,8 @@ assert(Flags == 0x0101 || Flags == 0x0); cBlockSize = UtGetIntelWord(pCurrLabel) * 1024; pCurrLabel += 2; + if (cBlockSize == 0) + return BenErr_NotBentoContainer; // Check major version if (UtGetIntelWord(pCurrLabel) != BEN_CURR_MAJOR_VERSION) diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xfcell.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xfcell.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xfcell.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xfcell.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -58,6 +58,9 @@ * Table cell. ************************************************************************/ #include "xfcell.hxx" + +#include + #include "xfparagraph.hxx" #include "xftable.hxx" #include "xfrow.hxx" @@ -91,9 +94,13 @@ assert(false); return; } + if (!pContent) + { + throw std::runtime_error("no content"); + } if( pContent->GetContentType() == enumXFContentTable ) { - XFTable *pTable = static_cast(pContent); + XFTable *pTable = dynamic_cast(pContent); if( !pTable ) return; //the sub table will fill all the cell, there can't be other contents. diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xftable.cxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xftable.cxx --- libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xftable.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xftable.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -104,11 +104,13 @@ m_aRows[row] = pRow; } -void XFTable::AddHeaderRow(XFRow *pRow) +void XFTable::AddHeaderRow(XFRow *pRow) { - if( !pRow ) + if( !pRow) return; - m_aHeaderRows.Add(pRow); + if (!m_aHeaderRows.is()) + return; + m_aHeaderRows->Add(pRow); } OUString XFTable::GetTableName() @@ -207,10 +209,10 @@ } } - if( m_aHeaderRows.GetCount()>0 ) + if (m_aHeaderRows.is() && m_aHeaderRows->GetCount()>0) { pStrm->StartElement( "table:table-header-rows" ); - m_aHeaderRows.ToXml(pStrm); + m_aHeaderRows->ToXml(pStrm); pStrm->EndElement( "table:table-header-rows" ); } //output rows: diff -Nru libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xftable.hxx libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xftable.hxx --- libreoffice-5.0.2/lotuswordpro/source/filter/xfilter/xftable.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/lotuswordpro/source/filter/xfilter/xftable.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -117,7 +117,7 @@ OUString m_strName; bool m_bSubTable; XFCell *m_pOwnerCell; - XFContentContainer m_aHeaderRows; + rtl::Reference m_aHeaderRows; std::map m_aRows; std::map m_aColumns; OUString m_strDefCellStyle; diff -Nru libreoffice-5.0.2/odk/docs/install.html libreoffice-5.0.5~rc2/odk/docs/install.html --- libreoffice-5.0.2/odk/docs/install.html 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/odk/docs/install.html 2016-02-04 16:41:28.000000000 +0000 @@ -507,7 +507,7 @@ False diff -Nru libreoffice-5.0.2/sc/uiconfig/scalc/ui/optcalculatepage.ui libreoffice-5.0.5~rc2/sc/uiconfig/scalc/ui/optcalculatepage.ui --- libreoffice-5.0.2/sc/uiconfig/scalc/ui/optcalculatepage.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sc/uiconfig/scalc/ui/optcalculatepage.ui 2016-02-04 16:41:28.000000000 +0000 @@ -5,7 +5,7 @@ 1 - 1000 + 32767 100 1 10 diff -Nru libreoffice-5.0.2/sc/uiconfig/scalc/ui/protectsheetdlg.ui libreoffice-5.0.5~rc2/sc/uiconfig/scalc/ui/protectsheetdlg.ui --- libreoffice-5.0.2/sc/uiconfig/scalc/ui/protectsheetdlg.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sc/uiconfig/scalc/ui/protectsheetdlg.ui 2016-02-04 16:41:28.000000000 +0000 @@ -180,7 +180,7 @@ - + True False True diff -Nru libreoffice-5.0.2/scp2/source/kde/module_kde.scp libreoffice-5.0.5~rc2/scp2/source/kde/module_kde.scp --- libreoffice-5.0.2/scp2/source/kde/module_kde.scp 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/scp2/source/kde/module_kde.scp 2016-02-04 16:41:28.000000000 +0000 @@ -26,5 +26,7 @@ PackageInfo = "packinfo_office.txt"; MOD_NAME_DESC(MODULE_OPTIONAL_KDE); Styles = (); - Files = (auto_kde_ALL); + Files = (auto_kde_ALL, + gid_File_Bin_Kde_Open_Url + ); End diff -Nru libreoffice-5.0.2/sd/CppunitTest_sd_import_tests.mk libreoffice-5.0.5~rc2/sd/CppunitTest_sd_import_tests.mk --- libreoffice-5.0.2/sd/CppunitTest_sd_import_tests.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/CppunitTest_sd_import_tests.mk 2016-02-04 16:41:28.000000000 +0000 @@ -76,8 +76,10 @@ desktop/source/deployment/deployment \ embeddedobj/util/embobj \ filter/source/config/cache/filterconfig1 \ + filter/source/odfflatxml/odfflatxml \ filter/source/svg/svgfilter \ filter/source/xmlfilteradaptor/xmlfa \ + filter/source/xmlfilterdetect/xmlfd \ forms/util/frm \ framework/util/fwk \ i18npool/util/i18npool \ diff -Nru libreoffice-5.0.2/sd/qa/unit/data/odg/gradient-angle.fodg libreoffice-5.0.5~rc2/sd/qa/unit/data/odg/gradient-angle.fodg --- libreoffice-5.0.2/sd/qa/unit/data/odg/gradient-angle.fodg 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/qa/unit/data/odg/gradient-angle.fodg 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,212 @@ + + + + ms 2015-10-09T14:51:21.0864478012015-10-09T14:54:47.829092906ms PT3M27S1LibreOfficeDev/5.1.0.0.alpha1$Linux_X86_64 LibreOffice_project/83c5214889c712646e45dc1c19b6d3c13a05aa83 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/odp/bulletCharAndFont.odp and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/odp/bulletCharAndFont.odp differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/odp/tdf80224.odp and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/odp/tdf80224.odp differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/ppt/pass/hang-22.ppt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/ppt/pass/hang-22.ppt differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/pptx/bnc584721_3.pptx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/pptx/bnc584721_3.pptx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/pptx/hyperlinktest.pptx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/pptx/hyperlinktest.pptx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sd/qa/unit/data/pptx/tdf93097.pptx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sd/qa/unit/data/pptx/tdf93097.pptx differ diff -Nru libreoffice-5.0.2/sd/qa/unit/export-tests.cxx libreoffice-5.0.5~rc2/sd/qa/unit/export-tests.cxx --- libreoffice-5.0.2/sd/qa/unit/export-tests.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/qa/unit/export-tests.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -56,10 +56,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -98,8 +100,10 @@ void testLineStyle(); void testCellLeftAndRightMargin(); void testRightToLeftParaghraph(); + void testTextboxWithHyperlink(); void testTableCellBorder(); void testBulletColor(); + void testBulletCharAndFont(); void testBulletMarginAndIndentation(); void testParaMarginAndindentation(); @@ -107,6 +111,7 @@ #if !defined WNT void testBnc822341(); #endif + void testTdf80224(); CPPUNIT_TEST_SUITE(SdExportTest); CPPUNIT_TEST(testFdo90607); @@ -132,14 +137,17 @@ CPPUNIT_TEST(testLineStyle); CPPUNIT_TEST(testCellLeftAndRightMargin); CPPUNIT_TEST(testRightToLeftParaghraph); + CPPUNIT_TEST(testTextboxWithHyperlink); CPPUNIT_TEST(testTableCellBorder); CPPUNIT_TEST(testBulletColor); + CPPUNIT_TEST(testBulletCharAndFont); CPPUNIT_TEST(testBulletMarginAndIndentation); CPPUNIT_TEST(testParaMarginAndindentation); #if !defined WNT CPPUNIT_TEST(testBnc822341); #endif + CPPUNIT_TEST(testTdf80224); CPPUNIT_TEST_SUITE_END(); }; @@ -911,6 +919,49 @@ xDocShRef->DoClose(); } +void SdExportTest::testTextboxWithHyperlink() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/hyperlinktest.pptx"), PPTX); + + xDocShRef = saveAndReload( xDocShRef, PPTX ); + + uno::Reference< drawing::XDrawPagesSupplier > xDoc( + xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); + + uno::Reference< drawing::XDrawPage > xPage( + xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); + + uno::Reference< beans::XPropertySet > xShape( + xPage->getByIndex(0), uno::UNO_QUERY ); + CPPUNIT_ASSERT_MESSAGE( "no shape", xShape.is() ); + + // Get first paragraph + uno::Reference xText = uno::Reference(xShape, uno::UNO_QUERY)->getText(); + CPPUNIT_ASSERT_MESSAGE( "not a text shape", xText.is() ); + uno::Reference paraEnumAccess; + paraEnumAccess.set(xText, uno::UNO_QUERY); + uno::Reference paraEnum = paraEnumAccess->createEnumeration(); + uno::Reference const xParagraph(paraEnum->nextElement(), + uno::UNO_QUERY_THROW); + + // first chunk of text + uno::Reference xRunEnumAccess(xParagraph, uno::UNO_QUERY); + uno::Reference xRunEnum = xRunEnumAccess->createEnumeration(); + uno::Reference xRun(xRunEnum->nextElement(), uno::UNO_QUERY); + uno::Reference< beans::XPropertySet > xPropSet( xRun, uno::UNO_QUERY_THROW ); + + uno::Reference xField; + xPropSet->getPropertyValue("TextField") >>= xField; + CPPUNIT_ASSERT_MESSAGE("Where is the text field?", xField.is() ); + + xPropSet.set(xField, uno::UNO_QUERY); + OUString aURL; + xPropSet->getPropertyValue("URL") >>= aURL; + CPPUNIT_ASSERT_EQUAL_MESSAGE("URLs don't match", OUString("http://www.xkcd.com/"), aURL); + + xDocShRef->DoClose(); +} + void SdExportTest::testBulletColor() { ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/pptx/bulletColor.pptx"), PPTX ); @@ -937,6 +988,38 @@ CPPUNIT_ASSERT_EQUAL_MESSAGE( "Bullet's color is wrong!", sal_uInt32(0xff0000),pNumFmt->GetNumRule()->GetLevel(0).GetBulletColor().GetColor()); } +void SdExportTest::testBulletCharAndFont() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/odp/bulletCharAndFont.odp"), ODP); + xDocShRef = saveAndReload( xDocShRef, PPTX ); + uno::Reference< drawing::XDrawPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XDrawPage > xPage( xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0), uno::UNO_QUERY); + uno::Reference xText = uno::Reference(xShape, uno::UNO_QUERY_THROW)->getText(); + uno::Reference paraEnumAccess; + paraEnumAccess.set(xText, uno::UNO_QUERY); + uno::Reference paraEnum = paraEnumAccess->createEnumeration(); + uno::Reference const xParagraph(paraEnum->nextElement(), uno::UNO_QUERY_THROW); + uno::Reference< beans::XPropertySet > xPropSet( xParagraph, uno::UNO_QUERY_THROW ); + uno::Reference xLevels(xPropSet->getPropertyValue("NumberingRules"), uno::UNO_QUERY); + uno::Sequence aProps; + xLevels->getByIndex(0) >>= aProps; // 1st level + OUString sBulletChar(sal_Unicode(0xf06c)); + for (int i = 0; i < aProps.getLength(); ++i) + { + const beans::PropertyValue& rProp = aProps[i]; + if (rProp.Name == "BulletChar") + CPPUNIT_ASSERT_EQUAL_MESSAGE( "BulletChar incorrect.", sBulletChar ,rProp.Value.get()); + if (rProp.Name == "BulletFont") + { + awt::FontDescriptor aFontDescriptor; + rProp.Value >>= aFontDescriptor; + CPPUNIT_ASSERT_EQUAL_MESSAGE( "BulletFont incorrect.", OUString("Wingdings"),aFontDescriptor.Name); + } + } + xDocShRef->DoClose(); +} + #if !defined WNT void SdExportTest::testBnc822341() @@ -1136,6 +1219,25 @@ xDocShRef->DoClose(); } +void SdExportTest::testTdf80224() +{ + ::sd::DrawDocShellRef xDocShRef = loadURL( getURLFromSrc("/sd/qa/unit/data/odp/tdf80224.odp"), ODP); + xDocShRef = saveAndReload( xDocShRef, PPTX ); + uno::Reference< drawing::XDrawPagesSupplier > xDoc( xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XDrawPage > xPage( xDoc->getDrawPages()->getByIndex(0), uno::UNO_QUERY_THROW ); + uno::Reference< drawing::XShape > xShape(xPage->getByIndex(0), uno::UNO_QUERY); + uno::Reference xText = uno::Reference(xShape, uno::UNO_QUERY_THROW)->getText(); + uno::Reference paraEnumAccess; + paraEnumAccess.set(xText, uno::UNO_QUERY); + uno::Reference paraEnum = paraEnumAccess->createEnumeration(); + uno::Reference const xParagraph(paraEnum->nextElement(), uno::UNO_QUERY_THROW); + uno::Reference< beans::XPropertySet > xPropSet( xParagraph->getStart(), uno::UNO_QUERY_THROW ); + sal_Int32 nCharColor; + xPropSet->getPropertyValue("CharColor") >>= nCharColor; + CPPUNIT_ASSERT_EQUAL(sal_Int32(6644396), nCharColor); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdExportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sd/qa/unit/import-tests.cxx libreoffice-5.0.5~rc2/sd/qa/unit/import-tests.cxx --- libreoffice-5.0.2/sd/qa/unit/import-tests.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/qa/unit/import-tests.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -73,6 +73,7 @@ void testN759180(); void testN778859(); void testMasterPageStyleParent(); + void testGradientAngle(); void testFdo64512(); void testFdo71075(); void testN828390_2(); @@ -91,7 +92,6 @@ void testCreationDate(); void testBnc584721_1(); void testBnc584721_2(); - void testBnc584721_3(); void testBnc584721_4(); void testBnc904423(); void testShapeLineStyle(); @@ -105,6 +105,7 @@ void testBnc910045(); void testRowHeight(); void testTdf93830(); + void testTdf93097(); CPPUNIT_TEST_SUITE(SdImportTest); @@ -113,6 +114,7 @@ CPPUNIT_TEST(testN759180); CPPUNIT_TEST(testN778859); CPPUNIT_TEST(testMasterPageStyleParent); + CPPUNIT_TEST(testGradientAngle); CPPUNIT_TEST(testFdo64512); CPPUNIT_TEST(testFdo71075); CPPUNIT_TEST(testN828390_2); @@ -131,7 +133,6 @@ CPPUNIT_TEST(testCreationDate); CPPUNIT_TEST(testBnc584721_1); CPPUNIT_TEST(testBnc584721_2); - CPPUNIT_TEST(testBnc584721_3); CPPUNIT_TEST(testBnc584721_4); CPPUNIT_TEST(testBnc904423); CPPUNIT_TEST(testShapeLineStyle); @@ -145,6 +146,7 @@ CPPUNIT_TEST(testBnc910045); CPPUNIT_TEST(testRowHeight); CPPUNIT_TEST(testTdf93830); + CPPUNIT_TEST(testTdf93097); CPPUNIT_TEST_SUITE_END(); }; @@ -438,6 +440,62 @@ xDocShRef->DoClose(); } +void SdImportTest::testGradientAngle() +{ + sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/odg/gradient-angle.fodg"), FODG); + + uno::Reference const xDoc( + xDocShRef->GetDoc()->getUnoModel(), uno::UNO_QUERY); + + awt::Gradient gradient; + uno::Reference const xGradients( + xDoc->createInstance("com.sun.star.drawing.GradientTable"), + uno::UNO_QUERY); + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 38") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(0), gradient.Angle); // was: 3600 + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 10") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(270), gradient.Angle); // 27deg + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 11") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1145), gradient.Angle); // 2rad + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 12") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(900), gradient.Angle); // 100grad + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 13") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(3599), gradient.Angle); // -1 + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 14") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(3028), gradient.Angle); // -1rad + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 15") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(300), gradient.Angle); // 3900 + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 16") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(105), gradient.Angle); // 10.5deg + + CPPUNIT_ASSERT(xGradients->getByName("Gradient 17") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1800), gradient.Angle); // \pi rad + + uno::Reference const xTranspGradients( + xDoc->createInstance("com.sun.star.drawing.TransparencyGradientTable"), + uno::UNO_QUERY); + + CPPUNIT_ASSERT(xTranspGradients->getByName("Transparency 2") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(10), gradient.Angle); // 1 + + CPPUNIT_ASSERT(xTranspGradients->getByName("Transparency 1") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(900), gradient.Angle); // 90deg + + CPPUNIT_ASSERT(xTranspGradients->getByName("Transparency 3") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(572), gradient.Angle); // 1.0rad + + CPPUNIT_ASSERT(xTranspGradients->getByName("Transparency 4") >>= gradient); + CPPUNIT_ASSERT_EQUAL(sal_Int16(1800), gradient.Angle); // 1000grad +} + void SdImportTest::testN778859() { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/n778859.pptx"), PPTX); @@ -802,31 +860,6 @@ xDocShRef->DoClose(); } -void SdImportTest::testBnc584721_3() -{ - // Subtitle was simply skipped on master slides. - // Check whether the second shape is a subtitle shape with the right text. - - ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc584721_3.pptx"), PPTX); - - SdDrawDocument *pDoc = xDocShRef->GetDoc(); - CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL ); - const SdrPage *pPage = &(pDoc->GetPage(1)->TRG_GetMasterPage()); - CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL ); - SdrTextObj *pTxtObj = dynamic_cast( pPage->GetObj(1) ); - CPPUNIT_ASSERT_MESSAGE( "no text object", pTxtObj != NULL); - - // Check the shape type - uno::Reference< drawing::XShape > xShape( pTxtObj->getUnoShape(), uno::UNO_QUERY ); - CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.presentation.SubtitleShape"), xShape->getShapeType()); - - // Check the text - const EditTextObject& aEdit = pTxtObj->GetOutlinerParaObject()->GetTextObject(); - CPPUNIT_ASSERT_EQUAL(OUString("Click to edit Master subtitle style"), aEdit.GetText(0)); - - xDocShRef->DoClose(); -} - void SdImportTest::testBnc591147() { ::sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc591147.pptx"), PPTX); @@ -1225,6 +1258,16 @@ xDocShRef->DoClose(); } +void SdImportTest::testTdf93097() +{ + // Throwing metadata import aborted the filter, check that metadata is now imported. + sd::DrawDocShellRef xDocShRef = loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/tdf93097.pptx"), PPTX); + uno::Reference xDocumentPropertiesSupplier(xDocShRef->GetModel(), uno::UNO_QUERY); + uno::Reference xDocumentProperties = xDocumentPropertiesSupplier->getDocumentProperties(); + CPPUNIT_ASSERT_EQUAL(OUString("ss"), xDocumentProperties->getTitle()); + xDocShRef->DoClose(); +} + CPPUNIT_TEST_SUITE_REGISTRATION(SdImportTest); CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sd/qa/unit/sdmodeltestbase.hxx libreoffice-5.0.5~rc2/sd/qa/unit/sdmodeltestbase.hxx --- libreoffice-5.0.2/sd/qa/unit/sdmodeltestbase.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/qa/unit/sdmodeltestbase.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -48,6 +48,7 @@ #define PPTX_FORMAT_TYPE ( SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | SfxFilterFlags::PREFERED ) #define HTML_FORMAT_TYPE ( SfxFilterFlags::EXPORT | SfxFilterFlags::ALIEN ) #define PDF_FORMAT_TYPE ( SfxFilterFlags::STARONEFILTER | SfxFilterFlags::ALIEN | SfxFilterFlags::IMPORT | SfxFilterFlags::PREFERED ) +#define FODG_FORMAT_TYPE (SfxFilterFlags::STARONEFILTER | SfxFilterFlags::OWN | SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT) /** List of file formats we support in Impress unit tests. @@ -64,6 +65,7 @@ { "pptx", "Impress Office Open XML", "Office Open XML Presentation", "", PPTX_FORMAT_TYPE }, { "html", "graphic_HTML", "graphic_HTML", "", HTML_FORMAT_TYPE }, { "pdf", "draw_pdf_import", "pdf_Portable_Document_Format", "", PDF_FORMAT_TYPE }, + { "fodg", "OpenDocument Drawing Flat XML", "Flat XML ODF Drawing", "", FODG_FORMAT_TYPE }, { 0, 0, 0, 0, SfxFilterFlags::NONE } }; @@ -72,6 +74,7 @@ #define PPTX 2 #define HTML 3 #define PDF 4 +#define FODG 5 /// Base class for filter tests loading or roundtriping a document, and asserting the document model. class SdModelTestBase : public test::BootstrapFixture, public unotest::MacrosTest diff -Nru libreoffice-5.0.2/sd/source/core/stlsheet.cxx libreoffice-5.0.5~rc2/sd/source/core/stlsheet.cxx --- libreoffice-5.0.2/sd/source/core/stlsheet.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/core/stlsheet.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -245,6 +245,7 @@ 0, 0 }; pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable); + bMySet = true; } return *pSet; @@ -270,6 +271,7 @@ 0, 0 }; pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable); + bMySet = true; } return *pSet; @@ -309,6 +311,7 @@ 0, 0 }; pSet = new SfxItemSet(GetPool().GetPool(), nWhichPairTable); + bMySet = true; } return(*pSet); diff -Nru libreoffice-5.0.2/sd/source/filter/eppt/epptbase.hxx libreoffice-5.0.5~rc2/sd/source/filter/eppt/epptbase.hxx --- libreoffice-5.0.2/sd/source/filter/eppt/epptbase.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/eppt/epptbase.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -347,6 +347,7 @@ OString mType; bool mbPresObj; bool mbEmptyPresObj; + bool mbIsBackgroundDark; sal_Int32 mnAngle; sal_uInt32 mnPages; ///< number of Slides ( w/o master pages & notes & handout ) diff -Nru libreoffice-5.0.2/sd/source/filter/eppt/pptx-epptbase.cxx libreoffice-5.0.5~rc2/sd/source/filter/eppt/pptx-epptbase.cxx --- libreoffice-5.0.2/sd/source/filter/eppt/pptx-epptbase.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/eppt/pptx-epptbase.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -133,6 +133,7 @@ , mbStatusIndicator(false) , mbPresObj(false) , mbEmptyPresObj(false) + , mbIsBackgroundDark(false) , mnAngle(0) , mnPages(0) , mnMasterPages(0) @@ -325,6 +326,9 @@ if ( !mXPagePropSet.is() ) break; + if (GetPropertyValue( aAny, mXPagePropSet, OUString("IsBackgroundDark") ) ) + aAny >>= mbIsBackgroundDark; + mXShapes = Reference< XShapes >( mXDrawPage, UNO_QUERY ); if ( !mXShapes.is() ) break; diff -Nru libreoffice-5.0.2/sd/source/filter/eppt/pptx-epptooxml.cxx libreoffice-5.0.5~rc2/sd/source/filter/eppt/pptx-epptooxml.cxx --- libreoffice-5.0.2/sd/source/filter/eppt/pptx-epptooxml.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/eppt/pptx-epptooxml.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -412,7 +412,9 @@ pFS->startElementNS( XML_p, XML_bg, FSEND ); pFS->startElementNS( XML_p, XML_bgPr, FSEND ); - PowerPointShapeExport( pFS, &maShapeMap, this ).WriteFill( rXPropSet ); + PowerPointShapeExport aDML( pFS, &maShapeMap, this ); + aDML.SetBackgroundDark(mbIsBackgroundDark); + aDML.WriteFill( rXPropSet ); pFS->endElementNS( XML_p, XML_bgPr ); pFS->endElementNS( XML_p, XML_bg ); @@ -1706,6 +1708,7 @@ PowerPointShapeExport aDML( pFS, &maShapeMap, this ); aDML.SetMaster( bMaster ); aDML.SetPageType( ePageType ); + aDML.SetBackgroundDark(mbIsBackgroundDark); sal_uInt32 nShapes; pFS->startElementNS( XML_p, XML_spTree, FSEND ); diff -Nru libreoffice-5.0.2/sd/source/filter/ppt/pptin.cxx libreoffice-5.0.5~rc2/sd/source/filter/ppt/pptin.cxx --- libreoffice-5.0.2/sd/source/filter/ppt/pptin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/ppt/pptin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -367,7 +367,8 @@ if ( pSection ) { Dictionary aDict; - if ( pSection->GetDictionary( aDict ) ) + pSection->GetDictionary(aDict); + if (!aDict.empty()) { Dictionary::const_iterator iter = aDict.find( OUString("_PID_HLINKS") ); diff -Nru libreoffice-5.0.2/sd/source/filter/ppt/propread.cxx libreoffice-5.0.5~rc2/sd/source/filter/ppt/propread.cxx --- libreoffice-5.0.2/sd/source/filter/ppt/propread.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/ppt/propread.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -269,10 +269,8 @@ maEntries.push_back( new PropEntry( nId, pBuf, nBufSize, mnTextEnc ) ); } -bool Section::GetDictionary( Dictionary& rDict ) +void Section::GetDictionary(Dictionary& rDict) { - bool bRetValue = false; - boost::ptr_vector::iterator iter; for (iter = maEntries.begin(); iter != maEntries.end(); ++iter) { @@ -280,48 +278,50 @@ break; } - if ( iter != maEntries.end() ) + if (iter == maEntries.end()) + return; + + SvMemoryStream aStream( iter->mpBuf, iter->mnSize, StreamMode::READ ); + aStream.Seek( STREAM_SEEK_TO_BEGIN ); + sal_uInt32 nDictCount(0); + aStream.ReadUInt32( nDictCount ); + for (sal_uInt32 i = 0; i < nDictCount; ++i) { - sal_uInt32 nDictCount, nId, nSize, nPos; - SvMemoryStream aStream( iter->mpBuf, iter->mnSize, StreamMode::READ ); - aStream.Seek( STREAM_SEEK_TO_BEGIN ); - aStream.ReadUInt32( nDictCount ); - for ( sal_uInt32 i = 0; i < nDictCount; i++ ) + sal_uInt32 nId(0), nSize(0); + aStream.ReadUInt32(nId).ReadUInt32(nSize); + if (!aStream.good() || nSize > aStream.remainingSize()) + break; + if (mnTextEnc == RTL_TEXTENCODING_UCS2) + nSize >>= 1; + if (!nSize) + continue; + OUString aString; + try { - aStream.ReadUInt32( nId ).ReadUInt32( nSize ); - if ( nSize ) + if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) + { + sal_Unicode* pWString = new sal_Unicode[nSize]; + for (sal_uInt32 j = 0; j < nSize; ++j) + aStream.ReadUInt16(pWString[j]); + aString = OUString(pWString, lcl_getMaxSafeStrLen(nSize)); + delete[] pWString; + } + else { - OUString aString; - nPos = aStream.Tell(); - try - { - sal_Char* pString = new sal_Char[ nSize ]; - aStream.Read( pString, nSize ); - if ( mnTextEnc == RTL_TEXTENCODING_UCS2 ) - { - nSize >>= 1; - aStream.Seek( nPos ); - sal_Unicode* pWString = reinterpret_cast(pString); - for ( i = 0; i < nSize; i++ ) - aStream.ReadUInt16( pWString[ i ] ); - aString = OUString(pWString, lcl_getMaxSafeStrLen(nSize)); - } - else - aString = OUString(pString, lcl_getMaxSafeStrLen(nSize), mnTextEnc); - delete[] pString; - } - catch( const std::bad_alloc& ) - { - OSL_FAIL( "sd Section::GetDictionary bad alloc" ); - } - if ( aString.isEmpty() ) - break; - rDict.insert( std::make_pair(aString,nId) ); + sal_Char* pString = new sal_Char[nSize]; + aStream.Read(pString, nSize); + aString = OUString(pString, lcl_getMaxSafeStrLen(nSize), mnTextEnc); + delete[] pString; } - bRetValue = true; } + catch( const std::bad_alloc& ) + { + OSL_FAIL( "sd Section::GetDictionary bad alloc" ); + } + if (aString.isEmpty()) + break; + rDict.insert( std::make_pair(aString,nId) ); } - return bRetValue; } void Section::Read( SotStorageStream *pStrm ) diff -Nru libreoffice-5.0.2/sd/source/filter/ppt/propread.hxx libreoffice-5.0.5~rc2/sd/source/filter/ppt/propread.hxx --- libreoffice-5.0.2/sd/source/filter/ppt/propread.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/filter/ppt/propread.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -130,8 +130,8 @@ Section( const Section& rSection ); Section& operator=( const Section& rSection ); - bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); - bool GetDictionary( Dictionary& rDict ); + bool GetProperty( sal_uInt32 nId, PropItem& rPropItem ); + void GetDictionary( Dictionary& rDict ); const sal_uInt8* GetFMTID() const { return aFMTID; }; void Read( SotStorageStream* pStrm ); }; diff -Nru libreoffice-5.0.2/sd/source/ui/annotations/annotationmanager.cxx libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationmanager.cxx --- libreoffice-5.0.2/sd/source/ui/annotations/annotationmanager.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationmanager.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1143,7 +1143,9 @@ SdPage* AnnotationManagerImpl::GetCurrentPage() { - return mrBase.GetMainViewShell()->getCurrentPage(); + if (mrBase.GetMainViewShell().get()) + return mrBase.GetMainViewShell()->getCurrentPage(); + return nullptr; } AnnotationManager::AnnotationManager( ViewShellBase& rViewShellBase ) diff -Nru libreoffice-5.0.2/sd/source/ui/annotations/annotationtag.cxx libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationtag.cxx --- libreoffice-5.0.2/sd/source/ui/annotations/annotationtag.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationtag.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -566,9 +566,9 @@ if( !mpAnnotationWindow.get() ) { - vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); - if( pWindow ) - { + vcl::Window* pWindow = dynamic_cast< vcl::Window* >( getView().GetFirstOutputDevice() ); + if( pWindow ) + { RealPoint2D aPosition( mxAnnotation->getPosition() ); Point aPos( pWindow->OutputToScreenPixel( pWindow->LogicToPixel( Point( static_cast(aPosition.X * 100.0), static_cast(aPosition.Y * 100.0) ) ) ) ); @@ -604,7 +604,7 @@ { mpAnnotationWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); mpAnnotationWindow->Deactivate(); - mpAnnotationWindow.reset(); + mpAnnotationWindow.disposeAndClear(); } } diff -Nru libreoffice-5.0.2/sd/source/ui/annotations/annotationtag.hxx libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationtag.hxx --- libreoffice-5.0.2/sd/source/ui/annotations/annotationtag.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/annotations/annotationtag.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -82,7 +82,7 @@ VclPtr mpAnnotationWindow; Color maColor; int mnIndex; - const vcl::Font& mrFont; + const vcl::Font& mrFont; Size maSize; ImplSVEvent * mnClosePopupEvent; VclPtr mpListenWindow; diff -Nru libreoffice-5.0.2/sd/source/ui/dlg/animobjs.cxx libreoffice-5.0.5~rc2/sd/source/ui/dlg/animobjs.cxx --- libreoffice-5.0.2/sd/source/ui/dlg/animobjs.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/dlg/animobjs.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -430,7 +430,8 @@ SdPage* pPage = pMyDoc->GetSdPage(0, PK_STANDARD); SdrObject* pObject; - if (pBtn == m_pBtnRemoveBitmap) + // tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid out-of-bound array access + if (pBtn == m_pBtnRemoveBitmap && EMPTY_FRAMELIST != m_nCurrentFrame) { delete m_FrameList[m_nCurrentFrame].first; delete m_FrameList[m_nCurrentFrame].second; @@ -449,8 +450,8 @@ if (m_nCurrentFrame >= m_FrameList.size()) { - assert(m_FrameList.empty()); - m_nCurrentFrame = EMPTY_FRAMELIST; + // tdf#95298 last frame was deleted, try to use the one before it or go on empty state + m_nCurrentFrame = m_FrameList.empty() ? EMPTY_FRAMELIST : m_FrameList.size() - 1; } } else // delete everything @@ -539,7 +540,8 @@ void AnimationWindow::UpdateControl(bool const bDisableCtrls) { - if (!m_FrameList.empty()) + // tdf#95298 check m_nCurrentFrame for EMPTY_FRAMELIST to avoid out-of-bound array access + if (!m_FrameList.empty() && EMPTY_FRAMELIST != m_nCurrentFrame) { BitmapEx aBmp(*m_FrameList[m_nCurrentFrame].first); diff -Nru libreoffice-5.0.2/sd/source/ui/dlg/sdtreelb.cxx libreoffice-5.0.5~rc2/sd/source/ui/dlg/sdtreelb.cxx --- libreoffice-5.0.2/sd/source/ui/dlg/sdtreelb.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/dlg/sdtreelb.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1083,6 +1083,8 @@ { // commented code from svtools/source/contnr/svimpbox.cxx SvTreeListEntry* pCursor = GetCurEntry(); + if (!pCursor) + return; if( pCursor->HasChildren() || pCursor->HasChildrenOnDemand() ) { if( IsExpanded( pCursor ) ) diff -Nru libreoffice-5.0.2/sd/source/ui/func/fusldlg.cxx libreoffice-5.0.5~rc2/sd/source/ui/func/fusldlg.cxx --- libreoffice-5.0.2/sd/source/ui/func/fusldlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/func/fusldlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -120,18 +120,23 @@ pDlg->GetAttr( aDlgSet ); - aPage = ITEMVALUE( aDlgSet, ATTR_PRESENT_DIANAME, SfxStringItem ); - if( aPage != rPresentationSettings.maPresPage ) - { - bValuesChanged = true; - rPresentationSettings.maPresPage = aPage; - } - bValue = ITEMVALUE( aDlgSet, ATTR_PRESENT_ALL, SfxBoolItem ); if ( bValue != rPresentationSettings.mbAll ) { bValuesChanged = true; rPresentationSettings.mbAll = bValue; + // remove any previous existing slide + rPresentationSettings.maPresPage = ""; + } + + if (!rPresentationSettings.mbAll) + { + aPage = ITEMVALUE( aDlgSet, ATTR_PRESENT_DIANAME, SfxStringItem ); + if( aPage != rPresentationSettings.maPresPage ) + { + bValuesChanged = true; + rPresentationSettings.maPresPage = aPage; + } } bValue = ITEMVALUE( aDlgSet, ATTR_PRESENT_CUSTOMSHOW, SfxBoolItem ); diff -Nru libreoffice-5.0.2/sd/source/ui/table/tablefunction.cxx libreoffice-5.0.5~rc2/sd/source/ui/table/tablefunction.cxx --- libreoffice-5.0.2/sd/source/ui/table/tablefunction.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/table/tablefunction.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -224,24 +224,16 @@ void DrawViewShell::GetTableMenuState( SfxItemSet &rSet ) { - bool bIsUIActive = GetDocSh()->IsUIActive(); - if( bIsUIActive ) + OUString aActiveLayer = mpDrawView->GetActiveLayer(); + SdrPageView* pPV = mpDrawView->GetSdrPageView(); + + if( + ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) || + !pPV->IsLayerVisible(aActiveLayer) ) ) || + SD_MOD()->GetWaterCan() ) { rSet.DisableItem( SID_INSERT_TABLE ); } - else - { - OUString aActiveLayer = mpDrawView->GetActiveLayer(); - SdrPageView* pPV = mpDrawView->GetSdrPageView(); - - if( bIsUIActive || - ( !aActiveLayer.isEmpty() && pPV && ( pPV->IsLayerLocked(aActiveLayer) || - !pPV->IsLayerVisible(aActiveLayer) ) ) || - SD_MOD()->GetWaterCan() ) - { - rSet.DisableItem( SID_INSERT_TABLE ); - } - } } void CreateTableFromRTF( SvStream& rStream, SdDrawDocument* pModel ) diff -Nru libreoffice-5.0.2/sd/source/ui/view/Outliner.cxx libreoffice-5.0.5~rc2/sd/source/ui/view/Outliner.cxx --- libreoffice-5.0.2/sd/source/ui/view/Outliner.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/source/ui/view/Outliner.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1272,7 +1272,7 @@ void Outliner::EnterEditMode (bool bGrabFocus) { OutlinerView* pOutlinerView = mpImpl->GetOutlinerView(); - if (pOutlinerView != NULL) + if (pOutlinerView && mpTextObj) { pOutlinerView->SetOutputArea( Rectangle( Point(), Size(1, 1))); SetPaperSize( mpTextObj->GetLogicRect().GetSize() ); diff -Nru libreoffice-5.0.2/sd/uiconfig/sdraw/toolbar/toolbar.xml libreoffice-5.0.5~rc2/sd/uiconfig/sdraw/toolbar/toolbar.xml --- libreoffice-5.0.2/sd/uiconfig/sdraw/toolbar/toolbar.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sd/uiconfig/sdraw/toolbar/toolbar.xml 2016-02-04 16:41:28.000000000 +0000 @@ -37,9 +37,7 @@ - - diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_brand.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_brand.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_brand.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_brand.txt 2016-02-04 16:41:28.000000000 +0000 @@ -22,7 +22,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-images %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure (Name="UNO Runtime Environment"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core (Name="Core module for %PRODUCTNAME %PRODUCTVERSION"), %BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-images (Name="Images module for %PRODUCTNAME %PRODUCTVERSION")" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -36,7 +36,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-writer" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-writer" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -50,7 +50,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-calc" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-calc" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -64,7 +64,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-impress" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-impress" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Impress brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -78,7 +78,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-draw" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-draw %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-draw" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Draw brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -92,7 +92,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-math" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-math %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-math" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Math brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -106,7 +106,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-base" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-base" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Base brand module for %PRODUCTNAME %PRODUCTVERSION" @@ -120,7 +120,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Brand language module for %PRODUCTNAME %PRODUCTVERSION" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_extensions.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_extensions.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_extensions.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_extensions.txt 2016-02-04 16:41:28.000000000 +0000 @@ -41,7 +41,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mediawiki-publisher" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "MediaWiki publisher extension for %PRODUCTNAME %PRODUCTVERSION" @@ -191,7 +191,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-nlpsolver" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "NLPSolver extension for %PRODUCTNAME %PRODUCTVERSION" @@ -221,7 +221,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-mysql-connector" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "MySQL Connector extension for %PRODUCTNAME %PRODUCTVERSION" @@ -236,7 +236,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-beanshell-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for BeanShell extension for %PRODUCTNAME %PRODUCTVERSION" @@ -251,7 +251,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-javascript-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for JavaScript extension for %PRODUCTNAME %PRODUCTVERSION" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office_help.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office_help.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office_help.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office_help.txt 2016-02-04 16:41:28.000000000 +0000 @@ -41,7 +41,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-help" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Help module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office_lang.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office_lang.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office_lang.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office_lang.txt 2016-02-04 16:41:28.000000000 +0000 @@ -41,7 +41,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -57,7 +57,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-fonts" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-fonts" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Language fonts module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -73,7 +73,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-res" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Language resource module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -89,7 +89,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-writer" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -105,7 +105,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-calc" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -121,7 +121,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-impress" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-impress" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Impress language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -137,7 +137,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-draw" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-draw" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Draw language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -153,7 +153,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-math" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Math language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -169,7 +169,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-base" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Base language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -185,7 +185,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-onlineupd" provides = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING-onlineupd" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-%LANGUAGESTRING %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Online update language module for LibreOffice %PRODUCTVERSION, language %LANGUAGESTRING" @@ -201,7 +201,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-sun-templates-pack-%LANGUAGESTRING" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "SUN Template Pack (%LANGUAGESTRING) %PRODUCTNAME %PRODUCTVERSION" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_office.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_office.txt 2016-02-04 16:41:28.000000000 +0000 @@ -42,7 +42,7 @@ freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" findrequires = "find-requires-gnome.sh" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Gnome integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -57,7 +57,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-tde-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "TDE integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -72,7 +72,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-kde-integration" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "KDE integration module for %PRODUCTNAME %PRODUCTVERSION" @@ -89,7 +89,7 @@ solarisrequires = "SUNWcar, SUNWkvm, SUNWcsr, SUNWcsu, SUNWcsd, SUNWcsl, SUNWxwrtl, SUNWxwplt, SUNWlibC, %SOLSUREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" freebsdrequires = "" findrequires = "find-requires-x11.sh" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Core module for %PRODUCTNAME %PRODUCTVERSION" @@ -105,7 +105,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Writer module for %PRODUCTNAME %PRODUCTVERSION" @@ -121,7 +121,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-calc" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Calc module for %PRODUCTNAME %PRODUCTVERSION" @@ -137,7 +137,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-draw" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Draw module for %PRODUCTNAME %PRODUCTVERSION" @@ -153,7 +153,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Impress module for %PRODUCTNAME %PRODUCTVERSION" @@ -169,7 +169,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSIONg-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Base module for %PRODUCTNAME %PRODUCTVERSION" @@ -185,7 +185,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-math" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Math module for %PRODUCTNAME %PRODUCTVERSION" @@ -200,7 +200,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-firebird" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Firebird module for %PRODUCTNAME %PRODUCTVERSION" @@ -215,7 +215,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-graphicfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Graphic filter module for %PRODUCTNAME %PRODUCTVERSION" @@ -230,7 +230,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-xsltfilter" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "XSLT filter samples module for %PRODUCTNAME %PRODUCTVERSION" @@ -245,7 +245,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-activex" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "ActiveX control for %PRODUCTNAME %PRODUCTVERSION" @@ -259,7 +259,7 @@ solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWlibC, SUNWgzip" packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-onlineupdate" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Online update modul for %PRODUCTNAME %PRODUCTVERSION" @@ -274,7 +274,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION" @@ -289,7 +289,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-writer %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "LibreLogo toolbar for %PRODUCTNAME %PRODUCTVERSION Writer" @@ -304,7 +304,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-python-script-provider" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Script provider for Python for %PRODUCTNAME %PRODUCTVERSION" @@ -319,7 +319,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-images" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Images module for %PRODUCTNAME %PRODUCTVERSION" @@ -334,7 +334,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooofonts" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Mailcap module for %PRODUCTNAME %PRODUCTVERSION" @@ -349,7 +349,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ooolinguistic" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Linguistic module for %PRODUCTNAME %PRODUCTVERSION" @@ -364,7 +364,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-af" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Af dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -484,7 +484,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ca" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ca dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -499,7 +499,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-cs" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Cs dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -514,7 +514,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-da" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Da dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -529,7 +529,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-de" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "De dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -544,7 +544,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-en" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "En dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -574,7 +574,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-es" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Es dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -589,7 +589,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-et" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Et dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -604,7 +604,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-fr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Fr dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -634,7 +634,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-gl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Gl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -664,7 +664,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-he" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "He dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -694,7 +694,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-hu" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Hu dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -724,7 +724,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-is" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The hunspell-is project" description = "Is dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -739,7 +739,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-it" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "It dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -754,7 +754,7 @@ packagename = "%UNIXPRODUCTNAME%BRANDPACKAGEVERSION-dict-kmr-Latn" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPRODUCTNAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Kmr-Latn dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -784,7 +784,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-lt" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Lt dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -814,7 +814,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ne" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ne dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -829,7 +829,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-nl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Nl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -844,7 +844,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-no" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "No dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -874,7 +874,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -889,7 +889,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-BR" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pt-BR dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -904,7 +904,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-pt-PT" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Pt-PT dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -919,7 +919,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ro" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ro dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -934,7 +934,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-ru" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Ru dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -964,7 +964,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sk" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sk dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -979,7 +979,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sl" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sl dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -994,7 +994,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sr" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sr dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1009,7 +1009,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sv" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sv dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1024,7 +1024,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-sw" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Sw dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1054,7 +1054,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-th" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Th dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1084,7 +1084,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-vi" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Vietnamese dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1099,7 +1099,7 @@ packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-dict-zu" requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION,%UNIXPACKAGENAME%BRANDPACKAGEVERSION %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Zu dictionary for %PRODUCTNAME %PRODUCTVERSION" @@ -1115,7 +1115,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-ogltrans" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-impress %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "OpenGL slide transitions module for %PRODUCTNAME %PRODUCTVERSION" @@ -1130,7 +1130,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-postgresql-sdbc" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-base %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "PostgreSQL Connector driver for %PRODUCTNAME %PRODUCTVERSION" @@ -1145,7 +1145,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-pdf-import" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "PDF import extension for %PRODUCTNAME %PRODUCTVERSION" @@ -1160,7 +1160,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-filter-data" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Filter data for %PRODUCTNAME %PRODUCTVERSION" @@ -1175,7 +1175,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-extension-report-builder" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" linuxpatchrequires = "" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Report Builder extension for %PRODUCTNAME %PRODUCTVERSION" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_sdkoo.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_sdkoo.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_sdkoo.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_sdkoo.txt 2016-02-04 16:41:28.000000000 +0000 @@ -23,7 +23,7 @@ packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-sdk" freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core" requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "Software Development Kit for LibreOffice %PRODUCTVERSION" diff -Nru libreoffice-5.0.2/setup_native/source/packinfo/packinfo_ure.txt libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_ure.txt --- libreoffice-5.0.2/setup_native/source/packinfo/packinfo_ure.txt 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/setup_native/source/packinfo/packinfo_ure.txt 2016-02-04 16:41:28.000000000 +0000 @@ -24,7 +24,7 @@ linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "UNO Runtime Environment" @@ -40,7 +40,7 @@ linuxreplaces = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" linuxincompat = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-stdlibs" packagename = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure" -copyright = "2015 The Document Foundation" +copyright = "2016 The Document Foundation" solariscopyright = "solariscopyrightfile" vendor = "The Document Foundation" description = "UNO Runtime Environment" diff -Nru libreoffice-5.0.2/sfx2/source/dialog/backingwindow.cxx libreoffice-5.0.5~rc2/sfx2/source/dialog/backingwindow.cxx --- libreoffice-5.0.2/sfx2/source/dialog/backingwindow.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/backingwindow.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -95,7 +95,6 @@ mbIsSaveMode( false ), mbInitControls( false ), mnHideExternalLinks( 0 ), - mpAccExec( NULL ), maSelTemplates(cmpSelectionItems), maSelFolders(cmpSelectionItems) @@ -445,7 +444,7 @@ // try the 'normal' accelerators (so that eg. Ctrl+Q works) if( !mpAccExec ) { - mpAccExec = svt::AcceleratorExecute::createAcceleratorHelper(); + mpAccExec.reset(svt::AcceleratorExecute::createAcceleratorHelper()); mpAccExec->init( comphelper::getProcessComponentContext(), mxFrame); } const KeyEvent* pEvt = rNEvt.GetKeyEvent(); diff -Nru libreoffice-5.0.2/sfx2/source/dialog/backingwindow.hxx libreoffice-5.0.5~rc2/sfx2/source/dialog/backingwindow.hxx --- libreoffice-5.0.2/sfx2/source/dialog/backingwindow.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/backingwindow.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -44,6 +44,7 @@ #include #include +#include #include class ToolBox; @@ -91,7 +92,7 @@ bool mbIsSaveMode; bool mbInitControls; sal_Int32 mnHideExternalLinks; - svt::AcceleratorExecute* mpAccExec; + std::unique_ptr mpAccExec; void setupButton(PushButton* pButton); void setupButton(MenuButton* pButton); diff -Nru libreoffice-5.0.2/sfx2/source/dialog/dinfdlg.cxx libreoffice-5.0.5~rc2/sfx2/source/dialog/dinfdlg.cxx --- libreoffice-5.0.2/sfx2/source/dialog/dinfdlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/dinfdlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1449,16 +1449,19 @@ m_pCurrentLine (NULL), m_aNumberFormatter( ::comphelper::getProcessComponentContext(), Application::GetSettings().GetLanguageTag().getLanguageType() ) - { - m_aEditButton->SetPosSizePixel( - LogicToPixel(Point(159, 2), MAP_APPFONT), + Point aPos(LogicToPixel(Point(159, 2), MAP_APPFONT)); + + m_aEditButton->SetPosSizePixel(aPos, LogicToPixel(Size(RSC_CD_TEXTBOX_HEIGHT, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + m_aRemoveButton->SetSizePixel(LogicToPixel(Size(RSC_CD_PUSHBUTTON_HEIGHT, RSC_CD_PUSHBUTTON_HEIGHT), MAP_APPFONT)); - m_aValueEdit->SetPosSizePixel( - LogicToPixel(Point(159, 2), MAP_APPFONT), - LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + Size aSize(LogicToPixel(Size(61, RSC_CD_TEXTBOX_HEIGHT), MAP_APPFONT)); + m_aValueEdit->SetPosSizePixel(aPos, aSize); + m_aDurationField->SetPosSizePixel(aPos, aSize); + m_aDateField->SetPosSizePixel(aPos, aSize); + m_aTimeField->SetPosSizePixel(aPos, aSize); m_aEditLoseFocusIdle.SetPriority( SchedulerPriority::LOWEST ); m_aEditLoseFocusIdle.SetIdleHdl( LINK( this, CustomPropertiesWindow, EditTimeoutHdl ) ); diff -Nru libreoffice-5.0.2/sfx2/source/dialog/dockwin.cxx libreoffice-5.0.5~rc2/sfx2/source/dialog/dockwin.cxx --- libreoffice-5.0.2/sfx2/source/dialog/dockwin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/dockwin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -858,6 +858,7 @@ pImp->nLine = pImp->nDockLine = 0; pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; + pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT); pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT); pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); @@ -903,6 +904,7 @@ pImp->nLine = pImp->nDockLine = 0; pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; + pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT); pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT); pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); @@ -948,6 +950,7 @@ pImp->nLine = pImp->nDockLine = 0; pImp->nPos = pImp->nDockPos = 0; pImp->bNewLine = false; + pImp->SetDockAlignment(SfxChildAlignment::NOALIGNMENT); pImp->SetLastAlignment(SfxChildAlignment::NOALIGNMENT); pImp->aMoveIdle.SetPriority(SchedulerPriority::RESIZE); pImp->aMoveIdle.SetIdleHdl(LINK(this,SfxDockingWindow,TimerHdl)); diff -Nru libreoffice-5.0.2/sfx2/source/dialog/infobar.cxx libreoffice-5.0.5~rc2/sfx2/source/dialog/infobar.cxx --- libreoffice-5.0.2/sfx2/source/dialog/infobar.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/infobar.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -127,12 +127,13 @@ SetPosSizePixel(Point(0, 0), Size(nWidth, INFO_BAR_BASE_HEIGHT * nScaleFactor)); m_pMessage->SetText(sMessage); - m_pMessage->SetBackground(Wallpaper(Color(constLightColor))); m_pMessage->Show(); m_pCloseBtn->SetClickHdl(LINK(this, SfxInfoBarWindow, CloseHandler)); m_pCloseBtn->Show(); + EnableChildTransparentMode(); + Resize(); } @@ -173,9 +174,6 @@ BColor aDarkColor; lclDetermineLightDarkColor(aLightColor, aDarkColor); - // Update the label background color - m_pMessage->SetBackground(Wallpaper(Color(aLightColor))); - // Light background B2DPolygon aPolygon; aPolygon.append(B2DPoint(aRect.Left(), aRect.Top())); diff -Nru libreoffice-5.0.2/sfx2/source/dialog/mailmodel.cxx libreoffice-5.0.5~rc2/sfx2/source/dialog/mailmodel.cxx --- libreoffice-5.0.2/sfx2/source/dialog/mailmodel.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/dialog/mailmodel.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -828,7 +828,11 @@ OUString subject( url.getBase( INetURLObject::LAST_SEGMENT, false, +#ifdef WNT + INetURLObject::NO_DECODE)); // MAPISendMail does not accept Unicode +#else INetURLObject::DECODE_WITH_CHARSET)); +#endif if (subject.isEmpty()) { subject = maAttachedDocuments[0]; } diff -Nru libreoffice-5.0.2/sfx2/source/doc/objserv.cxx libreoffice-5.0.5~rc2/sfx2/source/doc/objserv.cxx --- libreoffice-5.0.2/sfx2/source/doc/objserv.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/doc/objserv.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -732,7 +732,9 @@ rReq.GetArg(SID_SAVETO, false, TYPE(SfxBoolItem))); if (saveTo == nullptr || !saveTo->GetValue()) { - GetFrame()->RemoveInfoBar("readonly"); + SfxViewFrame *pFrame = GetFrame(); + if (pFrame) + pFrame->RemoveInfoBar("readonly"); SetReadOnlyUI(false); } } diff -Nru libreoffice-5.0.2/sfx2/source/doc/objstor.cxx libreoffice-5.0.5~rc2/sfx2/source/doc/objstor.cxx --- libreoffice-5.0.2/sfx2/source/doc/objstor.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/doc/objstor.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -3641,6 +3641,7 @@ return true; } +// comphelper::IEmbeddedHelper uno::Reference< task::XInteractionHandler > SfxObjectShell::getInteractionHandler() const { uno::Reference< task::XInteractionHandler > xRet; @@ -3649,4 +3650,9 @@ return xRet; } +OUString SfxObjectShell::getDocumentBaseURL() const +{ + return GetMedium()->GetBaseURL(); +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/sfx2/source/sidebar/ControllerItem.cxx libreoffice-5.0.5~rc2/sfx2/source/sidebar/ControllerItem.cxx --- libreoffice-5.0.2/sfx2/source/sidebar/ControllerItem.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/sidebar/ControllerItem.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -166,6 +166,7 @@ SfxPoolItem* pState = NULL; const SfxItemState eState (GetBindings().QueryState(GetId(), pState)); mrItemUpdateReceiver.NotifyItemUpdate(GetId(), eState, pState, IsEnabled(eState)); + delete pState; } void ControllerItem::NotifyFrameContextChange() diff -Nru libreoffice-5.0.2/sfx2/source/sidebar/SidebarController.cxx libreoffice-5.0.5~rc2/sfx2/source/sidebar/SidebarController.cxx --- libreoffice-5.0.2/sfx2/source/sidebar/SidebarController.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/sidebar/SidebarController.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -229,6 +229,7 @@ { maAsynchronousDeckSwitch.CancelRequest(); maContextChangeUpdate.RequestCall(); + UpdateConfigurations(); } } diff -Nru libreoffice-5.0.2/sfx2/source/sidebar/SidebarToolBox.cxx libreoffice-5.0.5~rc2/sfx2/source/sidebar/SidebarToolBox.cxx --- libreoffice-5.0.2/sfx2/source/sidebar/SidebarToolBox.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/source/sidebar/SidebarToolBox.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -24,6 +24,7 @@ #include #include +#include #include #include #include @@ -32,6 +33,24 @@ using namespace css; using namespace css::uno; +namespace { + void lcl_RTLizeCommandURL( OUString& rCommandURL ) + { + if (rCommandURL == ".uno:ParaLeftToRight") + rCommandURL = ".uno:ParaRightToLeft"; + else if (rCommandURL == ".uno:ParaRightToLeft") + rCommandURL = ".uno:ParaLeftToRight"; + else if (rCommandURL == ".uno:LeftPara") + rCommandURL = ".uno:RightPara"; + else if (rCommandURL == ".uno:RightPara") + rCommandURL = ".uno:LeftPara"; + else if (rCommandURL == ".uno:AlignLeft") + rCommandURL = ".uno:AlignRight"; + else if (rCommandURL == ".uno:AlignRight") + rCommandURL = ".uno:AlignLeft"; + } +} + namespace sfx2 { namespace sidebar { SidebarToolBox::SidebarToolBox (vcl::Window* pParentWindow) @@ -87,9 +106,16 @@ const css::uno::Reference& rFrame, ToolBoxItemBits nBits, const Size& rRequestedSize, sal_uInt16 nPos) { - ToolBox::InsertItem(rCommand, rFrame, nBits, rRequestedSize, nPos); + OUString aCommand( rCommand ); + + if( AllSettings::GetLayoutRTL() ) + { + lcl_RTLizeCommandURL( aCommand ); + } + + ToolBox::InsertItem(aCommand, rFrame, nBits, rRequestedSize, nPos); - CreateController(GetItemId(rCommand), rFrame, std::max(rRequestedSize.Width(), 0L)); + CreateController(GetItemId(aCommand), rFrame, std::max(rRequestedSize.Width(), 0L)); RegisterHandlers(); } diff -Nru libreoffice-5.0.2/sfx2/uiconfig/ui/licensedialog.ui libreoffice-5.0.5~rc2/sfx2/uiconfig/ui/licensedialog.ui --- libreoffice-5.0.2/sfx2/uiconfig/ui/licensedialog.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/uiconfig/ui/licensedialog.ui 2016-02-04 16:41:28.000000000 +0000 @@ -60,19 +60,19 @@ True False - 0 - 0 %PRODUCTNAME is made available subject to the terms of the Mozilla Public License, v. 2.0. A copy of the MPL can be obtained at http://mozilla.org/MPL/2.0/. Third Party Code Additional copyright notices and license terms applicable to portions of the Software are set forth in the LICENSE.html file; choose Show License to see exact details in English. All trademarks and registered trademarks mentioned herein are the property of their respective owners. -Copyright © 2000, 2015 LibreOffice contributors. All rights reserved. +Copyright © 2000–2016 LibreOffice contributors. All rights reserved. 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. True 80 + 0 + 0 False diff -Nru libreoffice-5.0.2/sfx2/uiconfig/ui/newstyle.ui libreoffice-5.0.5~rc2/sfx2/uiconfig/ui/newstyle.ui --- libreoffice-5.0.2/sfx2/uiconfig/ui/newstyle.ui 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sfx2/uiconfig/ui/newstyle.ui 2016-02-04 16:41:28.000000000 +0000 @@ -23,6 +23,7 @@ gtk-ok True + False True True True diff -Nru libreoffice-5.0.2/solenv/bin/modules/installer/windows/file.pm libreoffice-5.0.5~rc2/solenv/bin/modules/installer/windows/file.pm --- libreoffice-5.0.2/solenv/bin/modules/installer/windows/file.pm 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/bin/modules/installer/windows/file.pm 2016-02-04 16:41:28.000000000 +0000 @@ -551,6 +551,26 @@ $fileversion = $version . "." . $subversion . "." . $microversion . "." . $vervariant; } } + # file version for font files (tdf#76239) + if ( $onefile->{'Name'} =~ /\.ttf$|\.TTF$/ ) + { + open (TTF, "<$onefile->{'sourcepath'}"); + binmode TTF; + {local $/ = undef; $ttfdata = ;} + close TTF; + + my $ttfversion = "(Version )([0-9]+[.]*([0-9][.])*[0-9]+)"; + + if ($ttfdata =~ /$ttfversion/ms) + { + my ($version, $subversion, $microversion, $vervariant) = split(/\./,$2); + $fileversion = int($version) . "." . int($subversion) . "." . int($microversion) . "." . int($vervariant); + } + else + { + $fileversion = "1.0.0.0"; + } + } return $fileversion; } diff -Nru libreoffice-5.0.2/solenv/bin/version.py libreoffice-5.0.5~rc2/solenv/bin/version.py --- libreoffice-5.0.2/solenv/bin/version.py 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/bin/version.py 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,49 @@ +#!/usr/bin/env python + +from __future__ import print_function +from optparse import OptionParser +import os.path +import re +import sys + +M = { + 'juh': 'javaunohelper', + 'jurt': 'jurt', + 'officebean': 'bean', + 'ridl': 'ridljar', + 'unoil': 'unoil', + 'unoloader': 'ridljar', +} + +parser = OptionParser() +_, args = parser.parse_args() + +if not len(args): + parser.error('not enough arguments') +elif len(args) > 1: + parser.error('too many arguments') + +DEST = r'\g<1>%s\g<3>' % args[0] + + +def replace_in_file(filename, src_pattern): + try: + f = open(filename, "r") + s = f.read() + f.close() + s = re.sub(src_pattern, DEST, s) + f = open(filename, "w") + f.write(s) + f.close() + except IOError as err: + print('error updating %s: %s' % (filename, err), file=sys.stderr) + +src_pattern = re.compile(r'^(\s*)([-.@\w]+)(\s*)$', + re.MULTILINE) + +for a in ['juh', 'jurt', 'officebean', 'ridl', 'unoil', 'unoloader']: + replace_in_file(os.path.join(M[a], 'pom.%s.xml' % a), src_pattern) + +src_pattern = re.compile(r"^(LIBREOFFICE_VERSION = ')([-.@\w]+)(')$", + re.MULTILINE) +replace_in_file('solenv/maven/VERSION', src_pattern) diff -Nru libreoffice-5.0.2/solenv/buck/build.defs libreoffice-5.0.5~rc2/solenv/buck/build.defs --- libreoffice-5.0.2/solenv/buck/build.defs 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/buck/build.defs 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,49 @@ +def java_sources( + name, + srcs, + visibility = [] + ): + java_library( + name = name, + resources = srcs, + visibility = visibility, + ) + +def java_doc( + name, + title, + pkgs, + paths, + srcs = [], + deps = [], + visibility = [], + do_it_wrong = False, + ): + if do_it_wrong: + sourcepath = paths + else: + sourcepath = ['$SRCDIR/' + n for n in paths] + genrule( + name = name, + cmd = ' '.join([ + 'while ! test -f .buckconfig; do cd ..; done;', + 'javadoc', + '-quiet', + '-protected', + '-encoding UTF-8', + '-charset UTF-8', + '-notimestamp', + '-windowtitle "' + title + '"', + '-link http://docs.oracle.com/javase/7/docs/api', + '-subpackages ', + ':'.join(pkgs), + '-sourcepath ', + ':'.join(sourcepath), + ' -classpath ', + ':'.join(['$(location %s)' % n for n in deps]), + '-d $TMP', + ]) + ';jar cf $OUT -C $TMP .', + srcs = srcs, + out = name + '.jar', + visibility = visibility, +) diff -Nru libreoffice-5.0.2/solenv/gbuild/platform/com_GCC_class.mk libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_GCC_class.mk --- libreoffice-5.0.2/solenv/gbuild/platform/com_GCC_class.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_GCC_class.mk 2016-02-04 16:41:28.000000000 +0000 @@ -173,10 +173,10 @@ $(if $(VISIBILITY),,$(gb_VISIBILITY_FLAGS)) \ $(if $(EXTERNAL_CODE),$(gb_CXXFLAGS_Wundef),$(gb_DEFS_INTERNAL)) \ $(6) \ - $(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target,$(2))) \ + $(call gb_cxx_dep_generation_options,$(1),$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2))) \ -c $(patsubst %.cxx,%.hxx,$(3)) \ -o$(1) \ - $(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target,$(2))) \ + $(call gb_cxx_dep_copy,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2))) \ ) endef diff -Nru libreoffice-5.0.2/solenv/gbuild/platform/com_GCC_defs.mk libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_GCC_defs.mk --- libreoffice-5.0.2/solenv/gbuild/platform/com_GCC_defs.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_GCC_defs.mk 2016-02-04 16:41:28.000000000 +0000 @@ -47,6 +47,8 @@ gb_AFLAGS := $(AFLAGS) gb_COMPILERDEFS := \ + -DBOOST_ERROR_CODE_HEADER_ONLY \ + -DBOOST_SYSTEM_NO_DEPRECATED \ -DCPPU_ENV=$(gb_CPPU_ENV) \ gb_CFLAGS_COMMON := \ @@ -110,7 +112,7 @@ gb_LinkTarget_LDFLAGS += -fstack-protector-strong endif -gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror) +gb_CFLAGS_WERROR := $(if $(ENABLE_WERROR),-Werror -Wno-error=deprecated-declarations) # This is the default in non-C++11 mode ifeq ($(COM_GCC_IS_CLANG),TRUE) diff -Nru libreoffice-5.0.2/solenv/gbuild/platform/com_MSC_class.mk libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_MSC_class.mk --- libreoffice-5.0.2/solenv/gbuild/platform/com_MSC_class.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_MSC_class.mk 2016-02-04 16:41:28.000000000 +0000 @@ -85,7 +85,7 @@ -I$(dir $(3)) \ $(6) \ -c $(3) \ - -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target,$(2)),$(1),$(3)) + -Yc$(notdir $(patsubst %.cxx,%.hxx,$(3))) -Fp$(1) -Fo$(1).obj) $(call gb_create_deps,$(call gb_PrecompiledHeader_get_dep_target_tmp,$(2)),$(1),$(3)) endef # AsmObject class diff -Nru libreoffice-5.0.2/solenv/gbuild/platform/com_MSC_defs.mk libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_MSC_defs.mk --- libreoffice-5.0.2/solenv/gbuild/platform/com_MSC_defs.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/platform/com_MSC_defs.mk 2016-02-04 16:41:28.000000000 +0000 @@ -44,6 +44,9 @@ # like std::copy, std::transform (when MSVC_USE_DEBUG_RUNTIME is enabled) gb_COMPILERDEFS := \ + -DBOOST_ERROR_CODE_HEADER_ONLY \ + -DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \ + -DBOOST_SYSTEM_NO_DEPRECATED \ -D_CRT_NON_CONFORMING_SWPRINTFS \ -D_CRT_NONSTDC_NO_DEPRECATE \ -D_CRT_SECURE_NO_DEPRECATE \ diff -Nru libreoffice-5.0.2/solenv/gbuild/PrecompiledHeaders.mk libreoffice-5.0.5~rc2/solenv/gbuild/PrecompiledHeaders.mk --- libreoffice-5.0.2/solenv/gbuild/PrecompiledHeaders.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/PrecompiledHeaders.mk 2016-02-04 16:41:28.000000000 +0000 @@ -34,9 +34,18 @@ mkdir -p $(dir $@) && \ echo "$(call gb_PrecompiledHeader_get_target,$*) : $(gb_Helper_PHONY)" > $@) +# despite this being only one .d file, need to run concat-deps on it to +# re-write external headers from UnpackedTarball $(call gb_PrecompiledHeader_get_target,%) : rm -f $@ $(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE)) +ifeq ($(gb_FULLDEPS),$(true)) + $(call gb_Helper_abbreviate_dirs,\ + RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(call gb_PrecompiledHeader_get_dep_target_tmp,$*)) && \ + $(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} \ + > $(call gb_PrecompiledHeader_get_dep_target,$*) && \ + rm -f $${RESPONSEFILE} $(call gb_PrecompiledHeader_get_dep_target_tmp,$*)) +endif .PHONY : $(call gb_PrecompiledHeader_get_clean_target,%) $(call gb_PrecompiledHeader_get_clean_target,%) : diff -Nru libreoffice-5.0.2/solenv/gbuild/TargetLocations.mk libreoffice-5.0.5~rc2/solenv/gbuild/TargetLocations.mk --- libreoffice-5.0.2/solenv/gbuild/TargetLocations.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/gbuild/TargetLocations.mk 2016-02-04 16:41:28.000000000 +0000 @@ -131,6 +131,7 @@ gb_PackageInfo_get_target = $(WORKDIR)/PackageInfo gb_Postprocess_get_target = $(WORKDIR)/Postprocess/$(1) gb_PrecompiledHeader_get_dep_target = $(WORKDIR)/Dep/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch.d +gb_PrecompiledHeader_get_dep_target_tmp = $(call gb_PrecompiledHeader_get_dep_target,$(1)).tmp gb_PrecompiledHeader_get_target = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/$(1).hxx.gch gb_PrecompiledHeader_get_timestamp = $(WORKDIR)/PrecompiledHeader/$(gb_PrecompiledHeader_DEBUGDIR)/Timestamps/$(1) gb_PropertiesTranslateTarget_get_target = $(WORKDIR)/PropertiesTranslateTarget/$(1).properties diff -Nru libreoffice-5.0.2/solenv/maven/BUCK libreoffice-5.0.5~rc2/solenv/maven/BUCK --- libreoffice-5.0.2/solenv/maven/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/maven/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,41 @@ +include_defs('//solenv/maven/VERSION') +include_defs('//solenv/maven/package.defs') + +URL = 'https://oss.sonatype.org/content/repositories/snapshots' \ + if LIBREOFFICE_VERSION.endswith('-SNAPSHOT') else \ + 'https://oss.sonatype.org/service/local/staging/deploy/maven2' + +maven_package( + repository = 'sonatype-nexus-staging', + url = URL, + version = LIBREOFFICE_VERSION, + jar = { + 'juh': '//:juh', + 'jurt': '//:jurt', + 'officebean': '//:officebean', + 'ridl': '//:ridl', + 'unoil': '//:unoil', + 'unoloader': '//:unoloader', + }, + src = { + 'juh': '//javaunohelper:juh-src', + 'jurt': '//jurt:jurt-src', + 'officebean': '//bean:officebean-src', + 'ridl': '//ridljar:ridl-src', + 'unoil': '//unoil:unoil-src', + 'unoloader': '//ridljar/source/unoloader:unoloader-src', + }, + doc = { + 'juh': '//javaunohelper:juh-javadoc', + 'jurt': '//jurt:jurt-javadoc', + 'officebean': '//bean:officebean-javadoc', + 'ridl': '//ridljar:ridl-javadoc', + 'unoil': '//unoil:unoil-javadoc', + 'unoloader': '//ridljar/source/unoloader:unoloader-javadoc', + }, +) + +python_binary( + name = 'mvn', + main = 'mvn.py', +) diff -Nru libreoffice-5.0.2/solenv/maven/mvn.py libreoffice-5.0.5~rc2/solenv/maven/mvn.py --- libreoffice-5.0.2/solenv/maven/mvn.py 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/maven/mvn.py 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,77 @@ +#!/usr/bin/python +# 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/. + +from __future__ import print_function +from optparse import OptionParser +from os import path, environ +from subprocess import check_output +from sys import stderr + +M = { + 'juh': 'javaunohelper', + 'jurt': 'jurt', + 'officebean': 'bean', + 'ridl': 'ridljar', + 'unoil': 'unoil', + 'unoloader': 'ridljar', +} + +opts = OptionParser() +opts.add_option('--repository', help='maven repository id') +opts.add_option('--url', help='maven repository url') +opts.add_option('-o') +opts.add_option('-a', help='action (valid actions are: install,deploy)') +opts.add_option('-v', help='gerrit version') +opts.add_option('-s', action='append', help='triplet of artifactId:type:path') + +args, ctx = opts.parse_args() +if not args.v: + print('version is empty', file=stderr) + exit(1) + +root = path.abspath(__file__) +while not path.exists(path.join(root, '.buckconfig')): + root = path.dirname(root) + +if 'install' == args.a: + cmd = [ + 'mvn', + 'install:install-file', + '-Dversion=%s' % args.v, + ] +elif 'deploy' == args.a: + cmd = [ + 'mvn', + 'gpg:sign-and-deploy-file', + '-DrepositoryId=%s' % args.repository, + '-Durl=%s' % args.url, + ] +else: + print("unknown action -a %s" % args.a, file=stderr) + exit(1) + +for spec in args.s: + artifact, packaging_type, src = spec.split(':') + exe = cmd + [ + '-DpomFile=%s' % path.join(root, '%s/pom.%s.xml' % (M[artifact], artifact)), + '-Dpackaging=%s' % packaging_type, + '-Dfile=%s' % src, + ] + try: + if environ.get('VERBOSE'): + print(' '.join(exe), file=stderr) + check_output(exe) + except Exception as e: + print('%s command failed: %s' % (args.a, e), file=stderr) + exit(1) + +with open(args.o, 'w') as fd: + if args.repository: + print('Repository: %s' % args.repository, file=fd) + if args.url: + print('URL: %s' % args.url, file=fd) + print('Version: %s' % args.v, file=fd) diff -Nru libreoffice-5.0.2/solenv/maven/package.defs libreoffice-5.0.5~rc2/solenv/maven/package.defs --- libreoffice-5.0.2/solenv/maven/package.defs 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/maven/package.defs 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,28 @@ +def maven_package( + version, + repository = None, + url = None, + jar = {}, + src = {}, + doc = {}): + cmd = ['$(exe //solenv/maven:mvn)', '-v', version, '-o', '$OUT'] + api_cmd = [] + for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]: + for a,t in d.iteritems(): + api_cmd.append('-s %s:%s:$(location %s)' % (a,type,t)) + + genrule( + name = 'api_install', + cmd = ' '.join(cmd + api_cmd + ['-a', 'install']), + out = 'api_install.info', + ) + + if repository and url: + genrule( + name = 'api_deploy', + cmd = ' '.join(cmd + api_cmd + [ + '-a', 'deploy', + '--repository', repository, + '--url', url]), + out = 'api_deploy.info', + ) diff -Nru libreoffice-5.0.2/solenv/maven/README.md libreoffice-5.0.5~rc2/solenv/maven/README.md --- libreoffice-5.0.2/solenv/maven/README.md 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/maven/README.md 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,373 @@ += Uploading LibreOffice API to Maven Central + +This file documents the prerequisites and workflow to upload LibreOffice +API to Maven Central or local Maven repository. + +To install LibreOffice API to local Maven repository or deploy the API +to the Maven Central, extra build toolchain is required. + +`Ant` is used to bootstrap `Buck` build tool. `Buck` build tool is used to +build sources and javadocs for the API and install or deploy the artifacts +to Maven repository. `Maven` commands are invoked for that from within +`Buck` driven build. To be able to upload the API to Maven Central, access +must be granted to LibreOffice project on OSSRH. + + +== Buck + +`Buck` is new build tool that uses Python to write build files. It is +maintained by Facebook and is available under Apache 2 license. + + +=== Installing Buck + +There is currently no binary distribution of `Buck`, so it has to be manually +built and installed. Apache Ant and gcc are required. + +Clone the git and build it: + +---- + git clone https://github.com/facebook/buck + cd buck + ant +---- + +If you don't have a `bin/` directory in your home directory, create one: + +---- + mkdir ~/bin +---- + +Add the `~/bin` folder to the path: + +---- + PATH=~/bin:$PATH +---- + +Note that the buck executable needs to be available in all shell sessions, +so also make sure it is appended to the path globally. + +Add a symbolic link in `~/bin` to the buck and buckd executables: + +---- + ln -s `pwd`/bin/buck ~/bin/ + ln -s `pwd`/bin/buckd ~/bin/ +---- + +Verify that `buck` is accessible: + +---- + which buck +---- + +To enable autocompletion of buck commands, install the autocompletion +script from `./scripts/buck_completion.bash` in the buck project. Refer +to the script's header comments for installation instructions. + + +=== Prerequisites + +Buck requires Python version 2.7 to be installed. The Maven download toolchain +requires `curl` to be installed. + + +=== Using Buck daemon + +Buck ships with a daemon command `buckd`, which uses the +link:https://github.com/martylamb/nailgun[Nailgun] protocol for running +Java programs from the command line without incurring the JVM startup +overhead. + +Using a Buck daemon can save significant amounts of time as it avoids the +overhead of starting a Java virtual machine, loading the buck class files +and parsing the build files for each command. + +It is safe to run several buck daemons started from different project +directories and they will not interfere with each other. Buck's documentation +covers daemon in http://facebook.github.io/buck/command/buckd.html[buckd]. + +To use `buckd` the additional +link:https://facebook.github.io/watchman[watchman] program must be installed. + +To disable `buckd`, the environment variable `NO_BUCKD` must be set. It's not +recommended to put it in the shell config, as it can be forgotten about it and +then assumed Buck was working as it should when it should be using buckd. +Prepend the variable to Buck invocation instead: + +---- + NO_BUCKD=1 buck build api +---- + + +=== Installing watchman + +Watchman is used internally by Buck to monitor directory trees and is needed +for buck daemon to work properly. Because buckd is activated by default in the +latest version of Buck, it searches for the watchman executable in the +path and issues a warning when it is not found and kills buckd. + +To prepare watchman installation on Linux: + +---- + git clone https://github.com/facebook/watchman.git + cd watchman + ./autogen.sh +---- + +To install it in user home directory (without root privileges): + +---- + ./configure --prefix $HOME/watchman + make install +---- + +To install it system wide: + +---- + ./configure + make + sudo make install +---- + +Put $HOME/watchman/bin/watchman in path or link to $HOME/bin/watchman. + +To install watchman on OS X: + +---- + brew install --HEAD watchman +---- + +See the original documentation for more information: +link:https://facebook.github.io/watchman/docs/install.html[Watchman +installation]. + + +=== Override Buck's settings + +Additional JVM args for Buck can be set in `.buckjavaargs` in the +project root directory. For example to override Buck's default 1GB +heap size: + +---- + cat > .buckjavaargs < + sonatype-nexus-staging + USER + PASSWORD + +---- + +* Request permissions to upload artifacts to the `org.libreoffice` +repository on Maven Central: + +Ask for this permission by adding a comment on the +link:https://issues.sonatype.org/browse/OSSRH-19129[OSSRH-19129] Jira +ticket at Sonatype. + +The request needs to be approved by someone who already has this +permission by commenting on the same issue. + +* Generate and publish a PGP key + +Generate and publish a PGP key as described in +link:http://central.sonatype.org/pages/working-with-pgp-signatures.html[ +Working with PGP Signatures]. + +Please be aware that after publishing your public key it may take a +while until it is visible to the Sonatype server. + +The PGP key is needed to be able to sign the artifacts before the +upload to Maven Central. + +The PGP passphrase can be put in `~/.m2/settings.xml`: + +---- + + + + gpg + + gpg2 + mypassphrase + + + + + gpg + + +---- + +It can also be included in the key chain on OS X. + + +== Update Versions + +Before publishing new artifacts to Maven Central, `LIBREOFFICE_VERSION` +in the `VERSION` file must be updated, e.g. change it from `5.0.0` to `5.1.0`. + +In addition the version must be updated in a number of pom.xml files. + +To do this run the `./solenv/bin/version.py` script and provide the new +version as parameter, e.g.: + +---- + ./solenv/bin/version.py 5.1.0 +---- + + +== Build LibreOffice + +Build LibreOffice as usually, so that API JARs are created. + + +== Publish the LibreOffice artifacts to local Maven repository + +Execute this command to install LibreOffice API to local Maven repository: + +---- + buck build api_install +---- + +Once executed, he local Maven respoitory contains the LibreOffice API +artifacts: + +---- + $ ls -1 ~/.m2/repository/org/libreoffice/unoil/5.1.0/ + _maven.repositories + unoil-5.1.0.jar + unoil-5.1.0-javadoc.jar + unoil-5.1.0.pom + unoil-5.1.0-sources.jar +---- + + +== Publish the LibreOffice artifacts to Maven Central + +* Make sure you have done the configuration for deploying to Maven Central. +* Make sure that the version is updated in the `VERSION` file and in +the `pom.xml` files as described above. + +Push the API to Maven Central: + +---- + buck build api_deploy +---- + +For troubleshooting, the environment variable `VERBOSE` can be set. This +prints out the commands that are executed by the Buck build process: + +---- + VERBOSE=1 buck build api_deploy +---- + +If no artifacts are uploaded, clean the `buck-out` folder and retry: + +---- + rm -rf buck-out +---- + +* To where the artifacts are uploaded depends on the `LIBREOFFICE_VERSION` +in the `VERSION` file: + +** SNAPSHOT versions are directly uploaded into the Sonatype snapshots +repository and no further action is needed: + +https://oss.sonatype.org/content/repositories/snapshots/org/libreoffice/ + +** Release versions are uploaded into a staging repository in the +link:https://oss.sonatype.org/[Sonatype Nexus Server]. + +* Verify the staging repository + +** Go to the link:https://oss.sonatype.org/[Sonatype Nexus Server] and +sign in with your Sonatype credentials. + +** Click on 'Build Promotion' in the left navigation bar under +'Staging Repositories' and find the `orglibreoffice-XXXX` staging +repository. + +** Verify its content + +While the staging repository is open you can upload further content and +also replace uploaded artifacts. If something is wrong with the staging +repository you can drop it by selecting it and clicking on `Drop`. + +** Run Sonatype validations on the staging repository + +Select the staging repository and click on `Close`. This runs the +Sonatype validations on the staging repository. The repository will +only be closed if everything is OK. A closed repository cannot be +modified anymore, but you may still drop it if you find any issues. + +** Test closed staging repository + +Once a repository is closed you can find the URL to it in the `Summary` +section, e.g. https://oss.sonatype.org/content/repositories/orglibreoffice-4711 + +Use this URL for further testing of the artifacts in this repository, +e.g. to try building a extension against this API in this repository +update the version in the `pom.xml` and configure the repository: + +---- + + + mexus-staging-repository + https://oss.sonatype.org/content/repositories/orglibreoffice-4711 + + +---- + +* Release the staging repository + +How to release a staging repository is described in the +link:https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide#SonatypeOSSMavenRepositoryUsageGuide-8.a.2.ReleasingaStagingRepository[ +Sonatype OSS Maven Repository Usage Guide]. + +[WARNING] +Releasing artifacts to Maven Central cannot be undone! + +** Find the closed staging repository in the +link:https://oss.sonatype.org/[Sonatype Nexus Server], select it and +click on `Release`. + +** The released artifacts are available in +https://oss.sonatype.org/content/repositories/releases/org/libreoffice/ + +** It may take up to 2 hours until the artifacts appear on Maven +Central: + +http://central.maven.org/maven2/org/libreoffice/ + +* [optional]: View download statistics + +** Sign in to the +link:https://oss.sonatype.org/[Sonatype Nexus Server]. + +** Click on 'Views/Repositories' in the left navigation bar under +'Central Statistics'. + +** Select `org.libreoffice` as `Project`. diff -Nru libreoffice-5.0.2/solenv/maven/VERSION libreoffice-5.0.5~rc2/solenv/maven/VERSION --- libreoffice-5.0.2/solenv/maven/VERSION 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/solenv/maven/VERSION 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,7 @@ +# Maven style API version (e.g. '2.x-SNAPSHOT'). +# +# Used by :install and :deploy when talking to the destination repository. As +# we currently have no stable releases, we use the "build number" scheme +# described at: +# http://mojo.codehaus.org/versions-maven-plugin/version-rules.html +LIBREOFFICE_VERSION = '@version@' Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/2100bc5a7ea9685928ff68cda2e60569-nss-3.19.2-with-nspr-4.10.8.tar.gz differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/478e0e90ebc4a90159549e77021021fd-nss-3.19.4-with-nspr-4.10.10.tar.gz differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/9c0cfef285d5c4a5c80d00904ddab380-libxml2-2.9.1.tar.gz differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz differ diff -Nru libreoffice-5.0.2/src/fetch.log libreoffice-5.0.5~rc2/src/fetch.log --- libreoffice-5.0.2/src/fetch.log 2015-09-18 10:47:55.000000000 +0000 +++ libreoffice-5.0.5~rc2/src/fetch.log 2016-02-08 19:24:07.000000000 +0000 @@ -1,328 +1,328 @@ -Fri Sep 18 10:40:45 UTC 2015 +Mon Feb 8 19:16:59 UTC 2016 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 360k 3 14273 0 0 111k 0 0:00:03 --:--:-- 0:00:03 110k 100 360k 100 360k 0 0 715k 0 --:--:-- --:--:-- --:--:-- 714k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 360k 3 11369 0 0 89849 0 0:00:04 --:--:-- 0:00:04 89519 100 360k 100 360k 0 0 577k 0 --:--:-- --:--:-- --:--:-- 577k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 83 512k 83 430k 0 0 769k 0 --:--:-- --:--:-- --:--:-- 769k 100 512k 100 512k 0 0 782k 0 --:--:-- --:--:-- --:--:-- 781k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 62 512k 62 321k 0 0 656k 0 --:--:-- --:--:-- --:--:-- 655k 100 512k 100 512k 0 0 602k 0 --:--:-- --:--:-- --:--:-- 602k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 39 1838k 39 731k 0 0 840k 0 0:00:02 --:--:-- 0:00:02 839k 88 1838k 88 1626k 0 0 869k 0 0:00:02 0:00:01 0:00:01 869k 100 1838k 100 1838k 0 0 890k 0 0:00:02 0:00:02 --:--:-- 890k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 19 1838k 19 361k 0 0 579k 0 0:00:03 --:--:-- 0:00:03 579k 57 1838k 57 1061k 0 0 644k 0 0:00:02 0:00:01 0:00:01 644k 100 1838k 100 1838k 0 0 706k 0 0:00:02 0:00:02 --:--:-- 707k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 90 721k 90 652k 0 0 845k 0 --:--:-- --:--:-- --:--:-- 845k 100 721k 100 721k 0 0 835k 0 --:--:-- --:--:-- --:--:-- 834k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 721k 100 721k 0 0 746k 0 --:--:-- --:--:-- --:--:-- 746k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 184k 100 184k 0 0 591k 0 --:--:-- --:--:-- --:--:-- 592k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 184k 100 184k 0 0 605k 0 --:--:-- --:--:-- --:--:-- 603k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 39 956k 39 379k 0 0 709k 0 0:00:01 --:--:-- 0:00:01 708k 100 956k 100 956k 0 0 839k 0 0:00:01 0:00:01 --:--:-- 840k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 50 956k 50 486k 0 0 674k 0 0:00:01 --:--:-- 0:00:01 674k 100 956k 100 956k 0 0 762k 0 0:00:01 0:00:01 --:--:-- 762k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 14 853k 14 124k 0 0 307k 0 0:00:02 --:--:-- 0:00:02 306k 100 853k 100 853k 0 0 643k 0 0:00:01 0:00:01 --:--:-- 643k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 29 853k 29 254k 0 0 568k 0 0:00:01 --:--:-- 0:00:01 567k 100 853k 100 853k 0 0 685k 0 0:00:01 0:00:01 --:--:-- 685k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 55.4M 1 727k 0 0 720k 0 0:01:18 0:00:01 0:01:17 720k 2 55.4M 2 1644k 0 0 814k 0 0:01:09 0:00:02 0:01:07 814k 4 55.4M 4 2624k 0 0 872k 0 0:01:05 0:00:03 0:01:02 872k 6 55.4M 6 3615k 0 0 897k 0 0:01:03 0:00:04 0:00:59 897k 8 55.4M 8 4568k 0 0 912k 0 0:01:02 0:00:05 0:00:57 914k 9 55.4M 9 5568k 0 0 927k 0 0:01:01 0:00:06 0:00:55 968k 11 55.4M 11 6579k 0 0 939k 0 0:01:00 0:00:07 0:00:53 989k 13 55.4M 13 7625k 0 0 952k 0 0:00:59 0:00:08 0:00:51 1000k 15 55.4M 15 8645k 0 0 959k 0 0:00:59 0:00:09 0:00:50 1009k 17 55.4M 17 9719k 0 0 971k 0 0:00:58 0:00:10 0:00:48 1030k 18 55.4M 18 10.5M 0 0 979k 0 0:00:57 0:00:11 0:00:46 1043k 20 55.4M 20 11.4M 0 0 976k 0 0:00:58 0:00:12 0:00:46 1028k 22 55.4M 22 12.5M 0 0 984k 0 0:00:57 0:00:13 0:00:44 1035k 24 55.4M 24 13.5M 0 0 988k 0 0:00:57 0:00:14 0:00:43 1041k 26 55.4M 26 14.4M 0 0 989k 0 0:00:57 0:00:15 0:00:42 1024k 27 55.4M 27 15.5M 0 0 992k 0 0:00:57 0:00:16 0:00:41 1019k 29 55.4M 29 16.4M 0 0 990k 0 0:00:57 0:00:17 0:00:40 1023k 31 55.4M 31 17.4M 0 0 989k 0 0:00:57 0:00:18 0:00:39 1003k 33 55.4M 33 18.3M 0 0 989k 0 0:00:57 0:00:19 0:00:38 991k 34 55.4M 34 19.3M 0 0 988k 0 0:00:57 0:00:20 0:00:37 985k 36 55.4M 36 20.1M 0 0 983k 0 0:00:57 0:00:21 0:00:36 955k 37 55.4M 37 21.0M 0 0 979k 0 0:00:57 0:00:22 0:00:35 943k 39 55.4M 39 21.8M 0 0 970k 0 0:00:58 0:00:23 0:00:35 903k 40 55.4M 40 22.6M 0 0 964k 0 0:00:58 0:00:24 0:00:34 870k 42 55.4M 42 23.4M 0 0 960k 0 0:00:59 0:00:25 0:00:34 848k 43 55.4M 43 24.0M 0 0 948k 0 0:00:59 0:00:26 0:00:33 803k 44 55.4M 44 24.9M 0 0 945k 0 0:01:00 0:00:27 0:00:33 795k 46 55.4M 46 25.7M 0 0 938k 0 0:01:00 0:00:28 0:00:32 790k 47 55.4M 47 26.4M 0 0 933k 0 0:01:00 0:00:29 0:00:31 784k 49 55.4M 49 27.2M 0 0 928k 0 0:01:01 0:00:30 0:00:31 772k 50 55.4M 50 28.0M 0 0 926k 0 0:01:01 0:00:31 0:00:30 809k 52 55.4M 52 28.8M 0 0 924k 0 0:01:01 0:00:32 0:00:29 808k 53 55.4M 53 29.7M 0 0 923k 0 0:01:01 0:00:33 0:00:28 839k 55 55.4M 55 30.7M 0 0 924k 0 0:01:01 0:00:34 0:00:27 870k 57 55.4M 57 31.6M 0 0 926k 0 0:01:01 0:00:35 0:00:26 909k 58 55.4M 58 32.6M 0 0 929k 0 0:01:01 0:00:36 0:00:25 946k 60 55.4M 60 33.6M 0 0 931k 0 0:01:00 0:00:37 0:00:23 978k 62 55.4M 62 34.6M 0 0 932k 0 0:01:00 0:00:38 0:00:22 991k 64 55.4M 64 35.5M 0 0 933k 0 0:01:00 0:00:39 0:00:21 998k 66 55.4M 66 36.6M 0 0 937k 0 0:01:00 0:00:40 0:00:20 1013k 67 55.4M 67 37.4M 0 0 934k 0 0:01:00 0:00:41 0:00:19 975k 69 55.4M 69 38.4M 0 0 936k 0 0:01:00 0:00:42 0:00:18 970k 70 55.4M 70 39.2M 0 0 935k 0 0:01:00 0:00:43 0:00:17 954k 72 55.4M 72 40.0M 0 0 932k 0 0:01:00 0:00:44 0:00:16 917k 73 55.4M 73 40.9M 0 0 929k 0 0:01:01 0:00:45 0:00:16 868k 74 55.4M 74 41.5M 0 0 925k 0 0:01:01 0:00:46 0:00:15 847k 76 55.4M 76 42.5M 0 0 925k 0 0:01:01 0:00:47 0:00:14 840k 78 55.4M 78 43.3M 0 0 925k 0 0:01:01 0:00:48 0:00:13 844k 80 55.4M 80 44.4M 0 0 927k 0 0:01:01 0:00:49 0:00:12 892k 81 55.4M 81 45.4M 0 0 929k 0 0:01:01 0:00:50 0:00:11 935k 83 55.4M 83 46.3M 0 0 931k 0 0:01:00 0:00:51 0:00:09 988k 85 55.4M 85 47.3M 0 0 931k 0 0:01:00 0:00:52 0:00:08 981k 87 55.4M 87 48.2M 0 0 932k 0 0:01:00 0:00:53 0:00:07 997k 88 55.4M 88 49.1M 0 0 932k 0 0:01:00 0:00:54 0:00:06 978k 90 55.4M 90 50.1M 0 0 933k 0 0:01:00 0:00:55 0:00:05 972k 92 55.4M 92 51.1M 0 0 935k 0 0:01:00 0:00:56 0:00:04 977k 94 55.4M 94 52.1M 0 0 937k 0 0:01:00 0:00:57 0:00:03 995k 95 55.4M 95 53.1M 0 0 938k 0 0:01:00 0:00:58 0:00:02 998k 97 55.4M 97 54.2M 0 0 941k 0 0:01:00 0:00:59 0:00:01 1032k 99 55.4M 99 55.2M 0 0 942k 0 0:01:00 0:01:00 --:--:-- 1039k 100 55.4M 100 55.4M 0 0 942k 0 0:01:00 0:01:00 --:--:-- 1038k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 55.4M 0 103k 0 0 525k 0 0:01:48 --:--:-- 0:01:48 524k 1 55.4M 1 955k 0 0 799k 0 0:01:10 0:00:01 0:01:09 799k 3 55.4M 3 1874k 0 0 848k 0 0:01:06 0:00:02 0:01:04 848k 4 55.4M 4 2837k 0 0 888k 0 0:01:03 0:00:03 0:01:00 888k 6 55.4M 6 3643k 0 0 865k 0 0:01:05 0:00:04 0:01:01 865k 8 55.4M 8 4691k 0 0 903k 0 0:01:02 0:00:05 0:00:57 918k 10 55.4M 10 5708k 0 0 921k 0 0:01:01 0:00:06 0:00:55 951k 11 55.4M 11 6625k 0 0 921k 0 0:01:01 0:00:07 0:00:54 953k 13 55.4M 13 7678k 0 0 936k 0 0:01:00 0:00:08 0:00:52 966k 15 55.4M 15 8585k 0 0 933k 0 0:01:00 0:00:09 0:00:51 991k 16 55.4M 16 9623k 0 0 944k 0 0:01:00 0:00:10 0:00:50 986k 18 55.4M 18 10.3M 0 0 949k 0 0:00:59 0:00:11 0:00:48 982k 20 55.4M 20 11.3M 0 0 953k 0 0:00:59 0:00:12 0:00:47 998k 22 55.4M 22 12.3M 0 0 961k 0 0:00:59 0:00:13 0:00:46 1002k 24 55.4M 24 13.5M 0 0 979k 0 0:00:57 0:00:14 0:00:43 1064k 26 55.4M 26 14.6M 0 0 981k 0 0:00:57 0:00:15 0:00:42 1055k 28 55.4M 28 15.6M 0 0 987k 0 0:00:57 0:00:16 0:00:41 1072k 30 55.4M 30 16.6M 0 0 992k 0 0:00:57 0:00:17 0:00:40 1088k 31 55.4M 31 17.4M 0 0 984k 0 0:00:57 0:00:18 0:00:39 1044k 33 55.4M 33 18.3M 0 0 976k 0 0:00:58 0:00:19 0:00:39 966k 34 55.4M 34 19.2M 0 0 975k 0 0:00:58 0:00:20 0:00:38 957k 36 55.4M 36 20.2M 0 0 977k 0 0:00:58 0:00:21 0:00:37 946k 38 55.4M 38 21.2M 0 0 981k 0 0:00:57 0:00:22 0:00:35 943k 40 55.4M 40 22.2M 0 0 981k 0 0:00:57 0:00:23 0:00:34 970k 41 55.4M 41 23.0M 0 0 976k 0 0:00:58 0:00:24 0:00:34 976k 43 55.4M 43 23.9M 0 0 974k 0 0:00:58 0:00:25 0:00:33 971k 44 55.4M 44 24.9M 0 0 973k 0 0:00:58 0:00:26 0:00:32 958k 46 55.4M 46 25.7M 0 0 969k 0 0:00:58 0:00:27 0:00:31 917k 48 55.4M 48 26.7M 0 0 969k 0 0:00:58 0:00:28 0:00:30 917k 49 55.4M 49 27.7M 0 0 972k 0 0:00:58 0:00:29 0:00:29 952k 51 55.4M 51 28.7M 0 0 973k 0 0:00:58 0:00:30 0:00:28 970k 53 55.4M 53 29.6M 0 0 973k 0 0:00:58 0:00:31 0:00:27 970k 54 55.4M 54 30.3M 0 0 965k 0 0:00:58 0:00:32 0:00:26 944k 55 55.4M 55 30.9M 0 0 952k 0 0:00:59 0:00:33 0:00:26 858k 56 55.4M 56 31.4M 0 0 940k 0 0:01:00 0:00:34 0:00:26 759k 57 55.4M 57 32.0M 0 0 931k 0 0:01:00 0:00:35 0:00:25 679k 58 55.4M 58 32.3M 0 0 915k 0 0:01:02 0:00:36 0:00:26 554k 59 55.4M 59 32.8M 0 0 904k 0 0:01:02 0:00:37 0:00:25 508k 60 55.4M 60 33.6M 0 0 901k 0 0:01:02 0:00:38 0:00:24 558k 62 55.4M 62 34.5M 0 0 903k 0 0:01:02 0:00:39 0:00:23 640k 64 55.4M 64 35.5M 0 0 905k 0 0:01:02 0:00:40 0:00:22 718k 65 55.4M 65 36.4M 0 0 907k 0 0:01:02 0:00:41 0:00:21 846k 67 55.4M 67 37.4M 0 0 909k 0 0:01:02 0:00:42 0:00:20 950k 69 55.4M 69 38.4M 0 0 912k 0 0:01:02 0:00:43 0:00:19 993k 70 55.4M 70 39.3M 0 0 912k 0 0:01:02 0:00:44 0:00:18 983k 72 55.4M 72 40.2M 0 0 912k 0 0:01:02 0:00:45 0:00:17 971k 74 55.4M 74 41.1M 0 0 912k 0 0:01:02 0:00:46 0:00:16 956k 76 55.4M 76 42.1M 0 0 915k 0 0:01:02 0:00:47 0:00:15 962k 77 55.4M 77 43.1M 0 0 917k 0 0:01:01 0:00:48 0:00:13 961k 79 55.4M 79 44.0M 0 0 916k 0 0:01:01 0:00:49 0:00:12 958k 80 55.4M 80 44.9M 0 0 916k 0 0:01:01 0:00:50 0:00:11 948k 82 55.4M 82 46.0M 0 0 920k 0 0:01:01 0:00:51 0:00:10 992k 84 55.4M 84 46.9M 0 0 920k 0 0:01:01 0:00:52 0:00:09 972k 86 55.4M 86 47.8M 0 0 921k 0 0:01:01 0:00:53 0:00:08 956k 87 55.4M 87 48.7M 0 0 920k 0 0:01:01 0:00:54 0:00:07 954k 89 55.4M 89 49.5M 0 0 919k 0 0:01:01 0:00:55 0:00:06 951k 91 55.4M 91 50.5M 0 0 921k 0 0:01:01 0:00:56 0:00:05 935k 92 55.4M 92 51.5M 0 0 922k 0 0:01:01 0:00:57 0:00:04 934k 94 55.4M 94 52.5M 0 0 924k 0 0:01:01 0:00:58 0:00:03 957k 96 55.4M 96 53.4M 0 0 925k 0 0:01:01 0:00:59 0:00:02 978k 98 55.4M 98 54.4M 0 0 926k 0 0:01:01 0:01:00 0:00:01 1000k 99 55.4M 99 55.3M 0 0 926k 0 0:01:01 0:01:01 --:--:-- 983k 100 55.4M 100 55.4M 0 0 927k 0 0:01:01 0:01:01 --:--:-- 996k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 26 1935k 26 511k 0 0 830k 0 0:00:02 --:--:-- 0:00:02 830k 79 1935k 79 1529k 0 0 947k 0 0:00:02 0:00:01 0:00:01 947k 100 1935k 100 1935k 0 0 964k 0 0:00:02 0:00:02 --:--:-- 964k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 35 1935k 35 693k 0 0 849k 0 0:00:02 --:--:-- 0:00:02 849k 84 1935k 84 1627k 0 0 897k 0 0:00:02 0:00:01 0:00:01 897k 100 1935k 100 1935k 0 0 927k 0 0:00:02 0:00:02 --:--:-- 927k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 22.4M 1 338k 0 0 590k 0 0:00:38 --:--:-- 0:00:38 589k 5 22.4M 5 1322k 0 0 830k 0 0:00:27 0:00:01 0:00:26 830k 9 22.4M 9 2299k 0 0 893k 0 0:00:25 0:00:02 0:00:23 893k 14 22.4M 14 3331k 0 0 932k 0 0:00:24 0:00:03 0:00:21 932k 18 22.4M 18 4310k 0 0 942k 0 0:00:24 0:00:04 0:00:20 942k 23 22.4M 23 5348k 0 0 959k 0 0:00:23 0:00:05 0:00:18 1001k 27 22.4M 27 6313k 0 0 960k 0 0:00:23 0:00:06 0:00:17 1001k 31 22.4M 31 7307k 0 0 964k 0 0:00:23 0:00:07 0:00:16 1001k 35 22.4M 35 8267k 0 0 964k 0 0:00:23 0:00:08 0:00:15 987k 40 22.4M 40 9253k 0 0 966k 0 0:00:23 0:00:09 0:00:14 988k 44 22.4M 44 10.0M 0 0 968k 0 0:00:23 0:00:10 0:00:13 978k 48 22.4M 48 10.9M 0 0 972k 0 0:00:23 0:00:11 0:00:12 988k 53 22.4M 53 11.9M 0 0 974k 0 0:00:23 0:00:12 0:00:11 988k 57 22.4M 57 12.9M 0 0 975k 0 0:00:23 0:00:13 0:00:10 995k 61 22.4M 61 13.8M 0 0 974k 0 0:00:23 0:00:14 0:00:09 989k 65 22.4M 65 14.8M 0 0 974k 0 0:00:23 0:00:15 0:00:08 986k 70 22.4M 70 15.8M 0 0 976k 0 0:00:23 0:00:16 0:00:07 986k 74 22.4M 74 16.7M 0 0 975k 0 0:00:23 0:00:17 0:00:06 978k 78 22.4M 78 17.7M 0 0 976k 0 0:00:23 0:00:18 0:00:05 979k 82 22.4M 82 18.5M 0 0 972k 0 0:00:23 0:00:19 0:00:04 966k 85 22.4M 85 19.2M 0 0 955k 0 0:00:24 0:00:20 0:00:04 896k 86 22.4M 86 19.5M 0 0 924k 0 0:00:24 0:00:21 0:00:03 752k 88 22.4M 88 19.9M 0 0 900k 0 0:00:25 0:00:22 0:00:03 642k 90 22.4M 90 20.3M 0 0 885k 0 0:00:25 0:00:23 0:00:02 544k 91 22.4M 91 20.6M 0 0 853k 0 0:00:26 0:00:24 0:00:02 405k 93 22.4M 93 21.0M 0 0 838k 0 0:00:27 0:00:25 0:00:02 375k 97 22.4M 97 21.8M 0 0 840k 0 0:00:27 0:00:26 0:00:01 472k 100 22.4M 100 22.4M 0 0 841k 0 0:00:27 0:00:27 --:--:-- 553k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 22.4M 2 623k 0 0 875k 0 0:00:26 --:--:-- 0:00:26 874k 6 22.4M 6 1514k 0 0 884k 0 0:00:26 0:00:01 0:00:25 884k 10 22.4M 10 2432k 0 0 897k 0 0:00:25 0:00:02 0:00:23 897k 14 22.4M 14 3343k 0 0 900k 0 0:00:25 0:00:03 0:00:22 900k 18 22.4M 18 4195k 0 0 890k 0 0:00:25 0:00:04 0:00:21 890k 21 22.4M 21 4995k 0 0 873k 0 0:00:26 0:00:05 0:00:21 873k 25 22.4M 25 5844k 0 0 870k 0 0:00:26 0:00:06 0:00:20 866k 29 22.4M 29 6823k 0 0 884k 0 0:00:26 0:00:07 0:00:19 878k 34 22.4M 34 7872k 0 0 903k 0 0:00:25 0:00:08 0:00:17 905k 38 22.4M 38 8935k 0 0 920k 0 0:00:25 0:00:09 0:00:16 948k 43 22.4M 43 9.8M 0 0 938k 0 0:00:24 0:00:10 0:00:14 1011k 48 22.4M 48 10.8M 0 0 945k 0 0:00:24 0:00:11 0:00:13 1045k 52 22.4M 52 11.7M 0 0 943k 0 0:00:24 0:00:12 0:00:12 1033k 56 22.4M 56 12.6M 0 0 948k 0 0:00:24 0:00:13 0:00:11 1026k 60 22.4M 60 13.6M 0 0 951k 0 0:00:24 0:00:14 0:00:10 1013k 65 22.4M 65 14.6M 0 0 952k 0 0:00:24 0:00:15 0:00:09 982k 68 22.4M 68 15.4M 0 0 946k 0 0:00:24 0:00:16 0:00:08 947k 72 22.4M 72 16.3M 0 0 943k 0 0:00:24 0:00:17 0:00:07 942k 76 22.4M 76 17.2M 0 0 942k 0 0:00:24 0:00:18 0:00:06 926k 80 22.4M 80 18.1M 0 0 945k 0 0:00:24 0:00:19 0:00:05 925k 85 22.4M 85 19.1M 0 0 949k 0 0:00:24 0:00:20 0:00:04 940k 89 22.4M 89 20.2M 0 0 953k 0 0:00:24 0:00:21 0:00:03 977k 94 22.4M 94 21.2M 0 0 959k 0 0:00:23 0:00:22 0:00:01 1017k 97 22.4M 97 21.9M 0 0 949k 0 0:00:24 0:00:23 0:00:01 978k 100 22.4M 100 22.4M 0 0 952k 0 0:00:24 0:00:24 --:--:-- 985k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 457k 0 1205 0 0 7521 0 0:01:02 --:--:-- 0:01:02 7484 100 457k 100 457k 0 0 591k 0 --:--:-- --:--:-- --:--:-- 591k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 76 457k 76 349k 0 0 696k 0 --:--:-- --:--:-- --:--:-- 695k 100 457k 100 457k 0 0 724k 0 --:--:-- --:--:-- --:--:-- 723k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 29 649k 29 192k 0 0 568k 0 0:00:01 --:--:-- 0:00:01 568k 100 649k 100 649k 0 0 744k 0 --:--:-- --:--:-- --:--:-- 743k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 649k 100 649k 0 0 778k 0 --:--:-- --:--:-- --:--:-- 779k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 11 2188k 11 245k 0 0 558k 0 0:00:03 --:--:-- 0:00:03 558k 53 2188k 53 1178k 0 0 808k 0 0:00:02 0:00:01 0:00:01 808k 95 2188k 95 2082k 0 0 847k 0 0:00:02 0:00:02 --:--:-- 847k 100 2188k 100 2188k 0 0 862k 0 0:00:02 0:00:02 --:--:-- 862k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 26 2188k 26 588k 0 0 579k 0 0:00:03 0:00:01 0:00:02 578k 61 2188k 61 1341k 0 0 663k 0 0:00:03 0:00:02 0:00:01 663k 100 2188k 100 2188k 0 0 726k 0 0:00:03 0:00:03 --:--:-- 726k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 74 720k 74 534k 0 0 620k 0 0:00:01 --:--:-- 0:00:01 620k 100 720k 100 720k 0 0 660k 0 0:00:01 0:00:01 --:--:-- 661k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 720k 100 720k 0 0 777k 0 --:--:-- --:--:-- --:--:-- 778k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 9.8M 3 348k 0 0 469k 0 0:00:21 --:--:-- 0:00:21 469k 9 9.8M 9 993k 0 0 570k 0 0:00:17 0:00:01 0:00:16 570k 17 9.8M 17 1726k 0 0 629k 0 0:00:16 0:00:02 0:00:14 629k 24 9.8M 24 2502k 0 0 667k 0 0:00:15 0:00:03 0:00:12 667k 32 9.8M 32 3319k 0 0 699k 0 0:00:14 0:00:04 0:00:10 699k 41 9.8M 41 4188k 0 0 729k 0 0:00:13 0:00:05 0:00:08 767k 50 9.8M 50 5121k 0 0 753k 0 0:00:13 0:00:06 0:00:07 817k 58 9.8M 58 5865k 0 0 757k 0 0:00:13 0:00:07 0:00:06 827k 67 9.8M 67 6864k 0 0 785k 0 0:00:12 0:00:08 0:00:04 873k 77 9.8M 77 7822k 0 0 802k 0 0:00:12 0:00:09 0:00:03 901k 87 9.8M 87 8845k 0 0 823k 0 0:00:12 0:00:10 0:00:02 931k 96 9.8M 96 9789k 0 0 831k 0 0:00:12 0:00:11 0:00:01 936k 100 9.8M 100 9.8M 0 0 825k 0 0:00:12 0:00:12 --:--:-- 941k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 7 9.8M 7 798k 0 0 752k 0 0:00:13 0:00:01 0:00:12 752k 15 9.8M 15 1542k 0 0 752k 0 0:00:13 0:00:02 0:00:11 752k 23 9.8M 23 2381k 0 0 780k 0 0:00:12 0:00:03 0:00:09 780k 33 9.8M 33 3344k 0 0 825k 0 0:00:12 0:00:04 0:00:08 825k 43 9.8M 43 4398k 0 0 870k 0 0:00:11 0:00:05 0:00:06 880k 54 9.8M 54 5467k 0 0 903k 0 0:00:11 0:00:06 0:00:05 935k 64 9.8M 64 6533k 0 0 926k 0 0:00:10 0:00:07 0:00:03 998k 75 9.8M 75 7583k 0 0 941k 0 0:00:10 0:00:08 0:00:02 1040k 85 9.8M 85 8649k 0 0 954k 0 0:00:10 0:00:09 0:00:01 1059k 96 9.8M 96 9714k 0 0 943k 0 0:00:10 0:00:10 --:--:-- 1014k 100 9.8M 100 9.8M 0 0 968k 0 0:00:10 0:00:10 --:--:-- 1057k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 7 542k 7 40409 0 0 92014 0 0:00:06 --:--:-- 0:00:06 92047 100 542k 100 542k 0 0 478k 0 0:00:01 0:00:01 --:--:-- 478k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 94 542k 94 510k 0 0 873k 0 --:--:-- --:--:-- --:--:-- 873k 100 542k 100 542k 0 0 862k 0 --:--:-- --:--:-- --:--:-- 862k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 18 931k 18 169k 0 0 586k 0 0:00:01 --:--:-- 0:00:01 585k 97 931k 97 904k 0 0 710k 0 0:00:01 0:00:01 --:--:-- 710k 100 931k 100 931k 0 0 720k 0 0:00:01 0:00:01 --:--:-- 720k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 74 931k 74 697k 0 0 738k 0 0:00:01 --:--:-- 0:00:01 738k 100 931k 100 931k 0 0 749k 0 0:00:01 0:00:01 --:--:-- 749k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 42487 100 42487 0 0 251k 0 --:--:-- --:--:-- --:--:-- 251k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 49659 100 49659 0 0 288k 0 --:--:-- --:--:-- --:--:-- 290k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 19 3284k 19 644k 0 0 834k 0 0:00:03 --:--:-- 0:00:03 834k 46 3284k 46 1519k 0 0 866k 0 0:00:03 0:00:01 0:00:02 865k 77 3284k 77 2535k 0 0 919k 0 0:00:03 0:00:02 0:00:01 919k 100 3284k 100 3284k 0 0 936k 0 0:00:03 0:00:03 --:--:-- 936k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 7 3284k 7 233k 0 0 454k 0 0:00:07 --:--:-- 0:00:07 454k 33 3284k 33 1088k 0 0 720k 0 0:00:04 0:00:01 0:00:03 720k 62 3284k 62 2041k 0 0 813k 0 0:00:04 0:00:02 0:00:02 813k 85 3284k 85 2794k 0 0 795k 0 0:00:04 0:00:03 0:00:01 795k 100 3284k 100 3284k 0 0 814k 0 0:00:04 0:00:04 --:--:-- 814k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 18 455k 18 86873 0 0 373k 0 0:00:01 --:--:-- 0:00:01 373k 100 455k 100 455k 0 0 740k 0 --:--:-- --:--:-- --:--:-- 739k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 63 455k 63 287k 0 0 623k 0 --:--:-- --:--:-- --:--:-- 623k 100 455k 100 455k 0 0 706k 0 --:--:-- --:--:-- --:--:-- 705k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 98 452k 98 443k 0 0 739k 0 --:--:-- --:--:-- --:--:-- 739k 100 452k 100 452k 0 0 744k 0 --:--:-- --:--:-- --:--:-- 744k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 452k 100 452k 0 0 758k 0 --:--:-- --:--:-- --:--:-- 759k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 450k 100 450k 0 0 670k 0 --:--:-- --:--:-- --:--:-- 671k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 13 450k 13 63641 0 0 310k 0 0:00:01 --:--:-- 0:00:01 310k 100 450k 100 450k 0 0 613k 0 --:--:-- --:--:-- --:--:-- 613k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 29 549k 29 159k 0 0 572k 0 --:--:-- --:--:-- --:--:-- 571k 100 549k 100 549k 0 0 766k 0 --:--:-- --:--:-- --:--:-- 765k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 58 549k 58 318k 0 0 705k 0 --:--:-- --:--:-- --:--:-- 705k 100 549k 100 549k 0 0 743k 0 --:--:-- --:--:-- --:--:-- 743k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 13.1M 2 298k 0 0 545k 0 0:00:24 --:--:-- 0:00:24 545k 8 13.1M 8 1125k 0 0 729k 0 0:00:18 0:00:01 0:00:17 729k 15 13.1M 15 2152k 0 0 846k 0 0:00:15 0:00:02 0:00:13 846k 23 13.1M 23 3166k 0 0 893k 0 0:00:15 0:00:03 0:00:12 893k 31 13.1M 31 4189k 0 0 922k 0 0:00:14 0:00:04 0:00:10 922k 38 13.1M 38 5217k 0 0 941k 0 0:00:14 0:00:05 0:00:09 984k 45 13.1M 45 6187k 0 0 945k 0 0:00:14 0:00:06 0:00:08 1012k 53 13.1M 53 7197k 0 0 951k 0 0:00:14 0:00:07 0:00:07 1004k 60 13.1M 60 8155k 0 0 954k 0 0:00:14 0:00:08 0:00:06 997k 68 13.1M 68 9198k 0 0 963k 0 0:00:13 0:00:09 0:00:04 1000k 75 13.1M 75 9.9M 0 0 966k 0 0:00:13 0:00:10 0:00:03 994k 83 13.1M 83 10.9M 0 0 969k 0 0:00:13 0:00:11 0:00:02 999k 90 13.1M 90 11.8M 0 0 969k 0 0:00:13 0:00:12 0:00:01 996k 97 13.1M 97 12.9M 0 0 975k 0 0:00:13 0:00:13 --:--:-- 1011k 100 13.1M 100 13.1M 0 0 972k 0 0:00:13 0:00:13 --:--:-- 993k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 13.1M 3 500k 0 0 711k 0 0:00:18 --:--:-- 0:00:18 710k 10 13.1M 10 1413k 0 0 830k 0 0:00:16 0:00:01 0:00:15 829k 17 13.1M 17 2298k 0 0 850k 0 0:00:15 0:00:02 0:00:13 849k 23 13.1M 23 3113k 0 0 840k 0 0:00:16 0:00:03 0:00:13 840k 29 13.1M 29 3981k 0 0 846k 0 0:00:15 0:00:04 0:00:11 846k 36 13.1M 36 4935k 0 0 865k 0 0:00:15 0:00:05 0:00:10 887k 43 13.1M 43 5911k 0 0 881k 0 0:00:15 0:00:06 0:00:09 898k 51 13.1M 51 6966k 0 0 904k 0 0:00:14 0:00:07 0:00:07 933k 58 13.1M 58 7885k 0 0 906k 0 0:00:14 0:00:08 0:00:06 954k 64 13.1M 64 8662k 0 0 892k 0 0:00:15 0:00:09 0:00:06 936k 71 13.1M 71 9626k 0 0 899k 0 0:00:14 0:00:10 0:00:04 938k 77 13.1M 77 10.2M 0 0 896k 0 0:00:15 0:00:11 0:00:04 916k 84 13.1M 84 11.1M 0 0 897k 0 0:00:15 0:00:12 0:00:03 886k 92 13.1M 92 12.1M 0 0 907k 0 0:00:14 0:00:13 0:00:01 911k 99 13.1M 99 13.1M 0 0 913k 0 0:00:14 0:00:14 --:--:-- 954k 100 13.1M 100 13.1M 0 0 914k 0 0:00:14 0:00:14 --:--:-- 955k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 30 1512k 30 463k 0 0 746k 0 0:00:02 --:--:-- 0:00:02 746k 99 1512k 99 1509k 0 0 932k 0 0:00:01 0:00:01 --:--:-- 932k 100 1512k 100 1512k 0 0 932k 0 0:00:01 0:00:01 --:--:-- 932k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 50 1512k 50 761k 0 0 822k 0 0:00:01 --:--:-- 0:00:01 822k 100 1512k 100 1512k 0 0 852k 0 0:00:01 0:00:01 --:--:-- 852k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 583k 100 583k 0 0 860k 0 --:--:-- --:--:-- --:--:-- 861k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 6 583k 6 36053 0 0 250k 0 0:00:02 --:--:-- 0:00:02 249k 100 583k 100 583k 0 0 797k 0 --:--:-- --:--:-- --:--:-- 796k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 1457k 1 21531 0 0 83185 0 0:00:17 --:--:-- 0:00:17 83131 69 1457k 69 1012k 0 0 804k 0 0:00:01 0:00:01 --:--:-- 804k 100 1457k 100 1457k 0 0 869k 0 0:00:01 0:00:01 --:--:-- 869k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 13 1457k 13 199k 0 0 503k 0 0:00:02 --:--:-- 0:00:02 502k 64 1457k 64 937k 0 0 671k 0 0:00:02 0:00:01 0:00:01 670k 100 1457k 100 1457k 0 0 713k 0 0:00:02 0:00:02 --:--:-- 713k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 49 840k 49 418k 0 0 763k 0 0:00:01 --:--:-- 0:00:01 762k 100 840k 100 840k 0 0 870k 0 --:--:-- --:--:-- --:--:-- 870k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 22 840k 22 186k 0 0 547k 0 0:00:01 --:--:-- 0:00:01 546k 100 840k 100 840k 0 0 648k 0 0:00:01 0:00:01 --:--:-- 649k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 8 5166k 8 459k 0 0 846k 0 0:00:06 --:--:-- 0:00:06 845k 27 5166k 27 1427k 0 0 924k 0 0:00:05 0:00:01 0:00:04 924k 47 5166k 47 2454k 0 0 965k 0 0:00:05 0:00:02 0:00:03 965k 67 5166k 67 3462k 0 0 975k 0 0:00:05 0:00:03 0:00:02 975k 85 5166k 85 4430k 0 0 974k 0 0:00:05 0:00:04 0:00:01 974k 100 5166k 100 5166k 0 0 974k 0 0:00:05 0:00:05 --:--:-- 989k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 12 5166k 12 653k 0 0 631k 0 0:00:08 0:00:01 0:00:07 630k 25 5166k 25 1338k 0 0 652k 0 0:00:07 0:00:02 0:00:05 652k 41 5166k 41 2167k 0 0 713k 0 0:00:07 0:00:03 0:00:04 713k 56 5166k 56 2908k 0 0 720k 0 0:00:07 0:00:04 0:00:03 720k 72 5166k 72 3744k 0 0 743k 0 0:00:06 0:00:05 0:00:01 749k 86 5166k 86 4491k 0 0 744k 0 0:00:06 0:00:06 --:--:-- 767k 100 5166k 100 5166k 0 0 750k 0 0:00:06 0:00:06 --:--:-- 792k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 6776k 0 44763 0 0 229k 0 0:00:29 --:--:-- 0:00:29 228k 13 6776k 13 927k 0 0 777k 0 0:00:08 0:00:01 0:00:07 777k 28 6776k 28 1938k 0 0 883k 0 0:00:07 0:00:02 0:00:05 883k 42 6776k 42 2878k 0 0 901k 0 0:00:07 0:00:03 0:00:04 901k 57 6776k 57 3869k 0 0 921k 0 0:00:07 0:00:04 0:00:03 921k 71 6776k 71 4825k 0 0 928k 0 0:00:07 0:00:05 0:00:02 955k 85 6776k 85 5806k 0 0 937k 0 0:00:07 0:00:06 0:00:01 975k 100 6776k 100 6776k 0 0 944k 0 0:00:07 0:00:07 --:--:-- 971k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 6776k 9 659k 0 0 580k 0 0:00:11 0:00:01 0:00:10 580k 20 6776k 20 1358k 0 0 636k 0 0:00:10 0:00:02 0:00:08 636k 30 6776k 30 2050k 0 0 654k 0 0:00:10 0:00:03 0:00:07 654k 42 6776k 42 2888k 0 0 698k 0 0:00:09 0:00:04 0:00:05 698k 55 6776k 55 3755k 0 0 731k 0 0:00:09 0:00:05 0:00:04 754k 69 6776k 69 4725k 0 0 770k 0 0:00:08 0:00:06 0:00:02 813k 81 6776k 81 5504k 0 0 771k 0 0:00:08 0:00:07 0:00:01 829k 95 6776k 95 6461k 0 0 794k 0 0:00:08 0:00:08 --:--:-- 882k 100 6776k 100 6776k 0 0 799k 0 0:00:08 0:00:08 --:--:-- 895k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 65 1155k 65 755k 0 0 782k 0 0:00:01 --:--:-- 0:00:01 782k 100 1155k 100 1155k 0 0 858k 0 0:00:01 0:00:01 --:--:-- 859k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 35 1155k 35 406k 0 0 642k 0 0:00:01 --:--:-- 0:00:01 642k 100 1155k 100 1155k 0 0 758k 0 0:00:01 0:00:01 --:--:-- 759k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 13 3436k 13 476k 0 0 787k 0 0:00:04 --:--:-- 0:00:04 787k 40 3436k 40 1382k 0 0 873k 0 0:00:03 0:00:01 0:00:02 872k 65 3436k 65 2264k 0 0 875k 0 0:00:03 0:00:02 0:00:01 875k 94 3436k 94 3261k 0 0 909k 0 0:00:03 0:00:03 --:--:-- 909k 100 3436k 100 3436k 0 0 910k 0 0:00:03 0:00:03 --:--:-- 910k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 3436k 0 9918 0 0 99k 0 0:00:34 --:--:-- 0:00:34 99k 22 3436k 22 765k 0 0 697k 0 0:00:04 0:00:01 0:00:03 697k 38 3436k 38 1332k 0 0 635k 0 0:00:05 0:00:02 0:00:03 635k 48 3436k 48 1678k 0 0 530k 0 0:00:06 0:00:03 0:00:03 530k 63 3436k 63 2173k 0 0 518k 0 0:00:06 0:00:04 0:00:02 518k 75 3436k 75 2607k 0 0 511k 0 0:00:06 0:00:05 0:00:01 519k 88 3436k 88 3032k 0 0 496k 0 0:00:06 0:00:06 --:--:-- 452k 99 3436k 99 3426k 0 0 482k 0 0:00:07 0:00:07 --:--:-- 418k 100 3436k 100 3436k 0 0 483k 0 0:00:07 0:00:07 --:--:-- 446k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 61 962k 61 593k 0 0 735k 0 0:00:01 --:--:-- 0:00:01 735k 100 962k 100 962k 0 0 805k 0 0:00:01 0:00:01 --:--:-- 805k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 50 962k 50 484k 0 0 497k 0 0:00:01 --:--:-- 0:00:01 497k 100 962k 100 962k 0 0 609k 0 0:00:01 0:00:01 --:--:-- 610k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 57 623k 57 358k 0 0 631k 0 --:--:-- --:--:-- --:--:-- 631k 100 623k 100 623k 0 0 739k 0 --:--:-- --:--:-- --:--:-- 738k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 22 623k 22 141k 0 0 363k 0 0:00:01 --:--:-- 0:00:01 362k 100 623k 100 623k 0 0 654k 0 --:--:-- --:--:-- --:--:-- 654k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 24.3M 2 515k 0 0 773k 0 0:00:32 --:--:-- 0:00:32 773k 5 24.3M 5 1468k 0 0 879k 0 0:00:28 0:00:01 0:00:27 880k 9 24.3M 9 2442k 0 0 916k 0 0:00:27 0:00:02 0:00:25 915k 13 24.3M 13 3469k 0 0 946k 0 0:00:26 0:00:03 0:00:23 946k 17 24.3M 17 4453k 0 0 953k 0 0:00:26 0:00:04 0:00:22 953k 21 24.3M 21 5352k 0 0 944k 0 0:00:26 0:00:05 0:00:21 967k 25 24.3M 25 6278k 0 0 939k 0 0:00:26 0:00:06 0:00:20 959k 28 24.3M 28 7191k 0 0 937k 0 0:00:26 0:00:07 0:00:19 949k 32 24.3M 32 8049k 0 0 927k 0 0:00:26 0:00:08 0:00:18 914k 35 24.3M 35 8856k 0 0 915k 0 0:00:27 0:00:09 0:00:18 880k 38 24.3M 38 9626k 0 0 902k 0 0:00:27 0:00:10 0:00:17 854k 41 24.3M 41 10.0M 0 0 877k 0 0:00:28 0:00:11 0:00:17 793k 44 24.3M 44 10.7M 0 0 870k 0 0:00:28 0:00:12 0:00:16 767k 47 24.3M 47 11.5M 0 0 868k 0 0:00:28 0:00:13 0:00:15 766k 51 24.3M 51 12.5M 0 0 877k 0 0:00:28 0:00:14 0:00:14 802k 55 24.3M 55 13.5M 0 0 885k 0 0:00:28 0:00:15 0:00:13 849k 59 24.3M 59 14.5M 0 0 892k 0 0:00:27 0:00:16 0:00:11 929k 63 24.3M 63 15.3M 0 0 892k 0 0:00:27 0:00:17 0:00:10 947k 67 24.3M 67 16.4M 0 0 901k 0 0:00:27 0:00:18 0:00:09 989k 71 24.3M 71 17.3M 0 0 905k 0 0:00:27 0:00:19 0:00:08 988k 75 24.3M 75 18.2M 0 0 905k 0 0:00:27 0:00:20 0:00:07 968k 79 24.3M 79 19.2M 0 0 910k 0 0:00:27 0:00:21 0:00:06 968k 83 24.3M 83 20.2M 0 0 915k 0 0:00:27 0:00:22 0:00:05 998k 87 24.3M 87 21.1M 0 0 916k 0 0:00:27 0:00:23 0:00:04 976k 91 24.3M 91 22.1M 0 0 921k 0 0:00:27 0:00:24 0:00:03 983k 95 24.3M 95 23.1M 0 0 923k 0 0:00:26 0:00:25 0:00:01 996k 99 24.3M 99 24.1M 0 0 926k 0 0:00:26 0:00:26 --:--:-- 994k 100 24.3M 100 24.3M 0 0 926k 0 0:00:26 0:00:26 --:--:-- 981k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 24.3M 1 280k 0 0 666k 0 0:00:37 --:--:-- 0:00:37 666k 4 24.3M 4 1077k 0 0 755k 0 0:00:32 0:00:01 0:00:31 755k 7 24.3M 7 1767k 0 0 729k 0 0:00:34 0:00:02 0:00:32 729k 10 24.3M 10 2703k 0 0 786k 0 0:00:31 0:00:03 0:00:28 786k 14 24.3M 14 3537k 0 0 800k 0 0:00:31 0:00:04 0:00:27 799k 18 24.3M 18 4676k 0 0 862k 0 0:00:28 0:00:05 0:00:23 879k 23 24.3M 23 5888k 0 0 916k 0 0:00:27 0:00:06 0:00:21 962k 28 24.3M 28 7113k 0 0 958k 0 0:00:25 0:00:07 0:00:18 1069k 32 24.3M 32 8148k 0 0 967k 0 0:00:25 0:00:08 0:00:17 1092k 36 24.3M 36 9056k 0 0 961k 0 0:00:25 0:00:09 0:00:16 1103k 40 24.3M 40 9.7M 0 0 962k 0 0:00:25 0:00:10 0:00:15 1070k 44 24.3M 44 10.8M 0 0 971k 0 0:00:25 0:00:11 0:00:14 1042k 48 24.3M 48 11.7M 0 0 965k 0 0:00:25 0:00:12 0:00:13 976k 52 24.3M 52 12.6M 0 0 968k 0 0:00:25 0:00:13 0:00:12 969k 56 24.3M 56 13.6M 0 0 971k 0 0:00:25 0:00:14 0:00:11 991k 59 24.3M 59 14.5M 0 0 963k 0 0:00:25 0:00:15 0:00:10 964k 62 24.3M 62 15.2M 0 0 953k 0 0:00:26 0:00:16 0:00:10 911k 67 24.3M 67 16.3M 0 0 962k 0 0:00:25 0:00:17 0:00:08 953k 71 24.3M 71 17.3M 0 0 964k 0 0:00:25 0:00:18 0:00:07 952k 75 24.3M 75 18.2M 0 0 963k 0 0:00:25 0:00:19 0:00:06 940k 79 24.3M 79 19.2M 0 0 965k 0 0:00:25 0:00:20 0:00:05 972k 83 24.3M 83 20.2M 0 0 968k 0 0:00:25 0:00:21 0:00:04 1018k 86 24.3M 86 21.1M 0 0 965k 0 0:00:25 0:00:22 0:00:03 976k 90 24.3M 90 22.0M 0 0 963k 0 0:00:25 0:00:23 0:00:02 959k 94 24.3M 94 22.8M 0 0 958k 0 0:00:25 0:00:24 0:00:01 940k 97 24.3M 97 23.7M 0 0 957k 0 0:00:25 0:00:25 --:--:-- 925k 100 24.3M 100 24.3M 0 0 960k 0 0:00:25 0:00:25 --:--:-- 918k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 66 725k 66 483k 0 0 683k 0 0:00:01 --:--:-- 0:00:01 682k 100 725k 100 725k 0 0 768k 0 --:--:-- --:--:-- --:--:-- 767k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 42 725k 42 307k 0 0 710k 0 0:00:01 --:--:-- 0:00:01 710k 100 725k 100 725k 0 0 701k 0 0:00:01 0:00:01 --:--:-- 702k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 202k 100 202k 0 0 516k 0 --:--:-- --:--:-- --:--:-- 517k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 95 202k 95 194k 0 0 485k 0 --:--:-- --:--:-- --:--:-- 485k 100 202k 100 202k 0 0 500k 0 --:--:-- --:--:-- --:--:-- 499k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 35 417k 35 150k 0 0 431k 0 --:--:-- --:--:-- --:--:-- 431k 100 417k 100 417k 0 0 582k 0 --:--:-- --:--:-- --:--:-- 581k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 417k 100 417k 0 0 603k 0 --:--:-- --:--:-- --:--:-- 603k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 6 5615k 6 379k 0 0 677k 0 0:00:08 --:--:-- 0:00:08 676k 22 5615k 22 1266k 0 0 810k 0 0:00:06 0:00:01 0:00:05 809k 40 5615k 40 2298k 0 0 898k 0 0:00:06 0:00:02 0:00:04 898k 57 5615k 57 3241k 0 0 910k 0 0:00:06 0:00:03 0:00:03 910k 74 5615k 74 4199k 0 0 921k 0 0:00:06 0:00:04 0:00:02 921k 92 5615k 92 5182k 0 0 932k 0 0:00:06 0:00:05 0:00:01 960k 100 5615k 100 5615k 0 0 923k 0 0:00:06 0:00:06 --:--:-- 962k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 5615k 2 138k 0 0 512k 0 0:00:10 --:--:-- 0:00:10 511k 21 5615k 21 1186k 0 0 934k 0 0:00:06 0:00:01 0:00:05 934k 34 5615k 34 1939k 0 0 854k 0 0:00:06 0:00:02 0:00:04 854k 49 5615k 49 2777k 0 0 849k 0 0:00:06 0:00:03 0:00:03 849k 63 5615k 63 3590k 0 0 840k 0 0:00:06 0:00:04 0:00:02 840k 79 5615k 79 4474k 0 0 848k 0 0:00:06 0:00:05 0:00:01 867k 98 5615k 98 5522k 0 0 880k 0 0:00:06 0:00:06 --:--:-- 867k 100 5615k 100 5615k 0 0 877k 0 0:00:06 0:00:06 --:--:-- 889k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 23 1152k 23 274k 0 0 641k 0 0:00:01 --:--:-- 0:00:01 640k 100 1152k 100 1152k 0 0 833k 0 0:00:01 0:00:01 --:--:-- 834k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 47 1152k 47 552k 0 0 654k 0 0:00:01 --:--:-- 0:00:01 654k 100 1152k 100 1152k 0 0 669k 0 0:00:01 0:00:01 --:--:-- 669k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 64 1363k 64 885k 0 0 868k 0 0:00:01 0:00:01 --:--:-- 868k 100 1363k 100 1363k 0 0 907k 0 0:00:01 0:00:01 --:--:-- 907k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 1363k 1 15726 0 0 133k 0 0:00:10 --:--:-- 0:00:10 132k 50 1363k 50 694k 0 0 622k 0 0:00:02 0:00:01 0:00:01 622k 100 1363k 100 1363k 0 0 711k 0 0:00:01 0:00:01 --:--:-- 711k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 13 2869k 13 388k 0 0 799k 0 0:00:03 --:--:-- 0:00:03 798k 45 2869k 45 1307k 0 0 877k 0 0:00:03 0:00:01 0:00:02 877k 78 2869k 78 2251k 0 0 904k 0 0:00:03 0:00:02 0:00:01 904k 100 2869k 100 2869k 0 0 917k 0 0:00:03 0:00:03 --:--:-- 917k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 2869k 1 50574 0 0 272k 0 0:00:10 --:--:-- 0:00:10 271k 32 2869k 32 928k 0 0 784k 0 0:00:03 0:00:01 0:00:02 784k 60 2869k 60 1745k 0 0 799k 0 0:00:03 0:00:02 0:00:01 799k 90 2869k 90 2600k 0 0 817k 0 0:00:03 0:00:03 --:--:-- 817k 100 2869k 100 2869k 0 0 832k 0 0:00:03 0:00:03 --:--:-- 832k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 23 744k 23 178k 0 0 558k 0 0:00:01 --:--:-- 0:00:01 557k 100 744k 100 744k 0 0 843k 0 --:--:-- --:--:-- --:--:-- 843k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 56 744k 56 422k 0 0 589k 0 0:00:01 --:--:-- 0:00:01 589k 100 744k 100 744k 0 0 650k 0 0:00:01 0:00:01 --:--:-- 651k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 206k 100 206k 0 0 554k 0 --:--:-- --:--:-- --:--:-- 556k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 206k 100 206k 0 0 437k 0 --:--:-- --:--:-- --:--:-- 438k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 26 2860k 26 761k 0 0 764k 0 0:00:03 --:--:-- 0:00:03 764k 60 2860k 60 1743k 0 0 857k 0 0:00:03 0:00:02 0:00:01 858k 93 2860k 93 2674k 0 0 894k 0 0:00:03 0:00:02 0:00:01 894k 100 2860k 100 2860k 0 0 905k 0 0:00:03 0:00:03 --:--:-- 905k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 2860k 0 1206 0 0 13919 0 0:03:30 --:--:-- 0:03:30 13862 25 2860k 25 732k 0 0 680k 0 0:00:04 0:00:01 0:00:03 679k 49 2860k 49 1423k 0 0 685k 0 0:00:04 0:00:02 0:00:02 685k 79 2860k 79 2286k 0 0 743k 0 0:00:03 0:00:03 --:--:-- 743k 100 2860k 100 2860k 0 0 761k 0 0:00:03 0:00:03 --:--:-- 761k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 149k 100 149k 0 0 351k 0 --:--:-- --:--:-- --:--:-- 351k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 93 149k 93 140k 0 0 460k 0 --:--:-- --:--:-- --:--:-- 459k 100 149k 100 149k 0 0 486k 0 --:--:-- --:--:-- --:--:-- 485k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 16 976k 16 158k 0 0 484k 0 0:00:02 --:--:-- 0:00:02 483k 48 976k 48 477k 0 0 359k 0 0:00:02 0:00:01 0:00:01 359k 83 976k 83 815k 0 0 339k 0 0:00:02 0:00:02 --:--:-- 339k 100 976k 100 976k 0 0 346k 0 0:00:02 0:00:02 --:--:-- 346k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 70 976k 70 691k 0 0 699k 0 0:00:01 --:--:-- 0:00:01 698k 100 976k 100 976k 0 0 740k 0 0:00:01 0:00:01 --:--:-- 740k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 1357k 9 123k 0 0 212k 0 0:00:06 --:--:-- 0:00:06 211k 20 1357k 20 283k 0 0 176k 0 0:00:07 0:00:01 0:00:06 176k 41 1357k 41 557k 0 0 222k 0 0:00:06 0:00:02 0:00:04 222k 72 1357k 72 983k 0 0 283k 0 0:00:04 0:00:03 0:00:01 283k 100 1357k 100 1357k 0 0 324k 0 0:00:04 0:00:04 --:--:-- 324k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 33 1357k 33 456k 0 0 693k 0 0:00:01 --:--:-- 0:00:01 693k 92 1357k 92 1251k 0 0 751k 0 0:00:01 0:00:01 --:--:-- 750k 100 1357k 100 1357k 0 0 771k 0 0:00:01 0:00:01 --:--:-- 771k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 35.7M 0 15721 0 0 54621 0 0:11:26 --:--:-- 0:11:26 54586 2 35.7M 2 918k 0 0 722k 0 0:00:50 0:00:01 0:00:49 722k 5 35.7M 5 1921k 0 0 845k 0 0:00:43 0:00:02 0:00:41 845k 7 35.7M 7 2841k 0 0 868k 0 0:00:42 0:00:03 0:00:39 868k 10 35.7M 10 3819k 0 0 894k 0 0:00:40 0:00:04 0:00:36 894k 13 35.7M 13 4761k 0 0 902k 0 0:00:40 0:00:05 0:00:35 951k 15 35.7M 15 5657k 0 0 901k 0 0:00:40 0:00:06 0:00:34 946k 17 35.7M 17 6587k 0 0 904k 0 0:00:40 0:00:07 0:00:33 931k 20 35.7M 20 7414k 0 0 895k 0 0:00:40 0:00:08 0:00:32 914k 22 35.7M 22 8236k 0 0 884k 0 0:00:41 0:00:09 0:00:32 877k 24 35.7M 24 9118k 0 0 887k 0 0:00:41 0:00:10 0:00:31 871k 27 35.7M 27 9.8M 0 0 889k 0 0:00:41 0:00:11 0:00:30 874k 29 35.7M 29 10.6M 0 0 892k 0 0:00:41 0:00:12 0:00:29 875k 32 35.7M 32 11.6M 0 0 901k 0 0:00:40 0:00:13 0:00:27 909k 35 35.7M 35 12.6M 0 0 908k 0 0:00:40 0:00:14 0:00:26 951k 38 35.7M 38 13.5M 0 0 911k 0 0:00:40 0:00:15 0:00:25 960k 40 35.7M 40 14.4M 0 0 910k 0 0:00:40 0:00:16 0:00:24 960k 43 35.7M 43 15.4M 0 0 914k 0 0:00:40 0:00:17 0:00:23 969k 45 35.7M 45 16.2M 0 0 913k 0 0:00:40 0:00:18 0:00:22 944k 48 35.7M 48 17.1M 0 0 912k 0 0:00:40 0:00:19 0:00:21 924k 50 35.7M 50 17.9M 0 0 907k 0 0:00:40 0:00:20 0:00:20 894k 52 35.7M 52 18.7M 0 0 902k 0 0:00:40 0:00:21 0:00:19 877k 54 35.7M 54 19.5M 0 0 899k 0 0:00:40 0:00:22 0:00:18 847k 57 35.7M 57 20.4M 0 0 899k 0 0:00:40 0:00:23 0:00:17 851k 59 35.7M 59 21.3M 0 0 899k 0 0:00:40 0:00:24 0:00:16 848k 62 35.7M 62 22.2M 0 0 900k 0 0:00:40 0:00:25 0:00:15 874k 64 35.7M 64 23.1M 0 0 902k 0 0:00:40 0:00:26 0:00:14 902k 67 35.7M 67 23.9M 0 0 899k 0 0:00:40 0:00:27 0:00:13 897k 69 35.7M 69 24.8M 0 0 901k 0 0:00:40 0:00:28 0:00:12 907k 72 35.7M 72 25.7M 0 0 900k 0 0:00:40 0:00:29 0:00:11 905k 74 35.7M 74 26.6M 0 0 902k 0 0:00:40 0:00:30 0:00:10 914k 77 35.7M 77 27.5M 0 0 903k 0 0:00:40 0:00:31 0:00:09 908k 79 35.7M 79 28.5M 0 0 904k 0 0:00:40 0:00:32 0:00:08 933k 82 35.7M 82 29.4M 0 0 905k 0 0:00:40 0:00:33 0:00:07 928k 84 35.7M 84 30.3M 0 0 905k 0 0:00:40 0:00:34 0:00:06 933k 87 35.7M 87 31.1M 0 0 905k 0 0:00:40 0:00:35 0:00:05 920k 89 35.7M 89 32.0M 0 0 904k 0 0:00:40 0:00:36 0:00:04 910k 92 35.7M 92 32.9M 0 0 904k 0 0:00:40 0:00:37 0:00:03 900k 94 35.7M 94 33.8M 0 0 905k 0 0:00:40 0:00:38 0:00:02 905k 97 35.7M 97 34.7M 0 0 907k 0 0:00:40 0:00:39 0:00:01 919k 99 35.7M 99 35.6M 0 0 907k 0 0:00:40 0:00:40 --:--:-- 921k 100 35.7M 100 35.7M 0 0 908k 0 0:00:40 0:00:40 --:--:-- 940k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 35.7M 1 666k 0 0 754k 0 0:00:48 --:--:-- 0:00:48 753k 4 35.7M 4 1519k 0 0 806k 0 0:00:45 0:00:01 0:00:44 806k 6 35.7M 6 2370k 0 0 816k 0 0:00:44 0:00:02 0:00:42 816k 9 35.7M 9 3310k 0 0 851k 0 0:00:42 0:00:03 0:00:39 851k 11 35.7M 11 4284k 0 0 877k 0 0:00:41 0:00:04 0:00:37 877k 14 35.7M 14 5253k 0 0 892k 0 0:00:41 0:00:05 0:00:36 917k 16 35.7M 16 6177k 0 0 896k 0 0:00:40 0:00:06 0:00:34 930k 19 35.7M 19 7242k 0 0 918k 0 0:00:39 0:00:07 0:00:32 977k 22 35.7M 22 8276k 0 0 931k 0 0:00:39 0:00:08 0:00:31 993k 25 35.7M 25 9310k 0 0 941k 0 0:00:38 0:00:09 0:00:29 1004k 28 35.7M 28 10.1M 0 0 949k 0 0:00:38 0:00:10 0:00:28 1017k 31 35.7M 31 11.2M 0 0 970k 0 0:00:37 0:00:11 0:00:26 1070k 34 35.7M 34 12.2M 0 0 976k 0 0:00:37 0:00:12 0:00:25 1067k 37 35.7M 37 13.3M 0 0 982k 0 0:00:37 0:00:13 0:00:24 1073k 40 35.7M 40 14.4M 0 0 991k 0 0:00:36 0:00:14 0:00:22 1089k 43 35.7M 43 15.6M 0 0 1008k 0 0:00:36 0:00:15 0:00:21 1135k 47 35.7M 47 16.9M 0 0 1025k 0 0:00:35 0:00:16 0:00:19 1157k 50 35.7M 50 18.0M 0 0 1033k 0 0:00:35 0:00:17 0:00:18 1180k 53 35.7M 53 19.1M 0 0 1036k 0 0:00:35 0:00:18 0:00:17 1184k 56 35.7M 56 20.2M 0 0 1042k 0 0:00:35 0:00:19 0:00:16 1194k 59 35.7M 59 21.2M 0 0 1042k 0 0:00:35 0:00:20 0:00:15 1151k 62 35.7M 62 22.3M 0 0 1046k 0 0:00:34 0:00:21 0:00:13 1118k 65 35.7M 65 23.5M 0 0 1052k 0 0:00:34 0:00:22 0:00:12 1118k 69 35.7M 69 24.6M 0 0 1058k 0 0:00:34 0:00:23 0:00:11 1142k 72 35.7M 72 25.7M 0 0 1059k 0 0:00:34 0:00:24 0:00:10 1129k 74 35.7M 74 26.6M 0 0 1053k 0 0:00:34 0:00:25 0:00:09 1099k 77 35.7M 77 27.7M 0 0 1055k 0 0:00:34 0:00:26 0:00:08 1095k 80 35.7M 80 28.8M 0 0 1059k 0 0:00:34 0:00:27 0:00:07 1094k 83 35.7M 83 29.9M 0 0 1061k 0 0:00:34 0:00:28 0:00:06 1076k 86 35.7M 86 31.0M 0 0 1064k 0 0:00:34 0:00:29 0:00:05 1086k 89 35.7M 89 32.0M 0 0 1061k 0 0:00:34 0:00:30 0:00:04 1102k 92 35.7M 92 32.9M 0 0 1059k 0 0:00:34 0:00:31 0:00:03 1080k 94 35.7M 94 33.9M 0 0 1055k 0 0:00:34 0:00:32 0:00:02 1034k 97 35.7M 97 34.9M 0 0 1057k 0 0:00:34 0:00:33 0:00:01 1033k 100 35.7M 100 35.7M 0 0 1058k 0 0:00:34 0:00:34 --:--:-- 1021k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 12 4475k 12 541k 0 0 627k 0 0:00:07 --:--:-- 0:00:07 627k 32 4475k 32 1446k 0 0 776k 0 0:00:05 0:00:01 0:00:04 776k 52 4475k 52 2372k 0 0 828k 0 0:00:05 0:00:02 0:00:03 828k 73 4475k 73 3296k 0 0 853k 0 0:00:05 0:00:03 0:00:02 853k 94 4475k 94 4208k 0 0 865k 0 0:00:05 0:00:04 0:00:01 865k 100 4475k 100 4475k 0 0 873k 0 0:00:05 0:00:05 --:--:-- 923k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 4475k 1 73803 0 0 324k 0 0:00:13 --:--:-- 0:00:13 323k 20 4475k 20 921k 0 0 754k 0 0:00:05 0:00:01 0:00:04 754k 39 4475k 39 1767k 0 0 794k 0 0:00:05 0:00:02 0:00:03 794k 60 4475k 60 2702k 0 0 834k 0 0:00:05 0:00:03 0:00:02 834k 77 4475k 77 3456k 0 0 815k 0 0:00:05 0:00:04 0:00:01 815k 100 4475k 100 4475k 0 0 857k 0 0:00:05 0:00:05 --:--:-- 881k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 311k 100 311k 0 0 536k 0 --:--:-- --:--:-- --:--:-- 536k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 311k 100 311k 0 0 632k 0 --:--:-- --:--:-- --:--:-- 633k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 254k 0 1205 0 0 11461 0 0:00:22 --:--:-- 0:00:22 11367 100 254k 100 254k 0 0 582k 0 --:--:-- --:--:-- --:--:-- 581k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 86 254k 86 220k 0 0 454k 0 --:--:-- --:--:-- --:--:-- 453k 100 254k 100 254k 0 0 462k 0 --:--:-- --:--:-- --:--:-- 462k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 38 1102k 38 420k 0 0 696k 0 0:00:01 --:--:-- 0:00:01 695k 100 1102k 100 1102k 0 0 799k 0 0:00:01 0:00:01 --:--:-- 800k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 72 1102k 72 803k 0 0 852k 0 0:00:01 --:--:-- 0:00:01 852k 100 1102k 100 1102k 0 0 858k 0 0:00:01 0:00:01 --:--:-- 859k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 72992 100 72992 0 0 458k 0 --:--:-- --:--:-- --:--:-- 459k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 73106 100 73106 0 0 418k 0 --:--:-- --:--:-- --:--:-- 419k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 636k 100 636k 0 0 651k 0 --:--:-- --:--:-- --:--:-- 651k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 49 636k 49 314k 0 0 713k 0 --:--:-- --:--:-- --:--:-- 713k 100 636k 100 636k 0 0 860k 0 --:--:-- --:--:-- --:--:-- 860k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 65 1077k 65 708k 0 0 705k 0 0:00:01 0:00:01 --:--:-- 705k 100 1077k 100 1077k 0 0 795k 0 0:00:01 0:00:01 --:--:-- 795k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 48 1104k 48 532k 0 0 772k 0 0:00:01 --:--:-- 0:00:01 772k 100 1104k 100 1104k 0 0 844k 0 0:00:01 0:00:01 --:--:-- 844k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 5051k 9 457k 0 0 737k 0 0:00:06 --:--:-- 0:00:06 737k 27 5051k 27 1407k 0 0 857k 0 0:00:05 0:00:01 0:00:04 856k 47 5051k 47 2374k 0 0 907k 0 0:00:05 0:00:02 0:00:03 907k 65 5051k 65 3290k 0 0 909k 0 0:00:05 0:00:03 0:00:02 909k 83 5051k 83 4232k 0 0 913k 0 0:00:05 0:00:04 0:00:01 913k 100 5051k 100 5051k 0 0 915k 0 0:00:05 0:00:05 --:--:-- 938k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 4 5348k 4 222k 0 0 604k 0 0:00:08 --:--:-- 0:00:08 604k 19 5348k 19 1061k 0 0 775k 0 0:00:06 0:00:01 0:00:05 775k 36 5348k 36 1948k 0 0 816k 0 0:00:06 0:00:02 0:00:04 816k 53 5348k 53 2864k 0 0 850k 0 0:00:06 0:00:03 0:00:03 850k 70 5348k 70 3764k 0 0 861k 0 0:00:06 0:00:04 0:00:02 861k 88 5348k 88 4711k 0 0 874k 0 0:00:06 0:00:05 0:00:01 894k 100 5348k 100 5348k 0 0 881k 0 0:00:06 0:00:06 --:--:-- 912k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 52 1613k 52 853k 0 0 813k 0 0:00:01 0:00:01 --:--:-- 813k 100 1613k 100 1613k 0 0 859k 0 0:00:01 0:00:01 --:--:-- 859k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 4 1613k 4 73803 0 0 324k 0 0:00:04 --:--:-- 0:00:04 324k 56 1613k 56 910k 0 0 744k 0 0:00:02 0:00:01 0:00:01 744k 100 1613k 100 1613k 0 0 820k 0 0:00:01 0:00:01 --:--:-- 820k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 3355k 1 49119 0 0 373k 0 0:00:08 --:--:-- 0:00:08 371k 27 3355k 27 932k 0 0 826k 0 0:00:04 0:00:01 0:00:03 826k 57 3355k 57 1936k 0 0 909k 0 0:00:03 0:00:02 0:00:01 909k 88 3355k 88 2953k 0 0 943k 0 0:00:03 0:00:03 --:--:-- 943k 100 3355k 100 3355k 0 0 937k 0 0:00:03 0:00:03 --:--:-- 937k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 3355k 3 123k 0 0 505k 0 0:00:06 --:--:-- 0:00:06 504k 24 3355k 24 826k 0 0 662k 0 0:00:05 0:00:01 0:00:04 662k 50 3355k 50 1698k 0 0 756k 0 0:00:04 0:00:02 0:00:02 756k 74 3355k 74 2489k 0 0 768k 0 0:00:04 0:00:03 0:00:01 768k 100 3355k 100 3355k 0 0 811k 0 0:00:04 0:00:04 --:--:-- 811k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 52 751k 52 393k 0 0 757k 0 --:--:-- --:--:-- --:--:-- 756k 100 751k 100 751k 0 0 843k 0 --:--:-- --:--:-- --:--:-- 842k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 751k 0 1205 0 0 12051 0 0:01:03 --:--:-- 0:01:03 12050 100 751k 100 751k 0 0 709k 0 0:00:01 0:00:01 --:--:-- 710k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 15 1878k 15 300k 0 0 500k 0 0:00:03 --:--:-- 0:00:03 500k 64 1878k 64 1209k 0 0 756k 0 0:00:02 0:00:01 0:00:01 755k 100 1878k 100 1878k 0 0 802k 0 0:00:02 0:00:02 --:--:-- 803k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 43 1878k 43 807k 0 0 796k 0 0:00:02 0:00:01 0:00:01 796k 76 1878k 76 1438k 0 0 712k 0 0:00:02 0:00:02 --:--:-- 712k 100 1878k 100 1878k 0 0 720k 0 0:00:02 0:00:02 --:--:-- 720k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 45 149k 45 69449 0 0 313k 0 --:--:-- --:--:-- --:--:-- 312k 100 149k 100 149k 0 0 512k 0 --:--:-- --:--:-- --:--:-- 510k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 149k 100 149k 0 0 492k 0 --:--:-- --:--:-- --:--:-- 493k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 110k 100 110k 0 0 524k 0 --:--:-- --:--:-- --:--:-- 526k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 110k 1 1205 0 0 13306 0 0:00:08 --:--:-- 0:00:08 13241 100 110k 100 110k 0 0 262k 0 --:--:-- --:--:-- --:--:-- 262k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 49 1142k 49 562k 0 0 833k 0 0:00:01 --:--:-- 0:00:01 832k 100 1142k 100 1142k 0 0 865k 0 0:00:01 0:00:01 --:--:-- 865k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 23 1142k 23 266k 0 0 409k 0 0:00:02 --:--:-- 0:00:02 409k 69 1142k 69 790k 0 0 457k 0 0:00:02 0:00:01 0:00:01 457k 100 1142k 100 1142k 0 0 467k 0 0:00:02 0:00:02 --:--:-- 467k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 5019k 3 191k 0 0 594k 0 0:00:08 --:--:-- 0:00:08 593k 22 5019k 22 1117k 0 0 845k 0 0:00:05 0:00:01 0:00:04 845k 41 5019k 41 2087k 0 0 900k 0 0:00:05 0:00:02 0:00:03 899k 60 5019k 60 3029k 0 0 911k 0 0:00:05 0:00:03 0:00:02 911k 79 5019k 79 3985k 0 0 922k 0 0:00:05 0:00:04 0:00:01 922k 98 5019k 98 4939k 0 0 928k 0 0:00:05 0:00:05 --:--:-- 949k 100 5019k 100 5019k 0 0 932k 0 0:00:05 0:00:05 --:--:-- 961k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 5019k 0 1206 0 0 4019 0 0:21:19 --:--:-- 0:21:19 4020 9 5019k 9 479k 0 0 399k 0 0:00:12 0:00:01 0:00:11 399k 19 5019k 19 996k 0 0 453k 0 0:00:11 0:00:02 0:00:09 453k 30 5019k 30 1525k 0 0 477k 0 0:00:10 0:00:03 0:00:07 477k 40 5019k 40 2044k 0 0 486k 0 0:00:10 0:00:04 0:00:06 486k 59 5019k 59 2970k 0 0 571k 0 0:00:08 0:00:05 0:00:03 606k 76 5019k 76 3833k 0 0 618k 0 0:00:08 0:00:06 0:00:02 671k 94 5019k 94 4754k 0 0 660k 0 0:00:07 0:00:07 --:--:-- 751k 100 5019k 100 5019k 0 0 670k 0 0:00:07 0:00:07 --:--:-- 813k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 77 847k 77 660k 0 0 708k 0 0:00:01 --:--:-- 0:00:01 707k 100 847k 100 847k 0 0 702k 0 0:00:01 0:00:01 --:--:-- 702k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 55 847k 55 466k 0 0 681k 0 0:00:01 --:--:-- 0:00:01 680k 100 847k 100 847k 0 0 777k 0 0:00:01 0:00:01 --:--:-- 777k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 34 1302k 34 453k 0 0 676k 0 0:00:01 --:--:-- 0:00:01 676k 98 1302k 98 1287k 0 0 772k 0 0:00:01 0:00:01 --:--:-- 772k 100 1302k 100 1302k 0 0 776k 0 0:00:01 0:00:01 --:--:-- 776k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 27 1302k 27 354k 0 0 607k 0 0:00:02 --:--:-- 0:00:02 607k 92 1302k 92 1202k 0 0 756k 0 0:00:01 0:00:01 --:--:-- 756k 100 1302k 100 1302k 0 0 752k 0 0:00:01 0:00:01 --:--:-- 751k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 32 2232k 32 735k 0 0 776k 0 0:00:02 --:--:-- 0:00:02 776k 78 2232k 78 1745k 0 0 896k 0 0:00:02 0:00:01 0:00:01 896k 100 2232k 100 2232k 0 0 882k 0 0:00:02 0:00:02 --:--:-- 882k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 22 2232k 22 508k 0 0 605k 0 0:00:03 --:--:-- 0:00:03 605k 56 2232k 56 1271k 0 0 689k 0 0:00:03 0:00:01 0:00:02 689k 92 2232k 92 2060k 0 0 725k 0 0:00:03 0:00:02 0:00:01 725k 100 2232k 100 2232k 0 0 725k 0 0:00:03 0:00:03 --:--:-- 726k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 6496k 3 259k 0 0 672k 0 0:00:09 --:--:-- 0:00:09 671k 17 6496k 17 1145k 0 0 827k 0 0:00:07 0:00:01 0:00:06 827k 31 6496k 31 2020k 0 0 848k 0 0:00:07 0:00:02 0:00:05 848k 46 6496k 46 3017k 0 0 891k 0 0:00:07 0:00:03 0:00:04 891k 61 6496k 61 3991k 0 0 905k 0 0:00:07 0:00:04 0:00:03 905k 75 6496k 75 4890k 0 0 904k 0 0:00:07 0:00:05 0:00:02 922k 88 6496k 88 5760k 0 0 902k 0 0:00:07 0:00:06 0:00:01 923k 100 6496k 100 6496k 0 0 896k 0 0:00:07 0:00:07 --:--:-- 919k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 6 6496k 6 453k 0 0 603k 0 0:00:10 --:--:-- 0:00:10 603k 17 6496k 17 1161k 0 0 663k 0 0:00:09 0:00:01 0:00:08 663k 29 6496k 29 1948k 0 0 708k 0 0:00:09 0:00:02 0:00:07 708k 43 6496k 43 2794k 0 0 745k 0 0:00:08 0:00:03 0:00:05 745k 56 6496k 56 3694k 0 0 777k 0 0:00:08 0:00:04 0:00:04 777k 71 6496k 71 4660k 0 0 810k 0 0:00:08 0:00:05 0:00:03 841k 87 6496k 87 5671k 0 0 839k 0 0:00:07 0:00:06 0:00:01 901k 100 6496k 100 6496k 0 0 856k 0 0:00:07 0:00:07 --:--:-- 940k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 455k 0 1205 0 0 9139 0 0:00:51 --:--:-- 0:00:51 9128 100 455k 100 455k 0 0 665k 0 --:--:-- --:--:-- --:--:-- 665k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 455k 0 1205 0 0 5822 0 0:01:20 --:--:-- 0:01:20 5821 100 455k 100 455k 0 0 450k 0 0:00:01 0:00:01 --:--:-- 450k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 33 697k 33 230k 0 0 621k 0 0:00:01 --:--:-- 0:00:01 620k 100 697k 100 697k 0 0 757k 0 --:--:-- --:--:-- --:--:-- 757k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 697k 0 1205 0 0 9335 0 0:01:16 --:--:-- 0:01:16 9269 100 697k 100 697k 0 0 698k 0 --:--:-- --:--:-- --:--:-- 698k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 100k 100 100k 0 0 319k 0 --:--:-- --:--:-- --:--:-- 320k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 15 100k 15 15725 0 0 141k 0 --:--:-- --:--:-- --:--:-- 140k 100 100k 100 100k 0 0 455k 0 --:--:-- --:--:-- --:--:-- 454k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 1073k 1 15723 0 0 168k 0 0:00:06 --:--:-- 0:00:06 166k 74 1073k 74 796k 0 0 735k 0 0:00:01 0:00:01 --:--:-- 735k 100 1073k 100 1073k 0 0 773k 0 0:00:01 0:00:01 --:--:-- 773k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 53 1073k 53 572k 0 0 653k 0 0:00:01 --:--:-- 0:00:01 653k 100 1073k 100 1073k 0 0 658k 0 0:00:01 0:00:01 --:--:-- 659k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 419k 100 419k 0 0 733k 0 --:--:-- --:--:-- --:--:-- 734k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 17 419k 17 73805 0 0 305k 0 0:00:01 --:--:-- 0:00:01 305k 100 419k 100 419k 0 0 520k 0 --:--:-- --:--:-- --:--:-- 520k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 1274k 0 1203 0 0 9098 0 0:02:23 --:--:-- 0:02:23 9113 60 1274k 60 771k 0 0 719k 0 0:00:01 0:00:01 --:--:-- 719k 100 1274k 100 1274k 0 0 775k 0 0:00:01 0:00:01 --:--:-- 774k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 17 1274k 17 226k 0 0 538k 0 0:00:02 --:--:-- 0:00:02 537k 75 1274k 75 956k 0 0 673k 0 0:00:01 0:00:01 --:--:-- 673k 100 1274k 100 1274k 0 0 683k 0 0:00:01 0:00:01 --:--:-- 682k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 39 494k 39 196k 0 0 447k 0 0:00:01 --:--:-- 0:00:01 447k 100 494k 100 494k 0 0 646k 0 --:--:-- --:--:-- --:--:-- 646k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 65 494k 65 321k 0 0 596k 0 --:--:-- --:--:-- --:--:-- 595k 100 494k 100 494k 0 0 631k 0 --:--:-- --:--:-- --:--:-- 631k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 4795k 9 442k 0 0 722k 0 0:00:06 --:--:-- 0:00:06 722k 27 4795k 27 1309k 0 0 812k 0 0:00:05 0:00:01 0:00:04 812k 46 4795k 46 2250k 0 0 861k 0 0:00:05 0:00:02 0:00:03 861k 65 4795k 65 3124k 0 0 865k 0 0:00:05 0:00:03 0:00:02 865k 85 4795k 85 4096k 0 0 885k 0 0:00:05 0:00:04 0:00:01 884k 100 4795k 100 4795k 0 0 899k 0 0:00:05 0:00:05 --:--:-- 922k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 4795k 9 437k 0 0 584k 0 0:00:08 --:--:-- 0:00:08 584k 26 4795k 26 1281k 0 0 733k 0 0:00:06 0:00:01 0:00:05 733k 44 4795k 44 2122k 0 0 773k 0 0:00:06 0:00:02 0:00:04 773k 64 4795k 64 3092k 0 0 825k 0 0:00:05 0:00:03 0:00:02 825k 85 4795k 85 4093k 0 0 862k 0 0:00:05 0:00:04 0:00:01 862k 100 4795k 100 4795k 0 0 892k 0 0:00:05 0:00:05 --:--:-- 942k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 15 863k 15 137k 0 0 580k 0 0:00:01 --:--:-- 0:00:01 579k 100 863k 100 863k 0 0 877k 0 --:--:-- --:--:-- --:--:-- 876k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 20 863k 20 172k 0 0 399k 0 0:00:02 --:--:-- 0:00:02 398k 31 863k 31 267k 0 0 188k 0 0:00:04 0:00:01 0:00:03 188k 58 863k 58 507k 0 0 215k 0 0:00:04 0:00:02 0:00:02 215k 100 863k 100 863k 0 0 312k 0 0:00:02 0:00:02 --:--:-- 312k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 1 8119k 1 125k 0 0 566k 0 0:00:14 --:--:-- 0:00:14 564k 13 8119k 13 1071k 0 0 880k 0 0:00:09 0:00:01 0:00:08 879k 25 8119k 25 2047k 0 0 923k 0 0:00:08 0:00:02 0:00:06 923k 37 8119k 37 3010k 0 0 927k 0 0:00:08 0:00:03 0:00:05 927k 48 8119k 48 3964k 0 0 940k 0 0:00:08 0:00:04 0:00:04 940k 61 8119k 61 4988k 0 0 952k 0 0:00:08 0:00:05 0:00:03 969k 73 8119k 73 5966k 0 0 959k 0 0:00:08 0:00:06 0:00:02 978k 85 8119k 85 6978k 0 0 966k 0 0:00:08 0:00:07 0:00:01 985k 97 8119k 97 7943k 0 0 966k 0 0:00:08 0:00:08 --:--:-- 991k 100 8119k 100 8119k 0 0 962k 0 0:00:08 0:00:08 --:--:-- 984k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 4 8122k 4 379k 0 0 654k 0 0:00:12 --:--:-- 0:00:12 653k 16 8122k 16 1338k 0 0 848k 0 0:00:09 0:00:01 0:00:08 848k 29 8122k 29 2366k 0 0 918k 0 0:00:08 0:00:02 0:00:06 918k 42 8122k 42 3428k 0 0 956k 0 0:00:08 0:00:03 0:00:05 956k 54 8122k 54 4455k 0 0 973k 0 0:00:08 0:00:04 0:00:04 973k 68 8122k 68 5539k 0 0 993k 0 0:00:08 0:00:05 0:00:03 1032k 82 8122k 82 6698k 0 0 1018k 0 0:00:07 0:00:06 0:00:01 1071k 97 8122k 97 7933k 0 0 1046k 0 0:00:07 0:00:07 --:--:-- 1112k 100 8122k 100 8122k 0 0 1051k 0 0:00:07 0:00:07 --:--:-- 1134k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 425k 100 425k 0 0 752k 0 --:--:-- --:--:-- --:--:-- 752k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 425k 100 425k 0 0 664k 0 --:--:-- --:--:-- --:--:-- 665k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 9464k 0 37503 0 0 304k 0 0:00:31 --:--:-- 0:00:31 302k 8 9464k 8 789k 0 0 705k 0 0:00:13 0:00:01 0:00:12 705k 18 9464k 18 1753k 0 0 827k 0 0:00:11 0:00:02 0:00:09 827k 28 9464k 28 2740k 0 0 873k 0 0:00:10 0:00:03 0:00:07 873k 39 9464k 39 3761k 0 0 913k 0 0:00:10 0:00:04 0:00:06 913k 50 9464k 50 4747k 0 0 927k 0 0:00:10 0:00:05 0:00:05 942k 60 9464k 60 5719k 0 0 934k 0 0:00:10 0:00:06 0:00:04 986k 65 9464k 65 6224k 0 0 874k 0 0:00:10 0:00:07 0:00:03 894k 69 9464k 69 6591k 0 0 803k 0 0:00:11 0:00:08 0:00:03 760k 74 9464k 74 7037k 0 0 771k 0 0:00:12 0:00:09 0:00:03 655k 79 9464k 79 7497k 0 0 740k 0 0:00:12 0:00:10 0:00:02 550k 84 9464k 84 8008k 0 0 720k 0 0:00:13 0:00:11 0:00:02 457k 90 9464k 90 8540k 0 0 704k 0 0:00:13 0:00:12 0:00:01 463k 97 9464k 97 9239k 0 0 704k 0 0:00:13 0:00:13 --:--:-- 538k 100 9464k 100 9464k 0 0 708k 0 0:00:13 0:00:13 --:--:-- 573k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 9464k 0 75255 0 0 418k 0 0:00:22 --:--:-- 0:00:22 417k 9 9464k 9 893k 0 0 756k 0 0:00:12 0:00:01 0:00:11 756k 18 9464k 18 1722k 0 0 786k 0 0:00:12 0:00:02 0:00:10 786k 27 9464k 27 2634k 0 0 828k 0 0:00:11 0:00:03 0:00:08 828k 39 9464k 39 3696k 0 0 884k 0 0:00:10 0:00:04 0:00:06 884k 49 9464k 49 4711k 0 0 907k 0 0:00:10 0:00:05 0:00:05 924k 61 9464k 61 5843k 0 0 945k 0 0:00:10 0:00:06 0:00:04 990k 74 9464k 74 7014k 0 0 968k 0 0:00:09 0:00:07 0:00:02 1047k 82 9464k 82 7852k 0 0 960k 0 0:00:09 0:00:08 0:00:01 1043k 94 9464k 94 8984k 0 0 979k 0 0:00:09 0:00:09 --:--:-- 1057k 100 9464k 100 9464k 0 0 988k 0 0:00:09 0:00:09 --:--:-- 1084k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 11 5316k 11 625k 0 0 868k 0 0:00:06 --:--:-- 0:00:06 868k 30 5316k 30 1616k 0 0 939k 0 0:00:05 0:00:01 0:00:04 939k 49 5316k 49 2613k 0 0 960k 0 0:00:05 0:00:02 0:00:03 960k 67 5316k 67 3608k 0 0 969k 0 0:00:05 0:00:03 0:00:02 969k 83 5316k 83 4422k 0 0 937k 0 0:00:05 0:00:04 0:00:01 936k 100 5316k 100 5316k 0 0 944k 0 0:00:05 0:00:05 --:--:-- 955k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 6 5316k 6 321k 0 0 564k 0 0:00:09 --:--:-- 0:00:09 564k 22 5316k 22 1180k 0 0 750k 0 0:00:07 0:00:01 0:00:06 750k 40 5316k 40 2146k 0 0 835k 0 0:00:06 0:00:02 0:00:04 834k 60 5316k 60 3217k 0 0 900k 0 0:00:05 0:00:03 0:00:02 900k 80 5316k 80 4283k 0 0 937k 0 0:00:05 0:00:04 0:00:01 937k 100 5316k 100 5316k 0 0 963k 0 0:00:05 0:00:05 --:--:-- 1009k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 17 5138k 17 917k 0 0 869k 0 0:00:05 0:00:01 0:00:04 869k 37 5138k 37 1906k 0 0 927k 0 0:00:05 0:00:02 0:00:03 927k 55 5138k 55 2852k 0 0 933k 0 0:00:05 0:00:03 0:00:02 933k 74 5138k 74 3835k 0 0 945k 0 0:00:05 0:00:04 0:00:01 945k 93 5138k 93 4796k 0 0 945k 0 0:00:05 0:00:05 --:--:-- 957k 100 5138k 100 5138k 0 0 953k 0 0:00:05 0:00:05 --:--:-- 974k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 14 5138k 14 762k 0 0 739k 0 0:00:06 0:00:01 0:00:05 739k 33 5138k 33 1738k 0 0 856k 0 0:00:05 0:00:02 0:00:03 856k 51 5138k 51 2649k 0 0 874k 0 0:00:05 0:00:03 0:00:02 874k 71 5138k 71 3656k 0 0 904k 0 0:00:05 0:00:04 0:00:01 904k 87 5138k 87 4513k 0 0 897k 0 0:00:05 0:00:05 --:--:-- 904k 100 5138k 100 5138k 0 0 911k 0 0:00:05 0:00:05 --:--:-- 949k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 29 1626k 29 487k 0 0 769k 0 0:00:02 --:--:-- 0:00:02 768k 86 1626k 86 1407k 0 0 859k 0 0:00:01 0:00:01 --:--:-- 858k 100 1626k 100 1626k 0 0 873k 0 0:00:01 0:00:01 --:--:-- 872k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 11 1626k 11 189k 0 0 517k 0 0:00:03 --:--:-- 0:00:03 517k 58 1626k 58 944k 0 0 686k 0 0:00:02 0:00:01 0:00:01 686k 100 1626k 100 1626k 0 0 738k 0 0:00:02 0:00:02 --:--:-- 738k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 350k 100 350k 0 0 795k 0 --:--:-- --:--:-- --:--:-- 796k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 10 350k 10 36053 0 0 219k 0 0:00:01 --:--:-- 0:00:01 218k 100 350k 100 350k 0 0 607k 0 --:--:-- --:--:-- --:--:-- 607k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 6 2526k 6 162k 0 0 593k 0 0:00:04 --:--:-- 0:00:04 592k 45 2526k 45 1155k 0 0 920k 0 0:00:02 0:00:01 0:00:01 920k 84 2526k 84 2143k 0 0 950k 0 0:00:02 0:00:02 --:--:-- 950k 100 2526k 100 2526k 0 0 959k 0 0:00:02 0:00:02 --:--:-- 959k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 15 2526k 15 392k 0 0 696k 0 0:00:03 --:--:-- 0:00:03 695k 51 2526k 51 1305k 0 0 833k 0 0:00:03 0:00:01 0:00:02 833k 89 2526k 89 2271k 0 0 886k 0 0:00:02 0:00:02 --:--:-- 885k 100 2526k 100 2526k 0 0 893k 0 0:00:02 0:00:02 --:--:-- 893k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 15.3M 2 444k 0 0 737k 0 0:00:21 --:--:-- 0:00:21 736k 8 15.3M 8 1392k 0 0 868k 0 0:00:18 0:00:01 0:00:17 867k 14 15.3M 14 2323k 0 0 892k 0 0:00:17 0:00:02 0:00:15 892k 20 15.3M 20 3299k 0 0 915k 0 0:00:17 0:00:03 0:00:14 915k 26 15.3M 26 4230k 0 0 918k 0 0:00:17 0:00:04 0:00:13 918k 32 15.3M 32 5186k 0 0 925k 0 0:00:17 0:00:05 0:00:12 948k 39 15.3M 39 6149k 0 0 931k 0 0:00:16 0:00:06 0:00:10 951k 44 15.3M 44 7079k 0 0 930k 0 0:00:16 0:00:07 0:00:09 950k 49 15.3M 49 7859k 0 0 913k 0 0:00:17 0:00:08 0:00:09 911k 55 15.3M 55 8798k 0 0 914k 0 0:00:17 0:00:09 0:00:08 909k 61 15.3M 61 9731k 0 0 917k 0 0:00:17 0:00:10 0:00:07 908k 68 15.3M 68 10.4M 0 0 924k 0 0:00:17 0:00:11 0:00:06 915k 74 15.3M 74 11.3M 0 0 923k 0 0:00:17 0:00:12 0:00:05 913k 80 15.3M 80 12.3M 0 0 928k 0 0:00:16 0:00:13 0:00:03 955k 86 15.3M 86 13.2M 0 0 929k 0 0:00:16 0:00:14 0:00:02 958k 91 15.3M 91 14.1M 0 0 926k 0 0:00:16 0:00:15 0:00:01 945k 97 15.3M 97 15.0M 0 0 926k 0 0:00:16 0:00:16 --:--:-- 931k 100 15.3M 100 15.3M 0 0 926k 0 0:00:16 0:00:16 --:--:-- 932k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 15.3M 2 425k 0 0 589k 0 0:00:26 --:--:-- 0:00:26 588k 8 15.3M 8 1292k 0 0 750k 0 0:00:20 0:00:01 0:00:19 750k 13 15.3M 13 2126k 0 0 777k 0 0:00:20 0:00:02 0:00:18 777k 19 15.3M 19 3038k 0 0 815k 0 0:00:19 0:00:03 0:00:16 815k 25 15.3M 25 3989k 0 0 844k 0 0:00:18 0:00:04 0:00:14 844k 31 15.3M 31 4982k 0 0 867k 0 0:00:18 0:00:05 0:00:13 908k 38 15.3M 38 5980k 0 0 889k 0 0:00:17 0:00:06 0:00:11 937k 45 15.3M 45 7191k 0 0 931k 0 0:00:16 0:00:07 0:00:09 1015k 53 15.3M 53 8341k 0 0 956k 0 0:00:16 0:00:08 0:00:08 1061k 59 15.3M 59 9390k 0 0 965k 0 0:00:16 0:00:09 0:00:07 1080k 65 15.3M 65 10.1M 0 0 967k 0 0:00:16 0:00:10 0:00:06 1081k 71 15.3M 71 11.0M 0 0 964k 0 0:00:16 0:00:11 0:00:05 1064k 78 15.3M 78 12.1M 0 0 976k 0 0:00:16 0:00:12 0:00:04 1046k 85 15.3M 85 13.1M 0 0 984k 0 0:00:15 0:00:13 0:00:02 1033k 92 15.3M 92 14.2M 0 0 989k 0 0:00:15 0:00:14 0:00:01 1036k 100 15.3M 100 15.3M 0 0 1000k 0 0:00:15 0:00:15 --:--:-- 1070k 100 15.3M 100 15.3M 0 0 1000k 0 0:00:15 0:00:15 --:--:-- 1105k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 16.0M 2 410k 0 0 767k 0 0:00:21 --:--:-- 0:00:21 766k 7 16.0M 7 1287k 0 0 838k 0 0:00:19 0:00:01 0:00:18 838k 13 16.0M 13 2200k 0 0 867k 0 0:00:19 0:00:02 0:00:17 867k 19 16.0M 19 3150k 0 0 884k 0 0:00:18 0:00:03 0:00:15 884k 24 16.0M 24 4067k 0 0 893k 0 0:00:18 0:00:04 0:00:14 893k 30 16.0M 30 4969k 0 0 897k 0 0:00:18 0:00:05 0:00:13 911k 35 16.0M 35 5931k 0 0 907k 0 0:00:18 0:00:06 0:00:12 928k 40 16.0M 40 6696k 0 0 888k 0 0:00:18 0:00:07 0:00:11 899k 46 16.0M 46 7594k 0 0 889k 0 0:00:18 0:00:08 0:00:10 893k 51 16.0M 51 8442k 0 0 885k 0 0:00:18 0:00:09 0:00:09 877k 56 16.0M 56 9354k 0 0 887k 0 0:00:18 0:00:10 0:00:08 877k 62 16.0M 62 10.0M 0 0 890k 0 0:00:18 0:00:11 0:00:07 867k 67 16.0M 67 10.8M 0 0 888k 0 0:00:18 0:00:12 0:00:06 889k 73 16.0M 73 11.7M 0 0 890k 0 0:00:18 0:00:13 0:00:05 893k 78 16.0M 78 12.6M 0 0 891k 0 0:00:18 0:00:14 0:00:04 902k 84 16.0M 84 13.5M 0 0 891k 0 0:00:18 0:00:15 0:00:03 899k 89 16.0M 89 14.3M 0 0 891k 0 0:00:18 0:00:16 0:00:02 893k 95 16.0M 95 15.3M 0 0 894k 0 0:00:18 0:00:17 0:00:01 910k 100 16.0M 100 16.0M 0 0 896k 0 0:00:18 0:00:18 --:--:-- 913k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 4 16.0M 4 715k 0 0 757k 0 0:00:21 --:--:-- 0:00:21 756k 9 16.0M 9 1572k 0 0 808k 0 0:00:20 0:00:01 0:00:19 808k 16 16.0M 16 2662k 0 0 903k 0 0:00:18 0:00:02 0:00:16 903k 21 16.0M 21 3591k 0 0 910k 0 0:00:18 0:00:03 0:00:15 909k 28 16.0M 28 4646k 0 0 939k 0 0:00:17 0:00:04 0:00:13 939k 34 16.0M 34 5734k 0 0 964k 0 0:00:17 0:00:05 0:00:12 1003k 41 16.0M 41 6916k 0 0 995k 0 0:00:16 0:00:06 0:00:10 1068k 48 16.0M 48 8073k 0 0 1016k 0 0:00:16 0:00:07 0:00:09 1082k 56 16.0M 56 9307k 0 0 1040k 0 0:00:15 0:00:08 0:00:07 1143k 63 16.0M 63 10.1M 0 0 1048k 0 0:00:15 0:00:09 0:00:06 1155k 69 16.0M 69 11.2M 0 0 1048k 0 0:00:15 0:00:10 0:00:05 1149k 76 16.0M 76 12.3M 0 0 1059k 0 0:00:15 0:00:11 0:00:04 1148k 84 16.0M 84 13.5M 0 0 1073k 0 0:00:15 0:00:12 0:00:03 1165k 90 16.0M 90 14.6M 0 0 1073k 0 0:00:15 0:00:13 0:00:02 1131k 97 16.0M 97 15.7M 0 0 1079k 0 0:00:15 0:00:14 0:00:01 1141k 100 16.0M 100 16.0M 0 0 1082k 0 0:00:15 0:00:15 --:--:-- 1168k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 46 1746k 46 816k 0 0 748k 0 0:00:02 0:00:01 0:00:01 747k 100 1746k 100 1746k 0 0 875k 0 0:00:01 0:00:01 --:--:-- 875k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 23 1746k 23 406k 0 0 586k 0 0:00:02 --:--:-- 0:00:02 586k 74 1746k 74 1298k 0 0 774k 0 0:00:02 0:00:01 0:00:01 774k 100 1746k 100 1746k 0 0 797k 0 0:00:02 0:00:02 --:--:-- 797k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 1435k 0 1203 0 0 14769 0 0:01:39 --:--:-- 0:01:39 14670 62 1435k 62 895k 0 0 830k 0 0:00:01 0:00:01 --:--:-- 830k 100 1435k 100 1435k 0 0 855k 0 0:00:01 0:00:01 --:--:-- 854k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 21 1435k 21 306k 0 0 648k 0 0:00:02 --:--:-- 0:00:02 648k 85 1435k 85 1231k 0 0 840k 0 0:00:01 0:00:01 --:--:-- 840k 100 1435k 100 1435k 0 0 861k 0 0:00:01 0:00:01 --:--:-- 861k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 14 1586k 14 235k 0 0 641k 0 0:00:02 --:--:-- 0:00:02 640k 74 1586k 74 1180k 0 0 857k 0 0:00:01 0:00:01 --:--:-- 857k 100 1586k 100 1586k 0 0 895k 0 0:00:01 0:00:01 --:--:-- 895k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 36 1586k 36 576k 0 0 733k 0 0:00:02 --:--:-- 0:00:02 732k 90 1586k 90 1427k 0 0 798k 0 0:00:01 0:00:01 --:--:-- 798k 100 1586k 100 1586k 0 0 826k 0 0:00:01 0:00:01 --:--:-- 826k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 94 475k 94 450k 0 0 808k 0 --:--:-- --:--:-- --:--:-- 809k 100 475k 100 475k 0 0 819k 0 --:--:-- --:--:-- --:--:-- 818k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 475k 100 475k 0 0 592k 0 --:--:-- --:--:-- --:--:-- 592k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 56 1486k 56 846k 0 0 889k 0 0:00:01 --:--:-- 0:00:01 888k 100 1486k 100 1486k 0 0 924k 0 0:00:01 0:00:01 --:--:-- 924k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 49 1486k 49 731k 0 0 702k 0 0:00:02 0:00:01 0:00:01 701k 100 1486k 100 1486k 0 0 804k 0 0:00:01 0:00:01 --:--:-- 803k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 9796 100 9796 0 0 121k 0 --:--:-- --:--:-- --:--:-- 122k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 9796 100 9796 0 0 129k 0 --:--:-- --:--:-- --:--:-- 131k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 38 186k 38 72353 0 0 358k 0 --:--:-- --:--:-- --:--:-- 356k 100 186k 100 186k 0 0 567k 0 --:--:-- --:--:-- --:--:-- 567k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 186k 9 18629 0 0 188k 0 --:--:-- --:--:-- --:--:-- 187k 100 186k 100 186k 0 0 650k 0 --:--:-- --:--:-- --:--:-- 650k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 96939 100 96939 0 0 488k 0 --:--:-- --:--:-- --:--:-- 490k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 96939 100 96939 0 0 407k 0 --:--:-- --:--:-- --:--:-- 408k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 3 15.7M 3 487k 0 0 759k 0 0:00:21 --:--:-- 0:00:21 759k 6 15.7M 6 1060k 0 0 641k 0 0:00:25 0:00:01 0:00:24 641k 9 15.7M 9 1552k 0 0 587k 0 0:00:27 0:00:02 0:00:25 587k 13 15.7M 13 2191k 0 0 601k 0 0:00:26 0:00:03 0:00:23 601k 18 15.7M 18 3056k 0 0 658k 0 0:00:24 0:00:04 0:00:20 658k 24 15.7M 24 4008k 0 0 710k 0 0:00:22 0:00:05 0:00:17 704k 30 15.7M 30 4965k 0 0 746k 0 0:00:21 0:00:06 0:00:15 781k 36 15.7M 36 5919k 0 0 773k 0 0:00:20 0:00:07 0:00:13 870k 42 15.7M 42 6910k 0 0 799k 0 0:00:20 0:00:08 0:00:12 943k 48 15.7M 48 7897k 0 0 819k 0 0:00:19 0:00:09 0:00:10 968k 55 15.7M 55 8877k 0 0 832k 0 0:00:19 0:00:10 0:00:09 969k 60 15.7M 60 9823k 0 0 843k 0 0:00:19 0:00:11 0:00:08 972k 67 15.7M 67 10.5M 0 0 856k 0 0:00:18 0:00:12 0:00:06 985k 73 15.7M 73 11.5M 0 0 864k 0 0:00:18 0:00:13 0:00:05 977k 78 15.7M 78 12.4M 0 0 868k 0 0:00:18 0:00:14 0:00:04 963k 84 15.7M 84 13.3M 0 0 872k 0 0:00:18 0:00:15 0:00:03 959k 90 15.7M 90 14.3M 0 0 879k 0 0:00:18 0:00:16 0:00:02 964k 96 15.7M 96 15.1M 0 0 881k 0 0:00:18 0:00:17 0:00:01 944k 100 15.7M 100 15.7M 0 0 884k 0 0:00:18 0:00:18 --:--:-- 942k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 2 15.7M 2 347k 0 0 620k 0 0:00:25 --:--:-- 0:00:25 619k 6 15.7M 6 985k 0 0 632k 0 0:00:25 0:00:01 0:00:24 632k 11 15.7M 11 1865k 0 0 727k 0 0:00:22 0:00:02 0:00:20 727k 17 15.7M 17 2868k 0 0 806k 0 0:00:20 0:00:03 0:00:17 805k 24 15.7M 24 3873k 0 0 849k 0 0:00:18 0:00:04 0:00:14 849k 31 15.7M 31 5017k 0 0 902k 0 0:00:17 0:00:05 0:00:12 934k 35 15.7M 35 5667k 0 0 861k 0 0:00:18 0:00:06 0:00:12 931k 39 15.7M 39 6357k 0 0 841k 0 0:00:19 0:00:07 0:00:12 899k 42 15.7M 42 6872k 0 0 801k 0 0:00:20 0:00:08 0:00:12 799k 45 15.7M 45 7395k 0 0 770k 0 0:00:20 0:00:09 0:00:11 699k 49 15.7M 49 7916k 0 0 745k 0 0:00:21 0:00:10 0:00:11 572k 52 15.7M 52 8497k 0 0 729k 0 0:00:22 0:00:11 0:00:11 558k 56 15.7M 56 9046k 0 0 720k 0 0:00:22 0:00:12 0:00:10 537k 62 15.7M 62 9.8M 0 0 741k 0 0:00:21 0:00:13 0:00:08 638k 69 15.7M 69 10.9M 0 0 767k 0 0:00:21 0:00:14 0:00:07 762k 76 15.7M 76 12.0M 0 0 791k 0 0:00:20 0:00:15 0:00:05 892k 83 15.7M 83 13.1M 0 0 816k 0 0:00:19 0:00:16 0:00:03 1021k 90 15.7M 90 14.2M 0 0 833k 0 0:00:19 0:00:17 0:00:02 1117k 98 15.7M 98 15.4M 0 0 852k 0 0:00:18 0:00:18 --:--:-- 1154k 100 15.7M 100 15.7M 0 0 858k 0 0:00:18 0:00:18 --:--:-- 1169k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 37 503k 37 189k 0 0 601k 0 --:--:-- --:--:-- --:--:-- 600k 100 503k 100 503k 0 0 769k 0 --:--:-- --:--:-- --:--:-- 768k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 503k 100 503k 0 0 752k 0 --:--:-- --:--:-- --:--:-- 752k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 65 617k 65 402k 0 0 642k 0 --:--:-- --:--:-- --:--:-- 641k 100 617k 100 617k 0 0 752k 0 --:--:-- --:--:-- --:--:-- 752k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 617k 100 617k 0 0 827k 0 --:--:-- --:--:-- --:--:-- 826k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 372k 100 372k 0 0 767k 0 --:--:-- --:--:-- --:--:-- 768k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 41 372k 41 154k 0 0 557k 0 --:--:-- --:--:-- --:--:-- 557k 100 372k 100 372k 0 0 786k 0 --:--:-- --:--:-- --:--:-- 786k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 24 551k 24 134k 0 0 517k 0 0:00:01 --:--:-- 0:00:01 517k 100 551k 100 551k 0 0 789k 0 --:--:-- --:--:-- --:--:-- 788k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 551k 100 551k 0 0 806k 0 --:--:-- --:--:-- --:--:-- 807k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 23150 100 23150 0 0 179k 0 --:--:-- --:--:-- --:--:-- 180k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 23150 100 23150 0 0 234k 0 --:--:-- --:--:-- --:--:-- 235k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 42 557k 42 236k 0 0 638k 0 --:--:-- --:--:-- --:--:-- 639k 100 557k 100 557k 0 0 765k 0 --:--:-- --:--:-- --:--:-- 765k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 557k 100 557k 0 0 836k 0 --:--:-- --:--:-- --:--:-- 837k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 159k 100 159k 0 0 526k 0 --:--:-- --:--:-- --:--:-- 527k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 159k 100 159k 0 0 548k 0 --:--:-- --:--:-- --:--:-- 549k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 12288 100 12288 0 0 169k 0 --:--:-- --:--:-- --:--:-- 171k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 12288 100 12288 0 0 93259 0 --:--:-- --:--:-- --:--:-- 93090 % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 5006k 0 1206 0 0 6510 0 0:13:07 --:--:-- 0:13:07 6483 19 5006k 19 990k 0 0 844k 0 0:00:05 0:00:01 0:00:04 844k 40 5006k 40 2013k 0 0 926k 0 0:00:05 0:00:02 0:00:03 926k 59 5006k 59 2984k 0 0 940k 0 0:00:05 0:00:03 0:00:02 940k 77 5006k 77 3880k 0 0 929k 0 0:00:05 0:00:04 0:00:01 929k 97 5006k 97 4890k 0 0 945k 0 0:00:05 0:00:05 --:--:-- 979k 100 5006k 100 5006k 0 0 939k 0 0:00:05 0:00:05 --:--:-- 966k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 13 5006k 13 691k 0 0 795k 0 0:00:06 --:--:-- 0:00:06 795k 33 5006k 33 1681k 0 0 899k 0 0:00:05 0:00:01 0:00:04 899k 51 5006k 51 2574k 0 0 897k 0 0:00:05 0:00:02 0:00:03 897k 70 5006k 70 3553k 0 0 915k 0 0:00:05 0:00:03 0:00:02 915k 90 5006k 90 4535k 0 0 931k 0 0:00:05 0:00:04 0:00:01 931k 100 5006k 100 5006k 0 0 947k 0 0:00:05 0:00:05 --:--:-- 977k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 72 933k 72 678k 0 0 814k 0 0:00:01 --:--:-- 0:00:01 814k 100 933k 100 933k 0 0 840k 0 0:00:01 0:00:01 --:--:-- 840k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 44 933k 44 419k 0 0 722k 0 0:00:01 --:--:-- 0:00:01 721k 100 933k 100 933k 0 0 851k 0 0:00:01 0:00:01 --:--:-- 852k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 4122k 9 403k 0 0 567k 0 0:00:07 --:--:-- 0:00:07 566k 34 4122k 34 1433k 0 0 837k 0 0:00:04 0:00:01 0:00:03 836k 61 4122k 61 2515k 0 0 927k 0 0:00:04 0:00:02 0:00:02 927k 85 4122k 85 3512k 0 0 946k 0 0:00:04 0:00:03 0:00:01 946k 100 4122k 100 4122k 0 0 959k 0 0:00:04 0:00:04 --:--:-- 959k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 9 4122k 9 374k 0 0 789k 0 0:00:05 --:--:-- 0:00:05 789k 29 4122k 29 1209k 0 0 820k 0 0:00:05 0:00:01 0:00:04 820k 51 4122k 51 2111k 0 0 853k 0 0:00:04 0:00:02 0:00:02 853k 74 4122k 74 3078k 0 0 885k 0 0:00:04 0:00:03 0:00:01 885k 100 4122k 100 4122k 0 0 922k 0 0:00:04 0:00:04 --:--:-- 922k % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed - 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 57 525k 57 303k 0 0 789k 0 --:--:-- --:--:-- --:--:-- 789k 100 525k 100 525k 0 0 874k 0 --:--:-- --:--:-- --:--:-- 874k + 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 100 525k 100 525k 0 0 763k 0 --:--:-- --:--:-- --:--:-- 763k Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/language-subtag-registry-2015-06-08.tar.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/language-subtag-registry-2015-06-08.tar.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/language-subtag-registry-2015-08-04.tar.bz2 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/language-subtag-registry-2015-08-04.tar.bz2 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/libpng-1.5.18.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/libpng-1.5.18.tar.gz differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/src/libpng-1.5.24.tar.gz and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/src/libpng-1.5.24.tar.gz differ diff -Nru libreoffice-5.0.2/svl/source/items/style.cxx libreoffice-5.0.5~rc2/svl/source/items/style.cxx --- libreoffice-5.0.2/svl/source/items/style.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svl/source/items/style.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -284,6 +284,11 @@ return *pSet; } +std::unique_ptr SfxStyleSheetBase::GetItemSetForPreview() +{ + return std::unique_ptr(new SfxItemSet(GetItemSet())); +} + /** * Set help file and ID and return it */ diff -Nru libreoffice-5.0.2/svl/source/numbers/zforlist.cxx libreoffice-5.0.5~rc2/svl/source/numbers/zforlist.cxx --- libreoffice-5.0.2/svl/source/numbers/zforlist.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svl/source/numbers/zforlist.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -718,6 +718,78 @@ } +void SvNumberFormatter::FillKeywordTableForExcel( NfKeywordTable& rKeywords ) +{ + FillKeywordTable( rKeywords, LANGUAGE_ENGLISH_US ); + + // Replace upper case "GENERAL" with proper case "General". + rKeywords[ NF_KEY_GENERAL ] = GetStandardName( LANGUAGE_ENGLISH_US ); + // Remap codes unknown to Excel. + rKeywords[ NF_KEY_NN ] = "DDD"; + rKeywords[ NF_KEY_NNN ] = "DDDD"; + // NNNN gets a separator appended in SvNumberformat::GetMappedFormatString() + rKeywords[ NF_KEY_NNNN ] = "DDDD"; + // Export the Thai T NatNum modifier. + rKeywords[ NF_KEY_THAI_T ] = "T"; +} + + +OUString SvNumberFormatter::GetFormatStringForExcel( sal_uInt32 nKey, const NfKeywordTable& rKeywords, + SvNumberFormatter& rTempFormatter ) const +{ + OUString aFormatStr; + if (const SvNumberformat* pEntry = GetEntry( nKey)) + { + if (pEntry->GetType() == css::util::NumberFormat::LOGICAL) + { + // Build Boolean number format, which needs non-zero and zero + // subformat codes with TRUE and FALSE strings. + Color* pColor = nullptr; + OUString aTemp; + const_cast< SvNumberformat* >( pEntry )->GetOutputString( 1.0, aTemp, &pColor ); + aFormatStr += "\"" + aTemp + "\";\"" + aTemp + "\";\""; + const_cast< SvNumberformat* >( pEntry )->GetOutputString( 0.0, aTemp, &pColor ); + aFormatStr += aTemp + "\""; + } + else + { + LanguageType nLang = pEntry->GetLanguage(); + if (nLang == LANGUAGE_SYSTEM) + nLang = SvtSysLocale().GetLanguageTag().getLanguageType(); + if (nLang != LANGUAGE_ENGLISH_US) + { + sal_Int32 nCheckPos; + short nType = css::util::NumberFormat::DEFINED; + sal_uInt32 nTempKey; + OUString aTemp( pEntry->GetFormatstring()); + rTempFormatter.PutandConvertEntry( aTemp, nCheckPos, nType, nTempKey, nLang, LANGUAGE_ENGLISH_US); + SAL_WARN_IF( nCheckPos != 0, "svl.numbers", + "SvNumberFormatter::GetFormatStringForExcel - format code not convertible"); + if (nTempKey != NUMBERFORMAT_ENTRY_NOT_FOUND) + pEntry = rTempFormatter.GetEntry( nTempKey); + } + + if (pEntry) + { + // GetLocaleData() returns the current locale's data, so switch + // before (which doesn't do anything if it was the same locale + // already). + rTempFormatter.ChangeIntl( LANGUAGE_ENGLISH_US); + aFormatStr = pEntry->GetMappedFormatstring( rKeywords, *rTempFormatter.GetLocaleData()); + } + } + } + else + { + SAL_WARN("svl.numbers","SvNumberFormatter::GetFormatStringForExcel - format not found: " << nKey); + } + + if (aFormatStr.isEmpty()) + aFormatStr = "General"; + return aFormatStr; +} + + OUString SvNumberFormatter::GetKeyword( LanguageType eLnge, sal_uInt16 nIndex ) { ChangeIntl(eLnge); diff -Nru libreoffice-5.0.2/svl/source/numbers/zformat.cxx libreoffice-5.0.5~rc2/svl/source/numbers/zformat.cxx --- libreoffice-5.0.2/svl/source/numbers/zformat.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svl/source/numbers/zformat.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -55,6 +55,11 @@ const sal_uInt16 UPPER_PRECISION = 300; // entirely arbitrary... const double EXP_LOWER_BOUND = 1.0E-4; // prefer scientific notation below this value. +const double EXP_ABS_UPPER_BOUND = 1.0E15; // use exponential notation above that absolute value. + // Back in time was E16 that lead + // to display rounding errors, see + // also sal/rtl/math.cxx + // doubleToString() } // namespace @@ -1717,7 +1722,7 @@ { sal_uInt16 nStandardPrec = rScan.GetStandardPrec(); - if ( fabs(fNumber) > 1.0E15 ) // #58531# was E16 + if ( fabs(fNumber) > EXP_ABS_UPPER_BOUND ) { nStandardPrec = ::std::min(nStandardPrec, static_cast(14)); // limits to 14 decimals rOutString = ::rtl::math::doubleToUString( fNumber, @@ -2110,27 +2115,40 @@ } fNumber = -fNumber; } + /* TODO: why did we insist on 10 decimals for the non-exponent + * case? doubleToUString() handles rtl_math_DecimalPlaces_Max + * gracefully when used with rtl_math_StringFormat_Automatic, + * so all that special casing and mumbo-jumbo in the else + * branch below might not be needed at all. */ + if (fNumber > EXP_ABS_UPPER_BOUND) + { + sBuff.append( ::rtl::math::doubleToUString( fNumber, + rtl_math_StringFormat_Automatic, + rtl_math_DecimalPlaces_Max, + GetFormatter().GetNumDecimalSep()[0], true)); + } + else { OUString sTemp; ImpGetOutputStdToPrecision(fNumber, sTemp, 10); // Use 10 decimals for general 'unlimited' format. sBuff.append(sTemp); - } - if (fNumber < EXP_LOWER_BOUND) - { - sal_Int32 nLen = sBuff.getLength(); - if (!nLen) + if (fNumber < EXP_LOWER_BOUND) { - return false; - } - // #i112250# With the 10-decimal limit, small numbers are formatted as "0". - // Switch to scientific in that case, too: - if (nLen > 11 || ((nLen == 1 && sBuff[0] == '0') && fNumber != 0.0)) - { - sal_uInt16 nStandardPrec = rScan.GetStandardPrec(); - nStandardPrec = ::std::min(nStandardPrec, static_cast(14)); // limits to 14 decimals - sBuff = ::rtl::math::doubleToUString( fNumber, - rtl_math_StringFormat_E2, nStandardPrec /*2*/, - GetFormatter().GetNumDecimalSep()[0], true); + sal_Int32 nLen = sBuff.getLength(); + if (!nLen) + { + return false; + } + // #i112250# With the 10-decimal limit, small numbers are formatted as "0". + // Switch to scientific in that case, too: + if (nLen > 11 || ((nLen == 1 && sBuff[0] == '0') && fNumber != 0.0)) + { + sal_uInt16 nStandardPrec = rScan.GetStandardPrec(); + nStandardPrec = ::std::min(nStandardPrec, static_cast(14)); // limits to 14 decimals + sBuff = ::rtl::math::doubleToUString( fNumber, + rtl_math_StringFormat_E2, nStandardPrec /*2*/, + GetFormatter().GetNumDecimalSep()[0], true); + } } } if (bSign) @@ -4828,6 +4846,11 @@ case NF_SYMBOLTYPE_THSEP : aStr.append( rLocWrp.getNumThousandSep() ); break; + case NF_SYMBOLTYPE_EXP : + // tdf#95677: Excel does not support exponent without sign + aStr.append( rKeywords[NF_KEY_E] ); + aStr.append( "+" ); + break; case NF_SYMBOLTYPE_DATESEP : aStr.append( rLocWrp.getDateSep() ); break; diff -Nru libreoffice-5.0.2/svtools/source/config/slidesorterbaropt.cxx libreoffice-5.0.5~rc2/svtools/source/config/slidesorterbaropt.cxx --- libreoffice-5.0.2/svtools/source/config/slidesorterbaropt.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/config/slidesorterbaropt.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -94,7 +94,27 @@ */ static Sequence< OUString > GetPropertyNames(); - protected: + void SetVisibleViewImpl( bool& bVisibleView, bool bVisible ); + + public: + void SetVisibleImpressView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleImpressView, bVisible ); } + + void SetVisibleOutlineView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleOutlineView, bVisible ); } + + void SetVisibleNotesView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleNotesView, bVisible ); } + + void SetVisibleHandoutView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleHandoutView, bVisible ); } + + void SetVisibleSlideSorterView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleSlideSorterView, bVisible ); } + + void SetVisibleDrawView( bool bVisible) + { SetVisibleViewImpl( m_bVisibleDrawView, bVisible ); } + }; SvtSlideSorterBarOptions_Impl::SvtSlideSorterBarOptions_Impl() @@ -314,6 +334,15 @@ return Sequence< OUString >( pProperties, SAL_N_ELEMENTS( pProperties ) ); } +void SvtSlideSorterBarOptions_Impl::SetVisibleViewImpl( bool& bVisibleView, bool bVisible ) +{ + if( bVisibleView != bVisible ) + { + bVisibleView = bVisible; + SetModified(); + } +} + // initialize static member, see definition for further information // DON'T DO IT IN YOUR HEADER! SvtSlideSorterBarOptions_Impl* SvtSlideSorterBarOptions::m_pDataContainer = NULL ; @@ -339,6 +368,8 @@ // If last instance was deleted we must destroy our static data container! if( m_nRefCount <= 0 ) { + if (m_pDataContainer->IsModified()) + m_pDataContainer->Commit(); delete m_pDataContainer; m_pDataContainer = NULL; } @@ -351,7 +382,7 @@ void SvtSlideSorterBarOptions::SetVisibleImpressView(bool bVisible) { - m_pDataContainer->m_bVisibleImpressView = bVisible; + m_pDataContainer->SetVisibleImpressView( bVisible ); } bool SvtSlideSorterBarOptions::GetVisibleOutlineView() const @@ -361,7 +392,7 @@ void SvtSlideSorterBarOptions::SetVisibleOutlineView(bool bVisible) { - m_pDataContainer->m_bVisibleOutlineView = bVisible; + m_pDataContainer->SetVisibleOutlineView( bVisible ); } bool SvtSlideSorterBarOptions::GetVisibleNotesView() const @@ -371,7 +402,7 @@ void SvtSlideSorterBarOptions::SetVisibleNotesView(bool bVisible) { - m_pDataContainer->m_bVisibleNotesView = bVisible; + m_pDataContainer->SetVisibleNotesView( bVisible ); } bool SvtSlideSorterBarOptions::GetVisibleHandoutView() const @@ -381,7 +412,7 @@ void SvtSlideSorterBarOptions::SetVisibleHandoutView(bool bVisible) { - m_pDataContainer->m_bVisibleHandoutView = bVisible; + m_pDataContainer->SetVisibleHandoutView( bVisible ); } bool SvtSlideSorterBarOptions::GetVisibleSlideSorterView() const @@ -391,7 +422,7 @@ void SvtSlideSorterBarOptions::SetVisibleSlideSorterView(bool bVisible) { - m_pDataContainer->m_bVisibleSlideSorterView = bVisible; + m_pDataContainer->SetVisibleSlideSorterView( bVisible ); } bool SvtSlideSorterBarOptions::GetVisibleDrawView() const @@ -401,7 +432,7 @@ void SvtSlideSorterBarOptions::SetVisibleDrawView(bool bVisible) { - m_pDataContainer->m_bVisibleDrawView = bVisible; + m_pDataContainer->SetVisibleDrawView( bVisible ); } namespace diff -Nru libreoffice-5.0.2/svtools/source/control/ctrlbox.cxx libreoffice-5.0.5~rc2/svtools/source/control/ctrlbox.cxx --- libreoffice-5.0.2/svtools/source/control/ctrlbox.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/control/ctrlbox.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1595,7 +1595,7 @@ pStr++; } } - else + else if (!aStr.isEmpty()) { if ( -1 != aStr.indexOf('%') ) { diff -Nru libreoffice-5.0.2/svtools/source/control/fmtfield.cxx libreoffice-5.0.5~rc2/svtools/source/control/fmtfield.cxx --- libreoffice-5.0.2/svtools/source/control/fmtfield.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/control/fmtfield.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -304,10 +304,10 @@ ,m_bHasMin(false) ,m_bHasMax(false) ,m_bStrictFormat(true) - ,m_bValueDirty(true) ,m_bEnableEmptyField(true) ,m_bAutoColor(false) ,m_bEnableNaN(false) + ,m_ValueState(valueDirty) ,m_dCurrentValue(0) ,m_dDefaultValue(0) ,m_nFormatKey(0) @@ -333,14 +333,14 @@ { SpinField::SetText(rStr); - m_bValueDirty = true; + m_ValueState = valueDirty; } void FormattedField::SetText( const OUString& rStr, const Selection& rNewSelection ) { SpinField::SetText( rStr, rNewSelection ); - m_bValueDirty = true; + m_ValueState = valueDirty; } void FormattedField::SetTextFormatted(const OUString& rStr) @@ -402,15 +402,15 @@ else aNewSel = aSel; // don't use the justified version SpinField::SetText(sFormatted, aNewSel); - m_bValueDirty = false; + m_ValueState = valueString; } OUString FormattedField::GetTextValue() const { - if (m_bValueDirty) + if (m_ValueState != valueString ) { const_cast(this)->m_sCurrentTextValue = GetText(); - const_cast(this)->m_bValueDirty = false; + const_cast(this)->m_ValueState = valueString; } return m_sCurrentTextValue; } @@ -444,7 +444,7 @@ if (!IsStrictFormat()) { if(makeValueDirty) - m_bValueDirty = true; + m_ValueState = valueDirty; SpinField::Modify(); return; } @@ -455,7 +455,7 @@ m_sLastValidText = sCheck; m_aLastSelection = GetSelection(); if(makeValueDirty) - m_bValueDirty = true; + m_ValueState = valueDirty; } else { @@ -518,7 +518,7 @@ SpinField::SetText(rNew, aSel); } - m_bValueDirty = true; // not always necessary, but better re-evaluate for safety reasons + m_ValueState = valueDirty; // not always necessary, but better re-evaluate for safety reasons } bool FormattedField::PreNotify(NotifyEvent& rNEvt) @@ -800,6 +800,7 @@ { ImplSetValue(m_dCurrentValue, true); Modify(); + m_ValueState = valueDouble; } else { @@ -808,8 +809,8 @@ SetTextFormatted(sNew); else SetTextFormatted(m_sDefaultText); + m_ValueState = valueString; } - m_bValueDirty = false; } } else @@ -869,7 +870,7 @@ DBG_ASSERT(ImplGetFormatter() != NULL, "FormattedField::ImplSetValue : can't set a value without a formatter !"); - m_bValueDirty = false; + m_ValueState = valueDouble; m_dCurrentValue = dVal; OUString sNewText; @@ -894,7 +895,7 @@ } ImplSetTextImpl(sNewText, NULL); - m_bValueDirty = false; + m_ValueState = valueDouble; DBG_ASSERT(CheckText(sNewText), "FormattedField::ImplSetValue : formatted string doesn't match the criteria !"); } @@ -902,7 +903,7 @@ { dNewVal = m_dCurrentValue; - if (!m_bValueDirty) + if (m_ValueState == valueDouble) return true; dNewVal = m_dDefaultValue; @@ -948,7 +949,7 @@ void FormattedField::SetValue(double dVal) { - ImplSetValue(dVal, m_bValueDirty); + ImplSetValue(dVal, m_ValueState != valueDouble); } double FormattedField::GetValue() @@ -962,7 +963,7 @@ m_dCurrentValue = m_dDefaultValue; } - m_bValueDirty = false; + m_ValueState = valueDouble; return m_dCurrentValue; } diff -Nru libreoffice-5.0.2/svtools/source/control/valueset.cxx libreoffice-5.0.5~rc2/svtools/source/control/valueset.cxx --- libreoffice-5.0.2/svtools/source/control/valueset.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/control/valueset.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1327,7 +1327,7 @@ { if (nCurPos == nLastItem) { - const size_t nCol = nLastItem % mnCols; + const size_t nCol = mnCols ? nLastItem % mnCols : 0; if (nCol < mnCurCol) { // Move to previous row/page, keeping the old column diff -Nru libreoffice-5.0.2/svtools/source/filter/DocumentToGraphicRenderer.cxx libreoffice-5.0.5~rc2/svtools/source/filter/DocumentToGraphicRenderer.cxx --- libreoffice-5.0.2/svtools/source/filter/DocumentToGraphicRenderer.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/filter/DocumentToGraphicRenderer.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -94,7 +94,8 @@ Graphic DocumentToGraphicRenderer::renderToGraphic( sal_Int32 aCurrentPage, Size aDocumentSizePixel, - Size aTargetSizePixel) + Size aTargetSizePixel, + Color aPageColor) { if (!mxModel.is() || !mxController.is() || !mxRenderable.is()) @@ -127,6 +128,12 @@ aMtf.Record( pOutputDev ); + if (aPageColor != Color(COL_TRANSPARENT)) + { + pOutputDev->SetBackground(Wallpaper(aPageColor)); + pOutputDev->Erase(); + } + uno::Any aSelection; aSelection <<= mxDocument; mxRenderable->render(aCurrentPage - 1, aSelection, renderProps ); diff -Nru libreoffice-5.0.2/svtools/source/svrtf/parrtf.cxx libreoffice-5.0.5~rc2/svtools/source/svrtf/parrtf.cxx --- libreoffice-5.0.2/svtools/source/svrtf/parrtf.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svtools/source/svrtf/parrtf.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -431,6 +431,24 @@ aToken = sSave; bRTF_InTextRead = false; } + else if ( 'c' == nNextCh ) + { + // Prevent text breaking into multiple tokens. + rInput.SeekRel( 2 ); + nNextCh = GetNextChar(); + if (RTF_ISDIGIT( nNextCh )) + { + sal_uInt8 nNewOverread = 0 ; + do { + nNewOverread *= 10; + nNewOverread += nNextCh - '0'; + nNextCh = GetNextChar(); + } while ( RTF_ISDIGIT( nNextCh ) ); + nUCharOverread = nNewOverread; + aParserStates.top().nUCharOverread = nNewOverread; + } + bNextCh = 0x20 == nNextCh; + } else { nNextCh = '\\'; @@ -448,8 +466,7 @@ } break; - case sal_Unicode(EOF): - eState = SVPAR_ERROR; + case sal_Unicode(EOF): eState = SVPAR_ERROR; // continue case '{': case '}': diff -Nru libreoffice-5.0.2/svx/sdi/svx.sdi libreoffice-5.0.5~rc2/svx/sdi/svx.sdi --- libreoffice-5.0.2/svx/sdi/svx.sdi 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/sdi/svx.sdi 2016-02-04 16:41:28.000000000 +0000 @@ -4002,10 +4002,10 @@ Asynchron; /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, + AccelConfig = TRUE, + MenuConfig = TRUE, StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, + ToolBoxConfig = TRUE, GroupId = GID_FORMAT; ] diff -Nru libreoffice-5.0.2/svx/source/dialog/charmap.cxx libreoffice-5.0.5~rc2/svx/source/dialog/charmap.cxx --- libreoffice-5.0.2/svx/source/dialog/charmap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/dialog/charmap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1574,6 +1574,32 @@ aAllSubsets.push_back( Subset( 0x118A0, 0x118FF, RID_SUBSETSTR_WARANG_CITI ) ); break; #endif +#if U_ICU_VERSION_MAJOR_NUM >= 56 + /* FIXME: add RID_... to include/svx/ucsubset.hrc and + * strings to svx/source/dialog/ucsubset.src and Unicode + * block ranges to aAllSubsets, for now this only + * compiles.. */ + case UBLOCK_AHOM: + break; + case UBLOCK_ANATOLIAN_HIEROGLYPHS: + break; + case UBLOCK_CHEROKEE_SUPPLEMENT: + break; + case UBLOCK_CJK_UNIFIED_IDEOGRAPHS_EXTENSION_E: + break; + case UBLOCK_EARLY_DYNASTIC_CUNEIFORM: + break; + case UBLOCK_HATRAN: + break; + case UBLOCK_MULTANI: + break; + case UBLOCK_OLD_HUNGARIAN: + break; + case UBLOCK_SUPPLEMENTAL_SYMBOLS_AND_PICTOGRAPHS: + break; + case UBLOCK_SUTTON_SIGNWRITING: + break; +#endif } diff -Nru libreoffice-5.0.2/svx/source/dialog/imapdlg.cxx libreoffice-5.0.5~rc2/svx/source/dialog/imapdlg.cxx --- libreoffice-5.0.2/svx/source/dialog/imapdlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/dialog/imapdlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -184,7 +184,7 @@ m_pEdtText->SetModifyHdl( LINK( this, SvxIMapDlg, URLModifyHdl ) ); m_pCbbTarget->SetLoseFocusHdl( LINK( this, SvxIMapDlg, URLLoseFocusHdl ) ); - SvtMiscOptions aMiscOptions; + SvtMiscOptions aMiscOptions; aMiscOptions.AddListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) ); m_pTbxIMapDlg1->SetSelectHdl( LINK( this, SvxIMapDlg, TbxClickHdl ) ); @@ -220,6 +220,9 @@ void SvxIMapDlg::dispose() { + SvtMiscOptions aMiscOptions; + aMiscOptions.RemoveListenerLink( LINK( this, SvxIMapDlg, MiscHdl ) ); + // Delete URL-List pIMapWnd.disposeAndClear(); DELETEZ( pOwnData ); @@ -776,9 +779,11 @@ IMPL_LINK_NOARG(SvxIMapDlg, MiscHdl) { - SvtMiscOptions aMiscOptions; - m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); - + if (m_pTbxIMapDlg1) + { + SvtMiscOptions aMiscOptions; + m_pTbxIMapDlg1->SetOutStyle( aMiscOptions.GetToolboxStyle() ); + } return 0L; } diff -Nru libreoffice-5.0.2/svx/source/fmcomp/fmgridif.cxx libreoffice-5.0.5~rc2/svx/source/fmcomp/fmgridif.cxx --- libreoffice-5.0.2/svx/source/fmcomp/fmgridif.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/fmcomp/fmgridif.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1693,6 +1693,8 @@ static_cast(pWin)->SetDesignMode(bOn); } + setVisible(!bOn); + if (bOn) DisConnectFromDispatcher(); else diff -Nru libreoffice-5.0.2/svx/source/fmcomp/gridcell.cxx libreoffice-5.0.5~rc2/svx/source/fmcomp/gridcell.cxx --- libreoffice-5.0.2/svx/source/fmcomp/gridcell.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/fmcomp/gridcell.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -573,6 +573,8 @@ implDoPropertyListening( FM_PROP_TEXT, false ); implDoPropertyListening( FM_PROP_EFFECTIVE_VALUE, false ); implDoPropertyListening( FM_PROP_SELECT_SEQ, false ); + implDoPropertyListening( FM_PROP_DATE, false ); + implDoPropertyListening( FM_PROP_TIME, false ); // be listener at the bound field as well try @@ -678,6 +680,8 @@ || _rEvent.PropertyName == FM_PROP_TEXT || _rEvent.PropertyName == FM_PROP_EFFECTIVE_VALUE || _rEvent.PropertyName == FM_PROP_SELECT_SEQ + || _rEvent.PropertyName == FM_PROP_DATE + || _rEvent.PropertyName == FM_PROP_TIME ) { // it was one of the known "value" properties if ( !isValuePropertyLocked() ) @@ -3255,6 +3259,7 @@ Reference< ::com::sun::star::awt::XControlModel > FmXGridCell::getModel() throw( ::com::sun::star::uno::RuntimeException, std::exception ) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); return Reference< ::com::sun::star::awt::XControlModel > (m_pColumn->getModel(), UNO_QUERY); } @@ -3262,12 +3267,14 @@ sal_Bool FmXGridCell::getLock() throw( RuntimeException, std::exception ) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); return m_pColumn->isLocked(); } void FmXGridCell::setLock(sal_Bool _bLock) throw( RuntimeException, std::exception ) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); if (getLock() == _bLock) return; else @@ -3322,60 +3329,70 @@ void SAL_CALL FmXGridCell::addWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aWindowListeners.addInterface( _rxListener ); } void SAL_CALL FmXGridCell::removeWindowListener( const Reference< awt::XWindowListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aWindowListeners.removeInterface( _rxListener ); } void SAL_CALL FmXGridCell::addFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.addInterface( _rxListener ); } void SAL_CALL FmXGridCell::removeFocusListener( const Reference< awt::XFocusListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.removeInterface( _rxListener ); } void SAL_CALL FmXGridCell::addKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aKeyListeners.addInterface( _rxListener ); } void SAL_CALL FmXGridCell::removeKeyListener( const Reference< awt::XKeyListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aKeyListeners.removeInterface( _rxListener ); } void SAL_CALL FmXGridCell::addMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseListeners.addInterface( _rxListener ); } void SAL_CALL FmXGridCell::removeMouseListener( const Reference< awt::XMouseListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseListeners.removeInterface( _rxListener ); } void SAL_CALL FmXGridCell::addMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseMotionListeners.addInterface( _rxListener ); } void SAL_CALL FmXGridCell::removeMouseMotionListener( const Reference< awt::XMouseMotionListener >& _rxListener ) throw (RuntimeException, std::exception) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aMouseMotionListeners.removeInterface( _rxListener ); } @@ -3405,12 +3422,14 @@ void FmXGridCell::onFocusGained( const awt::FocusEvent& _rEvent ) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.notifyEach( &awt::XFocusListener::focusGained, _rEvent ); } void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) { + checkDisposed(OComponentHelper::rBHelper.bDisposed); m_aFocusListeners.notifyEach( &awt::XFocusListener::focusLost, _rEvent ); } diff -Nru libreoffice-5.0.2/svx/source/form/filtnav.cxx libreoffice-5.0.5~rc2/svx/source/form/filtnav.cxx --- libreoffice-5.0.2/svx/source/form/filtnav.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/form/filtnav.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -156,14 +156,8 @@ Image FmFormItem::GetImage() const { - static Image aImage; - - if (!aImage) - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FORM ); - } - return aImage; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + return aNavigatorImages.GetImage( RID_SVXIMG_FORM ); } @@ -187,14 +181,8 @@ Image FmFilterItems::GetImage() const { - static Image aImage; - - if (!aImage) - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FILTER ); - } - return aImage; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + return aNavigatorImages.GetImage( RID_SVXIMG_FILTER ); } @@ -213,14 +201,8 @@ Image FmFilterItem::GetImage() const { - static Image aImage; - - if (!aImage) - { - ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); - aImage = aNavigatorImages.GetImage( RID_SVXIMG_FIELD ); - } - return aImage; + ImageList aNavigatorImages( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); + return aNavigatorImages.GetImage( RID_SVXIMG_FIELD ); } diff -Nru libreoffice-5.0.2/svx/source/form/fmshell.cxx libreoffice-5.0.5~rc2/svx/source/form/fmshell.cxx --- libreoffice-5.0.2/svx/source/form/fmshell.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/form/fmshell.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -276,6 +276,8 @@ { case RET_NO: bModified = false; + // fallthrough to next case + case RET_YES: GetImpl()->didPrepareClose( true ); break; diff -Nru libreoffice-5.0.2/svx/source/gallery2/galctrl.cxx libreoffice-5.0.5~rc2/svx/source/gallery2/galctrl.cxx --- libreoffice-5.0.2/svx/source/gallery2/galctrl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/gallery2/galctrl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -257,23 +257,13 @@ void drawTransparenceBackground(vcl::RenderContext& rOut, const Point& rPos, const Size& rSize) { - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - if (rStyleSettings.GetPreviewUsesCheckeredBackground()) - { - // draw checkered background - static const sal_uInt32 nLen(8); - static const Color aW(COL_WHITE); - static const Color aG(0xef, 0xef, 0xef); + // draw checkered background + static const sal_uInt32 nLen(8); + static const Color aW(COL_WHITE); + static const Color aG(0xef, 0xef, 0xef); - rOut.DrawCheckered(rPos, rSize, nLen, aW, aG); - } - else - { - rOut.SetLineColor(); - rOut.SetFillColor(rStyleSettings.GetFieldColor()); - rOut.DrawRect(Rectangle(rPos, rSize)); - } + rOut.DrawCheckered(rPos, rSize, nLen, aW, aG); } GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ) : diff -Nru libreoffice-5.0.2/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx libreoffice-5.0.5~rc2/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx --- libreoffice-5.0.2/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/sdr/contact/viewcontactofsdrpathobj.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -91,15 +91,17 @@ if(bIsLine) { const SdrPage* pPage = GetPathObj().GetPage(); - if (pPage) + double fPageWidth = pPage ? pPage->GetWdt() : 0.0; + double fPageHeight = pPage ? pPage->GetHgt() : 0.0; + if (fPageWidth && fPageHeight) { //tdf#63955 if we have an extremely long line then clip it //to a very generous range of -1 page width/height vs +1 //page width/height to avoid oom and massive churn //generating a huge polygon chain to cover the length in //applyLineDashing if this line is dashed - double fPageWidth = pPage->GetWdt(); - double fPageHeight = pPage->GetHgt(); + //tdf#97276 don't clip if the underlying page dimension + //is unknown basegfx::B2DRange aClipRange(-fPageWidth, -fPageHeight, fPageWidth*2, fPageHeight*2); aUnitPolyPolygon = basegfx::tools::clipPolyPolygonOnRange(aUnitPolyPolygon, diff -Nru libreoffice-5.0.2/svx/source/sidebar/possize/PosSizePropertyPanel.cxx libreoffice-5.0.5~rc2/svx/source/sidebar/possize/PosSizePropertyPanel.cxx --- libreoffice-5.0.2/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1181,12 +1181,15 @@ void PosSizePropertyPanel::SetPosXYMinMax() { + SdrPageView* pPV = mpView->GetSdrPageView(); + if (!pPV) + return; Rectangle aTmpRect(mpView->GetAllMarkedRect()); - mpView->GetSdrPageView()->LogicToPagePos(aTmpRect); + pPV->LogicToPagePos(aTmpRect); maRect = basegfx::B2DRange(aTmpRect.Left(), aTmpRect.Top(), aTmpRect.Right(), aTmpRect.Bottom()); Rectangle aTmpRect2(mpView->GetWorkArea()); - mpView->GetSdrPageView()->LogicToPagePos(aTmpRect2); + pPV->LogicToPagePos(aTmpRect2); maWorkArea = basegfx::B2DRange(aTmpRect2.Left(), aTmpRect2.Top(), aTmpRect2.Right(), aTmpRect2.Bottom()); const Fraction aUIScale(mpView->GetModel()->GetUIScale()); diff -Nru libreoffice-5.0.2/svx/source/stbctrls/stbctrls.src libreoffice-5.0.5~rc2/svx/source/stbctrls/stbctrls.src --- libreoffice-5.0.2/svx/source/stbctrls/stbctrls.src 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/stbctrls/stbctrls.src 2016-02-04 16:41:28.000000000 +0000 @@ -126,11 +126,6 @@ Text [ en-US ] = "Zoom level. Right-click to change zoom level or click to open Zoom dialog."; }; -String RID_SVXSTR_ZOOM -{ - Text [ en-US ] = "Adjust zoom level"; -}; - String RID_SVXSTR_ZOOM_IN { Text [ en-US ] = "Zoom In"; diff -Nru libreoffice-5.0.2/svx/source/stbctrls/zoomsliderctrl.cxx libreoffice-5.0.5~rc2/svx/source/stbctrls/zoomsliderctrl.cxx --- libreoffice-5.0.2/svx/source/stbctrls/zoomsliderctrl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/stbctrls/zoomsliderctrl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -390,7 +390,8 @@ nXDiff <= aControlRect.GetWidth() - nSliderXOffset + nButtonRightOffset ) GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM_IN)); else - GetStatusBar().SetQuickHelpText(GetId(), SVX_RESSTR(RID_SVXSTR_ZOOM)); + // don't hide the slider and its handle with a tooltip during zooming + GetStatusBar().SetQuickHelpText(GetId(), ""); return true; } diff -Nru libreoffice-5.0.2/svx/source/styles/CommonStylePreviewRenderer.cxx libreoffice-5.0.5~rc2/svx/source/styles/CommonStylePreviewRenderer.cxx --- libreoffice-5.0.2/svx/source/styles/CommonStylePreviewRenderer.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/styles/CommonStylePreviewRenderer.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -47,7 +47,7 @@ const SfxObjectShell& rShell, OutputDevice& rOutputDev, SfxStyleSheetBase* pStyle, long nMaxHeight) : StylePreviewRenderer(rShell, rOutputDev, pStyle, nMaxHeight) - , maFont() + , m_pFont() , maFontColor(COL_AUTO) , maBackgroundColor(COL_AUTO) , maPixelSize() @@ -60,65 +60,69 @@ bool CommonStylePreviewRenderer::recalculate() { - const SfxItemSet& aItemSet = mpStyle->GetItemSet(); + m_pFont.reset(); - maFont = SvxFont(); + std::unique_ptr pItemSet(mpStyle->GetItemSetForPreview()); + + if (!pItemSet) return false; + + std::unique_ptr pFont(new SvxFont); const SfxPoolItem* pItem; - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_WEIGHT)) != nullptr) { - maFont.SetWeight(static_cast(pItem)->GetWeight()); + pFont->SetWeight(static_cast(pItem)->GetWeight()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_POSTURE)) != nullptr) { - maFont.SetItalic(static_cast(pItem)->GetPosture()); + pFont->SetItalic(static_cast(pItem)->GetPosture()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_CONTOUR)) != nullptr) { - maFont.SetOutline(static_cast< const SvxContourItem*>(pItem)->GetValue()); + pFont->SetOutline(static_cast< const SvxContourItem*>(pItem)->GetValue()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_SHADOWED)) != nullptr) { - maFont.SetShadow(static_cast(pItem)->GetValue()); + pFont->SetShadow(static_cast(pItem)->GetValue()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_RELIEF)) != nullptr) { - maFont.SetRelief(static_cast(static_cast(pItem)->GetValue())); + pFont->SetRelief(static_cast(static_cast(pItem)->GetValue())); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_UNDERLINE)) != nullptr) { - maFont.SetUnderline(static_cast< const SvxUnderlineItem*>(pItem)->GetLineStyle()); + pFont->SetUnderline(static_cast< const SvxUnderlineItem*>(pItem)->GetLineStyle()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_OVERLINE)) != nullptr) { - maFont.SetOverline(static_cast(static_cast(pItem)->GetValue())); + pFont->SetOverline(static_cast(static_cast(pItem)->GetValue())); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_STRIKEOUT)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_STRIKEOUT)) != nullptr) { - maFont.SetStrikeout(static_cast(pItem)->GetStrikeout()); + pFont->SetStrikeout(static_cast(pItem)->GetStrikeout()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_CASEMAP)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_CASEMAP)) != nullptr) { - maFont.SetCaseMap(static_cast(pItem)->GetCaseMap()); + pFont->SetCaseMap(static_cast(pItem)->GetCaseMap()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_EMPHASISMARK)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_EMPHASISMARK)) != nullptr) { - maFont.SetEmphasisMark(static_cast(pItem)->GetEmphasisMark()); + pFont->SetEmphasisMark(static_cast(pItem)->GetEmphasisMark()); } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_COLOR)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_COLOR)) != nullptr) { maFontColor = Color(static_cast(pItem)->GetValue()); } if (mpStyle->GetFamily() == SFX_STYLE_FAMILY_PARA) { - if ((pItem = aItemSet.GetItem(XATTR_FILLSTYLE)) != nullptr) + if ((pItem = pItemSet->GetItem(XATTR_FILLSTYLE)) != nullptr) { sal_uInt16 aFillStyle = static_cast(pItem)->GetValue(); if (aFillStyle == drawing::FillStyle_SOLID) { - if ((pItem = aItemSet.GetItem(XATTR_FILLCOLOR)) != nullptr) + if ((pItem = pItemSet->GetItem(XATTR_FILLCOLOR)) != nullptr) { maBackgroundColor = Color(static_cast(pItem)->GetColorValue()); } @@ -126,27 +130,27 @@ } } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_FONT)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_FONT)) != nullptr) { const SvxFontItem* pFontItem = static_cast(pItem); - maFont.SetName(pFontItem->GetFamilyName()); - maFont.SetStyleName(pFontItem->GetStyleName()); + pFont->SetName(pFontItem->GetFamilyName()); + pFont->SetStyleName(pFontItem->GetStyleName()); } else { return false; } - if ((pItem = aItemSet.GetItem(SID_ATTR_CHAR_FONTHEIGHT)) != nullptr) + if ((pItem = pItemSet->GetItem(SID_ATTR_CHAR_FONTHEIGHT)) != nullptr) { const SvxFontHeightItem* pFontHeightItem = static_cast(pItem); Size aFontSize(0, pFontHeightItem->GetHeight()); maPixelSize = Size(mrOutputDev.LogicToPixel(aFontSize, mrShell.GetMapUnit())); - maFont.SetSize(maPixelSize); + pFont->SetSize(maPixelSize); vcl::Font aOldFont(mrOutputDev.GetFont()); - mrOutputDev.SetFont(maFont); + mrOutputDev.SetFont(*pFont); Rectangle aTextRect; mrOutputDev.GetTextBoundRect(aTextRect, mpStyle->GetName()); if (aTextRect.Bottom() > mnMaxHeight) @@ -154,7 +158,7 @@ double ratio = double(mnMaxHeight) / aTextRect.Bottom(); maPixelSize.Width() *= ratio; maPixelSize.Height() *= ratio; - maFont.SetSize(maPixelSize); + pFont->SetSize(maPixelSize); } mrOutputDev.SetFont(aOldFont); } @@ -163,12 +167,14 @@ return false; } + m_pFont = std::move(pFont); return true; } Size CommonStylePreviewRenderer::getRenderSize() { - maPixelSize = maFont.GetTextSize(&mrOutputDev, maStyleName); + assert(m_pFont); + maPixelSize = m_pFont->GetTextSize(&mrOutputDev, maStyleName); if (maPixelSize.Height() > mnMaxHeight) maPixelSize.Height() = mnMaxHeight; return maPixelSize; @@ -187,13 +193,18 @@ mrOutputDev.DrawRect(aRectangle); } - mrOutputDev.SetFont(maFont); + if (m_pFont) + { + mrOutputDev.SetFont(*m_pFont); + } if (maFontColor != COL_AUTO) mrOutputDev.SetTextColor(maFontColor); + Size aPixelSize((m_pFont) ? maPixelSize : mrOutputDev.GetFont().GetSize()); + Point aFontDrawPosition = aRectangle.TopLeft(); - if (aRectangle.GetHeight() > maPixelSize.Height()) - aFontDrawPosition.Y() += ( aRectangle.GetHeight() - maPixelSize.Height() ) / 2; + if (aRectangle.GetHeight() > aPixelSize.Height()) + aFontDrawPosition.Y() += (aRectangle.GetHeight() - aPixelSize.Height()) / 2; mrOutputDev.DrawText(aFontDrawPosition, maStyleName); diff -Nru libreoffice-5.0.2/svx/source/svdraw/svdhdl.cxx libreoffice-5.0.5~rc2/svx/source/svdraw/svdhdl.cxx --- libreoffice-5.0.2/svx/source/svdraw/svdhdl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/svdraw/svdhdl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2252,10 +2252,7 @@ BitmapEx SdrCropHdl::GetHandlesBitmap() { - static BitmapEx* pModernBitmap = 0; - if( pModernBitmap == 0 ) - pModernBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); - return *pModernBitmap; + return BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr())); } diff -Nru libreoffice-5.0.2/svx/source/svdraw/svdmrkv.cxx libreoffice-5.0.5~rc2/svx/source/svdraw/svdmrkv.cxx --- libreoffice-5.0.2/svx/source/svdraw/svdmrkv.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/svdraw/svdmrkv.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2007,7 +2007,9 @@ Rectangle aRect2; for (size_t nm=0; nmGetMarkedSdrObj(); + SdrObject* pO = pM->GetMarkedSdrObj(); + if (!pO) + continue; Rectangle aR1(pO->GetSnapRect()); // apply calc offset to marked object rect // ( necessary for handles to be displayed in diff -Nru libreoffice-5.0.2/svx/source/svdraw/svdotextdecomposition.cxx libreoffice-5.0.5~rc2/svx/source/svdraw/svdotextdecomposition.cxx --- libreoffice-5.0.2/svx/source/svdraw/svdotextdecomposition.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/svdraw/svdotextdecomposition.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1223,7 +1223,7 @@ void impCreateScrollTiming(const SfxItemSet& rSet, drawinglayer::animation::AnimationEntryList& rAnimList, bool bForward, double fTimeFullPath, double fFrequency) { bool bVisisbleWhenStopped(static_cast(rSet.Get(SDRATTR_TEXT_ANISTOPINSIDE)).GetValue()); - bool bVisisbleWhenStarted(static_cast(rSet.Get(SDRATTR_TEXT_ANISTOPINSIDE )).GetValue()); + bool bVisisbleWhenStarted(static_cast(rSet.Get(SDRATTR_TEXT_ANISTARTINSIDE)).GetValue()); const sal_uInt32 nRepeat(static_cast(rSet.Get(SDRATTR_TEXT_ANICOUNT)).GetValue()); if(bVisisbleWhenStarted) @@ -1262,7 +1262,7 @@ const double fStartPosition(bForward ? fRelativeTextLength : 1.0 - fRelativeTextLength); const double fEndPosition(bForward ? 1.0 - fRelativeTextLength : fRelativeTextLength); - bool bVisisbleWhenStarted(static_cast(rSet.Get(SDRATTR_TEXT_ANISTOPINSIDE )).GetValue()); + bool bVisisbleWhenStarted(static_cast(rSet.Get(SDRATTR_TEXT_ANISTARTINSIDE)).GetValue()); const sal_uInt32 nRepeat(static_cast(rSet.Get(SDRATTR_TEXT_ANICOUNT)).GetValue()); if(!bVisisbleWhenStarted) diff -Nru libreoffice-5.0.2/svx/source/svdraw/svdpntv.cxx libreoffice-5.0.5~rc2/svx/source/svdraw/svdpntv.cxx --- libreoffice-5.0.2/svx/source/svdraw/svdpntv.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/svdraw/svdpntv.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -259,12 +259,12 @@ return; } - bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer - if (bObjChg) { + { const SdrHint* pSdrHint = dynamic_cast(&rHint); if (pSdrHint) { SdrHintKind eKind=pSdrHint->GetKind(); if (eKind==HINT_OBJCHG || eKind==HINT_OBJINSERTED || eKind==HINT_OBJREMOVED) { + bool bObjChg=!bSomeObjChgdFlag; // if true, evaluate for ComeBack timer if (bObjChg) { bSomeObjChgdFlag=true; aComeBackIdle.Start(); diff -Nru libreoffice-5.0.2/svx/source/tbxctrls/fontworkgallery.cxx libreoffice-5.0.5~rc2/svx/source/tbxctrls/fontworkgallery.cxx --- libreoffice-5.0.2/svx/source/tbxctrls/fontworkgallery.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/tbxctrls/fontworkgallery.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -116,7 +116,6 @@ sal_uInt32 nModelPos; FmFormModel *pModel = NULL; - const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ ) { @@ -134,19 +133,11 @@ pVDev->SetOutputSizePixel(aSize); - if(rStyleSettings.GetPreviewUsesCheckeredBackground()) - { - static const sal_uInt32 nLen(8); - static const Color aW(COL_WHITE); - static const Color aG(0xef, 0xef, 0xef); - - pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG); - } - else - { - pVDev->SetBackground(rStyleSettings.GetFieldColor()); - pVDev->Erase(); - } + static const sal_uInt32 nLen(8); + static const Color aW(COL_WHITE); + static const Color aG(0xef, 0xef, 0xef); + + pVDev->DrawCheckered(aNull, aSize, nLen, aW, aG); pVDev->DrawBitmapEx(aNull, aThumb); maFavoritesHorizontal.push_back(pVDev->GetBitmap(aNull, aSize)); diff -Nru libreoffice-5.0.2/svx/source/tbxctrls/itemwin.cxx libreoffice-5.0.5~rc2/svx/source/tbxctrls/itemwin.cxx --- libreoffice-5.0.2/svx/source/tbxctrls/itemwin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/tbxctrls/itemwin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -419,16 +419,19 @@ { MouseNotifyEvent nType = rNEvt.GetType(); - if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) - nCurPos = GetSelectEntryPos(); - else if ( MouseNotifyEvent::LOSEFOCUS == nType - && Application::GetFocusWindow() - && !IsWindowOrChild( Application::GetFocusWindow(), true ) ) + if (!isDisposed()) { - if ( !bSelect ) - SelectEntryPos( nCurPos ); - else - bSelect = false; + if ( MouseNotifyEvent::MOUSEBUTTONDOWN == nType || MouseNotifyEvent::GETFOCUS == nType ) + nCurPos = GetSelectEntryPos(); + else if ( MouseNotifyEvent::LOSEFOCUS == nType + && Application::GetFocusWindow() + && !IsWindowOrChild( Application::GetFocusWindow(), true ) ) + { + if ( !bSelect ) + SelectEntryPos( nCurPos ); + else + bSelect = false; + } } return FillTypeLB::PreNotify( rNEvt ); @@ -440,6 +443,9 @@ { bool nHandled = FillTypeLB::Notify( rNEvt ); + if (isDisposed()) + return false; + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); diff -Nru libreoffice-5.0.2/svx/source/tbxctrls/tbcontrl.cxx libreoffice-5.0.5~rc2/svx/source/tbxctrls/tbcontrl.cxx --- libreoffice-5.0.2/svx/source/tbxctrls/tbcontrl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/tbxctrls/tbcontrl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -136,9 +136,10 @@ void SetDefaultStyle( const OUString& rDefault ) { sDefaultStyle = rDefault; } - void CalcOptimalExtraUserWidth(); - protected: + /// Calculate the optimal width of the dropdown. Very expensive operation, triggers lots of font measurement. + DECL_DLLPRIVATE_LINK( CalcOptimalExtraUserWidth, VclWindowEvent* ); + virtual void Select() SAL_OVERRIDE; private: @@ -338,6 +339,7 @@ SetOptimalSize(); EnableAutocomplete( true ); EnableUserDraw( true ); + AddEventListener(LINK(this, SvxStyleBox_Impl, CalcOptimalExtraUserWidth)); SetUserItemSize( Size( 0, ITEM_HEIGHT ) ); } @@ -348,10 +350,13 @@ void SvxStyleBox_Impl::dispose() { - for(int i = 0; i < MAX_STYLES_ENTRIES; i++) + RemoveEventListener(LINK(this, SvxStyleBox_Impl, CalcOptimalExtraUserWidth)); + + for (int i = 0; i < MAX_STYLES_ENTRIES; i++) { m_pButtons[i].disposeAndClear(); } + ComboBox::dispose(); } @@ -639,10 +644,13 @@ if (pStyle ) { - const SfxItemSet& aItemSet = pStyle->GetItemSet(); + std::unique_ptr const pItemSet(pStyle->GetItemSetForPreview()); + if (!pItemSet) return; - const SvxFontItem *pFontItem = static_cast< const SvxFontItem* >( aItemSet.GetItem( SID_ATTR_CHAR_FONT ) ); - const SvxFontHeightItem *pFontHeightItem = static_cast< const SvxFontHeightItem* >( aItemSet.GetItem( SID_ATTR_CHAR_FONTHEIGHT ) ); + const SvxFontItem * const pFontItem = + static_cast(pItemSet->GetItem(SID_ATTR_CHAR_FONT)); + const SvxFontHeightItem * const pFontHeightItem = + static_cast(pItemSet->GetItem(SID_ATTR_CHAR_FONTHEIGHT)); if ( pFontItem && pFontHeightItem ) { @@ -655,43 +663,43 @@ aFont.SetStyleName(pFontItem->GetStyleName()); aFont.SetSize(aPixelSize); - const SfxPoolItem *pItem = aItemSet.GetItem( SID_ATTR_CHAR_WEIGHT ); + const SfxPoolItem *pItem = pItemSet->GetItem( SID_ATTR_CHAR_WEIGHT ); if ( pItem ) aFont.SetWeight( static_cast< const SvxWeightItem* >( pItem )->GetWeight() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_POSTURE ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_POSTURE ); if ( pItem ) aFont.SetItalic( static_cast< const SvxPostureItem* >( pItem )->GetPosture() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_CONTOUR ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_CONTOUR ); if ( pItem ) aFont.SetOutline( static_cast< const SvxContourItem* >( pItem )->GetValue() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_SHADOWED ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_SHADOWED ); if ( pItem ) aFont.SetShadow( static_cast< const SvxShadowedItem* >( pItem )->GetValue() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_RELIEF ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_RELIEF ); if ( pItem ) aFont.SetRelief( static_cast< FontRelief >( static_cast< const SvxCharReliefItem* >( pItem )->GetValue() ) ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_UNDERLINE ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_UNDERLINE ); if ( pItem ) aFont.SetUnderline( static_cast< const SvxUnderlineItem* >( pItem )->GetLineStyle() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_OVERLINE ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_OVERLINE ); if ( pItem ) aFont.SetOverline( static_cast< FontUnderline >( static_cast< const SvxOverlineItem* >( pItem )->GetValue() ) ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_STRIKEOUT ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_STRIKEOUT ); if ( pItem ) aFont.SetStrikeout( static_cast< const SvxCrossedOutItem* >( pItem )->GetStrikeout() ); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_CASEMAP ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_CASEMAP ); if ( pItem ) aFont.SetCaseMap(static_cast(pItem)->GetCaseMap()); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_EMPHASISMARK ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_EMPHASISMARK ); if ( pItem ) aFont.SetEmphasisMark( static_cast< const SvxEmphasisMarkItem* >( pItem )->GetEmphasisMark() ); @@ -702,14 +710,14 @@ rRenderContext.SetFont(aFont); - pItem = aItemSet.GetItem( SID_ATTR_CHAR_COLOR ); + pItem = pItemSet->GetItem( SID_ATTR_CHAR_COLOR ); // text color, when nothing is selected if ( (NULL != pItem) && bIsNotSelected) aFontCol = Color( static_cast< const SvxColorItem* >( pItem )->GetValue() ); sal_uInt16 style = drawing::FillStyle_NONE; // which kind of Fill style is selected - pItem = aItemSet.GetItem( XATTR_FILLSTYLE ); + pItem = pItemSet->GetItem( XATTR_FILLSTYLE ); // only when ok and not selected if ( (NULL != pItem) && bIsNotSelected) style = static_cast< const XFillStyleItem* >( pItem )->GetValue(); @@ -719,7 +727,7 @@ case drawing::FillStyle_SOLID: { // set background color - pItem = aItemSet.GetItem( XATTR_FILLCOLOR ); + pItem = pItemSet->GetItem( XATTR_FILLCOLOR ); if ( NULL != pItem ) aBackCol = Color( static_cast< const XFillColorItem* >( pItem )->GetColorValue() ); @@ -789,8 +797,12 @@ DrawEntry( rUDEvt, false, false ); } -void SvxStyleBox_Impl::CalcOptimalExtraUserWidth() +IMPL_LINK( SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent*, event ) { + // perform the calculation only when we are opening the dropdown + if (event->GetId() != VCLEVENT_DROPDOWN_PRE_OPEN) + return 0; + long nMaxNormalFontWidth = 0; sal_Int32 nEntryCount = GetEntryCount(); for (sal_Int32 i = 0; i < nEntryCount; ++i) @@ -826,6 +838,7 @@ } SetUserItemSize(Size(nMaxUserDrawFontWidth - nMaxNormalFontWidth, ITEM_HEIGHT)); + return 0; } // test is the color between Font- and background-color to be identify @@ -1624,7 +1637,8 @@ void SvxFrameWindow_Impl::GetFocus() { - aFrameSet->GrabFocus(); + if (aFrameSet) + aFrameSet->GrabFocus(); } void SvxFrameWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) @@ -2305,8 +2319,6 @@ sal_uInt16 nLines = static_cast( std::min( pBox->GetEntryCount(), static_cast(MAX_STYLES_ENTRIES))); pBox->SetDropDownLineCount( nLines ); - - pBox->CalcOptimalExtraUserWidth(); } } } diff -Nru libreoffice-5.0.2/svx/source/xml/xmleohlp.cxx libreoffice-5.0.5~rc2/svx/source/xml/xmleohlp.cxx --- libreoffice-5.0.2/svx/source/xml/xmleohlp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/xml/xmleohlp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -444,7 +444,8 @@ // server that was used to create the object. pClassId could be used to specify the server that should // be used for the next opening, but this information seems to be out of the file format responsibility // area. - rContainer.GetEmbeddedObject( aName ); + OUString const baseURL(mpDocPersist->getDocumentBaseURL()); + rContainer.GetEmbeddedObject(aName, &baseURL); return true; } diff -Nru libreoffice-5.0.2/svx/source/xml/xmlgrhlp.cxx libreoffice-5.0.5~rc2/svx/source/xml/xmlgrhlp.cxx --- libreoffice-5.0.2/svx/source/xml/xmlgrhlp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/xml/xmlgrhlp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -533,7 +533,33 @@ xProps->setPropertyValue( "MediaType", aAny ); } - const bool bCompressed = aMimeType.isEmpty() || aMimeType == "image/tiff" || aMimeType == "image/svg+xml"; + // picture formats that actuall _do_ benefit from zip + // storage compression + // .svm pics gets compressed via ZBITMAP old-style stream + // option below + static const char* aCompressiblePics[] = + { + "image/svg+xml", + "image/x-wmf", + "image/tiff", + "image/x-eps", + "image/bmp", + "image/x-pict" + }; + + bool bCompressed = aMimeType.isEmpty(); + if( !bCompressed ) + { + for( size_t i = 0; i < SAL_N_ELEMENTS(aCompressiblePics); ++i ) + { + if( aMimeType.equalsIgnoreAsciiCaseAscii(aCompressiblePics[i]) ) + { + bCompressed = true; + break; + } + } + } + aAny <<= bCompressed; xProps->setPropertyValue( "Compressed", aAny ); diff -Nru libreoffice-5.0.2/svx/source/xoutdev/xtabcolr.cxx libreoffice-5.0.5~rc2/svx/source/xoutdev/xtabcolr.cxx --- libreoffice-5.0.2/svx/source/xoutdev/xtabcolr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/svx/source/xoutdev/xtabcolr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -36,7 +36,7 @@ XColorListRef XColorList::GetStdColorList() { - static XColorListRef aTable( CreateStdColorList() ); + XColorListRef aTable( CreateStdColorList() ); return aTable; } diff -Nru libreoffice-5.0.2/sw/inc/docstyle.hxx libreoffice-5.0.5~rc2/sw/inc/docstyle.hxx --- libreoffice-5.0.2/sw/inc/docstyle.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/docstyle.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -61,10 +61,12 @@ enum FillStyleType { FillOnlyName, FillAllInfo, - FillPhysical + FillPhysical, + FillPreview, }; - SAL_DLLPRIVATE bool FillStyleSheet( FillStyleType eFType ); + SAL_DLLPRIVATE bool FillStyleSheet(FillStyleType eFType, + std::unique_ptr * o_ppFlatSet = nullptr); protected: virtual ~SwDocStyleSheet(); @@ -99,6 +101,7 @@ const bool bResetIndentAttrsAtParagraphStyle = false ); virtual SfxItemSet& GetItemSet() SAL_OVERRIDE; + virtual std::unique_ptr GetItemSetForPreview() SAL_OVERRIDE; /** new method for paragraph styles to merge indent attributes of applied list style into the given item set, if the list style indent attributes are applicable. */ void MergeIndentAttrsOfListStyle( SfxItemSet& rSet ); diff -Nru libreoffice-5.0.2/sw/inc/IDocumentContentOperations.hxx libreoffice-5.0.5~rc2/sw/inc/IDocumentContentOperations.hxx --- libreoffice-5.0.2/sw/inc/IDocumentContentOperations.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/IDocumentContentOperations.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -79,6 +79,9 @@ The position can be in the same or in an another document. It can also be within the range! + \warning The range has to include at least two nodes or has to be a + SwDoc::IsColumnSelection! + Normally this function should work only with content nodes. But there is a special case used by SwDoc::Paste, which starts the SwPaM at the content start node. This position doesn't contain any content: diff -Nru libreoffice-5.0.2/sw/inc/IDocumentMarkAccess.hxx libreoffice-5.0.5~rc2/sw/inc/IDocumentMarkAccess.hxx --- libreoffice-5.0.2/sw/inc/IDocumentMarkAccess.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/IDocumentMarkAccess.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -77,7 +77,7 @@ */ virtual ::sw::mark::IMark* makeMark(const SwPaM& rPaM, const OUString& rProposedName, - MarkType eMark) =0; + MarkType eMark) = 0; virtual sw::mark::IFieldmark* makeFieldBookmark( const SwPaM& rPaM, const OUString& rName, diff -Nru libreoffice-5.0.2/sw/inc/IDocumentStatistics.hxx libreoffice-5.0.5~rc2/sw/inc/IDocumentStatistics.hxx --- libreoffice-5.0.2/sw/inc/IDocumentStatistics.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/IDocumentStatistics.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -31,7 +31,7 @@ /** DocInfo has changed (notify via DocShell): make required fields update. */ - virtual void DocInfoChgd() = 0; + virtual void DocInfoChgd(bool isEnableSetModified) = 0; /** Document - Statistics */ diff -Nru libreoffice-5.0.2/sw/inc/ndgrf.hxx libreoffice-5.0.5~rc2/sw/inc/ndgrf.hxx --- libreoffice-5.0.2/sw/inc/ndgrf.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/ndgrf.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -51,6 +51,7 @@ boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; + bool mbUpdateLinkInProgress; com::sun::star::uno::Reference mxInputStream; bool mbIsStreamReadOnly; @@ -198,6 +199,8 @@ boost::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;} bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;} + bool IsUpdateLinkInProgress() const { return mbUpdateLinkInProgress;} + void SetUpdateLinkInProgress(bool b) { mbUpdateLinkInProgress = b; } void TriggerAsyncRetrieveInputStream(); void ApplyInputStream( com::sun::star::uno::Reference xInputStream, diff -Nru libreoffice-5.0.2/sw/inc/ndtxt.hxx libreoffice-5.0.5~rc2/sw/inc/ndtxt.hxx --- libreoffice-5.0.2/sw/inc/ndtxt.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/inc/ndtxt.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -184,13 +184,16 @@ void DelFrms_TextNodePart(); public: + enum class WrongState { TODO, PENDING, DONE }; + bool IsWordCountDirty() const; + WrongState GetWrongDirty() const; bool IsWrongDirty() const; bool IsGrammarCheckDirty() const; bool IsSmartTagDirty() const; bool IsAutoCompleteWordDirty() const; void SetWordCountDirty( bool bNew ) const; - void SetWrongDirty( bool bNew ) const; + void SetWrongDirty(WrongState eNew) const; void SetGrammarCheckDirty( bool bNew ) const; void SetSmartTagDirty( bool bNew ) const; void SetAutoCompleteWordDirty( bool bNew ) const; diff -Nru libreoffice-5.0.2/sw/ooxmlexport_setup.mk libreoffice-5.0.5~rc2/sw/ooxmlexport_setup.mk --- libreoffice-5.0.2/sw/ooxmlexport_setup.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/ooxmlexport_setup.mk 2016-02-04 16:41:28.000000000 +0000 @@ -33,6 +33,9 @@ dbaccess/util/dba \ drawinglayer/drawinglayer \ embeddedobj/util/embobj \ + $(if $(filter-out WNT,$(OS)), \ + embeddedobj/source/msole/emboleobj \ + ) \ filter/source/config/cache/filterconfig1 \ filter/source/odfflatxml/odfflatxml \ filter/source/xmlfilterdetect/xmlfd \ @@ -45,6 +48,9 @@ package/source/xstor/xstor \ package/util/package2 \ sax/source/expatwrap/expwrap \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ sw/util/sw \ sw/util/swd \ sw/util/msword \ @@ -60,6 +66,7 @@ ucb/source/ucp/file/ucpfile1 \ unotools/util/utl \ unoxml/source/service/unoxml \ + unoxml/source/rdf/unordf \ uui/util/uui \ writerfilter/util/writerfilter \ xmloff/util/xo Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/core/data/ooxml/pass/tdf89088.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/core/data/ooxml/pass/tdf89088.docx differ diff -Nru libreoffice-5.0.2/sw/qa/core/data/rtf/pass/tdf94049.rtf libreoffice-5.0.5~rc2/sw/qa/core/data/rtf/pass/tdf94049.rtf --- libreoffice-5.0.2/sw/qa/core/data/rtf/pass/tdf94049.rtf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/core/data/rtf/pass/tdf94049.rtf 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,12 @@ +{\rtf1 +\pard\plain\par +{\object\objemb\objw608\objh774\objscalex100\objscaley100 +{\*\objdata +0105000002000000080000005061636b6167650000000000000000006000000002000050726f674d616e2e45584500140001000000633a5c646f735c617474726962200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002f00101c01050000050000000d0000004d45544146494c45504943540022040000a0faffff480400000800220460058e1f010009000003090200000200410100000000050000000b0200000000050000000c023300270010000000fb02f5ff00000000000090010000000004000022417269616c005754040000002d01000005000000090200000000050000000102ffffff0065000000410bc6008800200020000000000020002000000004002800000020000000200000000100010000000000800000000000000000000000000000000000000000000000ffffff00fffffffffffffffffc7ffe3ffbffffdff73ffceffefc1f7ffff00fffffc003ffff0001fffe0000fffe00007ffe00007ffc00007ff000000fe0000003c00000018000000000000000003ff800003ff800007ff80000fff80101fffc0101fffc0183fffe0383fffe0387ffff07c7ffff07cfffff8fcfffff9fffffffffffffffff050000000902010000000500000001020100000005000000090200000000050000000102ffffff0041010000410b4600660020002000000000002000200000000400280000002000000020000000010004000000000000020000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000c0c0c0000000ff0000ff000000ffff00ff000000ff00ff00ffff0000ffffff00000000000000000000000000000000000000000000000000000000000000000000000077700000000000000777000000000007000000000000000000007000000000700077000000000000770007000000000007000000000000000070000000000000000000008f07700000000000000000000000008f08f00000000000000000000000008f08f0808877000000000000000000ff08f08f08f0000000000000000000000ff08f008fff88770000000000000000f008008ffff80000000000000000000fffffffffff808888000000000000008fffff80008808fff8700000000000608fffff0ff8008fffff8707000000066088fffff0fffffffffff0880700000e66088fffff0fffffffff0bb07770060e666088000000000007f0bb0787776660e666000000000000000bb078787766660e6660000000000000bb08878787666660ee0000000000000700f888787866666600000000000000007f8f888780666666000000000000000008f8f8887066666600000000000000000f8f8f8880066660000000000000000000f8f8f8000666600000000000000000008f8f8f0006660000000000000000000008f8f0000066000000000000000000000f8f800000600000000000000000000000f8000000600000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000005000000090201000000050000000102010000000d000000fb020000000000000000000000000000000000010044040000002d0101000300000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000002f00101c} +} +\pard\plain\par +{\object\objemb\objw608\objh774\objscalex100\objscaley100 +{\*\objdata +0105000002000000080000005061636b6167650000000000000000006000000002000050726f674d616e2e45584500140001000000633a5c646f735c617474726962200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002f00101c01050000050000000d0000004d45544146494c45504943540022040000a0faffff480400000800220460058e1f010009000003090200000200410100000000050000000b0200000000050000000c023300270010000000fb02f5ff00000000000090010000000004000022417269616c005754040000002d01000005000000090200000000050000000102ffffff0065000000410bc6008800200020000000000020002000000004002800000020000000200000000100010000000000800000000000000000000000000000000000000000000000ffffff00fffffffffffffffffc7ffe3ffbffffdff73ffceffefc1f7ffff00fffffc003ffff0001fffe0000fffe00007ffe00007ffc00007ff000000fe0000003c00000018000000000000000003ff800003ff800007ff80000fff80101fffc0101fffc0183fffe0383fffe0387ffff07c7ffff07cfffff8fcfffff9fffffffffffffffff050000000902010000000500000001020100000005000000090200000000050000000102ffffff0041010000410b4600660020002000000000002000200000000400280000002000000020000000010004000000000000020000000000000000000000000000000000000000000000008000008000000080800080000000800080008080000080808000c0c0c0000000ff0000ff000000ffff00ff000000ff00ff00ffff0000ffffff00000000000000000000000000000000000000000000000000000000000000000000000077700000000000000777000000000007000000000000000000007000000000700077000000000000770007000000000007000000000000000070000000000000000000008f07700000000000000000000000008f08f00000000000000000000000008f08f0808877000000000000000000ff08f08f08f0000000000000000000000ff08f008fff88770000000000000000f008008ffff80000000000000000000fffffffffff808888000000000000008fffff80008808fff8700000000000608fffff0ff8008fffff8707000000066088fffff0fffffffffff0880700000e66088fffff0fffffffff0bb07770060e666088000000000007f0bb0787776660e666000000000000000bb078787766660e6660000000000000bb08878787666660ee0000000000000700f888787866666600000000000000007f8f888780666666000000000000000008f8f8887066666600000000000000000f8f8f8880066660000000000000000000f8f8f8000666600000000000000000008f8f8f0006660000000000000000000008f8f0000066000000000000000000000f8f800000600000000000000000000000f8000000600000000000000000000000800000000000000000000000000000000000000000000000000000000000000000000005000000090201000000050000000102010000000d000000fb020000000000000000000000000000000000010044040000002d0101000300000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000002f00101c} +} +} Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/core/data/ww8/pass/fdo66692-2.doc and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/core/data/ww8/pass/fdo66692-2.doc differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/core/data/ww8/pass/hang-9.doc and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/core/data/ww8/pass/hang-9.doc differ diff -Nru libreoffice-5.0.2/sw/qa/extras/globalfilter/globalfilter.cxx libreoffice-5.0.5~rc2/sw/qa/extras/globalfilter/globalfilter.cxx --- libreoffice-5.0.2/sw/qa/extras/globalfilter/globalfilter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/globalfilter/globalfilter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -30,6 +30,7 @@ void testImageWithSpecialID(); void testGraphicShape(); void testCharHighlight(); + void testCharHighlightODF(); void testCharHighlightBody(); void testMSCharBackgroundEditing(); void testCharBackgroundToHighlighting(); @@ -41,6 +42,7 @@ CPPUNIT_TEST(testImageWithSpecialID); CPPUNIT_TEST(testGraphicShape); CPPUNIT_TEST(testCharHighlight); + CPPUNIT_TEST(testCharHighlightODF); CPPUNIT_TEST(testMSCharBackgroundEditing); CPPUNIT_TEST(testCharBackgroundToHighlighting); #if !defined(WNT) @@ -471,6 +473,84 @@ testCharHighlightBody(); } +void Test::testCharHighlightODF() +{ + mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/char_background_editing.docx"), + "com.sun.star.text.TextDocument"); + + // don't check import, testMSCharBackgroundEditing already does that + + uno::Reference xPara = getParagraph(1); + for (int i = 1; i <= 4; ++i) + { + uno::Reference xRun(getRun(xPara,i), uno::UNO_QUERY); + switch (i) + { + case 1: // non-transparent highlight + xRun->setPropertyValue("CharBackColor", uno::makeAny(static_cast(128))); + xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true)); + xRun->setPropertyValue("CharHighlight", uno::makeAny(static_cast(64))); + break; + + case 2: // transparent backcolor + xRun->setPropertyValue("CharBackColor", uno::makeAny(static_cast(128))); + xRun->setPropertyValue("CharBackTransparent", uno::makeAny(true)); + xRun->setPropertyValue("CharHighlight", uno::makeAny(static_cast(COL_TRANSPARENT))); + break; + + case 3: // non-transparent backcolor + xRun->setPropertyValue("CharBackColor", uno::makeAny(static_cast(128))); + xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false)); + xRun->setPropertyValue("CharHighlight", uno::makeAny(static_cast(COL_TRANSPARENT))); + break; + + case 4: // non-transparent highlight again + xRun->setPropertyValue("CharBackColor", uno::makeAny(static_cast(128))); + xRun->setPropertyValue("CharBackTransparent", uno::makeAny(false)); + xRun->setPropertyValue("CharHighlight", uno::makeAny(static_cast(64))); + break; + } + } + + uno::Reference xStorable(mxComponent, uno::UNO_QUERY); + utl::MediaDescriptor aMediaDescriptor; + aMediaDescriptor["FilterName"] <<= OUString::createFromAscii("writer8"); + + utl::TempFile aTempFile; + aTempFile.EnableKillingFile(); + xStorable->storeToURL(aTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList()); + + uno::Reference< lang::XComponent > xComponent(xStorable, uno::UNO_QUERY); + xComponent->dispose(); + mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument"); + + xPara.set(getParagraph(1)); + for (int i = 1; i <= 4; ++i) + { + uno::Reference xRun(getRun(xPara,i), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(static_cast(COL_TRANSPARENT), getProperty(xRun, "CharHighlight")); + switch (i) + { + case 1: // non-transparent highlight + CPPUNIT_ASSERT_EQUAL(static_cast(64), getProperty(xRun, "CharBackColor")); + CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(xRun, "CharBackTransparent")); + break; + case 2: // transparent backcolor + CPPUNIT_ASSERT_EQUAL(static_cast(COL_TRANSPARENT), getProperty(xRun, "CharBackColor")); + CPPUNIT_ASSERT_EQUAL(sal_True, getProperty(xRun, "CharBackTransparent")); + break; + case 3: // non-transparent backcolor + CPPUNIT_ASSERT_EQUAL(static_cast(128), getProperty(xRun, "CharBackColor")); + CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(xRun, "CharBackTransparent")); + break; + case 4: // non-transparent highlight again + CPPUNIT_ASSERT_EQUAL(static_cast(64), getProperty(xRun, "CharBackColor")); + CPPUNIT_ASSERT_EQUAL(sal_False, getProperty(xRun, "CharBackTransparent")); + break; + } + } +} + void Test::testMSCharBackgroundEditing() { // Simulate the editing process of imported MSO character background attributes Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/htmlexport/data/tdf90905.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/htmlexport/data/tdf90905.odt differ diff -Nru libreoffice-5.0.2/sw/qa/extras/htmlexport/htmlexport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/htmlexport/htmlexport.cxx --- libreoffice-5.0.2/sw/qa/extras/htmlexport/htmlexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/htmlexport/htmlexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -250,7 +250,8 @@ CPPUNIT_ASSERT(pDoc); // Internal url should be valid - assertXPath(pDoc, "/html/body/p/a", "href", "#0.0.1.Text|outline"); + assertXPath(pDoc, "/html/body/p[1]/a", "href", "#0.0.1.Text|outline"); + assertXPath(pDoc, "/html/body/p[2]/a", "href", "#bookmark"); } CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sw/qa/extras/inc/swmodeltestbase.hxx libreoffice-5.0.5~rc2/sw/qa/extras/inc/swmodeltestbase.hxx --- libreoffice-5.0.2/sw/qa/extras/inc/swmodeltestbase.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/inc/swmodeltestbase.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -572,14 +572,20 @@ void load(const char* pDir, const char* pName) { + return loadURL(getURLFromSrc(pDir) + OUString::createFromAscii(pName), pName); + } + + void loadURL(OUString const& rURL, const char* pName) + { if (mxComponent.is()) mxComponent->dispose(); // Output name early, so in the case of a hang, the name of the hanging input file is visible. - std::cout << pName << ","; + if (pName) + std::cout << pName << ","; mnStartTime = osl_getGlobalTimer(); - mxComponent = loadFromDesktop(getURLFromSrc(pDir) + OUString::createFromAscii(pName), "com.sun.star.text.TextDocument"); + mxComponent = loadFromDesktop(rURL, "com.sun.star.text.TextDocument"); discardDumpedLayout(); - if (mustCalcLayoutOf(pName)) + if (pName && mustCalcLayoutOf(pName)) calcLayout(); } @@ -691,6 +697,7 @@ xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("lc"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("extended-properties"), BAD_CAST("http://schemas.openxmlformats.org/officeDocument/2006/extended-properties")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("a14"), BAD_CAST("http://schemas.microsoft.com/office/drawing/2010/main")); + xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("c"), BAD_CAST("http://schemas.openxmlformats.org/drawingml/2006/chart")); xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("o"), BAD_CAST("urn:schemas-microsoft-com:office:office")); // odt xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("office"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:office:1.0")); Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/mailmerge/data/tdf92623.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/mailmerge/data/tdf92623.odt differ diff -Nru libreoffice-5.0.2/sw/qa/extras/mailmerge/mailmerge.cxx libreoffice-5.0.5~rc2/sw/qa/extras/mailmerge/mailmerge.cxx --- libreoffice-5.0.2/sw/qa/extras/mailmerge/mailmerge.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/mailmerge/mailmerge.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -412,5 +412,56 @@ executeMailMerge(); } +DECLARE_SHELL_MAILMERGE_TEST(testTdf92623, "tdf92623.odt", "10-testing-addresses.ods", "testing-addresses") +{ + // Copying bookmarks for MM was broken because of the StartOfContent node copy + // copyied marks were off by one + executeMailMerge(); + + SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(pTextDoc); + IDocumentMarkAccess const *pIDMA = pTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess(); + // There is just one mark... + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), pIDMA->getAllMarksCount()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), pIDMA->getBookmarksCount()); + IDocumentMarkAccess::const_iterator_t mark = pIDMA->getAllMarksBegin(); + // and it's a TEXT_FIELDMARK + CPPUNIT_ASSERT_EQUAL( sal_Int32(IDocumentMarkAccess::GetType( **mark )), + sal_Int32(IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) ); + sal_uLong src_pos = (*mark)->GetMarkPos().nNode.GetIndex(); + + // Get the size of the document in nodes + SwDoc *doc = pTextDoc->GetDocShell()->GetDoc(); + sal_uLong size = doc->GetNodes().GetEndOfContent().GetIndex() - doc->GetNodes().GetEndOfExtras().GetIndex(); + CPPUNIT_ASSERT_EQUAL( sal_uLong(13), size ); + size -= 2; // For common start and end nodes + + // Iterate over all field marks in the target document and check that they + // are positioned at a multitude of the document size + SwXTextDocument* pMMTextDoc = dynamic_cast(mxMMComponent.get()); + CPPUNIT_ASSERT(pMMTextDoc); + pIDMA = pMMTextDoc->GetDocShell()->GetDoc()->getIDocumentMarkAccess(); + // The target document has the duplicated amount of bookmarks + // as the helping uno bookmark from the mail merge is left in the doc + // TODO should be fixed! + CPPUNIT_ASSERT_EQUAL(sal_Int32(20), pIDMA->getAllMarksCount()); + std::set pages; + sal_Int32 countFieldMarks = 0; + for( mark = pIDMA->getAllMarksBegin(); mark != pIDMA->getAllMarksEnd(); ++mark ) + { + IDocumentMarkAccess::MarkType markType = IDocumentMarkAccess::GetType( **mark ); + if( markType == IDocumentMarkAccess::MarkType::TEXT_FIELDMARK ) + { + sal_uLong pos = (*mark)->GetMarkPos().nNode.GetIndex() - src_pos; + CPPUNIT_ASSERT_EQUAL(sal_uLong(0), pos % size); + CPPUNIT_ASSERT(pages.insert(pos).second); + countFieldMarks++; + } + else // see previous TODO + CPPUNIT_ASSERT_EQUAL( sal_Int32(markType), sal_Int32(IDocumentMarkAccess::MarkType::UNO_BOOKMARK) ); + } + CPPUNIT_ASSERT_EQUAL(sal_Int32(10), countFieldMarks); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/sw/qa/extras/odfexport/data/CrossRefHeadingBookmark.fodt libreoffice-5.0.5~rc2/sw/qa/extras/odfexport/data/CrossRefHeadingBookmark.fodt --- libreoffice-5.0.2/sw/qa/extras/odfexport/data/CrossRefHeadingBookmark.fodt 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/odfexport/data/CrossRefHeadingBookmark.fodt 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,120 @@ + + + + ms 2015-08-24T21:49:45.305718699LibreOfficeDev/4.3.7.2$Linux_X86_64 LibreOffice_project/8a35821d8636a03b8bf4e15b48f59794652c68ba + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text + + + cross-reference to 1.1 (Numbered paragraph - Number) and 1.1(Numbered paragraph - no context) + + + + + + + diff -Nru libreoffice-5.0.2/sw/qa/extras/odfexport/odfexport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/odfexport/odfexport.cxx --- libreoffice-5.0.2/sw/qa/extras/odfexport/odfexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/odfexport/odfexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -119,38 +120,38 @@ xTextFrame = getShape(8); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(false, getProperty(xTextFrame, "FillBackground")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillTransparence")); //Frame 9 xTextFrame = getShape(9); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBackground")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillTransparence")); //Frame 10 xTextFrame = getShape(10); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(false, getProperty(xTextFrame, "FillBackground")); CPPUNIT_ASSERT_EQUAL(sal_Int32(45), getProperty(xTextFrame, "FillTransparence")); //Frame 11 xTextFrame = getShape(11); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBackground")); CPPUNIT_ASSERT_EQUAL(sal_Int32(45), getProperty(xTextFrame, "FillTransparence")); //Frame 12 xTextFrame = getShape(12); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(false), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(false, getProperty(xTextFrame, "FillBackground")); aGradientxTextFrame = getProperty(xTextFrame, "FillTransparenceGradient"); CPPUNIT_ASSERT_EQUAL(css::awt::GradientStyle_LINEAR, aGradientxTextFrame.Style); //Frame 13 xTextFrame = getShape(13); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_HATCH, getProperty(xTextFrame, "FillStyle")); CPPUNIT_ASSERT_EQUAL(OUString("Black 0 Degrees"), getProperty(xTextFrame, "FillHatchName")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBackground")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBackground")); aGradientxTextFrame = getProperty(xTextFrame, "FillTransparenceGradient"); CPPUNIT_ASSERT_EQUAL(css::awt::GradientStyle_LINEAR, aGradientxTextFrame.Style); //Frame 14 @@ -162,7 +163,7 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapPositionOffsetY")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetX")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetY")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBitmapTile")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBitmapTile")); //Frame 15 xTextFrame = getShape(15); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, getProperty(xTextFrame, "FillStyle")); @@ -172,7 +173,7 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapPositionOffsetY")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetX")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetY")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBitmapTile")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBitmapTile")); //Frame 16 xTextFrame = getShape(16); CPPUNIT_ASSERT_EQUAL(drawing::FillStyle_BITMAP, getProperty(xTextFrame, "FillStyle")); @@ -181,7 +182,7 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapPositionOffsetY")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetX")); CPPUNIT_ASSERT_EQUAL(sal_Int32(0), getProperty(xTextFrame, "FillBitmapOffsetY")); - CPPUNIT_ASSERT_EQUAL(sal_Bool(true), getProperty(xTextFrame, "FillBitmapTile")); + CPPUNIT_ASSERT_EQUAL(true, getProperty(xTextFrame, "FillBitmapTile")); aGradientxTextFrame = getProperty(xTextFrame, "FillTransparenceGradient"); CPPUNIT_ASSERT_EQUAL(css::awt::GradientStyle_LINEAR, aGradientxTextFrame.Style); @@ -372,6 +373,33 @@ CPPUNIT_ASSERT_EQUAL(awt::GradientStyle_AXIAL, aGradient.Style); } +DECLARE_ODFEXPORT_TEST(testDuplicateCrossRefHeadingBookmark, "CrossRefHeadingBookmark.fodt") +{ + // the file contains invalid duplicate heading cross reference bookmarks + // but we have to round trip them, tdf#94804 + + uno::Reference xBookmarksSupplier(mxComponent, + uno::UNO_QUERY); + uno::Reference xBookmarks( + xBookmarksSupplier->getBookmarks(), uno::UNO_QUERY); + uno::Reference xBookmark1( + xBookmarks->getByName("__RefHeading__8284_1826734303"), uno::UNO_QUERY); + CPPUNIT_ASSERT(xBookmark1.is()); + CPPUNIT_ASSERT_THROW(xBookmarks->getByName("__RefHeading__1673_25705824"), container::NoSuchElementException); + + uno::Reference xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference(xTextFieldsSupplier->getTextFields(), uno::UNO_QUERY)->refresh(); + + uno::Reference xFieldsAccess(xTextFieldsSupplier->getTextFields()); + uno::Reference xFields(xFieldsAccess->createEnumeration()); + uno::Any aField1 = xFields->nextElement(); + uno::Reference xField1(aField1, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("1.1"), xField1->getPresentation(false)); + uno::Any aField2 = xFields->nextElement(); + uno::Reference xField2(aField2, uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("1.1"), xField2->getPresentation(false)); +} + DECLARE_ODFEXPORT_TEST(testFdo60769, "fdo60769.odt") { // Test multi-paragraph comment range feature. Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/odfimport/data/tdf92586.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/odfimport/data/tdf92586.odt differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/odfimport/data/tdf96113.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/odfimport/data/tdf96113.odt differ diff -Nru libreoffice-5.0.2/sw/qa/extras/odfimport/odfimport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/odfimport/odfimport.cxx --- libreoffice-5.0.2/sw/qa/extras/odfimport/odfimport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/odfimport/odfimport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -606,6 +606,19 @@ CPPUNIT_ASSERT(getProperty(getParagraph(2), "ParaKeepTogether")); } +DECLARE_ODFIMPORT_TEST(testTdf92586, "tdf92586.odt") +{ + uno::Reference xPageStyle(getStyles("PageStyles")->getByName("Standard"), uno::UNO_QUERY); + // This was BitmapMode_NO_REPEAT. + CPPUNIT_ASSERT_EQUAL(drawing::BitmapMode_STRETCH, getProperty(xPageStyle, "FillBitmapMode")); +} + +DECLARE_ODFIMPORT_TEST(testTdf96113, "tdf96113.odt") +{ + // Background of the formula frame was white (0xffffff), not green. + CPPUNIT_ASSERT_EQUAL(sal_Int32(0x00ff00), getProperty(getShape(1), "BackColor")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/data/EmbeddedExcelChart.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlexport/data/plausable-border.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/data/plausable-border.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlexport/data/tdf83227.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/data/tdf83227.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlexport/data/tdf92521.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/data/tdf92521.odt differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/data/tdf93676-1.odt differ diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -475,10 +475,32 @@ DECLARE_OOXMLEXPORT_TEST(testFdo51550, "fdo51550.odt") { - // The problem was that we lacked the fallback to export the replacement graphic for OLE objects. - uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); - uno::Reference xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY); - CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDraws->getCount()); + // The problem was that we lacked the fallback to export the replacement + // graphic for OLE objects. But we can actually export the OLE itself now, + // so check that instead. + uno::Reference xTextEmbeddedObjectsSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xEmbeddedObjects(xTextEmbeddedObjectsSupplier->getEmbeddedObjects(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xEmbeddedObjects->getCount()); + + xmlDocPtr pXmlDocCT = parseExport("[Content_Types].xml"); + + if (!pXmlDocCT) + return; // initial import + + assertXPath(pXmlDocCT, "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.xlsx']", "ContentType", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.xlsx']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p/w:r/w:object/o:OLEObject", + "ProgID", + "Excel.Sheet.12"); } /* diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -984,6 +984,9 @@ if (!pXmlDoc) return; assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:pStyle", "val", "Normal"); + + // let's also assert that the formula was exported properly + assertXPathContent(pXmlDoc, "//wps:txbx/w:txbxContent/w:tbl/w:tr/w:tc[2]/w:p/m:oMath/m:sSubSup/m:e/m:r/m:t", OUString::fromUtf8("\xcf\x83")); } #endif diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -390,6 +390,27 @@ // Check footer1.xml.rels contains in doc after roundtrip. // Check Id = rId1 in footer1.xml.rels assertXPath(pXmlDoc,"/rels:Relationships/rels:Relationship","Id","rId1"); + assertXPath(pXmlDoc, + "/rels:Relationships/rels:Relationship[@Id='rId1']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart"); + + xmlDocPtr pXmlDocCT = parseExport("[Content_Types].xml"); + assertXPath(pXmlDocCT, + "/ContentType:Types/ContentType:Override[@PartName='/word/charts/chart1.xml']", + "ContentType", + "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"); + + // check the content too + xmlDocPtr pXmlDocFooter1 = parseExport("word/footer1.xml"); + assertXPath(pXmlDocFooter1, + "/w:ftr/w:p[1]/w:r/w:drawing/wp:inline/a:graphic/a:graphicData", + "uri", + "http://schemas.openxmlformats.org/drawingml/2006/chart"); + assertXPath(pXmlDocFooter1, + "/w:ftr/w:p[1]/w:r/w:drawing/wp:inline/a:graphic/a:graphicData/c:chart", + "id", + "rId1"); uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); if (xDrawPageSupplier.is()) @@ -516,7 +537,26 @@ if (!pXmlDoc) return; - assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:imagedata", "o:title", ""); + assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r/w:object/v:shape/v:imagedata", "o:title", ""); + assertXPath(pXmlDoc, + "/w:document/w:body/w:p[2]/w:r/w:object/o:OLEObject", + "DrawAspect", + "Content"); + // TODO: ProgID="Package" - what is this? Zip with 10k extra header? + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.bin']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"); + // check the media type too + xmlDocPtr pXmlDocCT = parseExport("[Content_Types].xml"); + assertXPath(pXmlDocCT, + "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.bin']", + "ContentType", + "application/vnd.openxmlformats-officedocument.oleObject"); + } DECLARE_OOXMLEXPORT_TEST(testFdo74792, "fdo74792.docx") @@ -681,6 +721,26 @@ return; assertXPath(pXmlDoc,"/rels:Relationships/rels:Relationship[1]","Id","rId1"); + + xmlDocPtr pXmlDocCT = parseExport("[Content_Types].xml"); + + // check the media type too + assertXPath(pXmlDocCT, + "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.bin']", + "ContentType", + "application/vnd.openxmlformats-officedocument.oleObject"); + + // check the content too + xmlDocPtr pXmlDocHeader1 = parseExport("word/header1.xml"); + assertXPath(pXmlDocHeader1, + "/w:hdr/w:tbl/w:tr[1]/w:tc[2]/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Word.Picture.8"); + xmlDocPtr pXmlDocHeader2 = parseExport("word/header2.xml"); + assertXPath(pXmlDocHeader2, + "/w:hdr/w:tbl/w:tr[1]/w:tc[2]/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Word.Picture.8"); } DECLARE_OOXMLEXPORT_TEST(test_ClosingBrace, "2120112713.docx") @@ -747,6 +807,18 @@ "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.docx']", "ContentType", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"); + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.docx']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[6]/w:r/w:object/o:OLEObject", + "ProgID", + "Word.Document.12"); } DECLARE_OOXMLEXPORT_TEST(testContentTypeXLSM, "fdo76098.docx") @@ -757,6 +829,19 @@ return; assertXPath(pXmlDoc, "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/Microsoft_Excel_Macro-Enabled_Worksheet1.xlsm']", "ContentType", "application/vnd.ms-excel.sheet.macroEnabled.12"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/charts/_rels/chart1.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='../embeddings/Microsoft_Excel_Macro-Enabled_Worksheet1.xlsm']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocChart1 = parseExport("word/charts/chart1.xml"); + assertXPath(pXmlDocChart1, + "/c:chartSpace/c:externalData", + "id", + "rId1"); } DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx") @@ -800,7 +885,52 @@ assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:picture", 1); assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:group", 1); assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:sdt/w:sdtPr/w:citation", 1); +} + +DECLARE_OOXMLEXPORT_TEST(testEmbeddedExcelChart, "EmbeddedExcelChart.docx") +{ + xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); + if (!pXmlDoc) // only test the export, not initial import + return; + + assertXPath(pXmlDoc, + "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/oleObject1.xls']", + "ContentType", + "application/vnd.ms-excel"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.xls']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"); + + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p/w:r/w:object/o:OLEObject", + "ProgID", + "Excel.Chart.8"); +} + +DECLARE_OOXMLEXPORT_TEST(testTdf83227, "tdf83227.docx") +{ + // Bug document contains a rotated image, which is handled as a draw shape (not as a Writer image) on export. + if (!mbExported) + return; + + uno::Reference xNameAccess = packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory), maTempFile.GetURL()); + CPPUNIT_ASSERT_EQUAL(true, bool(xNameAccess->hasByName("word/media/image1.png"))); + // This was also true, image was written twice. + CPPUNIT_ASSERT_EQUAL(false, bool(xNameAccess->hasByName("word/media/image2.png"))); +} + +DECLARE_OOXMLEXPORT_TEST(testTdf92521, "tdf92521.odt") +{ + if (xmlDocPtr pXmlDoc = parseExport("word/document.xml")) + // There should be a section break that's in the middle of the document: right after the table. + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:pPr/w:sectPr", 1); } CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -342,6 +342,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']", "PartName", "/word/embeddings/oleObject1.xlsx"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.xlsx']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Excel.Sheet.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo78420, "fdo78420.docx") @@ -547,6 +560,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.openxmlformats-officedocument.presentationml.slide']", "PartName", "/word/embeddings/oleObject1.sldx"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.sldx']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "PowerPoint.Slide.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo79969_xlsb, "fdo79969_xlsb.docx") @@ -561,6 +587,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.binary.macroEnabled.12']", "PartName", "/word/embeddings/oleObject1.xlsb"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.xlsb']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Excel.SheetBinaryMacroEnabled.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo80097, "fdo80097.docx") @@ -638,6 +677,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-excel.sheet.macroEnabled.12']", "PartName", "/word/embeddings/oleObject1.xlsm"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.xlsm']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Excel.SheetMacroEnabled.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo80522,"fdo80522.docx") @@ -651,6 +703,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-word.document.macroEnabled.12']", "PartName", "/word/embeddings/oleObject1.docm"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.docm']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Word.DocumentMacroEnabled.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo80523_pptm,"fdo80523_pptm.docx") @@ -664,6 +729,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.presentation.macroEnabled.12']", "PartName", "/word/embeddings/oleObject1.pptm"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.pptm']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "PowerPoint.ShowMacroEnabled.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo80523_sldm,"fdo80523_sldm.docx") @@ -677,6 +755,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/vnd.ms-powerpoint.slide.macroEnabled.12']", "PartName", "/word/embeddings/oleObject1.sldm"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.sldm']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "PowerPoint.SlideMacroEnabled.12"); } DECLARE_OOXMLEXPORT_TEST(testfdo80898, "fdo80898.docx") @@ -691,6 +782,19 @@ "/ContentType:Types/ContentType:Override[@ContentType='application/msword']", "PartName", "/word/embeddings/oleObject1.doc"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/_rels/document.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='embeddings/oleObject1.doc']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"); + // check the content too + xmlDocPtr pXmlDocContent = parseExport("word/document.xml"); + assertXPath(pXmlDocContent, + "/w:document/w:body/w:p[1]/w:r/w:object/o:OLEObject", + "ProgID", + "Word.Document.8"); } DECLARE_OOXMLEXPORT_TEST(testTableCellWithDirectFormatting, "fdo80800.docx") diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -912,6 +912,21 @@ assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent","cx","0"); } +// part of tdf#93676, word gives the frame in the exported .docx a huge height, +// because its exported with 255% height percentage from a 255 HeightPercent +// settings, but 255 is a special flag that the value is synced to the +// other dimension. +DECLARE_OOXMLEXPORT_TEST(testSyncedRelativePercent, "tdf93676-1.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + + // check no explicit pctHeight has been exported, all we care + // about at this point is that its not 255000 + assertXPath(pXmlDoc, "//wp14:pctHeight", 0); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -305,6 +305,30 @@ uno::Reference xEmbeddedObjects(xTextEmbeddedObjectsSupplier->getEmbeddedObjects(), uno::UNO_QUERY); // This was 2, on second import we got a duplicated chart copy. CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xEmbeddedObjects->getCount()); + + xmlDocPtr pXmlDocCT = parseExport("[Content_Types].xml"); + + if (!pXmlDocCT) + return; // initial import + + assertXPath(pXmlDocCT, + "/ContentType:Types/ContentType:Override[@PartName='/word/charts/chart1.xml']", + "ContentType", + "application/vnd.openxmlformats-officedocument.drawingml.chart+xml"); + assertXPath(pXmlDocCT, "/ContentType:Types/ContentType:Override[@PartName='/word/embeddings/Microsoft_Excel_Worksheet1.xlsx']", "ContentType", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + + // check the rels too + xmlDocPtr pXmlDocRels = parseExport("word/charts/_rels/chart1.xml.rels"); + assertXPath(pXmlDocRels, + "/rels:Relationships/rels:Relationship[@Target='../embeddings/Microsoft_Excel_Worksheet1.xlsx']", + "Type", + "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"); + // check the content too + xmlDocPtr pXmlDocChart1 = parseExport("word/charts/chart1.xml"); + assertXPath(pXmlDocChart1, + "/c:chartSpace/c:externalData", + "id", + "rId1"); } DECLARE_OOXMLEXPORT_TEST(testPositionAndRotation, "position-and-rotation.docx") Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/hello.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/hello.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf78902.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf78902.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf83300.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf83300.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf85232.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf85232.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf89165.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf89165.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf90153.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf90153.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf92045.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf92045.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf92124.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf92124.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf92454.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf92454.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf93919.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf93919.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf94374.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf94374.docx differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ooxmlimport/data/tdf96674.docx and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/data/tdf96674.docx differ diff -Nru libreoffice-5.0.2/sw/qa/extras/ooxmlimport/ooxmlimport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/ooxmlimport.cxx --- libreoffice-5.0.2/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -66,6 +66,8 @@ #include #include #include +#include +#include #include #include #include @@ -75,6 +77,7 @@ #include #include #include +#include #include @@ -96,6 +99,24 @@ if (OString(filename) == "smartart.docx" || OString(filename) == "strict-smartart.docx" || OString(filename) == "fdo87488.docx") SvtFilterOptions::Get().SetSmartArt2Shape(false); } +protected: + /// Copy&paste helper. + bool paste(const OUString& rFilename, const uno::Reference& xTextRange) + { + uno::Reference xFilter(m_xSFactory->createInstance("com.sun.star.comp.Writer.WriterFilter"), uno::UNO_QUERY_THROW); + uno::Reference xImporter(xFilter, uno::UNO_QUERY_THROW); + xImporter->setTargetDocument(mxComponent); + uno::Sequence aDescriptor(3); + aDescriptor[0].Name = "InputStream"; + SvStream* pStream = utl::UcbStreamHelper::CreateStream(getURLFromSrc("/sw/qa/extras/ooxmlimport/data/") + rFilename, StreamMode::READ); + uno::Reference xStream(new utl::OStreamWrapper(*pStream)); + aDescriptor[0].Value <<= xStream; + aDescriptor[1].Name = "InsertMode"; + aDescriptor[1].Value <<= sal_True; + aDescriptor[2].Name = "TextInsertModeRange"; + aDescriptor[2].Value <<= xTextRange; + return xFilter->filter(aDescriptor); + } }; class FailTest : public Test @@ -546,7 +567,7 @@ uno::Reference xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY); sal_Int32 nValue = 0; xPropertySet->getPropertyValue("LeftMargin") >>= nValue; - CPPUNIT_ASSERT_EQUAL(sal_Int32(794), nValue); + CPPUNIT_ASSERT_EQUAL(sal_Int32(847), nValue); // No assert for the 3rd problem: see the comment in the test doc. @@ -2767,6 +2788,93 @@ CPPUNIT_ASSERT_EQUAL(static_cast(0), aGeometry["TextPreRotateAngle"].get()); } +DECLARE_OOXMLIMPORT_TEST(testTdf93919, "tdf93919.docx") +{ + // This was 0, left margin was not inherited from the list style. + CPPUNIT_ASSERT_EQUAL(static_cast(1270), getProperty(getParagraph(1), "ParaLeftMargin")); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf92454, "tdf92454.docx") +{ + // The first paragraph had a large indentation / left margin as inheritance + // in Word and Writer works differently, and no direct value was set to be + // explicit. + uno::Reference xParagraph(getParagraph(1), uno::UNO_QUERY); + // This was beans::PropertyState_DEFAULT_VALUE. + CPPUNIT_ASSERT_EQUAL(beans::PropertyState_DIRECT_VALUE, xParagraph->getPropertyState("ParaFirstLineIndent")); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf92124, "tdf92124.docx") +{ + // Get the second paragraph's numbering style's 1st level's suffix. + uno::Reference xParagraph = getParagraph(2); + auto xLevels = getProperty< uno::Reference >(xParagraph, "NumberingRules"); + uno::Sequence aLevel; + xLevels->getByIndex(0) >>= aLevel; // 1st level + OUString aSuffix = std::find_if(aLevel.begin(), aLevel.end(), [](const beans::PropertyValue& rValue) { return rValue.Name == "Suffix"; })->Value.get(); + // Make sure it's empty as the source document contains . + CPPUNIT_ASSERT(aSuffix.isEmpty()); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf90153, "tdf90153.docx") +{ + // This was at-para, so the line-level VertOrientRelation was lost, resulting in an incorrect vertical position. + CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, getProperty(getShape(1), "AnchorType")); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf89165, "tdf89165.docx") +{ + // This must not hang in layout +} + +DECLARE_OOXMLIMPORT_TEST(testTdf94374, "hello.docx") +{ + uno::Reference xTextDocument(mxComponent, uno::UNO_QUERY); + uno::Reference xText(xTextDocument->getText(), uno::UNO_QUERY); + uno::Reference xEnd = xText->getEnd(); + // This failed: it wasn't possible to insert a DOCX document into an existing Writer one. + CPPUNIT_ASSERT(paste("tdf94374.docx", xEnd)); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf83300, "tdf83300.docx") +{ + // This was 'Contents Heading', which (in the original document) implied 'keep with next' on unexpected paragraphs. + CPPUNIT_ASSERT_EQUAL(OUString("TOC Heading"), getProperty(getParagraph(1), "ParaStyleName")); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf85232, "tdf85232.docx") +{ + uno::Reference xShapes(getShapeByName("Group 219"), uno::UNO_QUERY); + uno::Reference xShape(xShapes->getByIndex(1), uno::UNO_QUERY); + uno::Reference xShapeDescriptor(xShape, uno::UNO_QUERY); + // Make sure we're not testing the ellipse child. + CPPUNIT_ASSERT_EQUAL(OUString("com.sun.star.drawing.LineShape"), xShapeDescriptor->getShapeType()); + // This was 2900: horizontal position of the line was incorrect, the 3 children were not connected visually. + CPPUNIT_ASSERT_EQUAL(static_cast(2267), xShape->getPosition().X); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf78902, "tdf78902.docx") +{ + // This hung in layout. + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf96674, "tdf96674.docx") +{ + uno::Reference xShape(getShape(1), uno::UNO_QUERY); + CPPUNIT_ASSERT(xShape.is()); + awt::Size aActualSize(xShape->getSize()); + // This was 3493: the vertical line was horizontal. + CPPUNIT_ASSERT_EQUAL(static_cast(0), aActualSize.Width); + CPPUNIT_ASSERT(aActualSize.Height > 0); +} + +DECLARE_OOXMLIMPORT_TEST(testTdf92045, "tdf92045.docx") +{ + // This was true, resulted in setting the blinking font effect. + CPPUNIT_ASSERT_EQUAL(false, getProperty(getRun(getParagraph(1), 1), "CharFlash")); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff -Nru libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf59454.rtf libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf59454.rtf --- libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf59454.rtf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf59454.rtf 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,8 @@ +{\rtf1 +foo\par +\sect\sectd +\trowd\cellx980\cellx11480\cellx14000\pard\plain \intbl\itap1\s33\qj\hyphpar1 \fs24 \qc\hyphpar1 A1\cell +\pard\plain \intbl\itap1\s33\qj\hyphpar1 \fs24 \qc\hyphpar1 B1\cell +\pard\plain \intbl\itap1\s33\qj\hyphpar1 \fs24 \qc\hyphpar1 C1\cell +\trowd\cellx980\clbrdrt\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clvertalt\cellx11480\clbrdrt\brdrs\brdrw10\clbrdrl\brdrs\brdrw10\clbrdrb\brdrs\brdrw10\clbrdrr\brdrs\brdrw10\clvertalt\cellx14000\row +\pard\plain bar\par } diff -Nru libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf94435.rtf libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf94435.rtf --- libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf94435.rtf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf94435.rtf 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,7 @@ +{\rtf1\ansi\deff3\adeflang1025 +\paperh15840\paperw12240\margl1260\margr720\margt180\margb67\sectd\sbknone\sectunlocked1\pgndec\pgwsxn12240\pghsxn15840\marglsxn1260\margrsxn720\margtsxn180\margbsxn67\ftnbj\ftnstart1\ftnrstcont\ftnnar\aenddoc\aftnrstcont\aftnstart1\aftnnrlc +{\*\ftnsep\chftnsep} +\pgndec\pard\plain \s0\ql\widctlpar\ltrpar\hyphpar0\cf0\dbch\af0\dbch\af0\afs24\alang1025\langfe2052\loch\f0\fs24\lang1033\qc\li0\ri720\lin0\rin720\fi0 +{\cf17\b\afs32\fs22\lang1049\rtlch \ltrch\loch\fs32\lang1049 +xxx} +\par} diff -Nru libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf94456.rtf libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf94456.rtf --- libreoffice-5.0.2/sw/qa/extras/rtfimport/data/tdf94456.rtf 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/data/tdf94456.rtf 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,23 @@ +{\rtf1\ansi\deff3\adeflang1025 +{\stylesheet +{\s0\snext0\nowidctlpar\hyphpar0\aspalpha\ltrpar\cf0\kerning1\dbch\af8\langfe2052\dbch\af6\afs24\alang1081\loch\f3\fs24\lang2055 Normal;} +{\s1\sbasedon15\snext16\ilvl0\outlinelevel0\sb240\sa120\keepn\b\dbch\af5\dbch\af6\afs36\ab\loch\f4\fs36 Heading 1;} +{\s15\sbasedon0\snext16\sb240\sa120\keepn\dbch\af5\dbch\af6\afs28\loch\f4\fs28 Heading;} +} +{\*\listtable +{\list\listtemplateid1 +{\listlevel\levelnfc255\leveljc0\levelstartat1\levelfollow2 +{\leveltext \'00;} +{\levelnumbers;} +\fi-432\li432} +\listid1} +} +{\listoverridetable +{\listoverride\listid1\listoverridecount0\ls1} +} +\pard\plain \s1\ilvl0\outlinelevel0\sb240\sa120\keepn\b\dbch\af5\dbch\af6\afs36\ab\loch\f4\fs36 +{\listtext\pard\plain \tab} +\ls1 \li432\ri0\lin432\rin0\fi-432\sb240\sa120 +{\rtlch \ltrch\loch +Heading} +\par} diff -Nru libreoffice-5.0.2/sw/qa/extras/rtfimport/rtfimport.cxx libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/rtfimport.cxx --- libreoffice-5.0.2/sw/qa/extras/rtfimport/rtfimport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/rtfimport/rtfimport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2328,6 +2328,28 @@ CPPUNIT_ASSERT_EQUAL(static_cast(2), getProperty(getParagraph(1), "ParaWidows")); } +DECLARE_RTFIMPORT_TEST(testTdf94456, "tdf94456.rtf") +{ + // Paragraph left margin and first line indent wasn't imported correctly. + + // This was 1270. + CPPUNIT_ASSERT_EQUAL(static_cast(762), getProperty(getParagraph(1), "ParaLeftMargin")); + // This was -635. + CPPUNIT_ASSERT_EQUAL(static_cast(-762), getProperty(getParagraph(1), "ParaFirstLineIndent")); +} + +DECLARE_RTFIMPORT_TEST(testTdf94435, "tdf94435.rtf") +{ + // This was style::ParagraphAdjust_LEFT, \ltrpar undone the effect of \qc. + CPPUNIT_ASSERT_EQUAL(style::ParagraphAdjust_CENTER, static_cast(getProperty(getParagraph(1), "ParaAdjust"))); +} + +DECLARE_RTFIMPORT_TEST(testTdf59454, "tdf59454.rtf") +{ + // This was 1, section break was ignored right before a table. + CPPUNIT_ASSERT_EQUAL(2, getPages()); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/sw/qa/extras/uiwriter/data/redlineFrame.fodt libreoffice-5.0.5~rc2/sw/qa/extras/uiwriter/data/redlineFrame.fodt --- libreoffice-5.0.2/sw/qa/extras/uiwriter/data/redlineFrame.fodt 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/uiwriter/data/redlineFrame.fodt 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,81 @@ + + + + ms 2015-08-24T21:49:45.305718699LibreOfficeDev/4.3.7.2$Linux_X86_64 LibreOffice_project/8a35821d8636a03b8bf4e15b48f59794652c68ba + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ms + 2015-09-10T15:36:00 + + + + + + + ms + 2015-09-10T15:36:00 + + + Removed text + + + + Added text + + + + diff -Nru libreoffice-5.0.2/sw/qa/extras/uiwriter/uiwriter.cxx libreoffice-5.0.5~rc2/sw/qa/extras/uiwriter/uiwriter.cxx --- libreoffice-5.0.2/sw/qa/extras/uiwriter/uiwriter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/uiwriter/uiwriter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -66,6 +66,8 @@ //Regression test of fdo#70143 //EDITING: undo search&replace corrupt text when searching backward void testReplaceBackward(); + void testRedlineFrame(); + void testBookmarkCopy(); void testFdo69893(); void testFdo70807(); void testImportRTF(); @@ -102,10 +104,13 @@ void testDde(); void testTdf89954(); void testTdf89720(); + void testTdf96479(); CPPUNIT_TEST_SUITE(SwUiWriterTest); CPPUNIT_TEST(testReplaceForward); CPPUNIT_TEST(testReplaceBackward); + CPPUNIT_TEST(testRedlineFrame); + CPPUNIT_TEST(testBookmarkCopy); CPPUNIT_TEST(testFdo69893); CPPUNIT_TEST(testFdo70807); CPPUNIT_TEST(testImportRTF); @@ -142,6 +147,7 @@ CPPUNIT_TEST(testDde); CPPUNIT_TEST(testTdf89954); CPPUNIT_TEST(testTdf89720); + CPPUNIT_TEST(testTdf96479); CPPUNIT_TEST_SUITE_END(); @@ -152,8 +158,9 @@ SwDoc* SwUiWriterTest::createDoc(const char* pName) { if (!pName) - pName = "empty.odt"; - load(DATA_DIRECTORY, pName); + loadURL("private:factory/swriter", nullptr); + else + load(DATA_DIRECTORY, pName); SwXTextDocument* pTextDoc = dynamic_cast(mxComponent.get()); CPPUNIT_ASSERT(pTextDoc); @@ -194,6 +201,86 @@ CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText()); } +void SwUiWriterTest::testRedlineFrame() +{ + SwDoc * pDoc(createDoc("redlineFrame.fodt")); + SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell(); + + uno::Reference xDrawPageSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xDrawPage = xDrawPageSupplier->getDrawPage(); + // there is exactly one frame + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); + + sal_uInt16 nMode = pWrtShell->GetRedlineMode(); + CPPUNIT_ASSERT(nMode & nsRedlineMode_t::REDLINE_SHOW_DELETE); + + // hide delete redlines + pWrtShell->SetRedlineMode(nMode & ~nsRedlineMode_t::REDLINE_SHOW_DELETE); + + // there is still exactly one frame + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); + + pWrtShell->SetRedlineMode(nMode); // show again + + // there is still exactly one frame + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xDrawPage->getCount()); +} + +void SwUiWriterTest::testBookmarkCopy() +{ + SwDoc * pDoc(createDoc()); + + // add text and bookmark + IDocumentMarkAccess & rIDMA(*pDoc->getIDocumentMarkAccess()); + IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations()); + SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1); + SwCursor aPaM(SwPosition(aIdx), nullptr, false); + rIDCO.InsertString(aPaM, OUString("foo")); + rIDCO.SplitNode(*aPaM.GetPoint(), false); + rIDCO.InsertString(aPaM, OUString("bar")); + aPaM.SetMark(); + aPaM.MovePara(GetfnParaCurr(), GetfnParaStart()); + rIDMA.makeMark(aPaM, OUString("Mark"), IDocumentMarkAccess::MarkType::BOOKMARK); + aPaM.Exchange(); + aPaM.DeleteMark(); + rIDCO.SplitNode(*aPaM.GetPoint(), false); + rIDCO.InsertString(aPaM, OUString("baz")); + + // copy range + rIDCO.SplitNode(*aPaM.GetPoint(), false); + SwPosition target(*aPaM.GetPoint()); + aPaM.Move(fnMoveBackward, fnGoContent); + aPaM.SetMark(); + aPaM.SttEndDoc(true/*start*/); + aPaM.Move(fnMoveForward, fnGoContent); // partially select 1st para + + rIDCO.CopyRange(aPaM, target, /*bCopyAll=*/false, /*bCheckPos=*/true); + + // check bookmark was copied to correct position + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), rIDMA.getBookmarksCount()); + for (auto it(rIDMA.getBookmarksBegin()); it != rIDMA.getBookmarksEnd(); ++it) + { + OUString markText(SwPaM((*it)->GetMarkPos(), (*it)->GetOtherMarkPos()).GetText()); + CPPUNIT_ASSERT_EQUAL(OUString("bar"), markText); + } + + // copy 2nd time, such that bCanMoveBack is false in CopyImpl + SwPaM aCopyPaM(*aPaM.GetMark(), *aPaM.GetPoint()); + aPaM.SttEndDoc(true/*start*/); + rIDCO.SplitNode(*aPaM.GetPoint(), false); + aPaM.SttEndDoc(true/*start*/); + + rIDCO.CopyRange(aCopyPaM, *aPaM.GetPoint(), /*bCopyAll=*/false, /*bCheckPos=*/true); + + // check bookmark was copied to correct position + CPPUNIT_ASSERT_EQUAL(sal_Int32(3), rIDMA.getBookmarksCount()); + for (auto it(rIDMA.getBookmarksBegin()); it != rIDMA.getBookmarksEnd(); ++it) + { + OUString markText(SwPaM((*it)->GetMarkPos(), (*it)->GetOtherMarkPos()).GetText()); + CPPUNIT_ASSERT_EQUAL(OUString("bar"), markText); + } +} + void SwUiWriterTest::testFdo75110() { SwDoc* pDoc = createDoc("fdo75110.odt"); @@ -1065,6 +1152,101 @@ #endif } +void SwUiWriterTest::testTdf96479() +{ + // We want to verify the empty input text field in the bookmark + static const OUString emptyInputTextField = + OUStringLiteral1() + OUStringLiteral1(); + + SwDoc* pDoc = createDoc(); + SwXTextDocument *xTextDoc = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(xTextDoc); + + // So we can clean up all references for reload + { + // Append bookmark + SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1); + SwPaM aPaM(aIdx); + IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess(); + sw::mark::IMark *pMark = + rIDMA.makeMark(aPaM, "original", IDocumentMarkAccess::MarkType::BOOKMARK); + CPPUNIT_ASSERT(!pMark->IsExpanded()); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); + + // Get helper objects + uno::Reference xBookmarksSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xFactory(mxComponent, uno::UNO_QUERY); + + // Create cursor from bookmark + uno::Reference xTextContent(xBookmarksSupplier->getBookmarks()->getByName("original"), uno::UNO_QUERY); + uno::Reference xRange(xTextContent->getAnchor(), uno::UNO_QUERY); + uno::Reference xCursor(xRange->getText()->createTextCursorByRange(xRange), uno::UNO_QUERY); + CPPUNIT_ASSERT(xCursor->isCollapsed()); + + // Remove bookmark + xRange->getText()->removeTextContent(xTextContent); + CPPUNIT_ASSERT_EQUAL(sal_Int32(0), rIDMA.getBookmarksCount()); + + // Insert replacement bookmark + uno::Reference xBookmarkNew(xFactory->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY); + uno::Reference xBookmarkName(xBookmarkNew, uno::UNO_QUERY); + xBookmarkName->setName("replacement"); + CPPUNIT_ASSERT(xCursor->isCollapsed()); + // Force bookmark expansion + xCursor->getText()->insertString(xCursor, ".", true); + xCursor->getText()->insertTextContent(xCursor, xBookmarkNew, true); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); + auto mark = *(rIDMA.getBookmarksBegin()); + CPPUNIT_ASSERT(mark->IsExpanded()); + + // Create and insert input textfield with some content + uno::Reference xTextField(xFactory->createInstance("com.sun.star.text.TextField.Input"), uno::UNO_QUERY); + uno::Reference xCursorNew(xBookmarkNew->getAnchor()->getText()->createTextCursorByRange(xBookmarkNew->getAnchor())); + CPPUNIT_ASSERT(!xCursorNew->isCollapsed()); + xCursorNew->getText()->insertTextContent(xCursorNew, xTextField, true); + xBookmarkNew = uno::Reference(xBookmarksSupplier->getBookmarks()->getByName("replacement"), uno::UNO_QUERY); + xCursorNew = uno::Reference(xBookmarkNew->getAnchor()->getText()->createTextCursorByRange(xBookmarkNew->getAnchor())); + CPPUNIT_ASSERT(!xCursorNew->isCollapsed()); + + // Can't check the actual content of the text node via UNO + mark = *(rIDMA.getBookmarksBegin()); + CPPUNIT_ASSERT(mark->IsExpanded()); + SwPaM pam(mark->GetMarkStart(), mark->GetMarkEnd()); + // Check for the actual bug, which didn't include CH_TXT_ATR_INPUTFIELDEND in the bookmark + CPPUNIT_ASSERT_EQUAL(emptyInputTextField, pam.GetText()); + } + + { + // Save and load cycle + // Actually not needed, but the bug symptom of a missing bookmark + // occured because a broken bookmar was saved and loading silently + // dropped the broken bookmark! + utl::TempFile aTempFile; + save("writer8", aTempFile); + loadURL(aTempFile.GetURL(), nullptr); + xTextDoc = dynamic_cast(mxComponent.get()); + CPPUNIT_ASSERT(xTextDoc); + pDoc = xTextDoc->GetDocShell()->GetDoc(); + + // Lookup "replacement" bookmark + IDocumentMarkAccess &rIDMA = *pDoc->getIDocumentMarkAccess(); + CPPUNIT_ASSERT_EQUAL(sal_Int32(1), rIDMA.getBookmarksCount()); + uno::Reference xBookmarksSupplier(mxComponent, uno::UNO_QUERY); + CPPUNIT_ASSERT(xBookmarksSupplier->getBookmarks()->hasByName("replacement")); + + uno::Reference xTextContent(xBookmarksSupplier->getBookmarks()->getByName("replacement"), uno::UNO_QUERY); + uno::Reference xRange(xTextContent->getAnchor(), uno::UNO_QUERY); + uno::Reference xCursor(xRange->getText()->createTextCursorByRange(xRange), uno::UNO_QUERY); + CPPUNIT_ASSERT(!xCursor->isCollapsed()); + + // Verify bookmark content via text node / PaM + auto mark = *(rIDMA.getBookmarksBegin()); + CPPUNIT_ASSERT(mark->IsExpanded()); + SwPaM pam(mark->GetMarkStart(), mark->GetMarkEnd()); + CPPUNIT_ASSERT_EQUAL(emptyInputTextField, pam.GetText()); + } +} + CPPUNIT_TEST_SUITE_REGISTRATION(SwUiWriterTest); CPPUNIT_PLUGIN_IMPLEMENT(); Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/sw/qa/extras/ww8import/data/tdf95321.doc and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/sw/qa/extras/ww8import/data/tdf95321.doc differ diff -Nru libreoffice-5.0.2/sw/qa/extras/ww8import/ww8import.cxx libreoffice-5.0.5~rc2/sw/qa/extras/ww8import/ww8import.cxx --- libreoffice-5.0.2/sw/qa/extras/ww8import/ww8import.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/extras/ww8import/ww8import.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -419,6 +419,16 @@ CPPUNIT_ASSERT_EQUAL(sal_Int32(5002), getProperty(xTable, "TopMargin")); } +DECLARE_WW8IMPORT_TEST(testTdf95321, "tdf95321.doc") +{ + // The problem was that there should be content in the second cell + // but there wasn't. + uno::Reference xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); + uno::Reference xTable(xIndexAccess->getByIndex(0), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(OUString("Second Column"), uno::Reference(xTable->getCellByName("B1"), uno::UNO_QUERY)->getString()); +} + DECLARE_WW8IMPORT_TEST(testBnc875715, "bnc875715.doc") { uno::Reference xTextSectionsSupplier(mxComponent, uno::UNO_QUERY); diff -Nru libreoffice-5.0.2/sw/qa/python/check_table.py libreoffice-5.0.5~rc2/sw/qa/python/check_table.py --- libreoffice-5.0.2/sw/qa/python/check_table.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/qa/python/check_table.py 2016-02-04 16:41:28.000000000 +0000 @@ -1,10 +1,14 @@ +import math import unittest from org.libreoffice.unotest import UnoInProcess +from com.sun.star.beans import PropertyValue from com.sun.star.uno import RuntimeException from com.sun.star.table import BorderLine from com.sun.star.table import BorderLine2 from com.sun.star.table.BorderLineStyle import (DOUBLE, SOLID, EMBOSSED,\ THICKTHIN_LARGEGAP, DASHED, DOTTED) +from com.sun.star.util import XNumberFormats +from com.sun.star.lang import Locale class CheckTable(unittest.TestCase): _uno = None @@ -344,6 +348,72 @@ self.assertEqual( xTable.Data, ((1,2,3), (4,55,66), (7,88,99), (10,1111,1212))) xDoc.dispose() + def test_tdf32082(self): + xDoc = CheckTable._uno.openEmptyWriterDoc() + xDocFrame = xDoc.CurrentController.Frame + xContext = CheckTable._uno.getContext() + xServiceManager = xContext.ServiceManager + xDispatcher = xServiceManager.createInstanceWithContext( + 'com.sun.star.frame.DispatchHelper', xContext) + xTable = xDoc.createInstance("com.sun.star.text.TextTable") + xTable.initialize(1,1) + xCursor = xDoc.Text.createTextCursor() + xDoc.Text.insertTextContent(xCursor, xTable, False) + # Setup numberformat for the cell + xNumberFormats = xDoc.NumberFormats + xLocale = Locale('en', 'US', '') + formatString = '#,##0.00 [$€-407];[RED]-#,##0.00 [$€-407]' + key = xNumberFormats.queryKey(formatString, xLocale, True) + if key == -1: + key = xNumberFormats.addNew(formatString, xLocale) + # Apply the format on the first cell + xTable.getCellByPosition(0,0).NumberFormat = key + xDispatcher.executeDispatch(xDocFrame, '.uno:GoToStartOfDoc', '', 0, ()) + xDispatcher.executeDispatch(xDocFrame, '.uno:InsertText', '', 0, + (PropertyValue('Text', 0, '3', 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:JumpToNextCell', '', 0, ()) + # Check that the formatting we set up is not destroyed + self.assertEquals(xTable.getCellByPosition(0,0).getString(), '3.00 €') + self.assertEquals(xTable.getCellByPosition(0,0).getValue(), 3) + # Verify that it works with number recognition turned on as well + xDispatcher.executeDispatch(xDocFrame, '.uno:TableNumberRecognition', '', 0, + (PropertyValue('TableNumberRecognition', 0, True, 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:InsertText', '', 0, + (PropertyValue('Text', 0, '4', 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:JumpToNextCell', '', 0, ()) + self.assertEquals(xTable.getCellByPosition(0,1).getString(), '4.00 €') + self.assertEquals(xTable.getCellByPosition(0,1).getValue(), 4) + xDoc.dispose() + + def test_numberRecognition(self): + xDoc = CheckTable._uno.openEmptyWriterDoc() + xDocFrame = xDoc.CurrentController.Frame + xContext = CheckTable._uno.getContext() + xServiceManager = xContext.ServiceManager + xDispatcher = xServiceManager.createInstanceWithContext( + 'com.sun.star.frame.DispatchHelper', xContext) + xTable = xDoc.createInstance('com.sun.star.text.TextTable') + xTable.initialize(2,1) + xCursor = xDoc.Text.createTextCursor() + xDoc.Text.insertTextContent(xCursor, xTable, False) + xDispatcher.executeDispatch(xDocFrame, '.uno:GoToStartOfDoc', '', 0, ()) + xDispatcher.executeDispatch(xDocFrame, '.uno:InsertText', '', 0, + (PropertyValue('Text', 0, '15-10-30', 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:JumpToNextCell', '', 0, ()) + # Without number recognition 15-10-30 should not be interperated as a date + self.assertEquals(xTable.getCellByPosition(0,0).getString(), '15-10-30') + self.assertEquals(xTable.getCellByPosition(0,0).getValue(), 0) + # Activate number recognition + xDispatcher.executeDispatch(xDocFrame, '.uno:TableNumberRecognition', '', 0, + (PropertyValue('TableNumberRecognition', 0, True, 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:InsertText', '', 0, + (PropertyValue('Text', 0, '15-10-30', 0),)) + xDispatcher.executeDispatch(xDocFrame, '.uno:JumpToNextCell', '', 0, ()) + # With number recognition it should now be a date, confirm by checking + # the string and value of the cell. + self.assertEquals(xTable.getCellByPosition(0,1).getString(), '2015-10-30') + self.assertEquals(xTable.getCellByPosition(0,1).getValue(), 42307.0) + xDoc.dispose() if __name__ == '__main__': unittest.main() diff -Nru libreoffice-5.0.2/sw/sdi/_annotsh.sdi libreoffice-5.0.5~rc2/sw/sdi/_annotsh.sdi --- libreoffice-5.0.2/sw/sdi/_annotsh.sdi 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/sdi/_annotsh.sdi 2016-02-04 16:41:28.000000000 +0000 @@ -237,6 +237,13 @@ DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] + SID_ATTR_CHAR_BACK_COLOR // api: + [ + ExecMethod = Exec; + StateMethod = GetState ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + SID_CHAR_DLG_EFFECT [ ExecMethod = Exec ; diff -Nru libreoffice-5.0.2/sw/sdi/drwtxtsh.sdi libreoffice-5.0.5~rc2/sw/sdi/drwtxtsh.sdi --- libreoffice-5.0.2/sw/sdi/drwtxtsh.sdi 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/sdi/drwtxtsh.sdi 2016-02-04 16:41:28.000000000 +0000 @@ -656,6 +656,14 @@ StateMethod = GetDrawTextCtrlState ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] + + SID_ATTR_CHAR_BACK_COLOR // api: + [ + ExecMethod = Execute ; + StateMethod = GetDrawTextCtrlState ; + DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; + ] + SID_ATTR_CHAR_WORDLINEMODE // status(final|play) [ ExecMethod = Execute ; diff -Nru libreoffice-5.0.2/sw/source/core/access/accpara.cxx libreoffice-5.0.5~rc2/sw/source/core/access/accpara.cxx --- libreoffice-5.0.2/sw/source/core/access/accpara.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/access/accpara.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -564,6 +564,8 @@ delete pPortionData; delete pHyperTextData; delete mpParaChangeTrackInfo; // #i108125# + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); } bool SwAccessibleParagraph::HasCursor() diff -Nru libreoffice-5.0.2/sw/source/core/attr/calbck.cxx libreoffice-5.0.5~rc2/sw/source/core/attr/calbck.cxx --- libreoffice-5.0.2/sw/source/core/attr/calbck.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/attr/calbck.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -22,12 +22,15 @@ #include #include #include +#include TYPEINIT0( SwClient ); SwClient::~SwClient() { + if(GetRegisteredIn()) + DBG_TESTSOLARMUTEX(); OSL_ENSURE( !pRegisteredIn || pRegisteredIn->HasWriterListeners(), "SwModify still known, but Client already disconnected!" ); if( pRegisteredIn && pRegisteredIn->HasWriterListeners() ) pRegisteredIn->Remove( this ); @@ -35,6 +38,7 @@ void SwClient::CheckRegistration( const SfxPoolItem* pOld, const SfxPoolItem* ) { + DBG_TESTSOLARMUTEX(); // this method only handles notification about dying SwModify objects if( (!pOld || pOld->Which() != RES_OBJECTDYING) ) return; @@ -58,6 +62,7 @@ SwModify::~SwModify() { + DBG_TESTSOLARMUTEX(); OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." ); if ( IsInCache() ) @@ -94,6 +99,7 @@ void SwModify::NotifyClients( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue ) { + DBG_TESTSOLARMUTEX(); if ( IsInCache() || IsInSwFntCache() ) { const sal_uInt16 nWhich = pOldValue ? pOldValue->Which() : @@ -144,6 +150,7 @@ void SwModify::Add( SwClient* pDepend ) { OSL_ENSURE( !bLockClientList, "Client inserted while in Modify" ); + DBG_TESTSOLARMUTEX(); if(pDepend->pRegisteredIn != this ) { @@ -187,6 +194,7 @@ if(m_bInDocDTOR) return nullptr; + DBG_TESTSOLARMUTEX(); assert(pDepend->pRegisteredIn == this); // SwClient is my listener diff -Nru libreoffice-5.0.2/sw/source/core/bastyp/calc.cxx libreoffice-5.0.5~rc2/sw/source/core/bastyp/calc.cxx --- libreoffice-5.0.2/sw/source/core/bastyp/calc.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/bastyp/calc.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1317,16 +1317,21 @@ break; case CALC_NAME: - if( GetToken() == CALC_ASSIGN ) + switch(SwCalcOper nOper = GetToken()) { - SwCalcExp* n = VarInsert( aVarName ); - GetToken(); - nErg = n->nValue = Expr(); - } - else - { - nErg = VarLook( aVarName )->nValue; - bChkPow = true; + case CALC_ASSIGN: + { + SwCalcExp* n = VarInsert(aVarName); + GetToken(); + nErg = n->nValue = Expr(); + } + break; + default: + nErg = VarLook(aVarName)->nValue; + if (nErg.IsVoidValue() && (nOper == CALC_LP)) + eError = CALC_SYNTAX; + else + bChkPow = true; } break; diff -Nru libreoffice-5.0.2/sw/source/core/crsr/crossrefbookmark.cxx libreoffice-5.0.5~rc2/sw/source/core/crsr/crossrefbookmark.cxx --- libreoffice-5.0.2/sw/source/core/crsr/crossrefbookmark.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/crsr/crossrefbookmark.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -84,7 +84,7 @@ const vcl::KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, CrossRefNumItemBookmark_NamePrefix) { } bool CrossRefNumItemBookmark::IsLegalName(const OUString& rName) diff -Nru libreoffice-5.0.2/sw/source/core/doc/docbm.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/docbm.cxx --- libreoffice-5.0.2/sw/source/core/doc/docbm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/docbm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1108,9 +1108,13 @@ OUStringBuffer sBuf; OUString sTmp; - // Try the name "XXX", where XXX is a number. Start the number at the existing count rather than 1 - // in order to increase the chance that already the first one will not exist. - sal_Int32 nCnt = m_vAllMarks.size() + 1; + // try the name "XXX" (where XXX is a number starting from 1) unless there is + // a unused name. Due to performance-reasons (especially in mailmerge-Szenarios) there + // is a map m_aMarkBasenameMapUniqueOffset which holds the next possible offset (XXX) for + // rName (so there is no need to test for nCnt-values smaller than the offset). + sal_Int32 nCnt = 1; + MarkBasenameMapUniqueOffset_t::const_iterator aIter = m_aMarkBasenameMapUniqueOffset.find(rName); + if(aIter != m_aMarkBasenameMapUniqueOffset.end()) nCnt = aIter->second; while(nCnt < SAL_MAX_INT32) { sTmp = sBuf.append(rName).append(nCnt).makeStringAndClear(); @@ -1120,6 +1124,8 @@ break; } } + m_aMarkBasenameMapUniqueOffset[rName] = nCnt; + return sTmp; } diff -Nru libreoffice-5.0.2/sw/source/core/doc/doc.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/doc.cxx --- libreoffice-5.0.2/sw/source/core/doc/doc.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/doc.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1100,14 +1100,14 @@ { if( pTextNode->GetWrong() && pTextNode->GetWrong()->InvalidateWrong() ) - pTextNode->SetWrongDirty( true ); + pTextNode->SetWrongDirty(SwTextNode::WrongState::TODO); if( pTextNode->GetGrammarCheck() && pTextNode->GetGrammarCheck()->InvalidateWrong() ) pTextNode->SetGrammarCheckDirty( true ); } else { - pTextNode->SetWrongDirty( true ); + pTextNode->SetWrongDirty(SwTextNode::WrongState::TODO); if( pTextNode->GetWrong() ) pTextNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING ); pTextNode->SetGrammarCheckDirty( true ); diff -Nru libreoffice-5.0.2/sw/source/core/doc/docnew.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/docnew.cxx --- libreoffice-5.0.2/sw/source/core/doc/docnew.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/docnew.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -896,6 +896,7 @@ SwPageDesc *const pTargetPageDesc, bool const bDeletePrevious, int pageOffset) { // GetEndOfExtras + 1 = StartOfContent == no content node! + // this ensures, that we have at least two nodes in the SwPaM. // @see IDocumentContentOperations::CopyRange SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 ); SwNodeIndex aSourceEndIdx( rSource.GetNodes().GetEndOfContent(), -1 ); diff -Nru libreoffice-5.0.2/sw/source/core/doc/DocumentContentOperationsManager.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/DocumentContentOperationsManager.cxx --- libreoffice-5.0.2/sw/source/core/doc/DocumentContentOperationsManager.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/DocumentContentOperationsManager.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -122,7 +122,8 @@ /* The lcl_CopyBookmarks function has to copy bookmarks from the source to the destination nodes array. It is called after a call of the _CopyNodes(..) function. But this function does not copy - every node (at least at the moment: 2/08/2006 ), section start and end nodes will not be copied if the corresponding end/start node is outside the copied pam. + every node (at least at the moment: 2/08/2006 ), section start and end nodes will not be copied + if the corresponding end/start node is outside the copied pam. The lcl_NonCopyCount function counts the number of these nodes, given the copied pam and a node index inside the pam. rPam is the original source pam, rLastIdx is the last calculated position, rDelCount the number @@ -136,6 +137,13 @@ sal_uLong nEnd = rPam.End()->nNode.GetIndex(); if( rLastIdx.GetIndex() < nNewIdx ) // Moving forward? { + // We never copy the StartOfContent node + // Special handling for SwDoc::AppendDoc + if( rPam.GetDoc()->GetNodes().GetEndOfExtras().GetIndex() + 1 == nStart ) + { + ++rDelCount; + ++rLastIdx; + } do // count "non-copy" nodes { SwNode& rNode = rLastIdx.GetNode(); @@ -1584,7 +1592,7 @@ bool bColumnSel = pDoc->IsClipBoard() && pDoc->IsColumnSelection(); // Catch if there's no copy to do - if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) ) + if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) ) return false; // Prevent copying in Flys that are anchored in the area @@ -3129,29 +3137,27 @@ const SwNodeRange& rRg, const sal_Int32 nEndContentIndex, const SwNodeIndex& rInsPos, - const SwPaM* pCopiedPaM, + const std::pair* pCopiedPaM /*and real insert pos*/, const bool bMakeNewFrms, const bool bDelRedlines, - const bool bCopyFlyAtFly, - const bool bMergedFirstNode ) const + const bool bCopyFlyAtFly ) const { + assert(!pCopiedPaM || pCopiedPaM->first.End()->nContent == nEndContentIndex); + assert(!pCopiedPaM || pCopiedPaM->first.End()->nNode == rRg.aEnd); + SwDoc* pDest = rInsPos.GetNode().GetDoc(); _SaveRedlEndPosForRestore aRedlRest( rInsPos, 0 ); SwNodeIndex aSavePos( rInsPos, -1 ); bool bEndIsEqualEndPos = rInsPos == rRg.aEnd; - SwNodeRange aRg( rRg ); - if ( bMergedFirstNode ) - aRg.aStart++; - if ( aRg.aStart <= aRg.aEnd ) - m_rDoc.GetNodes()._CopyNodes( aRg, rInsPos, bMakeNewFrms, true ); - if ( !bMergedFirstNode ) - ++aSavePos; - if ( bEndIsEqualEndPos ) + m_rDoc.GetNodes()._CopyNodes( rRg, rInsPos, bMakeNewFrms, true ); + ++aSavePos; + if( bEndIsEqualEndPos ) const_cast(rRg.aEnd) = aSavePos; aRedlRest.Restore(); + #if OSL_DEBUG_LEVEL > 0 { //JP 17.06.99: Bug 66973 - check count only if the selection is in @@ -3165,9 +3171,9 @@ !aTmpI.GetNode().IsEndNode() ) { // If the range starts with a SwStartNode, it isn't copied - sal_uInt16 offset = (aRg.aStart.GetNode().GetNodeType() != ND_STARTNODE) ? 1 : 0; + sal_uInt16 offset = (rRg.aStart.GetNode().GetNodeType() != ND_STARTNODE) ? 1 : 0; OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() == - aRg.aEnd.GetIndex() - aRg.aStart.GetIndex() - 1 + offset, + rRg.aEnd.GetIndex() - rRg.aStart.GetIndex() - 1 + offset, "An insufficient number of nodes were copied!" ); } } @@ -3175,20 +3181,30 @@ { ::sw::UndoGuard const undoGuard(pDest->GetIDocumentUndoRedo()); - CopyFlyInFlyImpl( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly, bMergedFirstNode ); + CopyFlyInFlyImpl( rRg, nEndContentIndex, aSavePos, bCopyFlyAtFly ); } SwNodeRange aCpyRange( aSavePos, rInsPos ); // Also copy all bookmarks + // guess this must be done before the _DelDummyNodes below as that + // deletes nodes so would mess up the index arithmetic if( m_rDoc.getIDocumentMarkAccess()->getAllMarksCount() ) { SwPaM aRgTmp( rRg.aStart, rRg.aEnd ); - SwPaM aCpyTmp( aCpyRange.aStart, aCpyRange.aEnd ); + SwPaM aCpyPaM(aCpyRange.aStart, aCpyRange.aEnd); + if (pCopiedPaM && rRg.aStart != pCopiedPaM->first.Start()->nNode) + { + // there is 1 (partially selected, maybe) paragraph before + assert(SwNodeIndex(rRg.aStart, -1) == pCopiedPaM->first.Start()->nNode); + // only use the passed in target SwPosition if the source PaM point + // is on a different node; if it was the same node then the target + // position was likely moved along by the copy operation and now + // points to the end of the range! + *aCpyPaM.GetPoint() = pCopiedPaM->second; + } - lcl_CopyBookmarks( - pCopiedPaM != NULL ? *pCopiedPaM : aRgTmp, - aCpyTmp ); + lcl_CopyBookmarks((pCopiedPaM) ? pCopiedPaM->first : aRgTmp, aCpyPaM); } if( bDelRedlines && ( nsRedlineMode_t::REDLINE_DELETE_REDLINES & pDest->getIDocumentRedlineAccess().GetRedlineMode() )) @@ -3197,12 +3213,17 @@ pDest->GetNodes()._DelDummyNodes( aCpyRange ); } +// TODO: there is a limitation here in that it's not possible to pass a start +// content index - which means that at-character anchored frames inside +// partial 1st paragraph of redline is not copied. +// But the DelFlyInRange() that is called from DelCopyOfSection() does not +// delete it either, and it also does not delete those on partial last para of +// redline, so copying those is supressed here too ... void DocumentContentOperationsManager::CopyFlyInFlyImpl( const SwNodeRange& rRg, const sal_Int32 nEndContentIndex, const SwNodeIndex& rStartIdx, - const bool bCopyFlyAtFly, - const bool bMergedFirstNode ) const + const bool bCopyFlyAtFly ) const { // First collect all Flys, sort them according to their ordering number, // and then only copy them. This maintains the ordering numbers (which are only @@ -3335,8 +3356,6 @@ ++aIdx; } - if ( bMergedFirstNode ) - nAnchorTextNdNumInRange--; if ( !bAnchorTextNdFound ) { @@ -4105,7 +4124,7 @@ SwPosition* pEnd = rPam.End(); // Catch when there's no copy to do. - if( !rPam.HasMark() || ( *pStt > *pEnd && !bColumnSel ) || + if( !rPam.HasMark() || ( *pStt >= *pEnd && !bColumnSel ) || //JP 29.6.2001: 88963 - dont copy if inspos is in region of start to end //JP 15.11.2001: don't test inclusive the end, ever exclusive ( pDoc == &m_rDoc && *pStt <= rPos && rPos < *pEnd )) @@ -4193,8 +4212,6 @@ pNumRuleToPropagate = 0; } - bool bHandledStartNode = false; - // This do/while block is only there so that we can break out of it! do { if( pSttTextNd ) @@ -4202,8 +4219,6 @@ // Don't copy the beginning completely? if( !bCopyCollFormat || bColumnSel || pStt->nContent.GetIndex() ) { - bHandledStartNode = true; - SwIndex aDestIdx( rPos.nContent ); bool bCopyOk = false; if( !pDestTextNd ) @@ -4279,11 +4294,18 @@ pEnd->nContent -= nCpyLen; } - if( bCopyCollFormat && bOneNode ) + if( bOneNode ) { - pSttTextNd->CopyCollFormat( *pDestTextNd ); - POP_NUMRULE_STATE + if (bCopyCollFormat) + { + pSttTextNd->CopyCollFormat( *pDestTextNd ); + POP_NUMRULE_STATE + } + + break; } + + aRg.aStart++; } } else if( pDestTextNd ) @@ -4340,7 +4362,7 @@ } pDestTextNd = aInsPos.GetNode().GetTextNode(); - if( pEndTextNd && (!bOneNode || !bHandledStartNode) ) + if (pEndTextNd) { SwIndex aDestIdx( rPos.nContent ); if( !pDestTextNd ) @@ -4384,7 +4406,7 @@ if( bCopyAll || aRg.aStart != aRg.aEnd ) { SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange ); - if( !bOneNode && pSttTextNd && bCopyCollFormat && pDestTextNd->HasSwAttrSet() ) + if (pSttTextNd && bCopyCollFormat && pDestTextNd->HasSwAttrSet()) { aBrkSet.Put( *pDestTextNd->GetpSwAttrSet() ); if( SfxItemState::SET == aBrkSet.GetItemState( RES_BREAK, false ) ) @@ -4393,18 +4415,26 @@ pDestTextNd->ResetAttr( RES_PAGEDESC ); } + SwPosition startPos(SwNodeIndex(pCopyPam->GetPoint()->nNode, +1), + SwIndex(SwNodeIndex(pCopyPam->GetPoint()->nNode, +1).GetNode().GetContentNode())); + if (bCanMoveBack) + { // pCopyPam is actually 1 before the copy range so move it fwd + SwPaM temp(*pCopyPam->GetPoint()); + temp.Move(fnMoveForward, fnGoContent); + startPos = *temp.GetPoint(); + } + assert(startPos.nNode.GetNode().IsContentNode()); + std::pair tmp(rPam, startPos); if( aInsPos == pEnd->nNode ) { SwNodeIndex aSaveIdx( aInsPos, -1 ); - CopyWithFlyInFly( aRg, 0, aInsPos, &rPam, bMakeNewFrms, - false, false, bHandledStartNode ); + CopyWithFlyInFly( aRg, 0, aInsPos, &tmp, bMakeNewFrms, false ); ++aSaveIdx; pEnd->nNode = aSaveIdx; pEnd->nContent.Assign( aSaveIdx.GetNode().GetTextNode(), 0 ); } else - CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam, - bMakeNewFrms, false, false, bHandledStartNode ); + CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &tmp, bMakeNewFrms, false ); bCopyBookmarks = false; diff -Nru libreoffice-5.0.2/sw/source/core/doc/DocumentStatisticsManager.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/DocumentStatisticsManager.cxx --- libreoffice-5.0.2/sw/source/core/doc/DocumentStatisticsManager.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/DocumentStatisticsManager.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -77,11 +77,14 @@ maStatsUpdateTimer.SetTimeoutHdl( LINK( this, DocumentStatisticsManager, DoIdleStatsUpdate ) ); } -void DocumentStatisticsManager::DocInfoChgd( ) +void DocumentStatisticsManager::DocInfoChgd(bool const isEnableSetModified) { m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )->UpdateFields(); m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD )->UpdateFields(); - m_rDoc.getIDocumentState().SetModified(); + if (isEnableSetModified) + { + m_rDoc.getIDocumentState().SetModified(); + } } const SwDocStat& DocumentStatisticsManager::GetDocStat() const diff -Nru libreoffice-5.0.2/sw/source/core/doc/extinput.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/extinput.cxx --- libreoffice-5.0.2/sw/source/core/doc/extinput.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/extinput.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -59,6 +59,9 @@ sal_Int32 nEndCnt = GetMark()->nContent.GetIndex(); if( nEndCnt != nSttCnt ) { + // Prevent IME edited text being grouped with non-IME edited text. + bool bKeepGroupUndo = pDoc->GetIDocumentUndoRedo().DoesGroupUndo(); + pDoc->GetIDocumentUndoRedo().DoGroupUndo(false); if( nEndCnt < nSttCnt ) { std::swap(nSttCnt, nEndCnt); @@ -66,24 +69,6 @@ // In order to get Undo/Redlining etc. working correctly, // we need to go through the Doc interface - if(eInputLanguage != LANGUAGE_DONTKNOW) - { - // #i41974# Only set language attribute - // for CJK/CTL scripts. - bool bLang = true; - sal_uInt16 nWhich = RES_CHRATR_LANGUAGE; - switch(SvtLanguageOptions::GetI18NScriptTypeOfLanguage(eInputLanguage)) - { - case i18n::ScriptType::ASIAN: nWhich = RES_CHRATR_CJK_LANGUAGE; break; - case i18n::ScriptType::COMPLEX: nWhich = RES_CHRATR_CTL_LANGUAGE; break; - default: bLang = false; - } - if ( bLang ) - { - SvxLanguageItem aLangItem( eInputLanguage, nWhich ); - pDoc->getIDocumentContentOperations().InsertPoolItem(*this, aLangItem ); - } - } rIdx = nSttCnt; const OUString sText( pTNd->GetText().copy(nSttCnt, nEndCnt - nSttCnt)); if( bIsOverwriteCursor && !sOverwriteText.isEmpty() ) @@ -124,6 +109,28 @@ pDoc->getIDocumentContentOperations().InsertString( *this, sText ); } } + pDoc->GetIDocumentUndoRedo().DoGroupUndo(bKeepGroupUndo); + if (eInputLanguage != LANGUAGE_DONTKNOW) + { + sal_uInt16 nWhich = RES_CHRATR_LANGUAGE; + sal_Int16 nScriptType = SvtLanguageOptions::GetI18NScriptTypeOfLanguage(eInputLanguage); + switch(nScriptType) + { + case i18n::ScriptType::ASIAN: + nWhich = RES_CHRATR_CJK_LANGUAGE; break; + case i18n::ScriptType::COMPLEX: + nWhich = RES_CHRATR_CTL_LANGUAGE; break; + } + // #i41974# Only set language attribute for CJK/CTL scripts. + if (RES_CHRATR_LANGUAGE != nWhich && pTNd->GetLang( nSttCnt, nEndCnt-nSttCnt, nScriptType) != eInputLanguage) + { + SvxLanguageItem aLangItem( eInputLanguage, nWhich ); + rIdx = nSttCnt; + GetMark()->nContent = nEndCnt; + pDoc->getIDocumentContentOperations().InsertPoolItem(*this, aLangItem ); + } + + } } } } diff -Nru libreoffice-5.0.2/sw/source/core/doc/notxtfrm.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/notxtfrm.cxx --- libreoffice-5.0.2/sw/source/core/doc/notxtfrm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/notxtfrm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -897,10 +897,11 @@ { Size aTmpSz; ::sfx2::SvLinkSource* pGrfObj = pGrfNd->GetLink()->GetObj(); - if( !pGrfObj || - !pGrfObj->IsDataComplete() || - !(aTmpSz = pGrfNd->GetTwipSize()).Width() || - !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) + if ( ( !pGrfObj || + !pGrfObj->IsDataComplete() || + !(aTmpSz = pGrfNd->GetTwipSize()).Width() || + !aTmpSz.Height() || !pGrfNd->GetAutoFormatLvl() ) && + !pGrfNd->IsUpdateLinkInProgress() ) { pGrfNd->TriggerAsyncRetrieveInputStream(); // #i73788# } @@ -909,9 +910,13 @@ GetRealURL( *pGrfNd, aText ); ::lcl_PaintReplacement( aAlignedGrfArea, aText, *pShell, this, false ); bContinue = false; + } else if ( rGrfObj.GetType() != GRAPHIC_DEFAULT && + rGrfObj.GetType() != GRAPHIC_NONE && + pGrfNd->IsUpdateLinkInProgress() ) + { + pGrfNd->SetUpdateLinkInProgress( false ); } } - if( bContinue ) { if( rGrfObj.GetGraphic().IsSupportedGraphic()) diff -Nru libreoffice-5.0.2/sw/source/core/doc/tblrwcl.cxx libreoffice-5.0.5~rc2/sw/source/core/doc/tblrwcl.cxx --- libreoffice-5.0.2/sw/source/core/doc/tblrwcl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/doc/tblrwcl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1613,17 +1613,15 @@ _InsULPara aPara( pTableNd, true, true, pLeftBox, pMergeBox, pRightBox, pInsLine ); // Move the overlapping upper/lower Lines of the selected Area - _FndBoxes& rLineBoxes = pFndBox->GetLines().front().GetBoxes(); - for (_FndBoxes::iterator it = rLineBoxes.begin(); it != rLineBoxes.end(); ++it) + for (auto & it : pFndBox->GetLines().front().GetBoxes()) { - lcl_Merge_MoveBox(*it, &aPara); + lcl_Merge_MoveBox(it, &aPara); } aPara.SetLower( pInsLine ); const auto nEnd = pFndBox->GetLines().size()-1; - rLineBoxes = pFndBox->GetLines()[nEnd].GetBoxes(); - for (_FndBoxes::iterator it = rLineBoxes.begin(); it != rLineBoxes.end(); ++it) + for (auto & it : pFndBox->GetLines()[nEnd].GetBoxes()) { - lcl_Merge_MoveBox(*it, &aPara); + lcl_Merge_MoveBox(it, &aPara); } // Move the Boxes extending into the selected Area from left/right diff -Nru libreoffice-5.0.2/sw/source/core/docnode/ndtbl.cxx libreoffice-5.0.5~rc2/sw/source/core/docnode/ndtbl.cxx --- libreoffice-5.0.2/sw/source/core/docnode/ndtbl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/docnode/ndtbl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -4043,7 +4043,7 @@ SfxItemSet aBoxSet( GetAttrPool(), RES_BOXATR_FORMAT, RES_BOXATR_VALUE ); bool bLockModify = true; - bool bSetNumberFormat = false; + bool bSetNumberFormat = IsInsTableFormatNum(); const bool bForceNumberFormat = IsInsTableFormatNum() && IsInsTableChangeNumFormat(); // if the user forced a number format in this cell previously, diff -Nru libreoffice-5.0.2/sw/source/core/fields/cellfml.cxx libreoffice-5.0.5~rc2/sw/source/core/fields/cellfml.cxx --- libreoffice-5.0.2/sw/source/core/fields/cellfml.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/fields/cellfml.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -366,8 +366,10 @@ // calculate the value of the box if ( pSttBox->getRowSpan() >= 1 ) { + rNewStr += "("; rNewStr += pCalcPara->rCalc.GetStrResult( pSttBox->GetValue( *pCalcPara ), false ); + rNewStr += ")"; } } else diff -Nru libreoffice-5.0.2/sw/source/core/graphic/ndgrf.cxx libreoffice-5.0.5~rc2/sw/source/core/graphic/ndgrf.cxx --- libreoffice-5.0.2/sw/source/core/graphic/ndgrf.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/graphic/ndgrf.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -71,6 +71,7 @@ mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), + mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) { maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) ); @@ -89,6 +90,7 @@ mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), + mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) { maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) ); @@ -112,6 +114,7 @@ mpReplacementGraphic(0), // #i73788# mbLinkedInputStreamReady( false ), + mbUpdateLinkInProgress( false ), mbIsStreamReadOnly( false ) { maGrfObj.SetSwapStreamHdl( LINK(this, SwGrfNode, SwapGraphic) ); @@ -521,7 +524,6 @@ bool bRet = false; bInSwapIn = true; SwBaseLink* pLink = static_cast((::sfx2::SvBaseLink*) refLink); - if( pLink ) { if( GRAPHIC_NONE == maGrfObj.GetType() || @@ -1089,7 +1091,6 @@ OSL_FAIL( " - Method is misused. Method call is only valid for graphic nodes, which refer a linked graphic file" ); return; } - if ( mpThreadConsumer.get() == 0 ) { mpThreadConsumer.reset( new SwAsyncRetrieveInputStreamThreadConsumer( *this ) ); @@ -1104,6 +1105,7 @@ } mpThreadConsumer->CreateThread( sGrfNm, sReferer ); } + } @@ -1137,6 +1139,7 @@ // #i88291# mxInputStream.clear(); GetLink()->clearStreamToLoadFrom(); + mbUpdateLinkInProgress = true; mbLinkedInputStreamReady = false; mpThreadConsumer.reset(); } diff -Nru libreoffice-5.0.2/sw/source/core/inc/DocumentContentOperationsManager.hxx libreoffice-5.0.5~rc2/sw/source/core/inc/DocumentContentOperationsManager.hxx --- libreoffice-5.0.2/sw/source/core/inc/DocumentContentOperationsManager.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/inc/DocumentContentOperationsManager.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -103,16 +103,14 @@ void CopyWithFlyInFly( const SwNodeRange& rRg, const sal_Int32 nEndContentIndex, const SwNodeIndex& rInsPos, - const SwPaM* pCopiedPaM = NULL, + const std::pair * pCopiedPaM = nullptr, bool bMakeNewFrms = true, bool bDelRedlines = true, - bool bCopyFlyAtFly = false, - const bool bMergedFirstNode = false ) const; + bool bCopyFlyAtFly = false ) const; void CopyFlyInFlyImpl( const SwNodeRange& rRg, const sal_Int32 nEndContentIndex, const SwNodeIndex& rStartIdx, - const bool bCopyFlyAtFly = false, - const bool bMergedFirstNode = false ) const; + const bool bCopyFlyAtFly = false ) const; /// Parameters for _Rst and lcl_SetTextFormatColl //originallyfrom docfmt.cxx diff -Nru libreoffice-5.0.2/sw/source/core/inc/DocumentStatisticsManager.hxx libreoffice-5.0.5~rc2/sw/source/core/inc/DocumentStatisticsManager.hxx --- libreoffice-5.0.2/sw/source/core/inc/DocumentStatisticsManager.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/inc/DocumentStatisticsManager.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -37,7 +37,7 @@ DocumentStatisticsManager( SwDoc& i_rSwdoc ); - void DocInfoChgd() SAL_OVERRIDE; + void DocInfoChgd(bool isEnableSetModified) SAL_OVERRIDE; const SwDocStat &GetDocStat() const SAL_OVERRIDE; SwDocStat & GetDocStat(); //Non const version of the above, not part of the interface. const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true) SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/sw/source/core/inc/MarkManager.hxx libreoffice-5.0.5~rc2/sw/source/core/inc/MarkManager.hxx --- libreoffice-5.0.2/sw/source/core/inc/MarkManager.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/inc/MarkManager.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -27,6 +27,7 @@ namespace sw { namespace mark { + typedef std::unordered_map MarkBasenameMapUniqueOffset_t; class MarkManager : private ::boost::noncopyable @@ -109,6 +110,7 @@ container_t m_vFieldmarks; std::unordered_set m_aMarkNamesSet; + mutable MarkBasenameMapUniqueOffset_t m_aMarkBasenameMapUniqueOffset; // container for annotation marks container_t m_vAnnotationMarks; diff -Nru libreoffice-5.0.2/sw/source/core/inc/scriptinfo.hxx libreoffice-5.0.5~rc2/sw/source/core/inc/scriptinfo.hxx --- libreoffice-5.0.2/sw/source/core/inc/scriptinfo.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/inc/scriptinfo.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -37,7 +37,7 @@ class SwScriptInfo { public: - enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE }; + enum CompType { KANA, SPECIAL_LEFT, SPECIAL_RIGHT, NONE, SPECIAL_MIDDLE}; private: //! Records a single change in script type. @@ -255,6 +255,7 @@ // modifies the kerning array according to a given compress value long Compress( long* pKernArray, sal_Int32 nIdx, sal_Int32 nLen, const sal_uInt16 nCompress, const sal_uInt16 nFontHeight, + const bool bCentered, Point* pPoint = NULL ) const; /** Performs a kashida justification on the kerning array diff -Nru libreoffice-5.0.2/sw/source/core/inc/wrong.hxx libreoffice-5.0.5~rc2/sw/source/core/inc/wrong.hxx --- libreoffice-5.0.2/sw/source/core/inc/wrong.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/inc/wrong.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -211,7 +211,8 @@ inline void Validate(){ nBeginInvalid = nEndInvalid = COMPLETE_STRING; } void Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ); bool InvalidateWrong(); - bool Fresh( sal_Int32 &rStart, sal_Int32 &rEnd, sal_Int32 nPos, + enum class FreshState { FRESH, CURSOR, NOTHING }; + FreshState Fresh( sal_Int32 &rStart, sal_Int32 &rEnd, sal_Int32 nPos, sal_Int32 nLen, sal_uInt16 nIndex, sal_Int32 nCursorPos ); sal_uInt16 GetWrongPos( sal_Int32 nValue ) const; diff -Nru libreoffice-5.0.2/sw/source/core/layout/hffrm.cxx libreoffice-5.0.5~rc2/sw/source/core/layout/hffrm.cxx --- libreoffice-5.0.2/sw/source/core/layout/hffrm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/layout/hffrm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -246,6 +246,7 @@ pFrm->_InvalidatePos(); aOldFooterPrtPos = Frm().Pos() + Prt().Pos(); } + int nLoopControl = 0; while( pFrm ) { pFrm->Calc(getRootFrm()->GetCurrShell()->GetOut()); @@ -263,9 +264,14 @@ if ( !SwObjectFormatter::FormatObjsAtFrm( *pFrm, *(pFrm->FindPageFrm()) ) ) { - // restart format with first content - pFrm = Lower(); - continue; + if (nLoopControl++ < 20) + { + // restart format with first content + pFrm = Lower(); + continue; + } + else + SAL_WARN("sw", "SwHeadFootFrm::FormatSize: loop detection triggered"); } } pFrm = pFrm->GetNext(); diff -Nru libreoffice-5.0.2/sw/source/core/layout/layact.cxx libreoffice-5.0.5~rc2/sw/source/core/layout/layact.cxx --- libreoffice-5.0.2/sw/source/core/layout/layact.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/layout/layact.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1931,7 +1931,8 @@ case ONLINE_SPELLING : { SwRect aRepaint( const_cast(static_cast(pCnt))->_AutoSpell( pContentNode, nTextPos ) ); - bPageValid = bPageValid && !pTextNode->IsWrongDirty(); + // tdf#92036 PENDING should stop idle spell checking + bPageValid = bPageValid && (SwTextNode::WrongState::TODO != pTextNode->GetWrongDirty()); if( !bPageValid ) bAllValid = false; if ( aRepaint.HasArea() ) @@ -1942,7 +1943,9 @@ } case AUTOCOMPLETE_WORDS : const_cast(static_cast(pCnt))->CollectAutoCmplWrds( pContentNode, nTextPos ); - if ( Application::AnyInput( VCL_INPUT_ANY ) ) + // note: bPageValid remains true here even if the cursor + // position is skipped, so no PENDING state needed currently + if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER))) return true; break; case WORD_COUNT : diff -Nru libreoffice-5.0.2/sw/source/core/layout/trvlfrm.cxx libreoffice-5.0.5~rc2/sw/source/core/layout/trvlfrm.cxx --- libreoffice-5.0.2/sw/source/core/layout/trvlfrm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/layout/trvlfrm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2429,8 +2429,7 @@ { lLeft = (pStartFrm->Frm().*fnRect->fnGetLeft)() + (pStartFrm->Prt().*fnRect->fnGetLeft)(); - lRight = (pStartFrm->Frm().*fnRect->fnGetLeft)() + - (pStartFrm->Prt().*fnRect->fnGetRight)(); + lRight = (aEndFrm.*fnRect->fnGetRight)(); } if( lLeft < (aStFrm.*fnRect->fnGetLeft)() ) lLeft = (aStFrm.*fnRect->fnGetLeft)(); diff -Nru libreoffice-5.0.2/sw/source/core/objectpositioning/anchoredobjectposition.cxx libreoffice-5.0.5~rc2/sw/source/core/objectpositioning/anchoredobjectposition.cxx --- libreoffice-5.0.2/sw/source/core/objectpositioning/anchoredobjectposition.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/objectpositioning/anchoredobjectposition.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -484,8 +484,10 @@ SwFrameFormat* pFrameFormat = ::FindFrameFormat(&GetObject()); SwFormatFrmSize aSize(pFormat->GetFrmSize()); SwTwips nShrinked = aSize.GetHeight() - (nProposedRelPosY - nAdjustedRelPosY); - aSize.SetHeight( nShrinked > 0 ? nShrinked : 0 ); - pFrameFormat->SetFormatAttr(aSize); + if (nShrinked >= 0) { + aSize.SetHeight( nShrinked ); + pFrameFormat->SetFormatAttr(aSize); + } nAdjustedRelPosY = nProposedRelPosY; } else if ( SwTextBoxHelper::findTextBox(pFormat) ) // when the shape has a textbox, use only the proposed vertical position diff -Nru libreoffice-5.0.2/sw/source/core/text/frmform.cxx libreoffice-5.0.5~rc2/sw/source/core/text/frmform.cxx --- libreoffice-5.0.2/sw/source/core/text/frmform.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/frmform.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1909,12 +1909,20 @@ sal_Int32 nStart = GetOfst(); const sal_Int32 nEnd = GetFollow() ? GetFollow()->GetOfst() : aInf.GetText().getLength(); + + int nLoopProtection = 0; do { - sal_Int32 nShift = aLine.FormatLine(nStart) - nStart; - nStart += nShift; - if ((nShift != 0) // Check for special case: line is invisible, - // like in too thin table cell: tdf#66141 + sal_Int32 nNewStart = aLine.FormatLine(nStart); + if (nNewStart == nStart) + ++nLoopProtection; + else + nLoopProtection = 0; + nStart = nNewStart; + const bool bWillEndlessInsert = nLoopProtection > 250; + SAL_WARN_IF(bWillEndlessInsert, "sw", "loop detection triggered"); + if ((!bWillEndlessInsert) // Check for special case: line is invisible, + // like in too thin table cell: tdf#66141 && (aInf.IsNewLine() || (!aInf.IsStop() && nStart < nEnd))) aLine.Insert( new SwLineLayout() ); } while( aLine.Next() ); diff -Nru libreoffice-5.0.2/sw/source/core/text/itratr.cxx libreoffice-5.0.5~rc2/sw/source/core/text/itratr.cxx --- libreoffice-5.0.2/sw/source/core/text/itratr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/itratr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -434,15 +434,17 @@ { const SwFormatAnchor& rFormatA = pNd->GetAnchor(); - if ((FLY_AT_PARA == rFormatA.GetAnchorId()) || - (FLY_AT_CHAR == rFormatA.GetAnchorId())) + if ((FLY_AT_PARA != rFormatA.GetAnchorId()) && + (FLY_AT_CHAR != rFormatA.GetAnchorId())) { - const SwPosition *pPos = rFormatA.GetContentAnchor(); - OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); - if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) - return; + return; } + const SwPosition *pPos = rFormatA.GetContentAnchor(); + OSL_ENSURE(pPos && pIn, "Unexpected NULL arguments"); + if (!pPos || !pIn || pIn->nIndx != pPos->nNode.GetIndex()) + return; + long nMin, nMax; SwHTMLTableLayout *pLayout = 0; const bool bIsDrawFrameFormat = pNd->Which()==RES_DRAWFRMFMT; diff -Nru libreoffice-5.0.2/sw/source/core/text/itrcrsr.cxx libreoffice-5.0.5~rc2/sw/source/core/text/itrcrsr.cxx --- libreoffice-5.0.2/sw/source/core/text/itrcrsr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/itrcrsr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1265,7 +1265,7 @@ // x is the horizontal offset within the line. SwTwips x = rPoint.X(); const SwTwips nLeftMargin = GetLineStart(); - SwTwips nRightMargin = GetLineEnd(); + SwTwips nRightMargin = GetLineEnd() + GetCurr()->GetHangingMargin(); if( nRightMargin == nLeftMargin ) nRightMargin += 30; diff -Nru libreoffice-5.0.2/sw/source/core/text/itrpaint.cxx libreoffice-5.0.5~rc2/sw/source/core/text/itrpaint.cxx --- libreoffice-5.0.2/sw/source/core/text/itrpaint.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/itrpaint.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -236,7 +236,7 @@ // we calculate Y value for the whole line SwTextGridItem const*const pGrid(GetGridItem(GetTextFrm()->FindPageFrm())); const bool bAdjustBaseLine = - ( !GetTextFrm()->IsVertical() || GetLineInfo().HasSpecialAlign( true ) ) && (! GetTextFrm()->IsInFly()) && + GetLineInfo().HasSpecialAlign( GetTextFrm()->IsVertical() ) || ( 0 != pGrid ); const SwTwips nLineBaseLine = GetInfo().GetPos().Y() + nTmpAscent; if ( ! bAdjustBaseLine ) @@ -423,7 +423,7 @@ if ( bAdjustBaseLine ) GetInfo().Y( GetInfo().GetPos().Y() + AdjustBaseLine( *pCurr, &aEnd ) ); - + GetInfo().X( GetInfo().X() + GetCurr()->GetHangingMargin() ); aEnd.Paint( GetInfo() ); GetInfo().Y( nOldY ); } diff -Nru libreoffice-5.0.2/sw/source/core/text/porlay.cxx libreoffice-5.0.5~rc2/sw/source/core/text/porlay.cxx --- libreoffice-5.0.2/sw/source/core/text/porlay.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/porlay.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -874,12 +874,15 @@ eState = SPECIAL_LEFT; break; // Right punctuation found - case 0x3001: case 0x3002: case 0x3009: case 0x300B: + case 0x3009: case 0x300B: case 0x300D: case 0x300F: case 0x3011: case 0x3015: case 0x3017: case 0x3019: case 0x301B: case 0x301E: case 0x301F: eState = SPECIAL_RIGHT; break; + case 0x3001: case 0x3002: // Fullstop or comma + eState = SPECIAL_MIDDLE ; + break; default: eState = ( 0x3040 <= cChar && 0x3100 > cChar ) ? KANA : NONE; } @@ -1509,6 +1512,7 @@ long SwScriptInfo::Compress( long* pKernArray, sal_Int32 nIdx, sal_Int32 nLen, const sal_uInt16 nCompress, const sal_uInt16 nFontHeight, + bool bCenter, Point* pPoint ) const { SAL_WARN_IF( !nCompress, "sw.core", "Compression without compression?!" ); @@ -1571,7 +1575,7 @@ long nMove = 0; if( SwScriptInfo::KANA != nType ) { - nLast /= 20000; + nLast /= 24000; if( pPoint && SwScriptInfo::SPECIAL_LEFT == nType ) { if( nI ) @@ -1582,12 +1586,14 @@ nLast = 0; } } + else if( bCenter && SwScriptInfo::SPECIAL_MIDDLE == nType ) + nMove = nLast / 2; } else nLast /= 100000; nSub -= nLast; nLast = pKernArray[ nI ]; - if( nMove ) + if( nI && nMove ) pKernArray[ nI - 1 ] += nMove; pKernArray[ nI++ ] -= nSub; ++nIdx; diff -Nru libreoffice-5.0.2/sw/source/core/text/portxt.cxx libreoffice-5.0.5~rc2/sw/source/core/text/portxt.cxx --- libreoffice-5.0.2/sw/source/core/text/portxt.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/portxt.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -655,58 +655,9 @@ SetWhichPor( POR_INPUTFLD ); } -bool SwTextInputFieldPortion::Format( SwTextFormatInfo &rInf ) +bool SwTextInputFieldPortion::Format(SwTextFormatInfo &rTextFormatInfo) { - mbContainsInputFieldStart = - rInf.GetChar( rInf.GetIdx() ) == CH_TXT_ATR_INPUTFIELDSTART; - mbContainsInputFieldEnd = - rInf.GetChar( rInf.GetIdx() + rInf.GetLen() - 1 ) == CH_TXT_ATR_INPUTFIELDEND; - - bool bRet = false; - if ( rInf.GetLen() == 1 - && ( mbContainsInputFieldStart || mbContainsInputFieldEnd ) ) - { - Width( 0 ); - } - else - { - SwTextSlot aFormatText( &rInf, this, true, true ); - if ( rInf.GetLen() == 0 ) - { - Width( 0 ); - } - else - { - const sal_Int32 nFormerLineStart = rInf.GetLineStart(); - if ( !mbContainsInputFieldStart ) - { - rInf.SetLineStart( 0 ); - } - - bRet = SwTextPortion::Format( rInf ); - - if ( mbContainsInputFieldEnd ) - { - // adjust portion length accordingly, if complete text fits into the portion - if ( GetLen() == rInf.GetLen() ) - { - SetLen( GetLen() + 1 ); - } - } - - if ( mbContainsInputFieldStart ) - { - // adjust portion length accordingly - SetLen( GetLen() + 1 ); - } - else - { - rInf.SetLineStart( nFormerLineStart ); - } - } - } - - return bRet; + return SwTextPortion::Format(rTextFormatInfo); } void SwTextInputFieldPortion::Paint( const SwTextPaintInfo &rInf ) const diff -Nru libreoffice-5.0.2/sw/source/core/text/txtfrm.cxx libreoffice-5.0.5~rc2/sw/source/core/text/txtfrm.cxx --- libreoffice-5.0.2/sw/source/core/text/txtfrm.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/txtfrm.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -845,7 +845,7 @@ pTextNode->SetSmartTags( new SwWrongList( WRONGLIST_SMARTTAG ) ); pTextNode->GetSmartTags()->SetInvalid( nPos, nEnd ); } - pTextNode->SetWrongDirty( true ); + pTextNode->SetWrongDirty(SwTextNode::WrongState::TODO); pTextNode->SetGrammarCheckDirty( true ); pTextNode->SetWordCountDirty( true ); pTextNode->SetAutoCompleteWordDirty( true ); diff -Nru libreoffice-5.0.2/sw/source/core/text/wrong.cxx libreoffice-5.0.5~rc2/sw/source/core/text/wrong.cxx --- libreoffice-5.0.2/sw/source/core/text/wrong.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/text/wrong.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -356,11 +356,17 @@ @return if ??? */ -bool SwWrongList::Fresh( sal_Int32 &rStart, sal_Int32 &rEnd, sal_Int32 nPos, - sal_Int32 nLen, sal_uInt16 nIndex, sal_Int32 nCursorPos ) +auto SwWrongList::Fresh( sal_Int32 &rStart, sal_Int32 &rEnd, sal_Int32 nPos, + sal_Int32 nLen, sal_uInt16 nIndex, sal_Int32 nCursorPos ) -> FreshState { - // length of word must be greater than 0 and cursor position must be outside the word - bool bRet = nLen && ( nCursorPos > nPos + nLen || nCursorPos < nPos ); + // length of word must be greater than 0 + // only report a spelling error if the cursor position is outside the word, + // so that the user is not annoyed while typing + FreshState eRet = (nLen) + ? (nCursorPos > nPos + nLen || nCursorPos < nPos) + ? FreshState::FRESH + : FreshState::CURSOR + : FreshState::NOTHING; sal_Int32 nWrPos = 0; sal_Int32 nWrEnd = rEnd; @@ -383,11 +389,11 @@ if( nCnt < Count() && nWrPos == nPos && Len( nCnt ) == nLen ) { ++nCnt; - bRet = true; + eRet = FreshState::FRESH; } else { - if( bRet ) + if (FreshState::FRESH == eRet) { if( rStart > nPos ) rStart = nPos; @@ -417,7 +423,7 @@ Remove( nIndex, nCnt - nIndex ); - return bRet; + return eRet; } void SwWrongList::Invalidate( sal_Int32 nBegin, sal_Int32 nEnd ) diff -Nru libreoffice-5.0.2/sw/source/core/txtnode/fntcache.cxx libreoffice-5.0.5~rc2/sw/source/core/txtnode/fntcache.cxx --- libreoffice-5.0.2/sw/source/core/txtnode/fntcache.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/txtnode/fntcache.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -629,6 +629,12 @@ return nWidth1 == nWidth2; } +static bool lcl_IsFullstopCentered( const vcl::RenderContext& rOut ) +{ + const FontMetric aMetric( rOut.GetFontMetric() ); + return aMetric.IsFullstopCentered() ; +} + /* This helper structure (SwForbidden) contains the already marked parts of the string to avoid double lines (e.g grammar + spell check error) */ @@ -1053,7 +1059,7 @@ lcl_IsMonoSpaceFont( *(rInf.GetpOut()) ) ) { pSI->Compress( pKernArray, rInf.GetIdx(), rInf.GetLen(), - rInf.GetKanaComp(), (sal_uInt16)aFont.GetSize().Height(), &aTextOriginPos ); + rInf.GetKanaComp(), (sal_uInt16)aFont.GetSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ) , &aTextOriginPos ); bSpecialJust = true; } ///Asian Justification @@ -1224,7 +1230,7 @@ { pSI->Compress( pKernArray, rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)aFont.GetSize().Height(), &aTextOriginPos ); + (sal_uInt16)aFont.GetSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); bSpecialJust = true; } @@ -1434,10 +1440,10 @@ Point aTmpPos( aTextOriginPos ); pSI->Compress( pScrArray, rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)aFont.GetSize().Height(), &aTmpPos ); + (sal_uInt16)aFont.GetSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTmpPos ); pSI->Compress( pKernArray, rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16)aFont.GetSize().Height(), &aTextOriginPos ); + (sal_uInt16)aFont.GetSize().Height(), lcl_IsFullstopCentered( rInf.GetOut() ), &aTextOriginPos ); } // Asian Justification @@ -1904,7 +1910,7 @@ if( bCompress ) rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn, rInf.GetKanaComp(), - (sal_uInt16)aFont.GetSize().Height() ) ); + (sal_uInt16)aFont.GetSize().Height() ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); else rInf.SetKanaDiff( 0 ); @@ -1967,7 +1973,7 @@ rInf.GetIdx(), nLn ); rInf.SetKanaDiff( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn, rInf.GetKanaComp(), - (sal_uInt16) aFont.GetSize().Height() ) ); + (sal_uInt16) aFont.GetSize().Height() ,lcl_IsFullstopCentered( rInf.GetOut() ) ) ); aTextSize.Width() = pKernArray[ nLn - 1 ]; delete[] pKernArray; } @@ -2027,7 +2033,8 @@ { pSI->Compress( pKernArray, rInf.GetIdx(), rInf.GetLen(), rInf.GetKanaComp(), - (sal_uInt16) aFont.GetSize().Height() ); + (sal_uInt16) aFont.GetSize().Height(), + lcl_IsFullstopCentered( rInf.GetOut() ) ); } // Asian Justification @@ -2466,7 +2473,8 @@ rInf.GetOut().GetTextArray( rInf.GetText(), pKernArray, rInf.GetIdx(), nLn ); if( rInf.GetScriptInfo()->Compress( pKernArray, rInf.GetIdx(), nLn, - rInf.GetKanaComp(), (sal_uInt16)GetHeight( nActual ) ) ) + rInf.GetKanaComp(), (sal_uInt16)GetHeight( nActual ) , + lcl_IsFullstopCentered( rInf.GetOut() ) ) ) { long nKernAdd = nKern; sal_Int32 nTmpBreak = nTextBreak2; diff -Nru libreoffice-5.0.2/sw/source/core/txtnode/ndtxt.cxx libreoffice-5.0.5~rc2/sw/source/core/txtnode/ndtxt.cxx --- libreoffice-5.0.2/sw/source/core/txtnode/ndtxt.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/txtnode/ndtxt.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -424,7 +424,7 @@ { pNode->SetWrong( GetWrong()->SplitList( nSplitPos ) ); } - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); if( GetGrammarCheck() ) { @@ -527,7 +527,7 @@ { SwWrongList *pList = GetWrong(); SetWrong( 0, false ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); SwGrammarMarkUp *pList3 = GetGrammarCheck(); SetGrammarCheck( 0, false ); @@ -648,7 +648,7 @@ if( pList ) { pList->JoinList( pTextNode->GetWrong(), nOldLen ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); SetWrong( 0, false ); } else @@ -657,7 +657,7 @@ if( pList ) { pList->Move( 0, nOldLen ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); pTextNode->SetWrong( 0, false ); } } @@ -739,7 +739,7 @@ if( pList ) { pList->JoinList( GetWrong(), Len() ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); pTextNode->SetWrong( 0, false ); SetWrong( NULL ); } @@ -749,7 +749,7 @@ if( pList ) { pList->Move( 0, nLen ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); SetWrong( 0, false ); } } @@ -1383,7 +1383,7 @@ void SwTextNode::DelFrms_TextNodePart() { SetWrong( NULL ); - SetWrongDirty( true ); + SetWrongDirty(WrongState::TODO); SetGrammarCheck( NULL ); SetGrammarCheckDirty( true ); diff -Nru libreoffice-5.0.2/sw/source/core/txtnode/thints.cxx libreoffice-5.0.5~rc2/sw/source/core/txtnode/thints.cxx --- libreoffice-5.0.2/sw/source/core/txtnode/thints.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/txtnode/thints.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1516,16 +1516,15 @@ if( !(SetAttrMode::NOTXTATRCHR & nMode) ) { SwIndex aIdx( this, pAttr->GetStart() ); - InsertText( OUString(CH_TXT_ATR_INPUTFIELDSTART), aIdx, nInsertFlags ); - const OUString aContent = pTextInputField->GetFieldContent(); + const OUString aContent = OUStringLiteral1() + + pTextInputField->GetFieldContent() + OUStringLiteral1(); InsertText( aContent, aIdx, nInsertFlags ); - InsertText( OUString(CH_TXT_ATR_INPUTFIELDEND), aIdx, nInsertFlags ); sal_Int32* const pEnd(pAttr->GetEnd()); OSL_ENSURE( pEnd != NULL, " - missing end of RES_TXTATR_INPUTFIELD!" ); if ( pEnd != NULL ) { - *pEnd = *pEnd + 2 + aContent.getLength(); + *pEnd = *pEnd + aContent.getLength(); nEnd = *pEnd; } } diff -Nru libreoffice-5.0.2/sw/source/core/txtnode/txtedt.cxx libreoffice-5.0.5~rc2/sw/source/core/txtnode/txtedt.cxx --- libreoffice-5.0.2/sw/source/core/txtnode/txtedt.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/txtnode/txtedt.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1311,6 +1311,7 @@ } bool bFresh = nBegin < nEnd; + bool bPending(false); if( bFresh ) { @@ -1353,13 +1354,19 @@ pNode->SetWrong( new SwWrongList( WRONGLIST_SPELL ) ); pNode->GetWrong()->SetInvalid( 0, nEnd ); } - if( pNode->GetWrong()->Fresh( nChgStart, nChgEnd, - nBegin, nLen, nInsertPos, nActPos ) ) - pNode->GetWrong()->Insert( OUString(), 0, nBegin, nLen, nInsertPos++ ); - else + SwWrongList::FreshState const eState(pNode->GetWrong()->Fresh( + nChgStart, nChgEnd, nBegin, nLen, nInsertPos, nActPos)); + switch (eState) { - nInvStart = nBegin; - nInvEnd = nBegin + nLen; + case SwWrongList::FreshState::FRESH: + pNode->GetWrong()->Insert(OUString(), 0, nBegin, nLen, nInsertPos++); + break; + case SwWrongList::FreshState::CURSOR: + bPending = true; // fall-through to mark as invalid + case SwWrongList::FreshState::NOTHING: + nInvStart = nBegin; + nInvEnd = nBegin + nLen; + break; } } } @@ -1402,12 +1409,17 @@ } pNode->GetWrong()->SetInvalid( nInvStart, nInvEnd ); - pNode->SetWrongDirty( COMPLETE_STRING != pNode->GetWrong()->GetBeginInv() ); + pNode->SetWrongDirty( + (COMPLETE_STRING != pNode->GetWrong()->GetBeginInv()) + ? ((bPending) + ? SwTextNode::WrongState::PENDING + : SwTextNode::WrongState::TODO) + : SwTextNode::WrongState::DONE); if( !pNode->GetWrong()->Count() && ! pNode->IsWrongDirty() ) pNode->SetWrong( NULL ); } else - pNode->SetWrongDirty( false ); + pNode->SetWrongDirty(SwTextNode::WrongState::DONE); if( bAddAutoCmpl ) pNode->SetAutoCompleteWordDirty( false ); @@ -1557,7 +1569,7 @@ sal_Int32 nBegin = 0; sal_Int32 nEnd = pNode->GetText().getLength(); sal_Int32 nLen; - bool bACWDirty = false, bAnyWrd = false; + bool bACWDirty = false; if( nBegin < nEnd ) { @@ -1576,21 +1588,21 @@ { if( rACW.GetMinWordLen() <= rWord.getLength() ) rACW.InsertWord( rWord, *pDoc ); - bAnyWrd = true; } else bACWDirty = true; } if( !--nCnt ) { - if ( Application::AnyInput( VCL_INPUT_ANY ) ) + // don't wait for TIMER here, so we can finish big paragraphs + if (Application::AnyInput(VCL_INPUT_ANY & VclInputFlags(~VclInputFlags::TIMER))) return; nCnt = 100; } } } - if( bAnyWrd && !bACWDirty ) + if (!bACWDirty) pNode->SetAutoCompleteWordDirty( false ); } @@ -2115,7 +2127,7 @@ sal_uLong nNumberOfChars; sal_uLong nNumberOfCharsExcludingSpaces; bool bWordCountDirty; - bool bWrongDirty; // Ist das Wrong-Feld auf invalid? + SwTextNode::WrongState eWrongDirty; ///< online spell checking needed/done? bool bGrammarCheckDirty; bool bSmartTagDirty; bool bAutoComplDirty; // die ACompl-Liste muss angepasst werden @@ -2129,7 +2141,7 @@ nNumberOfChars ( 0 ), nNumberOfCharsExcludingSpaces ( 0 ), bWordCountDirty ( true ), - bWrongDirty ( true ), + eWrongDirty ( SwTextNode::WrongState::TODO ), bGrammarCheckDirty ( true ), bSmartTagDirty ( true ), bAutoComplDirty ( true ) {}; @@ -2276,17 +2288,22 @@ return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bWordCountDirty; } -void SwTextNode::SetWrongDirty( bool bNew ) const +void SwTextNode::SetWrongDirty(WrongState eNew) const { if ( m_pParaIdleData_Impl ) { - m_pParaIdleData_Impl->bWrongDirty = bNew; + m_pParaIdleData_Impl->eWrongDirty = eNew; } } +auto SwTextNode::GetWrongDirty() const -> WrongState +{ + return (m_pParaIdleData_Impl) ? m_pParaIdleData_Impl->eWrongDirty : WrongState::DONE; +} + bool SwTextNode::IsWrongDirty() const { - return m_pParaIdleData_Impl && m_pParaIdleData_Impl->bWrongDirty; + return m_pParaIdleData_Impl && m_pParaIdleData_Impl->eWrongDirty != WrongState::DONE; } void SwTextNode::SetGrammarCheckDirty( bool bNew ) const diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unodraw.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unodraw.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unodraw.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unodraw.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1007,12 +1007,15 @@ SwXShape::~SwXShape() { + SolarMutexGuard aGuard; if (xShapeAgg.is()) { uno::Reference< uno::XInterface > xRef; xShapeAgg->setDelegator(xRef); } delete pImpl; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); } uno::Any SwXShape::queryInterface( const uno::Type& aType ) throw( uno::RuntimeException, std::exception ) diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unoflatpara.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unoflatpara.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unoflatpara.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unoflatpara.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -199,7 +199,10 @@ if (GetTextNode()) { if ( text::TextMarkupType::SPELLCHECK == nType ) - GetTextNode()->SetWrongDirty( !bVal ); + { + GetTextNode()->SetWrongDirty( + (bVal) ? SwTextNode::WrongState::DONE : SwTextNode::WrongState::TODO); + } else if ( text::TextMarkupType::SMARTTAG == nType ) GetTextNode()->SetSmartTagDirty( !bVal ); else if( text::TextMarkupType::PROOFREADING == nType ) @@ -358,6 +361,9 @@ SwXFlatParagraphIterator::~SwXFlatParagraphIterator() { + SolarMutexGuard aGuard; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); } void SwXFlatParagraphIterator::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unoframe.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unoframe.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unoframe.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unoframe.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1260,8 +1260,11 @@ SwXFrame::~SwXFrame() { + SolarMutexGuard aGuard; delete m_pCopySource; delete pProps; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); } template @@ -1800,7 +1803,7 @@ if(RES_BACKGROUND == pEntry->nWID) { const SwAttrSet& rSet = pFormat->GetAttrSet(); - const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND)); + const SvxBrushItem aOriginalBrushItem(getSvxBrushItemFromSourceSet(rSet, RES_BACKGROUND, true, pDoc->IsInXMLImport())); SvxBrushItem aChangedBrushItem(aOriginalBrushItem); aChangedBrushItem.PutValue(aValue, nMemberId); diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unoobj.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unoobj.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unoobj.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unoobj.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2562,7 +2562,7 @@ if ( text::TextMarkupType::SPELLCHECK == nType ) { - txtNode->SetWrongDirty(true); + txtNode->SetWrongDirty(SwTextNode::WrongState::TODO); txtNode->SetWrong(0, true); } else if( text::TextMarkupType::PROOFREADING == nType ) diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unoport.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unoport.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unoport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unoport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -143,6 +143,11 @@ SolarMutexGuard aGuard; SwUnoCrsr* pUnoCrsr = GetCursor(); delete pUnoCrsr; + if(m_FrameDepend.GetRegisteredIn()) + { + auto pFrameDepend(const_cast(&m_FrameDepend)); + pFrameDepend->GetRegisteredIn()->Remove(pFrameDepend); + } } uno::Reference< text::XText > SwXTextPortion::getText() diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unosett.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unosett.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unosett.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unosett.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2099,6 +2099,7 @@ throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { + SolarMutexGuard aGuard; SwNumRule* pDocRule = 0; SwNumRule* pCreatedRule = 0; if(!pNumRule) diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unostyle.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unostyle.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unostyle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unostyle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1314,6 +1314,8 @@ if(pBasePool) EndListening(*pBasePool); delete pPropImpl; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove( this ); } void SwXStyle::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) diff -Nru libreoffice-5.0.2/sw/source/core/unocore/unotbl.cxx libreoffice-5.0.5~rc2/sw/source/core/unocore/unotbl.cxx --- libreoffice-5.0.2/sw/source/core/unocore/unotbl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/unocore/unotbl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -774,6 +774,9 @@ SwXCell::~SwXCell() { + SolarMutexGuard aGuard; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); } namespace @@ -1217,7 +1220,11 @@ { } SwXTextTableRow::~SwXTextTableRow() -{ } +{ + SolarMutexGuard aGuard; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); +} uno::Reference< beans::XPropertySetInfo > SwXTextTableRow::getPropertySetInfo() throw( uno::RuntimeException, std::exception ) { @@ -1969,7 +1976,12 @@ { } SwXTextTable::~SwXTextTable() - { delete pTableProps; } +{ + SolarMutexGuard aGuard; + delete pTableProps; + if(GetRegisteredIn()) + GetRegisteredIn()->Remove(this); +} uno::Reference SwXTextTable::CreateXTextTable(SwFrameFormat* const pFrameFormat) { diff -Nru libreoffice-5.0.2/sw/source/core/view/viewsh.cxx libreoffice-5.0.5~rc2/sw/source/core/view/viewsh.cxx --- libreoffice-5.0.2/sw/source/core/view/viewsh.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/core/view/viewsh.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -203,8 +203,8 @@ mpBufferedOut = mpOut; mpOut = &(mpTargetPaintWindow->GetTargetOutputDevice()); } - else - // In case mpOut is used without buffering, need to set clipping. + else if (isOutputToWindow()) + // In case mpOut is used without buffering and we're not printing, need to set clipping. mpOut->SetClipRegion(rRegion); // remember original paint MapMode for wrapped FlyFrame paints @@ -1674,7 +1674,7 @@ class RenderContextGuard { VclPtr& m_pRef; - vcl::RenderContext* m_pOriginalValue; + VclPtr m_pOriginalValue; SwViewShell* m_pShell; public: diff -Nru libreoffice-5.0.2/sw/source/filter/html/htmlplug.cxx libreoffice-5.0.5~rc2/sw/source/filter/html/htmlplug.cxx --- libreoffice-5.0.2/sw/source/filter/html/htmlplug.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/html/htmlplug.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -655,6 +655,8 @@ delete pAppletImpl; pAppletImpl = 0; } +#else + (void) this; // Silence loplugin:staticmethods #endif } @@ -786,6 +788,8 @@ delete pAppletImpl; pAppletImpl = 0; +#else + (void) this; #endif } @@ -816,6 +820,8 @@ return; pAppletImpl->AppendParam( aName, aValue ); +#else + (void) this; #endif } diff -Nru libreoffice-5.0.2/sw/source/filter/html/wrthtml.cxx libreoffice-5.0.5~rc2/sw/source/filter/html/wrthtml.cxx --- libreoffice-5.0.2/sw/source/filter/html/wrthtml.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/html/wrthtml.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1198,8 +1198,9 @@ } } } - else + else if (!sURL.isEmpty() && sURL[0] != '#') { + // Link is not started from "#", so looks like external link. Encode this URL. INetURLObject aURL(sURL); sURL = aURL.GetMainURL(INetURLObject::NO_DECODE); } diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/attributeoutputbase.hxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/attributeoutputbase.hxx --- libreoffice-5.0.2/sw/source/filter/ww8/attributeoutputbase.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/attributeoutputbase.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -156,7 +156,7 @@ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) = 0; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTextNode& rNode) = 0; + virtual void SectionBreaks(const SwNode& rNode) = 0; /// Called before we start outputting the attributes. virtual void StartParagraphProperties() = 0; diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/docxattributeoutput.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxattributeoutput.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/docxattributeoutput.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxattributeoutput.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -126,6 +126,7 @@ #include #include #include +#include #include @@ -774,7 +775,7 @@ m_pSerializer->singleElementNS( XML_w, XML_p, FSEND ); } -void DocxAttributeOutput::SectionBreaks(const SwTextNode& rNode) +void DocxAttributeOutput::SectionBreaks(const SwNode& rNode) { // output page/section breaks // Writer can have them at the beginning of a paragraph, or at the end, but @@ -782,16 +783,31 @@ // paragraph in a section. To get it right, we have to switch to the next // paragraph, and detect the section breaks there. SwNodeIndex aNextIndex( rNode, 1 ); - if ( aNextIndex.GetNode().IsTextNode() ) + + if (rNode.IsTextNode()) { - const SwTextNode* pTextNode = static_cast< SwTextNode* >( &aNextIndex.GetNode() ); - m_rExport.OutputSectionBreaks( pTextNode->GetpSwAttrSet(), *pTextNode, m_tableReference->m_bTableCellOpen, pTextNode->GetText().isEmpty() ); + if (aNextIndex.GetNode().IsTextNode()) + { + const SwTextNode* pTextNode = static_cast(&aNextIndex.GetNode()); + m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode, m_tableReference->m_bTableCellOpen, pTextNode->GetText().isEmpty()); + } + else if (aNextIndex.GetNode().IsTableNode()) + { + const SwTableNode* pTableNode = static_cast(&aNextIndex.GetNode()); + const SwFrameFormat *pFormat = pTableNode->GetTable().GetFrameFormat(); + m_rExport.OutputSectionBreaks(&(pFormat->GetAttrSet()), *pTableNode); + } } - else if ( aNextIndex.GetNode().IsTableNode() ) + else if (rNode.IsEndNode()) { - const SwTableNode* pTableNode = static_cast< SwTableNode* >( &aNextIndex.GetNode() ); - const SwFrameFormat *pFormat = pTableNode->GetTable().GetFrameFormat(); - m_rExport.OutputSectionBreaks( &(pFormat->GetAttrSet()), *pTableNode ); + // End of something: make sure that it's the end of a table. + assert(rNode.StartOfSectionNode()->IsTableNode()); + if (aNextIndex.GetNode().IsTextNode()) + { + // Handle section break between a table and a text node following it. + const SwTextNode* pTextNode = aNextIndex.GetNode().GetTextNode(); + m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode, m_tableReference->m_bTableCellOpen, pTextNode->GetText().isEmpty()); + } } } @@ -4074,6 +4090,22 @@ void DocxAttributeOutput::ClearRelIdCache() { m_aRelIdCache.clear(); + m_aSdrRelIdCache.clear(); +} + +OUString DocxAttributeOutput::FindRelId(BitmapChecksum nChecksum) +{ + OUString aRet; + + if (m_aSdrRelIdCache.find(nChecksum) != m_aSdrRelIdCache.end()) + aRet = m_aSdrRelIdCache[nChecksum]; + + return aRet; +} + +void DocxAttributeOutput::CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) +{ + m_aSdrRelIdCache[nChecksum] = rRelId; } void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size& rSize, const SwFlyFrameFormat* pOLEFrameFormat, SwOLENode* pOLENode, const SdrObject* pSdrObj ) @@ -4299,22 +4331,27 @@ bool DocxAttributeOutput::WriteOLEChart( const SdrObject* pSdrObj, const Size& rSize ) { - uno::Reference< chart2::XChartDocument > xChartDoc; uno::Reference< drawing::XShape > xShape( const_cast(pSdrObj)->getUnoShape(), uno::UNO_QUERY ); - if( xShape.is() ) - { - uno::Reference< beans::XPropertySet > xPropSet( xShape, uno::UNO_QUERY ); - if( xPropSet.is() ) - xChartDoc.set( xPropSet->getPropertyValue( "Model" ), uno::UNO_QUERY ); - } + if (!xShape.is()) + return false; - if( xChartDoc.is() ) - { - m_postponedChart = pSdrObj; - m_postponedChartSize = rSize; - return true; - } - return false; + uno::Reference const xPropSet(xShape, uno::UNO_QUERY); + if (!xPropSet.is()) + return false; + + OUString clsid; // why is the property of type string, not sequence? + xPropSet->getPropertyValue("CLSID") >>= clsid; + SAL_WARN_IF(clsid.isEmpty(), "sw.ww8", "OLE without CLSID?"); + SvGlobalName aClassID; + bool const isValid(aClassID.MakeId(clsid)); + SAL_WARN_IF(!isValid, "sw.ww8", "OLE with invalid CLSID?"); + + if (!SotExchange::IsChart(aClassID)) + return false; + + m_postponedChart = pSdrObj; + m_postponedChartSize = rSize; + return true; } /* @@ -4380,10 +4417,9 @@ FSEND ); OString aRelId; - static sal_Int32 nChartCount = 0; - nChartCount++; + m_nChartCount++; uno::Reference< frame::XModel > xModel( xChartDoc, uno::UNO_QUERY ); - aRelId = m_rExport.OutputChart( xModel, nChartCount, m_pSerializer ); + aRelId = m_rExport.OutputChart( xModel, m_nChartCount, m_pSerializer ); m_pSerializer->singleElementNS( XML_c, XML_chart, FSNS( XML_xmlns, XML_c ), "http://schemas.openxmlformats.org/drawingml/2006/chart", @@ -4414,6 +4450,10 @@ void DocxAttributeOutput::WritePostponedMath(const SwOLENode* pPostponedMath) { uno::Reference < embed::XEmbeddedObject > xObj(const_cast(pPostponedMath)->GetOLEObj().GetOleRef()); + if (embed::EmbedStates::LOADED == xObj->getCurrentState()) + { // must be running so there is a Component + xObj->changeState(embed::EmbedStates::RUNNING); + } uno::Reference< uno::XInterface > xInterface( xObj->getComponent(), uno::UNO_QUERY ); if (!xInterface.is()) { @@ -4640,7 +4680,7 @@ OUString sObjectName = aContainer->GetEmbeddedObjectName( xObj ); // set some attributes according to the type of the embedded object - OUString sProgID, sMediaType, sRelationType, sFileExtension, sDrawAspect="Content"; + OUString sProgID, sDrawAspect = "Content"; for( sal_Int32 i=0; i < aObjectsInteropList.getLength(); ++i ) if ( aObjectsInteropList[i].Name == sObjectName ) { @@ -4660,87 +4700,8 @@ } } - if( sProgID == "Excel.Sheet.12" ) - { - sMediaType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "xlsx"; - } - else if(sProgID.startsWith("Excel.SheetBinaryMacroEnabled.12") ) - { - sMediaType = "application/vnd.ms-excel.sheet.binary.macroEnabled.12"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "xlsb"; - } - else if( sProgID.startsWith("Excel.SheetMacroEnabled.12") ) - { - sMediaType = "application/vnd.ms-excel.sheet.macroEnabled.12"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "xlsm"; - } - else if( sProgID.startsWith("Excel.Sheet") ) - { - sMediaType = "application/vnd.ms-excel"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; - sFileExtension = "xls"; - } - else if( sProgID == "PowerPoint.Show.12" ) - { - sMediaType = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "pptx"; - } - else if(sProgID == "PowerPoint.ShowMacroEnabled.12") - { - sMediaType = "application/vnd.ms-powerpoint.presentation.macroEnabled.12"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "pptm"; - } - else if( sProgID.startsWith("PowerPoint.Show") ) - { - sMediaType = "application/vnd.ms-powerpoint"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; - sFileExtension = "ppt"; - } - else if (sProgID.startsWith("PowerPoint.Slide.12")) - { - sMediaType = "application/vnd.openxmlformats-officedocument.presentationml.slide"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "sldx"; - } - else if( sProgID == "PowerPoint.SlideMacroEnabled.12" ) - { - sMediaType = "application/vnd.ms-powerpoint.slide.macroEnabled.12"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "sldm"; - } - else if( sProgID == "Word.DocumentMacroEnabled.12" ) - { - sMediaType = "application/vnd.ms-word.document.macroEnabled.12"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "docm"; - } - else if (sProgID == "Word.Document.12") - { - sMediaType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; - sFileExtension = "docx"; - } - else if( sProgID == "Word.Document.8" ) - { - sMediaType = "application/msword"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; - sFileExtension = "doc"; - } - else - { - sMediaType = "application/vnd.openxmlformats-officedocument.oleObject"; - sRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; - sFileExtension = "bin"; - } - // write embedded file - OString sId = m_rExport.WriteOLEObject( aObject, sMediaType, sRelationType, sFileExtension ); + OString sId = m_rExport.WriteOLEObject(aObject, sProgID); if( sId.isEmpty() ) { @@ -8373,6 +8334,7 @@ m_startedHyperlink( false ), m_nHyperLinkCount(0), m_nFieldsInHyperlink( 0 ), + m_nChartCount(0), m_postponedChart( NULL ), pendingPlaceholder( NULL ), m_postitFieldsMaxId( 0 ), diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/docxattributeoutput.hxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxattributeoutput.hxx --- libreoffice-5.0.2/sw/source/filter/ww8/docxattributeoutput.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxattributeoutput.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -155,7 +155,7 @@ virtual void EmptyParagraph() SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE; + virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE; /// Called before we start outputting the attributes. virtual void StartParagraphProperties() SAL_OVERRIDE; @@ -861,6 +861,8 @@ std::unique_ptr< std::list > m_pPostponedOLEs; std::vector m_aPostponedMaths; + /// count charts consistently for unit tests + unsigned int m_nChartCount; const SdrObject* m_postponedChart; Size m_postponedChartSize; std::vector m_aPostponedFormControls; @@ -906,6 +908,8 @@ /// RelId <-> Graphic* cache, so that in case of alternate content, the same graphic only gets written once. std::map m_aRelIdCache; + /// RelId <-> BitmapChecksum cache, similar to m_aRelIdCache, but used for non-Writer graphics, handled in oox. + std::map m_aSdrRelIdCache; /// members to control the existence of grabbagged SDT properties in the paragraph sal_Int32 m_nParagraphSdtPrToken; @@ -963,6 +967,8 @@ virtual void WriteVMLTextBox(css::uno::Reference xShape) SAL_OVERRIDE; /// DMLTextExport virtual void WriteTextBox(css::uno::Reference xShape) SAL_OVERRIDE; + virtual OUString FindRelId(BitmapChecksum nChecksum) SAL_OVERRIDE; + virtual void CacheRelId(BitmapChecksum nChecksum, const OUString& rRelId) SAL_OVERRIDE; virtual oox::drawingml::DrawingML& GetDrawingML() SAL_OVERRIDE; void BulletDefinition(int nId, const Graphic& rGraphic, Size aSize) SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/docxexport.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxexport.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/docxexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -25,8 +25,10 @@ #include #include #include +#include #include #include +#include #include #include #include @@ -70,6 +72,7 @@ #include "ww8par.hxx" #include "ww8scan.hxx" #include +#include #include #include #include @@ -366,23 +369,230 @@ return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } -OString DocxExport::WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType, const OUString& sFileExtension ) + +static void lcl_ConvertProgID(OUString const& rProgID, + OUString & o_rMediaType, OUString & o_rRelationType, OUString & o_rFileExtension) +{ + if (rProgID == "Excel.Sheet.12") + { + o_rMediaType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "xlsx"; + } + else if (rProgID.startsWith("Excel.SheetBinaryMacroEnabled.12") ) + { + o_rMediaType = "application/vnd.ms-excel.sheet.binary.macroEnabled.12"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "xlsb"; + } + else if (rProgID.startsWith("Excel.SheetMacroEnabled.12")) + { + o_rMediaType = "application/vnd.ms-excel.sheet.macroEnabled.12"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "xlsm"; + } + else if (rProgID.startsWith("Excel.Sheet")) + { + o_rMediaType = "application/vnd.ms-excel"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "xls"; + } + else if (rProgID == "PowerPoint.Show.12") + { + o_rMediaType = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "pptx"; + } + else if (rProgID == "PowerPoint.ShowMacroEnabled.12") + { + o_rMediaType = "application/vnd.ms-powerpoint.presentation.macroEnabled.12"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "pptm"; + } + else if (rProgID.startsWith("PowerPoint.Show")) + { + o_rMediaType = "application/vnd.ms-powerpoint"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "ppt"; + } + else if (rProgID.startsWith("PowerPoint.Slide.12")) + { + o_rMediaType = "application/vnd.openxmlformats-officedocument.presentationml.slide"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "sldx"; + } + else if (rProgID == "PowerPoint.SlideMacroEnabled.12") + { + o_rMediaType = "application/vnd.ms-powerpoint.slide.macroEnabled.12"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "sldm"; + } + else if (rProgID == "Word.DocumentMacroEnabled.12") + { + o_rMediaType = "application/vnd.ms-word.document.macroEnabled.12"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "docm"; + } + else if (rProgID == "Word.Document.12") + { + o_rMediaType = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + o_rFileExtension = "docx"; + } + else if (rProgID == "Word.Document.8") + { + o_rMediaType = "application/msword"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "doc"; + } + else if (rProgID == "Excel.Chart.8") + { + o_rMediaType = "application/vnd.ms-excel"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "xls"; + } + else if (rProgID == "AcroExch.Document.11") + { + o_rMediaType = "application/pdf"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "pdf"; + } + else + { + o_rMediaType = "application/vnd.openxmlformats-officedocument.oleObject"; + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject"; + o_rFileExtension = "bin"; + } +} + +static uno::Reference lcl_StoreOwnAsOOXML( + uno::Reference const& xContext, + uno::Reference const& xObj, + char const*& o_rpProgID, + OUString & o_rMediaType, OUString & o_rRelationType, OUString & o_rSuffix) +{ + static struct { + struct { + sal_uInt32 n1; + sal_uInt16 n2, n3; + sal_uInt8 b8, b9, b10, b11, b12, b13, b14, b15; + } ClassId; + char const* pFilterName; + char const* pMediaType; + char const* pProgID; + char const* pSuffix; + } s_Mapping[] = { + { {SO3_SW_CLASSID_60}, "MS Word 2007 XML", "application/vnd.openxmlformats-officedocument.wordprocessingml.document", "Word.Document.12", "docx" }, + { {SO3_SC_CLASSID_60}, "Calc MS Excel 2007 XML", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Excel.Sheet.12", "xlsx" }, + { {SO3_SIMPRESS_CLASSID_60}, "Impress MS PowerPoint 2007 XML", "application/vnd.openxmlformats-officedocument.presentationml.presentation", "PowerPoint.Show.12", "pptx" }, + // FIXME: Draw does not appear to have a MSO format export filter? +// { {SO3_SDRAW_CLASSID}, "", "", "", "" }, + { {SO3_SCH_CLASSID_60}, "unused", "", "", "" }, + { {SO3_SM_CLASSID_60}, "unused", "", "", "" }, + }; + + const char * pFilterName(nullptr); + SvGlobalName const classId(xObj->getClassID()); + for (size_t i = 0; i < SAL_N_ELEMENTS(s_Mapping); ++i) + { + auto const& rId(s_Mapping[i].ClassId); + SvGlobalName const temp(rId.n1, rId.n2, rId.n3, rId.b8, rId.b9, rId.b10, rId.b11, rId.b12, rId.b13, rId.b14, rId.b15); + if (temp == classId) + { + assert(SvGlobalName(SO3_SCH_CLASSID_60) != classId); // chart should be written elsewhere! + assert(SvGlobalName(SO3_SM_CLASSID_60) != classId); // formula should be written elsewhere! + pFilterName = s_Mapping[i].pFilterName; + o_rMediaType = OUString::createFromAscii(s_Mapping[i].pMediaType); + o_rpProgID = s_Mapping[i].pProgID; + o_rSuffix = OUString::createFromAscii(s_Mapping[i].pSuffix); + o_rRelationType = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/package"; + break; + } + } + + if (!pFilterName) + { + SAL_WARN("sw.ww8", "DocxExport::WriteOLEObject: unknown ClassId " << classId.GetHexName()); + return nullptr; + } + + if (embed::EmbedStates::LOADED == xObj->getCurrentState()) + { + xObj->changeState(embed::EmbedStates::RUNNING); + } + // use a temp stream - while it would work to store directly to a + // fragment stream, an error during export means we'd have to delete it + uno::Reference const xTempStream( + xContext->getServiceManager()->createInstanceWithContext( + "com.sun.star.comp.MemoryStream", xContext), + uno::UNO_QUERY_THROW); + uno::Sequence args(2); + args[0].Name = "OutputStream"; + args[0].Value <<= xTempStream->getOutputStream(); + args[1].Name = "FilterName"; + args[1].Value <<= OUString::createFromAscii(pFilterName); + uno::Reference xStorable(xObj->getComponent(), uno::UNO_QUERY); + try + { + xStorable->storeToURL("private:stream", args); + } + catch (uno::Exception const& e) + { + SAL_WARN("sw.ww8", "DocxExport::WriteOLEObject: exception: \"" << e.Message << "\""); + return nullptr; + } + xTempStream->getOutputStream()->closeOutput(); + return xTempStream->getInputStream(); +} + +OString DocxExport::WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID) { uno::Reference xObj( rObject.GetOleRef() ); comphelper::EmbeddedObjectContainer* aContainer = rObject.GetObject().GetContainer(); uno::Reference< io::XInputStream > xInStream = aContainer->GetObjectStream( xObj, NULL ); - OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + "." + sFileExtension; - uno::Reference< io::XOutputStream > xOutStream = GetFilter().openFragmentStream( OUStringBuffer() - .appendAscii( "word/" ) - .append( sFileName ) - .makeStringAndClear(), - sMediaType ); - OUString sId; - if( lcl_CopyStream( xInStream, xOutStream ) ) + OUString sMediaType; + OUString sRelationType; + OUString sSuffix; + const char * pProgID(nullptr); + + if (xInStream.is()) + { + lcl_ConvertProgID(io_rProgID, sMediaType, sRelationType, sSuffix); + } + else // the object is ODF - either the whole document is + { // ODF, or the OLE was edited so it was converted to ODF + uno::Reference const xContext( + GetFilter().getComponentContext()); + xInStream = lcl_StoreOwnAsOOXML(xContext, xObj, + pProgID, sMediaType, sRelationType, sSuffix); + } + + if (!xInStream.is()) + { + return OString(); + } + + assert(!sMediaType.isEmpty()); + assert(!sRelationType.isEmpty()); + assert(!sSuffix.isEmpty()); + OUString sFileName = "embeddings/oleObject" + OUString::number( ++m_nOLEObjects ) + "." + sSuffix; + uno::Reference const xOutStream = + GetFilter().openFragmentStream("word/" + sFileName, sMediaType); + assert(xOutStream.is()); // no reason why that could fail + bool const isExported = lcl_CopyStream(xInStream, xOutStream); + + OUString sId; + if (isExported) + { sId = m_pFilter->addRelation( GetFS()->getOutputStream(), sRelationType, sFileName, false ); + if (pProgID) + { + io_rProgID = OUString::createFromAscii(pProgID); + } + } return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 ); } @@ -499,6 +709,9 @@ m_pSections->AppendSection( m_pAktPageDesc, pParentFormat, nRstLnNum ); } } + else if (TXT_MAINTEXT == m_nTextTyp && rEndNode.StartOfSectionNode()->IsTableNode()) + // End node of a table: see if a section break should be written after the table. + AttrOutput().SectionBreaks(rEndNode); } void DocxExport::OutputGrfNode( const SwGrfNode& ) diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/docxexport.hxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxexport.hxx --- libreoffice-5.0.2/sw/source/filter/ww8/docxexport.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxexport.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -173,7 +173,7 @@ /// Returns the relationd id OString OutputChart( com::sun::star::uno::Reference< com::sun::star::frame::XModel >& xModel, sal_Int32 nCount, ::sax_fastparser::FSHelperPtr m_pSerializer ); - OString WriteOLEObject( SwOLEObj& rObject, const OUString& sMediaType, const OUString& sRelationType, const OUString& sFileExtension ); + OString WriteOLEObject(SwOLEObj& rObject, OUString & io_rProgID); static bool lcl_CopyStream( css::uno::Reference< css::io::XInputStream> xIn, css::uno::Reference< css::io::XOutputStream > xOut ); /// Writes the shape using drawingML syntax. diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/docxsdrexport.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxsdrexport.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/docxsdrexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/docxsdrexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1594,23 +1594,25 @@ pFS->endElementNS(XML_a, XML_graphic); // Relative size of the Text Frame. - if (rSize.GetWidthPercent()) + const sal_uInt8 nWidthPercent = rSize.GetWidthPercent(); + if (nWidthPercent && nWidthPercent != 0xff) { pFS->startElementNS(XML_wp14, XML_sizeRelH, XML_relativeFrom, (rSize.GetWidthPercentRelation() == text::RelOrientation::PAGE_FRAME ? "page" : "margin"), FSEND); pFS->startElementNS(XML_wp14, XML_pctWidth, FSEND); - pFS->writeEscaped(OUString::number(rSize.GetWidthPercent() * oox::drawingml::PER_PERCENT)); + pFS->writeEscaped(OUString::number(nWidthPercent * oox::drawingml::PER_PERCENT)); pFS->endElementNS(XML_wp14, XML_pctWidth); pFS->endElementNS(XML_wp14, XML_sizeRelH); } - if (rSize.GetHeightPercent()) + const sal_uInt8 nHeightPercent = rSize.GetHeightPercent(); + if (nHeightPercent && nHeightPercent != 0xff) { pFS->startElementNS(XML_wp14, XML_sizeRelV, XML_relativeFrom, (rSize.GetHeightPercentRelation() == text::RelOrientation::PAGE_FRAME ? "page" : "margin"), FSEND); pFS->startElementNS(XML_wp14, XML_pctHeight, FSEND); - pFS->writeEscaped(OUString::number(rSize.GetHeightPercent() * oox::drawingml::PER_PERCENT)); + pFS->writeEscaped(OUString::number(nHeightPercent * oox::drawingml::PER_PERCENT)); pFS->endElementNS(XML_wp14, XML_pctHeight); pFS->endElementNS(XML_wp14, XML_sizeRelV); } diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/rtfattributeoutput.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/rtfattributeoutput.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/rtfattributeoutput.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/rtfattributeoutput.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -310,33 +310,36 @@ m_rExport.Strm().WriteCharPtr(SAL_NEWLINE_STRING).WriteCharPtr(OOO_STRING_SVTOOLS_RTF_PAR).WriteChar(' '); } -void RtfAttributeOutput::SectionBreaks(const SwTextNode& rNode) +void RtfAttributeOutput::SectionBreaks(const SwNode& rNode) { - OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty"); + if (rNode.IsTextNode()) + { + OSL_ENSURE(m_aStyles.getLength() == 0, "m_aStyles is not empty"); - // output page/section breaks - SwNodeIndex aNextIndex(rNode, 1); - m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); - m_bBufferSectionBreaks = true; + // output page/section breaks + SwNodeIndex aNextIndex(rNode, 1); + m_rExport.Strm().WriteCharPtr(m_aSectionBreaks.makeStringAndClear().getStr()); + m_bBufferSectionBreaks = true; - // output section headers / footers - if (!m_bBufferSectionHeaders) - m_rExport.Strm().WriteCharPtr(m_aSectionHeaders.makeStringAndClear().getStr()); + // output section headers / footers + if (!m_bBufferSectionHeaders) + m_rExport.Strm().WriteCharPtr(m_aSectionHeaders.makeStringAndClear().getStr()); - if (aNextIndex.GetNode().IsTextNode()) - { - const SwTextNode* pTextNode = static_cast< SwTextNode* >(&aNextIndex.GetNode()); - m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode); - // Save the current page description for now, so later we will be able to access the previous one. - m_pPrevPageDesc = pTextNode->FindPageDesc(false); - } - else if (aNextIndex.GetNode().IsTableNode()) - { - const SwTableNode* pTableNode = static_cast< SwTableNode* >(&aNextIndex.GetNode()); - const SwFrameFormat* pFormat = pTableNode->GetTable().GetFrameFormat(); - m_rExport.OutputSectionBreaks(&(pFormat->GetAttrSet()), *pTableNode); + if (aNextIndex.GetNode().IsTextNode()) + { + const SwTextNode* pTextNode = static_cast< SwTextNode* >(&aNextIndex.GetNode()); + m_rExport.OutputSectionBreaks(pTextNode->GetpSwAttrSet(), *pTextNode); + // Save the current page description for now, so later we will be able to access the previous one. + m_pPrevPageDesc = pTextNode->FindPageDesc(false); + } + else if (aNextIndex.GetNode().IsTableNode()) + { + const SwTableNode* pTableNode = static_cast< SwTableNode* >(&aNextIndex.GetNode()); + const SwFrameFormat* pFormat = pTableNode->GetTable().GetFrameFormat(); + m_rExport.OutputSectionBreaks(&(pFormat->GetAttrSet()), *pTableNode); + } + m_bBufferSectionBreaks = false; } - m_bBufferSectionBreaks = false; } void RtfAttributeOutput::StartParagraphProperties() @@ -1600,9 +1603,10 @@ const SwFormatFrmSize& rSize = rFrameFormat.GetFrmSize(); // Relative size of the Text Frame. - if (rSize.GetWidthPercent()) + const sal_uInt8 nWidthPercent = rSize.GetWidthPercent(); + if (nWidthPercent && nWidthPercent != 0xff) { - rFlyProperties.push_back(std::make_pair("pctHoriz", OString::number(rSize.GetWidthPercent() * 10))); + rFlyProperties.push_back(std::make_pair("pctHoriz", OString::number(nWidthPercent * 10))); OString aRelation; switch (rSize.GetWidthPercentRelation()) @@ -1616,9 +1620,10 @@ } rFlyProperties.push_back(std::make_pair("sizerelh", aRelation)); } - if (rSize.GetHeightPercent()) + const sal_uInt8 nHeightPercent = rSize.GetHeightPercent(); + if (nHeightPercent && nHeightPercent != 0xff) { - rFlyProperties.push_back(std::make_pair("pctVert", OString::number(rSize.GetHeightPercent() * 10))); + rFlyProperties.push_back(std::make_pair("pctVert", OString::number(nHeightPercent * 10))); OString aRelation; switch (rSize.GetHeightPercentRelation()) diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/rtfattributeoutput.hxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/rtfattributeoutput.hxx --- libreoffice-5.0.2/sw/source/filter/ww8/rtfattributeoutput.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/rtfattributeoutput.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -53,7 +53,7 @@ virtual void EmptyParagraph() SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE; + virtual void SectionBreaks(const SwNode& rNode) SAL_OVERRIDE; /// Called before we start outputting the attributes. virtual void StartParagraphProperties() SAL_OVERRIDE; diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/ww8attributeoutput.hxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8attributeoutput.hxx --- libreoffice-5.0.2/sw/source/filter/ww8/ww8attributeoutput.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8attributeoutput.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -36,7 +36,7 @@ virtual void EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTextNode& /*rNode*/) SAL_OVERRIDE {} + virtual void SectionBreaks(const SwNode& /*rNode*/) SAL_OVERRIDE {} /// Called before we start outputting the attributes. virtual void StartParagraphProperties() SAL_OVERRIDE {} diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/ww8par6.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8par6.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/ww8par6.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8par6.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2513,6 +2513,21 @@ if (rBrush.GetColor().GetColor() != COL_AUTO) aBg = rBrush.GetColor(); + if (m_pLastAnchorPos.get()) + { + //If the last anchor pos is here, then clear the anchor pos. + //This "last anchor pos" is only used for fixing up the + //postions of things anchored to page breaks and here + //we are removing the last paragraph of a frame, so there + //cannot be a page break at this point so we can + //safely reset m_pLastAnchorPos to avoid any dangling + //SwIndex's pointing into the deleted paragraph + SwNodeIndex aLastAnchorPos(m_pLastAnchorPos->nNode); + SwNodeIndex aToBeJoined(aPref, 1); + if (aLastAnchorPos == aToBeJoined) + m_pLastAnchorPos.reset(); + } + //Get rid of extra empty paragraph pNd->JoinNext(); } diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/ww8par.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8par.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/ww8par.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8par.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -3534,11 +3534,24 @@ } break; case 0x7: - bNewParaEnd = true; - if (m_pPlcxMan->GetPapPLCF()->Where() == nCpOfs+nPosCp+1) - TabCellEnd(); // Table cell/row end - else - bParaMark = true; + { + bNewParaEnd = true; + WW8PLCFxDesc* pPap = m_pPlcxMan->GetPap(); + //The last paragraph of each cell is terminated by a special + //paragraph mark called a cell mark. Following the cell mark + //that ends the last cell of a table row, the table row is + //terminated by a special paragraph mark called a row mark + // + //So the 0x7 should be right at the end of the previous + //range to be a real cell-end. + if (pPap->nOrigStartPos == nPosCp+1 || + pPap->nOrigStartPos == WW8_CP_MAX) + { + TabCellEnd(); // Table cell/row end + } + else + bParaMark = true; + } break; case 0xf: if( !m_bSpec ) // "Satellite" diff -Nru libreoffice-5.0.2/sw/source/filter/ww8/ww8scan.cxx libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8scan.cxx --- libreoffice-5.0.2/sw/source/filter/ww8/ww8scan.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/filter/ww8/ww8scan.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -4450,11 +4450,15 @@ else nStartPos -= nCpOfs; } - if( nEndPos != WW8_CP_MAX ) + if (nEndPos != WW8_CP_MAX) { - OSL_ENSURE(nCpOfs <= nEndPos, - "oh oh, so much for the subdocument piece theory"); - nEndPos -= nCpOfs; + if (nCpOfs > nEndPos) + { + SAL_WARN("sw.ww8", "broken subdocument piece entry"); + nEndPos = WW8_CP_MAX; + } + else + nEndPos -= nCpOfs; } } diff -Nru libreoffice-5.0.2/sw/source/ui/frmdlg/cption.cxx libreoffice-5.0.5~rc2/sw/source/ui/frmdlg/cption.cxx --- libreoffice-5.0.2/sw/source/ui/frmdlg/cption.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/ui/frmdlg/cption.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -83,10 +83,10 @@ OUString SwCaptionDialog::our_aSepTextSave(": "); // Caption separator text -//Resolves: fdo#47427 disallow typing *or* pasting content into the category box +//Resolves: tdf#47427 disallow typing *or* pasting invalid content into the category box OUString TextFilterAutoConvert::filter(const OUString &rText) { - if (rText != m_sNone && !SwCalc::IsValidVarName(rText)) + if (!rText.isEmpty() && rText != m_sNone && !SwCalc::IsValidVarName(rText)) return m_sLastGoodText; m_sLastGoodText = rText; return rText; @@ -318,8 +318,6 @@ SwFieldType* pType = (bCorrectFieldName && !bNone) ? rSh.GetFieldType( RES_SETEXPFLD, sFieldTypeName ) : 0; - fprintf(stderr, "pType is %p\n", pType); - fprintf(stderr, "bCorrectFieldName is %d\n", bCorrectFieldName); m_pOKButton->Enable( bCorrectFieldName && (!pType || static_cast(pType)->GetType() == nsSwGetSetExpType::GSE_SEQ) ); diff -Nru libreoffice-5.0.2/sw/source/ui/index/swuiidxmrk.cxx libreoffice-5.0.5~rc2/sw/source/ui/index/swuiidxmrk.cxx --- libreoffice-5.0.2/sw/source/ui/index/swuiidxmrk.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/ui/index/swuiidxmrk.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -621,6 +621,7 @@ } else { + SwViewShell::SetCareWin( 0 ); m_rDialog.EndDialog(RET_CANCEL); } return 0; @@ -930,7 +931,6 @@ SwIndexMarkPane::~SwIndexMarkPane() { delete pTOXMgr; - SwViewShell::SetCareWin( 0 ); } void SwIndexMarkPane::ReInitDlg(SwWrtShell& rWrtShell, SwTOXMark* pCurTOXMark) diff -Nru libreoffice-5.0.2/sw/source/uibase/app/docsh2.cxx libreoffice-5.0.5~rc2/sw/source/uibase/app/docsh2.cxx --- libreoffice-5.0.2/sw/source/uibase/app/docsh2.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/app/docsh2.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -207,7 +207,7 @@ m_pWrtShell->StartAllAction(); } - m_pDoc->getIDocumentStatistics().DocInfoChgd(); + m_pDoc->getIDocumentStatistics().DocInfoChgd(IsEnableSetModified()); if (m_pWrtShell) { @@ -296,8 +296,9 @@ EnableSetModified( false ); // #i41679# const bool bIsDocModified = m_pDoc->getIDocumentState().IsModified(); + // TODO: is the ResetModified() below because of only the direct call from DocInfoChgd, or does UpdateFields() set it too? - m_pDoc->getIDocumentStatistics().DocInfoChgd( ); + m_pDoc->getIDocumentStatistics().DocInfoChgd(false); // #i41679# if ( !bIsDocModified ) diff -Nru libreoffice-5.0.2/sw/source/uibase/app/docstyle.cxx libreoffice-5.0.5~rc2/sw/source/uibase/app/docstyle.cxx --- libreoffice-5.0.2/sw/source/uibase/app/docstyle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/app/docstyle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + +#include + #include #include #include @@ -1169,6 +1173,61 @@ return true; } +static +std::unique_ptr lcl_SwFormatToFlatItemSet(SwFormat *const pFormat) +{ + // note: we don't add the odd items that GetItemSet() would add + // because they don't seem relevant for preview + std::vector sets; + sets.push_back(&pFormat->GetAttrSet()); + while (SfxItemSet const*const pParent = sets.back()->GetParent()) + { + sets.push_back(pParent); + } + // start by copying top-level parent set + std::unique_ptr pRet(new SfxItemSet(*sets.back())); + sets.pop_back(); + for (auto iter = sets.rbegin(); iter != sets.rend(); ++iter) + { // in reverse so child overrides parent + pRet->Put(**iter); + } + return pRet; +} + +std::unique_ptr SwDocStyleSheet::GetItemSetForPreview() +{ + if (SFX_STYLE_FAMILY_PAGE == nFamily || SFX_STYLE_FAMILY_PSEUDO == nFamily) + { + SAL_WARN("sw.ui", "GetItemSetForPreview not implemented for page or number style"); + return std::unique_ptr(); + } + if (!bPhysical) + { + // because not only this style, but also any number of its parents + // (or follow style) may not actually exist in the document at this + // time, return one "flattened" item set that contains all items from + // all parents. + std::unique_ptr pRet; + FillStyleSheet(FillPreview, &pRet); + assert(pRet); + return pRet; + } + else + { + switch (nFamily) + { + case SFX_STYLE_FAMILY_CHAR: + return lcl_SwFormatToFlatItemSet(pCharFormat); + case SFX_STYLE_FAMILY_PARA: + return lcl_SwFormatToFlatItemSet(pColl); + case SFX_STYLE_FAMILY_FRAME: + return lcl_SwFormatToFlatItemSet(pFrameFormat); + default: + std::abort(); + } + } +} + // extract ItemSet to Name and Family, Mask SfxItemSet& SwDocStyleSheet::GetItemSet() @@ -1709,7 +1768,8 @@ } // determine the format -bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType ) +bool SwDocStyleSheet::FillStyleSheet( + FillStyleType const eFType, std::unique_ptr *const o_ppFlatSet) { bool bRet = false; sal_uInt16 nPoolId = USHRT_MAX; @@ -1717,8 +1777,9 @@ bool bCreate = FillPhysical == eFType; bool bDeleteInfo = false; - bool bFillOnlyInfo = FillAllInfo == eFType; + bool bFillOnlyInfo = FillAllInfo == eFType || FillPreview == eFType; std::vector aDelArr; + bool const isModified(rDoc.getIDocumentState().IsModified()); switch(nFamily) { @@ -1727,6 +1788,9 @@ bPhysical = 0 != pCharFormat; if( bFillOnlyInfo && !bPhysical ) { + // create style (plus all needed parents) and clean it up + // later - without affecting the undo/redo stack + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); pCharFormat = lcl_FindCharFormat(rDoc, aName, this, true ); @@ -1754,6 +1818,7 @@ bPhysical = 0 != pColl; if( bFillOnlyInfo && !bPhysical ) { + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); pColl = lcl_FindParaFormat(rDoc, aName, this, true ); @@ -1775,8 +1840,9 @@ case SFX_STYLE_FAMILY_FRAME: pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, bCreate); bPhysical = 0 != pFrameFormat; - if( bFillOnlyInfo && bPhysical ) + if (bFillOnlyInfo && !bPhysical) { + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); pFrameFormat = lcl_FindFrameFormat(rDoc, aName, this, true ); @@ -1796,6 +1862,7 @@ bPhysical = 0 != pDesc; if( bFillOnlyInfo && !pDesc ) { + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); pDesc = lcl_FindPageDesc( rDoc, aName, this, true ); @@ -1824,6 +1891,7 @@ bPhysical = 0 != pNumRule; if( bFillOnlyInfo && !pNumRule ) { + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); bDeleteInfo = true; ::lcl_SaveStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); pNumRule = lcl_FindNumRule( rDoc, aName, this, true ); @@ -1885,12 +1953,25 @@ if( RES_CONDTXTFMTCOLL == pFormat->Which() ) _nMask |= SWSTYLEBIT_CONDCOLL; + + if (FillPreview == eFType) + { + assert(o_ppFlatSet); + *o_ppFlatSet = lcl_SwFormatToFlatItemSet(pFormat); + } } SetMask( _nMask ); } if( bDeleteInfo && bFillOnlyInfo ) + { + ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); ::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); + if (!isModified) + { + rDoc.getIDocumentState().ResetModified(); + } + } return bRet; } diff -Nru libreoffice-5.0.2/sw/source/uibase/app/swmodule.cxx libreoffice-5.0.5~rc2/sw/source/uibase/app/swmodule.cxx --- libreoffice-5.0.2/sw/source/uibase/app/swmodule.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/app/swmodule.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -318,6 +318,7 @@ SvxColorToolBoxControl::RegisterControl(SID_ATTR_LINE_COLOR, pMod ); SvxLineEndToolBoxControl::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_FILL_COLOR, pMod); + SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_BACK_COLOR, pMod); SvxFontNameToolBoxControl::RegisterControl(SID_ATTR_CHAR_FONT, pMod ); SvxColorToolBoxControl::RegisterControl(SID_ATTR_CHAR_COLOR, pMod ); diff -Nru libreoffice-5.0.2/sw/source/uibase/dbui/dbmgr.cxx libreoffice-5.0.5~rc2/sw/source/uibase/dbui/dbmgr.cxx --- libreoffice-5.0.2/sw/source/uibase/dbui/dbmgr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/dbui/dbmgr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -928,6 +928,8 @@ pStoreToFilterOptions = &rMergeDescriptor.sSaveToFilterOptions; } } + const bool bIsPDFeport = pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export"; + bCancel = false; // in case of creating a single resulting file this has to be created here @@ -1113,7 +1115,7 @@ // Create a copy of the source document and work with that one instead of the source. // If we're not in the single file mode (which requires modifying the document for the merging), // it is enough to do this just once. - if( 1 == nDocNo || bCreateSingleFile ) + if( 1 == nDocNo || bCreateSingleFile || bIsPDFeport ) { assert( !xWorkDocSh.Is()); // copy the source document @@ -1244,12 +1246,13 @@ pWorkView->StartPrint( aOptions, IsMergeSilent(), rMergeDescriptor.bPrintAsync ); SfxPrinter* pDocPrt = pWorkView->GetPrinter(false); JobSetup aJobSetup = pDocPrt ? pDocPrt->GetJobSetup() : SfxViewShell::GetJobSetup(); - Printer::PreparePrintJob( pWorkView->GetPrinterController(), aJobSetup ); + bCancel = !Printer::PreparePrintJob( pWorkView->GetPrinterController(), aJobSetup ); #if ENABLE_CUPS && !defined(MACOSX) - psp::PrinterInfoManager::get().startBatchPrint(); + if( !bCancel ) + psp::PrinterInfoManager::get().startBatchPrint(); #endif } - if( !Printer::ExecutePrintJob( pWorkView->GetPrinterController())) + if( !bCancel && !Printer::ExecutePrintJob( pWorkView->GetPrinterController())) bCancel = true; } else @@ -1270,7 +1273,7 @@ //convert fields to text if we are exporting to PDF //this prevents a second merge while updating the fields in SwXTextDocument::getRendererCount() - if( pStoreToFilter && pStoreToFilter->GetFilterName() == "writer_pdf_Export") + if( bIsPDFeport ) rWorkShell.ConvertFieldsToText(); xWorkDocSh->DoSaveAs(*pDstMed); xWorkDocSh->DoSaveCompleted(pDstMed); @@ -1359,7 +1362,7 @@ } } } - if( bCreateSingleFile ) + if( bCreateSingleFile || bIsPDFeport ) { pWorkDoc->SetDBManager( pOldDBManager ); xWorkDocSh->DoClose(); @@ -1397,8 +1400,11 @@ psp::PrinterInfoManager::get().flushBatchPrint(); #endif } - pWorkDoc->SetDBManager( pOldDBManager ); - xWorkDocSh->DoClose(); + if( !bIsPDFeport ) + { + pWorkDoc->SetDBManager( pOldDBManager ); + xWorkDocSh->DoClose(); + } } if (bCreateSingleFile) diff -Nru libreoffice-5.0.2/sw/source/uibase/docvw/edtwin.cxx libreoffice-5.0.5~rc2/sw/source/uibase/docvw/edtwin.cxx --- libreoffice-5.0.2/sw/source/uibase/docvw/edtwin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/docvw/edtwin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1822,7 +1822,7 @@ break; case KEY_DELETE: - if ( !rSh.HasReadonlySel() ) + if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputField()) { if (rSh.IsInFrontOfLabel() && rSh.NumOrNoNum(false)) eKeyState = KS_NumOrNoNum; @@ -1909,7 +1909,7 @@ break; case KEY_BACKSPACE: case KEY_BACKSPACE | KEY_SHIFT: - if ( !rSh.HasReadonlySel() ) + if ( !rSh.HasReadonlySel() || rSh.CrsrInsideInputField()) { bool bDone = false; // try to add comment for code snip: diff -Nru libreoffice-5.0.2/sw/source/uibase/inc/FrameControl.hxx libreoffice-5.0.5~rc2/sw/source/uibase/inc/FrameControl.hxx --- libreoffice-5.0.2/sw/source/uibase/inc/FrameControl.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/inc/FrameControl.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -56,7 +56,7 @@ const SwFrm* m_pFrm; protected: - virtual ~SwFrameMenuButtonBase() {} + virtual ~SwFrameMenuButtonBase() { disposeOnce(); } virtual void dispose() SAL_OVERRIDE; public: diff -Nru libreoffice-5.0.2/sw/source/uibase/inc/redlndlg.hxx libreoffice-5.0.5~rc2/sw/source/uibase/inc/redlndlg.hxx --- libreoffice-5.0.2/sw/source/uibase/inc/redlndlg.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/inc/redlndlg.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -93,6 +93,13 @@ // prevent update dialog data during longer operations (cf #102657#) bool bInhibitActivate; + Image aInserted; + Image aDeleted; + Image aFormated; + Image aTableChgd; + Image aFormatCollSet; + Image aAutoFormat; + DECL_DLLPRIVATE_LINK( AcceptHdl, void* ); DECL_DLLPRIVATE_LINK( AcceptAllHdl, void* ); DECL_DLLPRIVATE_LINK( RejectHdl, void* ); diff -Nru libreoffice-5.0.2/sw/source/uibase/misc/redlndlg.cxx libreoffice-5.0.5~rc2/sw/source/uibase/misc/redlndlg.cxx --- libreoffice-5.0.2/sw/source/uibase/misc/redlndlg.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/misc/redlndlg.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -160,7 +160,14 @@ bOnlyFormatedRedlines( false ), bHasReadonlySel ( false ), bRedlnAutoFormat (bAutoFormat), - bInhibitActivate( false ) + bInhibitActivate( false ), + aInserted (SW_RES(IMG_REDLINE_INSERTED)), + aDeleted (SW_RES(IMG_REDLINE_DELETED)), + aFormated (SW_RES(IMG_REDLINE_FORMATED)), + aTableChgd (SW_RES(IMG_REDLINE_TABLECHG)), + aFormatCollSet (SW_RES(IMG_REDLINE_FMTCOLLSET)), + aAutoFormat (SW_RES(IMG_REDLINE_AUTOFMT)) + { aTabPagesCTRL->SetHelpId(HID_REDLINE_CTRL); pTPView = aTabPagesCTRL->GetViewPage(); @@ -338,13 +345,6 @@ Image SwRedlineAcceptDlg::GetActionImage(const SwRangeRedline& rRedln, sal_uInt16 nStack) { - const static Image aInserted(SW_RES(IMG_REDLINE_INSERTED)); - const static Image aDeleted(SW_RES(IMG_REDLINE_DELETED)); - const static Image aFormated(SW_RES(IMG_REDLINE_FORMATED)); - const static Image aTableChgd(SW_RES(IMG_REDLINE_TABLECHG)); - const static Image aFormatCollSet(SW_RES(IMG_REDLINE_FMTCOLLSET)); - const static Image aAutoFormat(SW_RES(IMG_REDLINE_AUTOFMT)); - switch (rRedln.GetType(nStack)) { case nsRedlineType_t::REDLINE_INSERT: return aInserted; diff -Nru libreoffice-5.0.2/sw/source/uibase/shells/annotsh.cxx libreoffice-5.0.5~rc2/sw/source/uibase/shells/annotsh.cxx --- libreoffice-5.0.2/sw/source/uibase/shells/annotsh.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/shells/annotsh.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -260,6 +260,7 @@ break; } case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: { if( rReq.GetArgs() ) @@ -696,6 +697,7 @@ } break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; diff -Nru libreoffice-5.0.2/sw/source/uibase/shells/drwtxtex.cxx libreoffice-5.0.5~rc2/sw/source/uibase/shells/drwtxtex.cxx --- libreoffice-5.0.2/sw/source/uibase/shells/drwtxtex.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/shells/drwtxtex.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -169,6 +169,7 @@ break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: { @@ -913,6 +914,7 @@ } break; case SID_ATTR_CHAR_COLOR: nEEWhich = EE_CHAR_COLOR; break; + case SID_ATTR_CHAR_BACK_COLOR: nEEWhich = EE_CHAR_BKGCOLOR; break; case SID_ATTR_CHAR_UNDERLINE: nEEWhich = EE_CHAR_UNDERLINE;break; case SID_ATTR_CHAR_OVERLINE: nEEWhich = EE_CHAR_OVERLINE;break; case SID_ATTR_CHAR_CONTOUR: nEEWhich = EE_CHAR_OUTLINE; break; diff -Nru libreoffice-5.0.2/sw/source/uibase/shells/textsh1.cxx libreoffice-5.0.5~rc2/sw/source/uibase/shells/textsh1.cxx --- libreoffice-5.0.2/sw/source/uibase/shells/textsh1.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/shells/textsh1.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -666,6 +666,7 @@ if( bSet != rACfg.IsAutoFormatByInput() ) { rACfg.SetAutoFormatByInput( bSet ); + rACfg.Commit(); GetView().GetViewFrame()->GetBindings().Invalidate( nSlot ); if ( !pItem ) rReq.AppendItem( SfxBoolItem( GetPool().GetWhich(nSlot), bSet ) ); diff -Nru libreoffice-5.0.2/sw/source/uibase/shells/textsh.cxx libreoffice-5.0.5~rc2/sw/source/uibase/shells/textsh.cxx --- libreoffice-5.0.2/sw/source/uibase/shells/textsh.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/shells/textsh.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -698,9 +698,13 @@ SfxObjectCreateMode eCreateMode = GetView().GetDocShell()->GetCreateMode(); - rSh.Push(); - const bool bCrsrInHidden = rSh.SelectHiddenRange(); - rSh.Pop(); + bool bCrsrInHidden = false; + if( !rSh.HasMark() ) + { + rSh.Push(); + bCrsrInHidden = rSh.SelectHiddenRange(); + rSh.Pop(); + } while ( nWhich ) { @@ -765,6 +769,7 @@ case FN_INSERT_FRAME_INTERACT: { if( GetShell().IsSelFrmMode() + || rSh.IsTableMode() || GetShell().CrsrInsideInputField() || bCrsrInHidden ) rSet.DisableItem(nWhich); diff -Nru libreoffice-5.0.2/sw/source/uibase/sidebar/PagePropertyPanel.cxx libreoffice-5.0.5~rc2/sw/source/uibase/sidebar/PagePropertyPanel.cxx --- libreoffice-5.0.2/sw/source/uibase/sidebar/PagePropertyPanel.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/sidebar/PagePropertyPanel.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -226,6 +226,11 @@ m_aSwPageColControl.dispose(); m_aSwPagePgMetricControl.dispose(); + maColumnPopup.dispose(); + maSizePopup.dispose(); + maMarginPopup.dispose(); + maOrientationPopup.dispose(); + PanelLayout::dispose(); } diff -Nru libreoffice-5.0.2/sw/source/uibase/utlui/navipi.cxx libreoffice-5.0.5~rc2/sw/source/uibase/utlui/navipi.cxx --- libreoffice-5.0.2/sw/source/uibase/utlui/navipi.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/source/uibase/utlui/navipi.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -699,6 +699,8 @@ Rectangle aSecondRect = aContentToolBox->GetItemRect(FN_SELECT_HEADER); Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(), aFirstRect.Bottom() - aFirstRect.Top() ); + Size aOptimalSize(pEdit->get_preferred_size()); + aItemWinSize.Width() = std::max(aItemWinSize.Width(), aOptimalSize.Width()); pEdit->SetSizePixel(aItemWinSize); aContentToolBox->InsertSeparator(4); aContentToolBox->InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4); diff -Nru libreoffice-5.0.2/sw/uiconfig/swriter/menubar/menubar.xml libreoffice-5.0.5~rc2/sw/uiconfig/swriter/menubar/menubar.xml --- libreoffice-5.0.2/sw/uiconfig/swriter/menubar/menubar.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/uiconfig/swriter/menubar/menubar.xml 2016-02-04 16:41:28.000000000 +0000 @@ -239,8 +239,8 @@ - - + + diff -Nru libreoffice-5.0.2/sw/uiconfig/swriter/toolbar/drawbar.xml libreoffice-5.0.5~rc2/sw/uiconfig/swriter/toolbar/drawbar.xml --- libreoffice-5.0.2/sw/uiconfig/swriter/toolbar/drawbar.xml 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/sw/uiconfig/swriter/toolbar/drawbar.xml 2016-02-04 16:41:28.000000000 +0000 @@ -29,11 +29,9 @@ - - diff -Nru libreoffice-5.0.2/toolkit/source/awt/vclxaccessiblecomponent.cxx libreoffice-5.0.5~rc2/toolkit/source/awt/vclxaccessiblecomponent.cxx --- libreoffice-5.0.2/toolkit/source/awt/vclxaccessiblecomponent.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/toolkit/source/awt/vclxaccessiblecomponent.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -42,35 +42,45 @@ using namespace ::com::sun::star; using namespace ::comphelper; -VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXindow ) +VCLXAccessibleComponent::VCLXAccessibleComponent( VCLXWindow* pVCLXWindow ) : AccessibleExtendedComponentHelper_BASE( new VCLExternalSolarLock() ) , OAccessibleImplementationAccess( ) { - mpVCLXindow = pVCLXindow; - mxWindow = pVCLXindow; + m_xVCLXWindow = pVCLXWindow; m_pSolarLock = static_cast< VCLExternalSolarLock* >( getExternalLock( ) ); - DBG_ASSERT( pVCLXindow->GetWindow(), "VCLXAccessibleComponent - no window!" ); - if ( pVCLXindow->GetWindow() ) + DBG_ASSERT( pVCLXWindow->GetWindow(), "VCLXAccessibleComponent - no window!" ); + m_xEventSource = pVCLXWindow->GetWindow(); + if ( m_xEventSource ) { - pVCLXindow->GetWindow()->AddEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); - pVCLXindow->GetWindow()->AddChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); + m_xEventSource->AddEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); + m_xEventSource->AddChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); } // announce the XAccessible of our creator to the base class - lateInit( pVCLXindow ); + lateInit( pVCLXWindow ); } -VCLXAccessibleComponent::~VCLXAccessibleComponent() +VCLXWindow* VCLXAccessibleComponent::GetVCLXWindow() const { - ensureDisposed(); + return m_xVCLXWindow.get(); +} - if ( mpVCLXindow && mpVCLXindow->GetWindow() ) +void VCLXAccessibleComponent::DisconnectEvents() +{ + if ( m_xEventSource ) { - mpVCLXindow->GetWindow()->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); - mpVCLXindow->GetWindow()->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); + m_xEventSource->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); + m_xEventSource->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); + m_xEventSource.clear(); } +} + +VCLXAccessibleComponent::~VCLXAccessibleComponent() +{ + ensureDisposed(); + DisconnectEvents(); delete m_pSolarLock; m_pSolarLock = NULL; @@ -104,13 +114,11 @@ IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclSimpleEvent*, pEvent ) { - DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); - - /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper - * might have been destroyed by the previous VCLEventListener (if no AT tool - * is running), e.g. sub-toolbars in impress. - */ - if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #122218# */ && (pEvent->GetId() != VCLEVENT_WINDOW_ENDPOPUPMODE) ) + /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper + * might have been destroyed by the previous VCLEventListener (if no AT tool + * is running), e.g. sub-toolbars in impress. + */ + if ( pEvent && pEvent->ISA( VclWindowEvent ) && m_xVCLXWindow.is() /* #122218# */ && (pEvent->GetId() != VCLEVENT_WINDOW_ENDPOPUPMODE) ) { DBG_ASSERT( static_cast(pEvent)->GetWindow(), "Window???" ); if( !static_cast(pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() || ( pEvent->GetId() == VCLEVENT_OBJECT_DYING ) ) @@ -123,8 +131,7 @@ IMPL_LINK( VCLXAccessibleComponent, WindowChildEventListener, VclSimpleEvent*, pEvent ) { - DBG_ASSERT( pEvent && pEvent->ISA( VclWindowEvent ), "Unknown WindowEvent!" ); - if ( pEvent && pEvent->ISA( VclWindowEvent ) && mxWindow.is() /* #i68079# */ ) + if ( pEvent && pEvent->ISA( VclWindowEvent ) && m_xVCLXWindow.is() /* #i68079# */ ) { DBG_ASSERT( static_cast(pEvent)->GetWindow(), "Window???" ); if( !static_cast(pEvent)->GetWindow()->IsAccessibilityEventsSuppressed() ) @@ -192,10 +199,8 @@ { case VCLEVENT_OBJECT_DYING: { - pAccWindow->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); - pAccWindow->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); - mxWindow.clear(); - mpVCLXindow = NULL; + DisconnectEvents(); + m_xVCLXWindow.clear(); } break; case VCLEVENT_WINDOW_CHILDDESTROYED: @@ -344,16 +349,11 @@ void VCLXAccessibleComponent::disposing() { - if ( mpVCLXindow && mpVCLXindow->GetWindow() ) - { - mpVCLXindow->GetWindow()->RemoveEventListener( LINK( this, VCLXAccessibleComponent, WindowEventListener ) ); - mpVCLXindow->GetWindow()->RemoveChildEventListener( LINK( this, VCLXAccessibleComponent, WindowChildEventListener ) ); - } + DisconnectEvents(); AccessibleExtendedComponentHelper_BASE::disposing(); - mxWindow.clear(); - mpVCLXindow = NULL; + m_xVCLXWindow.clear(); } VclPtr VCLXAccessibleComponent::GetWindow() const @@ -770,8 +770,8 @@ OExternalLockGuard aGuard( this ); uno::Reference< accessibility::XAccessibleStateSet > xStates = getAccessibleStateSet(); - if ( mxWindow.is() && xStates.is() && xStates->contains( accessibility::AccessibleStateType::FOCUSABLE ) ) - mxWindow->setFocus(); + if ( m_xVCLXWindow.is() && xStates.is() && xStates->contains( accessibility::AccessibleStateType::FOCUSABLE ) ) + m_xVCLXWindow->setFocus(); } sal_Int32 SAL_CALL VCLXAccessibleComponent::getForeground( ) throw (uno::RuntimeException, std::exception) diff -Nru libreoffice-5.0.2/translations/source/af/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/af/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/af/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/af/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:11+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "Vervang" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Wydte" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Wydte" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Hoogte" #: borderpage.ui msgctxt "" @@ -4331,13 +4334,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Hoogte" #: distributionpage.ui #, fuzzy @@ -6511,13 +6515,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Naam" #: hyperlinkdocpage.ui msgctxt "" @@ -6646,13 +6651,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Naam" #: hyperlinkinternetpage.ui msgctxt "" @@ -6745,13 +6751,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Naam" #: hyperlinkmailpage.ui msgctxt "" @@ -6898,13 +6905,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Naam" #: hyperlinknewdocpage.ui msgctxt "" @@ -7724,13 +7732,14 @@ msgstr "Strepie" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Styl" #: linetabpage.ui msgctxt "" @@ -7788,13 +7797,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Wydte" #: linetabpage.ui msgctxt "" @@ -7806,13 +7816,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Wydte" #: linetabpage.ui msgctxt "" @@ -7878,13 +7889,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Wydte" #: linetabpage.ui msgctxt "" @@ -10596,13 +10608,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Grootte" #: optfontspage.ui #, fuzzy @@ -13232,13 +13245,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Hoogte" #: pageformatpage.ui msgctxt "" @@ -13631,13 +13645,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Hoogte" #: paragalignpage.ui msgctxt "" @@ -14661,22 +14676,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Posisie" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Posisie" #: possizetabpage.ui msgctxt "" @@ -14698,13 +14715,14 @@ msgstr "Posisie" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Wydte" #: possizetabpage.ui #, fuzzy @@ -15151,22 +15169,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Posisie" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Posisie" #: rotationtabpage.ui msgctxt "" @@ -17629,57 +17649,3 @@ "string.text" msgid "View Layout" msgstr "Aansiguitleg" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/af/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/af/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/af/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/af/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:56+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/af/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/af/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/af/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/af/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-11 19:54+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:13+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: af\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431374070.000000\n" +"X-POOTLE-MTIME: 1439550802.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/af/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/af/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/af/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/af/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-11 20:00+0000\n" -"Last-Translator: Dwayne Bailey (admin) \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:21+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: af\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431374421.000000\n" +"X-POOTLE-MTIME: 1439551316.000000\n" #: stbctrls.src msgctxt "" @@ -161,14 +161,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/am/basctl/source/basicide.po libreoffice-5.0.5~rc2/translations/source/am/basctl/source/basicide.po --- libreoffice-5.0.2/translations/source/am/basctl/source/basicide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/basctl/source/basicide.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-30 13:08+0200\n" -"PO-Revision-Date: 2013-06-10 16:48+0000\n" -"Last-Translator: Samson \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-06 15:15+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1370882891.0\n" +"X-POOTLE-MTIME: 1446822932.000000\n" #: basicprint.src msgctxt "" @@ -427,7 +427,7 @@ "RID_STR_CANNOTSAVEVBA\n" "string.text" msgid "You are editing a VBA macro. Changes can be saved only in OpenDocument Format." -msgstr "" +msgstr "እርስዎ እያረሙ ነው የ VBA macro. ለውጦቹ የሚቀመጡት በ OpenDocument አቀራረብ ብቻ ነው" #: basidesh.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/chart2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/chart2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/chart2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/chart2/uiconfig/ui.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-08-19 22:02+0000\n" +"PO-Revision-Date: 2016-01-22 17:44+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440021724.000000\n" +"X-POOTLE-MTIME: 1453484693.000000\n" #: 3dviewdialog.ui msgctxt "" @@ -68,7 +68,7 @@ "title\n" "string.text" msgid "Data Table" -msgstr "የዳታ ሰንጠረዥ" +msgstr "የ ዳታ ሰንጠረዥ" #: chartdatadialog.ui msgctxt "" @@ -203,7 +203,7 @@ "label\n" "string.text" msgid "Number _format..." -msgstr "የቁጥር _አቀራረብ..." +msgstr "የ ቁጥር _አቀራረብ..." #: dlg_DataLabel.ui msgctxt "" @@ -1092,7 +1092,7 @@ "label\n" "string.text" msgid "_Start with horizontal line" -msgstr "በአግድም መስመር _ማስጀመሪያ" +msgstr "በ አግድም መስመር _ማስጀመሪያ" #: steppedlinesdlg.ui msgctxt "" @@ -1110,7 +1110,7 @@ "label\n" "string.text" msgid "_End with horizontal line" -msgstr "በአግድም መስመር _መጨረሻ" +msgstr "በ አግድም መስመር _መጨረሻ" #: steppedlinesdlg.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/connectivity/source/resource.po libreoffice-5.0.5~rc2/translations/source/am/connectivity/source/resource.po --- libreoffice-5.0.2/translations/source/am/connectivity/source/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/connectivity/source/resource.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-03 16:36+0000\n" +"PO-Revision-Date: 2015-10-15 22:38+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435941361.000000\n" +"X-POOTLE-MTIME: 1444948694.000000\n" #: conn_error_message.src msgctxt "" @@ -630,7 +630,7 @@ "STR_INVALID_TABLE_DESCRIPTOR_ERROR\n" "string.text" msgid "Could not create table: invalid object descriptor." -msgstr "ሰንጠረዥ መፍጠር አልተቻለም ፡ ዋጋ የሌለው የእቃ መግለጫ" +msgstr "ሰንጠረዥ መፍጠር አልተቻለም: ዋጋ የሌለው የእቃ መግለጫ" #: conn_shared_res.src msgctxt "" @@ -836,7 +836,7 @@ "STR_COULD_NOT_ALTER_TABLE\n" "string.text" msgid "The table could not be altered." -msgstr "The table could not be altered." +msgstr "ሰንጠረዡን መቀየር አይቻልም" #: conn_shared_res.src msgctxt "" @@ -860,7 +860,7 @@ "STR_SORT_BY_COL_ONLY\n" "string.text" msgid "Can only sort by table columns." -msgstr "መለየት የሚቻለው በሰንጠረዥ አምዶች ብቻ ነው" +msgstr "መለየት የሚቻለው በ ሰንጠረዥ አምዶች ብቻ ነው" #: conn_shared_res.src msgctxt "" @@ -892,7 +892,7 @@ "STR_TABLE_READONLY\n" "string.text" msgid "The table can not be changed. It is read only." -msgstr "ሰንጠረዡን መቀየር አይቻልም ፡ ለማንበብ ብቻ ነው" +msgstr "ሰንጠረዡን መቀየር አይቻልም: ለማንበብ ብቻ ነው" #: conn_shared_res.src msgctxt "" @@ -916,7 +916,7 @@ "STR_QUERY_MORE_TABLES\n" "string.text" msgid "The query can not be executed. It contains more than one table." -msgstr "ጥያቄውን መፈጸም አይቻልም ፡ ከአንድ በላይ ክፍል ይዟል" +msgstr "ጥያቄውን መፈጸም አይቻልም: ከ አንድ በላይ ክፍል ይዟል" #: conn_shared_res.src msgctxt "" @@ -924,7 +924,7 @@ "STR_QUERY_NO_TABLE\n" "string.text" msgid "The query can not be executed. It contains no valid table." -msgstr "ጥያቄውን መፈጸም አይቻልም ፡ ዋጋ ያለው ክፍል አልያዘም" +msgstr "ጥያቄውን መፈጸም አይቻልም: ዋጋ ያለው ክፍል አልያዘም" #: conn_shared_res.src msgctxt "" @@ -1012,7 +1012,7 @@ "STR_NO_KDE_INST\n" "string.text" msgid "No suitable KDE installation was found." -msgstr "ለኬዲኢ ተስማሚ የሆነ መግጠሚያ አልተገኘም" +msgstr "ለ ኬዲኢ ተስማሚ የሆነ መግጠሚያ አልተገኘም" #: conn_shared_res.src msgctxt "" @@ -1056,7 +1056,7 @@ "STR_NO_TABLE\n" "string.text" msgid "No such table!" -msgstr "እንዲህ አይነት ሰንጠረዥ የለም" +msgstr "እንዲህ አይነት ሰንጠረዥ የለም!" #: conn_shared_res.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/cui/source/options.po libreoffice-5.0.5~rc2/translations/source/am/cui/source/options.po --- libreoffice-5.0.2/translations/source/am/cui/source/options.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/cui/source/options.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-08-17 23:37+0000\n" +"PO-Revision-Date: 2016-01-22 17:45+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439854668.000000\n" +"X-POOTLE-MTIME: 1453484710.000000\n" #: connpooloptions.src msgctxt "" @@ -966,7 +966,7 @@ "Formatting Aids\n" "itemlist.text" msgid "Formatting Aids" -msgstr "Formatting Aids" +msgstr "የ አቀራረብ እርዳታ" #: treeopt.src msgctxt "" @@ -1092,7 +1092,7 @@ "Formatting Aids\n" "itemlist.text" msgid "Formatting Aids" -msgstr "Formatting Aids" +msgstr "የ አቀራረብ እርዳታ" #: treeopt.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/cui/source/tabpages.po libreoffice-5.0.5~rc2/translations/source/am/cui/source/tabpages.po --- libreoffice-5.0.2/translations/source/am/cui/source/tabpages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/cui/source/tabpages.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-14 10:09+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-28 18:17+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439546989.000000\n" +"X-POOTLE-MTIME: 1446056270.000000\n" #: border.src msgctxt "" @@ -38,7 +38,7 @@ "RID_SVXSTR_TABLE_PRESET_OUTERHORI\n" "string.text" msgid "Set Outer Border and Horizontal Lines" -msgstr "የውጪ ድንበሮች እና የአግድም መስመሮች ማሰናጃ" +msgstr "የ ውጪ ድንበሮች እና የ አግድም መስመሮች ማሰናጃ" #: border.src msgctxt "" @@ -1039,7 +1039,7 @@ "RID_SVXSTR_NON_BREAK_SPACE\n" "string.text" msgid "Add non-breaking space before specific punctuation marks in French text" -msgstr "" +msgstr "መጨመሪያ ምንም-ያልተሰበረ ክፍተት ከ ስርአተ ነጥብ በፊት ምልክት ማድረጊያ ለ ፈረንሳይኛ ጽሁፍ" #: strings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-17 22:37+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-22 17:47+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439851033.000000\n" +"X-POOTLE-MTIME: 1453484851.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME ዘመናዊ ፡ በጣም-ቀላል-ለመጠቀም , open source productivity suite ለቃላት ማቀናበሪያ ፡ ለሰንጠረዥ ፡ ለማቅረቢያ እና ሌሎችም" #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 LibreOffice contributors." #: aboutdialog.ui @@ -3973,7 +3974,7 @@ "title\n" "string.text" msgid "Customize" -msgstr "" +msgstr "ማስተካከያ" #: customizedialog.ui msgctxt "" @@ -5308,7 +5309,7 @@ "label\n" "string.text" msgid "_Wildcard expression" -msgstr "" +msgstr "_ሁለ ገብ መግለጫ" #: fmsearchdialog.ui msgctxt "" @@ -5398,7 +5399,7 @@ "title\n" "string.text" msgid "Format Number" -msgstr "የቁጥር አቀራረብ" +msgstr "የ ቁጥር አቀራረብ" #: galleryapplyprogress.ui msgctxt "" @@ -6038,7 +6039,7 @@ "title\n" "string.text" msgid "Edit Custom Dictionary" -msgstr "" +msgstr "መዝገበ ቃላት ማረሚያ ማስተካከያ" #: hangulhanjaeditdictdialog.ui msgctxt "" @@ -8516,7 +8517,7 @@ "label\n" "string.text" msgid "_Format code" -msgstr "_Format code" +msgstr "የ ኮድ _አቀራረብ" #: numberingformatpage.ui msgctxt "" @@ -9291,7 +9292,7 @@ "label\n" "string.text" msgid "N_umbering alignment:" -msgstr "የ_ቁጥር አሰጣጥ አሰላለፍ:" +msgstr "የ _ቁጥር አሰጣጥ አሰላለፍ:" #: numberingpositionpage.ui msgctxt "" @@ -9367,7 +9368,7 @@ "label\n" "string.text" msgid "N_umbering alignment:" -msgstr "የ_ቁጥር አሰጣጥ አሰላለፍ:" +msgstr "የ _ቁጥር አሰጣጥ አሰላለፍ:" #: numberingpositionpage.ui msgctxt "" @@ -9712,13 +9713,14 @@ msgstr "የ macro recording (የተወሰነ)" #: optadvancedpage.ui +#, fuzzy msgctxt "" "optadvancedpage.ui\n" "expertconfig\n" "label\n" "string.text" msgid "Expert Configuration" -msgstr "" +msgstr "የ ባለሞያ ማዋቀሪያዎች" #: optadvancedpage.ui msgctxt "" @@ -10592,7 +10594,7 @@ "label\n" "string.text" msgid "Collect usage data and send it to The Document Foundation" -msgstr "" +msgstr "የ አጠቃቀም ዳታ መስብሰቢያ እና ለ ሰነድ አዘጋጆቹ መላኪያ" #: optgeneralpage.ui msgctxt "" @@ -13058,7 +13060,7 @@ "label\n" "string.text" msgid "Paper Format" -msgstr "የወረቀት አቀራረብ" +msgstr "የ ወረቀት አቀራረብ" #: pageformatpage.ui msgctxt "" @@ -13184,7 +13186,7 @@ "label\n" "string.text" msgid "_Fit object to paper format" -msgstr "እቃውን በወረቀቱ አቀራረብ _ልክ ማድረጊያ" +msgstr "እቃውን በ ወረቀቱ አቀራረብ _ልክ ማድረጊያ" #: pageformatpage.ui msgctxt "" @@ -15952,7 +15954,7 @@ "label\n" "string.text" msgid "Web login information (passwords are never shown)" -msgstr "የዌብ መግቢያ መረጃ (የመግቢያ ቃል አይታይም)" +msgstr "የ ዌብ መግቢያ መረጃ (የ መግቢያ ቃል አይታይም)" #: storedwebconnectiondialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/app.po --- libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/app.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-12-07 19:23+0000\n" -"Last-Translator: Samson \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-22 17:47+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1417980191.000000\n" +"X-POOTLE-MTIME: 1453484858.000000\n" #: app.src msgctxt "" @@ -450,7 +450,7 @@ "SID_DB_APP_VIEW_DOCINFO_PREVIEW\n" "menuitem.text" msgid "Document Information" -msgstr "የሰነድ መረጃ" +msgstr "የ ሰነድ መረጃ" #: app.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/browser.po libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/browser.po --- libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/browser.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/browser.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-06 23:49+0000\n" +"PO-Revision-Date: 2016-01-22 17:48+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441583377.000000\n" +"X-POOTLE-MTIME: 1453484894.000000\n" #: sbabrw.src msgctxt "" @@ -166,7 +166,7 @@ "STR_NO_TABLE_FORMAT_INSIDE\n" "string.text" msgid "No table format could be found." -msgstr "የሰንጠረዥ አቀራረብ ማግኘት አልተገኘም" +msgstr "የ ሰንጠረዥ አቀራረብ ማግኘት አልተቻለም" #: sbabrw.src msgctxt "" @@ -210,7 +210,7 @@ "ID_BROWSER_TABLEATTR\n" "menuitem.text" msgid "Table Format..." -msgstr "የሰንጠረዥ አቀራረብ..." +msgstr "የ ሰንጠረዥ አቀራረብ..." #: sbagrid.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/control.po libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/control.po --- libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/control.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/control.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:02+0100\n" -"PO-Revision-Date: 2012-11-18 14:48+0000\n" -"Last-Translator: Andras \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-22 17:48+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1353250125.0\n" +"X-POOTLE-MTIME: 1453484911.000000\n" #: TableGrantCtrl.src msgctxt "" @@ -118,7 +118,7 @@ "STR_NOTABLEINFO\n" "string.text" msgid "Successfully connected, but information about database tables is not available." -msgstr "በሚገባ ተገናኝቷል ፡ ነገር ግን ስለ ዳታቤዝ ሰንጠረዥ መረጃ አልተገኘም" +msgstr "በሚገባ ተገናኝቷል: ነገር ግን ስለ ዳታቤዝ ሰንጠረዥ መረጃ አልተገኘም" #: tabletree.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/tabledesign.po libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/tabledesign.po --- libreoffice-5.0.2/translations/source/am/dbaccess/source/ui/tabledesign.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/dbaccess/source/ui/tabledesign.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-12-07 19:25+0000\n" -"Last-Translator: Samson \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-22 17:49+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1417980346.000000\n" +"X-POOTLE-MTIME: 1453484941.000000\n" #: table.src msgctxt "" @@ -296,7 +296,7 @@ "STR_FORMAT\n" "string.text" msgid "Format example" -msgstr "የአቀራረብ ምሳሌ" +msgstr "የ አቀራረብ ምሳሌ" #: table.src msgctxt "" @@ -346,7 +346,7 @@ "STR_HELP_NUMERIC_TYPE\n" "string.text" msgid "Enter the number format." -msgstr "የቁጥር አቀራረብ ያስገቡ" +msgstr "የ ቁጥር አቀራረብ ያስገቡ" #: table.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/dbaccess/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/dbaccess/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/dbaccess/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/dbaccess/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-14 10:17+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-22 17:49+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439547433.000000\n" +"X-POOTLE-MTIME: 1453484955.000000\n" #: admindialog.ui msgctxt "" @@ -821,7 +821,7 @@ "title\n" "string.text" msgid "Field Format" -msgstr "የሜዳ አቀራረብ" +msgstr "የ ሜዳ አቀራረብ" #: fielddialog.ui msgctxt "" @@ -1133,7 +1133,7 @@ "label\n" "string.text" msgid "_Query of generated values:" -msgstr "" +msgstr "የ መነጩ ዋጋዎች _ጥያቄ" #: generatedvaluespage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/editeng/source/items.po libreoffice-5.0.5~rc2/translations/source/am/editeng/source/items.po --- libreoffice-5.0.2/translations/source/am/editeng/source/items.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/editeng/source/items.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-14 10:20+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-29 00:30+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439547609.000000\n" +"X-POOTLE-MTIME: 1446078628.000000\n" #: page.src msgctxt "" @@ -1847,7 +1847,7 @@ "RID_SVXITEMS_HORJUST_STANDARD\n" "string.text" msgid "Horizontal alignment default" -msgstr "ነባር በአግድም ማሰለፊያ" +msgstr "ነባር በ አግድም ማሰለፊያ" #: svxitems.src msgctxt "" @@ -1895,7 +1895,7 @@ "RID_SVXITEMS_VERJUST_STANDARD\n" "string.text" msgid "Vertical alignment default" -msgstr "ነባር በቁመት ማሰለፊያ" +msgstr "ነባር በ ቁመት ማሰለፊያ" #: svxitems.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/extensions/source/propctrlr.po libreoffice-5.0.5~rc2/translations/source/am/extensions/source/propctrlr.po --- libreoffice-5.0.2/translations/source/am/extensions/source/propctrlr.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/extensions/source/propctrlr.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-08-20 17:20+0000\n" +"PO-Revision-Date: 2016-01-22 17:50+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440091201.000000\n" +"X-POOTLE-MTIME: 1453485022.000000\n" #: formlinkdialog.src msgctxt "" @@ -119,7 +119,7 @@ "RID_STR_STRICTFORMAT\n" "string.text" msgid "Strict format" -msgstr "Strict format" +msgstr "የተወሰነ አቀራረብ" #: formres.src msgctxt "" @@ -263,7 +263,7 @@ "RID_STR_VERTICAL_ALIGN\n" "string.text" msgid "Vert. Alignment" -msgstr "በቁመት ማሰለፊያ" +msgstr "በ ቁመት ማሰለፊያ" #: formres.src msgctxt "" @@ -676,7 +676,7 @@ "RID_STR_DATEFORMAT\n" "string.text" msgid "Date format" -msgstr "የቀን አቀራረብ" +msgstr "የ ቀን አቀራረብ" #: formres.src msgctxt "" @@ -708,7 +708,7 @@ "RID_STR_TIMEFORMAT\n" "string.text" msgid "Time format" -msgstr "የሰአት አቀራረብ" +msgstr "የ ሰአት አቀራረብ" #: formres.src msgctxt "" @@ -2911,7 +2911,7 @@ "RID_STR_PROPTITLE_FORMATTED\n" "string.text" msgid "Formatted Field" -msgstr "የሜዳ አቀራረብ" +msgstr "የ ሜዳ አቀራረብ" #: pcrmiscres.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/am/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/am/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-31 22:22+0000\n" +"PO-Revision-Date: 2016-01-22 17:50+0000\n" "Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" @@ -14,17 +14,16 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441059739.000000\n" +"X-POOTLE-MTIME: 1453485039.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CENT_SIGN\n" "LngText.text" msgid "cent" -msgstr "ድንኳን" +msgstr "" #. £ (U+000A3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -64,7 +63,6 @@ #. ¬ (U+000AC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "NOT_SIGN\n" @@ -1055,13 +1053,12 @@ #. ∍ (U+0220D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SMALL_CONTAINS_AS_MEMBER\n" "LngText.text" msgid "small ni" -msgstr "ትንሽ በ" +msgstr "ትንሽ ni" #. ∎ (U+0220E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1488,23 +1485,21 @@ #. ▪ (U+025AA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BLACK_SMALL_SQUARE\n" "LngText.text" msgid "small square2" -msgstr "ትንሽ ኮከብ2" +msgstr "ትንሽ square2" #. ▫ (U+025AB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_SMALL_SQUARE\n" "LngText.text" msgid "small square" -msgstr "ትንሽ ኮከብ" +msgstr "ትንሽ square" #. ▬ (U+025AC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1607,13 +1602,12 @@ #. ◻ (U+025FB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_MEDIUM_SQUARE\n" "LngText.text" msgid "medium square" -msgstr "መካከለኛ ኮከብ" +msgstr "መካከለኛ square" #. ◼ (U+025FC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1622,7 +1616,7 @@ "BLACK_MEDIUM_SQUARE\n" "LngText.text" msgid "medium square2" -msgstr "" +msgstr "መካከለኛ square2" #. ◽ (U+025FD), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1631,7 +1625,7 @@ "WHITE_MEDIUM_SMALL_SQUARE\n" "LngText.text" msgid "smaller square" -msgstr "" +msgstr "ትንሽ square" #. ◾ (U+025FE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1640,7 +1634,7 @@ "BLACK_MEDIUM_SMALL_SQUARE\n" "LngText.text" msgid "smaller square2" -msgstr "" +msgstr "በጣም ትንሽ square2" #. ☀ (U+02600), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2949,13 +2943,12 @@ #. ⛲ (U+026F2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "FOUNTAIN\n" "LngText.text" msgid "fountain" -msgstr "ተራራ" +msgstr "" #. ⛳ (U+026F3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6533,13 +6526,12 @@ #. 💁 (U+1F481), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "INFORMATION_DESK_PERSON\n" "LngText.text" msgid "information2" -msgstr "መረጃ" +msgstr "መረጃ2" #. 💂 (U+1F482), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-5.0.2/translations/source/am/filter/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/filter/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/filter/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/filter/uiconfig/ui.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-05 22:13+0000\n" +"PO-Revision-Date: 2015-11-04 00:22+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441491225.000000\n" +"X-POOTLE-MTIME: 1446596533.000000\n" #: impswfdialog.ui msgctxt "" @@ -306,7 +306,7 @@ "tooltip_text\n" "string.text" msgid "Creates an ISO 19005-1 compliant PDF file, ideal for long-term document preservation" -msgstr "" +msgstr "መፍጠሪያ የ ISO 19005-1 የ PDF ፋይል መቀበያ: ለ ረጅም-ጊዜ ሰነድ ማቆያ" #: pdfgeneralpage.ui msgctxt "" @@ -315,7 +315,7 @@ "label\n" "string.text" msgid "_Tagged PDF (add document structure)" -msgstr "" +msgstr "_ምልክት የተደረገበት PDF (የ ሰነድ አካል መጨመሪያ)" #: pdfgeneralpage.ui msgctxt "" @@ -324,7 +324,7 @@ "tooltip_text\n" "string.text" msgid "Includes a document's content structure information in a PDF" -msgstr "" +msgstr "የ ሰነዶች ይዞታ መረጃ ያካተተ በ PDF ውስጥ" #: pdfgeneralpage.ui msgctxt "" @@ -342,7 +342,7 @@ "tooltip_text\n" "string.text" msgid "Creates a PDF with fields that can be filled out" -msgstr "" +msgstr "PDF መፍጠሪያ ሊሞሉ ከሚችሉ ሜዳዎች ጋር" #: pdfgeneralpage.ui msgctxt "" @@ -477,7 +477,7 @@ "label\n" "string.text" msgid "_Convert document references to PDF targets" -msgstr "" +msgstr "መቀየሪያ የ ሰነድ ማመሳከሪያዎች ወደ PDF ኢላማዎች" #: pdflinkspage.ui msgctxt "" @@ -486,7 +486,7 @@ "label\n" "string.text" msgid "Export _URLs relative to file system" -msgstr "" +msgstr "መላኪያ _URLs ከ ፋይል ስርአቱ ጋር የሚዛመድ" #: pdflinkspage.ui msgctxt "" @@ -1179,7 +1179,7 @@ "label\n" "string.text" msgid "C_ontinuous facing" -msgstr "" +msgstr "የ ሚ_ቀጥል ፊት ለፊት" #: pdfviewpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/am/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/am/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/scalc.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/scalc.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/scalc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/scalc.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-09-01 17:10+0000\n" +"PO-Revision-Date: 2015-11-06 13:15+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441127417.000000\n" +"X-POOTLE-MTIME: 1446815708.000000\n" #: main0000.xhp msgctxt "" @@ -570,7 +570,7 @@ "10\n" "help.text" msgid "You can also create and assign macros and configure the look and feel of toolbars, menus, keyboard, and set the default options for $[officename] applications." -msgstr "" +msgstr "እርስዎ መፍጠር እና መመደብ ይችላሉ macros እና ማዋቀር የሚታየውን እና የሚሰማውን የ እቃ መደርደሪያውን: ዝርዝሮች: የ ፊደል ገበታ: እና ነባር ምርጫ ማሰናጃ ለ $[officename] መተግበሪያዎች" #: main0106.xhp msgctxt "" @@ -958,7 +958,7 @@ "par_idN108FD\n" "help.text" msgid "The text formatted in a complex text layout language is entered from right to left." -msgstr "" +msgstr "በ ውስብስብ እቅድ ቋንቋ ጽሁፍ የሚገባው ከ ቀኝ ወደ ግራ ነው" #: main0202.xhp msgctxt "" @@ -1537,7 +1537,7 @@ "14\n" "help.text" msgid "An interesting feature is to be able to immediately view the results of changes made to one factor of calculations that are composed of several factors. For instance, you can see how changing the time period in a loan calculation affects the interest rates or repayment amounts. Furthermore, you can manage larger tables by using different predefined scenarios." -msgstr "" +msgstr "አንዱ ጠቃሚ ገጽታ የ ለውጡን ውጤት ወዲያውን መመልከት መቻሎት ነው: ከ በርካታ ማዋቀሪያ የተሰናዳ ስሌት አንድ ምክንያት በሚቀየር ጊዜ: ለምሳሌ እርስዎ ማየት ይችላሉ የ ጊዜ ዘመን በብድር ስሌቶች ላይ የሚያመጣውን ውጤት: የ ወለድ መጠን ወይንም የ ክፍያ መጠን በሚቀየር ጊዜ: በበለጠ እርስዎ ማስተዳደር ይችላሉ ትላልቅ ሰንጠረዦች የ ተወሰኑ የ ተለያዩ ትእይንቶች በመጠቀም" #: main0503.xhp msgctxt "" @@ -1582,7 +1582,7 @@ "10\n" "help.text" msgid "With a few mouse-clicks, you can reorganize your spreadsheet to show or hide certain data ranges, or to format ranges according to special conditions, or to quickly calculate subtotals and totals." -msgstr "" +msgstr "በ ጥቂት አይጥ-መጫኛ እርስዎ እንደገና ማዘጋጀት ይችላሉ የ እርስዎን ሰንጠረዥ: ለ ማሳየት ወይንም ለ መደበቅ የ ተወሰነ የ ዳታ መጠን: ወይንም ለ ማቅረብ መጠኖችን እንደ ተለየ ሁኔታ: ወይንም በ ፍጥነት ንዑስ ድምሮች እና ጠቅላላ ድምር ለማስላት" #: main0503.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/schart.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/schart.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/schart.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/schart.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-01 14:59+0000\n" +"PO-Revision-Date: 2015-09-05 22:27+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441119577.000000\n" +"X-POOTLE-MTIME: 1441492028.000000\n" #: main0000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-09-10 22:34+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-18 23: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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441924484.000000\n" +"X-POOTLE-MTIME: 1453161401.000000\n" #: 01010000.xhp msgctxt "" @@ -1035,7 +1035,7 @@ "15\n" "help.text" msgid "Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box." -msgstr "" +msgstr "እንዲታይ የሚፈልጉትን የ ዳታቤዝ ሜዳ ይምረጡ: እና ከዛ ይጫኑ ቀስት ወደ ግራ በዚህ ሳጥን ውስጥ ሜዳ ለማስገባት ወደ የ ጽሁፍ ምልክት ሳጥን." #: 01010201.xhp msgctxt "" @@ -1044,7 +1044,7 @@ "16\n" "help.text" msgid "The name of the database field is bounded by brackets in the Label text box. If you want, you can separate database fields with spaces. Press Enter to insert a database field on a new line." -msgstr "" +msgstr "የ ዳታቤዝ ሜዳ ስም በ ቅንፍ የተከበበ ነው በ ጽሁፍ ምልክት text ሳጥን ውስጥ: እርስዎ ከፈለጉ መለየት ይችላሉ የ ዳታቤዝ ሜዳዎች በ ክፍተት: ይጫኑ ማስገቢያውን ለ ማስገባት የ ዳታቤዝ ሜዳ በ አዲስ መሰር ውስጥ" #: 01010201.xhp msgctxt "" @@ -1062,7 +1062,7 @@ "18\n" "help.text" msgid "You can select a pre-defined size format for your label or a size format that you specify on the Format tab.." -msgstr "" +msgstr "እርስዎ መምረጥ ይችላሉ በቅድሚያ-የተገለጽ መጠን አቀራረብ ለ እርስዎ ምልክት ወይንም እርስዎ በሚወስኑት መጠን አቀራረብ በ አቀራረብ tab.." #: 01010201.xhp msgctxt "" @@ -1196,7 +1196,7 @@ "4\n" "help.text" msgid "Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "ማሳያ እርቀት ከ ገጹ ግራ ጠርዝ ምልክቱ አጠገብ ወይንም የ ንግድ ካርድ ድረስ: እርስዎ የሚወስኑ ከሆነ አቀራረብ ማስተካከያ ዋጋውን አሁን ይወስኑ" #: 01010202.xhp msgctxt "" @@ -1214,7 +1214,7 @@ "6\n" "help.text" msgid "Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "ማሳያ እርቀት ከ ምልክቱ የ ላይ ጠርዝ ወይንም የ ንግድ ካርድ የ ላይ ጠርዝ የ ምልክቱ ወይንም የ ንግድ ካርድ በቀጥታ ከታች: እርስዎ የሚወስኑ ከሆነ አቀራረብ ማስተካከያ ዋጋውን አሁን ይወስኑ." #: 01010202.xhp msgctxt "" @@ -1232,7 +1232,7 @@ "8\n" "help.text" msgid "Displays the width for the label or the business card. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "የ ምልክት ወይንም የ ንግድ ካርድ ስፋት ማሳያ: እርስዎ መግለጽ ከ ፈለጉ አቀራረብ ማስተካከያ ዋጋውን እዚህ ያስገቡ" #: 01010202.xhp msgctxt "" @@ -1250,7 +1250,7 @@ "10\n" "help.text" msgid "Displays the height for the label or business card. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "የ ምልክት ወይንም የ ንግድ ካርድ እርዝመት ማሳያ: እርስዎ መግለጽ ከ ፈለጉ አቀራረብ ማስተካከያ ዋጋውን እዚህ ያስገቡ." #: 01010202.xhp msgctxt "" @@ -1268,7 +1268,7 @@ "12\n" "help.text" msgid "Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "ማሳያ እርቀት ከ ገጹ ግራ ጠርዝ እስከ ግራ ጠርዝ የ መጀመሪያው ምልክት ወይንም የ ንግድ ካርድ ድረስ: እርስዎ የሚወስኑ ከሆነ አቀራረብ ማስተካከያ ዋጋውን አሁን ይወስኑ" #: 01010202.xhp msgctxt "" @@ -1286,7 +1286,7 @@ "14\n" "help.text" msgid "Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here." -msgstr "" +msgstr "ማሳያ እርቀት ከ ገጹ ላይ ጠርዝ እስከ ላይ ጠርዝ የ መጀመሪያው ምልክት ወይንም የ ንግድ ካርድ ድረስ: እርስዎ የሚወስኑ ከሆነ አቀራረብ ማስተካከያ ዋጋውን አሁን ይወስኑ" #: 01010202.xhp msgctxt "" @@ -1304,7 +1304,7 @@ "16\n" "help.text" msgid "Enter the number of labels or business cards that you want to span the width of the page." -msgstr "" +msgstr "የ ምልክቶች ቁጥር ወይንም የ ንግድ ካርዶች ቁጥር ያስገቡ: በ እርስዎ የ ክፍተት ስፋት ገጽ ላይ የሚፈልጉትን" #: 01010202.xhp msgctxt "" @@ -1322,7 +1322,7 @@ "18\n" "help.text" msgid "Enter the number of labels or business cards that you want to span the height of the page." -msgstr "" +msgstr "የ ምልክቶች ቁጥር ወይንም የ ንግድ ካርዶች ቁጥር ያስገቡ: በ እርስዎ የ ክፍተት እርዝመት ገጽ ላይ የሚፈልጉትን" #: 01010202.xhp msgctxt "" @@ -1411,7 +1411,7 @@ "2\n" "help.text" msgid "Sets additional options for your labels or business cards, including text synchronization and printer settings." -msgstr "" +msgstr "ተጨማሪ ምርጫ ማሰናጃ ለ እርስዎ ምልክት ወይንም የ ንግድ ካርዶች: የ ጽሁፍ ማስማሚያ እና የ ማተሚያ ማሰናጃዎች ያካትታል" #: 01010203.xhp msgctxt "" @@ -1465,7 +1465,7 @@ "8\n" "help.text" msgid "Enter the number of labels or business cards that you want to have in a row on your page." -msgstr "" +msgstr "የ ምልክቶች ቁጥር ወይንም የ ንግድ ካርዶች ቁጥር ያስገቡ: በ እርስዎ የ ረድፉ ገጽ ላይ የሚፈልጉትን" #: 01010203.xhp msgctxt "" @@ -1483,7 +1483,7 @@ "10\n" "help.text" msgid "Enter the number of rows of labels or business cards that you want to have on your page." -msgstr "" +msgstr "የ ረድፎች ቁጥር ምልክት ወይንም የ ንግድ ካርዶች ቁጥር ያስገቡ: በ እርስዎ ገጽ ላይ የሚፈልጉትን" #: 01010203.xhp msgctxt "" @@ -1706,7 +1706,7 @@ "12\n" "help.text" msgid "Select the size format that you want to use. The available formats depend on what you selected in the Brand list. If you want to use a custom size format, select [User], and then click the Format tab to define the format." -msgstr "" +msgstr "ይምረጡ መጠቀም የሚፈልጉትን መጠን አቀራረብ: ዝግጁ የሆነው አቀራረብ እንደ እርስዎ ምርጫ አይነቱ ይወሰናል የ Brand ዝርዝር መጠቀም ከ ፈለጉ ምልክት ማስተካከያ አቀራረብ: ይምረጡ [User], እና ከዛ ይጫኑ አቀራረብ tab አቀራረብ ለመግለጽ" #: 01010301.xhp msgctxt "" @@ -1718,13 +1718,14 @@ msgstr "መረጃ" #: 01010301.xhp +#, fuzzy msgctxt "" "01010301.xhp\n" "par_id3153394\n" "14\n" "help.text" msgid "The paper type and the dimensions of the business card are displayed at the bottom of the Format area." -msgstr "" +msgstr "የ ወረቀቱ አይነት እና አቅጣጫዎች የሚታዩት ከ ምልክቱ በ ታች በኩል ነው በ አቀራረብ ቦታ ውስጥ" #: 01010302.xhp msgctxt "" @@ -3868,13 +3869,14 @@ msgstr "ቃላቶች: " #: 01100400.xhp +#, fuzzy msgctxt "" "01100400.xhp\n" "par_id3147402\n" "14\n" "help.text" msgid "Number of words (including words consisting of a single character) in the file. " -msgstr "" +msgstr "የ አንቀጾች ቁጥር በ ፋይል ውስጥ (ባዶ አንቀጾችንም ያካትታል) " #: 01100400.xhp msgctxt "" @@ -4527,12 +4529,13 @@ msgstr "" #: 01130000.xhp +#, fuzzy msgctxt "" "01130000.xhp\n" "par_id4\n" "help.text" msgid "Specifies whether the graphics and drawings or OLE objects of your text document are printed." -msgstr "" +msgstr "የ ፎርም መቆጣጠሪያ ሜዳዎች በ ጽሁፍ ሰነድ ውስጥ ይታተሙ እንደሆን መወሰኛ" #: 01130000.xhp msgctxt "" @@ -4784,12 +4787,13 @@ msgstr "" #: 01130000.xhp +#, fuzzy msgctxt "" "01130000.xhp\n" "par_id48\n" "help.text" msgid "Select which pages of a brochure to print." -msgstr "" +msgstr "የ ሰነዱ የትኛው ክፍል እንደሚታተም ይምረጡ" #: 01130000.xhp msgctxt "" @@ -4944,12 +4948,13 @@ msgstr "ቀለሞች በ ጥቁር እና ነጭ ይታተሙ እንደሆን መወሰኛ" #: 01130000.xhp +#, fuzzy msgctxt "" "01130000.xhp\n" "par_id86\n" "help.text" msgid "Specify how to scale slides in the printout." -msgstr "" +msgstr "ምን ያህል ተንሸራታች በ ገጽ ውስጥ እንደሚታተም ማዘጋጃ ይምረጡ" #: 01130000.xhp msgctxt "" @@ -5898,7 +5903,7 @@ "2\n" "help.text" msgid "Reverses the last command or the last entry you typed. To select the command that you want to reverse, click the arrow next to the Undo icon on the Standard bar." -msgstr "" +msgstr "መጨረሻ የሰሩትን መገልበጫ ወይንም መጨረሻ ጽፈው ያስገቡትን: እርስዎ ይምረጡ መገልበጥ የሚፈልጉትን: ይጫኑ ቀስቱ ላይ በ መተው ምልክት በ መደበኛ መደርደሪያ ላይ" #: 02010000.xhp msgctxt "" @@ -6489,7 +6494,7 @@ "25\n" "help.text" msgid "Subtracts the values in the clipboard cells from the values in the target cells. " -msgstr "" +msgstr "በ ቁራጭ ሰሌዳ ውስጥ ያሉትን ዋጋዎች መቀነሻ በ ታለመው ክፍሎች ዋጋ " #: 02070000.xhp msgctxt "" @@ -6507,7 +6512,7 @@ "27\n" "help.text" msgid "Multiplies the values in the clipboard cells with the values in the target cells. " -msgstr "" +msgstr "በ ቁራጭ ሰሌዳ ውስጥ ያሉትን ዋጋዎች ማባዣ በ ታለመው ክፍሎች ዋጋ " #: 02070000.xhp msgctxt "" @@ -6627,13 +6632,14 @@ msgstr "ክፍሎች መቀየሪያ " #: 02070000.xhp +#, fuzzy msgctxt "" "02070000.xhp\n" "par_id3145169\n" "58\n" "help.text" msgid "Set the shift options for the target cells when the clipboard content is inserted. " -msgstr "" +msgstr "ለ ቁራጭ ሰሌዳ ይዞታዎች የ መለጠፊያ ምርጫ ማሰናጃ" #: 02070000.xhp msgctxt "" @@ -8112,13 +8118,14 @@ msgstr "" #: 02100001.xhp +#, fuzzy msgctxt "" "02100001.xhp\n" "par_id3152576\n" "223\n" "help.text" msgid "Represents a nonprinting character." -msgstr "" +msgstr "ሊታተሙ የሚችሉ ባህሪዎች ይወክላል" #: 02100001.xhp msgctxt "" @@ -8601,13 +8608,14 @@ msgstr "መስኮቶች" #: 02100200.xhp +#, fuzzy msgctxt "" "02100200.xhp\n" "par_id3153105\n" "45\n" "help.text" msgid "Finds the Widow Control attribute." -msgstr "" +msgstr "መፈለጊያ የ ማዞሪያ ባህሪ" #: 02100200.xhp msgctxt "" @@ -8637,13 +8645,14 @@ msgstr "እቅድ" #: 02100200.xhp +#, fuzzy msgctxt "" "02100200.xhp\n" "par_id3153143\n" "13\n" "help.text" msgid "Finds the Outline attribute." -msgstr "" +msgstr "መፈለጊያ የ ማዞሪያ ባህሪ" #: 02100200.xhp msgctxt "" @@ -8673,13 +8682,14 @@ msgstr "" #: 02100200.xhp +#, fuzzy msgctxt "" "02100200.xhp\n" "par_id3152886\n" "63\n" "help.text" msgid "Finds the Register-true attribute." -msgstr "" +msgstr "መፈለጊያ የ ክፍተት ባህሪ" #: 02100200.xhp msgctxt "" @@ -11020,7 +11030,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -12132,7 +12142,7 @@ "55\n" "help.text" msgid "Sorts the list according to the comments that are attached to the changes." -msgstr "" +msgstr "ዝርዝሩን እንደ አስተያየቱ አይነት ከ ለውጦቹ ጋር የተያያዙትን መለያ" #: 02230401.xhp msgctxt "" @@ -14217,7 +14227,7 @@ "12\n" "help.text" msgid "Locate the file that you want to insert, and then click Open." -msgstr "" +msgstr "ፋይሉን ፈልገው ያግኙ እንደ አገናኝ ማስገባት የሚፈልጉትን እና ከዛ ይጫኑ መክፈቻ." #: 04150100.xhp msgctxt "" @@ -15594,13 +15604,14 @@ msgstr "" #: 05020300.xhp +#, fuzzy msgctxt "" "05020300.xhp\n" "hd_id3150103\n" "17\n" "help.text" msgid "Format code" -msgstr "" +msgstr "አቀራረብ Code" #: 05020300.xhp msgctxt "" @@ -16372,13 +16383,14 @@ msgstr "የቀን አቀራረብ" #: 05020301.xhp +#, fuzzy msgctxt "" "05020301.xhp\n" "par_id3152791\n" "38\n" "help.text" msgid "To display days, months and years, use the following number format codes." -msgstr "" +msgstr "ሰአቶችን: ደቂቆችን እና ሰከንዶችን ለማሳየት የሚቀጥለውን የ ቁጥር አቀራረብ ኮዶች ይጠቀሙ" #: 05020301.xhp msgctxt "" @@ -21661,13 +21673,14 @@ msgstr "ሰንጠረዥ ማሰለፊያ" #: 05040200.xhp +#, fuzzy msgctxt "" "05040200.xhp\n" "par_id3150417\n" "48\n" "help.text" msgid "Specify the alignment options for the cells on a printed page." -msgstr "" +msgstr "ለ ቁራጭ ሰሌዳ ይዞታዎች የ መለጠፊያ ምርጫ ማሰናጃ" #: 05040200.xhp msgctxt "" @@ -21776,13 +21789,14 @@ msgstr "ግራ እና ቀኝ" #: 05040200.xhp +#, fuzzy msgctxt "" "05040200.xhp\n" "par_id3153058\n" "20\n" "help.text" msgid "The current page style shows both odd and even pages with left and right margins as specified." -msgstr "" +msgstr "የ አሁኑ ገጽ ዘዴ የሚያሳየው ጎዶሎ (በ ቀኝ) ገጾች ነው: ሙሉ ገጾች የሚታዩት እንደ ባዶ ገጾች ነው" #: 05040200.xhp msgctxt "" @@ -24074,13 +24088,14 @@ msgstr "የመስመር ክፍተት" #: 05120000.xhp +#, fuzzy msgctxt "" "05120000.xhp\n" "par_id3153514\n" "2\n" "help.text" msgid "Specify the amount of space to leave between lines of text in a paragraph." -msgstr "" +msgstr "በ ተመረጡት አንቀጾች መካከል መተው የሚፈልጉትን ክፍተት መወሰኛ" #: 05120000.xhp msgctxt "" @@ -25829,7 +25844,7 @@ "4\n" "help.text" msgid "Select the gradient that you want to apply." -msgstr "" +msgstr "እርስዎ መፈጸም የሚፈልጉትን ከፍታ ይምረጡ" #: 05210300.xhp msgctxt "" @@ -31969,7 +31984,7 @@ "16\n" "help.text" msgid "Select a color for the ambient light." -msgstr "" +msgstr "ለ አሁኑ የ ብርሀን ምንጭ ቀለም ይምረጡ" #: 05350400.xhp msgctxt "" @@ -32622,7 +32637,7 @@ "20\n" "help.text" msgid "Select the color to illuminate the object." -msgstr "" +msgstr "እቃው ላይ እንዲፈጸም የሚፈልጉትን የ ብርሃን ቀለም ይምረጡ" #: 05350600.xhp msgctxt "" @@ -32667,7 +32682,7 @@ "25\n" "help.text" msgid "Select the color that you want the object to reflect." -msgstr "" +msgstr "እቃው ላይ እንዲጸባረቅ የሚፈልጉትን ቀለም ይምረጡ" #: 05350600.xhp msgctxt "" @@ -32741,13 +32756,14 @@ msgstr "በአግድም" #: 05360000.xhp +#, fuzzy msgctxt "" "05360000.xhp\n" "par_id3150355\n" "5\n" "help.text" msgid "Specify the horizontal distribution for the selected objects." -msgstr "" +msgstr "ለ ተመረጠው እቃ የ ቁመት ስርጭት ይወስኑ" #: 05360000.xhp msgctxt "" @@ -35848,13 +35864,14 @@ msgstr "ነጥቦች" #: 06050100.xhp +#, fuzzy msgctxt "" "06050100.xhp\n" "par_id3155069\n" "2\n" "help.text" msgid "Displays the different bullet styles that you can apply." -msgstr "" +msgstr "እርስዎ ሊፈጽሙት የሚችሉት የ ቁጥር አሰጣጥ ዘዴዎች ማሳያ" #: 06050100.xhp msgctxt "" @@ -36521,13 +36538,14 @@ msgstr "ለ አሁኑ ቁጥር መስጫ ዘዴ ቀለም ይምረጡ " #: 06050500.xhp +#, fuzzy msgctxt "" "06050500.xhp\n" "hd_id3159180\n" "107\n" "help.text" msgid "Relative size Relative size " -msgstr "" +msgstr "ቀለም ቀለም " #: 06050500.xhp msgctxt "" @@ -37462,12 +37480,13 @@ msgstr "" #: 06130000.xhp +#, fuzzy msgctxt "" "06130000.xhp\n" "par_idN10A04\n" "help.text" msgid "Enter a name for the script." -msgstr "" +msgstr "ለ አዲሱ መጻህፍት ቤት ወይንም ክፍል ስም ያስገቡ" #: 06130000.xhp msgctxt "" @@ -38020,12 +38039,13 @@ msgstr "ዝርዝር" #: 06140100.xhp +#, fuzzy msgctxt "" "06140100.xhp\n" "bm_id900601\n" "help.text" msgid "editing;menuscustomizing;menusmenus;customizing" -msgstr "" +msgstr "መለጠፊያ;የ ክፍል መጠኖችቁራጭ ሰሌዳ; መለጠፊያክፍሎች;መለጠፊያ" #: 06140100.xhp msgctxt "" @@ -41861,13 +41881,14 @@ msgstr "ባህሪዎች" #: gallery.xhp +#, fuzzy msgctxt "" "gallery.xhp\n" "par_id3148990\n" "16\n" "help.text" msgid "The Properties of (Theme) dialog contains the following tabs:" -msgstr "" +msgstr "የ ባህሪዎች ንግግር የያዛቸው የሚከተሉትን tab ገጾች ነው:" #: gallery.xhp msgctxt "" @@ -42028,7 +42049,7 @@ "20\n" "help.text" msgid "Displays a preview of the selected file." -msgstr "" +msgstr "የተመረጠውን የ ንድፍ ፋይል በ ቅድመ እይታ ማሳያ" #: grid.xhp msgctxt "" @@ -42096,12 +42117,13 @@ msgstr "" #: grid.xhp +#, fuzzy msgctxt "" "grid.xhp\n" "par_idN105C9\n" "help.text" msgid "Grid to Front" -msgstr "" +msgstr "ወደ ፊት ማምጫ" #: grid.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/shared/05.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/shared/05.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/shared/05.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/shared/05.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-12-14 23:08+0000\n" -"Last-Translator: Samson \n" +"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"PO-Revision-Date: 2015-11-06 23:39+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1418598535.000000\n" +"X-POOTLE-MTIME: 1446853145.000000\n" #: 00000001.xhp msgctxt "" @@ -97,7 +97,7 @@ "hd_id0915200811081722\n" "help.text" msgid "Forum" -msgstr "" +msgstr "መድረክ" #: 00000001.xhp msgctxt "" @@ -177,7 +177,7 @@ "par_id0120200910361874\n" "help.text" msgid "Visit the Get involved page on the website and follow the links for contributors." -msgstr "" +msgstr "ይጎብኙ የ ይሳተፉ ድህረ ገጽ እና ትእዛዙን ይከተሉ" #: 00000002.xhp msgctxt "" @@ -212,7 +212,7 @@ "9\n" "help.text" msgid "There are three icons used to call your attention to additional helpful information." -msgstr "" +msgstr "ሶስት ምልክቶችን እንጠቀማለን የ እርስዎን ትኩረት ለማግኘት ለ ተጨማሪ እርዳታ መረጃ" #: 00000002.xhp msgctxt "" @@ -239,7 +239,7 @@ "12\n" "help.text" msgid "The \"Tip\" icon points out tips for working with the program in a more efficient manner." -msgstr "" +msgstr "ይህ የ \"ምክር\" ምልክት እርስዎ ፕሮግራሙን እንንዴት በሚገባ እንደሚጠቀሙ ጠቃሚ ምክር መስጫ ነው" #: 00000100.xhp msgctxt "" @@ -256,7 +256,7 @@ "1\n" "help.text" msgid "The $[officename] Help system provides easy access to information and support. There are several ways to find what you are looking for in the Help environment: You can search for a specific keyword in the Index, carry out a full-text search under Find, or look through a hierarchical list of the Topics." -msgstr "" +msgstr "የ $[officename] እርዳታ ስርአት የሚያቀርበው መረጃ እና ድጋፍ በ ቀላሉ ነው: እርስዎ የሚፈልጉትን ለማግኘት በርካታ መንገዶች አሉ: በ እርዳት አካባቢ: እርስዎ መፈለግ ይችላሉ ቁልፍ ቃል በ መጠቀም በ ማውጫ, መፈጸም ይችላሉ ሙሉ-ጽሁፍ መፈለጊያ በ መፈለጊያ, ወይንም በ ቅደም ተከትል ዝርዝር ውስጥ በ አርእስት." #: 00000110.xhp msgctxt "" @@ -523,7 +523,7 @@ "par_idN10A59\n" "help.text" msgid "To find the next occurrence of the search term on the page, click Find again." -msgstr "" +msgstr "የሚቀጥለውን ሁኔታ በ ፍለጋው ደንብ ውስጥ በ ገጹ ላይ ለማግኘት: ይጫኑ መፈለጊያ እንደገና" #: 00000110.xhp msgctxt "" @@ -531,7 +531,7 @@ "par_idN10906\n" "help.text" msgid "Enter the text that you want to search for or select a text entry in the list." -msgstr "" +msgstr "የሚፈልጉትን ጽሁፍ ያስገቡ ወይንም ይምረጡ የ ጽሁፍ ማስገቢያ ቃል ከ ዝርዝር ውስጥ ለማግኘት" #: 00000110.xhp msgctxt "" @@ -555,7 +555,7 @@ "par_idN109C1\n" "help.text" msgid "Searches the entire Help page, starting at the current position of the cursor." -msgstr "" +msgstr "ጠቅላላ የ እርዳት ገጽ ውስጥ መፈለጊያ: መጠቆሚያው አሁን ካለበት ቦታ ጀምሮ" #: 00000110.xhp msgctxt "" @@ -563,7 +563,7 @@ "par_idN109D8\n" "help.text" msgid "Searches backwards from the current position of the cursor." -msgstr "" +msgstr "የ ኋሊዮሽ መፈለጊያ: መጠቆሚያው አሁን ካለበት ቦታ ጀምሮ" #: 00000110.xhp msgctxt "" @@ -571,7 +571,7 @@ "par_idN109F5\n" "help.text" msgid "Finds the next occurrence of the search term." -msgstr "" +msgstr "በ መፈለጊያ ደንብ ውስጥ የሚቀጥለውን ሁኔታ መፈለጊያ" #: 00000110.xhp msgctxt "" @@ -598,7 +598,7 @@ "19\n" "help.text" msgid "The list box located at the very top is where you can select other %PRODUCTNAME Help modules. The Index and Find tab pages only contain the data for the selected %PRODUCTNAME module." -msgstr "" +msgstr "የ ዝርዝር ሳጥን የሚገኘው ከ ላይ በኩል ነው: እርስዎ መምረጥ ይችላሉ በ %PRODUCTNAME እርዳታ ክፍሎች የ ማውጫ እና መፈለጊያ tab ገጾች ብቻ ናቸው የ ተመረጠውን ዳታ የያዙት %PRODUCTNAME ክፍል" #: 00000110.xhp msgctxt "" @@ -616,7 +616,7 @@ "15\n" "help.text" msgid "Displays an index of the main topics of all modules." -msgstr "" +msgstr "የ ዋናውን አርእስቶች የ ሁሉንም ክፍሎች ማውጫዎች ማሳያ" #: 00000110.xhp msgctxt "" @@ -652,7 +652,7 @@ "13\n" "help.text" msgid "Allows you to carry out a full-text search. The search will include the entire Help contents of the currently selected %PRODUCTNAME module." -msgstr "" +msgstr "እርስዎን ሙሉ-ጽሁፍ መፈለግ ያስችሎታል: ፍለጋው ሙሉ የ እርዳታ ይዞታዎችን ያጠቃልላል አሁን የ ተመረጠውን %PRODUCTNAME ክፍል" #: 00000110.xhp msgctxt "" @@ -757,7 +757,7 @@ "6\n" "help.text" msgid "Extended tips provide a brief description about buttons and commands. To display an extended tip, press Shift+F1, then point to a button or command." -msgstr "" +msgstr "የ ተስፋፉ ምክሮች የሚያቀርቡት ተጨማሪ መግለጫ ስለ ቁልፎች እና ትእዛዞች ነው: የ ተስፋፉ ምክሮች ለማሳየት ይጫኑ Shift+F1, እና ከዛ መጠቆሚያውን ወደ ቁልፍ ወይንም ትእዛዝ ላይ ያሳርፉ" #: 00000120.xhp msgctxt "" @@ -869,7 +869,7 @@ "2\n" "help.text" msgid "Enter the search term here. The search is not case-sensitive." -msgstr "" +msgstr "የ ሚፈልጉትን ቃል ያስገቡ: የ መፈለጊያ ደንብ case-sensitive አይደለም" #: 00000140.xhp msgctxt "" @@ -878,7 +878,7 @@ "3\n" "help.text" msgid "Click to start a full-text search for the term you entered." -msgstr "" +msgstr "ይጫኑ እርስዎ ያስገቡትን ደንብ በ ሙሉ-ጽሁፍ መፈለጊያ ዘዴ ለማስጀምር" #: 00000140.xhp msgctxt "" @@ -1037,7 +1037,7 @@ "3\n" "help.text" msgid "You can find the bookmarks on the Bookmarks tab page." -msgstr "" +msgstr "እርስዎ ማግኘት ይችላሉ ምልክት ማድረጊያ በ ምልክት ማድረጊያ tab ገጽ ውስጥ" #: 00000150.xhp msgctxt "" @@ -1064,7 +1064,7 @@ "6\n" "help.text" msgid "The following commands are on the context menu of a bookmark:" -msgstr "" +msgstr "የሚከተሉት ትእዛዞች በ አገባብ ዝርዝር ምልክት ውስጥ አሉ:" #: 00000150.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-09-01 17:14+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-18 23:52+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441127672.000000\n" +"X-POOTLE-MTIME: 1453161147.000000\n" #: 01120000.xhp msgctxt "" @@ -4174,8 +4174,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "ክፍል" +msgid "Section" +msgstr "ክፍል" #: 04020100.xhp msgctxt "" @@ -4268,13 +4268,14 @@ msgstr "" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "የፋይል ስም / DDE ትእዛዝ " #: 04020100.xhp msgctxt "" @@ -5883,7 +5884,7 @@ "18\n" "help.text" msgid "Feeds the envelope with the print side face up in the printer tray." -msgstr "" +msgstr "ፖስታውን በ ቁመት ማቀበያ ከ ማተሚያ ትሪ በ ግራ ጠርዝ በኩል" #: 04070300.xhp msgctxt "" @@ -5901,7 +5902,7 @@ "20\n" "help.text" msgid "Feeds the envelope with the print side face down in the printer tray." -msgstr "" +msgstr "ፖስታው የሚታተምበትን ፊት ወደ ታች በማድረግ ለ ማተሚያው ትሪ ማቅረቢያ" #: 04070300.xhp msgctxt "" @@ -6575,13 +6576,14 @@ msgstr "ዋጋ" #: 04090001.xhp +#, fuzzy msgctxt "" "04090001.xhp\n" "par_id3153049\n" "48\n" "help.text" msgid "Enter the contents that you want to add to a user-defined field." -msgstr "" +msgstr "ያስገቡ መፈጸም የሚፈልጉትን ማካካሻ ወደ ቀን ወይንም ሰአት ሜዳ ውስጥ" #: 04090002.xhp msgctxt "" @@ -7116,12 +7118,13 @@ msgstr "" #: 04090002.xhp +#, fuzzy msgctxt "" "04090002.xhp\n" "par_id0903200802250745\n" "help.text" msgid "Enter the contents that you want to add to a user-defined fields." -msgstr "" +msgstr "ይዞታውን ያስገቡ በ ተጠቃሚው-የሚወሰን ሜዳ መጨመር የሚፈልጉትን" #: 04090002.xhp msgctxt "" @@ -7176,12 +7179,13 @@ msgstr "" #: 04090003.xhp +#, fuzzy msgctxt "" "04090003.xhp\n" "par_id0902200804352037\n" "help.text" msgid "Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert." -msgstr "" +msgstr "ዝግጁ የሆኑ የ ሜዳ አይነቶች ዝርዝር: ወደ እርስዎ ሰነድ ውስጥ ሜዳ ለመጨመር: ይጫኑ የ ሜዳ አይነት: ይጫኑ ሜዳ ከ ይምረጡ ዝርዝር ውስጥ: እና ከዛ ይጫኑ ማስገቢያ." #: 04090003.xhp msgctxt "" @@ -7301,13 +7305,14 @@ msgstr "የተደበቀ ጽሁፍ" #: 04090003.xhp +#, fuzzy msgctxt "" "04090003.xhp\n" "par_id3147524\n" "14\n" "help.text" msgid "Inserts a text field that is hidden when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden text check box." -msgstr "" +msgstr "ለስላሳ ጭረቶችን ለ መደበቅ: ይምረጡ %PRODUCTNAME - ምርጫዎችመሳሪያዎች - ምርጫ - %PRODUCTNAME መጻፊያ - አቀራረብ እርዳታ, እና ከዛ ያጽዱ የ ጭረቶች ማስተካከያ ምልክት ማድረጊያ ሳጥን ውስጥ" #: 04090003.xhp msgctxt "" @@ -7319,13 +7324,14 @@ msgstr "የተደበቀ አንቀጽ" #: 04090003.xhp +#, fuzzy msgctxt "" "04090003.xhp\n" "par_id3153677\n" "16\n" "help.text" msgid "Hides a paragraph when the condition that you specify is met. To use this function, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids and clear the Fields: Hidden paragraph check box." -msgstr "" +msgstr "ለስላሳ ጭረቶችን ለ መደበቅ: ይምረጡ %PRODUCTNAME - ምርጫዎችመሳሪያዎች - ምርጫ - %PRODUCTNAME መጻፊያ - አቀራረብ እርዳታ, እና ከዛ ያጽዱ የ ጭረቶች ማስተካከያ ምልክት ማድረጊያ ሳጥን ውስጥ" #: 04090003.xhp msgctxt "" @@ -7800,7 +7806,7 @@ "3\n" "help.text" msgid "When you export and import an HTML document containing DocInformation fields, special $[officename] formats are used." -msgstr "" +msgstr "ለ HTML መላኪያ እና ማምጫ የ ሰነድ መረጃ ሜዳዎች የያዘ የተለየ $[officename] አቀራረብ ተጠቅሟል" #: 04090004.xhp msgctxt "" @@ -7808,7 +7814,7 @@ "par_id0902200804290053\n" "help.text" msgid "Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert." -msgstr "" +msgstr "ዝግጁ የሆኑ የ ሜዳ አይነቶች ዝርዝር: ወደ እርስዎ ሰነድ ውስጥ ሜዳ ለመጨመር: ይጫኑ የ ሜዳ አይነት: ይጫኑ ሜዳ ከ ይምረጡ ዝርዝር ውስጥ: እና ከዛ ይጫኑ ማስገቢያ" #: 04090004.xhp msgctxt "" @@ -8563,12 +8569,13 @@ msgstr "" #: 04090006.xhp +#, fuzzy msgctxt "" "04090006.xhp\n" "par_id090220080439090\n" "help.text" msgid "Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert." -msgstr "" +msgstr "ዝግጁ የሆኑ የ ሜዳ አይነቶች ዝርዝር: ወደ እርስዎ ሰነድ ውስጥ ሜዳ ለመጨመር: ይጫኑ የ ሜዳ አይነት: ይጫኑ ሜዳ ከ ይምረጡ ዝርዝር ውስጥ: እና ከዛ ይጫኑ ማስገቢያ." #: 04090006.xhp msgctxt "" @@ -8901,7 +8908,7 @@ "1\n" "help.text" msgid "Special Tags" -msgstr "" +msgstr "የተለየ Tags" #: 04090007.xhp msgctxt "" @@ -10179,13 +10186,14 @@ msgstr "" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "ይምረጡ ማስገቢያ - ሜዳዎች - ተጨማሪ ሜዳዎች, እና ከዛ ይጫኑ ዳታቤዝ tab." #: 04090200.xhp msgctxt "" @@ -10449,13 +10457,14 @@ msgstr "በ አይነትሳጥን ውስጥ ይጫኑ \"Conditional text\"." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3151277\n" "86\n" "help.text" msgid "In the Condition box, type: Addressbook.addresses.firstname == \"Michael\"" -msgstr "" +msgstr "በ ሁኔታዎች ሳጥን ውስጥ ይጻፉ: \"የአድራሻ ደብተር.ተናጋሪ.የመጀመሪያስም\"." #: 04090200.xhp msgctxt "" @@ -11189,13 +11198,14 @@ msgstr "ማውጫ" #: 04120211.xhp +#, fuzzy msgctxt "" "04120211.xhp\n" "par_id3150570\n" "2\n" "help.text" msgid "The following options are available when you select Table of Contents as the index type. " -msgstr "" +msgstr "የሚቀጥለው ተግባር ዝግጁ የሚሆነው ይህን ሲመርጡ ነው የ እቃዎች ሰንጠረዥ እንደ ማውጫ አይነት" #: 04120211.xhp msgctxt "" @@ -12339,13 +12349,14 @@ msgstr "ማስገቢያ (የሰንጠረዥ ማውጫዎች)" #: 04120221.xhp +#, fuzzy msgctxt "" "04120221.xhp\n" "par_id3150017\n" "2\n" "help.text" msgid "Specify the format of the entries in the table of contents." -msgstr "" +msgstr "በተጠቃሚ-የሚወሰን ማውጫ ማስገቢያ አቀራረብ ይወስኑ " #: 04120221.xhp msgctxt "" @@ -12670,13 +12681,14 @@ msgstr "ማስገቢያ (በፊደል ቅደም ተከተል ማውጫ)" #: 04120222.xhp +#, fuzzy msgctxt "" "04120222.xhp\n" "par_id3154100\n" "2\n" "help.text" msgid "Specify the format of the alphabetical index entries. " -msgstr "" +msgstr "ለ ማውጫ ማብራሪያ ማስገቢያ አቀራረብ ይወስኑ " #: 04120222.xhp msgctxt "" @@ -12846,13 +12858,14 @@ msgstr "ማስገቢያዎች (የማውጫ ሰንጠረዦች)" #: 04120224.xhp +#, fuzzy msgctxt "" "04120224.xhp\n" "par_id3146318\n" "2\n" "help.text" msgid "Specify the format for the entries in an Index of Tables. " -msgstr "" +msgstr "በተጠቃሚ-የሚወሰን ማውጫ ማስገቢያ አቀራረብ ይወስኑ " #: 04120224.xhp msgctxt "" @@ -12916,13 +12929,14 @@ msgstr "ማስገቢያዎች (የሰንጠረዥ እቃዎች)" #: 04120226.xhp +#, fuzzy msgctxt "" "04120226.xhp\n" "par_id3083447\n" "2\n" "help.text" msgid "Specify the format for the entries in a Table of Objects. " -msgstr "" +msgstr "በተጠቃሚ-የሚወሰን ማውጫ ማስገቢያ አቀራረብ ይወስኑ " #: 04120226.xhp msgctxt "" @@ -12951,13 +12965,14 @@ msgstr "ማስገቢያዎች (bibliography)" #: 04120227.xhp +#, fuzzy msgctxt "" "04120227.xhp\n" "par_id3083449\n" "2\n" "help.text" msgid "Specify the format for bibliography entries." -msgstr "" +msgstr "ለ ማውጫ ማብራሪያ ማስገቢያ አቀራረብ ይወስኑ " #: 04120227.xhp msgctxt "" @@ -13243,7 +13258,7 @@ "12\n" "help.text" msgid "Formatting bibliography entries" -msgstr "" +msgstr "የ bibliography ማስገቢያ" #: 04120250.xhp msgctxt "" @@ -13701,13 +13716,14 @@ msgstr "" #: 04120300.xhp +#, fuzzy msgctxt "" "04120300.xhp\n" "par_id3149172\n" "22\n" "help.text" msgid "Tips for working with bibliography entries" -msgstr "" +msgstr "በ bibliography entries እንዴት እንደሚሰሩ ጠቃሚ ምክር." #: 04130000.xhp msgctxt "" @@ -14528,7 +14544,7 @@ "20\n" "help.text" msgid "Locate the script file that you want to link to, and then click Insert." -msgstr "" +msgstr "የ script ፋይሉን ፈልገው ያግኙ እንደ አገናኝ ማስገባት የሚፈልጉትን እና ከዛ ይጫኑ ማስገቢያ." #: 04200000.xhp msgctxt "" @@ -16143,15 +16159,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "ይህ tab አልተገኘም በ ማተሚያ እቅድ መመልከቻ ውስጥ" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16210,7 +16217,7 @@ "14\n" "help.text" msgid "Enter the number that you want to assign the footnote." -msgstr "" +msgstr "ለ ግርጌ ማስታወሻ መመደብ የሚፈልጉትን ቁጥር ያስገቡ" #: 05040700.xhp msgctxt "" @@ -16246,7 +16253,7 @@ "18\n" "help.text" msgid "Enter the text that you want to display in front of the footnote number." -msgstr "" +msgstr "ከ ግርጌ ማስታወሻ ቁጥር በፊት ማሳየት የሚፈልጉትን ጽሁፍ ያስገቡ" #: 05040700.xhp msgctxt "" @@ -16701,7 +16708,7 @@ "6\n" "help.text" msgid "Enter the width that you want for the selected object." -msgstr "" +msgstr "ለተመረጠው እቃ እርስዎ የሚፈልጉትን ስፋት ያስገቡ" #: 05060100.xhp msgctxt "" @@ -16753,7 +16760,7 @@ "10\n" "help.text" msgid "Enter the height that you want for the selected object." -msgstr "" +msgstr "ለተመረጠው እቃ እርስዎ የሚፈልጉትን እርዝመት ያስገቡ" #: 05060100.xhp msgctxt "" @@ -18195,13 +18202,14 @@ msgstr "በቁመት" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "የተመረጠውን ንድፍ በቁመት መገልበጫ" #: 05060300.xhp msgctxt "" @@ -18213,13 +18221,14 @@ msgstr "በአግድም" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "የተመረጠውን ንድፍ በአግድም መገልበጫ" #: 05060300.xhp msgctxt "" @@ -18231,13 +18240,14 @@ msgstr "በሁሉም ገጾች ላይ" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "የተመረጠውን ንድፍ በአግድም በሁሉም ገጻች ላይ መገልበጫ" #: 05060300.xhp msgctxt "" @@ -18249,13 +18259,14 @@ msgstr "በግራ ገጾች ላይ" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "የተመረጠውን ንድፍ በአግድም በሙሉ ገጻች ላይ መገልበጫ" #: 05060300.xhp msgctxt "" @@ -18267,13 +18278,14 @@ msgstr "በቀኝ ገጾች ላይ" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "የተመረጠውን ንድፍ በአግድም በጎዶሎ ገጻች ላይ መገልበጫ" #: 05060300.xhp msgctxt "" @@ -18328,7 +18340,7 @@ "14\n" "help.text" msgid "Locate the new graphic file that you want to link to, and then click Open." -msgstr "" +msgstr "የ ንድፍ ፋይሉን ፈልገው ያግኙ እንደ አገናኝ ማስገባት የሚፈልጉትን እና ከዛ ይጫኑ መክፈቻ." #: 05060300.xhp msgctxt "" @@ -19395,7 +19407,7 @@ "17\n" "help.text" msgid "Prevents changes to the contents of the selected item." -msgstr "" +msgstr "የ ተመረጠው እቃ እንዳይቀየር መከልከያ" #: 05060900.xhp msgctxt "" @@ -19440,7 +19452,7 @@ "13\n" "help.text" msgid "Locks the size of the selected item." -msgstr "" +msgstr "የተመረጠው እቃ መጠን መቆለፊያ" #: 05060900.xhp msgctxt "" @@ -20165,31 +20177,34 @@ msgstr "አምድ ለመጨመር መጠቆሚያውን በሰንጠረዡ ውስጥ ያድርጉ እና ተጭነው ይያዙ ምርጫዎችAlt እና ከዛ ማስገቢያውን ይጫኑ እና ይልቀቁ እና ከዛ የቀኝ ወይንም የግራ ቀስትን ይጫኑ" #: 05090201.xhp +#, fuzzy msgctxt "" "05090201.xhp\n" "par_id3152940\n" "13\n" "help.text" msgid "To delete a column, place the cursor in the column that you want to delete, hold down OptionAlt and press Delete, release, and then press the left or the right arrow." -msgstr "" +msgstr "አምድ ለመጨመር መጠቆሚያውን በሰንጠረዡ ውስጥ ያድርጉ እና ተጭነው ይያዙ ምርጫዎችAlt እና ከዛ ማስገቢያውን ይጫኑ እና ይልቀቁ እና ከዛ የቀኝ ወይንም የግራ ቀስትን ይጫኑ" #: 05090201.xhp +#, fuzzy msgctxt "" "05090201.xhp\n" "par_id3154105\n" "14\n" "help.text" msgid "To insert a row, place the cursor in a table cell, hold down OptionAlt and press Insert, release, and then press the up or the down arrow." -msgstr "" +msgstr "አምድ ለመጨመር መጠቆሚያውን በሰንጠረዡ ውስጥ ያድርጉ እና ተጭነው ይያዙ ምርጫዎችAlt እና ከዛ ማስገቢያውን ይጫኑ እና ይልቀቁ እና ከዛ የቀኝ ወይንም የግራ ቀስትን ይጫኑ" #: 05090201.xhp +#, fuzzy msgctxt "" "05090201.xhp\n" "par_id3153531\n" "15\n" "help.text" msgid "To delete a row, place the cursor in the row that you want to delete, hold down OptionAlt and press Delete, release, and then press the up or the down arrow." -msgstr "" +msgstr "አምድ ለመጨመር መጠቆሚያውን በሰንጠረዡ ውስጥ ያድርጉ እና ተጭነው ይያዙ ምርጫዎችAlt እና ከዛ ማስገቢያውን ይጫኑ እና ይልቀቁ እና ከዛ የቀኝ ወይንም የግራ ቀስትን ይጫኑ" #: 05090201.xhp msgctxt "" @@ -22588,7 +22603,7 @@ "34\n" "help.text" msgid "Includes numbering formats in the selected table style." -msgstr "" +msgstr "የ ቁጥር መስጫ ዘዴ አቀራረብ በ ተመረጠው የ ሰንጠረዥ ዘዴ ውስጥ ማካተቻ" #: 05150101.xhp msgctxt "" @@ -22606,7 +22621,7 @@ "25\n" "help.text" msgid "Includes font formatting in the selected table style." -msgstr "" +msgstr "ለ ተመረጠው የ ሰንጠርዥ ዘዴ የ ፊደል አቀራረብ ማካተቻ" #: 05150101.xhp msgctxt "" @@ -22624,7 +22639,7 @@ "21\n" "help.text" msgid "Includes alignment settings in the selected table style." -msgstr "" +msgstr "ለ ተመረጠው የ ሰንጠርዥ ዘዴ የ ማሰለፊያ ማሰናጃ ማካተቻ" #: 05150101.xhp msgctxt "" @@ -22642,7 +22657,7 @@ "23\n" "help.text" msgid "Includes border styles in the selected table style." -msgstr "" +msgstr "ለ ተመረጠው የ ሰንጠርዥ ዘዴ የ ሰንጠረዥ ድንበር ማካተቻ" #: 05150101.xhp msgctxt "" @@ -22660,7 +22675,7 @@ "27\n" "help.text" msgid "Includes background styles in the selected table style." -msgstr "" +msgstr "ለ ተመረጠው የ ሰንጠርዥ ዘዴ የ መደብ ዘዴዎች ማካተቻ" #: 05150101.xhp msgctxt "" @@ -22973,13 +22988,14 @@ msgstr "" #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "ለውጡን እቀበላለሁ ወይንም አልቀበልም ማጣሪያ tab" #: 05170000.xhp msgctxt "" @@ -23205,13 +23221,14 @@ msgstr "ገጽ መጠቅለያ" #: 05180000.xhp +#, fuzzy msgctxt "" "05180000.xhp\n" "hd_id3149027\n" "5\n" "help.text" msgid "Dynamic page wrap" -msgstr "" +msgstr "ገጽ መጠቅለያ" #: 05180000.xhp msgctxt "" @@ -23583,7 +23600,7 @@ "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "ለስላሳ ጭረቶችን ለ መደበቅ: ይምረጡ %PRODUCTNAME - ምርጫዎችመሳሪያዎች - ምርጫ - %PRODUCTNAME መጻፊያ - አቀራረብ እርዳታ, እና ከዛ ያጽዱ የ ጭረቶች ማስተካከያ ምልክት ማድረጊያ ሳጥን ውስጥ" #: 06030000.xhp msgctxt "" @@ -24447,7 +24464,7 @@ "26\n" "help.text" msgid "Select the numbering option for the footnotes." -msgstr "" +msgstr "ለ ግርጌ ማስታወሻ የ ቁጥር መስጫ ምርጫ ይምረጡ" #: 06080100.xhp msgctxt "" @@ -24662,7 +24679,7 @@ "38\n" "help.text" msgid "Select the paragraph style for the footnote text." -msgstr "" +msgstr "ለ ግርጌ ማስታወሻ ጽሁፍ የ አንቀጽ ዘዴ ይምረጡ" #: 06080100.xhp msgctxt "" @@ -24680,7 +24697,7 @@ "40\n" "help.text" msgid "Select the page style that you want to use for footnotes." -msgstr "" +msgstr "ለ ግርጌ ማስታወሻ መጠቀም የሚፈልጉትን የ ገጽ ዘዴ ይምረጡ" #: 06080100.xhp msgctxt "" @@ -25269,7 +25286,7 @@ "31\n" "help.text" msgid "Adds a border to the table and the table cells." -msgstr "" +msgstr "ለ ሰንጠረዥ እና ለ ሰንጠረዥ ክፍሎች ድንበር መጨመሪያ" #: 06100000.xhp msgctxt "" @@ -26119,7 +26136,7 @@ "1\n" "help.text" msgid "All Charts" -msgstr "" +msgstr "ሁሉንም Charts" #: 06220000.xhp msgctxt "" @@ -26610,7 +26627,7 @@ "par_idN105A0\n" "help.text" msgid "Opens the Match Fields dialog." -msgstr "" +msgstr "መክፈቻ የ ሜዳዎች ማመሳሰያ ንግግር." #: mailmerge03.xhp msgctxt "" @@ -26834,7 +26851,7 @@ "par_idN105BC\n" "help.text" msgid "Opens the Match Fields dialog." -msgstr "" +msgstr "መክፈቻ የ ሜዳ ማመሳሰያ ንግግር" #: mailmerge04.xhp msgctxt "" @@ -26858,7 +26875,7 @@ "par_idN105D4\n" "help.text" msgid "Mail Merge Wizard - Adjust layout" -msgstr "" +msgstr "የ ደብዳቤ ማዋሀጃ አዋቂ - አድራሻ" #: mailmerge05.xhp msgctxt "" @@ -27083,7 +27100,7 @@ "par_idN1056F\n" "help.text" msgid "Mail Merge Wizard - Personalize document" -msgstr "" +msgstr "የ ደብዳቤ ማዋሀጃ አዋቂ - ሰነድ የ ግል ማድረጊያ" #: mailmerge07.xhp msgctxt "" @@ -27726,12 +27743,13 @@ msgstr "የአድራሻ አካሎች" #: mm_cusaddfie.xhp +#, fuzzy msgctxt "" "mm_cusaddfie.xhp\n" "par_idN1056D\n" "help.text" msgid "Select a field and drag the field to the other list." -msgstr "" +msgstr "ሜዳ ይምረጡ እና ይጎትቱ ሜዳውን ወደ ሌላ ዝርዝር" #: mm_cusaddfie.xhp #, fuzzy @@ -28391,12 +28409,13 @@ msgstr "የአድራሻ አካሎች" #: mm_newaddblo.xhp +#, fuzzy msgctxt "" "mm_newaddblo.xhp\n" "par_idN1056D\n" "help.text" msgid "Select an address field and drag the field to the other list." -msgstr "" +msgstr "ሜዳ ይምረጡ እና ይጎትቱ ሜዳውን ወደ ሌላ ዝርዝር" #: mm_newaddblo.xhp msgctxt "" @@ -28439,12 +28458,13 @@ msgstr "የ አድራሻ አካሎችን እታች ካለው ሜዳ ውስጥ መጎተቻ" #: mm_newaddblo.xhp +#, fuzzy msgctxt "" "mm_newaddblo.xhp\n" "par_idN10582\n" "help.text" msgid "Arrange the fields with drag-and-drop or use the arrow buttons." -msgstr "" +msgstr "ሜዳዎችን በመጎተት-እና-በመጣል ማዘጋጃ ወይንም የቀስት ቁልፎችን ይጠቀሙ" #: mm_newaddblo.xhp msgctxt "" @@ -28596,7 +28616,7 @@ "par_idN1059E\n" "help.text" msgid "Opens the Customize Address List dialog where you can rearrange, rename, add, and delete fields." -msgstr "" +msgstr "መክፈቻ የየ አድራሻ ዝርዝር ማስተካከያ ንግግር እርስዎ እንደገና የሚያዘጋጁበት: እንደገና የሚሰይሙበት የ አድራሻ ዝርዝር የሚጨምሩበት እና ሜዳዎችን የሚያጠፉበት ነው" #: mm_seladdblo.xhp msgctxt "" @@ -28708,7 +28728,7 @@ "par_idN1056E\n" "help.text" msgid "Opens the New Address Block dialog where you can define a new address block layout." -msgstr "" +msgstr "መክፈቻ የአዲስ አድራሻ መከልከያ ንግግር እርስዎ አዲስ የ አድራሻ መከልከያ እቅድ የሚፈጥሩበት" #: mm_seladdblo.xhp msgctxt "" @@ -28724,7 +28744,7 @@ "par_idN10583\n" "help.text" msgid "Opens the New Address Block dialog where you can edit the selected address block layout." -msgstr "" +msgstr "መክፈቻ የአዲስ አድራሻ መከልከያ ንግግር እርስዎ አዲስ የ አድራሻ መከልከያ እቅድ የሚፈጥሩበት" #: mm_seladdblo.xhp msgctxt "" @@ -28823,12 +28843,13 @@ msgstr "ማረሚያ" #: mm_seladdlis.xhp +#, fuzzy msgctxt "" "mm_seladdlis.xhp\n" "par_idN105B3\n" "help.text" msgid "Opens the New Address List dialog, where you can edit the selected address list." -msgstr "" +msgstr "መክፈቻ የአዲስ አድራሻ ዝርዝር ንግግር አዲስ የአድራሻ ዝርዝር የሚፈጥሩበት" #: mm_seladdlis.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter/guide.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter/guide.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-08-28 01:25+0000\n" +"PO-Revision-Date: 2015-09-25 16:12+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440725117.000000\n" +"X-POOTLE-MTIME: 1443197544.000000\n" #: anchor_object.xhp msgctxt "" @@ -6980,7 +6980,7 @@ "30\n" "help.text" msgid "Enter a statement in the Condition box. For example, using the variable you previously defined, enter Hide==1." -msgstr "" +msgstr "መግለጫ ያስገቡ በ ሁኔታ ሳጥን ውስጥ: ለምሳሌ: እርስዎ ቀደም ብለው የተጠቀሙበትን ተለዋዋጭ: ያስገቡ መደበቂያ==1." #: hidden_text.xhp msgctxt "" @@ -7043,7 +7043,7 @@ "36\n" "help.text" msgid "Enter a statement in the Condition box. For example, using the variable you previously defined, enter Hide==1." -msgstr "" +msgstr "መግለጫ ያስገቡ በ ሁኔታ ሳጥን ውስጥ: ለምሳሌ: እርስዎ ቀደም ብለው የተጠቀሙበትን ተለዋዋጭ: ያስገቡ መደበቂያ==1." #: hidden_text.xhp msgctxt "" @@ -7304,7 +7304,7 @@ "24\n" "help.text" msgid "In the Navigator list, click the plus sign next to the item that you want to insert as a hyperlink." -msgstr "" +msgstr "በ መቃኛ ዝርዝር ውስጥ: ይጫኑ የ መደመሪያ ምልክት ከ እቃው አጠገብ ያለውን እርስዎ ማስገባት የሚፈልጉትን እንደ hyperlink." #: hyperlinks.xhp msgctxt "" @@ -7313,7 +7313,7 @@ "26\n" "help.text" msgid "Drag the item to where you want to insert the hyperlink in the document." -msgstr "" +msgstr "እቃውን ይጎትቱ እርስዎ hyperlink ማስገባት ወደሚፈልጉበት ቦታ በ ሰነዱ ውስጥ" #: hyperlinks.xhp msgctxt "" @@ -7322,7 +7322,7 @@ "27\n" "help.text" msgid "The name of the item is inserted in the document as an underlined hyperlink." -msgstr "" +msgstr "የ እቃው ስም ገብቷል በ ሰነዱ ውስጥ እንደ ከ ስሩ የተሰመረ hyperlink" #: hyphen_prevent.xhp msgctxt "" @@ -7338,7 +7338,7 @@ "bm_id3149695\n" "help.text" msgid "hyphenation;preventing for specific words words;wrapping/not wrapping in text switching off;hyphenation for specific words" -msgstr "" +msgstr "ጭረት;መከልከያ ለ ተወሰኑ ቃላቶች ቃላቶች;መጠቅለያ/በ ጽሁፍ ውስጥ አይጠቀልልም ማጥፊያ;ጭረት ለ ተወሰኑ ቃላቶች" #: hyphen_prevent.xhp msgctxt "" @@ -7347,7 +7347,7 @@ "20\n" "help.text" msgid "Preventing Hyphenation of Specific Words" -msgstr "" +msgstr "ጭረት መከልከያ ለ ተወሰኑ ቃላቶች" #: hyphen_prevent.xhp msgctxt "" @@ -7588,7 +7588,7 @@ "12\n" "help.text" msgid "Index entries are inserted as fields into your document. To view fields in your document, choose View and ensure that Field Shadings is selected." -msgstr "" +msgstr "በ እርስዎ ሰነድ ውስጥ የ ማውጫ ማስገቢያ የሚገባው እንደ ሜዳዎች ነው: ሜዳዎችን ለ መመልከት በ እርስዎ ሰነድ ውስጥ: ይምረጡ መመልከቻ እና እርግጠኛ ይሁኑ የ ሜዳ ጥላዎች መመረጣቸውን" #: indices_delete.xhp msgctxt "" @@ -7597,7 +7597,7 @@ "13\n" "help.text" msgid "Place the cursor immediately in front of the index entry in your document." -msgstr "" +msgstr "መጠቆሚያውን ወዲያውኑ በ እርስዎ ሰነድ ማውጫ ማስገቢያ ፊት ለፊት ያደርገዋል" #: indices_delete.xhp msgctxt "" @@ -8066,7 +8066,7 @@ "36\n" "help.text" msgid "If you want to use a concordance file, select Concordance file in the Options area, click the File button, and then locate an existing file or create a new concordance file." -msgstr "" +msgstr "እርስዎ መጠቀም ከ ፈለጉ ፋይል በ ፊደል ቅደም ተከተል: ይምረጡ ፋይል በ ፊደል ቅደም ተከተል በ ምርጫ ቦታ: ይጫኑ የ ፋይል ቁልፍ: እና ከዛ ፈልገው ያግኙ የ ነበረውን ፋይል ወይንም ይፍጠሩ አዲስ ፋይል በ ፊደል ቅደም ተከተል" #: indices_index.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter.po libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter.po --- libreoffice-5.0.2/translations/source/am/helpcontent2/source/text/swriter.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/helpcontent2/source/text/swriter.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-08-31 23:36+0000\n" +"PO-Revision-Date: 2015-11-02 14:50+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441064188.000000\n" +"X-POOTLE-MTIME: 1446475806.000000\n" #: main0000.xhp msgctxt "" @@ -2128,7 +2128,7 @@ "21\n" "help.text" msgid "Flexible Application Interface" -msgstr "" +msgstr "ተለዋዋጭ የ መተግበሪያ ገጽታዎች" #: main0503.xhp msgctxt "" @@ -2137,7 +2137,7 @@ "22\n" "help.text" msgid "The program interface is designed so that you can configure it according to your preferences, including customizing icons and menus. You can position various program windows, such as the Styles and Formatting window or the Navigator as floating windows anywhere on the screen. You can also dock some windows to the edge of the workspace." -msgstr "" +msgstr "ይህ የ ፕሮግራም ገጽታ የተዘጋጀው እርስዎ እንደሚፈልጉት እንዲያሰናዱት ተደርጎ ነው: ምልክቶችን ማስተካከል ይችላሉ እና ዝርዝሮችን: የ ተለያዩ የ ፕሮግራም መስኮቶችን ቦታ መቀየር ይችላሉ: እንደ ዘዴዎች እና አቀራረብ መስኮት ወይንም መቃኛውን እንደ ተንሳፋፊ መስኮቶች በ ማንኛውም ቦታ በ መስኮቱ ውስጥ ማድረግ ይችላሉ: እርስዎ dockአንዳንድ መስኮቶችን በ መስሪያ ቦታ ጠርዝ በኩል ማድረግ ይችላሉ" #: main0503.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po libreoffice-5.0.5~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po --- libreoffice-5.0.2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,19 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:06+0200\n" -"PO-Revision-Date: 2013-05-24 23:43+0000\n" -"Last-Translator: Samson \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:40+0200\n" +"PO-Revision-Date: 2015-10-15 22:28+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1369439011.0\n" +"X-POOTLE-MTIME: 1444948109.000000\n" #: Options.xhp msgctxt "" @@ -246,7 +246,7 @@ "par_id0603200910394216\n" "help.text" msgid "DE: Scaling Factor" -msgstr "DE: Scaling Factor" +msgstr "DE: መመጠኛ ምክንያት" #: Options.xhp msgctxt "" @@ -254,7 +254,7 @@ "par_id060320091039424\n" "help.text" msgid "During crossover, the scaling factor decides about the “speed” of movement." -msgstr "በሚያቋርጥ ጊዜ የመመጠኛ አካል ይወስናል “ፍጥነትን” ለእንቅስቃሴው" +msgstr "በሚያቋርጥ ጊዜ የመመጠኛ አካል ለ እንቅስቃሴው “ፍጥነትን” ይወስናል" #: Options.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/nlpsolver/src/locale.po libreoffice-5.0.5~rc2/translations/source/am/nlpsolver/src/locale.po --- libreoffice-5.0.2/translations/source/am/nlpsolver/src/locale.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/nlpsolver/src/locale.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,19 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:06+0200\n" -"PO-Revision-Date: 2012-11-18 14:49+0000\n" -"Last-Translator: Andras \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:40+0200\n" +"PO-Revision-Date: 2015-10-15 22:27+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1353250167.0\n" +"X-POOTLE-MTIME: 1444948041.000000\n" #: NLPSolverCommon_en_US.properties msgctxt "" @@ -118,7 +118,7 @@ "NLPSolverCommon.Properties.DEFactor\n" "property.text" msgid "DE: Scaling Factor (0-1.2)" -msgstr "DE: Scaling Factor (0-1.2)" +msgstr "DE: መመጠኛ ምክንያት (0-1.2)" #: NLPSolverCommon_en_US.properties msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-06 23:50+0000\n" +"PO-Revision-Date: 2015-10-30 22:37+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441583431.000000\n" +"X-POOTLE-MTIME: 1446244626.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -672,7 +672,7 @@ "Label\n" "value.text" msgid "Scaling Factor" -msgstr "የመመጠኛ ምክንያት" +msgstr "የ መመጠኛ ምክንያት" #: CalcCommands.xcu msgctxt "" @@ -12336,7 +12336,7 @@ "Label\n" "value.text" msgid "Fontwork Alignment" -msgstr "የፊደል ስራ ማሰለፊያ" +msgstr "የ ፊደል ስራ ማሰለፊያ" #: GenericCommands.xcu msgctxt "" @@ -15219,7 +15219,7 @@ "Label\n" "value.text" msgid "Horizontal Line" -msgstr "የአግድም መስመር" +msgstr "የ አግድም መስመር" #: GenericCommands.xcu msgctxt "" @@ -20667,7 +20667,7 @@ "Label\n" "value.text" msgid "Section alignment" -msgstr "በክፍሉ ማሰለፊያ" +msgstr "በ ክፍሉ ማሰለፊያ" #: ReportCommands.xcu msgctxt "" @@ -21063,7 +21063,7 @@ "Title\n" "value.text" msgid "Cell Appearance" -msgstr "የክፍል አቀራረብ" +msgstr "የ ክፍል አቀራረብ" #: Sidebar.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/reportdesign/source/ui/inspection.po libreoffice-5.0.5~rc2/translations/source/am/reportdesign/source/ui/inspection.po --- libreoffice-5.0.2/translations/source/am/reportdesign/source/ui/inspection.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/reportdesign/source/ui/inspection.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-14 10:50+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-29 00:31+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439549429.000000\n" +"X-POOTLE-MTIME: 1446078681.000000\n" #: inspection.src msgctxt "" @@ -596,7 +596,7 @@ "RID_STR_VERTICALALIGN\n" "string.text" msgid "Vert. Alignment" -msgstr "በቁመት ማሰለፊያ" +msgstr "በ ቁመት ማሰለፊያ" #: inspection.src msgctxt "" @@ -631,7 +631,7 @@ "RID_STR_PARAADJUST\n" "string.text" msgid "Horz. Alignment" -msgstr "በአግድም ማሰለፊያ" +msgstr "በ አግድም ማሰለፊያ" #: inspection.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/am/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/am/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sc/source/ui/src.po 2016-02-04 16:41:28.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-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-09-06 23:50+0000\n" +"PO-Revision-Date: 2015-10-29 00:31+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441583450.000000\n" +"X-POOTLE-MTIME: 1446078706.000000\n" #: condformatdlg.src msgctxt "" @@ -24809,7 +24809,7 @@ "SCSTR_HOR_JUSTIFY_STANDARD\n" "string.text" msgid "Horizontal alignment default" -msgstr "ነባር የአግድም ማሰለፊያ" +msgstr "ነባር የ አግድም ማሰለፊያ" #: scstring.src msgctxt "" @@ -24841,7 +24841,7 @@ "SCSTR_VER_JUSTIFY_STANDARD\n" "string.text" msgid "Vertical alignment default" -msgstr "ነባር በቁመት ማሰለፊያ" +msgstr "ነባር በ ቁመት ማሰለፊያ" #: scstring.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/am/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/am/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-09-06 23:51+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-10-29 00:32+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441583496.000000\n" +"X-POOTLE-MTIME: 1446078737.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1563,6 +1563,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "አነስተኛ ዋጋ ከ ከፍተኛ ዋጋ ማነስ አለበት" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Custom" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -2754,13 +2764,14 @@ msgstr "" #: exponentialsmoothingdialog.ui +#, fuzzy msgctxt "" "exponentialsmoothingdialog.ui\n" "label1\n" "label\n" "string.text" msgid "Parameters" -msgstr "" +msgstr "Parameters" #: externaldata.ui msgctxt "" @@ -4492,13 +4503,14 @@ msgstr "እረፍት:" #: movingaveragedialog.ui +#, fuzzy msgctxt "" "movingaveragedialog.ui\n" "label1\n" "label\n" "string.text" msgid "Parameters" -msgstr "" +msgstr "Parameters" #: multipleoperationsdialog.ui msgctxt "" @@ -7541,7 +7553,7 @@ "label\n" "string.text" msgid "Scaling _mode:" -msgstr "መመጠኛ _ዘዴ" +msgstr "መመጠኛ _ዘዴ:" #: sheetprintpage.ui msgctxt "" @@ -7703,7 +7715,7 @@ "tooltip_markup\n" "string.text" msgid "Horizontal Alignment" -msgstr "በአግድም ማሰለፊያ" +msgstr "በ አግድም ማሰለፊያ" #: sidebaralignment.ui msgctxt "" @@ -7712,7 +7724,7 @@ "tooltip_text\n" "string.text" msgid "Horizontal Alignment" -msgstr "በአግድም ማሰለፊያ" +msgstr "በ አግድም ማሰለፊያ" #: sidebaralignment.ui msgctxt "" @@ -7721,7 +7733,7 @@ "tooltip_text\n" "string.text" msgid "Vertical Alignment" -msgstr "በቁመት ማሰለፊያ" +msgstr "በ ቁመት ማሰለፊያ" #: sidebaralignment.ui msgctxt "" @@ -9596,40 +9608,44 @@ msgstr "መቁጠሪያ (ቁጥር ብቻ)" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "liststore1\n" "7\n" "stringlist.text" msgid "StDev (Sample)" -msgstr "" +msgstr "StDev (sample)" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "liststore1\n" "8\n" "stringlist.text" msgid "StDevP (Population)" -msgstr "" +msgstr "StDevP (population)" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "liststore1\n" "9\n" "stringlist.text" msgid "Var (Sample)" -msgstr "" +msgstr "Var (sample)" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "liststore1\n" "10\n" "stringlist.text" msgid "VarP (Population)" -msgstr "" +msgstr "VarP (population)" #: subtotaloptionspage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sd/uiconfig/sdraw/ui.po libreoffice-5.0.5~rc2/translations/source/am/sd/uiconfig/sdraw/ui.po --- libreoffice-5.0.2/translations/source/am/sd/uiconfig/sdraw/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sd/uiconfig/sdraw/ui.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-07-03 16:45+0000\n" +"PO-Revision-Date: 2015-10-16 21:30+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435941916.000000\n" +"X-POOTLE-MTIME: 1445031045.000000\n" #: breakdialog.ui msgctxt "" @@ -32,7 +32,7 @@ "label\n" "string.text" msgid "Processing metafile:" -msgstr "" +msgstr "metafile በ ሂደት ላይ:" #: breakdialog.ui msgctxt "" @@ -113,7 +113,7 @@ "label\n" "string.text" msgid "Customize" -msgstr "" +msgstr "ማስተካከያ" #: copydlg.ui msgctxt "" @@ -446,7 +446,7 @@ "label\n" "string.text" msgid "Asian Typography" -msgstr "" +msgstr "Asian Typography" #: drawparadialog.ui msgctxt "" @@ -590,7 +590,7 @@ "label\n" "string.text" msgid "Customize" -msgstr "" +msgstr "ማስተካከያ" #: drawprtldialog.ui msgctxt "" @@ -608,7 +608,7 @@ "label\n" "string.text" msgid "Asian Typography" -msgstr "" +msgstr "Asian Typography" #: drawprtldialog.ui msgctxt "" @@ -716,7 +716,7 @@ "title\n" "string.text" msgid "Name HTML Design" -msgstr "" +msgstr "የ HTML ንድፍ ስም" #: paranumberingtab.ui msgctxt "" @@ -1013,4 +1013,4 @@ "label\n" "string.text" msgid "Vectorized image:" -msgstr "" +msgstr "Vectorized ምስል:" diff -Nru libreoffice-5.0.2/translations/source/am/sd/uiconfig/simpress/ui.po libreoffice-5.0.5~rc2/translations/source/am/sd/uiconfig/simpress/ui.po --- libreoffice-5.0.2/translations/source/am/sd/uiconfig/simpress/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sd/uiconfig/simpress/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-09-06 23:52+0000\n" +"PO-Revision-Date: 2015-11-04 00:27+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441583532.000000\n" +"X-POOTLE-MTIME: 1446596877.000000\n" #: assistentdialog.ui msgctxt "" @@ -167,7 +167,7 @@ "label\n" "string.text" msgid "W_idescreen" -msgstr "" +msgstr "በ _ሰፊ መመልከቻ" #: assistentdialog.ui msgctxt "" @@ -2093,7 +2093,7 @@ "label\n" "string.text" msgid "Auto External (Display %1)" -msgstr "" +msgstr "በራሱ የ ውጪ (ማሳያ %1)" #: presentationdialog.ui msgctxt "" @@ -2435,7 +2435,7 @@ "label\n" "string.text" msgid "B_rochure" -msgstr "" +msgstr "መ_ግለጫ ጽሁፍ" #: prntopts.ui msgctxt "" @@ -2741,7 +2741,7 @@ "label\n" "string.text" msgid "_WebCast" -msgstr "" +msgstr "_ዌብ ማስተላለፊያ" #: publishingdialog.ui msgctxt "" @@ -2759,7 +2759,7 @@ "label\n" "string.text" msgid "_Single-document HTML" -msgstr "" +msgstr "የ HTML _ነጠላ-ሰነድ" #: publishingdialog.ui msgctxt "" @@ -2768,7 +2768,7 @@ "label\n" "string.text" msgid "Standard HTML with _frames" -msgstr "" +msgstr "መደበኛ HTML ከ _ክፈፎች ጋር" #: publishingdialog.ui msgctxt "" @@ -2867,7 +2867,7 @@ "label\n" "string.text" msgid "Monitor Resolution" -msgstr "" +msgstr "የ መመልከቻው ሪዞሊሽን" #: publishingdialog.ui msgctxt "" @@ -2939,7 +2939,7 @@ "label\n" "string.text" msgid "Link to a copy of the _original presentation" -msgstr "" +msgstr "ለ _ዋናው ማቅረቢያ ኮፒ አገናኝ" #: publishingdialog.ui msgctxt "" @@ -2975,7 +2975,7 @@ "label\n" "string.text" msgid "_Apply color scheme from document" -msgstr "" +msgstr "ከ ሰነዱ የ ቀለም ገጽታ _መፈጸሚያ" #: publishingdialog.ui msgctxt "" @@ -2993,7 +2993,7 @@ "label\n" "string.text" msgid "_Use custom color scheme" -msgstr "" +msgstr "_ይጠቀሙ የ ቀለም ገጽታ ማስተካከያ" #: publishingdialog.ui msgctxt "" @@ -3020,7 +3020,7 @@ "label\n" "string.text" msgid "Hyper_link" -msgstr "" +msgstr "Hyper_link" #: publishingdialog.ui msgctxt "" @@ -3119,7 +3119,7 @@ "label\n" "string.text" msgid "_All control points in Bézier editor" -msgstr "" +msgstr "_ሁሉም መቆጣጠሪያዎች ነጥቦች ወደ Bézier editor" #: sdviewpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-05 18:12+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:21+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: am\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438798322.000000\n" +"X-POOTLE-MTIME: 1439551309.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/am/starmath/uiconfig/smath/ui.po libreoffice-5.0.5~rc2/translations/source/am/starmath/uiconfig/smath/ui.po --- libreoffice-5.0.2/translations/source/am/starmath/uiconfig/smath/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/starmath/uiconfig/smath/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-16 19:37+0000\n" +"PO-Revision-Date: 2015-10-15 22:26+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439753832.000000\n" +"X-POOTLE-MTIME: 1444947961.000000\n" #: alignmentdialog.ui msgctxt "" @@ -496,14 +496,13 @@ msgstr "በ ገጹ ልክ" #: printeroptions.ui -#, fuzzy msgctxt "" "printeroptions.ui\n" "scaling\n" "label\n" "string.text" msgid "Scaling:" -msgstr "መመጠኛ" +msgstr "መመጠኛ:" #: printeroptions.ui msgctxt "" @@ -597,14 +596,13 @@ msgstr "በ_ገጹ ልክ" #: smathsettings.ui -#, fuzzy msgctxt "" "smathsettings.ui\n" "sizezoomed\n" "label\n" "string.text" msgid "_Scaling:" -msgstr "_መመጠኛ" +msgstr "_መመጠኛ:" #: smathsettings.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/am/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/am/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/source/dialog.po 2016-02-04 16:41:28.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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-09-02 01:34+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-28 18:18+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441157646.000000\n" +"X-POOTLE-MTIME: 1446056328.000000\n" #: bmpmask.src msgctxt "" @@ -228,7 +228,7 @@ "Horizontal border line\n" "itemlist.text" msgid "Horizontal border line" -msgstr "የአግድም ድንበር መስመር" +msgstr "የ አግድም ድንበር መስመር" #: frmsel.src msgctxt "" @@ -309,7 +309,7 @@ "Horizontal border line\n" "itemlist.text" msgid "Horizontal border line" -msgstr "የአግድም ድንበር መስመር" +msgstr "የ አግድም ድንበር መስመር" #: frmsel.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/svx/source/items.po libreoffice-5.0.5~rc2/translations/source/am/svx/source/items.po --- libreoffice-5.0.2/translations/source/am/svx/source/items.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/source/items.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-09-02 01:36+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-29 00:32+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441157813.000000\n" +"X-POOTLE-MTIME: 1446078755.000000\n" #: svxerr.src msgctxt "" @@ -793,7 +793,7 @@ "Vertical text alignment\n" "itemlist.text" msgid "Vertical text alignment" -msgstr "በቁመት ጽሁፍ ማሰለፊያ" +msgstr "በ ቁመት ጽሁፍ ማሰለፊያ" #: svxitems.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/am/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/am/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-06-02 21:42+0000\n" -"Last-Translator: Samson \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:31+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1433281355.000000\n" +"X-POOTLE-MTIME: 1439551883.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "የ ማሳያ መጠን ማስተካከያ" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/am/svx/source/svdraw.po libreoffice-5.0.5~rc2/translations/source/am/svx/source/svdraw.po --- libreoffice-5.0.2/translations/source/am/svx/source/svdraw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/source/svdraw.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-14 11:33+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-29 00:32+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439551981.000000\n" +"X-POOTLE-MTIME: 1446078768.000000\n" #: svdstr.src msgctxt "" @@ -78,7 +78,7 @@ "STR_ObjNameSingulLINE_Hori\n" "string.text" msgid "horizontal line" -msgstr "የአግድም መስመር" +msgstr "የ አግድም መስመር" #: svdstr.src msgctxt "" @@ -2542,7 +2542,7 @@ "STR_ItemNam_SHADOWXDIST\n" "string.text" msgid "Horizontal shadow outline" -msgstr "በአግድም የጥላ ረቂቅ" +msgstr "በ አግድም የ ጥላ ረቂቅ" #: svdstr.src msgctxt "" @@ -3366,7 +3366,7 @@ "SIP_XA_FORMTXTADJUST\n" "string.text" msgid "Fontwork alignment" -msgstr "የፊደል ስራ ማሰለፊያ" +msgstr "የ ፊደል ስራ ማሰለፊያ" #: svdstr.src msgctxt "" @@ -3582,7 +3582,7 @@ "SIP_SA_CAPTIONESCDIR\n" "string.text" msgid "Legend exit alignment" -msgstr "ከመግለጫ ማሰለፊያ መውጫ" +msgstr "ከ መግለጫ ማሰለፊያ መውጫ" #: svdstr.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/svx/source/toolbars.po libreoffice-5.0.5~rc2/translations/source/am/svx/source/toolbars.po --- libreoffice-5.0.2/translations/source/am/svx/source/toolbars.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/source/toolbars.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,19 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:06+0200\n" -"PO-Revision-Date: 2012-11-18 14:52+0000\n" -"Last-Translator: Andras \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: 2015-10-29 00:32+0000\n" +"Last-Translator: Samson B \n" "Language-Team: LANGUAGE \n" "Language: am\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1353250345.0\n" +"X-POOTLE-MTIME: 1446078777.000000\n" #: extrusionbar.src msgctxt "" @@ -150,7 +150,7 @@ "RID_SVXSTR_UNDO_APPLY_FONTWORK_ALIGNMENT\n" "string.text" msgid "Apply Fontwork Alignment" -msgstr "የፊደል ስራ ማሰለፊያ መፈጸሚያ" +msgstr "የ ፊደል ስራ ማሰለፊያ መፈጸሚያ" #: fontworkbar.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/svx/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/svx/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/svx/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/svx/uiconfig/ui.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-18 00:58+0000\n" +"PO-Revision-Date: 2015-10-29 00:33+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439859509.000000\n" +"X-POOTLE-MTIME: 1446078792.000000\n" #: acceptrejectchangesdialog.ui msgctxt "" @@ -329,7 +329,7 @@ "label\n" "string.text" msgid "Edit Model" -msgstr "ዘዴ ማረሚያ" +msgstr "ናሙና ማረሚያ" #: addnamespacedialog.ui msgctxt "" @@ -5298,7 +5298,7 @@ "tooltip_text\n" "string.text" msgid "Horizontal Alignment" -msgstr "በአግድም ማሰለፊያ" +msgstr "በ አግድም ማሰለፊያ" #: sidebarparagraph.ui msgctxt "" @@ -5307,7 +5307,7 @@ "tooltip_text\n" "string.text" msgid "Vertical Alignment" -msgstr "በቁመት ማሰለፊያ" +msgstr "በ ቁመት ማሰለፊያ" #: sidebarparagraph.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/am/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/am/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-11-27 22:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1228,7 +1228,7 @@ "STR_POOLCOLL_HTML_HR\n" "string.text" msgid "Horizontal Line" -msgstr "የአግድም መስመር" +msgstr "የ አግድም መስመር" #: poolfmt.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sw/source/uibase/utlui.po libreoffice-5.0.5~rc2/translations/source/am/sw/source/uibase/utlui.po --- libreoffice-5.0.2/translations/source/am/sw/source/uibase/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sw/source/uibase/utlui.po 2016-02-04 16:41:28.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-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-07-10 18:48+0000\n" +"PO-Revision-Date: 2015-11-03 02:05+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436554118.000000\n" +"X-POOTLE-MTIME: 1446516349.000000\n" #: attrdesc.src msgctxt "" @@ -2002,7 +2002,7 @@ "STR_BOOKCTRL_HINT\n" "string.text" msgid "Page number in document. Click to open Navigator window or right-click for bookmark list." -msgstr "" +msgstr "የ ገጽ ቁጥር በ ሰነድ ውስጥ: ይጫኑ የ መቃኛ መስኮት ለመክፈት ወይንም በ ቀኝ-ይጫኑ ለ ምልክት ማድረጊያ ዝርዝር" #: statusbar.src msgctxt "" @@ -2010,7 +2010,7 @@ "STR_BOOKCTRL_HINT_EXTENDED\n" "string.text" msgid "Page number in document (Page number on printed document). Click to open Navigator window." -msgstr "" +msgstr "የ ገጽ ቁጥር በ ሰነድ ውስጥ (የ ገጽ ቁጥር በታተመ ሰነድ ላይ) ይጫኑ ለ መክፈት የ መቃኛ መስኮት" #: statusbar.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/am/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/am/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-16 19:37+0000\n" +"PO-Revision-Date: 2015-10-29 00:33+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439753873.000000\n" +"X-POOTLE-MTIME: 1446078833.000000\n" #: abstractdialog.ui msgctxt "" @@ -5329,7 +5329,7 @@ "label\n" "string.text" msgid "_Vertical alignment" -msgstr "_በቁመት ማሰለፊያ" +msgstr "በ _ቁመት ማሰለፊያ" #: frmaddpage.ui msgctxt "" @@ -9552,7 +9552,7 @@ "label\n" "string.text" msgid "Store it when changing the document" -msgstr "" +msgstr "ሰነዱ በሚቀየር ጊዜ ማስቀመጫ" #: optcomparison.ui msgctxt "" @@ -9877,7 +9877,7 @@ "label\n" "string.text" msgid "Math baseline alignment" -msgstr "የሂሳብ መሰረታዊ መስመር ማሰለፊያ" +msgstr "የ ሂሳብ መሰረታዊ መስመር ማሰለፊያ" #: optformataidspage.ui msgctxt "" @@ -13430,7 +13430,7 @@ "label\n" "string.text" msgid "_Vertical alignment" -msgstr "_በቁመት ማሰለፊያ" +msgstr "በ _ቁመት ማሰለፊያ" #: tabletextflowpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/vcl/source/src.po libreoffice-5.0.5~rc2/translations/source/am/vcl/source/src.po --- libreoffice-5.0.2/translations/source/am/vcl/source/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/vcl/source/src.po 2016-02-04 16:41:28.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: 2015-09-02 01:29+0000\n" +"PO-Revision-Date: 2015-10-16 21:28+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441157394.000000\n" +"X-POOTLE-MTIME: 1445030888.000000\n" #. This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string #: btntext.src @@ -1142,13 +1142,12 @@ msgstr "<መተው>" #: print.src -#, fuzzy msgctxt "" "print.src\n" "SV_PRINT_CUSTOM_TXT\n" "string.text" msgid "Custom" -msgstr "Custom" +msgstr "ማስተካከያ" #: stdtext.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/am/vcl/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/am/vcl/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/am/vcl/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/am/vcl/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-14 11:56+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-16 21:28+0000\n" +"Last-Translator: Samson B \n" "Language-Team: none\n" "Language: am\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439553387.000000\n" +"X-POOTLE-MTIME: 1445030896.000000\n" #: cupspassworddialog.ui msgctxt "" @@ -737,7 +737,6 @@ msgstr "የ ማተሚያ _ቋንቋ አይነት:" #: printerdevicepage.ui -#, fuzzy msgctxt "" "printerdevicepage.ui\n" "colorspace\n" diff -Nru libreoffice-5.0.2/translations/source/ar/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ar/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ar/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-17 14:05+0000\n" -"Last-Translator: صفا الفليج \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-12-27 16:58+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Arabic \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439820307.000000\n" +"X-POOTLE-MTIME: 1451235496.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "‏%PRODUCTNAME طقم لزيادة الإنتاجيّة حديث، سهل الاستخدام ومفتوح المصدر لمعالجة الكلمات، الجداول الممتدّة، العروض التّقديميّة وأكثر." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "حقوق النّشر © 2000 - 2015 لمساهمي ليبر‌أُفِس." #: aboutdialog.ui @@ -5249,13 +5250,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "ftForm\n" "label\n" "string.text" msgid "Form:" -msgstr "" +msgstr "_لـ" #: fmsearchdialog.ui msgctxt "" @@ -5683,13 +5685,14 @@ msgstr "الع_نوان:" #: galleryupdateprogress.ui +#, fuzzy msgctxt "" "galleryupdateprogress.ui\n" "GalleryUpdateProgress\n" "title\n" "string.text" msgid "Update" -msgstr "" +msgstr "_حدّث" #: galleryupdateprogress.ui msgctxt "" @@ -10352,7 +10355,6 @@ msgstr "[ح]: تحويل وحفظ الكائن" #: optfltrembedpage.ui -#, fuzzy msgctxt "" "optfltrembedpage.ui\n" "label1\n" @@ -10368,7 +10370,7 @@ "label\n" "string.text" msgid "Export as:" -msgstr "" +msgstr "صدّر كَ‍:" #: optfltrembedpage.ui msgctxt "" @@ -10404,7 +10406,7 @@ "label\n" "string.text" msgid "Load Basic _code" -msgstr "تحميل الت_عليمات البرمجية لـ Basic" +msgstr "حمّل أ_كواد بيزك" #: optfltrpage.ui msgctxt "" @@ -10413,7 +10415,7 @@ "label\n" "string.text" msgid "E_xecutable code" -msgstr "نص _تنفيذي" +msgstr "كود _تنفيذي" #: optfltrpage.ui msgctxt "" @@ -10422,7 +10424,7 @@ "label\n" "string.text" msgid "Save _original Basic code" -msgstr "حفظ التعلي_مات البرمجية الأصلية لـ Basic" +msgstr "احفظ كود بيزك الأصلي" #: optfltrpage.ui msgctxt "" @@ -11703,13 +11705,14 @@ msgstr "ح_ذف" #: optopenclpage.ui +#, fuzzy msgctxt "" "optopenclpage.ui\n" "os\n" "label\n" "string.text" msgid "Operating System" -msgstr "" +msgstr "نظام التّشغيل:" #: optopenclpage.ui msgctxt "" @@ -15572,13 +15575,14 @@ msgstr "" #: select_persona_dialog.ui +#, fuzzy msgctxt "" "select_persona_dialog.ui\n" "search_personas\n" "label\n" "string.text" msgid "_Search" -msgstr "" +msgstr "ا_بحث" #: select_persona_dialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/dbaccess/source/ui/tabledesign.po libreoffice-5.0.5~rc2/translations/source/ar/dbaccess/source/ui/tabledesign.po --- libreoffice-5.0.2/translations/source/ar/dbaccess/source/ui/tabledesign.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/dbaccess/source/ui/tabledesign.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2014-11-18 12:31+0000\n" +"PO-Revision-Date: 2015-12-27 17:00+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1416313901.000000\n" +"X-POOTLE-MTIME: 1451235610.000000\n" #: table.src msgctxt "" @@ -525,7 +525,7 @@ "STR_TABLEDESIGN_COULD_NOT_DROP_COL\n" "string.text" msgid "The column $column$ could not be deleted." -msgstr "تعذر حذف العمود $column" +msgstr "تعذر حذف العمود $column$." #: table.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/desktop/source/deployment/misc.po libreoffice-5.0.5~rc2/translations/source/ar/desktop/source/deployment/misc.po --- libreoffice-5.0.2/translations/source/ar/desktop/source/deployment/misc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/desktop/source/deployment/misc.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-30 13:09+0200\n" -"PO-Revision-Date: 2014-07-29 05:43+0000\n" -"Last-Translator: صفا \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-12-27 16:59+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1406612588.000000\n" +"X-POOTLE-MTIME: 1451235579.000000\n" #: dp_misc.src msgctxt "" @@ -46,4 +46,4 @@ "RID_DEPLOYMENT_DEPENDENCIES_LO_MIN\n" "string.text" msgid "Extension requires at least %PRODUCTNAME version %VERSION" -msgstr "يتطلّب الامتداد الإصدار رقم %PRODUCTNAME من ليبرأوفيس على الأقل" +msgstr "يتطلّب الامتداد الإصدارة رقم %VERSION من %PRODUCTNAME على الأقل" diff -Nru libreoffice-5.0.2/translations/source/ar/extensions/source/propctrlr.po libreoffice-5.0.5~rc2/translations/source/ar/extensions/source/propctrlr.po --- libreoffice-5.0.2/translations/source/ar/extensions/source/propctrlr.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/extensions/source/propctrlr.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2013-06-30 20:38+0000\n" -"Last-Translator: صفا \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-12-27 17:00+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1372624728.0\n" +"X-POOTLE-MTIME: 1451235627.000000\n" #: formlinkdialog.src msgctxt "" @@ -964,7 +964,7 @@ "5\n" "string.text" msgid "Sql [Native]" -msgstr "Sql [أصلي]" +msgstr "Sql [أصيل]" #: formres.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/framework/source/classes.po libreoffice-5.0.5~rc2/translations/source/ar/framework/source/classes.po --- libreoffice-5.0.2/translations/source/ar/framework/source/classes.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/framework/source/classes.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-10-09 07:33+0000\n" -"Last-Translator: صفا \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-12-27 17:01+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1412839986.000000\n" +"X-POOTLE-MTIME: 1451235677.000000\n" #: resource.src msgctxt "" @@ -294,4 +294,4 @@ "STR_LANGSTATUS_HINT\n" "string.text" msgid "Text Language. Right-click to set character or paragraph language" -msgstr "" +msgstr "لغة النص. انقر باليمين لضبط لغة المحرف او الفقرة" diff -Nru libreoffice-5.0.2/translations/source/ar/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ar/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ar/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-30 16:05+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:05+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ar\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438272304.000000\n" +"X-POOTLE-MTIME: 1439550301.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "مخصّص" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -5922,13 +5932,14 @@ msgstr "" #: pivotfilterdialog.ui +#, fuzzy msgctxt "" "pivotfilterdialog.ui\n" "label4\n" "label\n" "string.text" msgid "Condition" -msgstr "" +msgstr "الشّروط" #: pivotfilterdialog.ui #, fuzzy @@ -6418,13 +6429,14 @@ msgstr "" #: randomnumbergenerator.ui +#, fuzzy msgctxt "" "randomnumbergenerator.ui\n" "cell-range-label\n" "label\n" "string.text" msgid "Cell range:" -msgstr "" +msgstr "نطاق الخلايا" #: randomnumbergenerator.ui #, fuzzy @@ -8634,13 +8646,14 @@ msgstr "" #: solveroptionsdialog.ui +#, fuzzy msgctxt "" "solveroptionsdialog.ui\n" "edit\n" "label\n" "string.text" msgid "Edit..." -msgstr "" +msgstr "حرّر..." #: solverprogressdialog.ui msgctxt "" @@ -9032,13 +9045,14 @@ msgstr "" #: standardfilterdialog.ui +#, fuzzy msgctxt "" "standardfilterdialog.ui\n" "label4\n" "label\n" "string.text" msgid "Condition" -msgstr "" +msgstr "الشّروط" #: standardfilterdialog.ui #, fuzzy @@ -10584,13 +10598,14 @@ msgstr "الوقت" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "liststore1\n" "5\n" "stringlist.text" msgid "Cell range" -msgstr "" +msgstr "نطاق الخلايا" #: validationcriteriapage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ar/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ar/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-31 07:50+0000\n" -"Last-Translator: صفا الفليج \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:20+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438329053.000000\n" +"X-POOTLE-MTIME: 1439551234.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2001,11 +2001,3 @@ "string.text" msgid "Existing Versions" msgstr "الإصدارات الموجودة" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "صفّر" diff -Nru libreoffice-5.0.2/translations/source/ar/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ar/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ar/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-30 17:20+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:31+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438276812.000000\n" +"X-POOTLE-MTIME: 1439551876.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/app.po --- libreoffice-5.0.2/translations/source/ar/sw/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/app.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-31 07:59+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-12 14:26+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438329542.000000\n" +"X-POOTLE-MTIME: 1452608818.000000\n" #: app.src msgctxt "" @@ -1322,24 +1322,22 @@ msgstr "لا يمكن تسجيل كل الخواص." #: error.src -#, fuzzy msgctxt "" "error.src\n" "RID_SW_ERRHDL\n" "WARN_CODE ( ERRCODE_CLASS_READ , WARN_SWG_OLE )\n" "string.text" msgid "Some OLE objects could only be loaded as images." -msgstr "من الممكن أن تكون بعض كائنات OLE قدحمّلت كرسوميات فقط.." +msgstr "يمكن تحميل بعض كائنات OLE كصور فقط." #: error.src -#, fuzzy msgctxt "" "error.src\n" "RID_SW_ERRHDL\n" "WARN_CODE ( ERRCODE_CLASS_WRITE , WARN_SWG_OLE )\n" "string.text" msgid "Some OLE objects could only be saved as images." -msgstr "من الممكن أن تكون بعض كائنات OLE قدحفظت كرسوميات فقط." +msgstr "يمكن حفظ بعض كائنات OLE كصور فقط." #: error.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/ui/chrdlg.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/chrdlg.po --- libreoffice-5.0.2/translations/source/ar/sw/source/ui/chrdlg.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/chrdlg.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2013-07-03 20:10+0000\n" -"Last-Translator: صفا \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-12 14:28+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1372882236.0\n" +"X-POOTLE-MTIME: 1452608904.000000\n" #: chrdlg.src msgctxt "" @@ -38,4 +38,4 @@ "STR_ILLEGAL_PAGENUM\n" "string.text" msgid "Page numbers cannot be applied to the current page. Even numbers can be used on left pages, odd numbers on right pages." -msgstr "" +msgstr "لا يمكن تطبيق أرقام الصّفحات على الصّفحة الحاليّة. الأعداد الفرديّة للصّفحات اليمنى والزّوجيّة لليسرى." diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/ui/index.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/index.po --- libreoffice-5.0.2/translations/source/ar/sw/source/ui/index.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/ui/index.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-14 11:37+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-12 14:34+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439552267.000000\n" +"X-POOTLE-MTIME: 1452609241.000000\n" #: cnttab.src msgctxt "" @@ -294,7 +294,7 @@ "STR_ADDITIONAL_ACCNAME_STRING2\n" "string.text" msgid "Press left or right arrow to choose the structure controls" -msgstr "" +msgstr "اضغط السّهم الأيمن أو الأيسر لاختيار متحكّمات البنية" #: cnttab.src msgctxt "" @@ -302,7 +302,7 @@ "STR_ADDITIONAL_ACCNAME_STRING3\n" "string.text" msgid "Press Ctrl+Alt+B to move focus back to the current structure control" -msgstr "" +msgstr "اضفط Ctrl+Alt+B لنقل التّركيز إلى متحكّم البنية الحاليّ" #: cnttab.src msgctxt "" @@ -334,4 +334,4 @@ "STR_QUERY_CHANGE_AUTH_ENTRY\n" "string.text" msgid "The document already contains the bibliography entry but with different data. Do you want to adjust the existing entries?" -msgstr "" +msgstr "يحوي المستند فعلًا مدخلة مراجع ولكن ببيانات مختلفة. أتريد ضبط المدخلات الموجودة؟" diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/uibase/docvw.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/docvw.po --- libreoffice-5.0.2/translations/source/ar/sw/source/uibase/docvw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/docvw.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-02 16:14+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-12 16:38+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438532048.000000\n" +"X-POOTLE-MTIME: 1452616711.000000\n" #: docvw.src msgctxt "" @@ -350,7 +350,7 @@ "STR_TABLE_COL_ADJUST\n" "string.text" msgid "Adjust table column" -msgstr "" +msgstr "اضبط عمود الجدول" #: docvw.src msgctxt "" @@ -358,7 +358,7 @@ "STR_TABLE_ROW_ADJUST\n" "string.text" msgid "Adjust table row" -msgstr "" +msgstr "اضبط صفّ الجدول" #: docvw.src msgctxt "" @@ -366,7 +366,7 @@ "STR_TABLE_SELECT_ALL\n" "string.text" msgid "Select whole table" -msgstr "" +msgstr "حدّد الجدول بالكامل" #: docvw.src msgctxt "" @@ -374,7 +374,7 @@ "STR_TABLE_SELECT_ROW\n" "string.text" msgid "Select table row" -msgstr "" +msgstr "حدّد صفّ الجدول" #: docvw.src msgctxt "" @@ -382,7 +382,7 @@ "STR_TABLE_SELECT_COL\n" "string.text" msgid "Select table column" -msgstr "" +msgstr "حدّد عمود الجدول" #: docvw.src msgctxt "" @@ -390,7 +390,7 @@ "STR_SMARTTAG_CLICK\n" "string.text" msgid "%s-click to open Smart Tag menu" -msgstr "" +msgstr "انقر مع %s لفتح قائمة الوسم الذّكيّ" #: docvw.src msgctxt "" @@ -398,7 +398,7 @@ "STR_HEADER_TITLE\n" "string.text" msgid "Header (%1)" -msgstr "" +msgstr "التّرويسة (%1)" #: docvw.src msgctxt "" @@ -406,7 +406,7 @@ "STR_FIRST_HEADER_TITLE\n" "string.text" msgid "First Page Header (%1)" -msgstr "" +msgstr "ترويسة الصّفحة الأولى (%1)" #: docvw.src msgctxt "" @@ -414,7 +414,7 @@ "STR_LEFT_HEADER_TITLE\n" "string.text" msgid "Left Page Header (%1)" -msgstr "" +msgstr "ترويسة الصّفحة اليسرى (%1)" #: docvw.src msgctxt "" @@ -422,7 +422,7 @@ "STR_RIGHT_HEADER_TITLE\n" "string.text" msgid "Right Page Header (%1)" -msgstr "" +msgstr "ترويسة الصّفحة اليمنى (%1)" #: docvw.src msgctxt "" @@ -430,7 +430,7 @@ "STR_FOOTER_TITLE\n" "string.text" msgid "Footer (%1)" -msgstr "" +msgstr "التّذييل (%1)" #: docvw.src msgctxt "" @@ -438,7 +438,7 @@ "STR_FIRST_FOOTER_TITLE\n" "string.text" msgid "First Page Footer (%1)" -msgstr "" +msgstr "تذييل الصّفحة الأولى (%1)" #: docvw.src msgctxt "" @@ -446,7 +446,7 @@ "STR_LEFT_FOOTER_TITLE\n" "string.text" msgid "Left Page Footer (%1)" -msgstr "" +msgstr "تذييل الصّفحة اليسرى (%1)" #: docvw.src msgctxt "" @@ -454,7 +454,7 @@ "STR_RIGHT_FOOTER_TITLE\n" "string.text" msgid "Right Page Footer (%1)" -msgstr "" +msgstr "تذييل الصّفحة اليمنى (%1)" #: docvw.src msgctxt "" @@ -462,7 +462,7 @@ "STR_DELETE_HEADER\n" "string.text" msgid "Delete Header..." -msgstr "" +msgstr "احذف التّرويسة..." #: docvw.src msgctxt "" @@ -470,7 +470,7 @@ "STR_FORMAT_HEADER\n" "string.text" msgid "Format Header..." -msgstr "" +msgstr "نسّق التّرويسة..." #: docvw.src msgctxt "" @@ -478,7 +478,7 @@ "STR_DELETE_FOOTER\n" "string.text" msgid "Delete Footer..." -msgstr "" +msgstr "احذف التّذييل..." #: docvw.src msgctxt "" @@ -486,4 +486,4 @@ "STR_FORMAT_FOOTER\n" "string.text" msgid "Format Footer..." -msgstr "" +msgstr "نسّق التّذييل..." diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/uibase/ribbar.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/ribbar.po --- libreoffice-5.0.2/translations/source/ar/sw/source/uibase/ribbar.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/ribbar.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-07-31 08:29+0000\n" +"PO-Revision-Date: 2016-01-12 17:38+0000\n" "Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438331356.000000\n" +"X-POOTLE-MTIME: 1452620326.000000\n" #: inputwin.src msgctxt "" @@ -301,7 +301,7 @@ "STR_TBL_FORMULA\n" "string.text" msgid "Text formula" -msgstr "" +msgstr "صيغة نصّيّة" #: inputwin.src msgctxt "" @@ -309,7 +309,7 @@ "STR_ACCESS_FORMULA_TOOLBAR\n" "string.text" msgid "Formula Tool Bar" -msgstr "" +msgstr "شريط أدوات الصّيغ" #: inputwin.src msgctxt "" @@ -317,7 +317,7 @@ "STR_ACCESS_FORMULA_TYPE\n" "string.text" msgid "Formula Type" -msgstr "" +msgstr "نوع الصّيغة" #: inputwin.src msgctxt "" @@ -325,7 +325,7 @@ "STR_ACCESS_FORMULA_TEXT\n" "string.text" msgid "Formula Text" -msgstr "" +msgstr "نصّ الصّيغة" #: workctrl.src msgctxt "" @@ -334,7 +334,7 @@ "FN_INSERT_FLD_PGNUMBER\n" "menuitem.text" msgid "Page Number" -msgstr "" +msgstr "رقم الصّفحة" #: workctrl.src msgctxt "" @@ -343,7 +343,7 @@ "FN_INSERT_FLD_PGCOUNT\n" "menuitem.text" msgid "Page Count" -msgstr "" +msgstr "عدد الصّفحات" #: workctrl.src msgctxt "" @@ -352,7 +352,7 @@ "FN_INSERT_FLD_DATE\n" "menuitem.text" msgid "Date" -msgstr "" +msgstr "التّاريخ" #: workctrl.src msgctxt "" @@ -361,7 +361,7 @@ "FN_INSERT_FLD_TIME\n" "menuitem.text" msgid "Time" -msgstr "" +msgstr "الوقت" #: workctrl.src msgctxt "" @@ -370,7 +370,7 @@ "FN_INSERT_FLD_TITLE\n" "menuitem.text" msgid "Title" -msgstr "" +msgstr "العنوان" #: workctrl.src msgctxt "" @@ -379,7 +379,7 @@ "FN_INSERT_FLD_AUTHOR\n" "menuitem.text" msgid "Author" -msgstr "" +msgstr "المؤلّف" #: workctrl.src msgctxt "" @@ -388,7 +388,7 @@ "FN_INSERT_FLD_TOPIC\n" "menuitem.text" msgid "Subject" -msgstr "" +msgstr "الموضوع" #: workctrl.src msgctxt "" @@ -397,7 +397,7 @@ "FN_INSERT_FIELD\n" "menuitem.text" msgid "More Fields..." -msgstr "" +msgstr "حقول أخرى..." #: workctrl.src msgctxt "" @@ -549,7 +549,7 @@ "STR_IMGBTN_TBL_DOWN\n" "string.text" msgid "Next table" -msgstr "" +msgstr "الجدول التّالي" #: workctrl.src msgctxt "" @@ -557,7 +557,7 @@ "STR_IMGBTN_FRM_DOWN\n" "string.text" msgid "Next text frame" -msgstr "" +msgstr "إطار النّصّ التّالي" #: workctrl.src msgctxt "" @@ -565,7 +565,7 @@ "STR_IMGBTN_PGE_DOWN\n" "string.text" msgid "Next page" -msgstr "" +msgstr "الصّفحة التّالية" #: workctrl.src msgctxt "" @@ -573,7 +573,7 @@ "STR_IMGBTN_DRW_DOWN\n" "string.text" msgid "Next drawing" -msgstr "" +msgstr "الرّسمة التّالية" #: workctrl.src msgctxt "" @@ -581,7 +581,7 @@ "STR_IMGBTN_CTRL_DOWN\n" "string.text" msgid "Next control" -msgstr "" +msgstr "المتحكّم التّالي" #: workctrl.src msgctxt "" @@ -589,7 +589,7 @@ "STR_IMGBTN_REG_DOWN\n" "string.text" msgid "Next section" -msgstr "" +msgstr "القسم التّالي" #: workctrl.src msgctxt "" @@ -597,7 +597,7 @@ "STR_IMGBTN_BKM_DOWN\n" "string.text" msgid "Next bookmark" -msgstr "" +msgstr "العلامة التّالية" #: workctrl.src msgctxt "" @@ -613,7 +613,7 @@ "STR_IMGBTN_OLE_DOWN\n" "string.text" msgid "Next OLE object" -msgstr "" +msgstr "كائن OLE التّالي" #: workctrl.src msgctxt "" @@ -621,7 +621,7 @@ "STR_IMGBTN_OUTL_DOWN\n" "string.text" msgid "Next heading" -msgstr "" +msgstr "التّرويسة التّالية" #: workctrl.src msgctxt "" @@ -629,7 +629,7 @@ "STR_IMGBTN_SEL_DOWN\n" "string.text" msgid "Next selection" -msgstr "" +msgstr "التّحديد التّالي" #: workctrl.src msgctxt "" @@ -645,7 +645,7 @@ "STR_IMGBTN_MARK_DOWN\n" "string.text" msgid "Next Reminder" -msgstr "" +msgstr "التّذكير التّالي" #: workctrl.src msgctxt "" @@ -653,7 +653,7 @@ "STR_IMGBTN_POSTIT_DOWN\n" "string.text" msgid "Next Comment" -msgstr "" +msgstr "التّعليق التّالي" #: workctrl.src msgctxt "" @@ -661,7 +661,7 @@ "STR_IMGBTN_SRCH_REP_DOWN\n" "string.text" msgid "Continue search forward" -msgstr "" +msgstr "تابع البحث أمامًا" #: workctrl.src msgctxt "" @@ -669,7 +669,7 @@ "STR_IMGBTN_INDEX_ENTRY_DOWN\n" "string.text" msgid "Next index entry" -msgstr "" +msgstr "مدخلة الفهرس التّالية" #: workctrl.src msgctxt "" @@ -677,7 +677,7 @@ "STR_IMGBTN_TBL_UP\n" "string.text" msgid "Previous table" -msgstr "" +msgstr "الجدول السّابقة" #: workctrl.src msgctxt "" @@ -685,7 +685,7 @@ "STR_IMGBTN_FRM_UP\n" "string.text" msgid "Previous text frame" -msgstr "" +msgstr "إطار النّصّ السّابق" #: workctrl.src msgctxt "" @@ -693,7 +693,7 @@ "STR_IMGBTN_PGE_UP\n" "string.text" msgid "Previous page" -msgstr "" +msgstr "الصّفحة السّابقة" #: workctrl.src msgctxt "" @@ -701,7 +701,7 @@ "STR_IMGBTN_DRW_UP\n" "string.text" msgid "Previous drawing" -msgstr "" +msgstr "الرّسمة السّابقة" #: workctrl.src msgctxt "" @@ -709,7 +709,7 @@ "STR_IMGBTN_CTRL_UP\n" "string.text" msgid "Previous control" -msgstr "" +msgstr "المتحكّم السّابق" #: workctrl.src msgctxt "" @@ -717,7 +717,7 @@ "STR_IMGBTN_REG_UP\n" "string.text" msgid "Previous section" -msgstr "" +msgstr "القسم السّابق" #: workctrl.src msgctxt "" @@ -725,7 +725,7 @@ "STR_IMGBTN_BKM_UP\n" "string.text" msgid "Previous bookmark" -msgstr "" +msgstr "العلامة السّابقة" #: workctrl.src msgctxt "" @@ -741,7 +741,7 @@ "STR_IMGBTN_OLE_UP\n" "string.text" msgid "Previous OLE object" -msgstr "" +msgstr "كائن OLE السّابق" #: workctrl.src msgctxt "" @@ -749,7 +749,7 @@ "STR_IMGBTN_OUTL_UP\n" "string.text" msgid "Previous heading" -msgstr "" +msgstr "التّرويسة السّابقة" #: workctrl.src msgctxt "" @@ -757,7 +757,7 @@ "STR_IMGBTN_SEL_UP\n" "string.text" msgid "Previous selection" -msgstr "" +msgstr "التّحديد السّابق" #: workctrl.src msgctxt "" @@ -773,7 +773,7 @@ "STR_IMGBTN_MARK_UP\n" "string.text" msgid "Previous Reminder" -msgstr "" +msgstr "التّذكير السّابق" #: workctrl.src msgctxt "" @@ -781,7 +781,7 @@ "STR_IMGBTN_POSTIT_UP\n" "string.text" msgid "Previous Comment" -msgstr "" +msgstr "التّعليق السّابق" #: workctrl.src msgctxt "" @@ -789,7 +789,7 @@ "STR_IMGBTN_SRCH_REP_UP\n" "string.text" msgid "Continue search backwards" -msgstr "" +msgstr "تابع البحث خلفًا" #: workctrl.src msgctxt "" @@ -797,7 +797,7 @@ "STR_IMGBTN_INDEX_ENTRY_UP\n" "string.text" msgid "Previous index entry" -msgstr "" +msgstr "مدخلة الفهرس السّابقة" #: workctrl.src msgctxt "" @@ -805,7 +805,7 @@ "STR_IMGBTN_TBLFML_UP\n" "string.text" msgid "Previous table formula" -msgstr "" +msgstr "صيغة الجدول السّابقة" #: workctrl.src msgctxt "" @@ -813,7 +813,7 @@ "STR_IMGBTN_TBLFML_DOWN\n" "string.text" msgid "Next table formula" -msgstr "" +msgstr "صيغة الجدول التّالية" #: workctrl.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/sw/source/uibase/utlui.po libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/utlui.po --- libreoffice-5.0.2/translations/source/ar/sw/source/uibase/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/source/uibase/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,15 +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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2016-01-13 06:20+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1452666029.000000\n" #: attrdesc.src msgctxt "" @@ -696,7 +698,7 @@ "STR_CALC_SYNTAX\n" "string.text" msgid "** Syntax Error **" -msgstr "" +msgstr "** خطأ صياغيّ **" #: initui.src msgctxt "" @@ -705,7 +707,7 @@ "STR_CALC_ZERODIV\n" "string.text" msgid "** Division by zero **" -msgstr "" +msgstr "** القسمة على الصّفر **" #: initui.src msgctxt "" @@ -714,7 +716,7 @@ "STR_CALC_BRACK\n" "string.text" msgid "** Wrong use of brackets **" -msgstr "" +msgstr "** استخدام خاطئ للأقواس **" #: initui.src msgctxt "" @@ -732,7 +734,7 @@ "STR_CALC_VARNFND\n" "string.text" msgid "** Variable not found **" -msgstr "" +msgstr "** لم يُعثر على المتغيّر **" #: initui.src msgctxt "" @@ -750,7 +752,7 @@ "STR_CALC_WRONGTIME\n" "string.text" msgid "** Wrong time format **" -msgstr "" +msgstr "** نسق الوقت خاطئ **" #: initui.src msgctxt "" @@ -759,7 +761,7 @@ "STR_CALC_DEFAULT\n" "string.text" msgid "** Error **" -msgstr "" +msgstr "** خطأ **" #: initui.src msgctxt "" @@ -768,7 +770,7 @@ "STR_CALC_ERROR\n" "string.text" msgid "** Expression is faulty **" -msgstr "" +msgstr "** بالتعبير علّة **" #: initui.src msgctxt "" @@ -1996,7 +1998,7 @@ "STR_BOOKCTRL_HINT\n" "string.text" msgid "Page number in document. Click to open Navigator window or right-click for bookmark list." -msgstr "" +msgstr "رقم الصّفحة في المستند. انقر لفتح نافذة الملّاح أو انقر باليمين لترى قائمة العلامات." #: statusbar.src msgctxt "" @@ -2004,7 +2006,7 @@ "STR_BOOKCTRL_HINT_EXTENDED\n" "string.text" msgid "Page number in document (Page number on printed document). Click to open Navigator window." -msgstr "" +msgstr "رقم الصّفحة في المستند (رقم الصّفحة في المستند المطبوع). انقر لفتح نافذة الملّاح." #: statusbar.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/ar/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/ar/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-14 11:45+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-24 12:14+0000\n" +"Last-Translator: صفا الفليج \n" "Language-Team: none\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439552739.000000\n" +"X-POOTLE-MTIME: 1453637640.000000\n" #: abstractdialog.ui msgctxt "" @@ -527,7 +527,7 @@ "label\n" "string.text" msgid "_POP3" -msgstr "" +msgstr "_POP3" #: authenticationsettingsdialog.ui msgctxt "" @@ -536,7 +536,7 @@ "label\n" "string.text" msgid "_IMAP" -msgstr "" +msgstr "_IMAP" #: authenticationsettingsdialog.ui msgctxt "" @@ -1022,7 +1022,7 @@ "label\n" "string.text" msgid "Co_untry/state:" -msgstr "ال_دولة\\الولاية:" +msgstr "ال_دّولة/الولاية:" #: businessdatapage.ui msgctxt "" @@ -1058,7 +1058,7 @@ "label\n" "string.text" msgid "Homepage/e-mail:" -msgstr "الموقع\\البريد الإلكتروني:" +msgstr "الصفحة الرئيسية/البريد الإلكتروني:" #: businessdatapage.ui msgctxt "" @@ -1220,7 +1220,7 @@ "secondary_text\n" "string.text" msgid "Predefined labels cannot be overwritten, use another name." -msgstr "" +msgstr "لا يمكن تغيير العناوين المعرّفة مسبقا، استخدم اسما آخر." #: captiondialog.ui msgctxt "" @@ -1286,14 +1286,13 @@ msgstr "ت_طبيق الحدود والظل" #: captionoptions.ui -#, fuzzy msgctxt "" "captionoptions.ui\n" "label2\n" "label\n" "string.text" msgid "Category and Frame Format" -msgstr "تنسيق الفئات والأطر" +msgstr "تنسيق الفئة والإطار" #: captionoptions.ui msgctxt "" @@ -1338,20 +1337,18 @@ "label\n" "string.text" msgid "AutoText - Section" -msgstr "" +msgstr "قسم - نص تلقائي" #: cardformatpage.ui -#, fuzzy msgctxt "" "cardformatpage.ui\n" "label1\n" "label\n" "string.text" msgid "Content" -msgstr "المحتويات" +msgstr "المحتوى" #: cardmediumpage.ui -#, fuzzy msgctxt "" "cardmediumpage.ui\n" "address\n" @@ -1367,7 +1364,7 @@ "label\n" "string.text" msgid "Label text:" -msgstr "" +msgstr "نص العنوان:" #: cardmediumpage.ui #, fuzzy @@ -2691,15 +2688,6 @@ msgid "No data source has been set up yet. You need a data source, such as a database, to supply data (for example, names and addresses) for the fields." msgstr "" -#: documentfontspage.ui -msgctxt "" -"documentfontspage.ui\n" -"embedFonts\n" -"label\n" -"string.text" -msgid "_Embed fonts in the document" -msgstr "خطوط م_ضمّنة في المستند" - #: dropcapspage.ui msgctxt "" "dropcapspage.ui\n" @@ -9846,15 +9834,6 @@ msgstr "فهر_س:" #: optfonttabpage.ui -msgctxt "" -"optfonttabpage.ui\n" -"doconly\n" -"label\n" -"string.text" -msgid "C_urrent document only" -msgstr "ا_لمستند الحالى فقط" - -#: optfonttabpage.ui #, fuzzy msgctxt "" "optfonttabpage.ui\n" @@ -11789,14 +11768,13 @@ msgstr "الشارع:" #: privateuserpage.ui -#, fuzzy msgctxt "" "privateuserpage.ui\n" "countryft\n" "label\n" "string.text" msgid "Co_untry/state:" -msgstr "ال_دولة\\الولاية:" +msgstr "ال_دّولة/الولاية:" #: privateuserpage.ui msgctxt "" @@ -15732,33 +15710,6 @@ #: viewoptionspage.ui msgctxt "" "viewoptionspage.ui\n" -"hscrollbar\n" -"label\n" -"string.text" -msgid "H_orizontal scrollbar" -msgstr "شريط تمرير أف_قي" - -#: viewoptionspage.ui -msgctxt "" -"viewoptionspage.ui\n" -"vscrollbar\n" -"label\n" -"string.text" -msgid "_Vertical scrollbar" -msgstr "شريط تمرير رأ_سي" - -#: viewoptionspage.ui -msgctxt "" -"viewoptionspage.ui\n" -"ruler\n" -"label\n" -"string.text" -msgid "R_uler" -msgstr "_مسطرة" - -#: viewoptionspage.ui -msgctxt "" -"viewoptionspage.ui\n" "smoothscroll\n" "label\n" "string.text" @@ -16119,3 +16070,197 @@ "string.text" msgid "Options" msgstr "خيارات" + +#: sidebarwrap.ui +#, fuzzy +msgctxt "" +"sidebarwrap.ui\n" +"enablecontour\n" +"label\n" +"string.text" +msgid "Enable Contour" +msgstr "ال_حد الخارجي" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"enablecontour\n" +"tooltip_markup\n" +"string.text" +msgid "Click to automatically trim unnecessary parts of the image" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"enablecontour\n" +"tooltip_text\n" +"string.text" +msgid "Click to automatically trim unnecessary parts of the image" +msgstr "" + +#: sidebarwrap.ui +#, fuzzy +msgctxt "" +"sidebarwrap.ui\n" +"editcontour\n" +"label\n" +"string.text" +msgid "Edit Contour" +msgstr "ال_حد الخارجي" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"editcontour\n" +"tooltip_markup\n" +"string.text" +msgid "Edit the trimmed area of the image" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"editcontour\n" +"tooltip_text\n" +"string.text" +msgid "Edit the trimmed area of the image" +msgstr "" + +#: sidebarwrap.ui +#, fuzzy +msgctxt "" +"sidebarwrap.ui\n" +"label1\n" +"label\n" +"string.text" +msgid "Spacing:" +msgstr "التّباعد:" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacingLB\n" +"tooltip_markup\n" +"string.text" +msgid "Set the amount of space between the image and surrounding text" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacingLB\n" +"tooltip_text\n" +"string.text" +msgid "Set the amount of space between the image and surrounding text" +msgstr "" + +#: sidebarwrap.ui +#, fuzzy +msgctxt "" +"sidebarwrap.ui\n" +"customlabel\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "_خصّص..." + +#: sidebarwrap.ui +#, fuzzy +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"0\n" +"stringlist.text" +msgid "None" +msgstr "بلا" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"1\n" +"stringlist.text" +msgid "Extra Small (0.16cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"2\n" +"stringlist.text" +msgid "Small (0.32cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"3\n" +"stringlist.text" +msgid "Small Medium (0.64cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"4\n" +"stringlist.text" +msgid "Medium (0.95cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"5\n" +"stringlist.text" +msgid "Medium Large (1.27cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"6\n" +"stringlist.text" +msgid "Large (1.9cm)" +msgstr "" + +#: sidebarwrap.ui +msgctxt "" +"sidebarwrap.ui\n" +"spacinglist\n" +"7\n" +"stringlist.text" +msgid "Extra Large (2.54cm)" +msgstr "" + +#: tocdialog.ui +msgctxt "" +"tocdialog.ui\n" +"TocDialog\n" +"title\n" +"string.text" +msgid "Insert Index or Table of Contents" +msgstr "" + +#: tocdialog.ui +msgctxt "" +"tocdialog.ui\n" +"index\n" +"label\n" +"string.text" +msgid "Index or Table of Contents" +msgstr "" + +#: tocindexpage.ui +msgctxt "" +"tocindexpage.ui\n" +"label1\n" +"label\n" +"string.text" +msgid "Create Index or Table of Contents" +msgstr "" diff -Nru libreoffice-5.0.2/translations/source/ar/vcl/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ar/vcl/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ar/vcl/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/vcl/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-31 06:29+0000\n" +"PO-Revision-Date: 2015-12-27 17:07+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ar\n" @@ -14,17 +14,16 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438324149.000000\n" +"X-POOTLE-MTIME: 1451236020.000000\n" #: cupspassworddialog.ui -#, fuzzy msgctxt "" "cupspassworddialog.ui\n" "CUPSPasswordDialog\n" "title\n" "string.text" msgid "Authentication Request" -msgstr "طلب الاستيثاق" +msgstr "الاستيثاق مطلوب" #: cupspassworddialog.ui msgctxt "" @@ -297,14 +296,13 @@ msgstr "طباعة بترتيب الصفحات العكسي" #: printdialog.ui -#, fuzzy msgctxt "" "printdialog.ui\n" "label13\n" "label\n" "string.text" msgid "Range and Copies" -msgstr "النطاق والنسخ" +msgstr "النّطاق والنُّسخ" #: printdialog.ui msgctxt "" @@ -862,7 +860,7 @@ "label\n" "string.text" msgid "_Duplex:" -msgstr "" +msgstr "على الوج_هين:" #: printerpaperpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ar/wizards/source/formwizard.po libreoffice-5.0.5~rc2/translations/source/ar/wizards/source/formwizard.po --- libreoffice-5.0.2/translations/source/ar/wizards/source/formwizard.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ar/wizards/source/formwizard.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-07-09 15:22+0000\n" -"Last-Translator: صفا الفليج \n" +"PO-Revision-Date: 2015-12-27 17:05+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436455376.000000\n" +"X-POOTLE-MTIME: 1451235952.000000\n" #: dbwizres.src msgctxt "" @@ -5885,7 +5885,7 @@ "RID_AGENDAWIZARDDIALOG_START +88\n" "string.text" msgid "Classic" -msgstr "" +msgstr "تقليديّ" #: dbwizres.src msgctxt "" @@ -5893,7 +5893,7 @@ "RID_AGENDAWIZARDDIALOG_START +89\n" "string.text" msgid "Colorful" -msgstr "" +msgstr "ملوّن" #: dbwizres.src msgctxt "" @@ -5909,7 +5909,7 @@ "RID_AGENDAWIZARDDIALOG_START +91\n" "string.text" msgid "Green" -msgstr "" +msgstr "أخضر" #: dbwizres.src msgctxt "" @@ -5917,7 +5917,7 @@ "RID_AGENDAWIZARDDIALOG_START +92\n" "string.text" msgid "Grey" -msgstr "" +msgstr "رماديّ" #: dbwizres.src msgctxt "" @@ -5933,7 +5933,7 @@ "RID_AGENDAWIZARDDIALOG_START +94\n" "string.text" msgid "Orange" -msgstr "" +msgstr "برتقاليّ" #: dbwizres.src msgctxt "" @@ -5941,7 +5941,7 @@ "RID_AGENDAWIZARDDIALOG_START +95\n" "string.text" msgid "Red" -msgstr "" +msgstr "أحمر" #: dbwizres.src msgctxt "" @@ -5949,4 +5949,4 @@ "RID_AGENDAWIZARDDIALOG_START +96\n" "string.text" msgid "Simple" -msgstr "" +msgstr "بسيط" diff -Nru libreoffice-5.0.2/translations/source/as/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/as/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/as/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/as/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: Assamese \n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "স্বত্বাধিকাৰ ©২০০০-২০১৪ LibreOffice অৱদানকাৰীসকল।" #: aboutdialog.ui @@ -2547,13 +2547,14 @@ msgstr "যোগ কৰক (_A)..." #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "ডিজিটেল স্বাক্ষৰসমূহৰ বাবে ব্যৱহাৰ কৰিবলে নেটৱাৰ্ক সুৰক্ষা সেৱাসমূহ প্ৰমাণপত্ৰ ডাইৰেকটৰি বাছক।" #: certdialog.ui #, fuzzy @@ -5160,13 +5161,14 @@ msgstr "আঁতৰাওক" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label1\n" "label\n" "string.text" msgid "Assign:" -msgstr "" +msgstr "ধাৰ্য্য কৰক (_A)" #: eventsconfigpage.ui msgctxt "" @@ -5187,13 +5189,14 @@ msgstr "আঁতৰাওক (_R)" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label2\n" "label\n" "string.text" msgid "Save in:" -msgstr "" +msgstr "চিহ্নিত স্থানত সংৰক্ষণ কৰক (_S)" #: eventsconfigpage.ui msgctxt "" @@ -5522,13 +5525,14 @@ msgstr "ফাইল" #: galleryfilespage.ui +#, fuzzy msgctxt "" "galleryfilespage.ui\n" "label1\n" "label\n" "string.text" msgid "_File type:" -msgstr "" +msgstr "শাৰীৰ ধৰণ (_L)" #: galleryfilespage.ui msgctxt "" @@ -6463,13 +6467,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "url_label\n" "label\n" "string.text" msgid "URL:" -msgstr "" +msgstr "URL (_U)" #: hyperlinkdocpage.ui msgctxt "" @@ -6527,22 +6532,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম (_N)" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "বাবে (_o)" #: hyperlinkdocpage.ui msgctxt "" @@ -6663,22 +6670,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম (_N)" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "বাবে (_o)" #: hyperlinkinternetpage.ui msgctxt "" @@ -6763,22 +6772,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম (_N)" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "বাবে (_o)" #: hyperlinkmailpage.ui msgctxt "" @@ -6918,22 +6929,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম (_N)" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "বাবে (_o)" #: hyperlinknewdocpage.ui msgctxt "" @@ -14752,22 +14765,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "স্থান" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "স্থান" #: possizetabpage.ui msgctxt "" @@ -15242,22 +15257,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "স্থান" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "স্থান" #: rotationtabpage.ui msgctxt "" @@ -16386,13 +16403,14 @@ msgstr "" #: swpossizepage.ui +#, fuzzy msgctxt "" "swpossizepage.ui\n" "horitoft\n" "label\n" "string.text" msgid "_to:" -msgstr "" +msgstr "লৈ (_T)" #: swpossizepage.ui #, fuzzy @@ -17720,58 +17738,3 @@ "string.text" msgid "View Layout" msgstr "বিন্যাস দৰ্শন কৰক" - -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "পটভূমি" - -#: aboutdialog.ui -#, fuzzy -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "পৃষ্ঠভূমিৰ ৰং" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/as/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/as/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/as/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/as/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 11:14+0000\n" "Last-Translator: system user <>\n" "Language-Team: Assamese \n" @@ -1568,6 +1568,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "স্বনিৰ্বাচিত" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -2027,13 +2037,14 @@ msgstr "" #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_markup\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "ইয়াত স্থানীয় ফাইল চিস্টেম অথবা ইন্টাৰনেটত উৎস দস্তাবেজৰ URL সুমুৱাওক।" #: datastreams.ui msgctxt "" @@ -3441,13 +3452,14 @@ msgstr "" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "days\n" "label\n" "string.text" msgid "Number of _days:" -msgstr "" +msgstr "পৃষ্ঠাবোৰৰ সংখ্যা (_u):" #: groupbydate.ui msgctxt "" @@ -3941,13 +3953,14 @@ msgstr "আখৰৰ সমষ্টি (_a)" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "লিখনীৰ সীমা নিৰ্দ্ধাৰণকৰ্তা (_x)" #: imoptdialog.ui #, fuzzy @@ -5595,13 +5608,14 @@ msgstr "সকলোবোৰ পেইস্ট কৰক (_P)" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "টেক্সট (_T)" #: pastespecial.ui msgctxt "" @@ -5667,13 +5681,14 @@ msgstr "নিৰ্বাচন" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "টীকা" #: pastespecial.ui msgctxt "" @@ -5812,13 +5827,14 @@ msgstr "বিকল্পসমূহ (_p)..." #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "টীকা" #: pivotfielddialog.ui #, fuzzy @@ -6682,22 +6698,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "পাছৱাৰ্ড (_P)" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "নিশ্চিত কৰক (_C)" #: retypepassworddialog.ui msgctxt "" @@ -8087,13 +8105,14 @@ msgstr "" #: sidebarnumberformat.ui +#, fuzzy msgctxt "" "sidebarnumberformat.ui\n" "category\n" "7\n" "stringlist.text" msgid "Fraction" -msgstr "" +msgstr "ফলন (_F):" #: sidebarnumberformat.ui msgctxt "" @@ -9516,22 +9535,24 @@ msgstr "পৃষ্ঠাবোৰৰ সংখ্যা (_u):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label5\n" "label\n" "string.text" msgid "Number of Cells:" -msgstr "" +msgstr "পৃষ্ঠাবোৰৰ সংখ্যা (_u):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label2\n" "label\n" "string.text" msgid "Number of Sheets:" -msgstr "" +msgstr "পৃষ্ঠাবোৰৰ সংখ্যা (_u):" #: statisticsinfopage.ui msgctxt "" @@ -9588,13 +9609,14 @@ msgstr "বিকল্পসমূহ" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "label1\n" "label\n" "string.text" msgid "Group by:" -msgstr "" +msgstr "চিহ্নিত বস্তু দ্বাৰা দলবদ্ধ" #: subtotalgrppage.ui msgctxt "" @@ -10885,93 +10907,3 @@ "string.text" msgid "Grouped by" msgstr "চিহ্নিত বস্তু দ্বাৰা দলবদ্ধ" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/as/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/as/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/as/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/as/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-11 22:09+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:29+0000\n" "Last-Translator: system user <>\n" "Language-Team: Assamese \n" "Language: as\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431382190.000000\n" +"X-POOTLE-MTIME: 1439551749.000000\n" #: alienwarndialog.ui msgctxt "" @@ -625,13 +625,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "বিষয়সূচী (_C)" #: helpcontrol.ui msgctxt "" @@ -754,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2018,11 +2019,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "পুনৰসংহতি কৰক" diff -Nru libreoffice-5.0.2/translations/source/as/starmath/source.po libreoffice-5.0.5~rc2/translations/source/as/starmath/source.po --- libreoffice-5.0.2/translations/source/as/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/as/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/as/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/as/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/as/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/as/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-10-29 13:40+0000\n" -"Last-Translator: ngoswami \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:42+0000\n" +"Last-Translator: system user <>\n" "Language-Team: as_IN \n" "Language: as\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1414590046.000000\n" +"X-POOTLE-MTIME: 1439552522.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/ast/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ast/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ast/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:13+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000–2014 collaboradores de LibreOffice." #: aboutdialog.ui @@ -2099,13 +2099,14 @@ msgstr "_Posición" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "byft\n" "label\n" "string.text" msgid "_By:" -msgstr "" +msgstr "p_or" #: calloutpage.ui msgctxt "" @@ -2547,13 +2548,14 @@ msgstr "_Amestar..." #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "Seleiciona'l direutoriu del certificáu Network Security Services pa usar pa les robles dixitales." #: certdialog.ui #, fuzzy @@ -5162,13 +5164,14 @@ msgstr "Desaniciar" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label1\n" "label\n" "string.text" msgid "Assign:" -msgstr "" +msgstr "_Asignar" #: eventsconfigpage.ui msgctxt "" @@ -5189,13 +5192,14 @@ msgstr "Desanicia_r" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label2\n" "label\n" "string.text" msgid "Save in:" -msgstr "" +msgstr "_Guardar en" #: eventsconfigpage.ui msgctxt "" @@ -5526,13 +5530,14 @@ msgstr "Ficheru" #: galleryfilespage.ui +#, fuzzy msgctxt "" "galleryfilespage.ui\n" "label1\n" "label\n" "string.text" msgid "_File type:" -msgstr "" +msgstr "Tipu de _llinia" #: galleryfilespage.ui msgctxt "" @@ -6468,13 +6473,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "url_label\n" "label\n" "string.text" msgid "URL:" -msgstr "" +msgstr "_URL" #: hyperlinkdocpage.ui msgctxt "" @@ -6532,22 +6538,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Nome:" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "P_a" #: hyperlinkdocpage.ui msgctxt "" @@ -6668,22 +6676,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Nome:" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "P_a" #: hyperlinkinternetpage.ui msgctxt "" @@ -6768,22 +6778,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Nome:" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "P_a" #: hyperlinkmailpage.ui msgctxt "" @@ -6923,22 +6935,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Nome:" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "P_a" #: hyperlinknewdocpage.ui msgctxt "" @@ -17734,58 +17748,3 @@ "string.text" msgid "View Layout" msgstr "Vista de diseñu" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "Color de fondu" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/ast/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/ast/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/ast/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-05-11 15:07+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 11:39+0000\n" "Last-Translator: system user <>\n" "Language-Team: Softastur \n" "Language: ast\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Poedit-SourceCharset: utf-8\n" -"X-POOTLE-MTIME: 1431356859.000000\n" +"X-POOTLE-MTIME: 1439465974.000000\n" #: 01010000.xhp msgctxt "" @@ -11024,12 +11024,13 @@ msgstr "Mou gráficu" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Amuesa'l mapa d'imaxes pa poder faer clic y editar les zones actives." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/ast/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/ast/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/ast/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2014-09-21 09:04+0000\n" -"Last-Translator: serval2412 \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 12:49+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Softastur \n" "Language: ast\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411290267.000000\n" +"X-POOTLE-MTIME: 1439470185.000000\n" #: 01120000.xhp msgctxt "" @@ -42,12 +42,13 @@ msgstr "Amuesa la vista preliminar de la páxina a imprentar o zarra la ventana correspondiente." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Utilice los iconos de la barra Vista preliminar de páxina pa movese poles páxines del documentu o pa imprimilo." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "Usté nun va poder editar el documentu mientres esti na vista preliminar." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Pa salir de la vista preliminar de páxina, faiga clic nel botónZarrar la vista preliminar." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Empecipia l'asistente pa Combinar correspondencia, que lu ayudar a imprentar y guardar cartes modelo." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Mientres la impresión, la información de la base de datos troca los campos correspondientes de la base de datos (marcadores de posición). Va Atopar información adicional sobre l'inxertamientu de campos de bases de datos, na llingüeta Base de datos del menú Inxertar - Campos - Otros" #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "Anterior" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Salta al elementu anterior nel documentu. Pa especificar el tipu d'elementu al que deseye saltar, faiga clic nel iconu Navegación y, de siguío, faiga clic nuna categoría d'elementu, por exemplu \"Gráficos\". Salta al elementu anterior del documentu. Pa especificar el tipu d'elementu al que deseye saltar, faiga clic nel iconu Navegación y, a darréu, faiga clic nuna categoría del elementu, por exemplu \"Gráficos\"." #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "Siguiente" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Salta al elementu siguiente nel documentu. Pa especificar el tipu d'elementu al que deseye saltar, faiga clic nel iconu Navegación y, de siguío, faiga clic nuna categoría d'elementu, por exemplu \"Gráficu\". Salta al elementu siguiente del documentu. Pa especificar el tipu d'elementu al que deseye saltar, faiga clic nel iconu Navegación y, de siguío, faiga clic nuna categoría d'elementu, por exemplu \"Gráficu\"." #: 02110000.xhp msgctxt "" @@ -3685,13 +3690,14 @@ msgstr "Marques" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Amuesa o anubre los avisiegos de los campos nel documentu, incluyíos los espacios protexíos, les separaciones manuales, los índices y les notes al pie." #: 03080000.xhp msgctxt "" @@ -4171,13 +4177,14 @@ msgstr "seiciones;inxertar por aciu DDEDDE;comandu pa inxertar seiciones" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Seición" #: 04020100.xhp msgctxt "" @@ -4198,13 +4205,14 @@ msgstr "Nueva seición" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Escriba un nome pa la nueva seición. De forma predeterminada, $[officename] asigna automáticamente el nome \"Seición X\" a les seiciones nueves, onde X ye un númberu consecutivu." #: 04020100.xhp msgctxt "" @@ -4225,13 +4233,14 @@ msgstr "Link" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Inxerta'l conteníu d'otru documentu o seición d'otru documentu na seición actual." #: 04020100.xhp msgctxt "" @@ -4243,13 +4252,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Crea un enllaz DDE. Escueya esti caxellu de verificación y, de siguío, escriba'l comandu DDE que deseye. La opción DDE namái ta disponible si'l caxellu de verificación Enllaz ta escoyida." #: 04020100.xhp msgctxt "" @@ -4270,22 +4280,24 @@ msgstr "Por exemplu, pa inxertar una seición llamada \"Seición1\" dende un documentu de testu abc.sxw de $[officename] como un enllaz DDE, use la orde: \"soffice x:\\abc.sxw Seición1\". Pa inxertar el conteníu de la primer caxella dende una fueya de cálculu de MS Excel llamada \"abc.xls\", use la orde: \"excel x:\\[abc.xls]Fueya1 z1s1\". Pue copiar tamién los elementos que deseye inxertar como enllaz DDE y de siguío Editar - Pegáu especial. Pue ver el comandu DDE pal enllaz, escoyendo'l conteníu y faciendo clic en Editar - Campos." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Nome de ficheru / Comandu DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Introduza la ruta y el nome del ficheru que deseye inxertar, o faiga clic nel botón de navegación (...) p'atopalo.Si'l caxellu de verificación DDE ta escoyida, especifique'l comandu DDE que deseye utilizar. " #: 04020100.xhp msgctxt "" @@ -4414,13 +4426,14 @@ msgstr "Anubrir" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Oculta y evita que la seición escoyida imprímase. Los componentes d'una seición oculta apaecen en color gris nel Navegador. Si dexa'l punteru del mur sobre un componente ocultu nel Navegador, va amosase l'Ayuda emerxente \"ocultu\"." #: 04020100.xhp msgctxt "" @@ -4441,13 +4454,14 @@ msgstr "Con condición" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Escriba la condición que se debe cumplir pa anubrir la seición. Una condición ye una espresión lóxica, como \"SALUDU EQ Sr.\". Por exemplu, si usa la carta en serie impresión en serie pa definir un campu de la base de datos llamáu \"Saludu\" que contenga \"Sr.\", \"Sra. o \"Dama o caballeru\", pue especificar qu'una seición namái s'imprima si'l saludu ye \"Sr.\"." #: 04020100.xhp msgctxt "" @@ -10181,13 +10195,14 @@ msgstr "P'amosar testu condicional basáu nel númberu de páxines:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Escueya Inxertar - Campos - Otros y de siguío calque la llingüeta Funciones." #: 04090200.xhp msgctxt "" @@ -10244,13 +10259,14 @@ msgstr "P'amosar testu condicional basáu nuna variable definida pol usuariu." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Escueya Inxertar - Campos - Otros y de siguío calque la llingüeta Variables." #: 04090200.xhp msgctxt "" @@ -10361,13 +10377,14 @@ msgstr "Na primer parte d'esti exemplu inxerta un espaciu ente'l campu \"Nome\" y \"Apellíu\" nun documentu, ente que na segunda parte inxertar testu según el conteníu d'un campu. Esti exemplu rique que se rexistre un orixe de datos de direiciones con $[officename]." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Escueya Inxertar - Campos - Otros y de siguío calque la llingüeta Base de datos." #: 04090200.xhp msgctxt "" @@ -16145,15 +16162,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Esta ficha nun ta disponible na vista Diseñu d'impresión." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16608,22 +16616,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Formatea'l tamañu, la posición y otres propiedaes de la imaxe escoyida." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Tamién pue camudar delles de les propiedaes de la imaxe escoyida con combinaciones de tecles." #: 05060000.xhp #, fuzzy @@ -17053,13 +17063,14 @@ msgstr "Invierte los valores d'alliniación horizontal nes páxines pares." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Tamién pue usar la opción de voltiar imaxes p'axustar la distribución de los oxetos nes páxines pares ya impares." #: 05060100.xhp msgctxt "" @@ -18171,13 +18182,14 @@ msgstr "Axuste" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Especifique les opciones de voltiar y enllazar na imaxe escoyida." #: 05060300.xhp msgctxt "" @@ -18198,13 +18210,14 @@ msgstr "Verticalmente" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Voltia verticalmente la imaxe escoyida." #: 05060300.xhp msgctxt "" @@ -18216,13 +18229,14 @@ msgstr "horizontal, sobre" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Voltia horizontalmente la imaxe escoyida." #: 05060300.xhp msgctxt "" @@ -18234,13 +18248,14 @@ msgstr "En toles páxines" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Voltia horizontalmente la imaxe escoyida en toles páxines." #: 05060300.xhp msgctxt "" @@ -18252,13 +18267,14 @@ msgstr "nes páxines esquierdes" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Voltia horizontalmente la imaxe escoyida namái nes páxines pares." #: 05060300.xhp msgctxt "" @@ -18270,13 +18286,14 @@ msgstr "Nes páxines dereches" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Voltia horizontalmente la imaxe escoyida namái nes páxines impares." #: 05060300.xhp msgctxt "" @@ -22976,13 +22993,14 @@ msgstr "Abre un diálogu que dexa aceutar o refugar los cambeos de correición automática. Tamién dexa ver los cambeos realizaos por un autor concretu o nuna fecha específica." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Aceutar o refugar cambeos de la Correición automáticu, llingüeta Filtru" #: 05170000.xhp msgctxt "" @@ -23580,13 +23598,14 @@ msgstr "Pa inxertar un guión (protexíu) de non separtamientu directamente nel documentu, faiga clic sobre la pallabra que deseye dixebrar y, de siguío, prima \"Mayúscules\" + Comandu Control + el signu menos (-)." #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Pa anubrir los guiones personalizaos, escueya %PRODUCTNAME - PreferenciesFerramientes - Opciones - %PRODUCTNAME Writer - Asistencia al formateo y desmarque el caxelluSepartamientu manual" #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ast/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ast/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ast/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-11 22:46+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 10:58+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ast\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431384384.000000\n" +"X-POOTLE-MTIME: 1439549917.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1577,6 +1577,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalizáu" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ast/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ast/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ast/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-11 22:50+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:14+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ast\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431384642.000000\n" +"X-POOTLE-MTIME: 1439550868.000000\n" #: alienwarndialog.ui msgctxt "" @@ -758,7 +758,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ast/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ast/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ast/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ast/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-09-27 19:24+0000\n" -"Last-Translator: astur \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:29+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ast\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411845878.000000\n" +"X-POOTLE-MTIME: 1439551743.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/be/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/be/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/be/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/be/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:13+0000\n" "Last-Translator: system user <>\n" "Language-Team: Belarusian \n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -881,13 +881,14 @@ msgstr "Адносна" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Шырыня:" #: areatabpage.ui #, fuzzy @@ -1544,13 +1545,14 @@ msgstr "" #: bitmaptabpage.ui +#, fuzzy msgctxt "" "bitmaptabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "Колер фону" #: bitmaptabpage.ui #, fuzzy @@ -2039,31 +2041,34 @@ msgstr "" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "CalloutDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: calloutdialog.ui msgctxt "" @@ -2565,13 +2570,14 @@ msgstr "Дадаць..." #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "Выберыце каталог сертыфікатаў службы Network Security Service, якім будзеце карыстацца для лічбавых подпісаў." #: certdialog.ui #, fuzzy @@ -5201,13 +5207,14 @@ msgstr "Сцерці" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label2\n" "label\n" "string.text" msgid "Save in:" -msgstr "" +msgstr "Запісаць у" #: eventsconfigpage.ui msgctxt "" @@ -6538,22 +6545,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Назва" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Для" #: hyperlinkdocpage.ui msgctxt "" @@ -6673,22 +6682,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Назва" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Для" #: hyperlinkinternetpage.ui msgctxt "" @@ -6772,22 +6783,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Назва" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Для" #: hyperlinkmailpage.ui msgctxt "" @@ -6926,22 +6939,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Назва" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Для" #: hyperlinknewdocpage.ui msgctxt "" @@ -7738,22 +7753,24 @@ msgstr "Штрыхі" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Стыль" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "Colo_r:" -msgstr "" +msgstr "Колер" #: linetabpage.ui msgctxt "" @@ -7802,13 +7819,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Шырыня:" #: linetabpage.ui #, fuzzy @@ -7821,13 +7839,14 @@ msgstr "У цэнтры" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Шырыня:" #: linetabpage.ui #, fuzzy @@ -7894,13 +7913,14 @@ msgstr "Выбраць..." #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Шырыня:" #: linetabpage.ui #, fuzzy @@ -9504,13 +9524,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "indent\n" "label\n" "string.text" msgid "Indent:" -msgstr "" +msgstr "Водступ" #: numberingpositionpage.ui msgctxt "" @@ -10636,13 +10657,14 @@ msgstr "Шрыфты" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Памер" #: optfontspage.ui msgctxt "" @@ -14708,31 +14730,34 @@ msgstr "Шчыльны" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "PositionAndSizeDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Месца і водступ" #: positionsizedialog.ui msgctxt "" @@ -14753,22 +14778,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Месца" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Месца" #: possizetabpage.ui msgctxt "" @@ -14789,13 +14816,14 @@ msgstr "Месца" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Шырыня:" #: possizetabpage.ui #, fuzzy @@ -15244,22 +15272,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Месца" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Месца" #: rotationtabpage.ui msgctxt "" @@ -15690,13 +15720,14 @@ msgstr "" #: shadowtabpage.ui +#, fuzzy msgctxt "" "shadowtabpage.ui\n" "FT_DISTANCE\n" "label\n" "string.text" msgid "_Distance:" -msgstr "" +msgstr "Адлегласць" #: shadowtabpage.ui #, fuzzy @@ -16390,13 +16421,14 @@ msgstr "" #: swpossizepage.ui +#, fuzzy msgctxt "" "swpossizepage.ui\n" "horitoft\n" "label\n" "string.text" msgid "_to:" -msgstr "" +msgstr "Да" #: swpossizepage.ui #, fuzzy @@ -17168,13 +17200,14 @@ msgstr "Градыент" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "FT_TRGR_TYPE\n" "label\n" "string.text" msgid "Ty_pe:" -msgstr "" +msgstr "Тып" #: transparencytabpage.ui #, fuzzy @@ -17725,59 +17758,3 @@ "string.text" msgid "View Layout" msgstr "Выклад паказу" - -#: aboutdialog.ui -#, fuzzy -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "Колер фону" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/be/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/be/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/be/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/be/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 11:00+0000\n" "Last-Translator: system user <>\n" "Language-Team: \n" @@ -1288,13 +1288,14 @@ msgstr "Аўтаматычна" #: databaroptions.ui +#, fuzzy msgctxt "" "databaroptions.ui\n" "min\n" "1\n" "stringlist.text" msgid "Minimum" -msgstr "" +msgstr "Максімальнае" #: databaroptions.ui #, fuzzy @@ -1354,13 +1355,14 @@ msgstr "Аўтаматычна" #: databaroptions.ui +#, fuzzy msgctxt "" "databaroptions.ui\n" "max\n" "1\n" "stringlist.text" msgid "Minimum" -msgstr "" +msgstr "Максімальнае" #: databaroptions.ui #, fuzzy @@ -1573,6 +1575,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Па-свойму" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -8493,13 +8505,14 @@ msgstr "Чыё" #: solverdlg.ui +#, fuzzy msgctxt "" "solverdlg.ui\n" "min\n" "label\n" "string.text" msgid "Minim_um" -msgstr "" +msgstr "Максімальнае" #: solverdlg.ui #, fuzzy @@ -10737,13 +10750,14 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "minft\n" "label\n" "string.text" msgid "_Minimum:" -msgstr "" +msgstr "Максімальнае" #: validationcriteriapage.ui #, fuzzy diff -Nru libreoffice-5.0.2/translations/source/be/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/be/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/be/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/be/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-11 23:25+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:16+0000\n" "Last-Translator: system user <>\n" "Language-Team: \n" "Language: be\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431386740.000000\n" +"X-POOTLE-MTIME: 1439550962.000000\n" #: alienwarndialog.ui msgctxt "" @@ -654,13 +654,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "Заўвагі" #: helpcontrol.ui msgctxt "" @@ -785,7 +786,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2073,12 +2074,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -#, fuzzy -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Да пачатковага" diff -Nru libreoffice-5.0.2/translations/source/be/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/be/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/be/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/be/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: stbctrls\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: 2013-08-26 09:02+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:26+0000\n" +"Last-Translator: system user <>\n" "Language-Team: \n" "Language: be\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377507734.000000\n" +"X-POOTLE-MTIME: 1439551590.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/bg/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bg/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bg/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-26 14:40+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 19:14+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: .\n" "Language: bg\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1435329621.000000\n" +"X-POOTLE-MTIME: 1452280483.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,8 +185,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "© 2000 - 2015 сътрудниците на LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "© 2000–2016 сътрудниците на LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bg/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/bg/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/bg/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.000000000 +0000 @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441268133.000000\n" +"X-POOTLE-MTIME: 1441268134.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/scalc/01.po libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/scalc/01.po --- libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/scalc/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/scalc/01.po 2016-02-04 16:41:28.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-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-26 10:41+0000\n" +"PO-Revision-Date: 2015-12-12 09:31+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: LibreOffice на български\n" "Language: bg\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1435315317.000000\n" +"X-POOTLE-MTIME: 1449912702.000000\n" #: 01120000.xhp msgctxt "" @@ -65434,7 +65434,7 @@ "par_id7869502\n" "help.text" msgid "The initial variable values are inserted in a rectangular cell range that you enter in the By changing cells box." -msgstr "Началните стойности на променливите се вмъкват в правоъгълна област от клетки, която въвеждате в полето Променяйки клетките box." +msgstr "Началните стойности на променливите се вмъкват в правоъгълна област от клетки, която въвеждате в полето Променяйки клетките." #: solver.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-06-27 14:01+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-20 14:57+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: .\n" "Language: bg\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1435413682.000000\n" +"X-POOTLE-MTIME: 1453301839.000000\n" #: 01010000.xhp msgctxt "" @@ -11020,8 +11020,8 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." -msgstr "Показва чувствителното изображение, така че да можете да щракате върху чувствителните области и да ги редактирате." +msgid "Displays the image map, so that you can click and edit the hotspots." +msgstr "Показва чувствителното изображение, така че да можете да щракате върху чувствителните области и да ги редактирате." #: 02220000.xhp msgctxt "" @@ -12565,7 +12565,7 @@ "32\n" "help.text" msgid "Enter a short name for the record. The short name appears in the Identifier column in the list of records." -msgstr "Въведете късо име за записа. То се показва в колоната Идентификатор в списъка със записи." +msgstr "Въведете кратко име за записа. То се показва в колоната Идентификатор в списъка със записи." #: 02250000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/bg/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-09-01 15:31+0000\n" -"Last-Translator: Christian Lohmaier \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-20 14:57+0000\n" +"Last-Translator: Mihail Balabanov \n" "Language-Team: .\n" "Language: bg\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1441121494.000000\n" +"X-POOTLE-MTIME: 1453301853.000000\n" #: 01120000.xhp msgctxt "" @@ -4175,8 +4175,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "Раздел" +msgid "Section" +msgstr "Раздел" #: 04020100.xhp msgctxt "" @@ -13190,7 +13190,7 @@ "4\n" "help.text" msgid "Enter a short name and select the appropriate source type. You can now enter data into the other fields belonging for the entry." -msgstr "Въведете късо име и изберете подходящ тип на източник. Сега можете да въведете данни в другите полета от записа." +msgstr "Въведете кратко име и изберете подходящ тип на източник. Сега можете да въведете данни в другите полета от записа." #: 04120229.xhp msgctxt "" @@ -13208,7 +13208,7 @@ "6\n" "help.text" msgid "Displays the short name for the bibliography entry. You can only enter a name here if you are creating a new bibliography entry." -msgstr "Показва късото име на библиографския запис. Тук можете да въвеждате име само ако създавате нов библиографски запис." +msgstr "Показва краткото име на библиографския запис. Тук можете да въвеждате име само ако създавате нов библиографски запис." #: 04120229.xhp msgctxt "" @@ -13609,7 +13609,7 @@ "6\n" "help.text" msgid "Select the short name of the bibliography record that you want to insert." -msgstr "Изберете късото име на библиографския запис, който искате да вмъкнете." +msgstr "Изберете краткото име на библиографския запис, който искате да вмъкнете." #: 04120300.xhp msgctxt "" @@ -13627,7 +13627,7 @@ "8\n" "help.text" msgid "If available, the author and the full title of the selected short name are displayed in this area." -msgstr "Ако е възможно, авторът и пълното име на избраното късо име се показват в тази област." +msgstr "Ако са налични, авторът и пълното име на избраното кратко име се показват в тази област." #: 04120300.xhp msgctxt "" @@ -16143,15 +16143,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Този раздел не е наличен в изгледа Оформление за печат." - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/bg/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/bg/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/bg/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-06-16 15:16+0000\n" +"PO-Revision-Date: 2015-11-18 09:37+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: LANGUAGE \n" "Language: bg\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434467763.000000\n" +"X-POOTLE-MTIME: 1447839460.000000\n" #: ActionTe.ulf msgctxt "" @@ -2902,7 +2902,7 @@ "OOO_ERROR_15\n" "LngText.text" msgid "Time remaining: {[1] minutes }{[2] seconds}" -msgstr "Оставащо време: {[1] минути и }{[2] секунди}" +msgstr "Оставащо време: {[1] мин }{[2] сек}" #: Error.ulf msgctxt "" @@ -3182,7 +3182,7 @@ "OOO_ERROR_50\n" "LngText.text" msgid "[2] is not a valid short file name." -msgstr "[2] не е валидно късо име на файл." +msgstr "[2] не е валидно кратко име на файл." #: Error.ulf msgctxt "" @@ -4374,7 +4374,7 @@ "OOO_UITEXT_44\n" "LngText.text" msgid "Time remaining: {[1] min }[2] sec" -msgstr "оставащо време: {[1] мин. и }[2] сек." +msgstr "Оставащо време: {[1] мин }[2] сек" #: UIText.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bg/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/bg/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/bg/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-27 14:34+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 19:14+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: none\n" "Language: bg\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435415683.000000\n" +"X-POOTLE-MTIME: 1452280487.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "Минималната стойност трябва да е по-малка от максималната." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "По избор" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -8246,7 +8255,7 @@ "label\n" "string.text" msgid "V_alue" -msgstr "С_ойност" +msgstr "Стойност" #: solverdlg.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bg/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bg/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bg/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-25 23:22+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 19:15+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: none\n" "Language: bg\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435274531.000000\n" +"X-POOTLE-MTIME: 1452280508.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "Всички споменати запазени и регистрирани марки са собственост на съответните страни.\n" "\n" -"© 2000–2015 разработчиците на LibreOffice. Всички права запазени.\n" +"© 2000–2016 разработчиците на LibreOffice. Всички права запазени.\n" "\n" "Продуктът е създаден от %OOOVENDOR на базата на OpenOffice.org, © 2000–2011 Oracle и/или партньорите ѝ. %OOOVENDOR благодари на всички членове на общността, за подробности вижте http://www.libreoffice.org/ ." diff -Nru libreoffice-5.0.2/translations/source/bg/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/bg/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/bg/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-15 23:41+0000\n" -"Last-Translator: Mihail \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:31+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: bg\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431733275.000000\n" +"X-POOTLE-MTIME: 1439551885.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Настройване на мащаба" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/bg/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/bg/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/bg/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/bg/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/bg/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/bg/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bg/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-07 07:58+0000\n" +"PO-Revision-Date: 2015-11-18 09:37+0000\n" "Last-Translator: Mihail Balabanov \n" "Language-Team: none\n" "Language: bg\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438934329.000000\n" +"X-POOTLE-MTIME: 1447839465.000000\n" #: abstractdialog.ui msgctxt "" @@ -887,7 +887,7 @@ "label\n" "string.text" msgid "Short name" -msgstr "Късо име" +msgstr "Кратко име" #: bibliographyentry.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bn/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bn/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bn/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:10+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "প্রতিস্থাপন (~R)" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "প্রস্থ" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "প্রস্থ" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "উচ্চতা" #: borderpage.ui msgctxt "" @@ -4331,13 +4334,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "উচ্চতা" #: distributionpage.ui #, fuzzy @@ -6510,13 +6514,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম" #: hyperlinkdocpage.ui msgctxt "" @@ -6645,13 +6650,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম" #: hyperlinkinternetpage.ui msgctxt "" @@ -6744,13 +6750,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম" #: hyperlinkmailpage.ui msgctxt "" @@ -6897,13 +6904,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "নাম" #: hyperlinknewdocpage.ui msgctxt "" @@ -7725,13 +7733,14 @@ msgstr "ড্যাশ" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "শৈলী" #: linetabpage.ui msgctxt "" @@ -7789,13 +7798,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "প্রস্থ" #: linetabpage.ui msgctxt "" @@ -7807,13 +7817,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "প্রস্থ" #: linetabpage.ui msgctxt "" @@ -7879,13 +7890,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "প্রস্থ" #: linetabpage.ui msgctxt "" @@ -10597,13 +10609,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "আকার" #: optfontspage.ui #, fuzzy @@ -13233,13 +13246,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "উচ্চতা" #: pageformatpage.ui msgctxt "" @@ -13632,13 +13646,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "উচ্চতা" #: paragalignpage.ui msgctxt "" @@ -14665,22 +14680,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "অবস্থান" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "অবস্থান" #: possizetabpage.ui msgctxt "" @@ -14702,13 +14719,14 @@ msgstr "অবস্থান" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "প্রস্থ" #: possizetabpage.ui #, fuzzy @@ -15155,22 +15173,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "অবস্থান" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "অবস্থান" #: rotationtabpage.ui msgctxt "" @@ -17635,57 +17655,3 @@ "string.text" msgid "View Layout" msgstr "বহির্বিন্যাস প্রদর্শন" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/bn/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/bn/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/bn/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 11:37+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11031,12 +11031,13 @@ msgstr "গ্রাফিক প্রদর্শন" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "চিত্র ম্যাপ প্রদর্শন করে, ফলে আপনি হটস্পটে ক্লিক এবং সম্পাদনা করতে পারেন।" #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/bn/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/bn/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/bn/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 12:50+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "মুদ্রিত পৃষ্ঠার প্রাকদর্শন দেখায় অথবা প্রাকদর্শন বন্ধ করে।" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "নথির পৃষ্ঠায় স্ক্রল করতে বা মুদ্রণ করতে পৃষ্ঠা প্রাকদর্শন বার আইকন ব্যবহার করুন।" #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "পৃষ্ঠা প্রাকদর্শনে থাকার সময় আপনি আপনার নথি সম্পাদনা করতে পারবেন না।" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "পৃষ্ঠা প্রাকদর্শন প্রস্থান করতে, প্রাকদর্শন বন্ধবোতামে ক্লিক করুন।" #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "বার্তা একত্রীকরণ ডায়ালগ খুলুন, যা আপনাকে চিঠি থেকে মুদ্রণ এবং সংরক্ষণ করতে সহায়তা করবে।" #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "মুদ্রণের সময়, ডাটাবেস তথ্য সঙ্গতিপূর্ণ ডাটাবেস ক্ষেত্রগুলোকে (স্থানধারক) প্রতিস্থাপন করে। ডাটাবেস ক্ষেত্র সন্নিবেশ সম্পর্কিত আরও তথ্যের জন্য, সন্নিবেশ - ক্ষেত্র - অন্যান্য অধীনে ডাটাবেস ট্যাব পৃষ্ঠা দেখুন।" #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "পূর্ববর্তী" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "নথির পূর্ববর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন, এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।নথির পূর্ববর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন,এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।" #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "পরবর্তী" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "নথির পরবর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমনআইকনে ক্লিক করুন, এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।নথির পরবর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন,এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।" #: 02110000.xhp msgctxt "" @@ -2917,12 +2922,13 @@ msgstr "নথিতে একই ধরনের পূর্ববতী ক্ষেত্রে যাওয়া হয়। এই বোতামটি শুধু তখনই সক্রিয় হয় যখন একটি নথিতে একই ধরনের একাধিক ক্ষেত্র ধারণ করে।" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02140000.xhp msgctxt "" @@ -2952,12 +2958,13 @@ msgstr "নথিতে একই ধরনের পরবর্তী ক্ষেত্রে যাওয়া হয়। এই বোতামটি শুধু তখনই সক্রিয় হয় যখন একটি নথিতে একই ধরনের একাধিক ক্ষেত্র ধারণ করে।" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02140000.xhp msgctxt "" @@ -3139,12 +3146,13 @@ msgstr "নথিতে পূর্ববর্তী পাদটীকা অথবা প্রান্তটীকা নোঙ্গর সরানো হয়।" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02150000.xhp msgctxt "" @@ -3174,12 +3182,13 @@ msgstr "নথিতে পরবর্তী পাদটীকা অথবা প্রান্তটীকা নোঙ্গর সরানো হয়।" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02150000.xhp msgctxt "" @@ -3379,12 +3388,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3414,12 +3424,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3484,12 +3495,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3685,13 +3697,14 @@ msgstr "ক্ষেত্র ছায়াকরণ" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr " আপনার নথিতে বিভাজক নয় এমন ফাঁকা স্থান, স্বনির্ধারিত হাইফেন, সূচিপত্র, পাদটীকা সহ ক্ষেত্র ছায়াকরণ দেখানো বা আড়াল করা হয়।" #: 03080000.xhp msgctxt "" @@ -4171,13 +4184,14 @@ msgstr "sections;inserting sections by DDEDDE; command for inserting sections" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "অংশ" #: 04020100.xhp msgctxt "" @@ -4198,13 +4212,14 @@ msgstr "নতুন অংশ" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "নতুন শাখার জন্য একটি নাম টাইপ করুন পূর্ব নির্ধারিতক্রমে, $[officename] স্বয়ংক্রিয়ভাবে \"শাখা X\" নামটি নতুন শাখায় বরাদ্দ করুন, যেখানে X একটি পর্যায়ক্রমিক সংখ্যা।" #: 04020100.xhp msgctxt "" @@ -4225,13 +4240,14 @@ msgstr "লিংক" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "বর্তমান নথিতে অন্য নথি হতে বিষয়বস্তু বা অংশবিশেষ সন্নিবেশ করানো হয়।" #: 04020100.xhp msgctxt "" @@ -4243,13 +4259,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "একটি DDE লিংক তৈরি করা হয়। এই চেক বাক্সটি নির্বাচন করুন, অতঃপর আপনার ব্যবহার করতে চাওয়া DDE কমান্ড দিন। DDE অপশনটি পুনরায় পাওয়া যাবে যদি লিংক চেক বাক্স নির্বাচিত থাকে।" #: 04020100.xhp msgctxt "" @@ -4270,22 +4287,24 @@ msgstr "উদাহরণস্বরূপ, $[officename] নথি abc.sxw হতে \"Section1\" নামের একটি বিভাগকে DDE লিংক হিসেবে সন্নিবেশ করতে, \"soffice x:\\\\abc.sxw Section1\" এই কমান্ডটি ব্যবহার করুন। \"abc.xls\" নামের একটি MS এক্সেল স্প্রেডশীট হতে প্রথম ঘরের বিষয়বস্তু সন্নিবেশ করতে, \"excel x:\\\\[abc.xls]Sheet1 z1s1\" এই কমান্ডটি ব্যবহার করুন। সম্পাদনা - বিশেষ প্রতিলেপন নির্বাচন করে আপনি উপাদানগুলোকে অনুলিপি করে DDE লিংক হিসেবে সন্নিবেশ করতে পারেন। আপনি বিষয়বস্তু নির্বাচন করে এবং সম্পাদনা - ক্ষেত্র নির্বাচন করে, লিংকের জন্য DDE কমান্ড দেখতে পারেন।" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "ফাইলের নাম / DDE কমান্ড " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "পথ এবং ফাইলের জন্য ফাইলের নাম সন্নিবেশ করান, অথবা ফাইল চিহ্নিত করতে ব্রাউজ বোতামে (...) ক্লিক করুন।যদি DDE পরীক্ষন বাক্স নির্বাচিত থাকে, কমান্ড সন্নিবেশ করান যা আপনি ব্যবহার করতে চান। " #: 04020100.xhp msgctxt "" @@ -4414,13 +4433,14 @@ msgstr "লুকিয়ে রাখুন" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "নির্বাচিত শাখা মুদ্রণ হওয়া থেকে বাধা দিন এবং লুকিয়ে রাখুন। লুকায়িত শাখার বিষয়বস্তু ন্যাভিগেটরে ধূসর হয়ে আবির্ভূত হবে। যখন আপনি ন্যাভিগেটরের লুকায়িত উপাদানের উপর আপনার মাউস সূচক রাখবেন, সহায়তা পরামর্শ \"লুকায়িত\" প্রদর্শিত হবে।" #: 04020100.xhp msgctxt "" @@ -4441,13 +4461,14 @@ msgstr "শর্ত সহ" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "একটি শর্ত সন্নিবেশ করান যা একটি শাখা লুকাতে মিলতে হবে। একটি শর্ত হলো যৌক্তিক অভিব্যক্তি, যেমন \"SALUTATION EQ Mr.\"। উদাহরণস্বরূপ, যদি আপনি ডাটাবেস ক্ষেত্র \" অভিবাদন\" যা \"Mr.\", \"Ms.\", অথবা \"জনাব অথবা জনাবা\" সংজ্ঞায়িত করতেবার্তা একত্রিতকরণ ফর্ম পত্র বৈশিষ্ট্য ব্যবহার করেন, আপনি এরপর সুনির্দিষ্ট ভাবে উল্লেখ করতে পারবেন যে একটি শাখা কেবলমাত্র তখনই মুদ্রিত হবে যদি অভিবাদন \"Mr.\" হয়।" #: 04020100.xhp msgctxt "" @@ -10182,13 +10203,14 @@ msgstr "পৃষ্ঠার সংখ্যার উপর ভিত্তি করে শর্তসাপেক্ষ পাঠ্যের প্রদর্শনের জন্য:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর ফাংশন ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -10245,13 +10267,14 @@ msgstr "একটি ব্যবহারকারী-সংজ্ঞায়িত চলকের উপর ভিত্তি করে শর্তসাপেক্ষ পাঠ্য প্রদর্শন করতে" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর চলক ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -10362,13 +10385,14 @@ msgstr "এই উদাহরণের প্রথম অংশ নথিতে \"First Name\" এবং \"Last Name\" এর মাঝে একটি ফাঁকা স্থান সন্নিবেশ করায়, এবং দ্বিতীয় অংশ ক্ষেত্রের বিষয়স্তুর উপর নির্ভর করে পাঠ্য সন্নিবেশ করায়। এই উদাহরণটি প্রয়োজন বোধ করে যে একটি ঠিকানা ডাটা উৎ‍স $[officename] এর সঙ্গে নিবন্ধন করা হয়।" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর ডাটাবেস ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -13935,13 +13959,14 @@ msgstr "নাম" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "হাইপারলিংকের জন্য একটি নাম সন্নিবেশ করান।" #: 04150000.xhp msgctxt "" @@ -14025,13 +14050,14 @@ msgstr "শিরোনাম" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "হাইপারলিংকের জন্য একটি নাম সন্নিবেশ করান।" #: 04150000.xhp msgctxt "" @@ -16148,15 +16174,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "এই ট্যাবটি মুদ্রণ বহির্বিন্যাস প্রদর্শনে বিদ্যমান নয়।" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16611,22 +16628,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "নির্বাচিত গ্রাফিক্সের আকার, অবস্থান, এবং অন্যান্য বৈশিষ্ট্যাবলী ফরম্যাট করা হয়।" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "শর্টকার্ট কী এর মাধ্যমে আপনি নির্বাচিত গ্রাফিক্সের কিছু বৈশিষ্ট্যাবলীও পরিবর্তন করতে পারেন।।" #: 05060000.xhp #, fuzzy @@ -17056,13 +17075,14 @@ msgstr "একই পৃষ্ঠায় বর্তমান অনুভূমিক প্রান্তিককরণ সেটিং উল্টানো হয়।" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "You can also use the Graphics flip options to adjust the layout of objects on even and odd pages." #: 05060100.xhp msgctxt "" @@ -18174,13 +18194,14 @@ msgstr "মোড়ানো" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "নির্বাচিত গ্রাফিক্সের জন্য উল্টানো এবং সংযোগ অপশন সুনির্দিষ্ট ভাবে উল্লেখ করুন।" #: 05060300.xhp msgctxt "" @@ -18201,13 +18222,14 @@ msgstr "উল্লম্বভাবে" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "নির্বাচিত গ্রাফিকটি উল্লম্বভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18219,13 +18241,14 @@ msgstr "অনুভূমিকভাবে" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18237,13 +18260,14 @@ msgstr "সব পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "সব পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18255,13 +18279,14 @@ msgstr "বাম পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "জোড় পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18273,13 +18298,14 @@ msgstr "ডান পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "বিজোড় পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -20996,13 +21022,14 @@ msgstr "প্রস্থ" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "প্রস্থ সন্নিবেশ করান যা আপনি নির্বাচিত বস্তুর জন্য চান।" #: 05120200.xhp msgctxt "" @@ -22980,13 +23007,14 @@ msgstr "একটি ডায়ালগ খোলা হয় যেখানে আপনি স্বয়ংক্রিয় সংশোধকের পরিবর্তনগুলো গ্রহণ বা বর্জন করতে পারেন। এছাড়া কোন লেখক করে কি পরিবর্তন করছে আপনি তাও দেখতে পারেন।" #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "পরিবর্তন গ্রহণ বা বাতিল করা হবে, পরিশোধক ট্যাব" #: 05170000.xhp msgctxt "" @@ -25872,13 +25900,14 @@ msgstr "ফাঁকা স্থান" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "ফাঁকা স্থানের পরিমাণ সন্নিবেশ করান যা আপনি কলামগুলোর মাঝে দিতে চান।" #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bn/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/bn/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/bn/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:59+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/bn/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bn/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bn/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 00:23+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431390239.000000\n" +"X-POOTLE-MTIME: 1439550900.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/bn/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/bn/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/bn/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 16:17+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:24+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: bn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377620226.000000\n" +"X-POOTLE-MTIME: 1439551468.000000\n" #: stbctrls.src msgctxt "" @@ -161,14 +161,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bn-IN/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bn-IN/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-12 00:38+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 10:14+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bn_IN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431391082.000000\n" +"X-POOTLE-MTIME: 1439547293.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "কপিরাইট © 2000 - 2014 LibreOffice অবদানকারী।" #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/bn-IN/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/bn-IN/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/bn-IN/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/bn-IN/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/bn-IN/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 11:37+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11031,12 +11031,13 @@ msgstr "গ্রাফিক প্রদর্শন" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "চিত্র ম্যাপ প্রদর্শন করে, ফলে আপনি হটস্পটে ক্লিক এবং সম্পাদনা করতে পারেন।" #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/bn-IN/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/bn-IN/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/bn-IN/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 12:50+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "মুদ্রিত পৃষ্ঠার প্রাকদর্শন দেখায় অথবা প্রাকদর্শন বন্ধ করে।" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "নথির পৃষ্ঠায় স্ক্রল করতে বা মুদ্রণ করতে পৃষ্ঠা প্রাকদর্শন বার আইকন ব্যবহার করুন।" #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "পৃষ্ঠা প্রাকদর্শনে থাকার সময় আপনি আপনার নথি সম্পাদনা করতে পারবেন না।" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "পৃষ্ঠা প্রাকদর্শন প্রস্থান করতে, প্রাকদর্শন বন্ধবোতামে ক্লিক করুন।" #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "বার্তা একত্রীকরণ ডায়ালগ খুলুন, যা আপনাকে চিঠি থেকে মুদ্রণ এবং সংরক্ষণ করতে সহায়তা করবে।" #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "মুদ্রণের সময়, ডাটাবেস তথ্য সঙ্গতিপূর্ণ ডাটাবেস ক্ষেত্রগুলোকে (স্থানধারক) প্রতিস্থাপন করে। ডাটাবেস ক্ষেত্র সন্নিবেশ সম্পর্কিত আরও তথ্যের জন্য, সন্নিবেশ - ক্ষেত্র - অন্যান্য অধীনে ডাটাবেস ট্যাব পৃষ্ঠা দেখুন।" #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "পূর্ববর্তী" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "নথির পূর্ববর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন, এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।নথির পূর্ববর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন,এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।" #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "পরবর্তী" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "নথির পরবর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমনআইকনে ক্লিক করুন, এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।নথির পরবর্তী প্রকরণে লাফ দিতে। সুনির্দিষ্ট ভাবে উল্লেখ করা প্রকরণে লাফ দেওয়ার জন্য, পরিক্রমন আইকনে ক্লিক করুন,এবং এরপর একটি প্রকরণ শ্রেণীবিভাগে ক্লিক করুন - উদাহরণস্বরূপ, \"গ্রাফিক্স\"।" #: 02110000.xhp msgctxt "" @@ -2917,12 +2922,13 @@ msgstr "নথিতে একই ধরনের পূর্ববতী ক্ষেত্রে যাওয়া হয়। এই বোতামটি শুধু তখনই সক্রিয় হয় যখন একটি নথিতে একই ধরনের একাধিক ক্ষেত্র ধারণ করে।" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02140000.xhp msgctxt "" @@ -2952,12 +2958,13 @@ msgstr "নথিতে একই ধরনের পরবর্তী ক্ষেত্রে যাওয়া হয়। এই বোতামটি শুধু তখনই সক্রিয় হয় যখন একটি নথিতে একই ধরনের একাধিক ক্ষেত্র ধারণ করে।" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02140000.xhp msgctxt "" @@ -3139,12 +3146,13 @@ msgstr "নথিতে পূর্ববর্তী পাদটীকা অথবা প্রান্তটীকা নোঙ্গর সরানো হয়।" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02150000.xhp msgctxt "" @@ -3174,12 +3182,13 @@ msgstr "নথিতে পরবর্তী পাদটীকা অথবা প্রান্তটীকা নোঙ্গর সরানো হয়।" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02150000.xhp msgctxt "" @@ -3379,12 +3388,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3414,12 +3424,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3484,12 +3495,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "আইকন" #: 02160000.xhp msgctxt "" @@ -3685,13 +3697,14 @@ msgstr "ক্ষেত্র ছায়াকরণ" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr " আপনার নথিতে বিভাজক নয় এমন ফাঁকা স্থান, স্বনির্ধারিত হাইফেন, সূচিপত্র, পাদটীকা সহ ক্ষেত্র ছায়াকরণ দেখানো বা আড়াল করা হয়।" #: 03080000.xhp msgctxt "" @@ -4171,13 +4184,14 @@ msgstr "sections;inserting sections by DDEDDE; command for inserting sections" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "অংশ" #: 04020100.xhp msgctxt "" @@ -4198,13 +4212,14 @@ msgstr "নতুন অংশ" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "নতুন শাখার জন্য একটি নাম টাইপ করুন পূর্ব নির্ধারিতক্রমে, $[officename] স্বয়ংক্রিয়ভাবে \"শাখা X\" নামটি নতুন শাখায় বরাদ্দ করুন, যেখানে X একটি পর্যায়ক্রমিক সংখ্যা।" #: 04020100.xhp msgctxt "" @@ -4225,13 +4240,14 @@ msgstr "লিংক" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "বর্তমান নথিতে অন্য নথি হতে বিষয়বস্তু বা অংশবিশেষ সন্নিবেশ করানো হয়।" #: 04020100.xhp msgctxt "" @@ -4243,13 +4259,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "একটি DDE লিংক তৈরি করা হয়। এই চেক বাক্সটি নির্বাচন করুন, অতঃপর আপনার ব্যবহার করতে চাওয়া DDE কমান্ড দিন। DDE অপশনটি পুনরায় পাওয়া যাবে যদি লিংক চেক বাক্স নির্বাচিত থাকে।" #: 04020100.xhp msgctxt "" @@ -4270,22 +4287,24 @@ msgstr "উদাহরণস্বরূপ, $[officename] নথি abc.sxw হতে \"Section1\" নামের একটি বিভাগকে DDE লিংক হিসেবে সন্নিবেশ করতে, \"soffice x:\\\\abc.sxw Section1\" এই কমান্ডটি ব্যবহার করুন। \"abc.xls\" নামের একটি MS এক্সেল স্প্রেডশীট হতে প্রথম ঘরের বিষয়বস্তু সন্নিবেশ করতে, \"excel x:\\\\[abc.xls]Sheet1 z1s1\" এই কমান্ডটি ব্যবহার করুন। সম্পাদনা - বিশেষ প্রতিলেপন নির্বাচন করে আপনি উপাদানগুলোকে অনুলিপি করে DDE লিংক হিসেবে সন্নিবেশ করতে পারেন। আপনি বিষয়বস্তু নির্বাচন করে এবং সম্পাদনা - ক্ষেত্র নির্বাচন করে, লিংকের জন্য DDE কমান্ড দেখতে পারেন।" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "ফাইলের নাম / DDE কমান্ড " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "পথ এবং ফাইলের জন্য ফাইলের নাম সন্নিবেশ করান, অথবা ফাইল চিহ্নিত করতে ব্রাউজ বোতামে (...) ক্লিক করুন।যদি DDE পরীক্ষন বাক্স নির্বাচিত থাকে, কমান্ড সন্নিবেশ করান যা আপনি ব্যবহার করতে চান। " #: 04020100.xhp msgctxt "" @@ -4414,13 +4433,14 @@ msgstr "লুকিয়ে রাখুন" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "নির্বাচিত শাখা মুদ্রণ হওয়া থেকে বাধা দিন এবং লুকিয়ে রাখুন। লুকায়িত শাখার বিষয়বস্তু ন্যাভিগেটরে ধূসর হয়ে আবির্ভূত হবে। যখন আপনি ন্যাভিগেটরের লুকায়িত উপাদানের উপর আপনার মাউস সূচক রাখবেন, সহায়তা পরামর্শ \"লুকায়িত\" প্রদর্শিত হবে।" #: 04020100.xhp msgctxt "" @@ -4441,13 +4461,14 @@ msgstr "শর্ত সহ" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "একটি শর্ত সন্নিবেশ করান যা একটি শাখা লুকাতে মিলতে হবে। একটি শর্ত হলো যৌক্তিক অভিব্যক্তি, যেমন \"SALUTATION EQ Mr.\"। উদাহরণস্বরূপ, যদি আপনি ডাটাবেস ক্ষেত্র \" অভিবাদন\" যা \"Mr.\", \"Ms.\", অথবা \"জনাব অথবা জনাবা\" সংজ্ঞায়িত করতেবার্তা একত্রিতকরণ ফর্ম পত্র বৈশিষ্ট্য ব্যবহার করেন, আপনি এরপর সুনির্দিষ্ট ভাবে উল্লেখ করতে পারবেন যে একটি শাখা কেবলমাত্র তখনই মুদ্রিত হবে যদি অভিবাদন \"Mr.\" হয়।" #: 04020100.xhp msgctxt "" @@ -10182,13 +10203,14 @@ msgstr "পৃষ্ঠার সংখ্যার উপর ভিত্তি করে শর্তসাপেক্ষ পাঠ্যের প্রদর্শনের জন্য:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর ফাংশন ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -10245,13 +10267,14 @@ msgstr "একটি ব্যবহারকারী-সংজ্ঞায়িত চলকের উপর ভিত্তি করে শর্তসাপেক্ষ পাঠ্য প্রদর্শন করতে" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর চলক ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -10362,13 +10385,14 @@ msgstr "এই উদাহরণের প্রথম অংশ নথিতে \"First Name\" এবং \"Last Name\" এর মাঝে একটি ফাঁকা স্থান সন্নিবেশ করায়, এবং দ্বিতীয় অংশ ক্ষেত্রের বিষয়স্তুর উপর নির্ভর করে পাঠ্য সন্নিবেশ করায়। এই উদাহরণটি প্রয়োজন বোধ করে যে একটি ঠিকানা ডাটা উৎ‍স $[officename] এর সঙ্গে নিবন্ধন করা হয়।" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "সন্নিবেশ - ক্ষেত্রসমূহ - অন্যান্যনির্বাচন করুন, এবং এরপর ডাটাবেস ট্যাবে ক্লিক করুন।" #: 04090200.xhp msgctxt "" @@ -13935,13 +13959,14 @@ msgstr "নাম" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "হাইপারলিংকের জন্য একটি নাম সন্নিবেশ করান।" #: 04150000.xhp msgctxt "" @@ -14025,13 +14050,14 @@ msgstr "শিরোনাম" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "হাইপারলিংকের জন্য একটি নাম সন্নিবেশ করান।" #: 04150000.xhp msgctxt "" @@ -16148,15 +16174,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "এই ট্যাবটি মুদ্রণ বহির্বিন্যাস প্রদর্শনে বিদ্যমান নয়।" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16611,22 +16628,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "নির্বাচিত গ্রাফিক্সের আকার, অবস্থান, এবং অন্যান্য বৈশিষ্ট্যাবলী ফরম্যাট করা হয়।" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "শর্টকার্ট কী এর মাধ্যমে আপনি নির্বাচিত গ্রাফিক্সের কিছু বৈশিষ্ট্যাবলীও পরিবর্তন করতে পারেন।।" #: 05060000.xhp #, fuzzy @@ -17056,13 +17075,14 @@ msgstr "একই পৃষ্ঠায় বর্তমান অনুভূমিক প্রান্তিককরণ সেটিং উল্টানো হয়।" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "You can also use the Graphics flip options to adjust the layout of objects on even and odd pages." #: 05060100.xhp msgctxt "" @@ -18174,13 +18194,14 @@ msgstr "মোড়ানো" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "নির্বাচিত গ্রাফিক্সের জন্য উল্টানো এবং সংযোগ অপশন সুনির্দিষ্ট ভাবে উল্লেখ করুন।" #: 05060300.xhp msgctxt "" @@ -18201,13 +18222,14 @@ msgstr "উল্লম্বভাবে" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "নির্বাচিত গ্রাফিকটি উল্লম্বভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18219,13 +18241,14 @@ msgstr "অনুভূমিকভাবে" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18237,13 +18260,14 @@ msgstr "সব পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "সব পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18255,13 +18279,14 @@ msgstr "বাম পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "জোড় পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -18273,13 +18298,14 @@ msgstr "ডান পৃষ্ঠায়" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "বিজোড় পৃষ্ঠায় নির্বাচিত গ্রাফিকটি অনুভূমিকভাবে উল্টিয়ে ফেলা হয়।" #: 05060300.xhp msgctxt "" @@ -20996,13 +21022,14 @@ msgstr "প্রস্থ" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "প্রস্থ সন্নিবেশ করান যা আপনি নির্বাচিত বস্তুর জন্য চান।" #: 05120200.xhp msgctxt "" @@ -22980,13 +23007,14 @@ msgstr "একটি ডায়ালগ খোলা হয় যেখানে আপনি স্বয়ংক্রিয় সংশোধকের পরিবর্তনগুলো গ্রহণ বা বর্জন করতে পারেন। এছাড়া কোন লেখক করে কি পরিবর্তন করছে আপনি তাও দেখতে পারেন।" #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "পরিবর্তন গ্রহণ বা বাতিল করা হবে, পরিশোধক ট্যাব" #: 05170000.xhp msgctxt "" @@ -25872,13 +25900,14 @@ msgstr "ফাঁকা স্থান" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "ফাঁকা স্থানের পরিমাণ সন্নিবেশ করান যা আপনি কলামগুলোর মাঝে দিতে চান।" #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/bn-IN/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/bn-IN/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 00:49+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:06+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bn_IN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431391793.000000\n" +"X-POOTLE-MTIME: 1439550416.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "স্বনির্ধারিত" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/bn-IN/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/bn-IN/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bn-IN/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bn-IN/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 00:52+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:22+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bn_IN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431391943.000000\n" +"X-POOTLE-MTIME: 1439551329.000000\n" #: alienwarndialog.ui msgctxt "" @@ -751,7 +751,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/bn-IN/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/bn-IN/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/bn-IN/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bn-IN/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-02-02 08:20+0000\n" -"Last-Translator: Saibal Ray \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:31+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: bn_IN\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1422865220.000000\n" +"X-POOTLE-MTIME: 1439551884.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "জুমের স্তর সামঞ্জস্যপূর্ণ করুন" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/bo/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bo/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bo/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 10:12+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -2156,13 +2156,14 @@ msgstr "" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "position\n" "5\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "མཐོ་ཚད།" #: calloutpage.ui #, fuzzy @@ -2438,13 +2439,14 @@ msgstr "" #: cellalignment.ui +#, fuzzy msgctxt "" "cellalignment.ui\n" "liststoreHorzAlign\n" "3\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "མཐོ་ཚད།" #: cellalignment.ui msgctxt "" @@ -9098,13 +9100,14 @@ msgstr "" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "numalign\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "མཐོ་ཚད།" #: numberingoptionspage.ui #, fuzzy @@ -9554,13 +9557,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "liststore1\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "མཐོ་ཚད།" #: numberingpositionpage.ui msgctxt "" @@ -16442,13 +16446,14 @@ msgstr "" #: textanimtabpage.ui +#, fuzzy msgctxt "" "textanimtabpage.ui\n" "BTN_RIGHT-atkobject\n" "AtkObject::accessible-name\n" "string.text" msgid "Right" -msgstr "" +msgstr "མཐོ་ཚད།" #: textanimtabpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bo/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/bo/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/bo/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/bo/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/bo/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/bo/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 11:58+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11030,12 +11030,13 @@ msgstr "རིས་དབྱིབས་མཐོང་རིས།" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "བཪྙན་རིས་རྟེན་འཕྲོ་མངོན་པར་བྱས་ནས་ཚ་གནས་རྐྱང་རྡེབ་དང་རྩོམ་སྒྲིག་བྱེད།" #: 02220000.xhp @@ -14801,13 +14802,14 @@ msgstr "ཡིག་གཟུགས་བཟོ་ལྟ།" #: 05020100.xhp +#, fuzzy msgctxt "" "05020100.xhp\n" "par_id3155922\n" "11\n" "help.text" msgid "Select the formatting that you want to apply." -msgstr "" +msgstr "ཉེར་བར་སྤྱོད་པའམ་གསར་འཛུགས་བྱ་དགོས་པའི་ཚོན་ཁྲའི་རི་མོའི་རིགས་འདེམས་པ། " #: 05020100.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bo/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/bo/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/bo/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 13:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -108,13 +108,14 @@ msgstr "སྦྲགས་ཡིག་ཟླ་སྒྲིག་གླིང་སྒྲོམ་ཁ་ཕྱེ་དགོས་ གླིང་སྒྲོམ་དེ་རྣམ་གཞག་འཕྲིན་ཡིག་གཏག་པར་དང་ཉར་ཚགས་བྱ་རྒྱུ་ཕན་འདོག་ཡོད།" #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "གཏག་པར་རྒྱག་སྐབས་སྔོན་པ་གཞི་གྲངས་མཛོད་ཀྱི་ཆ་འཕྲིན་དེ་གཞི་གྲངས་མཛོད་ཡིག་དུམ་(གནས་ཟིན་རྟགས་)གནས་སའི་ཐོག་བསྒར་འཛུད་བྱེད་དགོས། གཞི་གྲངས་མཛོད་ཡིག་དུམ་ཆ་འཕྲིན་བསྒར་འཛུད་བྱེད་པའི་སྐོར་བསྒར་འཛུད་ - ཡིག་དུམ་ - གཞན་དག་ འོག་གི་འདེམས་གཞི་ཁཱ་གཞི་གྲངས་མཛོད་ལ་གཟིགས།" #: 01150000.xhp msgctxt "" @@ -2916,12 +2917,13 @@ msgstr "ཡིག་ཚགས་ནང་རིགས་གཅིག་མཚུངས་ཀྱི་མདུན་གྱི་ཡིག་དུམ་ཞིག་དུ་མཆོངས་སྒྱུར་བྱེད་པ ཡིག་ཚགས་ནང་ཚུད་པའི་རིགས་མཚུངས་པའི་ཡིག་དུམ་གཅིག་མང་བའི་སྐབས་གནོན་མཐེབ་དེ་གཞི་ནས་བཀོལ་སྤྱོད་བྱེད།" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས་" #: 02140000.xhp msgctxt "" @@ -2951,12 +2953,13 @@ msgstr "ཡིག་ཚགས་ནང་རིགས་གཅིག་མཚུངས་ཀྱི་མདུན་གྱི་ཡིག་དུམ་ཞིག་དུ་མཆོངས་སྒྱུར་བྱེད་པ།ཡིག་ཚགས་ནང་རིགས་གཅིག་མཚུངས་ཡིག་དུམ་མང་པོ་ཚུད་པའི་སྐབས་གནོན་མཐེབ་དེ་གཞི་ནས་སྤྱོད་ཆོག" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས་" #: 02140000.xhp msgctxt "" @@ -3138,12 +3141,13 @@ msgstr "ཡིག་ཚགས་ནང་གི་ཞབས་མཆན་གོང་མ་འམ་ཡང་ན་མཇུག་མཆན་འཆིང་རྒྱབ་བྲིས་རྟགས་སུ་བརྗེ་དགོས།" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས་" #: 02150000.xhp msgctxt "" @@ -3173,12 +3177,13 @@ msgstr "ཡིག་ཚགས་ནང་གི་ཞབས་མཆན་བྲིས་རྟགས་རྗེས་མ་འམ་ཞིག་མཇུག་མཆན་གནས་ངེས་བྲིས་རྟགས་སུ་བརྗེ་བ།" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས་" #: 02150000.xhp msgctxt "" @@ -3378,12 +3383,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr " དཔེ་རིས།" #: 02160000.xhp msgctxt "" @@ -3413,12 +3419,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས" #: 02160000.xhp msgctxt "" @@ -3483,12 +3490,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "རིས་རྟགས" #: 02160000.xhp msgctxt "" @@ -3684,13 +3692,14 @@ msgstr "ཁོངས་རྒྱབ་ལྗོངས་མངོན་པ་" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "ཡིག་ཚགས་ནང་ཁོངས་རྒྱབ་ལྗོངས་མངོན་པ་འམ་གབ་པ་ བར་མི་ཆོད་པའི་སྟོང་མིག་དང་、རང་མཚན་འཇོག་ཡིག་སྦྲེལ་རྟགས་、བཤེར་འདྲེན་དང་ཞབས་མཆན་ཚུད་ཡོད།" #: 03080000.xhp msgctxt "" @@ -4170,13 +4179,14 @@ msgstr "ས་ཁོངས་;བརྒྱུད་ DDE ས་ཁོངས་བསྒར་འཛུད་DDE; ས་ཁོངས་བསྒར་འཛུད་བཀའ་ཚིག་" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "ས་ཁོངས་" #: 04020100.xhp msgctxt "" @@ -4197,13 +4207,14 @@ msgstr "ས་ཁོངས་གསར་པ།" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "ས་ཁོངས་གསར་པའི་མིང་ནང་བཅུག་བྱེད།ཁས་ལེན་གནས་ཚུལ་འོག་ $[officename] རང་འགུལ་གྱི་ས་ཁོངས་གསར་པའི་མིང་\"ས་ཁོངས་ X\" གཏན་འཁེལ་ཤིང་དེ་ནང་ X ནི་རྒྱུན་མཐུད་ཀྱི་ཨང་བྲིས་ཡིན།" #: 04020100.xhp msgctxt "" @@ -4224,13 +4235,14 @@ msgstr "ཐག་སྦྲེལ།" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "མིག་སྔའི་ས་ཁོངས་ནང་ཡིག་ཚགས་གཞན་དག་གྱི་ནང་དོན་ནམ་ཡིག་ཚགས་གཞན་དག་གྱི་ས་ཁོངས་བསྒར་འཛུད་བྱེད།" #: 04020100.xhp msgctxt "" @@ -4242,13 +4254,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr " DDE ཐག་སྦྲེལ་གསར་འཛུགས་བྱེད། བསྐྱར་འདེམས་སྒྲོམ་དེ་གདམ་ཐོག་དེ་ནས་བེད་སྤྱོད་རྒྱུ་ DDE བཀའ་ཚིག་ནང་བཅུགབྱེད།\" ཐག་སྦྲེལ་\"བསྐྱར་འདེམས་སྒྲོམ་འདེམས་པའི་སྐབས་ DDE འདེམས་གཞི་ཞིག་ནས་སྤྱད་ཆོག།" #: 04020100.xhp msgctxt "" @@ -4269,22 +4282,24 @@ msgstr "དཔེར་ན་ DDE ཐག་སྦྲེལ་ཀྱི་རྣམ་པས་$[officename] ཡི་གེ་ལས་སྣོན་ཡིག་ཚགས་ abc.odt ནང་མིང་\"ས་ཁོངས་ 1\"གཅིག་བྱས་པའི་ས་ཁོངས་བསྒར་འཛུད་བྱེད་པ་དང་ བཀའ་ཚིག་བེད་སྤྱོད་པ་སྟེ་:\"soffice x:\\abc.odt ས་ཁོངས་ 1\" མིང་ཡི་\"abc.xls\"的 MS Excel གློག་རྡུལ་རེའུ་མིག་ཡིག་ཆའི་ནང་གི་དྲ་མིག་དང་པོ་ནང་དོན་བསྒར་འཛུད་བྱེད་་པ་དང་ བཀའ་ཚིག་:\"excel x:\\[abc.xls]Sheet1 z1s1\"བེད་སྤྱོད། DDE ཐག་སྦྲེལ་དུ་རྩིས་པའི་བསྒར་འཛུད་ཀྱི་གཞི་རྒྱུ་འདྲ་ཕབ་བྱེད་ དེ་ནས་ཚལ་ཐོ་[རྩོམ་སྒྲིག་] - [འདེམས་གཞི་རང་བཞིན་གྱི་སྦྱར་བ་...]འདེམས་དགོས།དེ་སྐབས་ནང་དོན་དེ་འདེམས་པ་རྒྱུད་ དེ་ནས་ཙིག་རྟགས་གཡས་མཐེབ་ལ་རྐྱང་རྡེབ་བྱས་ཏེ་[ཁོངས་བཀའ་བརྡ་རྩོམ་སྒྲིག་...] འདེམས་པ་དང་ ཐག་སྦྲེལ་DDE བཀའ་ཚིག་ལ་སྤྱོད་པ་ལྟ་ཞིབ་བྱེད།" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "ཡིག་ཆའི་མིང་ / DDE བཀའ་བརྡ་" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "ཡིག་ཆའི་རྒྱུད་ལག་དང་ཡིག་ཆའི་མིང་བསྒར་འཛུད་བྱེད་ནང་བཅུག་བྱེད་་པ་དང་ཡང་ན་ མིག་བཤར་གནོན་མཐེབ་ལ་རྐྱང་རྡེབ་བྱེད་\"...\"ཡིག་ཆའི་གནས་ས་བཙལ་འཚོལ་བྱེད།གལ་ཏེ་\"DDE\"བསྐྱར་འདེམས་སྒྲོམ་འདེམས་ཟིན་ན་ བེད་སྤྱོད་པའི་ DDE བཀའ་ཚིག་ནང་བཅུག་བྱེད། " #: 04020100.xhp msgctxt "" @@ -4413,13 +4428,14 @@ msgstr "གབ་པ།" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "འདེམས་ངེས་ས་ཁོངས་གབ་པ་དང་ འདེམས་ངེས་ས་ཁོངས་གཏག་པར་རྒྱབ་རྒྱུ་འགོག་དགོས།ས་ཁོངས་ཀྱི་ཚོ་ཆས་གབ་པས་ལག་རོགས་ནང་ཐལ་མདོག་དུ་མངོན་གྱི་ཡོད།ཙིག་རྟགས་སྟོན་མདའ་ལག་རོགས་ནང་གི་ཚོ་ཆས་གབ་པའི་ཐོག་སྟོས་པའི་སྐབས་ རོགས་རམ་དྲན་བརྡ་\"གབ་པ་\"མངོན།" #: 04020100.xhp msgctxt "" @@ -4440,13 +4456,14 @@ msgstr "ཟུར་སྣོན་ཆ་རྐྱེན།" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "ནང་བཅུག་ཀྱི་ཆ་རྐྱེན་ངེས་པར་དུ་གབ་པའི་ས་ཁོངས་ཀྱི་རེ་བ་སྐོར་ཐུབ།ཆ་རྐྱེན་ནི་གཏན་ཚིག་མཚོན་ཚུལ་ཞིག་ཡིན་ དཔེར་ན་\"SALUTATION EQ Mr.\"ལྟ་བུ།དཔེར་ན་ གལ་ཏེ་རྣམ་གཞག་འཕྲིན་ཡིག་བྱེད་ནུས་ཀྱི་མཚན་འཇོག་མིང་ནི་\"འབོད་མིང་\"གྱི་གཞི་གྲངས་མཛོད་ཡིག་དུམ་(ཡིག་དུ་དེར་\"Mr.\"、\"Ms.\"、\"Sir\"ཡང་\"Madam\")ཚུད་ཡོད་ བེད་སྤྱོད་དང་ཁྱེད་ཀྱི་མིང་འབོད་\"Mr.\"ཁོ་ན་གཏན་འཁེངས་བྱེད་པའི་སྐབས་གཞིགས་ནས་ས་ཁོངས་གཏག་པར་རྒྱབ་ཆོག" #: 04020100.xhp msgctxt "" @@ -6523,12 +6540,13 @@ msgstr "རྣམ་གཞག་ནང་འདྲེན་སྤྱོད་ཀྱི་ཨང་བྲིས་ཁོ་ན་ཚུད་ཡོད།" #: 04090001.xhp +#, fuzzy msgctxt "" "04090001.xhp\n" "par_id0902200804313432\n" "help.text" msgid "Inserts the field as static content, that is, the field cannot be updated." -msgstr "" +msgstr "ཁོངས་འདི་གཞི་རྣམ་ནང་དོན་དུ་རྩིས་ནས་བསྒརའཛུད་བྱེད་ དེ་ཡང་ཁོངས་གསར་བཅོས་བྱེད་དགོས།" #: 04090001.xhp msgctxt "" @@ -10180,13 +10198,14 @@ msgstr "ཤོག་གྲངས་ཀྱི་ཆ་རྐྱེན་ཡོད་པའི་ཡི་གེར་མངོན་པ།" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "ཚལ་ཐོ་འདེམས་པ་:[བསྒརའཛུད་] - [ཁོངས་] - [གཞན་དག་...]དེ་ནས་ \"བྱེད་ནུས་\"འདེམས་གཞི་ཁ་རྐྱང་རྡེབ་བྱེད།" #: 04090200.xhp msgctxt "" @@ -10243,13 +10262,14 @@ msgstr "སྤྱོད་པོའི་མཚན་འཇོག་གི་འགྱུར་ཚད་ཀྱི་ཆ་རྐྱེན་ཡོད་པའི་ཡི་གེ་མངོན་པ།" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "ཚལ་ཐོ་[བསྒརའཛུད་] - [ཁོངས་] - [གཞན་དག་...]འདེམས་ན་ དེ་ནས་\"འགྱུར་ཚད་\"འདེམས་གཞི་ཁ་རྐྱང་རྡེབ་བྱེད།" #: 04090200.xhp msgctxt "" @@ -10360,13 +10380,14 @@ msgstr "དཔེ་གཞི་དེའི་ཆ་ཤས་ཐོག་མ་དེ་ཡིག་ཚགས་ནང་གི་\"First Name\"དང་\"Last Name\"ཁོངས་འཚམས་སུ་སྟོང་མིག་རྩིས་བསྒརའཛུད་བྱས་རྒྱུ་དང་ཆ་ཤས་གཉིས་པདེ་ཁོངས་མིང་གི་ནང་དོན་ལ་གཞིགས་ནས་ཡི་གེ་བསྒརའཛུད་བྱེད་དགོས།དཔེ་གཞི་དེར་$[officename] ཕྱོགས་ཀྱི་ཐོ་བཀོད་ཟིན་པའི་གནས་ཡུལ་གྱི་གཞི་གྲངས་ཁུངས་བེད་སྤྱོད་པའི་དགོས་མཁོ་ཡོད།" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "ཚལ་ཐོ་འདེམས་པ་[བསྒརའཛུད་] - [ཁོངས] - [གཞན་དག་...]འདེམས་རྗེས་ དེ་ནས་\"གཞི་གྲངས་མཛོད་\"འདེམས་གཞི་ཁ་རྐྱང་རྡེབ་བྱེད།" #: 04090200.xhp msgctxt "" @@ -13932,13 +13953,14 @@ msgstr "མིང་།" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "ཐག་སྦྲེལ་ཆས་ཀྱི་བཀོད་སྒྲིག་" #: 04150000.xhp msgctxt "" @@ -14022,13 +14044,14 @@ msgstr "ཕྲེང་ཁ་བྱང་།" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "ཐག་སྦྲེལ་ཆས་ཀྱི་བཀོད་སྒྲིག་" #: 04150000.xhp msgctxt "" @@ -16145,15 +16168,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "འདེམས་གཞི་ཁག་འདི་ནི་ པར་འདེབས་པར་རིས་མཐོང་རིས་ནང་བེད་སྤྱོད་རྒྱུ་མེད།" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16608,22 +16622,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "བདམས་ཟིན་པའི་རིས་དབྱིབས་ཀྱི་ཆེ་ཆུང་གནས་ས་དང་གཏོགས་གཞིགས་གཞན་དང་རྣམ་བཞག་ཅན་བྱེད་དགོས།" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "ཁྱེད་ཀྱིས་མྱུར་བདེའི་མཐེབ་བེད་སྤྱད་དེ་བདམས་ཟིན་པའི་གཏོགས་གཞིགས་འགའ་ཞིག་གཅོད་རྒྱུ།" #: 05060000.xhp #, fuzzy @@ -17053,13 +17069,14 @@ msgstr "ཆ་གྲངས་ཤོག་ངོས་ཐོག་མིན་སྔའི་ཆུ་སྙོམས་ཁ་ཕྱོགས་ལྟོག་ཏེ་འཁོར་སྐབས་བཀོད་སྒྲིག་སྙོམ་སྒྲིག་" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "ཁྱེད་ཀྱི་ཀྱང་རིས་དབྱིབས་ཆ་གྲངས་དང་ཡ་གྲངས་ཤོག་ལྷེའི་འདེམས་བྱ་ལེགས་སྒྲིག་བྱ་ཡུལ་གྱི་བཀོད་རྣམ་མགོ་རྟིང་སློག" #: 05060100.xhp msgctxt "" @@ -18171,13 +18188,14 @@ msgstr "ཟླུམ་སྐོར་" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "བེད་སྤྱོད་པའི་འདེམས་ངེས་པར་རིས་ཀྱི་མགོ་རྟིང་སློག་པ་དང་ཐགས་སྦྲེལ་འདེམས་གཞི་གཏན་འཁེལ་བྱ་དགོས་" #: 05060300.xhp msgctxt "" @@ -18198,13 +18216,14 @@ msgstr "དྲང་འཕྱང་ཁ་ཕྱོགས།" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "འདེམས་ངེས་པའི་པར་རིས་དྲང་འཕྱང་ཐོག་མགོ་རྟིང་སློག་པ་" #: 05060300.xhp msgctxt "" @@ -18216,13 +18235,14 @@ msgstr "ཆུ་སྙོམས་ཁ་ཕྱོགས།" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "འདེམས་ངེས་པའི་པར་རིས་ཆུ་སྙོམགམགོ་རྟིང་སློག་པ་" #: 05060300.xhp msgctxt "" @@ -18234,13 +18254,14 @@ msgstr "ཤོག་ངོས་ཧྲིལ་པོ།" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "ཤོག་ངོས་ཚང་མའི་འདེམས་ངེས་པའི་པར་རིས་ཆུ་སྙོམ་ངང་མགོ་རྟིང་སློག་དགོས་" #: 05060300.xhp msgctxt "" @@ -18252,13 +18273,14 @@ msgstr "ཆ་གྲངས་ཤོག་ངོས།" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "ཆ་གྲང་ཤོག་ངོས་ཐོག་གི་འདེམས་ངེས་པའི་པར་རིས་ཁོ་ན་ཆུ་སྙོམ་ངང་མགོ་རྟིང་སློག་དགོས་" #: 05060300.xhp msgctxt "" @@ -18270,13 +18292,14 @@ msgstr "ཡ་གྲང་ཤོག་ངོས།" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "ཡ་གྲང་ཤོག་ངོས་ཐོག་གི་འདེམས་ངེས་པའི་པར་རིས་ཁོ་ན་ཆུ་སྙོམ་ཐོག་མགོ་རྟིང་སློག་དགོས་" #: 05060300.xhp msgctxt "" @@ -20993,13 +21016,14 @@ msgstr "ཞེང་ཚད།" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "འདེམས་ངེས་པའི་བྱ་ཡུལ་ཞེང་ཚད་ནང་འཇུག་" #: 05120200.xhp msgctxt "" @@ -22976,13 +23000,14 @@ msgstr "གླེང་སྒྲོམ་ཞིག་ཁ་ཕྱེ་ནས་དེའི་ནང་དང་ལེན་ནམ་ཁས་མི་ལེན་པའི་རང་འགུལ་རྣམ་བཞག་བཟོ་བཅོས་འདེམས་མཆོགཁྱེད་ཀྱིས་དམིགས་འཛུགས་རྩོམ་པོས་བྱས་པའི་དག་བཅོས་སམ་དམིགས་འཛུགས་ཚེས་གྲངས་བཟོ་བཅོས་ལྟ་ཞིབ་བྱས་ཆོག་" #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "འཚགས་འདེམས་" #: 05170000.xhp msgctxt "" @@ -25868,13 +25893,14 @@ msgstr "བར་རྒྱང་།" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "ཚང་དབར་གྱི་བར་ཆད་ནང་འཇུག་རྒྱུ་" #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bo/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/bo/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/bo/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 11:04+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/bo/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bo/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bo/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 01:13+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:21+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bo\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431393203.000000\n" +"X-POOTLE-MTIME: 1439551285.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/bo/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/bo/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/bo/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 16:20+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:32+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: bo\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377620433.000000\n" +"X-POOTLE-MTIME: 1439551979.000000\n" #: stbctrls.src msgctxt "" @@ -161,14 +161,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/bo/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/bo/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/bo/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bo/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/br/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/br/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/br/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-28 14:08+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-09 19:10+0000\n" "Last-Translator: Alan \n" "Language-Team: none\n" "Language: br\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435500523.000000\n" +"X-POOTLE-MTIME: 1452366658.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 Perzhiaded LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 - 2016 Perzhiaded LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/br/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/br/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/br/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1001,7 +1001,7 @@ "SC_OPCODE_CEIL_PRECISE\n" "string.text" msgid "CEILING.PRECISE" -msgstr "SEL.SPIS" +msgstr "LEIN.SPIS" #: core_resource.src msgctxt "" @@ -1010,7 +1010,7 @@ "SC_OPCODE_CEIL_ISO\n" "string.text" msgid "ISO.CEILING" -msgstr "ISO.SEL" +msgstr "ISO.LEIN" #: core_resource.src msgctxt "" @@ -1037,7 +1037,7 @@ "SC_OPCODE_FLOOR_MATH\n" "string.text" msgid "FLOOR.MATH" -msgstr "LEUR.JEDZH" +msgstr "LEUR.JEDONIEZH" #: core_resource.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/br/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/br/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/br/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-10 09:30+0000\n" +"PO-Revision-Date: 2015-10-20 17:40+0000\n" "Last-Translator: Alan \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441877442.000000\n" +"X-POOTLE-MTIME: 1445362855.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -4307,7 +4307,7 @@ "Label\n" "value.text" msgid "Format Floor..." -msgstr "Mentrezhañ al leurenn..." +msgstr "Mentrezhañ al leur..." #: ChartCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/br/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/br/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/br/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-29 17:34+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-09 19:13+0000\n" "Last-Translator: Alan \n" "Language-Team: none\n" "Language: br\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438191267.000000\n" +"X-POOTLE-MTIME: 1452366817.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "Bihanoc'h eget ar werzh uc'hek e rank bezañ ar werzh izek." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personelaet" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/br/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/br/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/br/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-18 14:13+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-09 19:12+0000\n" "Last-Translator: Alan \n" "Language-Team: none\n" "Language: br\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437228836.000000\n" +"X-POOTLE-MTIME: 1452366770.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "An holl verkoù kenwerzhel hag ar merkoù marilhet zo d'o ferc'hennerion dezho.\n" "\n" -"Copyright © 2000, 2015 perzhiaded LibreOffice. Pep gwir miret strizh.\n" +"Copyright © 2000, 2016 perzhiaded LibreOffice. Pep gwir miret strizh.\n" "\n" "Krouet eo bet ar meziant-mañ gant %OOOVENDOR, diazezet war OpenOffice.org, a zo gant Copyright Oracle 2000, 2011 hag he stalioù mibion. %OOOVENDOR a drugareka izili holl ar gumuniezh, lennit http://www.libreoffice.org/ evit gouzout hiroc'h." diff -Nru libreoffice-5.0.2/translations/source/br/starmath/source.po libreoffice-5.0.5~rc2/translations/source/br/starmath/source.po --- libreoffice-5.0.2/translations/source/br/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/starmath/source.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-05-08 13:02+0000\n" +"PO-Revision-Date: 2015-10-20 17:41+0000\n" "Last-Translator: Alan \n" "Language-Team: LANGUAGE \n" "Language: br\n" @@ -12,9 +12,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431090151.000000\n" +"X-POOTLE-MTIME: 1445362872.000000\n" #: commands.src msgctxt "" @@ -1302,7 +1302,7 @@ "RID_LRFLOORX_HELP\n" "string.text" msgid "Floor" -msgstr "Leurenn" +msgstr "Leur" #: commands.src msgctxt "" @@ -1382,7 +1382,7 @@ "RID_SLRFLOORX_HELP\n" "string.text" msgid "Floor (Scalable)" -msgstr "Leurenn (sturiadel)" +msgstr "Leur (sturiadel)" #: commands.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/br/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/br/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/br/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/br/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-03 13:24+0000\n" -"Last-Translator: Alan \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:46+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: br\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1430659456.000000\n" +"X-POOTLE-MTIME: 1439556382.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Kempenn live ar zoumañ" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/brx/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/brx/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/brx/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 11:21+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -2154,13 +2154,14 @@ msgstr "" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "position\n" "5\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "गोजौथि" #: calloutpage.ui #, fuzzy @@ -2435,13 +2436,14 @@ msgstr "" #: cellalignment.ui +#, fuzzy msgctxt "" "cellalignment.ui\n" "liststoreHorzAlign\n" "3\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "गोजौथि" #: cellalignment.ui msgctxt "" @@ -9093,13 +9095,14 @@ msgstr "" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "numalign\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "गोजौथि" #: numberingoptionspage.ui #, fuzzy @@ -9549,13 +9552,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "liststore1\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "गोजौथि" #: numberingpositionpage.ui msgctxt "" @@ -16436,13 +16440,14 @@ msgstr "" #: textanimtabpage.ui +#, fuzzy msgctxt "" "textanimtabpage.ui\n" "BTN_RIGHT-atkobject\n" "AtkObject::accessible-name\n" "string.text" msgid "Right" -msgstr "" +msgstr "गोजौथि" #: textanimtabpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/brx/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/brx/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/brx/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/brx/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/brx/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/brx/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 12:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/brx/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/brx/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/brx/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 02:02+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:30+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: brx\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431396178.000000\n" +"X-POOTLE-MTIME: 1439555452.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/brx/starmath/source.po libreoffice-5.0.5~rc2/translations/source/brx/starmath/source.po --- libreoffice-5.0.2/translations/source/brx/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/brx/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/brx/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/brx/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-01-06 14:07+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:43+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: brx\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1357481227.000000\n" +"X-POOTLE-MTIME: 1439556232.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/brx/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/brx/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/brx/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/brx/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/bs/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bs/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bs/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 11:24+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Autorsko pravo © 2000 - 2014 LibreOffice doprinosioci." #: aboutdialog.ui @@ -2099,13 +2099,14 @@ msgstr "_Pozicija" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "byft\n" "label\n" "string.text" msgid "_By:" -msgstr "" +msgstr "_sa" #: calloutpage.ui msgctxt "" @@ -2547,13 +2548,14 @@ msgstr "_Dodaj..." #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "Izaberite direktorij certifikata za NSS (Network Security Services) koji će se koristiti za digitalne potpise." #: certdialog.ui #, fuzzy @@ -5162,13 +5164,14 @@ msgstr "Ukloni" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label1\n" "label\n" "string.text" msgid "Assign:" -msgstr "" +msgstr "_Dodijeli" #: eventsconfigpage.ui msgctxt "" @@ -5189,13 +5192,14 @@ msgstr "U_kloni" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label2\n" "label\n" "string.text" msgid "Save in:" -msgstr "" +msgstr "_Snimi U" #: eventsconfigpage.ui msgctxt "" @@ -5526,13 +5530,14 @@ msgstr "Datoteka" #: galleryfilespage.ui +#, fuzzy msgctxt "" "galleryfilespage.ui\n" "label1\n" "label\n" "string.text" msgid "_File type:" -msgstr "" +msgstr "Vrsta _linije" #: galleryfilespage.ui msgctxt "" @@ -6468,13 +6473,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "url_label\n" "label\n" "string.text" msgid "URL:" -msgstr "" +msgstr "_URL" #: hyperlinkdocpage.ui msgctxt "" @@ -6532,22 +6538,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Ime:" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Z_a" #: hyperlinkdocpage.ui msgctxt "" @@ -6668,22 +6676,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Ime:" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Z_a" #: hyperlinkinternetpage.ui msgctxt "" @@ -6768,22 +6778,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Ime:" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Z_a" #: hyperlinkmailpage.ui msgctxt "" @@ -6923,22 +6935,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "_Ime:" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Z_a" #: hyperlinknewdocpage.ui msgctxt "" @@ -17734,58 +17748,3 @@ "string.text" msgid "View Layout" msgstr "Prikaz izgleda" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "Boja pozadine" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/bs/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/bs/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/bs/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 11:27+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -2794,13 +2794,14 @@ msgstr "" #: 01050000.xhp +#, fuzzy msgctxt "" "01050000.xhp\n" "par_id3153821\n" "9\n" "help.text" msgid "Close the current window" -msgstr "" +msgstr "Spoji Dokument" #: 01050000.xhp msgctxt "" @@ -6642,13 +6643,14 @@ msgstr "Raspon " #: 02070000.xhp +#, fuzzy msgctxt "" "02070000.xhp\n" "par_id3145169\n" "58\n" "help.text" msgid "Set the shift options for the target cells when the clipboard content is inserted. " -msgstr "" +msgstr "Akcija" #: 02070000.xhp msgctxt "" @@ -11038,12 +11040,13 @@ msgstr "Grafički prikaz" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Prikazuje mapu slike, tako da može kliknuti i editovati željenu lokaciju." #: 02220000.xhp @@ -21695,13 +21698,14 @@ msgstr "Raspon " #: 05040200.xhp +#, fuzzy msgctxt "" "05040200.xhp\n" "par_id3150417\n" "48\n" "help.text" msgid "Specify the alignment options for the cells on a printed page." -msgstr "" +msgstr "Akcija" #: 05040200.xhp msgctxt "" @@ -22774,12 +22778,13 @@ msgstr "Asijski fonetski vodič" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "bm_id9598376\n" "help.text" msgid "Asian Phonetic Guidephonetic guide" -msgstr "" +msgstr "novi prozoriprozori; novi" #: 05060000.xhp msgctxt "" @@ -23343,12 +23348,13 @@ msgstr "Pismo" #: 05090000.xhp +#, fuzzy msgctxt "" "05090000.xhp\n" "bm_id3155271\n" "help.text" msgid "fonts; text objectstext objects; fonts" -msgstr "" +msgstr "poravnavanje; ćelijećelije; poravnavanje" #: 05090000.xhp msgctxt "" @@ -24666,13 +24672,14 @@ msgstr "Širina" #: 05200100.xhp +#, fuzzy msgctxt "" "05200100.xhp\n" "par_id3150976\n" "28\n" "help.text" msgid "Enter a width for the symbol." -msgstr "" +msgstr "Unesite širinu za označeni objekat." #: 05200100.xhp msgctxt "" @@ -25556,13 +25563,14 @@ msgstr "Širina" #: 05210100.xhp +#, fuzzy msgctxt "" "05210100.xhp\n" "par_id3149810\n" "38\n" "help.text" msgid "Enter a width for the bitmap." -msgstr "" +msgstr "Unesite širinu za označeni objekat." #: 05210100.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bs/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/bs/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/bs/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 12:19+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "Prikazuje pregled odštampane stranice ili zatvara pregled." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Koristite ikone na Baru za pregled stranice da pregledate stranice dokumenta ili da odštampate dokument." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "Ne možete mijenjati vaš dokument dok ste u Pregledu stranice." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "To exit the page preview, click the Zatvori pregled button." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Opens the Mail Merge dialogue box, which helps you in printing and saving form letters." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Baza podataka tab page under Ubaci - Polja - Ostalo." #: 01150000.xhp msgctxt "" @@ -2917,12 +2920,13 @@ msgstr "PREEVDI: Jumps na sljedece polje istog tipa u dokumentu. Ovo dugme je aktivan samo kada se dokument sadrži više od jednog podrucja istog tipa." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02140000.xhp msgctxt "" @@ -2952,12 +2956,13 @@ msgstr "PREEVDI: Jumps na sljedece polje istog tipa u dokumentu. Ovo dugme je aktivan samo kada se dokument sadrži više od jednog podrucja istog tipa." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02140000.xhp msgctxt "" @@ -3139,12 +3144,13 @@ msgstr " Premještanje na prethodnu fusnotu ili krajnja bilješka sidro u dokumentu." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02150000.xhp msgctxt "" @@ -3174,12 +3180,13 @@ msgstr " Premještanje na prethodnu fusnotu ili krajnja bilješka sidro u dokumentu." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02150000.xhp msgctxt "" @@ -3379,12 +3386,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02160000.xhp msgctxt "" @@ -3414,12 +3422,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02160000.xhp msgctxt "" @@ -3484,12 +3493,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "{ENTER ALTERNATE DESCRIPTION HERE}" #: 02160000.xhp msgctxt "" @@ -4172,13 +4182,14 @@ msgstr " sekcije; umetanje sekcije DDE DDE; naredbu za umetanje sekcija" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Sekcija" #: 04020100.xhp msgctxt "" @@ -4199,13 +4210,14 @@ msgstr "Nova sekcija" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr " Unesite naziv za novu sekciju. Po zadanom, $ [officename] automatski dodjeljuje naziv \"Section X\" na nove dionice , gdje je X uzastopni broj." #: 04020100.xhp msgctxt "" @@ -4226,13 +4238,14 @@ msgstr "Veza" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr " Umece sadržaj drugog dokumenta ili sekcije iz drugog dokumenta u trenutne sekcije." #: 04020100.xhp msgctxt "" @@ -4244,13 +4257,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr " Stvara DDE link. Oznaci ovaj oznacite okvir, a zatim unesite DDE naredbu koju želite koristiti. DDE opcija dostupna samo ako Link odabrana oznacite okvir." #: 04020100.xhp msgctxt "" @@ -4271,22 +4285,24 @@ msgstr "Na primjer, za umetanje poglavlje pod nazivom \"Section1\" od $ [officename] tekst dokumenta abc.sxw kao DDE vezu, koristite naredbu: \"soffice x: \\abc.sxw Section1\". Da biste umetnuli sadržaj prve celije iz proracunske tablice Microsoft Excel datoteku pod nazivom \"abc.xls\", koristite naredbu: \"Excel x: \\[abc.xls] Sheet1 z1s1\". Takoder možete kopirati elemente koje želite umetnuti kao DDE vezu, a zatim Uredi - Posebno lijepljenje. Tada možete vidjeti DDE naredbu za vezu, odabirom sadržaja i odabiru Uredi - Fields." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Ime datoteke / DDE naredba" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr " Unesite put i naziv datoteke za datoteku koju želite umetnuti, ili kliknite dugme Browse ( ...) da biste pronašli datoteku. Ako DDE oznacite okvir, unesite DDE naredbu koju želite koristiti." #: 04020100.xhp msgctxt "" @@ -4415,13 +4431,14 @@ msgstr "Sakrij" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Sakriva i sprijeèava odabrani odjel od štampanja. Komponente skrivenih odjela se pojavljuju u sivoj boji u Navigatoru. Kada postavite pokazivaè od miša preko skrivene komponente u Navigatoru, Help uputa \"skriveno\" æe se prikazati." #: 04020100.xhp msgctxt "" @@ -4442,13 +4459,14 @@ msgstr "Sa uslovom" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Upišite uslov koji mora biti zadovoljen da bi se mogla sakriti ova sekcija. Uslov je logički izraz, kao što je \"POZDRAV EQ G-din.\". Npr., ako koristite mogućnost slanja cirkularnog pisma da biste definisali polje u bazi podataka zvano \"Pozdrav\" koje sadrži \"G-din.\", \"G-đa.\", or \"Gospodin ili Gospođa\", onda možete odrediti da će sekcija biti odštampana samo ako je pozdrav sa \"G-din.\"." #: 04020100.xhp msgctxt "" @@ -8047,13 +8065,14 @@ msgstr "" #: 04090004.xhp +#, fuzzy msgctxt "" "04090004.xhp\n" "par_id3150767\n" "29\n" "help.text" msgid "Inserts the field as static content, that is, the field cannot be updated." -msgstr "" +msgstr "Ubacuje polje kao statièni sadržaj, to je, polje ne može biti obnovljeno." #: 04090004.xhp msgctxt "" @@ -11153,13 +11172,14 @@ msgstr "Vrsta" #: 04120210.xhp +#, fuzzy msgctxt "" "04120210.xhp\n" "hd_id3145410\n" "10\n" "help.text" msgid "Bibliography" -msgstr "" +msgstr "Vrsta" #: 04120210.xhp msgctxt "" @@ -12323,13 +12343,14 @@ msgstr "Vrsta" #: 04120220.xhp +#, fuzzy msgctxt "" "04120220.xhp\n" "hd_id3147506\n" "10\n" "help.text" msgid "Bibliography" -msgstr "" +msgstr "Vrsta" #: 04120221.xhp msgctxt "" @@ -12952,13 +12973,14 @@ msgstr "" #: 04120227.xhp +#, fuzzy msgctxt "" "04120227.xhp\n" "hd_id3151388\n" "1\n" "help.text" msgid "Entries (bibliography)" -msgstr "" +msgstr "Vrsta" #: 04120227.xhp msgctxt "" @@ -15725,13 +15747,14 @@ msgstr "Širina" #: 05040500.xhp +#, fuzzy msgctxt "" "05040500.xhp\n" "par_id3152963\n" "43\n" "help.text" msgid "Enter the width of the column." -msgstr "" +msgstr "Upišite širinu koverte." #: 05040500.xhp msgctxt "" @@ -16156,15 +16179,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Ovaj razmak nije dostupan u pogleduPrint Layout" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16628,13 +16642,14 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Također možete promijeniti neke od svojstava odabranog grafičkog sa shortcut keys." #: 05060000.xhp #, fuzzy @@ -17064,13 +17079,14 @@ msgstr "" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Takodjer mozete koristiti Ilustracije opciju okretanja za prilagodjavanje iyglada objekta na parnim ili neparnim stranicama." #: 05060100.xhp msgctxt "" @@ -17558,13 +17574,14 @@ msgstr "Lijevo" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3150678\n" "36\n" "help.text" msgid "Enter the amount of space that you want between the left edge of the object and the text." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu lijevog kraja koverte i polja pošaljioca." #: 05060200.xhp msgctxt "" @@ -17576,13 +17593,14 @@ msgstr "Desno" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3149956\n" "38\n" "help.text" msgid "Enter the amount of space that you want between the right edge of the object and the text." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu lijevog kraja koverte i polja pošaljioca." #: 05060200.xhp msgctxt "" @@ -17594,13 +17612,14 @@ msgstr "Vrh" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3147284\n" "40\n" "help.text" msgid "Enter the amount of space that you want between the top edge of the object and the text." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu gornjeg kraja koverte i polja pošaljioca." #: 05060200.xhp msgctxt "" @@ -17612,13 +17631,14 @@ msgstr "Dno" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3157884\n" "42\n" "help.text" msgid "Enter the amount of space that you want between the bottom edge of the object and the text." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu gornjeg kraja koverte i polja pošaljioca." #: 05060201.xhp msgctxt "" @@ -18335,13 +18355,14 @@ msgstr "..." #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151373\n" "14\n" "help.text" msgid "Locate the new graphic file that you want to link to, and then click Open." -msgstr "" +msgstr " pronadite datoteku koju želite umetnuti kao vezu, a zatim pritisnite Umetni." #: 05060300.xhp msgctxt "" @@ -19893,13 +19914,14 @@ msgstr "Iznad" #: 05090100.xhp +#, fuzzy msgctxt "" "05090100.xhp\n" "par_id3152771\n" "32\n" "help.text" msgid "Enter the amount of space that you want to leave between the top edge of the table and the text above the table." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu gornjeg kraja koverte i polja adrese." #: 05090100.xhp msgctxt "" @@ -19911,13 +19933,14 @@ msgstr "Ispod" #: 05090100.xhp +#, fuzzy msgctxt "" "05090100.xhp\n" "par_id3145763\n" "34\n" "help.text" msgid "Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table." -msgstr "" +msgstr "Upišite kolièinu prostora koji želite da ostavite izmeðu gornjeg kraja koverte i polja adrese." #: 05090100.xhp msgctxt "" @@ -20036,13 +20059,14 @@ msgstr "Širina kolone" #: 05090200.xhp +#, fuzzy msgctxt "" "05090200.xhp\n" "par_id3159193\n" "12\n" "help.text" msgid "Enter the width that you want for the column." -msgstr "" +msgstr "Unesite sirinu koju zelite za oznaceni objekat." #: 05090200.xhp msgctxt "" @@ -20757,13 +20781,14 @@ msgstr "Visina" #: 05110100.xhp +#, fuzzy msgctxt "" "05110100.xhp\n" "par_id3154554\n" "4\n" "help.text" msgid "Enter the height that you want for the selected row(s)." -msgstr "" +msgstr "Unesite visinu koju zelite za oznaceni objekat." #: 05110100.xhp msgctxt "" @@ -21004,13 +21029,14 @@ msgstr "Širina" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "Unesite sirinu koju zelite za oznaceni objekat." #: 05120200.xhp msgctxt "" @@ -21089,12 +21115,13 @@ msgstr "Zatvara odjel." #: 05120400.xhp +#, fuzzy msgctxt "" "05120400.xhp\n" "par_idN105A7\n" "help.text" msgid "Inserts a column into the table." -msgstr "" +msgstr "Zatvara odjel." #: 05120400.xhp msgctxt "" @@ -21651,13 +21678,14 @@ msgstr "Stil znaka" #: 05130002.xhp +#, fuzzy msgctxt "" "05130002.xhp\n" "hd_id3148489\n" "1\n" "help.text" msgid "Character Style" -msgstr "" +msgstr "Vrsta" #: 05130002.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/bs/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/bs/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/bs/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 12:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1207,13 +1207,14 @@ msgstr "" #: dapiservicedialog.ui +#, fuzzy msgctxt "" "dapiservicedialog.ui\n" "label3\n" "label\n" "string.text" msgid "So_urce" -msgstr "" +msgstr "Izvor:" #: dapiservicedialog.ui #, fuzzy @@ -1576,6 +1577,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Prilagođeno" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3463,13 +3474,14 @@ msgstr "Broj stranica:" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "intervals\n" "label\n" "string.text" msgid "_Intervals:" -msgstr "" +msgstr "Interval" #: groupbydate.ui #, fuzzy @@ -3952,13 +3964,14 @@ msgstr "Sku_p znakova" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "Te_kst graničnik" #: imoptdialog.ui #, fuzzy @@ -5202,13 +5215,14 @@ msgstr "" #: optimalcolwidthdialog.ui +#, fuzzy msgctxt "" "optimalcolwidthdialog.ui\n" "label1\n" "label\n" "string.text" msgid "Add:" -msgstr "" +msgstr "_Dodaj" #: optimalcolwidthdialog.ui msgctxt "" @@ -5229,13 +5243,14 @@ msgstr "" #: optimalrowheightdialog.ui +#, fuzzy msgctxt "" "optimalrowheightdialog.ui\n" "label1\n" "label\n" "string.text" msgid "Add:" -msgstr "" +msgstr "_Dodaj" #: optimalrowheightdialog.ui msgctxt "" @@ -5690,13 +5705,14 @@ msgstr "Odabir" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "Zabilješka" #: pastespecial.ui msgctxt "" @@ -5837,13 +5853,14 @@ msgstr "O_pcije..." #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "Zabilješka" #: pivotfielddialog.ui #, fuzzy @@ -6712,22 +6729,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "_Lozinka" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "_Potvrdi" #: retypepassworddialog.ui msgctxt "" @@ -9620,13 +9639,14 @@ msgstr "Opcije" #: subtotalgrppage.ui +#, fuzzy msgctxt "" "subtotalgrppage.ui\n" "label1\n" "label\n" "string.text" msgid "Group by:" -msgstr "" +msgstr "Grupisano po" #: subtotalgrppage.ui msgctxt "" @@ -10511,22 +10531,24 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "minft\n" "label\n" "string.text" msgid "_Minimum:" -msgstr "" +msgstr "Minim_um" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "_Maksimum" #: validationcriteriapage.ui msgctxt "" @@ -10912,86 +10934,3 @@ "string.text" msgid "Grouped by" msgstr "Grupisano po" - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "Lijevo uvlačenje:" - -#, fuzzy -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "Vertikalno posloženi" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Vertikalno poravna tekst." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Vertikalno poravna tekst." - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "_Pozadina ćelije:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "Okvir _ćelije:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "Prikaži linije _mreže ćelije" - -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "_Kategorija:" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "_Negativni brojevi crveni" diff -Nru libreoffice-5.0.2/translations/source/bs/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/bs/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/bs/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 02:29+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:32+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: bs\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431397794.000000\n" +"X-POOTLE-MTIME: 1439555535.000000\n" #: alienwarndialog.ui msgctxt "" @@ -758,7 +758,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/bs/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/bs/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/bs/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-03-30 18:10+0000\n" -"Last-Translator: vljubovic \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:44+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: bs\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1396203014.000000\n" +"X-POOTLE-MTIME: 1439556250.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/bs/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/bs/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/bs/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/bs/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ca/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ca/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ca/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-06 08:54+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 11:44+0000\n" "Last-Translator: Joan Montané \n" "Language-Team: none\n" "Language: ca\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436172889.000000\n" +"X-POOTLE-MTIME: 1452512686.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 – 2015 col·laboradors del LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 – 2016 dels col·laboradors del LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ca/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/ca/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/ca/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ca/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/ca/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/ca/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-09-01 15:38+0000\n" "Last-Translator: Christian Lohmaier \n" "Language-Team: LANGUAGE \n" @@ -11025,12 +11025,13 @@ msgstr "Vista del gràfic" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Mostra el mapa d'imatge perquè pugueu fer clic a les zones sensibles i editar-les." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/ca/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/ca/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/ca/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-11 16:01+0000\n" -"Last-Translator: Joan Montané \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 12:57+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Language: ca\n" -"X-POOTLE-MTIME: 1431360060.000000\n" +"X-POOTLE-MTIME: 1439470663.000000\n" #: 01120000.xhp msgctxt "" @@ -43,12 +43,13 @@ msgstr "Mostra una previsualització de la pàgina impresa o tanca la previsualització." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Utilitzeu les icones de la barra Previsualització de la pàgina per desplaçar-vos per les pàgines del document o imprimir-lo." #: 01120000.xhp msgctxt "" @@ -68,12 +69,13 @@ msgstr "No podeu editar el document mentre us trobeu a la previsualització de la pàgina." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Per sortir de la previsualització de la pàgina, feu clic al botó Tanca la previsualització." #: 01120000.xhp msgctxt "" @@ -3686,13 +3688,14 @@ msgstr "Ombreigs dels camps" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Mostra o amaga els ombreigs dels camps en el document, inclosos espais no separables, guionets personalitzats, índexs i notes al peu." #: 03080000.xhp msgctxt "" @@ -4172,13 +4175,14 @@ msgstr "seccions;inserció de seccions pel DDEDDE; ordre per inserir seccions" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Secció" #: 04020100.xhp msgctxt "" @@ -4199,13 +4203,14 @@ msgstr "Secció nova" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Escriviu un nom per a la secció nova. Per defecte, el $[officename] assigna automàticament el nom \"Secció X\" a les seccions noves, on X és un nombre consecutiu." #: 04020100.xhp msgctxt "" @@ -4226,13 +4231,14 @@ msgstr "Enllaç" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Insereix el contingut d'un altre document o la secció d'un altre document en la secció actual." #: 04020100.xhp msgctxt "" @@ -4244,13 +4250,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Crea un enllaç DDE. Activeu aquesta casella de selecció i, a continuació, introduïu l'ordre DDE que voleu utilitzar. L'opció DDE només està disponible si la casella de selecció Enllaç està activada." #: 04020100.xhp msgctxt "" @@ -4271,22 +4278,24 @@ msgstr "Per exemple, per inserir una secció amb el nom \"Secció1\" a partir d'un document de text abc.sxw del $[officename] com a enllaç DDE, utilitzeu l'ordre: \"sofficex:\\abc.sxw Secció1\". Per inserir el contingut de la primera cel·la d'un fitxer d'un full de càlcul de l'MS Excel anomenat \"abc.xls\", utilitzeu l'ordre \"excel x:\\[abc.xls]Full1 z1s1\". També podeu copiar els elements que voleu inserir com a enllaç DDE i, a continuació, fer Edita - Enganxament especial. Després podeu visualitzar l'ordre DDE per a l'enllaç, seleccionant el contingut i triant Edita - Camps." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Nom de fitxer / ordre DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Introduïu el nom de fitxer i el camí del fitxer que voleu inserir o feu clic al botó de navegació (...) per localitzar-lo.Si la casella de selecció DDE està activada, introduïu l'ordre DDE que voleu utilitzar. " #: 04020100.xhp msgctxt "" @@ -4415,13 +4424,14 @@ msgstr "Amaga" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Amaga i evita que s'imprimeixi la secció seleccionada. Els components d'una secció amagada apareixen en color gris en el Navegador. Si deixeu la busca del ratolí sobre un component amagat en el Navegador, es mostra l'indicador d'ajuda \"amagat\"." #: 04020100.xhp msgctxt "" @@ -4442,13 +4452,14 @@ msgstr "Amb condició" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Introduïu la condició que s'ha de complir per amagar la secció. Una condició és una expressió lògica, com ara \"SALUTATION EQ Sr.\". Per exemple, si utilitzeu la característica Combinació de correu de la carta de formulari per definir un camp de la base de dades anomenat \"Salutació\" que conté \"Sr.\", \"Sra.\", o \"Sr. o Sra.\", aleshores podeu especificar que una secció només s'imprimirà si la salutació és \"Sr.\"." #: 04020100.xhp msgctxt "" @@ -16146,15 +16157,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Aquesta pestanya no està disponible en la visualització Format d'impressió." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -19952,13 +19954,14 @@ msgstr "Adapta l'amplada de la taula" #: 05090200.xhp +#, fuzzy msgctxt "" "05090200.xhp\n" "par_id3154280\n" "4\n" "help.text" msgid "Reduces or increases table width with modified column width. This option is not available if Automatic is selected in the Alignment area on the Table tab." -msgstr "" +msgstr "Si és possible, canvia l'amplada de la columna en relació amb l'amplada de columna que heu introduït. Aquesta opció no està disponible si Automàtic està seleccionat a l'àrea Alineació de la pestanya Taula." #: 05090200.xhp msgctxt "" @@ -22974,13 +22977,14 @@ msgstr "Obre un diàleg on podeu acceptar o rebutjar els canvis de la correcció automàtica. També podeu veure els canvis que ha fet un autor en concret o els que s'han aplicat en una data concreta." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Accepta o rebutja els canvis, pestanya Filtre" #: 05170000.xhp msgctxt "" @@ -23578,13 +23582,14 @@ msgstr "Per inserir un guionet no separable (protegit) directament al document, feu clic a la paraula que voleu partir i, a continuació, premeu Maj+OrdreCtrl+signe menys (-)." #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Per amagar els guionets personalitzats, trieu %PRODUCTNAME - PreferènciesEines - Opcions - %PRODUCTNAME Writer - Ajudes a la formatació i, a continuació, desactiveu la casella de selecció Guionets personalitzats." #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ca/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ca/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ca/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-26 10:41+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 11:45+0000\n" "Last-Translator: Joan Montané \n" "Language-Team: none\n" "Language: ca\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435315319.000000\n" +"X-POOTLE-MTIME: 1452512701.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "El valor mínim ha de ser inferior al valor màxim." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalitza" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ca/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ca/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ca/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-14 21:45+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 11:45+0000\n" "Last-Translator: Joan Montané \n" "Language-Team: none\n" "Language: ca\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439588746.000000\n" +"X-POOTLE-MTIME: 1452512717.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "Totes ls marques comercials i registrades mencionades aquí són propietat dels seus respectius propietaris.\n" "\n" -"Copyright © 2000 – 2015 dels col·laboradors del LibreOffice. Tots els drets reservats.\n" +"Copyright © 2000 – 2016 dels col·laboradors del LibreOffice. Tots els drets reservats.\n" "\n" "Aquest producte fou creat per %OOOVENDOR, basat en l'OpenOffice.org, amb copyright 2000 i 2011 d'Oracle o dels seus afiliats. %OOOVENDOR reconeix tots els membres de la comunitat. Visiteu http://www.libreoffice.org/ per a obtenir més detalls." diff -Nru libreoffice-5.0.2/translations/source/ca/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ca/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ca/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-06-16 19:35+0000\n" -"Last-Translator: Joan Montané \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:56+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434483355.000000\n" +"X-POOTLE-MTIME: 1439556987.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Ajusta el nivell d'escala" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ca-valencia/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-12 03:13+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 11:58+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ca-valencia\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431400392.000000\n" +"X-POOTLE-MTIME: 1439553535.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 – 2014 col·laboradors del LibreOffice." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/ca-valencia/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/ca-valencia/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 11:39+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11033,12 +11033,13 @@ msgstr "Vista del gràfic" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Mostra el mapa d'imatge perquè pugueu fer clic a les zones sensibles i editar-les." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/ca-valencia/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 12:52+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -43,12 +43,13 @@ msgstr "Mostra una previsualització de la pàgina impresa o tanca la previsualització." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Utilitzeu les icones de la barra Previsualització de la pàgina per desplaçar-vos per les pàgines del document o imprimir-lo." #: 01120000.xhp msgctxt "" @@ -68,12 +69,13 @@ msgstr "No podeu editar el document mentre vos trobeu a la previsualització de la pàgina." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Per eixir de la previsualització de la pàgina, feu clic al botó Tanca la previsualització." #: 01120000.xhp msgctxt "" @@ -110,13 +112,14 @@ msgstr "Obri el diàleg Combinació de correu, que vos ajudarà a imprimir i a guardar cartes de formulari." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Mentre s'imprimeix, la informació de la base de dades canvia els camps corresponents de la base de dades (espais reservats). Per obtenir més informació sobre la inserció de camps de la base de dades, consulteu la pestanya Base de dades a Insereix - Camps - Altres." #: 01150000.xhp msgctxt "" @@ -844,13 +847,14 @@ msgstr "Anterior" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Salta a l'element anterior en el document. Per especificar el tipus d'element al qual s'ha de saltar, feu clic a la icona Navegació i, a continuació, feu clic a una categoria d'element - per exemple, \"Gràfics\". Salta a l'element anterior en el document. Per especificar el tipus d'element al qual s'ha de saltar, feu clic a la icona Navegació i, a continuació, feu clic a una categoria d'element - per exemple, \"Gràfics\"." #: 02110000.xhp msgctxt "" @@ -879,13 +883,14 @@ msgstr "Següent" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Salta a l'element següent del document. Per especificar el tipus d'element al qual voleu saltar, feu clic a la icona Navegació i feu clic a una categoria d'element, com per exemple, \"Gràfics\". Salta a l'element següent en el document. Per especificar el tipus d'element al qual voleu saltar, feu clic a la icona Navegació i feu clic a una categoria d'element, com per exemple, \"Gràfics\"\"." #: 02110000.xhp msgctxt "" @@ -2918,12 +2923,13 @@ msgstr "Salta al camp anterior del mateix tipus al document. Este botó només és actiu quan el document conté més d'un camp del mateix tipus." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02140000.xhp msgctxt "" @@ -2953,12 +2959,13 @@ msgstr "Salta al camp següent del mateix tipus al document. Este botó només està actiu quan el document conté més d'un camp del mateix tipus." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02140000.xhp msgctxt "" @@ -3140,12 +3147,13 @@ msgstr "Es mou a l'àncora de la nota al peu o de la nota final anterior en el document." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02150000.xhp msgctxt "" @@ -3175,12 +3183,13 @@ msgstr "Es mou a l'àncora de la nota al peu o final següent en el document." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02150000.xhp msgctxt "" @@ -3380,12 +3389,13 @@ msgstr "Salta a la primera entrada d'índex del mateix tipus del document." #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02160000.xhp msgctxt "" @@ -3415,12 +3425,13 @@ msgstr "Salta a l'última entrada d'índex del mateix tipus del document." #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02160000.xhp msgctxt "" @@ -3485,12 +3496,13 @@ msgstr "Salta a l'entrada d'índex següent del mateix tipus del document." #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Icona" #: 02160000.xhp msgctxt "" @@ -3686,13 +3698,14 @@ msgstr "Ombreigs dels camps" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Mostra o amaga els ombreigs dels camps en el document, inclosos espais no separables, guionets personalitzats, índexs i notes al peu." #: 03080000.xhp msgctxt "" @@ -4172,13 +4185,14 @@ msgstr "seccions;inserció de seccions pel DDEDDE; orde per inserir seccions" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Secció" #: 04020100.xhp msgctxt "" @@ -4199,13 +4213,14 @@ msgstr "Secció nova" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Escriviu un nom per a la secció nova. Per defecte, el $[officename] assigna automàticament el nom \"Secció X\" a les seccions noves, on X és un nombre consecutiu." #: 04020100.xhp msgctxt "" @@ -4226,13 +4241,14 @@ msgstr "Enllaç" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Insereix el contingut d'un altre document o la secció d'un altre document en la secció actual." #: 04020100.xhp msgctxt "" @@ -4244,13 +4260,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Crea un enllaç DDE. Activeu esta casella de selecció i, a continuació, introduïu l'orde DDE que voleu utilitzar. L'opció DDE només està disponible si la casella de selecció Enllaç està activada." #: 04020100.xhp msgctxt "" @@ -4271,22 +4288,24 @@ msgstr "Per exemple, per inserir una secció amb el nom \"Secció1\" a partir d'un document de text abc.sxw del $[officename] com a enllaç DDE, utilitzeu l'orde: \"sofficex:\\abc.sxw Secció1\". Per inserir el contingut de la primera cel·la d'un fitxer d'un full de càlcul de l'MS Excel anomenat \"abc.xls\", utilitzeu l'orde \"excel x:\\[abc.xls]Full1 z1s1\". També podeu copiar els elements que voleu inserir com a enllaç DDE i, a continuació, fer Edita - Enganxament especial. Després podeu visualitzar l'orde DDE per a l'enllaç, seleccionant el contingut i triant Edita - Camps." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Nom de fitxer / orde DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Introduïu el nom de fitxer i el camí del fitxer que voleu inserir o feu clic al botó de navegació (...) per localitzar-lo.Si la casella de selecció DDE està activada, introduïu l'orde DDE que voleu utilitzar. " #: 04020100.xhp msgctxt "" @@ -4415,13 +4434,14 @@ msgstr "Amaga" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Amaga i evita que s'imprimisca la secció seleccionada. Els components d'una secció amagada apareixen en color gris en el Navegador. Si deixeu la busca del ratolí sobre un component amagat en el Navegador, es mostra l'indicador d'ajuda \"amagat\"." #: 04020100.xhp msgctxt "" @@ -4442,13 +4462,14 @@ msgstr "Amb condició" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Introduïu la condició que s'ha de complir per amagar la secció. Una condició és una expressió lògica, com ara \"SALUTATION EQ Sr.\". Per exemple, si utilitzeu la característica Combinació de correu de la carta de formulari per definir un camp de la base de dades anomenat \"Salutació\" que conté \"Sr.\", \"Sra.\", o \"Sr. o Sra.\", aleshores podeu especificar que una secció només s'imprimirà si la salutació és \"Sr.\"." #: 04020100.xhp msgctxt "" @@ -10182,13 +10203,14 @@ msgstr "Per visualitzar text condicional basat en el nombre de pàgines:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Trieu Insereix - Camps - Altres i, a continuació, feu clic a la pestanya Funcions." #: 04090200.xhp msgctxt "" @@ -10245,13 +10267,14 @@ msgstr "Per visualitzar text condicional basat en una variable definida per l'usuari" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Trieu Insereix - Camps - Altres i, a continuació, feu clic a la pestanya Variables." #: 04090200.xhp msgctxt "" @@ -10362,13 +10385,14 @@ msgstr "La primera part d'este exemple insereix un espai entre els camps \"Nom\" i \"Cognoms\" en un document, i la segona insereix text basat en el contingut del nom d'un camp. Este exemple requereix que es registri una font de dades d'una adreça amb el $[officename]." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Trieu Insereix - Camps - Altres i, a continuació, feu clic a la pestanya Base de dades." #: 04090200.xhp msgctxt "" @@ -16147,15 +16171,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Esta pestanya no està disponible en la visualització Format d'impressió." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16610,22 +16625,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Formata la mida, la posició i altres propietats del gràfic seleccionat." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "També podeu canviar algunes de les propietats del gràfic seleccionat amb les tecles de drecera." #: 05060000.xhp #, fuzzy @@ -17055,13 +17072,14 @@ msgstr "Inverteix els paràmetres d'alineació horitzontal actual a les pàgines parelles." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "També podeu utilitzar les opcions d'inversió dels Gràfics per ajustar el format dels objectes en les pàgines senars i parelles." #: 05060100.xhp msgctxt "" @@ -18173,13 +18191,14 @@ msgstr "Ajusta" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Especifiqueu les opcions d'inversió i d'enllaç per al gràfic seleccionat." #: 05060300.xhp msgctxt "" @@ -18200,13 +18219,14 @@ msgstr "Verticalment" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Inverteix verticalment el gràfic seleccionat." #: 05060300.xhp msgctxt "" @@ -18218,13 +18238,14 @@ msgstr "Horitzontalment" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Inverteix horitzontalment el gràfic seleccionat." #: 05060300.xhp msgctxt "" @@ -18236,13 +18257,14 @@ msgstr "En totes les pàgines" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Inverteix horitzontalment el gràfic seleccionat en totes les pàgines." #: 05060300.xhp msgctxt "" @@ -18254,13 +18276,14 @@ msgstr "En les pàgines de l'esquerra" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Inverteix horitzontalment el gràfic seleccionat només en les pàgines parelles." #: 05060300.xhp msgctxt "" @@ -18272,13 +18295,14 @@ msgstr "En les pàgines de la dreta" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Inverteix horitzontalment el gràfic seleccionat només en pàgines senars." #: 05060300.xhp msgctxt "" @@ -22978,13 +23002,14 @@ msgstr "Obri un diàleg on podeu acceptar o rebutjar els canvis de la correcció automàtica. També podeu veure els canvis que ha fet un autor en concret o els que s'han aplicat en una data concreta." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Accepta o rebutja els canvis, pestanya Filtre" #: 05170000.xhp msgctxt "" @@ -23582,13 +23607,14 @@ msgstr "Per inserir un guionet no separable (protegit) directament al document, feu clic a la paraula que voleu partir i, a continuació, premeu Maj+OrdeCtrl+signe menys (-)." #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Per amagar els guionets personalitzats, trieu %PRODUCTNAME - PreferènciesEines - Opcions - %PRODUCTNAME Writer - Ajudes a la formatació i, a continuació, desactiveu la casella de selecció Guionets personalitzats." #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ca-valencia/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 03:25+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 12:49+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ca-valencia\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431401125.000000\n" +"X-POOTLE-MTIME: 1439556584.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalitzat" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ca-valencia/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-12 03:28+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 13:04+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ca-valencia\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431401311.000000\n" +"X-POOTLE-MTIME: 1439557463.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -1996,11 +1996,3 @@ "string.text" msgid "Existing Versions" msgstr "Versions existents" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Reinicia" diff -Nru libreoffice-5.0.2/translations/source/ca-valencia/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ca-valencia/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ca-valencia/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ca-valencia/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-01-12 05:36+0000\n" -"Last-Translator: PauGNU \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 13:16+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ca-valencia\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421041006.000000\n" +"X-POOTLE-MTIME: 1439558216.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/cs/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/cs/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/cs/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-08 17:27+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-17 14:56+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: none\n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436376478.000000\n" +"X-POOTLE-MTIME: 1453042562.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 přispěvatelé do LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000–2016 přispěvatelé do LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/cs/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/cs/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-14 12:18+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-14 19:59+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439554697.000000\n" +"X-POOTLE-MTIME: 1444852787.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7983,123 +7983,111 @@ #. 🕜 (U+1F55C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_ONE-THIRTY\n" "LngText.text" msgid "1.30" -msgstr "1:30" +msgstr "1.30" #. 🕝 (U+1F55D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_TWO-THIRTY\n" "LngText.text" msgid "2.30" -msgstr "2:30" +msgstr "2.30" #. 🕞 (U+1F55E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_THREE-THIRTY\n" "LngText.text" msgid "3.30" -msgstr "3:30" +msgstr "3.30" #. 🕟 (U+1F55F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_FOUR-THIRTY\n" "LngText.text" msgid "4.30" -msgstr "4:30" +msgstr "4.30" #. 🕠 (U+1F560), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_FIVE-THIRTY\n" "LngText.text" msgid "5.30" -msgstr "5:30" +msgstr "5.30" #. 🕡 (U+1F561), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_SIX-THIRTY\n" "LngText.text" msgid "6.30" -msgstr "6:30" +msgstr "6.30" #. 🕢 (U+1F562), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_SEVEN-THIRTY\n" "LngText.text" msgid "7.30" -msgstr "7:30" +msgstr "7.30" #. 🕣 (U+1F563), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_EIGHT-THIRTY\n" "LngText.text" msgid "8.30" -msgstr "8:30" +msgstr "8.30" #. 🕤 (U+1F564), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_NINE-THIRTY\n" "LngText.text" msgid "9.30" -msgstr "9:30" +msgstr "9.30" #. 🕥 (U+1F565), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_TEN-THIRTY\n" "LngText.text" msgid "10.30" -msgstr "10:30" +msgstr "10.30" #. 🕦 (U+1F566), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_ELEVEN-THIRTY\n" "LngText.text" msgid "11.30" -msgstr "11:30" +msgstr "11.30" #. 🕧 (U+1F567), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOCK_FACE_TWELVE-THIRTY\n" "LngText.text" msgid "12.30" -msgstr "12:30" +msgstr "12.30" #. 🗻 (U+1F5FB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/sbasic/shared.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/sbasic/shared.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/sbasic/shared.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/sbasic/shared.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-08 17:34+0000\n" +"PO-Revision-Date: 2015-10-14 19:50+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436376863.000000\n" +"X-POOTLE-MTIME: 1444852221.000000\n" #: 00000002.xhp msgctxt "" @@ -9128,7 +9128,6 @@ msgstr "Print #iNumber, \"Another line of text\"" #: 03020103.xhp -#, fuzzy msgctxt "" "03020103.xhp\n" "tit\n" @@ -9145,7 +9144,6 @@ msgstr "Open (příkaz)" #: 03020103.xhp -#, fuzzy msgctxt "" "03020103.xhp\n" "hd_id3150791\n" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-08 19:49+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-22 19:48+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436384947.000000\n" +"X-POOTLE-MTIME: 1453492138.000000\n" #: 01010000.xhp msgctxt "" @@ -11019,8 +11019,8 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." -msgstr "Zobrazí obrázkovou mapu, abyste na ni mohli klepnout a upravit oblasti." +msgid "Displays the image map, so that you can click and edit the hotspots." +msgstr "Zobrazí obrázkovou mapu, abyste na ni mohli klepnout a upravit oblasti." #: 02220000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/explorer/database.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/explorer/database.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/explorer/database.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/explorer/database.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-24 10:20+0000\n" -"Last-Translator: Stanislav \n" +"PO-Revision-Date: 2015-11-07 18:30+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432462848.000000\n" +"X-POOTLE-MTIME: 1446921041.000000\n" #: 02000000.xhp msgctxt "" @@ -13350,7 +13350,7 @@ "par_id8286385\n" "help.text" msgid "Click the Execute Report iconIcon on the toolbar." -msgstr "V nástrojové liště klikněte na ikonku Spustit sestavu Ikona." +msgstr "Na nástrojové liště klepněte na ikonu Spustit sestavu Ikona." #: rep_main.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/guide.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/guide.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/shared/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/shared/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-08 17:20+0000\n" +"PO-Revision-Date: 2015-11-07 18:31+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436376044.000000\n" +"X-POOTLE-MTIME: 1446921081.000000\n" #: aaa_start.xhp msgctxt "" @@ -10517,7 +10517,7 @@ "13\n" "help.text" msgid "Press the down arrow or right arrow to open the selected toolbar. This is equivalent to a mouse click. In the toolbar use the right arrow and left arrow keys. The Home and End keys select the first and last icon in the toolbar, respectively." -msgstr "Stiskem šipky dolů nebo vpravo otevřete vybranou nástrojovou lištu. To odpovídá klepnutí myši. V nástrojové liště můžete použít šipky vlevo a vpravo. Klávesy Home a End vyberou první a poslední ikonu na nástrojové liště." +msgstr "Stiskem šipky dolů nebo vpravo otevřete vybranou nástrojovou lištu. To odpovídá klepnutí myši. Na nástrojové liště můžete použít šipky vlevo a vpravo. Klávesy Home a End vyberou první a poslední ikonu na nástrojové liště." #: keyboard.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-07-08 18:47+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-22 19:49+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436381229.000000\n" +"X-POOTLE-MTIME: 1453492151.000000\n" #: 01120000.xhp msgctxt "" @@ -4174,8 +4174,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "Sekce" +msgid "Section" +msgstr "Sekce" #: 04020100.xhp msgctxt "" @@ -16142,15 +16142,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Tato záložka není k dispozici v pohledu Náhled tisku" - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/guide.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/guide.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-08 16:50+0000\n" +"PO-Revision-Date: 2015-11-07 18:29+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436374238.000000\n" +"X-POOTLE-MTIME: 1446920952.000000\n" #: anchor_object.xhp msgctxt "" @@ -251,7 +251,7 @@ "71\n" "help.text" msgid "On the Standard Bar, click the Navigator icon Icon to open the Navigator." -msgstr "Klepnutím na ikonu NavigátorIkonav nástrojové lištěStandardníotevřeteNavigátor." +msgstr "Klepnutím na ikonu Navigátor Ikona na nástrojové liště Standardní otevřeteNavigátor." #: arrange_chapters.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/librelogo.po libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/librelogo.po --- libreoffice-5.0.2/translations/source/cs/helpcontent2/source/text/swriter/librelogo.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/helpcontent2/source/text/swriter/librelogo.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-08 19:35+0000\n" +"PO-Revision-Date: 2015-10-14 19:50+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436384126.000000\n" +"X-POOTLE-MTIME: 1444852249.000000\n" #: LibreLogo.xhp msgctxt "" @@ -1017,7 +1017,6 @@ msgstr "OBDÉLNÍK" #: LibreLogo.xhp -#, fuzzy msgctxt "" "LibreLogo.xhp\n" "par_1330\n" diff -Nru libreoffice-5.0.2/translations/source/cs/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/cs/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/cs/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-14 12:40+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-15 21:54+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439556053.000000\n" +"X-POOTLE-MTIME: 1444946050.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -3302,7 +3302,6 @@ msgstr "Smazat ~zalomení stránky" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Popups..uno:FillCellsMenu\n" @@ -6000,7 +5999,7 @@ "Label\n" "value.text" msgid "Photo Album" -msgstr "Foto album" +msgstr "Fotoalbum" #: DrawImpressCommands.xcu msgctxt "" @@ -15149,7 +15148,6 @@ msgstr "Odrážky a číslování..." #: GenericCommands.xcu -#, fuzzy msgctxt "" "GenericCommands.xcu\n" "..GenericCommands.UserInterface.Commands..uno:EditDoc\n" @@ -20874,7 +20872,6 @@ msgstr "Spravovat změny" #: Sidebar.xcu -#, fuzzy msgctxt "" "Sidebar.xcu\n" "..Sidebar.Content.DeckList.DesignDeck\n" diff -Nru libreoffice-5.0.2/translations/source/cs/officecfg/registry/data/org/openoffice/Office.po libreoffice-5.0.5~rc2/translations/source/cs/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-5.0.2/translations/source/cs/officecfg/registry/data/org/openoffice/Office.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/officecfg/registry/data/org/openoffice/Office.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-10 13:27+0000\n" +"PO-Revision-Date: 2015-10-14 20:02+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436534840.000000\n" +"X-POOTLE-MTIME: 1444852923.000000\n" #: Addons.xcu msgctxt "" @@ -89,7 +89,6 @@ msgstr "SMAŽOBRAZOVKU" #: Addons.xcu -#, fuzzy msgctxt "" "Addons.xcu\n" ".Addons.AddonUI.OfficeToolBar.LibreLogo.OfficeToolBar.m10\n" @@ -99,7 +98,6 @@ msgstr "Příkazový řádek pro Logo (pro vykonání příkazu stiskněte Enter, pro nápovědu F1)" #: Addons.xcu -#, fuzzy msgctxt "" "Addons.xcu\n" ".Addons.AddonUI.OfficeToolBar.LibreLogo.OfficeToolBar.m09\n" diff -Nru libreoffice-5.0.2/translations/source/cs/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/cs/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/cs/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sc/source/ui/src.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-14 12:52+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-15 21:23+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439556767.000000\n" +"X-POOTLE-MTIME: 1444944193.000000\n" #: condformatdlg.src msgctxt "" @@ -689,7 +689,7 @@ "3 Flags\n" "stringlist.text" msgid "3 Flags" -msgstr "3 emotikony" +msgstr "3 vlajky" #: condformatdlg.src msgctxt "" @@ -4920,7 +4920,6 @@ msgstr "Název" #: globstr.src -#, fuzzy msgctxt "" "globstr.src\n" "RID_GLOBSTR\n" diff -Nru libreoffice-5.0.2/translations/source/cs/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/cs/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/cs/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-10 14:19+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-17 14:56+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: none\n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436537973.000000\n" +"X-POOTLE-MTIME: 1453042602.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "Minimální hodnota musí být menší než maximální." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Vlastní" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/cs/sd/source/ui/view.po libreoffice-5.0.5~rc2/translations/source/cs/sd/source/ui/view.po --- libreoffice-5.0.2/translations/source/cs/sd/source/ui/view.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sd/source/ui/view.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-14 13:08+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-14 19:53+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439557727.000000\n" +"X-POOTLE-MTIME: 1444852386.000000\n" #: DocumentRenderer.src msgctxt "" @@ -104,7 +104,7 @@ "According to layout\n" "itemlist.text" msgid "According to layout" -msgstr "" +msgstr "Podle rozvržení" #: DocumentRenderer.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/sd/uiconfig/simpress/ui.po libreoffice-5.0.5~rc2/translations/source/cs/sd/uiconfig/simpress/ui.po --- libreoffice-5.0.2/translations/source/cs/sd/uiconfig/simpress/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sd/uiconfig/simpress/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-29 19:51+0000\n" +"PO-Revision-Date: 2015-10-15 21:55+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: none\n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438199489.000000\n" +"X-POOTLE-MTIME: 1444946127.000000\n" #: assistentdialog.ui msgctxt "" @@ -1301,7 +1301,7 @@ "label\n" "string.text" msgid "Number" -msgstr "Číslo" +msgstr "Počet" #: dockinganimation.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/cs/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/cs/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-09 16:36+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-17 14:55+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: none\n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436459774.000000\n" +"X-POOTLE-MTIME: 1453042534.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "Všechny ochranné známky a registrované ochranné známky, které jsou zde zmíněny, jsou majetkem jejich vlastníků.\n" "\n" -"Copyright © 2000, 2015 přispěvatelé do LibreOffice. Všechna práva vyhrazena.\n" +"Copyright © 2000–2016 přispěvatelé do LibreOffice. Všechna práva vyhrazena.\n" "\n" "Tento produkt vytvořila %OOOVENDOR na základě OpenOffice.org, který je Copyright 2000, 2011 Oracle a/nebo jeho pobočky. %OOOVENDOR děkuje všem členům komunity, podrobnosti naleznete na stránce http://www.libreoffice.org/." diff -Nru libreoffice-5.0.2/translations/source/cs/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/cs/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/cs/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/svx/source/dialog.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-05-23 09:53+0000\n" -"Last-Translator: Stanislav \n" +"PO-Revision-Date: 2015-10-14 20:03+0000\n" +"Last-Translator: Stanislav Horáček \n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432374810.000000\n" +"X-POOTLE-MTIME: 1444853018.000000\n" #: bmpmask.src msgctxt "" @@ -434,7 +434,7 @@ "RID_SVXSTR_LANGUAGE_ALL\n" "string.text" msgid "[All]" -msgstr "[vše]" +msgstr "[Vše]" #: passwd.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cs/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/cs/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/cs/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-08 16:08+0000\n" -"Last-Translator: Stanislav Horáček \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 13:23+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436371699.000000\n" +"X-POOTLE-MTIME: 1439558603.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Upravit úroveň přiblížení" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/cs/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/cs/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/cs/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/cs/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/cs/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/cs/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cs/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-10 14:22+0000\n" +"PO-Revision-Date: 2015-10-14 20:00+0000\n" "Last-Translator: Stanislav Horáček \n" "Language-Team: none\n" "Language: cs\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436538171.000000\n" +"X-POOTLE-MTIME: 1444852823.000000\n" #: abstractdialog.ui msgctxt "" @@ -10597,7 +10597,6 @@ msgstr "S_loupec:" #: opttablepage.ui -#, fuzzy msgctxt "" "opttablepage.ui\n" "label14\n" diff -Nru libreoffice-5.0.2/translations/source/cy/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/cy/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/cy/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-27 18:30+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 10:22+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: LANGUAGE \n" "Language: cy\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440700225.000000\n" +"X-POOTLE-MTIME: 1452507752.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Hawlfraint © 2000 - 2015 cyfranwyr LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Hawlfraint © 2000 - 2016 cyfranwyr LibreOffice." #: aboutdialog.ui msgctxt "" @@ -16904,7 +16904,7 @@ "label\n" "string.text" msgid "Area Transparency Mode" -msgstr "Modd Tryloyw Ardal" +msgstr "Modd Tryloywder Ardal" #: transparencytabpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-14 16:01+0000\n" +"PO-Revision-Date: 2015-11-11 11:21+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: LANGUAGE \n" "Language: cy\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1442246518.000000\n" +"X-POOTLE-MTIME: 1447240891.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -6386,7 +6386,7 @@ "Label\n" "value.text" msgid "S~lide Show Settings..." -msgstr "~Gosodiadau Sioe Tryloywder..." +msgstr "~Gosodiadau Sioe Sleidiau..." #: DrawImpressCommands.xcu msgctxt "" @@ -6809,7 +6809,7 @@ "Label\n" "value.text" msgid "Sli~de Sorter" -msgstr "~Trefnydd Tryloywderau" +msgstr "~Trefnydd Sleidiau" #: DrawImpressCommands.xcu msgctxt "" @@ -6827,7 +6827,7 @@ "Label\n" "value.text" msgid "Slid~e" -msgstr "~Tryloywder" +msgstr "~Sleid" #: DrawImpressCommands.xcu msgctxt "" @@ -8150,7 +8150,7 @@ "Label\n" "value.text" msgid "Sli~de Sorter" -msgstr "~Trefnydd Tryloywderau" +msgstr "~Trefnydd Sleidiau" #: DrawImpressCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cy/officecfg/registry/data/org/openoffice/Office.po libreoffice-5.0.5~rc2/translations/source/cy/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-5.0.2/translations/source/cy/officecfg/registry/data/org/openoffice/Office.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/officecfg/registry/data/org/openoffice/Office.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-14 12:35+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-29 09:03+0000\n" +"Last-Translator: Rhoslyn Prys \n" "Language-Team: LANGUAGE \n" "Language: cy\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439555727.000000\n" +"X-POOTLE-MTIME: 1446109384.000000\n" #: Addons.xcu msgctxt "" @@ -6962,7 +6962,7 @@ "Name\n" "value.text" msgid "PackageDimensions" -msgstr "PackageDimensions" +msgstr "DimensiynauPecyn" #: TableWizard.xcu msgctxt "" @@ -6980,7 +6980,7 @@ "Name\n" "value.text" msgid "PackageWeight" -msgstr "PackageWeight" +msgstr "PwysauPecyn" #: TableWizard.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/cy/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/cy/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/cy/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-27 18:30+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 15:44+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: none\n" "Language: cy\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440700247.000000\n" +"X-POOTLE-MTIME: 1452527069.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "Rhaid i'r isafswm gwerth fod yn llai na'r uchafswm gwerth." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Cyfaddas" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/cy/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/cy/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/cy/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-07 10:08+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-11 15:44+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: none\n" "Language: cy\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436263694.000000\n" +"X-POOTLE-MTIME: 1452527085.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "Eiddo eu perchnogion yw'r holl nodau masnach a nodau masnach cofrestredig nodir yma.\n" "\n" -"Hawlfraint © 2000, 2015 cyfranwyr LibreOffice contributors a'u cysylltiadau. Diogelir pob hawl.\n" +"Hawlfraint © 2000, 2016 cyfranwyr LibreOffice contributors a'u cysylltiadau. Diogelir pob hawl.\n" "\n" "Crëwyd y cynnyrch hwn gan %OOOVENDOR, ar sail OpenOffice.org, Hawlfraint 2000, 2011 Oracle a/neu ei gysylltiadau. Mae %OOOVENDOR yn cydnabod pob aelod cymunedol, gw. http://www.libreoffice.org/ am wybodaeth bellach." diff -Nru libreoffice-5.0.2/translations/source/cy/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/cy/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/cy/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-19 11:43+0000\n" -"Last-Translator: Rhoslyn \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 13:25+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: cy\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==2) ? 1 : 0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432035832.000000\n" +"X-POOTLE-MTIME: 1439558753.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Newid lefel y chwyddo" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/cy/uui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/cy/uui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/cy/uui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/cy/uui/uiconfig/ui.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-07 09:13+0000\n" +"PO-Revision-Date: 2015-09-24 14:38+0000\n" "Last-Translator: Rhoslyn Prys \n" "Language-Team: LANGUAGE \n" "Language: cy\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436260397.000000\n" +"X-POOTLE-MTIME: 1443105486.000000\n" #: authfallback.ui msgctxt "" @@ -202,7 +202,7 @@ "label\n" "string.text" msgid "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 "Gall facros gynnwys firysau. Mae diffodd macros ar gyfer dogfen yn beth ddiogel. Os fyddwch yn diffodd macro gallwch golli swyddogaethau sy'n cael eu darparu ganddynt." +msgstr "Gall facros gynnwys firysau. Mae analluogi macros ar gyfer dogfen bob tro'n fwy diogel. Os fyddwch yn diffodd macro gallwch golli'r swyddogaethau sy'n cael eu darparu ganddynt." #: macrowarnmedium.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/da/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/da/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-26 18:47+0000\n" -"Last-Translator: Jesper Hertel \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 17:26+0000\n" +"Last-Translator: Leif Lodahl \n" "Language-Team: none\n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435344468.000000\n" +"X-POOTLE-MTIME: 1452273983.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 LibreOffice bidragydere." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/da/dbaccess/source/ui/dlg.po libreoffice-5.0.5~rc2/translations/source/da/dbaccess/source/ui/dlg.po --- libreoffice-5.0.2/translations/source/da/dbaccess/source/ui/dlg.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/dbaccess/source/ui/dlg.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-25 18:49+0000\n" -"Last-Translator: Jeppe Bundsgaard \n" +"PO-Revision-Date: 2015-12-06 11:14+0000\n" +"Last-Translator: Leif Lodahl \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440528560.000000\n" +"X-POOTLE-MTIME: 1449400480.000000\n" #: AutoControls.src msgctxt "" @@ -275,7 +275,7 @@ "STR_AUTOFIELDSEPARATORLIST\n" "string.text" msgid ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32" -msgstr ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Mellemrumstegn}\t32" +msgstr ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Mellemrum}\t32" #: dbadmin.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/da/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/da/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:40-0500\n" +"POT-Creation-Date: 2015-11-27 22:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1031,14 +1031,13 @@ msgstr "GULV.MAT" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_FLOOR_PRECISE\n" "string.text" msgid "FLOOR.PRECISE" -msgstr "GULV.PRECISE" +msgstr "GULV.PRÆCIS" #: core_resource.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/sbasic/shared.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/sbasic/shared.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/sbasic/shared.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/sbasic/shared.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-25 18:43+0000\n" +"PO-Revision-Date: 2015-12-27 14:41+0000\n" "Last-Translator: Leif Lodahl \n" "Language-Team: LANGUAGE \n" "Language: da\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440528214.000000\n" +"X-POOTLE-MTIME: 1451227314.000000\n" #: 00000002.xhp msgctxt "" @@ -4631,7 +4631,7 @@ "19\n" "help.text" msgid "Opens the Macro Organizer dialog." -msgstr "Åbner dialogen $[officename] Basic-makroadministration." +msgstr "Åbner dialogen Basic-makroadministration." #: 01050100.xhp msgctxt "" @@ -27098,7 +27098,7 @@ "9\n" "help.text" msgid "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]" -msgstr "Dim VarNavn [(start To end)] [As VarType][, VarNavn2 [(start To end)] [As VarType2][,...]]" +msgstr "Dim VarNavn [(start To end)] [As VarType][, VarNavn2 [(start To end)] [As VarType][,...]]" #: 03102100.xhp msgctxt "" @@ -27420,7 +27420,7 @@ "4\n" "help.text" msgid "[ReDim]Dim VarName [(start To end)] [As VarType][, VarName2 [(start To end)] [As VarType][,...]]" -msgstr "Dim VarNavn [(start To end)] [As VarType][, VarNavn2 [(start To end)] [As VarType2][,...]]" +msgstr "Dim VarNavn [(start To end)] [As VarType][, VarNavn2 [(start To end)] [As VarType][,...]]" #: 03102101.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/01.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/01.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/01.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-19 12:45+0000\n" -"Last-Translator: Leif Lodahl \n" +"PO-Revision-Date: 2015-12-29 18:44+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437309919.000000\n" +"X-POOTLE-MTIME: 1451414657.000000\n" #: 01120000.xhp msgctxt "" @@ -7286,7 +7286,7 @@ "39\n" "help.text" msgid "Salvage Value" -msgstr "10.666,67 valutaenheder" +msgstr "Scrapværdi" #: 04060103.xhp msgctxt "" @@ -7295,7 +7295,7 @@ "40\n" "help.text" msgid "Useful Life" -msgstr "10.666,67 valutaenheder" +msgstr "Aktivets levetid" #: 04060103.xhp msgctxt "" @@ -7313,7 +7313,7 @@ "42\n" "help.text" msgid "Deprec. SYD" -msgstr "10.666,67 valutaenheder" +msgstr "Nedskrivning. SYD (Sum of Years Digits)" #: 04060103.xhp msgctxt "" @@ -7637,7 +7637,7 @@ "82\n" "help.text" msgid "=SYD($A$2;$B$2;$C$2;D2)" -msgstr "=TFORDELING(12;5;1)" +msgstr "=SYD($A$2;$B$2;$C$2;D2)" #: 04060103.xhp msgctxt "" @@ -10196,7 +10196,7 @@ "99\n" "help.text" msgid "=IFNA(D3;D4) returns the value of D3 if D3 does not result in an #N/A error, or D4 if it does." -msgstr "" +msgstr "=HVIS.IKKE.TILGÆNGELIG(D3;D4) returnerer værdien af D3 såfremt D3 ikke resulterer i en #N/A fejl, ellers returneres D4." #: 04060104.xhp msgctxt "" @@ -10974,7 +10974,7 @@ "176\n" "help.text" msgid "=CELL(\"ADDRESS\";Sheet3.D2) returns $Sheet3.$D$2." -msgstr "CELLE(\"ADDRESS\"; Ark3.D2) returnerer $Ark3.$D$2." +msgstr "=CELLE(\"ADDRESS\";Ark3.D2) returnerer $Ark3.$D$2." #: 04060104.xhp msgctxt "" @@ -11010,7 +11010,7 @@ "180\n" "help.text" msgid "=CELL(\"FILENAME\";D2) returns 'file:///X:/dr/own.sxc'#$Sheet1, if the formula in the current document X:\\dr\\own.sxc is located in Sheet1." -msgstr "CELLE(\"FILENAME\"; D2) returnerer 'fil:///X:/dr/egen.sxc'#$Ark1, hvis formlen i det aktuelle dokument X:\\dr\\egen.sxc er tilstede i Ark1." +msgstr "=CELLE(\"FILENAME\";D2) returnerer 'fil:///X:/dr/egen.sxc'#$Ark1, hvis formlen i det aktuelle dokument X:\\dr\\egen.sxc er tilstede i Ark1." #: 04060104.xhp msgctxt "" @@ -17345,7 +17345,7 @@ "bm_id2957404\n" "help.text" msgid "FLOOR.PRECISE functionrounding;down to nearest multiple of significance" -msgstr "GULV.PRECISE-funktionafrunding; ned til nærmeste multiplum af nøjagtighed" +msgstr "GULV.PRÆCIS-funktionafrunding; ned til nærmeste multiplum af nøjagtighed" #: 04060106.xhp msgctxt "" @@ -17354,7 +17354,7 @@ "512\n" "help.text" msgid "FLOOR.PRECISE" -msgstr "GULV.PRECISE" +msgstr "GULV.PRÆCIS" #: 04060106.xhp msgctxt "" @@ -17381,7 +17381,7 @@ "515\n" "help.text" msgid "FLOOR.PRECISE(Number; Significance)" -msgstr "GULV.PRECISE(Tal; Nøjagtighed)" +msgstr "GULV.PRÆCIS(Tal; Nøjagtighed)" #: 04060106.xhp msgctxt "" @@ -17417,7 +17417,7 @@ "519\n" "help.text" msgid "=FLOOR.PRECISE( -11;-2) returns -12" -msgstr "=GULV.PRECISE( -11;-2) returnerer -12" +msgstr "=GULV.PRÆCIS( -11;-2) returnerer -12" #: 04060106.xhp msgctxt "" @@ -22295,7 +22295,7 @@ "37\n" "help.text" msgid "=DDE(\"soffice\";\"c:\\office\\document\\motto.sxw\";\"Today's motto\") returns a motto in the cell containing this formula. First, you must enter a line in the motto.sxw document containing the motto text and define it as the first line of a section named Today's Motto (in %PRODUCTNAME Writer under Insert - Section). If the motto is modified (and saved) in the %PRODUCTNAME Writer document, the motto is updated in all %PRODUCTNAME Calc cells in which this DDE link is defined." -msgstr "=DDE(\"soffice\";\"c:\\Kontor\\dokument\\motto.sxw\";\"Dagens Motto\") returnerer et motto i den celle, som indeholder denne formel. Først skal du indtaste en linje i motto.sxw dokumentet som indeholder mottoets tekst og angive den som den første linje af en sektion med navnet Dagens Motto (i %PRODUCTNAME Writer under Indsæt - Sektion). Hvis mottoet bliver ændret (og gemt) i %PRODUCTNAME Writer dokumentet, bliver mottoet opdateret i alle %PRODUCTNAME Calc celler hvor denne DDE-kæde er defineret." +msgstr "=DDE(\"soffice\";\"c:\\Kontor\\dokument\\motto.sxw\";\"Dagens Motto\") returnerer et motto i den celle, som indeholder denne formel. Først skal du indtaste en linje i motto.sxw dokumentet som indeholder mottoets tekst og angive den som den første linje af en sektion med navnet Dagens Motto (i %PRODUCTNAME Writer under Indsæt - Sektion). Hvis mottoet bliver ændret (og gemt) i %PRODUCTNAME Writer dokumentet, bliver mottoet opdateret i alle %PRODUCTNAME Calc celler hvor denne DDE-kæde er defineret." #: 04060109.xhp msgctxt "" @@ -25606,7 +25606,7 @@ "par_id2949141\n" "help.text" msgid "LEFTB(\"中国\";1) returns \" \" (1 byte is only half a DBCS character and a space character is returned instead)." -msgstr "" +msgstr "VENSTREB(\"中国\";1) returnerer \" \" (1 byte udgør kun halvdelen af et DBCS tegn og et blanktegn returneres i stedet)." #: 04060110.xhp msgctxt "" @@ -25614,7 +25614,7 @@ "par_id2949151\n" "help.text" msgid "LEFTB(\"中国\";2) returns \"中\" (2 bytes constitute one complete DBCS character)." -msgstr "" +msgstr "VENSTREB(\"中国\";2) returnerer \"中\" (2 bytes udgør et helt DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -25622,7 +25622,7 @@ "par_id2949161\n" "help.text" msgid "LEFTB(\"中国\";3) returns \"中 \" (3 bytes constitute one DBCS character and a half; the last character returned is therefore a space character)." -msgstr "" +msgstr "VENSTREB(\"中国\";3) returnerer \"中 \" (3 bytes udgør halvanden DBCS tegn ; det sidst returnerede tegn er derfor et blanktegn)." #: 04060110.xhp msgctxt "" @@ -25630,7 +25630,7 @@ "par_id2949171\n" "help.text" msgid "LEFTB(\"中国\";4) returns \"中国\" (4 bytes constitute two complete DBCS characters)." -msgstr "" +msgstr "VENSTREB(\"中国\";4) returnerer \"中国\" (4 bytes udgør to hele DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -25638,7 +25638,7 @@ "par_id2949181\n" "help.text" msgid "LEFTB(\"office\";3) returns \"off\" (3 non-DBCS characters each consisting of 1 byte)." -msgstr "" +msgstr "VENSTREB(\"office\";3) returnerer \"off\" (3 ikke-DBCS tegn, der hver består af 1 byte)." #: 04060110.xhp msgctxt "" @@ -25787,7 +25787,7 @@ "par_id2956018\n" "help.text" msgid "LENB(\"中\") returns 2 (1 DBCS character consisting of 2 bytes)." -msgstr "" +msgstr "LÆNGDEB(\"中\") returnerer 2 (et DBCS tegn består af 2 bytes)." #: 04060110.xhp msgctxt "" @@ -25795,7 +25795,7 @@ "par_id2956028\n" "help.text" msgid "LENB(\"中国\") returns 4 (2 DBCS characters each consisting of 2 bytes)." -msgstr "" +msgstr "LÆNGDEB(\"中国\") returnerer 4 (to DBCS tegn hver på 2 bytes)." #: 04060110.xhp msgctxt "" @@ -25803,7 +25803,7 @@ "par_id2956038\n" "help.text" msgid "LENB(\"office\") returns 6 (6 non-DBCS characters each consisting of 1 byte)." -msgstr "" +msgstr "LÆNGDEB(\"office\") returnerer 6 (seks ikke-DBCS tegn hver på 1 byte)." #: 04060110.xhp msgctxt "" @@ -26068,7 +26068,7 @@ "par_id2958417\n" "help.text" msgid "MIDB(\"中国\";1;0) returns \"\" (0 bytes is always an empty string)." -msgstr "" +msgstr "MIDTB(\"中国\";1;0) returnerer \"\" (0 bytes er altid en tom streng)." #: 04060110.xhp msgctxt "" @@ -26076,7 +26076,7 @@ "par_id2958427\n" "help.text" msgid "MIDB(\"中国\";1;1) returns \" \" (1 byte is only half a DBCS character and therefore the result is a space character)." -msgstr "" +msgstr "MIDTB(\"中国\";1;1) returnerer \" \" (1 byte er kun et halvt DBCS tegn og derfor er resultatet et blanktegn)." #: 04060110.xhp msgctxt "" @@ -26084,7 +26084,7 @@ "par_id2958437\n" "help.text" msgid "MIDB(\"中国\";1;2) returns \"中\" (2 bytes constitute one complete DBCS character)." -msgstr "" +msgstr "MIDTB(\"中国\";1;2) returnerer \"中\" (2 bytes udgør et fuldt DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -26092,7 +26092,7 @@ "par_id2958447\n" "help.text" msgid "MIDB(\"中国\";1;3) returns \"中 \" (3 bytes constitute one and a half DBCS character; the last byte results in a space character)." -msgstr "" +msgstr "MIDTB(\"中国\";1;3) returnerer \"中 \" (3 bytes udgør 1½ DBCS tegn; den sidste byte resulterer i et blanktegn)." #: 04060110.xhp msgctxt "" @@ -26100,7 +26100,7 @@ "par_id2958457\n" "help.text" msgid "MIDB(\"中国\";1;4) returns \"中国\" (4 bytes constitute two complete DBCS characters)." -msgstr "" +msgstr "MIDTB(\"中国\";1;4) returnerer \"中国\" (4 bytes udgør to fulde DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -26108,7 +26108,7 @@ "par_id2958467\n" "help.text" msgid "MIDB(\"中国\";2;1) returns \" \" (byte position 2 is not at the beginning of a character in a DBCS string; 1 space character is returned)." -msgstr "" +msgstr "MIDTB(\"中国\";2;1) returnerer \" \" (byte position 2 er ikke i begyndelsen af et tegn i en DBCS streng; derfor returneres et blanktegn)." #: 04060110.xhp msgctxt "" @@ -26116,7 +26116,7 @@ "par_id2958477\n" "help.text" msgid "MIDB(\"中国\";2;2) returns \" \" (byte position 2 points to the last half of the first character in the DBCS string; the 2 bytes asked for therefore constitutes the last half of the first character and the first half of the second character in the string; 2 space characters are therefore returned)." -msgstr "" +msgstr "MIDTB(\"中国\";2;2) returnerer \" \" (byte position 2 peger på den sidste halvdel af det første tegn i en DBCS streng; de 2 bytes, der udbedes, udgør derfor den sidste halvdel af det første tegn og den første halvdel af det andet tegn i strengen; derfor returneres 2 blanktegn)." #: 04060110.xhp msgctxt "" @@ -26124,7 +26124,7 @@ "par_id2958487\n" "help.text" msgid "MIDB(\"中国\";2;3) returns \" 国\" (byte position 2 is not at the beginning of a character in a DBCS string; a space character is returned for byte position 2)." -msgstr "" +msgstr "MIDTB(\"中国\";2;3) returnerer \" 国\" (byte position 2 er ikke i starten af et tegn i en DBCS streng; derfor returneres et blanktegn for byte position 2)." #: 04060110.xhp msgctxt "" @@ -26132,7 +26132,7 @@ "par_id2958497\n" "help.text" msgid "MIDB(\"中国\";3;1) returns \" \" (byte position 3 is at the beginning of a character in a DBCS string, but 1 byte is only half a DBCS character and a space character is therefore returned instead)." -msgstr "" +msgstr "MIDTB(\"中国\";3;1) returnerer \" \" (byte position 3 er i starten af et DBCS tegn, men 1 byte er kun et halvt DBCS tegn og derfor returneres et blanktegn)." #: 04060110.xhp msgctxt "" @@ -26140,7 +26140,7 @@ "par_id2958507\n" "help.text" msgid "MIDB(\"中国\";3;2) returns \"国\" (byte position 3 is at the beginning of a character in a DBCS string, and 2 bytes constitute one DBCS character)." -msgstr "" +msgstr "MIDTB(\"中国\";3;2) returnerer \"国\" (byte position 3 er i starten af et DBCS tegn, og 2 bytes udgør et DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -26148,7 +26148,7 @@ "par_id2958517\n" "help.text" msgid "MIDB(\"office\";2;3) returns \"ffi\" (byte position 2 is at the beginning of a character in a non-DBCS string, and 3 bytes of a non-DBCS string constitute 3 characters)." -msgstr "" +msgstr "MIDTB(\"office\";2;3) returnerer \"ffi\" (byte position 2 er i begyndelsen af et ikke-DBCS tegn, og bytes i en ikke-DBCS streng udgør 3 tegn)." #: 04060110.xhp msgctxt "" @@ -26573,7 +26573,7 @@ "par_id2951132\n" "help.text" msgid "RIGHTB(\"中国\";1) returns \" \" (1 byte is only half a DBCS character and a space character is returned instead)." -msgstr "" +msgstr "HØJREB(\"中国\";1) returnerer \" \" (1 byte er kun et halvt DBCS tegn og derfor returneres et blanktegn)." #: 04060110.xhp msgctxt "" @@ -26581,7 +26581,7 @@ "par_id2951142\n" "help.text" msgid "RIGHTB(\"中国\";2) returns \"国\" (2 bytes constitute one complete DBCS character)." -msgstr "" +msgstr "HØJREB(\"中国\";2) returnerer \"国\" (2 bytes udgør et helt DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -26589,7 +26589,7 @@ "par_id2951152\n" "help.text" msgid "RIGHTB(\"中国\";3) returns \" 国\" (3 bytes constitute one half DBCS character and one whole DBCS character; a space is returned for the first half)." -msgstr "" +msgstr "HØJREB(\"中国\";3) returnerer \" 国\" (3 bytes udgør ½ DBCS tegn og et helt DBCS tegn; et blanktegn returneres for det første halve tegn)." #: 04060110.xhp msgctxt "" @@ -26597,7 +26597,7 @@ "par_id2951162\n" "help.text" msgid "RIGHTB(\"中国\";4) returns \"中国\" (4 bytes constitute two complete DBCS characters)." -msgstr "" +msgstr "HØJREB(\"中国\";4) returnerer \"中国\" (4 bytes udgør to fulde DBCS tegn)." #: 04060110.xhp msgctxt "" @@ -26605,7 +26605,7 @@ "par_id2951172\n" "help.text" msgid "RIGHTB(\"office\";3) returns \"ice\" (3 non-DBCS characters each consisting of 1 byte)." -msgstr "" +msgstr "HØJREB(\"office\";3) returnerer \"ice\" (3 ikke-DBCS tegn hver bestående af 1 byte)." #: 04060110.xhp msgctxt "" @@ -28088,7 +28088,7 @@ "73\n" "help.text" msgid "Add-ins can also be implemented through the %PRODUCTNAME API." -msgstr "Tilføjelsesfunktioner kan også implementeres via %PRODUCTNAME API." +msgstr "Tilføjelsesfunktioner kan også implementeres via %PRODUCTNAME API." #: 04060112.xhp msgctxt "" @@ -30981,7 +30981,7 @@ "136\n" "help.text" msgid "Returns values of the Gaussian error integral." -msgstr "Returnerer værdier af det Gauss fejl integrale." +msgstr "Returnerer værdier af det Gauss fejl integrale." #: 04060115.xhp msgctxt "" @@ -30993,14 +30993,13 @@ msgstr "Syntaks" #: 04060115.xhp -#, fuzzy msgctxt "" "04060115.xhp\n" "par_id2963824\n" "138\n" "help.text" msgid "ERF.PRECISE(LowerLimit; UpperLimit)" -msgstr "FEJLFUNK(Nedre_grænse; Øvre_grænse)" +msgstr "ERF.PRÆCIS(Nedre_grænse; Øvre_grænse)" #: 04060115.xhp msgctxt "" @@ -39802,7 +39801,6 @@ msgstr "Område er området, på hvilket kriteriet skal anvendes." #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id3165000\n" @@ -39819,7 +39817,6 @@ msgstr "Eksempel" #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id3166505\n" @@ -39852,7 +39849,6 @@ msgstr "=TÆL.HVIS(A1:A10;\">=2006\") - dette returnerer 4" #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id2118594\n" @@ -39861,7 +39857,6 @@ msgstr "=TÆL.HVIS(A1:A10;\"<\"&B1) - når B1 indeholder 2006, returneres 6" #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id166020\n" @@ -39870,7 +39865,6 @@ msgstr "=TÆL.HVIS(A1:A10;C2), hvor celle C2 indeholder teksten >2006 - tæller antallet af celler i området A1:A10 som er >2006" #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id6386913\n" @@ -40204,7 +40198,7 @@ "53\n" "help.text" msgid "Returns the inverse of the cumulative beta probability density function." -msgstr "Returnerer den inverse af den kumulerede tæthedsfunktion for beta-sandsynlighed." +msgstr "Returnerer den inverse af den kumulerede tæthedsfunktion for beta-sandsynlighed." #: 04060181.xhp msgctxt "" @@ -40681,7 +40675,7 @@ "77\n" "help.text" msgid "Returns the individual term binomial distribution probability." -msgstr "Returnerer det individuelle udtryk forbinomialfordelingens sandsynlighed." +msgstr "Returnerer det individuelle udtryk for binomialfordelingens sandsynlighed." #: 04060181.xhp msgctxt "" @@ -41340,7 +41334,7 @@ "139\n" "help.text" msgid "195" -msgstr "10.666,67 valutaenheder" +msgstr "195" #: 04060181.xhp msgctxt "" @@ -41349,7 +41343,7 @@ "140\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41367,7 +41361,7 @@ "142\n" "help.text" msgid "151" -msgstr "10.666,67 valutaenheder" +msgstr "151" #: 04060181.xhp msgctxt "" @@ -41376,7 +41370,7 @@ "143\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41394,7 +41388,7 @@ "145\n" "help.text" msgid "148" -msgstr "10.666,67 valutaenheder" +msgstr "148" #: 04060181.xhp msgctxt "" @@ -41403,7 +41397,7 @@ "146\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41421,7 +41415,7 @@ "148\n" "help.text" msgid "189" -msgstr "10.666,67 valutaenheder" +msgstr "189" #: 04060181.xhp msgctxt "" @@ -41430,7 +41424,7 @@ "149\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41448,7 +41442,7 @@ "151\n" "help.text" msgid "183" -msgstr "10.666,67 valutaenheder" +msgstr "183" #: 04060181.xhp msgctxt "" @@ -41457,7 +41451,7 @@ "152\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41475,7 +41469,7 @@ "154\n" "help.text" msgid "154" -msgstr "10.666,67 valutaenheder" +msgstr "154" #: 04060181.xhp msgctxt "" @@ -41484,7 +41478,7 @@ "155\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41513,24 +41507,22 @@ msgstr "CHI2.TEST" #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id2951052\n" "98\n" "help.text" msgid "Returns the probability of a deviance from a random distribution of two test series based on the chi-squared test for independence. CHISQ.TEST returns the chi-squared distribution of the data." -msgstr "Returnerer sandsynligheden af afvigelsen fra en tilfældig fordeling af to testserier baseret på chi-i-anden testen for uafhængighed. CHI.TEST returnerer chi-i-anden fordelingen af data." +msgstr "Returnerer sandsynligheden af afvigelsen fra en tilfældig fordeling af to testserier baseret på chi i anden-testen for uafhængighed. CHI2.TEST returnerer chi i anden-fordelingen af data." #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id2948925\n" "135\n" "help.text" msgid "The probability determined by CHISQ.TEST can also be determined with CHISQ.DIST, in which case the Chi square of the random sample must then be passed as a parameter instead of the data row." -msgstr "Sandsynligheden bestemt af CHI.TEST kan også beregnes med CHI.FORD, og i så tilfælde skal Chi-i-anden af stikprøven angives som en parameter i stedet for datarækken." +msgstr "Sandsynligheden bestemt af CHI2.TEST kan også beregnes med CHI2.DIST, og i så tilfælde skal chi i anden af den tilfældige stikprøve angives som en parameter i stedet for datarækken." #: 04060181.xhp msgctxt "" @@ -41611,7 +41603,7 @@ "139\n" "help.text" msgid "195" -msgstr "10.666,67 valutaenheder" +msgstr "195" #: 04060181.xhp msgctxt "" @@ -41620,7 +41612,7 @@ "140\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41638,7 +41630,7 @@ "142\n" "help.text" msgid "151" -msgstr "10.666,67 valutaenheder" +msgstr "151" #: 04060181.xhp msgctxt "" @@ -41647,7 +41639,7 @@ "143\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41665,7 +41657,7 @@ "145\n" "help.text" msgid "148" -msgstr "10.666,67 valutaenheder" +msgstr "148" #: 04060181.xhp msgctxt "" @@ -41674,7 +41666,7 @@ "146\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41692,7 +41684,7 @@ "148\n" "help.text" msgid "189" -msgstr "10.666,67 valutaenheder" +msgstr "189" #: 04060181.xhp msgctxt "" @@ -41701,7 +41693,7 @@ "149\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41719,7 +41711,7 @@ "151\n" "help.text" msgid "183" -msgstr "10.666,67 valutaenheder" +msgstr "183" #: 04060181.xhp msgctxt "" @@ -41728,7 +41720,7 @@ "152\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41746,7 +41738,7 @@ "154\n" "help.text" msgid "154" -msgstr "10.666,67 valutaenheder" +msgstr "154" #: 04060181.xhp msgctxt "" @@ -41755,7 +41747,7 @@ "155\n" "help.text" msgid "170" -msgstr "10.666,67 valutaenheder" +msgstr "170" #: 04060181.xhp msgctxt "" @@ -41927,7 +41919,6 @@ msgstr "Frihedsgrader er eksperimentets frihedsgrader." #: 04060181.xhp -#, fuzzy msgctxt "" "04060181.xhp\n" "par_id282020091254453\n" @@ -42832,7 +42823,7 @@ "29\n" "help.text" msgid "Returns the result of an F test." -msgstr "Returnerer resultatet af en F Logisk test." +msgstr "Returnerer resultatet af en F-logisk test." #: 04060182.xhp msgctxt "" @@ -45480,7 +45471,7 @@ "67\n" "help.text" msgid "Returns the inverse of the lognormal distribution." -msgstr "Returnerer den inverse af lognormal fordelingen. " +msgstr "Returnerer den inverse af lognormal fordelingen. " #: 04060183.xhp msgctxt "" @@ -47679,7 +47670,7 @@ "113\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 "Hvis Alfa ikke er et multiplum af 1/(n+1), (hvor n er antallet af værdier i det givne array), interpolerer funktionen mellem værdierne i det givne array for at beregne percentilværdien. Men hvis Alfaer mindre end 1/(n+1) eller Alfa er større end n/(n+1), kan funktionen ikke interpolere og returnerer så en fejl." +msgstr "Hvis Alfa ikke er et multiplum af 1/(n+1), (hvor n er antallet af værdier i det givne array), interpolerer funktionen mellem værdierne i det givne område for at beregne percentilværdien. Men hvis Alfaer mindre end 1/(n+1) eller Alfa er større end n/(n+1), kan funktionen ikke interpolere og returnerer så en fejl." #: 04060184.xhp msgctxt "" @@ -48611,7 +48602,7 @@ "2\n" "help.text" msgid "RANK.EQ" -msgstr "" +msgstr "PLADS.LIGE" #: 04060185.xhp msgctxt "" @@ -48620,7 +48611,7 @@ "3\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 "=PLADS.LIGE(A10; A1:A50) returnerer placeringen af værdien i A10 i dataområdet A1:A50. Hvis der er dublerede værdier i listen tildeles disse den samme placering." +msgstr "Returnerer placeringen af værdien for en given værdi i et tilsvarende dataområde. Hvis der er dublerede værdier i listen tildeles disse den samme placering." #: 04060185.xhp msgctxt "" @@ -50006,13 +49997,12 @@ msgstr "=TINV(0,1; 6) returnerer 1,94" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "bm_id2949579\n" "help.text" msgid "T.INV function one tailed inverse of t-distribution" -msgstr "T.INV-funktiondobbelt inverse af t-distribution" +msgstr "T.INV-funktion enkeltsidet invers af t-distributionen" #: 04060185.xhp msgctxt "" @@ -50024,14 +50014,13 @@ msgstr "T.INV" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2943232\n" "99\n" "help.text" msgid "Returns the one tailed inverse of the t-distribution." -msgstr "Returnerer den dobbelte inverse af t-distributionen." +msgstr "Returnerer den enkeltsidede inverse af t-distributionen." #: 04060185.xhp msgctxt "" @@ -50052,14 +50041,13 @@ msgstr "T.INV(Tal; Frihedsgrader)" #: 04060185.xhp -#, fuzzy msgctxt "" "04060185.xhp\n" "par_id2954070\n" "102\n" "help.text" msgid "Number is the probability associated with the one-tailed t-distribution." -msgstr "Sandsynlighed er sandsynligheden tilknyttet den dobbelte T-Fordeling." +msgstr "Tal er sandsynligheden forbundet med den enkeltsidede t-fordeling." #: 04060185.xhp msgctxt "" @@ -52533,7 +52521,7 @@ "13\n" "help.text" msgid "Scope" -msgstr "" +msgstr "Virkefelt" #: 04070100.xhp msgctxt "" @@ -52542,7 +52530,7 @@ "13\n" "help.text" msgid "Select the scope of the named range or named formula. Document(Global) means the name is valid for the whole document. Any other sheet name selected will restrict the scope of the named range or formula expression to that sheet." -msgstr "" +msgstr "Vælg virkefeltet for det navngivne område eller den navngivne formel. Dokument(Global) betyder, at navnet er gældende i hele dokumentet. Vælges et arknavn, begrænses virkefeltet for det navngivne område eller formeludtryk til dette ark." #: 04070100.xhp msgctxt "" @@ -52551,10 +52539,9 @@ "13\n" "help.text" msgid "Range options" -msgstr "" +msgstr "Områdeindstillinger" #: 04070100.xhp -#, fuzzy msgctxt "" "04070100.xhp\n" "par_id3149958\n" @@ -53163,7 +53150,7 @@ "6\n" "help.text" msgid "Enter the URL or the file name that contains the data that you want to insert, and then press Enter." -msgstr "Indtast URL'en eller filnavnet som indeholder de data, som du vil indsætte, og tryk så Enter." +msgstr "Indtast URL'en eller filnavnet som indeholder de data, som du vil indsætte, og tryk så Enter." #: 04090000.xhp msgctxt "" @@ -64650,7 +64637,7 @@ "171\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 "For at opnå en funktion som fortæller om en dag i A1 er en arbejdsdag skal du bruge HVIS- og UGEDAG- funktioner som følger: HVIS(UGEDAG(A1;2)<6;\"Arbejdsdag\";\"Weekend\")" +msgstr "For at opnå en funktion som fortæller om en dag i A1 er en arbejdsdag skal du bruge HVIS- og UGEDAG- funktioner som følger:
HVIS(UGEDAG(A1;2)<6;\"Arbejdsdag\";\"Weekend\")" #: func_weeknum.xhp msgctxt "" @@ -65577,7 +65564,6 @@ msgstr "Data" #: stat_data.xhp -#, fuzzy msgctxt "" "stat_data.xhp\n" "par_id1000010\n" @@ -65586,7 +65572,6 @@ msgstr "Inddataområde: Referencen til det dataområde som skal analyseres." #: stat_data.xhp -#, fuzzy msgctxt "" "stat_data.xhp\n" "par_id1000020\n" @@ -65603,7 +65588,6 @@ msgstr "Grupperet efter" #: stat_data.xhp -#, fuzzy msgctxt "" "stat_data.xhp\n" "par_id1000030\n" @@ -65660,7 +65644,6 @@ msgstr "Eksempel" #: stat_data.xhp -#, fuzzy msgctxt "" "stat_data.xhp\n" "par_id1000550\n" @@ -65682,7 +65665,7 @@ "par_id1000970\n" "help.text" msgid "The following table has two data sets." -msgstr "" +msgstr "Den følgende tabel har to datasæt." #: statistics.xhp msgctxt "" @@ -65709,7 +65692,6 @@ msgstr "Brug datastatistik i Calc til at udføre kompliceret analyse af data" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000020\n" @@ -65718,7 +65700,6 @@ msgstr "For at arbejde med komplicerede statistiske eller ingeniør-analyser, kan du spare arbejde og tid ved at bruge Calc Data Statistik. Du indtaster data og parametre for hver analyse, og værktøjerne bruger passende statistiske eller ingeniør-funktioner for at beregne eller vise resultatet i en resultat-tabel." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id2764278\n" @@ -65735,7 +65716,6 @@ msgstr "Stikprøveudtagning" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000030\n" @@ -65744,7 +65724,6 @@ msgstr "Opret en tabel med prøver udtaget fra en anden tabel." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000040\n" @@ -65753,16 +65732,14 @@ msgstr "Menu Data - Statistik - Prøvetagning..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "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 "Prøveudtagning gør det muligt for dig at plukke data fra en kildetabel for at udfylde en måltabel. Prøveudtagningen kan være tilfældig eller efter et mønster." +msgstr "Prøveudtagning gør det muligt for dig at plukke data fra en kilde-tabel for at udfylde en mål-tabel. Prøveudtagningen kan være tilfældig eller efter et mønster." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000060\n" @@ -65779,7 +65756,6 @@ msgstr "Prøveudtagningsmetode" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000070\n" @@ -65788,7 +65764,6 @@ msgstr "Tilfældig: Udtag præcis Prøvestørrelse linjer fra kildetabellen tilfældigt." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000080\n" @@ -65797,7 +65772,6 @@ msgstr "Prøvestørrelse: Antal linjer udtaget fra kildetabellen." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000090\n" @@ -65806,7 +65780,6 @@ msgstr "Periodisk: Udtager linjer med en afstand defineret af Periode." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000100\n" @@ -65823,7 +65796,6 @@ msgstr "Eksempel" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000110\n" @@ -65840,7 +65812,6 @@ msgstr "Prøveudtagning med en periode på 2 vil resultere i den følgende tabel:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id01001\n" @@ -65857,7 +65828,6 @@ msgstr "Deskriptiv statistik" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000640\n" @@ -65866,7 +65836,6 @@ msgstr "Udfyld en tabel i regnearket med datasættets vigtigste statistiske egenskaber." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000650\n" @@ -65875,7 +65844,6 @@ msgstr "Menu Data - Statistik - Deskriptiv Statistik..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000660\n" @@ -65884,7 +65852,6 @@ msgstr "Analyseværktøjet til deskriptiv statistik genererer en rapport af univariate statistikker for data i inddataområdet med oplysninger om den centrale tendens og variation af dine data." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000670\n" @@ -65893,13 +65860,12 @@ msgstr "For yderligere information kan du læse i Wikipedia: http://en.wikipedia.org/wiki/Descriptive_statistics" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1000680\n" "help.text" msgid "The following table displays the results of the descriptive statistics of the sample data above." -msgstr "Den følgende tabel viser resultaterne af den deskriptive statistik for de eksempel-data, der er vist ovenfor." +msgstr "Den følgende tabel viser resultaterne af den deskriptive statistik for de eksempeldata, der er vist ovenfor." #: statistics.xhp msgctxt "" @@ -66035,7 +66001,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 "Analyse værktøjskasse;varians Analyse værktøjskasse;ANOVA Varians;Analyse værktøjskasse ANOVA;Analyse værktøjskasse Datastatistik;VariansDatastatistik;ANOVA " #: statistics.xhp msgctxt "" @@ -66046,7 +66012,6 @@ msgstr "Analyse af varians (ANOVA)" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001240\n" @@ -66055,7 +66020,6 @@ msgstr "Udfører analyse af variansen (ANOVA) af et datasæt" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001250\n" @@ -66069,10 +66033,9 @@ "par_id1001260\n" "help.text" msgid "ANOVA is the acronym for ANalysis Of VAriance. Produces the analysis of variance (ANOVA) of a given data set" -msgstr "" +msgstr "ANOVA er akronymet for ANalysis Of VAriance. Resulterer i variansanalysen (ANOVA) for et givet datasæt" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001270\n" @@ -66089,7 +66052,6 @@ msgstr "Type" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001280\n" @@ -66122,7 +66084,6 @@ msgstr "Rækker per prøve: Definér hvor mange rækker en prøve har." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001310\n" @@ -66248,7 +66209,7 @@ "par_id1001590\n" "help.text" msgid "F" -msgstr "" +msgstr "F" #: statistics.xhp msgctxt "" @@ -66283,7 +66244,6 @@ msgstr "Total" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id1464278\n" @@ -66316,7 +66276,6 @@ msgstr "Menu Data - Statistik - Korrelation..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001760\n" @@ -66325,7 +66284,6 @@ msgstr "Korrelationskoefficienten (en værdi mellem -1 og +1) fortæller hvor stærkt to variable er relateret til hinanden. Du kan bruge funktionen KORRELATION eller Datastatistik til at finde korrelationskoefficienten mellem to variable." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001770\n" @@ -66334,16 +66292,14 @@ msgstr "En korrelationskoefficient på +1 indikerer en perfekt positiv korrelation." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001780\n" "help.text" msgid "A correlation coefficient of -1 indicates a perfect negative correlation" -msgstr "En korrelationskoefficient på -1 indikerer en perfekt negativ korrelation." +msgstr "En korrelationskoefficient på -1 indikerer en perfekt negativ korrelation" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001790\n" @@ -66352,7 +66308,6 @@ msgstr "For mere information om statistisk korrelation kan du læse i http://en.wikipedia.org/wiki/Correlation" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001800\n" @@ -66417,7 +66372,6 @@ msgstr "Kolonne 3" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id2964278\n" @@ -66434,7 +66388,6 @@ msgstr "Kovarians" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001940\n" @@ -66443,7 +66396,6 @@ msgstr "Beregner kovariansen for to mængder af numeriske data." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001950\n" @@ -66457,10 +66409,9 @@ "par_id1001960\n" "help.text" msgid "The covariance is a measure of how much two random variables change together." -msgstr "" +msgstr "Kovariansen er et udtryk for hvor meget to tilfældige (stokastiske) variable ændrer sig sammen." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001970\n" @@ -66469,7 +66420,6 @@ msgstr "For mere information om statistisk kovarians kan du læse i http://en.wikipedia.org/wiki/Covariance" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1001980\n" @@ -66534,7 +66484,6 @@ msgstr "Kolonne 3" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id03001\n" @@ -66551,7 +66500,6 @@ msgstr "Eksponentiel udjævning" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002120\n" @@ -66560,7 +66508,6 @@ msgstr "Resulterer i en udjævnet dataserie" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002130\n" @@ -66574,16 +66521,15 @@ "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 "Eksponentiel udjævning er en filterteknik, der, når den anvendes på et datasæt, giver udjævnede resultater. Benyttes i mange brancher som for eksempel børser, økonomi og samplede målinger." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002150\n" "help.text" msgid "For more information on exponential smoothing, refer to http://en.wikipedia.org/wiki/Exponential_smoothing" -msgstr "For mere information om ekponentiel udjævning kan du læse i http://en.wikipedia.org/wiki/Exponential_smoothing" +msgstr "Du kan læse mere information om ekponentiel udjævning her: http://en.wikipedia.org/wiki/Exponential_smoothing" #: statistics.xhp msgctxt "" @@ -66594,7 +66540,6 @@ msgstr "Parametre" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002160\n" @@ -66635,7 +66580,6 @@ msgstr "Kolonne 2" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id04001\n" @@ -66652,7 +66596,6 @@ msgstr "Rullende gennemsnit" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002500\n" @@ -66661,7 +66604,6 @@ msgstr "Beregner det løbende gennemsnit for en tidsserie" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002510\n" @@ -66670,13 +66612,12 @@ msgstr "Menu Data - Statistik - Løbende gennemsnit..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002520\n" "help.text" msgid "You can get more details about moving average in the Wikipedia: http://en.wikipedia.org/wiki/Moving_average" -msgstr "Du kan læse mere om løbende gennemsnit i Wikipedia: http://en.wikipedia.org/wiki/Moving_average" +msgstr "Du kan læse mere om løbende gennemsnit på Wikipedia: http://en.wikipedia.org/wiki/Moving_average" #: statistics.xhp msgctxt "" @@ -66687,7 +66628,6 @@ msgstr "Parametre" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002530\n" @@ -66701,7 +66641,7 @@ "hd_id1000171\n" "help.text" msgid "Results of the moving average:" -msgstr "" +msgstr "Resultater af det løbende gennemsnit:" #: statistics.xhp msgctxt "" @@ -66752,7 +66692,6 @@ msgstr "#N/A" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id05001\n" @@ -66769,16 +66708,14 @@ msgstr "t-test" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002820\n" "help.text" msgid "Calculates the t-Test of two data samples." -msgstr "Beregner t-testen eller F-testen af to dataprøver." +msgstr "Beregner t-testen af to dataprøver." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002830\n" @@ -66792,16 +66729,15 @@ "par_id1002840\n" "help.text" msgid "A t-test is any statistical hypothesis test that follows a Student's t distribution." -msgstr "" +msgstr "En t-test er enhver statistisk hypotesetest, der følger en t-fordeling." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002850\n" "help.text" msgid "For more information on t-tests, see the Wikipedia: http://en.wikipedia.org/wiki/T-test" -msgstr "Du kan finde mere information om t-tests i Wikipedia: http://en.wikipedia.org/wiki/T-test" +msgstr "Du kan finde mere information om t-tests på Wikipedia: http://en.wikipedia.org/wiki/T-test" #: statistics.xhp msgctxt "" @@ -66812,7 +66748,6 @@ msgstr "Data" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002860\n" @@ -66821,7 +66756,6 @@ msgstr "Variabel 1 område: Reference til området med den første dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002870\n" @@ -66830,13 +66764,12 @@ msgstr "Variabel 2 område: Reference til området med den anden dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "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 "Resultater til: Reference til den øverste venstre celle i det område, hvor test skal vises." +msgstr "Resultater til: Reference til den øverste venstre celle i det område, hvor testen skal vises." #: statistics.xhp msgctxt "" @@ -66844,10 +66777,9 @@ "hd_id1000170\n" "help.text" msgid "Results for t-Test:" -msgstr "" +msgstr "Resultater af en t-test:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1002890\n" @@ -66992,7 +66924,6 @@ msgstr "t kritisk to-halet" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id05002\n" @@ -67009,16 +66940,14 @@ msgstr "F-test" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003240\n" "help.text" msgid "Calculates the F-Test of two data samples." -msgstr "Beregner t-testen eller F-testen af to dataprøver." +msgstr "Beregner F-testen af to dataprøver." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003250\n" @@ -67032,16 +66961,15 @@ "par_id1003260\n" "help.text" msgid "A F-test is any statistical test based on the F-distribution under the null hypothesis." -msgstr "" +msgstr "En F-test er enhver statistisk test baseret på F-fordelingen under nul hypotesen." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003270\n" "help.text" msgid "For more information on F-tests, see the Wikipedia: http://en.wikipedia.org/wiki/F-test" -msgstr "Du kan finde mere information om F-tests i Wikipedia: http://en.wikipedia.org/wiki/F-test" +msgstr "Du kan finde mere information om F-test i Wikipedia: http://en.wikipedia.org/wiki/F-test" #: statistics.xhp msgctxt "" @@ -67052,7 +66980,6 @@ msgstr "Data" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003280\n" @@ -67061,7 +66988,6 @@ msgstr "Variabel 1 område: Reference til området med den første dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003290\n" @@ -67070,7 +66996,6 @@ msgstr "Variabel 2 område: Reference til området med den anden dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003300\n" @@ -67084,19 +67009,17 @@ "hd_id1000200\n" "help.text" msgid "Results for F-Test:" -msgstr "" +msgstr "Resultater af F-test:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003310\n" "help.text" msgid "The following table shows the F-Test for the data series above:" -msgstr "Den følgende tabel viser t-testen for dataserien ovenfor:" +msgstr "Den følgende tabel viser F-testen for dataserien ovenfor:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003320\n" @@ -67166,7 +67089,7 @@ "par_id1003490\n" "help.text" msgid "F" -msgstr "" +msgstr "F" #: statistics.xhp msgctxt "" @@ -67217,7 +67140,6 @@ msgstr "F kritisk to-halet" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "bm_id05003\n" @@ -67226,40 +67148,36 @@ msgstr "Analyseværktøj;prøveudtagning Prøveudtagning; analyseværktøj Data statistik;prøveudtagning" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "hd_id1000210\n" "help.text" msgid "Z-test" -msgstr "t-test" +msgstr "Z-test" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003640\n" "help.text" msgid "Calculates the z-Test of two data samples." -msgstr "Beregner t-testen eller F-testen af to dataprøver." +msgstr "Beregner Z-testen af to dataprøver." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003650\n" "help.text" msgid "Menu Data - Statistics - Z-test..." -msgstr "Menu Data - Statistik - F-test..." +msgstr "Menu Data - Statistik - Z-test..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003660\n" "help.text" msgid "For more information on Z-tests, see the Wikipedia: http://en.wikipedia.org/wiki/Z-test" -msgstr "Du kan finde mere information om t-tests i Wikipedia: http://en.wikipedia.org/wiki/T-test" +msgstr "Du kan finde mere information om Z-tests i Wikipedia: http://en.wikipedia.org/wiki/Z-test" #: statistics.xhp msgctxt "" @@ -67270,7 +67188,6 @@ msgstr "Data" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003670\n" @@ -67279,7 +67196,6 @@ msgstr "Variabel 1 område: Reference til området med den første dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003680\n" @@ -67288,7 +67204,6 @@ msgstr "Variabel 2 område: Reference til området med den anden dataserie, der skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003690\n" @@ -67302,25 +67217,23 @@ "hd_id1000230\n" "help.text" msgid "Results for z-Test:" -msgstr "" +msgstr "Resultater af Z-test:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003700\n" "help.text" msgid "The following table shows the z-Test for the data series above:" -msgstr "Den følgende tabel viser t-testen for dataserien ovenfor:" +msgstr "Den følgende tabel viser Z-testen for dataserien ovenfor:" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003710\n" "help.text" msgid "z-test" -msgstr "t-test" +msgstr "Z-test" #: statistics.xhp msgctxt "" @@ -67360,7 +67273,7 @@ "par_id1003780\n" "help.text" msgid "Known Variance" -msgstr "" +msgstr "Kendt varians" #: statistics.xhp msgctxt "" @@ -67392,7 +67305,7 @@ "par_id1003890\n" "help.text" msgid "z" -msgstr "" +msgstr "z" #: statistics.xhp msgctxt "" @@ -67400,16 +67313,15 @@ "par_id1003900\n" "help.text" msgid "#DIV/0!" -msgstr "" +msgstr "#DIV/0!" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003910\n" "help.text" msgid "P (Z<=z) one-tail" -msgstr "P (T<=t) en-halet" +msgstr "P (Z<= z) en-sidet" #: statistics.xhp msgctxt "" @@ -67417,25 +67329,23 @@ "par_id1003920\n" "help.text" msgid "#DIV/0!" -msgstr "" +msgstr "#DIV/0!" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003930\n" "help.text" msgid "z Critical one-tail" -msgstr "t kritisk en-halet" +msgstr "z kritisk en-sidet" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003950\n" "help.text" msgid "P (Z<=z) two-tail" -msgstr "P (T<=t) to-halet" +msgstr "P (Z<=z) to-sidet" #: statistics.xhp msgctxt "" @@ -67443,16 +67353,15 @@ "par_id1003960\n" "help.text" msgid "#DIV/0!" -msgstr "" +msgstr "#DIV/0!" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003970\n" "help.text" msgid "z Critical two-tail" -msgstr "t kritisk to-halet" +msgstr "z kritisk to-sidet" #: statistics.xhp msgctxt "" @@ -67460,7 +67369,7 @@ "bm_id05004\n" "help.text" msgid "Analysis toolpack;Chi-square testChi-square test;Analysis toolpackData statistics;Chi-square test" -msgstr "" +msgstr "Analyse værktøjskasse;Chi-kvadrat test Chi-kvadrat test;Analyse værktøjskasse Datastatistik;Chi-kvadrat test" #: statistics.xhp msgctxt "" @@ -67468,7 +67377,7 @@ "hd_id1000240\n" "help.text" msgid "Chi-square test" -msgstr "" +msgstr "Chi-kvadrat test" #: statistics.xhp msgctxt "" @@ -67476,25 +67385,23 @@ "par_id1003641\n" "help.text" msgid "Calculates the Chi-square test of a data sample." -msgstr "" +msgstr "Beregner Chi-kvadratet for en stikprøve." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1003990\n" "help.text" msgid "Menu Data - Statistics - Chi-square Test..." -msgstr "Menu Data - Statistik - F-test..." +msgstr "Menu Data - Statistik - Chi-kvadrat test..." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1004000\n" "help.text" msgid "For more information on Chi-square tests, see the Wikipedia: http://en.wikipedia.org/wiki/Chi-square_test" -msgstr "Du kan finde mere information om t-tests i Wikipedia: http://en.wikipedia.org/wiki/T-test" +msgstr "Du kan finde mere information om Chi-kvadrat test i Wikipedia: http://en.wikipedia.org/wiki/Chi-square_test" #: statistics.xhp msgctxt "" @@ -67505,7 +67412,6 @@ msgstr "Data" #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1004010\n" @@ -67514,7 +67420,6 @@ msgstr "Inddataområde: Referencen til det dataområde som skal analyseres." #: statistics.xhp -#, fuzzy msgctxt "" "statistics.xhp\n" "par_id1004020\n" @@ -67528,7 +67433,7 @@ "hd_id1000231\n" "help.text" msgid "Results for Chi-square Test:" -msgstr "" +msgstr "Resultater af Chi-kvadrat test:" #: statistics.xhp msgctxt "" @@ -67536,7 +67441,7 @@ "par_id1004030\n" "help.text" msgid "Test of Independence (Chi-Square)" -msgstr "" +msgstr "Test af uafhængighed (Chi-kvadrat)" #: statistics.xhp msgctxt "" @@ -67568,7 +67473,7 @@ "par_id1004100\n" "help.text" msgid "Test Statistic" -msgstr "" +msgstr "Test statistik" #: statistics.xhp msgctxt "" @@ -67576,7 +67481,7 @@ "par_id1004120\n" "help.text" msgid "Critical Value" -msgstr "" +msgstr "Kritisk værdi" #: text2columns.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/02.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/02.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/02.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/02.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:02+0100\n" -"PO-Revision-Date: 2013-06-04 17:06+0000\n" -"Last-Translator: aputsiaq \n" +"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"PO-Revision-Date: 2015-12-15 09:57+0000\n" +"Last-Translator: wkn \n" "Language-Team: LANGUAGE \n" "Language: da\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1370365611.0\n" +"X-POOTLE-MTIME: 1450173454.000000\n" #: 02130000.xhp msgctxt "" @@ -402,7 +402,7 @@ "par_id3153770\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/04.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/04.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/04.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/04.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-11 16:23+0000\n" -"Last-Translator: René Lagoni Neukirch \n" +"PO-Revision-Date: 2015-12-15 09:58+0000\n" +"Last-Translator: wkn \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431361435.000000\n" +"X-POOTLE-MTIME: 1450173499.000000\n" #: 01020000.xhp msgctxt "" @@ -375,14 +375,13 @@ msgstr "Flytter et ark til venstre." #: 01020000.xhp -#, fuzzy msgctxt "" "01020000.xhp\n" "par_id3149725\n" "131\n" "help.text" msgid "In the print preview: Moves to the previous print page." -msgstr "I udskriftsvisningen: Flytter til forrige side." +msgstr "I Vis udskrift: Flytter til forrige udskriftsside." #: 01020000.xhp msgctxt "" @@ -403,14 +402,13 @@ msgstr "Flytter et ark til højre." #: 01020000.xhp -#, fuzzy msgctxt "" "01020000.xhp\n" "par_id3159120\n" "132\n" "help.text" msgid "In the print preview: Moves to the next print page." -msgstr "I udskriftsvisningen: Flytter til næste side." +msgstr "I Vis udskrift: Flytter til næste udskriftsside." #: 01020000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/05.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/05.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/05.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/05.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-08 19:42+0000\n" -"Last-Translator: Ejnar Zacho Rath \n" +"PO-Revision-Date: 2015-12-15 10:01+0000\n" +"Last-Translator: wkn \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436384520.000000\n" +"X-POOTLE-MTIME: 1450173690.000000\n" #: 02140000.xhp msgctxt "" @@ -778,7 +778,7 @@ "tit\n" "help.text" msgid "OpenCL Options" -msgstr "" +msgstr "OpenCL valgmuligheder" #: OpenCL_options.xhp msgctxt "" @@ -786,7 +786,7 @@ "bm_id3146799\n" "help.text" msgid "OpenCl;options" -msgstr "" +msgstr "OpenCl;valgmuligheder" #: OpenCL_options.xhp msgctxt "" @@ -810,7 +810,7 @@ "par_id2733542\n" "help.text" msgid "OpenCL: the open standard for parallel programming of heterogeneous systems." -msgstr "" +msgstr "OpenCL: den åbne standard for parallel programmering af heterogene systemer." #: OpenCL_options.xhp msgctxt "" @@ -819,7 +819,7 @@ "26\n" "help.text" msgid "Menu Tools - Options - LibreOffice Calc - Formula, and in section Detailed Calculation Settings press Details... button" -msgstr "" +msgstr "I menuen Funktioner - Indstillinger - LibreOffice Calc - Formel, i afsnittet Detaljerede beregningsindstillinger tryk på knappen Detaljer..." #: OpenCL_options.xhp msgctxt "" @@ -827,7 +827,7 @@ "par_id8266853\n" "help.text" msgid "OpenCL™ is the first open, royalty-free standard for cross-platform, parallel programming of modern processors found in personal computers, servers and handheld/embedded devices. OpenCL (Open Computing Language) greatly improves speed and responsiveness for a wide spectrum of applications in numerous market categories from gaming and entertainment to scientific and medical software" -msgstr "" +msgstr "OpenCL ™ er den første åbne, royalty-frie standard for parallel programmering på tværs af platforme, for moderne processorer, som findes i computere, servere og håndholdte enheder. OpenCL (Open Computing Language) forbedrer i høj grad hastigheden og reaktionstiden for et bredt udvalg af applikationer inden for mange kategorier, fra spil og underholdning til videnskabelig og medicinsk software" #: OpenCL_options.xhp msgctxt "" @@ -843,7 +843,7 @@ "par_id4238715\n" "help.text" msgid "Contents to Numbers" -msgstr "" +msgstr "Indhold til tal" #: OpenCL_options.xhp msgctxt "" @@ -859,7 +859,7 @@ "par_id396740\n" "help.text" msgid "How to treat text when encountered as operand in an arithmetic operation or as argument to a function that expects a number instead. Unambiguous conversion is possible for integer numbers including exponents and ISO 8601 dates and times in their extended formats with separators. Fractional numeric values with decimal separators or dates other than ISO 8601 are locale dependent. Note that in locale dependent conversions the resulting numeric value may differ between locales!" -msgstr "" +msgstr "Hvorledes en tekst skal behandles, når den optræder som operand i en aritmetrisk operation eller som argument til en funktion, der forventer et tal i stedet. Entydig konvertering er mulig for heltal også med eksponenter og ISO 8601 datoer og tidspunkter i udvidet format med skilletegn. Numeriske brøkdele med decimaltegn eller datoer, som ikke er ISO 8601, afhænger af sprogtilpasningen. Bemærk at i sprogafhængige konverteringer, kan den resulterende numeriske værdi variere !" #: OpenCL_options.xhp msgctxt "" @@ -867,7 +867,7 @@ "par_id4086428\n" "help.text" msgid "Generate #VALUE! error: Text found where numeric data is expected will generate #VALUE! error. Example: \"123.45\" will generate a #VALUE! error, while 123.45 not." -msgstr "" +msgstr "Dan #VALUE! fejl: Tekst, som findes hvor numeriske data forventes, vil give #VALUE! fejl. Eksempel: \"123.45\" vil give en #VALUE! fejl, mens 123.45 ikke giver fejl." #: OpenCL_options.xhp msgctxt "" @@ -875,7 +875,7 @@ "par_id9024628\n" "help.text" msgid "Treat as zero: Any text found where numeric data is expected will be considered as a number of value zero. Example: \"123.45\" will map to zero, while 123.45 not." -msgstr "" +msgstr "Opfat som nul: Enhver tekst, der findes, hvor numeriske data forventes, opfattes som et tal med værdien nul. Eksempel: \"123.45\" opfattes som nul, mens 123.45 ikke opfattes som nul." #: OpenCL_options.xhp msgctxt "" @@ -883,7 +883,7 @@ "par_id3067110\n" "help.text" msgid "Convert only if unambiguous: If the text represents a valid and unambiguous numeric value, convert it. Example: \"+55.21.9.8822.8813\" will map to zero, because the numbers don't represent a numeric value." -msgstr "" +msgstr "Konverter kun hvis entydig: Hvis teksten udgør en gyldig og entydig numerisk værdi, konverteres den. Eksempel: \"+55.21.9.8822.8813\" vil konverteres til nul, fordi tallene ikke repræsenterer en numerisk værdi." #: OpenCL_options.xhp msgctxt "" @@ -891,7 +891,7 @@ "par_id8841822\n" "help.text" msgid "Convert also locale dependent: convert values valid in the locale representation. Example: \"123,45\" is a valid number in some locales because the comma is the decimal separator there." -msgstr "" +msgstr "Konverter også sprogafhængige: konverterer værdier som er gyldige i den lokale repræsentation. Eksempel: \"123,45\" er et gyldigt tal i f.eks. Danmark, fordi kommaet er decimalseparator her." #: OpenCL_options.xhp msgctxt "" @@ -899,7 +899,7 @@ "par_id4077578\n" "help.text" msgid "Treat empty string as zero" -msgstr "" +msgstr "Opfat en tom streng som nul" #: OpenCL_options.xhp msgctxt "" @@ -907,7 +907,7 @@ "par_id9094515\n" "help.text" msgid "This option determines how an empty string is treated when used in arithmetic operations. If you have set \"Conversion from text to number\" to either \"Generate #VALUE! error\" or \"Treat as zero\", you cannot choose (here) if conversion of an empty string to a number will generate an error or if it will treat empty strings as zero. Otherwise this option determines how empty strings are treated." -msgstr "" +msgstr "Denne valgmulighed afgør, hvorledes en tom streng behandles, når den indgår i aritmetriske operationer. Hvis du har sat \"Konverter fra tekst til tal\" til enten \"Dan #VALUE! fejl\" eller \"Opfat som nul\", kan du ikke (her) vælge om konvertering af en tom streng til tal vil medføre en fejl eller om den tomme streng opfattes som nul. I alle andre tilfælde vil denne valgmulighed bestemme, hvorledes tomme strenge behandles." #: OpenCL_options.xhp msgctxt "" @@ -915,7 +915,7 @@ "par_id3859675\n" "help.text" msgid "Reference syntax for string reference" -msgstr "" +msgstr "Referencesyntaks for strengreference" #: OpenCL_options.xhp msgctxt "" @@ -923,7 +923,7 @@ "par_id402233\n" "help.text" msgid "Formula syntax to use when parsing references given in string parameters. This affects built-in functions such as INDIRECT that takes a reference as a string value." -msgstr "" +msgstr "Formelsyntaks, der skal benyttes, når referencer givet i streng-parametre overføres. Dette påvirker indbyggede funktioner så som INDIREKTE, der tager en reference som en strengværdi." #: OpenCL_options.xhp msgctxt "" @@ -931,7 +931,7 @@ "par_id1623889\n" "help.text" msgid "Use formula syntax:" -msgstr "" +msgstr "Brug formelsyntaks:" #: OpenCL_options.xhp msgctxt "" @@ -971,7 +971,7 @@ "par_id9635914\n" "help.text" msgid "Use OpenCL only for a subset of operations" -msgstr "" +msgstr "Brug kun OpenCL for en delmængde af operationer" #: OpenCL_options.xhp msgctxt "" @@ -979,7 +979,7 @@ "par_id2476577\n" "help.text" msgid "Use OpenCL only for some of the operations that spreadsheet formulas are translated to." -msgstr "" +msgstr "Brug kun OpenCL for nogle af de operationer, formlerne i regnearket er oversat til." #: OpenCL_options.xhp msgctxt "" @@ -987,7 +987,7 @@ "par_id4217047\n" "help.text" msgid "Minimum data size for OpenCL use:" -msgstr "" +msgstr "Minimum datastørrelse for brug af OpenCL:" #: OpenCL_options.xhp msgctxt "" @@ -995,7 +995,7 @@ "par_id2629474\n" "help.text" msgid "An approximate lower limit on the number of data cells a spreadsheet formula should use for OpenCL to be considered." -msgstr "" +msgstr "En cirka nedre grænse for antallet af dataceller en regnearksformel skal anvende, før OpenCL skal benyttes." #: OpenCL_options.xhp msgctxt "" @@ -1003,7 +1003,7 @@ "par_id8069704\n" "help.text" msgid "Subset of OpCodes for which OpenCL is used" -msgstr "" +msgstr "Delmængde af operationskoder som OpenCL skal bruges til" #: OpenCL_options.xhp msgctxt "" @@ -1011,7 +1011,7 @@ "par_id4524674\n" "help.text" msgid "The list of operators and function opcodes for which to use OpenCL. If a formula contains only these operators and functions, it might be calculated using OpenCL." -msgstr "" +msgstr "Listen med operatorer og funktionsoperationskoder, OpenCL skal bruges til. Hvis en formel kun består af disse operatorer og funktioner, vil den muligvis blive beregnet med OpenCL." #: empty_cells.xhp msgctxt "" @@ -1067,7 +1067,7 @@ "par_id8277230\n" "help.text" msgid "A1: 1 B1: C1: =B1 (displays 0)" -msgstr "A1: 1 B1: C1: =B1 (viser 0)" +msgstr "A1: 1 B1: C1: =B1 (viser 0)" #: empty_cells.xhp msgctxt "" @@ -1211,7 +1211,7 @@ "par_id2629474\n" "help.text" msgid "A1: " -msgstr "A1: " +msgstr "A1: " #: empty_cells.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/guide.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/guide.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/scalc/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/scalc/guide.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-26 20:59+0000\n" -"Last-Translator: Leif \n" +"PO-Revision-Date: 2015-12-28 09:33+0000\n" +"Last-Translator: David Lamhauge \n" "Language-Team: LANGUAGE \n" "Language: da\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432673974.000000\n" +"X-POOTLE-MTIME: 1451295225.000000\n" #: address_auto.xhp msgctxt "" @@ -56,7 +56,7 @@ "par_id3156283\n" "help.text" msgid "Example spreadsheet" -msgstr "Eksempelregneark" +msgstr "Eksempelregneark" #: address_auto.xhp msgctxt "" @@ -2391,7 +2391,7 @@ "bm_id3150441\n" "help.text" msgid "HTML; in sheet cellsreferences; URL in cellscells; Internet referencesURL; in Calc" -msgstr "arkreferencer; til andre arkHTML; i arkcellerreferencer; URL i cellerceller; internetreferencerURL; i Calc" +msgstr "HTML; i arkcellerreferencer; URL i cellerceller; internetreferencerURL; i Calc" #: cellreferences_url.xhp msgctxt "" @@ -5365,13 +5365,12 @@ msgstr "Angiv teksten, der skal findes, i tekstfeltet Søg efter." #: finding.xhp -#, fuzzy msgctxt "" "finding.xhp\n" "par_id9121982\n" "help.text" msgid "Either click Find Next or Find All." -msgstr "Klik enten på Søg eller Søg alle." +msgstr "Klik enten på Søg næste eller Søg alle." #: finding.xhp msgctxt "" @@ -5379,7 +5378,7 @@ "par_id3808404\n" "help.text" msgid "When you click Find Next, Calc will select the next cell that contains your text. You can watch and edit the text, then click Find Next again to advance to the next found cell." -msgstr "" +msgstr "Når du klikker på Søg næste, vil Calc markere den næste celle som indeholder din tekst. Du kan se og redigere teksten, og så igen klikke på Søg næste for at rykke frem til næste fundne celle." #: finding.xhp msgctxt "" @@ -5550,7 +5549,7 @@ "22\n" "help.text" msgid "An image that you have loaded with Format - Page - Background is only visible in print or in the print preview. To display a background image on screen as well, insert the graphic image by choosing Insert - Image - From File and arrange the image behind the cells by choosing Format - Arrange - To Background. Use the Navigator to select the background image." -msgstr "" +msgstr "Et billede, som du har indlæst med Formater - Side - Baggrund, er kun synlig i udskrivning og Vis udskrift. For også at vise et baggrundsbillede på skærmen skal du indsætte det grafiske billede ved at vælge Indsæt - Billede - Fra fil og arrangere billedet bag cellerne ved at vælge Formater - Arranger - I baggrunden. Brug Navigator til at vælge baggrundsbilledet." #: format_table.xhp msgctxt "" @@ -6517,7 +6516,7 @@ "bm_id3145068\n" "help.text" msgid "goal seeking;exampleequations in goal seekcalculating;variables in equationsvariables;calculating equationsexamples;goal seek" -msgstr "målsøgning;eksempelberegne;variable i ligningervariable;beregne ligningereksempler;målsøgning" +msgstr "målsøgning;eksempelligninger i målsøgningberegne;variable i ligningervariable;beregne ligningereksempler;målsøgning" #: goalseek.xhp msgctxt "" @@ -7282,14 +7281,13 @@ msgstr "Avancerede beregninger" #: main.xhp -#, fuzzy msgctxt "" "main.xhp\n" "hd_id3153070\n" "7\n" "help.text" msgid "Printing and Print Preview" -msgstr "Udskrivning og udskriftsvisning" +msgstr "Udskrivning og Vis udskrift" #: main.xhp msgctxt "" @@ -8400,7 +8398,7 @@ "bm_id3153968\n" "help.text" msgid "comments; on cells cells;comments remarks on cells formatting;comments on cells viewing;comments on cells displaying; comments" -msgstr "kommentarer; i celler celler;kommentarer bemærkninger i celler formatering;kommentarer i celler vise;kommentarer i celler" +msgstr "kommentarer; i celler celler;kommentarer bemærkninger i celler formatering;kommentarer i celler vise;kommentarer i cellersynlig;kommentarer i celler" #: note_insert.xhp msgctxt "" @@ -9286,7 +9284,7 @@ "par_idN108D7\n" "help.text" msgid "Defining Print Ranges on a Sheet" -msgstr "" +msgstr "Definere udskivningsområder i et ark " #: printranges.xhp msgctxt "" @@ -10186,7 +10184,7 @@ "13\n" "help.text" msgid "Click the Scenarios icon Scenarios icon in the Navigator." -msgstr "Klik på ikonet scenarier scenarierikon i Navigatoren." +msgstr "Klik på ikonet scenarier scenarierikon i Navigatoren." #: scenario.xhp msgctxt "" @@ -10261,7 +10259,7 @@ "bm_id3150870\n" "help.text" msgid "filling;customized listssort lists;applyingdefining;sort listsgeometric listsarithmetic listsseries;sort listslists; user-definedcustomized lists" -msgstr "udfylde;tilpassede listersorteringslister;anvendeanvende;sorteringslisterdefinere;sorteringslistergeometriske listeraritmetiske listerserie;sorteringslisterlister; brugerdefineredetilpassede lister" +msgstr "udfylde;tilpassede listersorteringslister;anvendedefinere;sorteringslistergeometriske listeraritmetiske listerserie;sorteringslisterlister; brugerdefineredetilpassede lister" #: sorted_list.xhp msgctxt "" @@ -11114,7 +11112,7 @@ "5\n" "help.text" msgid "Under the menu item %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Calc, go to the View tab page. Unmark Grid lines. Confirm with OK." -msgstr "Under menuelementet Funktioner - IndstillingerFunktioner - Indstillinger - %PRODUCTNAME Calc,, gå til fanen Vis. Fjern markeringen Gitterlinjer. og bekræft med OK." +msgstr "Under menuelementet %PRODUCTNAME - IndstillingerFunktioner - Indstillinger - %PRODUCTNAME Calc,, gå til fanen Vis. Fjern markeringen Gitterlinjer. og bekræft med OK." #: text_numbers.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/00.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/00.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/00.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/00.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-09-01 18:08+0000\n" -"Last-Translator: Christian Lohmaier \n" +"PO-Revision-Date: 2015-12-27 15:20+0000\n" +"Last-Translator: Leif Lodahl \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441130907.000000\n" +"X-POOTLE-MTIME: 1451229607.000000\n" #: 00000001.xhp msgctxt "" @@ -6787,7 +6787,7 @@ "5\n" "help.text" msgid "On the Print PreviewBar of a text document, click" -msgstr "" +msgstr "På værktøjslinjen Sidevisning i et tekstdokument, klik på" #: 00000401.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-16 09:10+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-19 19:56+0000\n" +"Last-Translator: Leif Lodahl \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437037834.000000\n" +"X-POOTLE-MTIME: 1453233409.000000\n" #: 01010000.xhp msgctxt "" @@ -3769,14 +3769,13 @@ msgstr "Antal sider i filen." #: 01100400.xhp -#, fuzzy msgctxt "" "01100400.xhp\n" "hd_id3156027\n" "5\n" "help.text" msgid "Tables: Number of Sheets: " -msgstr "Antal tabeller:Antal ark:" +msgstr "Tabeller:Antal ark:" #: 01100400.xhp msgctxt "" @@ -3806,14 +3805,13 @@ msgstr "Antal celler med indhold i filen." #: 01100400.xhp -#, fuzzy msgctxt "" "01100400.xhp\n" "hd_id3147210\n" "7\n" "help.text" msgid "Images: " -msgstr "Linjer: " +msgstr "Billeder: " #: 01100400.xhp msgctxt "" @@ -11021,7 +11019,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Viser Imagemappet (Billedkortet), så du kan klikke og redigere hotspottene." #: 02220000.xhp @@ -13854,7 +13852,7 @@ "20\n" "help.text" msgid "Select a Unicode category for the current font. The special characters for the selected Unicode category are displayed in the character table." -msgstr "Marker en Unicodekategori i den valgte skrifttype.Den valgte Unicodekategoris specialtegn bliver vist i tegntabellen." +msgstr "Marker en Unicodekategori i den valgte skrifttype.Den valgte Unicodekategoris specialtegn bliver vist i tegntabellen." #: 04100000.xhp msgctxt "" @@ -15183,7 +15181,7 @@ "par_id0123200902243343\n" "help.text" msgid "Select the overlining style that you want to apply. To apply the overlining to words only, select the Individual Words box." -msgstr "Marker den overstregningstypografi du vil bruge. Hvis du kun vil overstrege ord, skal du markere feltet Ordvis." +msgstr "Marker den overstregningstypografi du vil bruge. Hvis du kun vil overstrege ord, skal du markere feltet Ordvis." #: 05020200.xhp msgctxt "" @@ -15583,7 +15581,7 @@ "106\n" "help.text" msgid "Engineering notation" -msgstr "" +msgstr "Ingeniørnotation" #: 05020300.xhp msgctxt "" @@ -15592,7 +15590,7 @@ "107\n" "help.text" msgid "With scientific format, Engineering notation ensures that exponent is a multiple of 3." -msgstr "" +msgstr "Med videnskabeligt format sikrer ingeniørnotation, at eksponenten er delelig med 3." #: 05020300.xhp msgctxt "" @@ -15977,14 +15975,13 @@ msgstr "Tusindtalsskilletegn" #: 05020301.xhp -#, fuzzy msgctxt "" "05020301.xhp\n" "par_id3154380\n" "21\n" "help.text" msgid "Depending on your language setting, you can use a comma, a period or a blank as a thousands separator. You can also use the separator to reduce the size of the number that is displayed by a multiple of 1000." -msgstr "Afhængig af din sprogindstilling, kan du bruge et komma eller punktum som et tusindtalsskilletegn. Du kan også bruge skilletegnet til at formindske det tal, som er vist med multipla af 1000." +msgstr "Alt efter din sprogindstilling, kan du bruge et komma eller punktum som et tusindtalsskilletegn. Du kan også bruge skilletegnet til at formindske det tal, som er vist, med multipla af 1000." #: 05020301.xhp msgctxt "" @@ -16326,7 +16323,7 @@ "85\n" "help.text" msgid "Scientific notation lets you write very large numbers or very small fractions in a compact form. For example, in scientific notation, 650000 is written as 6.5 x 10^5, and 0.000065 as 6.5 x 10^-5. In %PRODUCTNAME, these numbers are written as 6.5E+5 and 6.5E-5, respectively. To create a number format that displays numbers using scientific notation, enter a # or 0, and then one of the following codes E-, E+, e- or e+. If sign is omitted after E or e, it won't appear for positive value of exponent. To get engineering notation, enter 3 digits (0 or #) in the integer part.For instance: ###.##E+00" -msgstr "" +msgstr "Videnskabelig notation lader dig skrive meget store eller meget små tal i et kompakt format. I videnskabelig notation kan 650000 eksempelvis skrives som 6,5 X 10^5, og 0,000065 som 6,5 X 10^-5. I %PRODUCTNAME skrives disse tal henholdsvis som 6,5E+5 og 6,5E-5. For at oprette et talformat som viser tal ved brug af videnskabelig notation, skal du indtaste et #-tegn eller 0 og derefter en af de følgende koder E-, E+, e- eller e+. Hvis tegnet udelades efter E eller e, vil det ikke blive vist for positive værdier af eksponenten. For at opnår ingeniørnotation, indtast 3 cifre (0 eller #) i heltalsdelen. For eksempel: ###.##E+00" #: 05020301.xhp msgctxt "" @@ -19743,7 +19740,6 @@ msgstr "Decimal" #: 05030300.xhp -#, fuzzy msgctxt "" "05030300.xhp\n" "par_id3144422\n" @@ -28706,7 +28702,7 @@ "62\n" "help.text" msgid "Removes baseline formatting." -msgstr "Fjerner grundlinjeformatering." +msgstr "Fjerner grundlinjeformatering." #: 05280000.xhp msgctxt "" @@ -28732,7 +28728,7 @@ "64\n" "help.text" msgid "Uses the top or the bottom edge of the selected object as the text baseline." -msgstr "Bruger øverste eller nederste kant af det valgte objekt som tekstens grundlinje." +msgstr "Bruger øverste eller nederste kant af det valgte objekt som tekstens grundlinje." #: 05280000.xhp msgctxt "" @@ -28752,14 +28748,13 @@ msgstr "Roter" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3155742\n" "66\n" "help.text" msgid "Uses the top or the bottom edge of the selected object as the text baseline and preserves the original vertical alignment of the individual characters." -msgstr "Bruger øverste eller nederste kant af det valgte objekt som tekstens grundlinje og bevarer originalens lodrette justering af de enkelte tegn." +msgstr "Bruger øverste eller nederste kant af det valgte objekt som tekstens grundlinje og bevarer originalens lodrette justering af de enkelte tegn." #: 05280000.xhp msgctxt "" @@ -28785,7 +28780,7 @@ "68\n" "help.text" msgid "Horizontally slants the characters in the text object." -msgstr "" +msgstr "Hælder tegnene i tekstobjektet vandret." #: 05280000.xhp msgctxt "" @@ -28811,7 +28806,7 @@ "70\n" "help.text" msgid "Vertically slants the characters in the text object." -msgstr "" +msgstr "Hælder tegnene i tekstobjektet lodret." #: 05280000.xhp msgctxt "" @@ -28831,14 +28826,13 @@ msgstr "Hæld lodret" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3154985\n" "22\n" "help.text" msgid "Reverses the text flow direction, and flips the text horizontally or vertically. To use this command, you must first apply a different baseline to the text." -msgstr "Vender tekstforløbsretning om, og vender teksten vandret eller lodret. For at bruge denne kommando skal du først anvende en anden grundlinje til teksten." +msgstr "Vender tekstforløbsretning om, og vender teksten vandret eller lodret. For at bruge denne kommando skal du først anvende en anden grundlinje til teksten." #: 05280000.xhp msgctxt "" @@ -28864,7 +28858,7 @@ "24\n" "help.text" msgid "Aligns the text to the left end of the text baseline." -msgstr "Justerer teksten til venstre på tekstens grundlinje." +msgstr "Justerer teksten til venstre på tekstens grundlinje." #: 05280000.xhp msgctxt "" @@ -28890,7 +28884,7 @@ "26\n" "help.text" msgid "Centers the text on the text baseline." -msgstr "" +msgstr "Centrerer teksten på tekstens grundlinje." #: 05280000.xhp msgctxt "" @@ -28910,14 +28904,13 @@ msgstr "Centreret" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3149583\n" "28\n" "help.text" msgid "Aligns the text to the right end of the text baseline." -msgstr "Justerer teksten til venstre på tekstens grundlinje." +msgstr "Justerer teksten til venstre på tekstens grundlinje." #: 05280000.xhp msgctxt "" @@ -28937,14 +28930,13 @@ msgstr "Højrejusteret" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3147124\n" "30\n" "help.text" msgid "Resizes the text to fit the length of the text baseline." -msgstr "Justerer teksten til venstre på tekstens grundlinje." +msgstr "Ændrer størrelsen af teksten, så den passer til længden på tekstens grundlinje." #: 05280000.xhp msgctxt "" @@ -28970,7 +28962,7 @@ "32\n" "help.text" msgid "Enter the amount of space that you want to leave between the text baseline and the base of the individual characters." -msgstr "" +msgstr "Indtast den plads, der skal være mellem tekstens grundlinje og basen af de enkelte tegn." #: 05280000.xhp msgctxt "" @@ -28996,7 +28988,7 @@ "34\n" "help.text" msgid "Enter the amount of space to leave between the beginning of the text baseline, and the beginning of the text." -msgstr "" +msgstr "Indtast hvor meget plads, der skal være mellem begyndelsen af teksten grundlinje og begyndelsen af teksten." #: 05280000.xhp msgctxt "" @@ -29016,14 +29008,13 @@ msgstr "Indryk" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3154636\n" "36\n" "help.text" msgid "Shows or hides the text baseline, or the edges of the selected object." -msgstr "Viser eller skjuler tekstens grundlinje eller kanterne af det valgte objekt." +msgstr "Viser eller skjuler tekstens grundlinje eller kanterne af det valgte objekt." #: 05280000.xhp msgctxt "" @@ -29049,7 +29040,7 @@ "38\n" "help.text" msgid "Shows or hides the borders of the individual characters in the text." -msgstr "" +msgstr "Viser eller skjuler kanterne af de enkelte tegn i teksten." #: 05280000.xhp msgctxt "" @@ -29095,14 +29086,13 @@ msgstr "Ingen skygge" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3147321\n" "42\n" "help.text" msgid "Adds a shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes." -msgstr "Tilføjer en skygge til teksten i det markerede objekt. Klik på denne knap, og indtast så dimensionerne af skyggen i feltet Afstand X og Afstand Y." +msgstr "Tilføjer en skygge til teksten i det markerede objekt. Klik på denne knap, og indtast så dimensionerne af skyggen i felterne Afstand X og Afstand Y." #: 05280000.xhp msgctxt "" @@ -29122,14 +29112,13 @@ msgstr "Lodret" #: 05280000.xhp -#, fuzzy msgctxt "" "05280000.xhp\n" "par_id3148478\n" "44\n" "help.text" msgid "Adds a slant shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes." -msgstr "Tilføjer en hældningsskygge til teksten i det markerede objekt. Klik på denne knap, og indtast så dimensionerne af skyggen i feltet Afstand X og Afstand Y." +msgstr "Tilføjer en hældningsskygge til teksten i det markerede objekt. Klik på denne knap, og indtast så dimensionerne af skyggen i felterne Afstand X og Afstand Y." #: 05280000.xhp msgctxt "" @@ -29164,7 +29153,7 @@ "46\n" "help.text" msgid "Enter the horizontal distance between the text characters and the edge of the shadow." -msgstr "" +msgstr "Angiv den vandrette afstand imellem tekstens tegn og kanten af skyggen." #: 05280000.xhp msgctxt "" @@ -29199,7 +29188,7 @@ "48\n" "help.text" msgid "Enter the vertical distance between the text characters and the edge of the shadow." -msgstr "" +msgstr "Angiv den lodrette afstand imellem tekstens tegn og kanten af skyggen." #: 05280000.xhp msgctxt "" @@ -31270,14 +31259,13 @@ msgstr "Geometri" #: 05350200.xhp -#, fuzzy msgctxt "" "05350200.xhp\n" "par_id3150008\n" "2\n" "help.text" msgid "Adjusts the shape of the selected 3D object. You can only modify the shape of a 3D object that was created by converting a 2D object. To convert a 2D object to 3D, select the object, right-click, and then choose Convert - To 3D, or Convert - To 3D Rotation Object." -msgstr "Justerer formen for det valgte 3D-objekt. Du kan kun ændre formen på et 3D-objekt, som blev oprettet af et konverteret 2D-objekt. For at konvertere et 2D-objekt til 3D, vælg objektet, højreklik, og vælg så Konverter - til 3D, eller Konverter - til 3D-omdrejningslegeme." +msgstr "Justerer formen for det valgte 3D-objekt. Du kan kun ændre formen på et 3D-objekt, som blev oprettet af et konverteret 2D-objekt. For at konvertere et 2D-objekt til 3D, vælg objektet, højreklik, og vælg så Konverter - til 3D, eller Konverter - til 3D-omdrejningslegeme." #: 05350200.xhp msgctxt "" @@ -31313,7 +31301,7 @@ "13\n" "help.text" msgid "Enter the amount by which you want to round the corners of the selected 3D object." -msgstr "" +msgstr "Indtast den størrelse, du vil afrunde hjørnerne med for det valgte 3D-objekt." #: 05350200.xhp msgctxt "" @@ -31331,7 +31319,7 @@ "15\n" "help.text" msgid "Enter the amount by which to increase or decrease the area of the front side of the selected 3D object." -msgstr "" +msgstr "Indtast mængden for at forøge eller formindske arealet af forsiden af det valgte 3D-objekt." #: 05350200.xhp msgctxt "" @@ -31349,7 +31337,7 @@ "17\n" "help.text" msgid "Enter the angle in degrees to rotate the selected 3D rotation object." -msgstr "" +msgstr "Indtast antallet af grader, som det valgte 3D-omdrejningslegeme skal roteres." #: 05350200.xhp msgctxt "" @@ -31361,14 +31349,13 @@ msgstr "Dybde" #: 05350200.xhp -#, fuzzy msgctxt "" "05350200.xhp\n" "par_id3153252\n" "19\n" "help.text" msgid "Enter the extrusion depth for the selected 3D object. This option is not valid for 3D rotation objects." -msgstr "Indtast extrusionsdybden for det valgte 3D-objekt. Denne indstilling er ikke gyldig for 3D-omdrejningslegemer." +msgstr "Indtast extrusionsdybden for det valgte 3D-objekt. Denne indstilling er ikke gyldig for 3D-omdrejningslegemer." #: 05350200.xhp msgctxt "" @@ -31404,7 +31391,7 @@ "9\n" "help.text" msgid "Enter the number of horizontal segments to use in the selected 3D rotation object." -msgstr "" +msgstr "Indtast antallet af vandrette segmenter til brug for det valgte 3D-omdrejningslegeme." #: 05350200.xhp msgctxt "" @@ -31422,7 +31409,7 @@ "11\n" "help.text" msgid "Enter the number of vertical segments to use in the selected 3D rotation object" -msgstr "" +msgstr "Indtast antallet af lodrette segmenter til brug for det valgte 3D-omdrejningslegeme" #: 05350200.xhp msgctxt "" @@ -31452,14 +31439,13 @@ msgstr "Objektspecifik" #: 05350200.xhp -#, fuzzy msgctxt "" "05350200.xhp\n" "par_id3149670\n" "23\n" "help.text" msgid "Renders the 3D surface according to the shape of the object. For example, a circular shape is rendered with a spherical surface." -msgstr "Gengiver 3D-overfladen ifølge objektets form. For eksempel, er et cirkelformet objekt gengivet med en kugleformet overflade." +msgstr "Gengiver 3D-overfladen ifølge objektets form. For eksempel er et cirkelformet objekt gengivet med en kugleformet overflade." #: 05350200.xhp msgctxt "" @@ -31494,7 +31480,7 @@ "26\n" "help.text" msgid "Renders the 3D surface as polygons." -msgstr "" +msgstr "Gengiver 3D-overfladen som polygoner." #: 05350200.xhp msgctxt "" @@ -31529,7 +31515,7 @@ "29\n" "help.text" msgid "Renders a smooth 3D surface." -msgstr "" +msgstr "Gengiver en jævn 3D-overflade." #: 05350200.xhp msgctxt "" @@ -31564,7 +31550,7 @@ "32\n" "help.text" msgid "Inverts the light source." -msgstr "" +msgstr "Omvender lyskilden." #: 05350200.xhp msgctxt "" @@ -31593,14 +31579,13 @@ msgstr "Dobbeltsidet belysning" #: 05350200.xhp -#, fuzzy msgctxt "" "05350200.xhp\n" "par_id3163820\n" "35\n" "help.text" msgid "Lights the object from the outside and the inside. To use an ambient light source, click this button, and then click the Invert Normals button." -msgstr "Belyser objektet fra ydersiden og indersiden. For at bruge en omgivelseslyskilde, klik på denne knap, og klik så på knappen Inverter normaler." +msgstr "Belyser objektet fra ydersiden og indersiden. For at bruge en omgivelseslyskilde, klik på denne knap, og klik så på knappen Inverter normaler." #: 05350200.xhp msgctxt "" @@ -31635,7 +31620,7 @@ "38\n" "help.text" msgid "Closes the shape of a 3D object that was created by extruding a freeform line (Convert - To 3D)." -msgstr "" +msgstr "Lukker formen på et 3D-objekt, som blev oprettet ved at ekstrudere en frihåndslinje (Konverter - til 3D)." #: 05350200.xhp msgctxt "" @@ -31678,7 +31663,7 @@ "2\n" "help.text" msgid "Sets the shading and shadow options for the selected 3D object." -msgstr "" +msgstr "Sætter skyggen og skyggeindstillinger for det valgte 3D-objekt." #: 05350300.xhp msgctxt "" @@ -31708,14 +31693,13 @@ msgstr "Tilstand" #: 05350300.xhp -#, fuzzy msgctxt "" "05350300.xhp\n" "par_id3155583\n" "7\n" "help.text" msgid "Select the shading method that you want to use. Flat shading assigns a single color to a single polygon on the surface of the object. Gouraud shading blends colors across the polygons. Phong shading averages the color of each pixel based on the pixels that surround it, and requires the most processing power." -msgstr "Vælg den skyggemetode du vil bruge. Flad skygge tildeler en enkelt farve til en enkelt polygon på objektets overflade. Gouraud-skygge blander farver på tværs af polygonerne. Phong-skygge udligner farven på hvert billedpunkt baseret på de omgivne billedpunkter og kræver mest regnekraft." +msgstr "Vælg den skyggemetode du vil bruge. Flad skygge tildeler en enkelt farve til en enkelt polygon på objektets overflade. Gouraud-skygge blander farver på tværs af polygonerne. Phong-skygge udligner farven på hvert billedpunkt baseret på de omgivne billedpunkter og kræver mest regnekraft." #: 05350300.xhp msgctxt "" @@ -31768,7 +31752,7 @@ "12\n" "help.text" msgid "Enter an angle from 0 to 90 degrees for casting the shadow." -msgstr "" +msgstr "Indtast en vinkel fra 0 til 90 grader som skyggen kaster." #: 05350300.xhp msgctxt "" @@ -31804,7 +31788,7 @@ "16\n" "help.text" msgid "Enter the distance to leave between the camera and the center of the selected object." -msgstr "" +msgstr "Indtast afstanden, der skal være mellem kameraet og midten af det valgte objekt." #: 05350300.xhp msgctxt "" @@ -31816,14 +31800,13 @@ msgstr "Kamerabrændvidde" #: 05350300.xhp -#, fuzzy msgctxt "" "05350300.xhp\n" "par_id3156344\n" "18\n" "help.text" msgid "Enter the focal length of the camera, where a small value corresponds to a \"fisheye\" lens, and a large value to a telephoto lens." -msgstr "Indast brændvidden for kameraet, hvor en lav værdi svarer til en fiskeøjelinse, og en høj værdi svarer til en telelinse." +msgstr "Indast brændvidden for kameraet, hvor en lav værdi svarer til en fiskeøjelinse, og en høj værdi svarer til en telelinse." #: 05350400.xhp msgctxt "" @@ -31879,14 +31862,13 @@ msgstr "Lyskilde" #: 05350400.xhp -#, fuzzy msgctxt "" "05350400.xhp\n" "par_id3149149\n" "7\n" "help.text" msgid "Click twice to turn the light source on, and then select a color for the light from the list. If you want, you can also set the color of the surrounding light, by selecting a color from the Ambient light box. You can also press the Spacebar to turn the light source on or off." -msgstr "Klik to gange for at tænde lyskilden og vælg så en farve på belysningen fra listen. Hvis du vil, kan du også indstille farven på det omgivende lys ved at vælge en farve fra feltet Omgivelseslys. Du kan også tænde og slukke lyset med mellemrumstasten." +msgstr "Klik to gange for at tænde lyskilden og vælg så en farve på belysningen fra listen. Hvis du vil, kan du også indstille farven på det omgivende lys ved at vælge en farve fra feltet Omgivelseslys. Du kan også tænde og slukke lyset med mellemrumstasten." #: 05350400.xhp msgctxt "" @@ -31968,14 +31950,13 @@ msgstr "Farvevalg" #: 05350400.xhp -#, fuzzy msgctxt "" "05350400.xhp\n" "par_id3153896\n" "16\n" "help.text" msgid "Select a color for the ambient light." -msgstr "Vælg en farve for den aktuelle lyskilde." +msgstr "Vælg en farve for den omgivende lyskilde." #: 05350400.xhp msgctxt "" @@ -32022,14 +32003,13 @@ msgstr "Teksturer" #: 05350500.xhp -#, fuzzy msgctxt "" "05350500.xhp\n" "par_id3147000\n" "2\n" "help.text" msgid "Sets the properties of the surface texture for the selected 3D object. This feature is only available after you apply a surface textures to the selected object. To quickly apply a surface texture, open the Gallery, hold down Shift+Ctrl (Mac: Shift+Command), and then drag an image onto the selected 3D object." -msgstr "Sætter egenskaberne for overfladeteksturen for det valgte 3D-objekt. Denne mulighed er kun tilgængelig efter, du har givet en overfladetekstur til det valgte objekt. For hurtigt at tildele en overfladetekstur skal du åbne Galleriet, holde Skift+Ctrl (Mac: Skift+Æble) nede og så trække et billede hen på det valgte 3D-objekt." +msgstr "Sætter egenskaberne for overfladeteksturen for det valgte 3D-objekt. Denne mulighed er kun tilgængelig efter, du har givet en overfladetekstur til det valgte objekt. For hurtigt at tildele en overfladetekstur skal du åbne Galleriet, holde Skift+Ctrl (Mac: Skift+Æble) nede og så trække et billede hen på det valgte 3D-objekt." #: 05350500.xhp msgctxt "" @@ -32083,7 +32063,7 @@ "9\n" "help.text" msgid "Converts the texture to black and white." -msgstr "" +msgstr "Konverterer teksturen til sort-hvid." #: 05350500.xhp msgctxt "" @@ -32118,7 +32098,7 @@ "12\n" "help.text" msgid "Converts the texture to color." -msgstr "" +msgstr "Konverterer teksturen til farve." #: 05350500.xhp msgctxt "" @@ -32171,7 +32151,7 @@ "17\n" "help.text" msgid "Applies the texture without shading." -msgstr "" +msgstr "Lægger teksturen på uden skygger." #: 05350500.xhp msgctxt "" @@ -32200,14 +32180,13 @@ msgstr "Tekstur og skygge" #: 05350500.xhp -#, fuzzy msgctxt "" "05350500.xhp\n" "par_id3154938\n" "20\n" "help.text" msgid "Applies the texture with shading. To define the shading options for the texture, click the Shading button in this dialog." -msgstr "Lægger teksturen på med skygge. For at definere skyggeindstillinger for teksturen, klik på knappen Skygge i denne dialog." +msgstr "Lægger teksturen på med skygge. For at definere skyggeindstillinger for teksturen, klik på knappen Skygge i denne dialog." #: 05350500.xhp msgctxt "" @@ -32260,7 +32239,7 @@ "25\n" "help.text" msgid "Automatically adjusts the texture based on the shape and size of the object." -msgstr "" +msgstr "Justerer automatisk teksturen baseret på formen og størrelsen af objektet." #: 05350500.xhp msgctxt "" @@ -32295,7 +32274,7 @@ "28\n" "help.text" msgid "Applies the texture parallel to the horizontal axis." -msgstr "" +msgstr "Lægger teksturen på parallel med den vandrette akse." #: 05350500.xhp msgctxt "" @@ -32330,7 +32309,7 @@ "31\n" "help.text" msgid "Wraps the horizontal axis of the texture pattern around a sphere." -msgstr "" +msgstr "Lægger teksturmønstrets vandrette akse omkring en kugle." #: 05350500.xhp msgctxt "" @@ -32383,7 +32362,7 @@ "36\n" "help.text" msgid "Automatically adjusts the texture based on the shape and size of the object." -msgstr "" +msgstr "Justerer automatisk teksturen baseret på formen og størrelsen af objektet." #: 05350500.xhp msgctxt "" @@ -32418,7 +32397,7 @@ "39\n" "help.text" msgid "Applies the texture parallel to the vertical axis." -msgstr "" +msgstr "Lægger teksturen parallelt med den lodrette akse." #: 05350500.xhp msgctxt "" @@ -32453,7 +32432,7 @@ "42\n" "help.text" msgid "Wraps the vertical axis of the texture pattern around a sphere." -msgstr "" +msgstr "Lægger teksturmønstrets lodrette akse omkring en kugle." #: 05350500.xhp msgctxt "" @@ -32506,7 +32485,7 @@ "47\n" "help.text" msgid "Blurs the texture slightly to remove unwanted speckles." -msgstr "" +msgstr "Gør teksturen lidt uskarp for at fjerne uønskede pletter." #: 05350500.xhp msgctxt "" @@ -32585,7 +32564,7 @@ "10\n" "help.text" msgid "Select a predefined color scheme, or select User-defined to define a custom color scheme." -msgstr "" +msgstr "Vælg et foruddefineret farveskema, eller vælg Brugerdefineret for at definere et brugerdefineret farveskema." #: 05350600.xhp msgctxt "" @@ -32624,14 +32603,13 @@ msgstr "Belysningsfarve" #: 05350600.xhp -#, fuzzy msgctxt "" "05350600.xhp\n" "par_id3159234\n" "20\n" "help.text" msgid "Select the color to illuminate the object." -msgstr "Vælg farven som du ønsker at tilføje objektet." +msgstr "Vælg farven som du ønsker at belyse objektet med." #: 05350600.xhp msgctxt "" @@ -32670,14 +32648,13 @@ msgstr "Farve" #: 05350600.xhp -#, fuzzy msgctxt "" "05350600.xhp\n" "par_id3151111\n" "25\n" "help.text" msgid "Select the color that you want the object to reflect." -msgstr "Vælg farven som du ønsker at tilføje objektet." +msgstr "Vælg farven som du ønsker at objektet skal reflektere." #: 05350600.xhp msgctxt "" @@ -32704,7 +32681,7 @@ "28\n" "help.text" msgid "Enter the intensity of the specular effect." -msgstr "" +msgstr "Indtast intensiteten af spejlglanseffekten." #: 05360000.xhp msgctxt "" @@ -33967,14 +33944,13 @@ msgstr "Erstat" #: 06030000.xhp -#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154983\n" "8\n" "help.text" msgid "Replaces the selected source colors in the current image with the colors that you specify in the Replace with boxes." -msgstr "Erstatter de valgte kildefarver i det aktuelle billede med de farver, som du angiver i boksene Erstat med." +msgstr "Erstatter de valgte kildefarver i det aktuelle billede med de farver, som du angiver i boksene Erstat med." #: 06030000.xhp msgctxt "" @@ -34004,14 +33980,13 @@ msgstr "Afkrydsningsfelt med kildefarve" #: 06030000.xhp -#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3149819\n" "12\n" "help.text" msgid "Select this checkbox to replace the current Source color with the color that you specify in the Replace with box." -msgstr "Vælg dette afkrydsningsfelt for at erstatte den aktuelle Kildefarve med den farve, som du angiver i feltet Erstat med." +msgstr "Vælg dette afkrydsningsfelt for at erstatte den aktuelle Kildefarve med den farve, som du angiver i feltet Erstat med." #: 06030000.xhp msgctxt "" @@ -34041,14 +34016,13 @@ msgstr "Tolerance" #: 06030000.xhp -#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3144438\n" "16\n" "help.text" msgid "Set the tolerance for replacing a source color in the source image. To replace colors that are similar to the color that you selected, enter a low value. To replace a wider range of colors, enter a higher value." -msgstr "Sæt tolerancen for erstatning af en kildefarve i kildebilledet. For at erstatte farver, der ligner den farve, som du valgte, skal du indtaste en lav værdi. For at erstatte et bredere område af farver skal du indtaste en højere værdi." +msgstr "Sæt tolerancen for erstatning af en kildefarve i kildebilledet. For at erstatte farver, der ligner den farve, som du valgte, skal du indtaste en lav værdi. For at erstatte et bredere område af farver skal du indtaste en højere værdi." #: 06030000.xhp msgctxt "" @@ -34060,14 +34034,13 @@ msgstr "Erstat med" #: 06030000.xhp -#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154173\n" "18\n" "help.text" msgid "Lists the available replacement colors. To modify the current list of colors, deselect the image, choose Format - Area, and then click the Colors tab." -msgstr "Opremser de tilgængelige erstatningsfarver. For at ændre den aktuelle liste med farver, vælg billedet fra, vælg Formater - Område, og klik så på fanebladet Farver." +msgstr "Oplister de tilgængelige erstatningsfarver. For at ændre den aktuelle liste med farver, vælg billedet fra, vælg Formater - Område, og klik så på fanebladet Farver." #: 06030000.xhp msgctxt "" @@ -34103,7 +34076,7 @@ "22\n" "help.text" msgid "Select the color to replace the transparent areas in the current image." -msgstr "" +msgstr "Vælg den farve, der skal erstatte de transparente områder i det aktuelle billede." #: 06040000.xhp msgctxt "" @@ -35227,7 +35200,7 @@ "53\n" "help.text" msgid "Note that this only applies to languages that have the convention of formatting ordinal numbers as superscript." -msgstr "" +msgstr "Bemærk at dette kun gør sig gældende for sprog som formaterer ordenstal som hævet skrift." #: 06040400.xhp msgctxt "" @@ -35673,7 +35646,7 @@ "107\n" "help.text" msgid "Lists the collected words. The list is valid until you close the current document. To make the list available to other documents in the current session, disable \"When closing a document, remove the words collected from it from the list\"." -msgstr "Lister de indsamlede ord. Listen er gyldig indtil du lukker det aktuelle dokument. For at gøre listen tilgængelig for andre dokumenter i den aktuelle session, vælg da \"Gem listen til senere brug, når et dokument lukkes\"." +msgstr "Lister de indsamlede ord. Listen er gyldig indtil du lukker det aktuelle dokument. For at gøre listen tilgængelig for andre dokumenter i den aktuelle session, vælg da \"Gem listen til senere brug, når et dokument lukkes\"." #: 06040600.xhp msgctxt "" @@ -36736,7 +36709,7 @@ "par_id5004119\n" "help.text" msgid "The Position tab page looks different for documents using the new position and spacing attributes introduced with OpenOffice.org 3.0 (and used in all versions of LibreOffice), or documents using the old attributes from versions before 3.0. The new version of this tab page shows the controls \"Numbering followed by\", \"Numbering alignment\", \"Aligned at\", and \"Indent at\". The old version of this tab page that can be seen in an old numbered or bulleted list shows the controls \"Indent\", \"Width of numbering\", \"Minimum space between numbering and text\", and \"Numbering alignment\"." -msgstr "Fanen Placering ser anderledes ud i dokumenter, der benytter de nye placerings- og afstandsattributter, som blev introduceret med OpenOffice.org 3.0 (og benyttes i alle versioner af LibreOffice), end dokumenter der benytter de ældre attributter fra før version 3.0. Den nye version af denne fane viser kontrolelementerne \"Nummerering efterfulgt af\", \"Justering af nummerering\", Justeret ved\" og \"Indryk ved\". Den ældre version af denne fane, der kan opleves i dokumenter med gamle punktopstillinger, har kontrolelementerne \"Indryk\", \"Nummereringens bredde\", \"Mindste afstand mellem nummerering <-> tekst\" og \"Justering af nummerering\"." +msgstr "Fanen Placering ser anderledes ud i dokumenter, der benytter de nye placerings- og afstandsattributter, som blev introduceret med OpenOffice.org 3.0 (og benyttes i alle versioner af LibreOffice), end dokumenter der benytter de ældre attributter fra før version 3.0. Den nye version af denne fane viser kontrolelementerne \"Nummerering efterfulgt af\", \"Justering af nummerering\", Justeret ved\" og \"Indryk ved\". Den ældre version af denne fane, der kan opleves i dokumenter med gamle punktopstillinger, har kontrolelementerne \"Indryk\", \"Nummereringens bredde\", \"Mindste afstand mellem nummerering og tekst\" og \"Justering af nummerering\"." #: 06050600.xhp msgctxt "" @@ -36908,7 +36881,7 @@ "8\n" "help.text" msgid "Minimum space between numbering and text" -msgstr "Mindste afstand mellem nummerering <-> tekst" +msgstr "Mindste afstand mellem nummerering og tekst" #: 06050600.xhp msgctxt "" @@ -37050,7 +37023,7 @@ "16\n" "help.text" msgid "Opens the Customize dialog, where you can assign the selected macro to a menu command, a toolbar, or an event." -msgstr "Åbner dialogen Tilpas, hvor den valgte makro kan tildeles en menukommando, en værktøjslinje eller en hændelse." +msgstr "Åbner dialogen Tilpas, hvor den valgte makro kan tildeles en menukommando, en værktøjslinje eller en hændelse." #: 06130000.xhp msgctxt "" @@ -43015,7 +42988,7 @@ "par_id5269020\n" "help.text" msgid "On a web page, click a hyperlink to an *.oxt file (if your web browser can be configured to start the Extension Manager for this file type)." -msgstr "På en internetside kan du klikke på et link til en *.oxt-fil (hvis din browser kan konfigureres til at starte Udvidelsesadministrationen for denne filtype)." +msgstr "På en internetside kan du klikke på et link til en *.oxt-fil (hvis din browser kan konfigureres til at starte Udvidelsesadministrationen for denne filtype)." #: packagemanager.xhp msgctxt "" @@ -43519,7 +43492,7 @@ "7\n" "help.text" msgid "Exports the pages you type in the box." -msgstr "" +msgstr "Eksporterer de sider, du skriver i feltet." #: ref_pdf_export.xhp msgctxt "" @@ -43666,7 +43639,7 @@ "hd_id080420080355360\n" "help.text" msgid "Hybrid PDF (embed ODF file)" -msgstr "" +msgstr "Hybrid PDF (indlejret ODF-fil)" #: ref_pdf_export.xhp msgctxt "" @@ -43682,7 +43655,7 @@ "hd_id2796411\n" "help.text" msgid "Archive PDF/A-1a (ISO 19005-1)" -msgstr "" +msgstr "Arkiv PDF/A-1a (ISO 19005-1)" #: ref_pdf_export.xhp msgctxt "" @@ -43698,7 +43671,7 @@ "par_idN107A0\n" "help.text" msgid "Tagged PDF (add document structure)" -msgstr "" +msgstr "Opmærket PDF (tilføj dokumentstruktur)" #: ref_pdf_export.xhp msgctxt "" @@ -43829,7 +43802,6 @@ msgstr "Eksporter automatisk indsatte tomme sider" #: ref_pdf_export.xhp -#, fuzzy msgctxt "" "ref_pdf_export.xhp\n" "par_id8551896\n" @@ -44630,13 +44602,12 @@ msgstr "Marker for at aktivere tekstadgang for tilgængelighedsværktøjer." #: ref_pdf_export.xhp -#, fuzzy msgctxt "" "ref_pdf_export.xhp\n" "hd_id13068636\n" "help.text" msgid "Digital Signatures tab" -msgstr "Digitale signaturer" +msgstr "Fanen Digitale signaturer" #: ref_pdf_export.xhp msgctxt "" @@ -44644,7 +44615,7 @@ "par_id22107303\n" "help.text" msgid "This tab contains the options related to exporting to a digitally signed PDF." -msgstr "" +msgstr "Denne fane indeholder valgmulighederne for eksport af digitalt signeret PDF." #: ref_pdf_export.xhp msgctxt "" @@ -44652,7 +44623,7 @@ "par_id22107304\n" "help.text" msgid "Digital signatures are used to ensure that the PDF was really created by the original author (i.e. you), and that the document has not been modified since it was signed." -msgstr "" +msgstr "Digitale signaturer anvendes til at sikre, at PDF-filen i virkeligheden er oprettet af den rette forfatter (f.eks. dig), og at dokumentet ikke er blevet ændret siden den blev signeret." #: ref_pdf_export.xhp msgctxt "" @@ -44660,7 +44631,7 @@ "par_id22107305\n" "help.text" msgid "The signed PDF export uses the keys and X.509 certificates already stored in your default key store location or on a smartcard." -msgstr "" +msgstr "Den signerede PDF-eksport benytter de nøgler og X.509-certifikater som allerede er i din nøglebank eller på en smartcard." #: ref_pdf_export.xhp msgctxt "" @@ -44668,7 +44639,7 @@ "par_id22107306\n" "help.text" msgid "The key store to be used can be selected under %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Security - Certificate Path." -msgstr "" +msgstr "Nøglebanken som bruges kan du vælge under %PRODUCTNAME - IndstillingerFunktioner - Indstillinger - %PRODUCTNAME - Sikkerhed - Sti til certifikat." #: ref_pdf_export.xhp msgctxt "" @@ -44676,7 +44647,7 @@ "par_id22107307\n" "help.text" msgid "When using a smartcard, it must already be configured for use by your key store. This is usually done during installation of the smartcard software." -msgstr "" +msgstr "Hvis du bruger smartcard, skal det på forhånd være registreret til at blive brugt fra din nøglebank. Det gøres normalt ved installation af smartcard-programmet." #: ref_pdf_export.xhp msgctxt "" @@ -44692,7 +44663,7 @@ "par_id12107303\n" "help.text" msgid "Allows you to select a certificate to be used for signing this PDF export." -msgstr "" +msgstr "Gør det muligt at vælge et certifikat, som skal bruges til at signere denne PDF-eksport." #: ref_pdf_export.xhp msgctxt "" @@ -44708,7 +44679,7 @@ "par_id12507303\n" "help.text" msgid "Opens the Select Certificate dialog." -msgstr "" +msgstr "Åbner dialogen Vælg certifikat." #: ref_pdf_export.xhp msgctxt "" @@ -44716,7 +44687,7 @@ "par_id12507403\n" "help.text" msgid "All certificates found in your selected key store are displayed. If the key store is protected by a password, you are prompted for it. When using a smartcard that is protected by a PIN, you are also prompted for that." -msgstr "" +msgstr "Alle certifikater i den valgte nøglebank vises. Hvis nøglebanken er beskyttet af et kodeord, bliver du spurgt efter det. Ved brug af et smart card som er beskyttet af en PIN-kode, bliver du spurgt om det." #: ref_pdf_export.xhp msgctxt "" @@ -44724,7 +44695,7 @@ "par_id12507503\n" "help.text" msgid "Select the certificate to use for digitally signing the exported PDF by clicking on the corresponding line, then click OK." -msgstr "" +msgstr "Vælg det certifikat du vil bruge til at signere den eksporterede PDF-fil med, ved at klikke på den relevante linje i oversigten. Klik herefter på OK." #: ref_pdf_export.xhp msgctxt "" @@ -44748,7 +44719,7 @@ "par_id13939634\n" "help.text" msgid "Enter the password used for protecting the private key associated with the selected certificate. Usually this is the key store password." -msgstr "" +msgstr "Indtast kodeordet for den private nøgle, som passer til det valgte certifikat. Dette er normalt nøglebankens kodeord." #: ref_pdf_export.xhp msgctxt "" @@ -44756,7 +44727,7 @@ "par_id13932634\n" "help.text" msgid "If the key store password has already been entered in the Select Certificate dialog, the key store may already be unlocked and not require the password again. But to be on the safe side, enter it nevertheless." -msgstr "" +msgstr "Hvis kodeordet til nøglebanken allerede er indtastet i dialogen Vælg certifikat, er nøglebanken muligvis allerede låst op og kodeordet skal ikke indtastes endnu en gang. Men for at være sikker, kan du indtaste det alligevel." #: ref_pdf_export.xhp msgctxt "" @@ -44764,7 +44735,7 @@ "par_id13933634\n" "help.text" msgid "When using a smartcard, enter the PIN here. Some smartcard software will prompt you for the PIN again before signing. This is cumbersome, but that's how smartcards work." -msgstr "" +msgstr "Hvis du bruger et smartcard, skal du indtaste PIN-koden her. Nogle smartcards vil spørge dig om PIN-koden endnu en gang før signering. Det er underligt, men sådan fungerer smartcards." #: ref_pdf_export.xhp msgctxt "" @@ -44772,7 +44743,7 @@ "hd_id1599688\n" "help.text" msgid "Location, Contact information, Reason" -msgstr "" +msgstr "Placering, kontaktinformationer, årsag" #: ref_pdf_export.xhp msgctxt "" @@ -44780,7 +44751,7 @@ "par_id11371501\n" "help.text" msgid "These three fields allow you to optionally enter additional information about the digital signature that will be applied to the PDF (Where, by whom and why it was made). It will be embedded in the appropriate PDF fields and will be visible to anyone viewing the PDF. Each or all of the three fields may be left blank." -msgstr "" +msgstr "Disse tre felter tillader dig at tilføje yderligere information, som tilføjes PDF-filen. til den digitale signatur, hvis du vil. Informationen tilføjes de tilsvarende felter i PDF-filen, og vil være synlig for alle som viser PDF-filen. Hvert enkelt felt er valgfrit." #: ref_pdf_export.xhp msgctxt "" @@ -44788,7 +44759,7 @@ "hd_id14661702\n" "help.text" msgid "Time Stamp Authority" -msgstr "" +msgstr "Tidsstempel Myndigheder (Time Stamping Authority, TSA)" #: ref_pdf_export.xhp msgctxt "" @@ -44796,7 +44767,7 @@ "par_id17868892\n" "help.text" msgid "Allows you to optionally select a Time Stamping Authority (TSA) URL. " -msgstr "" +msgstr "Giver dig mulighed for, hvis der er relevant for dig, at vælge URL for en tidsstempel myndighed (Time Stamping Authority, TSA). " #: ref_pdf_export.xhp msgctxt "" @@ -44804,7 +44775,7 @@ "par_id29089022\n" "help.text" msgid "During the PDF signing process, the TSA will be used to obtain a digitally signed timestamp that is then embedded in the signature. This (RFC 3161) timestamp will allow anyone viewing the PDF to verify when the document was signed." -msgstr "" +msgstr "I signeringsprocessen, vil TSA blive brugt til at anskaffe et digitalt signert tidsstempel som også bliver vedlagt PDF-filen. Dette (RFC 3161) tidsstempel garanterer at tidspunktet for signering af PDF-filen er korrekt." #: ref_pdf_export.xhp msgctxt "" @@ -44812,7 +44783,7 @@ "par_id39089022\n" "help.text" msgid "The list of TSA URLs that can be selected is maintained under %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME - Security - TSAs." -msgstr "" +msgstr "Listen med TSA URL-adresser kan vælges og vedligeholdes under %PRODUCTNAME - IndstillingerFunktioner - Indstillinger - %PRODUCTNAME - Sikkerhed - TSA." #: ref_pdf_export.xhp msgctxt "" @@ -44820,7 +44791,7 @@ "par_id49089022\n" "help.text" msgid "If no TSA URL is selected (the default), the signature will not be timestamped, but will use the current time from your local computer." -msgstr "" +msgstr "Hvis ingen TSA URL-adresse er valgt (standard), vil den digitale signatur ikke blive tidsstemplet, men vil benytte det aktuelle klokkeslæt fra din computer." #: ref_pdf_export.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/02.po libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/02.po --- libreoffice-5.0.2/translations/source/da/helpcontent2/source/text/shared/02.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/da/helpcontent2/source/text/shared/02.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-06-24 16:47+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-12-29 15:01+0000\n" +"Last-Translator: David Lamhauge \n" "Language-Team: LANGUAGE \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435164461.000000\n" +"X-POOTLE-MTIME: 1451401297.000000\n" #: 01110000.xhp msgctxt "" @@ -123,7 +123,7 @@ "par_id3154288\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -183,7 +183,7 @@ "par_id3154897\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -218,7 +218,7 @@ "par_id3154125\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -244,7 +244,7 @@ "par_id3156443\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -270,7 +270,7 @@ "par_id3154129\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -314,7 +314,7 @@ "par_id3153876\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -340,7 +340,7 @@ "par_id3155602\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -366,7 +366,7 @@ "par_id3156359\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -392,7 +392,7 @@ "par_id3154363\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -418,7 +418,7 @@ "par_id3151017\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -444,7 +444,7 @@ "par_id3145790\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -470,7 +470,7 @@ "par_id3150380\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -496,7 +496,7 @@ "par_id3153781\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -562,7 +562,7 @@ "par_id3156068\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -588,7 +588,7 @@ "par_id3146929\n" "help.text" msgid "Icon" -msgstr "Ikon" +msgstr "Ikon" #: 01140000.xhp msgctxt "" @@ -5963,7 +5963,7 @@ "17\n" "help.text" msgid "In the data transfer of a selected entry from a list box or a combo box, both the list of the values displayed in the form, which was entered on the General tab under List entries, and the value list entered on the Data tab under List content, are taken into consideration: If a (non-empty) text is at the selected position in the value list ( returnerer « » (den 2. byteposisjonen peikar til den siste halvdelen av det første teiknet i ein DBCS-streng. Dei 2 byte som vert returnerte er difor den siste halvparten av det første teiknet og den første halvparten av det andre teiknet. Det vert difor returnert 2 mellomrom)." #: 04060110.xhp msgctxt "" @@ -28088,7 +28088,7 @@ "73\n" "help.text" msgid "Add-ins can also be implemented through the %PRODUCTNAME API." -msgstr "Tilleggsfunksjonar kan også leggjast inn via %PRODUCTNAME API." +msgstr "Tilleggsfunksjonar kan også leggjast inn via %PRODUCTNAME API." #: 04060112.xhp msgctxt "" @@ -28131,7 +28131,7 @@ "2\n" "help.text" msgid "$[officename] Calc can be expanded by Add-Ins, which are external programming modules providing additional functions for working with spreadsheets. These are listed in the Function Wizard in the Add-In category. If you would like to program an Add-In yourself, you can learn here which functions must be exported by the shared library external DLL so that the Add-In can be successfully attached." -msgstr "$[officename] Calc kan utvidast med programtillegg som er eksterne programmodular som legg fleire funksjonar til i reknearket. Du kan få fram lista over tillegga frå menyen Verktøy → Utvidingar. Dersom du ønskjer å programmera ein tilleggsfunksjon, kan du læra her kva funksjonar som må eksporterast med det delte biblioteketden eksterne DLL for å verta korrekt installert." +msgstr "$[officename] Calc kan utvidast med programtillegg som er eksterne programmodular som legg fleire funksjonar til i reknearket. Desse er lista opp i Funksjonsvegvisaren under kategorien Tillegg. Dersom du ønskjer å programmera ein tilleggsfunksjon, kan du sjå her kva funksjonar som må eksporterast med det delte biblioteketden eksterne DLL for å verta korrekt installert." #: 04060112.xhp msgctxt "" @@ -39757,7 +39757,7 @@ "bm_id3164897\n" "help.text" msgid "COUNTIF functioncounting;specified cells" -msgstr "TAL.VISS-funksjonentelja;bestemte celler" +msgstr "TEL.VISS-funksjonentelja;bestemte celler" #: 04060181.xhp msgctxt "" @@ -39766,7 +39766,7 @@ "547\n" "help.text" msgid "COUNTIF" -msgstr "TAL.VISS (COUNTIF på engelsk)" +msgstr "TEL.VISS (COUNTIF på engelsk)" #: 04060181.xhp msgctxt "" @@ -39790,7 +39790,7 @@ "par_id3164967\n" "help.text" msgid "COUNTIF(Range; Criteria)" -msgstr "TAL.VISS(Område; Vilkår)" +msgstr "TEL.VISS(Område; Vilkår)" #: 04060181.xhp msgctxt "" @@ -39830,7 +39830,7 @@ "par_id3581652\n" "help.text" msgid "=COUNTIF(A1:A10;2006) - this returns 1" -msgstr "=TAL.VISS(A1:A10;2006) - dette returnerer 1" +msgstr "=TEL.VISS(A1:A10;2006) - dette returnerer 1" #: 04060181.xhp msgctxt "" @@ -39838,7 +39838,7 @@ "par_id708639\n" "help.text" msgid "=COUNTIF(A1:A10;B1) - this returns 1" -msgstr "=TAL.VISS(A1:A10;B1) - dette returnerer 1" +msgstr "=TEL.VISS(A1:A10;B1) - dette returnerer 1" #: 04060181.xhp msgctxt "" @@ -39846,7 +39846,7 @@ "par_id5169225\n" "help.text" msgid "=COUNTIF(A1:A10;\">=2006\") - this returns 4" -msgstr "=TAL.VISS(A1:A10;\">=2006\") ‒ dette returnerer 4" +msgstr "=TEL.VISS(A1:A10;\">=2006\") ‒ dette returnerer 4" #: 04060181.xhp msgctxt "" @@ -39854,7 +39854,7 @@ "par_id2118594\n" "help.text" msgid "=COUNTIF(A1:A10;\"<\"&B1) - when B1 contains 2006, this returns 6" -msgstr "=TAL.VISS(A1:A10;\"<\"&B1) ‒ når B1 inneheld 2006, vert 6 returnert" +msgstr "=TEL.VISS(A1:A10;\"<\"&B1) ‒ når B1 inneheld 2006, vert 6 returnert" #: 04060181.xhp msgctxt "" @@ -39862,7 +39862,7 @@ "par_id166020\n" "help.text" msgid "=COUNTIF(A1:A10;C2) where cell C2 contains the text >2006 counts the number of cells in the range A1:A10 which are >2006" -msgstr "=TAL.VISS(A1:A10;C2) der celle C2 inneheld teksten >2006 vert talet på celler som er større enn 2006 talde i området A1:A10." +msgstr "=TEL.VISS(A1:A10;C2) der celle C2 inneheld teksten >2006 vert talet på celler som er større enn 2006 talde i området A1:A10." #: 04060181.xhp msgctxt "" @@ -39870,7 +39870,7 @@ "par_id6386913\n" "help.text" msgid "To count only negative numbers: =COUNTIF(A1:A10;\"<0\")" -msgstr "For berre å telja negative tal: =TAL.VISS(A1:A10;\"<0\")" +msgstr "For berre å telja negative tal: =TEL.VISS(A1:A10;\"<0\")" #: 04060181.xhp msgctxt "" @@ -56686,7 +56686,7 @@ "5\n" "help.text" msgid "To protect cells from further editing, the Protected check box must be checked on the Format - Cells - Cell Protection tab page or on the Format Cells context menu." -msgstr "For å verna celler frå vidare redigering, må avkryssingsfeltet i Format → Celler → Cellevern eller fana i lokalmenyen Formater celler vera avkryssa." +msgstr "For å verna celler frå vidare redigering, må avkryssingsfeltet Verna i Format → Celler → Cellevern eller fana Formater celler i lokalmenyen vera avkryssa." #: 06060100.xhp msgctxt "" @@ -56967,7 +56967,7 @@ "par_id315475855\n" "help.text" msgid "The Add-In functions like RANDBETWEEN currently cannot respond to the Recalculate command or F9. Press Shift+CommandCtrl+F9 to recalculate all formulas, including the Add-In functions." -msgstr "Tilleggsfunksjonar som TILFELDIGMELLOM reagerer førebels ikkje på Rekna på nytt eller F9. Trykk Shift + CmdCtrl + F9 for å rekne ut alle formlane, også dei som høyrer til tileggsfunksjonane." +msgstr "Tilleggsfunksjonar som TILFELDIGMELLOM reagerer førebels ikkje på Rekna på nytt eller F9. Trykk Shift + CmdCtrl + F9 for å rekna ut alle formlane, også dei som høyrer til tileggsfunksjonane." #: 06130000.xhp msgctxt "" @@ -60556,7 +60556,7 @@ "29\n" "help.text" msgid "If the Regular Expression check box is selected, you can use EQUAL (=) and NOT EQUAL (<>) also in comparisons. You can also use the following functions: DCOUNTA, DGET, MATCH, COUNTIF, SUMIF, LOOKUP, VLOOKUP and HLOOKUP." -msgstr "Dersom det er kryssa av for å bruka Regulært uttrykk, kan du bruka likskapsteinet (=) og ulikskapsteiknet (<>) i samanlikningar. Du kan også bruka desse funksjonane: DTAL.PÅA, DHENT, SAMANLIKNA, TAL.VISS, SUMMER.VISS, SLÅ.OPP, FINN.RAD og FINN.KOLONNE." +msgstr "Dersom det er kryssa av for å bruka Regulært uttrykk, kan du bruka likskapsteinet (=) og ulikskapsteiknet (<>) i samanlikningar. Du kan også bruka desse funksjonane: DTAL.PÅA, DHENT, SAMANLIKNA, TEL.VISS, SUMMER.VISS, SLÅ.OPP, FINN.RAD og FINN.KOLONNE." #: 12090104.xhp msgctxt "" @@ -65729,7 +65729,7 @@ "par_id1000040\n" "help.text" msgid "Menu Data - Statistics - Sampling..." -msgstr "Meny Data → Statistikkar → Prøvetaking …" +msgstr "Meny Data → Statistikkar → Prøvetaking …" #: statistics.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/scalc/guide.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/scalc/guide.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/scalc/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/scalc/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-25 10:34+0000\n" +"PO-Revision-Date: 2016-02-03 20:24+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437820472.000000\n" +"X-POOTLE-MTIME: 1454531063.000000\n" #: address_auto.xhp msgctxt "" @@ -2514,7 +2514,7 @@ "14\n" "help.text" msgid "The STYLE() function can be added to an existing formula in a cell. For example, together with the CURRENT function, you can color a cell depending on its value. The formula =...+STYLE(IF(CURRENT()>3; \"Red\"; \"Green\")) applies the cell style \"Red\" to cells if the value is greater than 3, otherwise the cell style \"Green\" is applied." -msgstr "Funksjonen STIL() kan leggjast til ein formel som finst frå før i ei celle. For eksempel saman med funksjonen GJELDANDE kan du fargeleggja ei celle avhengig av verdien i cella. Formelen «=…+STIL(DERSOM(GJELDANDE()>3;\"Raud\";\"Grøn\"))» vil setja cellestilen «Raud» dersom verdien av cella er over 3, elles vert cellestilen «Grøn» brukt. " +msgstr "Funksjonen STIL() kan leggjast til ein formel som finst frå før i ei celle. For eksempel saman med funksjonen GJELDANDE kan du fargeleggja ei celle avhengig av verdien i cella. Formelen «=…+STIL(VISS(GJELDANDE()>3;\"Raud\";\"Grøn\"))» vil setja cellestilen «Raud» dersom verdien av cella er over 3, elles vert cellestilen «Grøn» brukt. " #: cellstyle_by_formula.xhp msgctxt "" @@ -2568,7 +2568,7 @@ "20\n" "help.text" msgid "Enter the following formula in the Replace with field: =&+STYLE(IF(CURRENT()>3;\"Red\";\"Green\"))" -msgstr "Skriv inn denne formelen i feltet Bytt ut med: =&+STIL(DERSOM(GJELDANDE()>3;\"Raud\";\"Grøn\"))" +msgstr "Skriv inn denne formelen i feltet Bytt ut med: =&+STIL(VISS(GJELDANDE()>3;\"Raud\";\"Grøn\"))" #: cellstyle_by_formula.xhp msgctxt "" @@ -4973,7 +4973,7 @@ "bm_id3150791\n" "help.text" msgid "theme selection for sheetslayout;spreadsheetscell styles; selectingselecting;formatting themessheets;formatting themesformats;themes for sheetsformatting;themes for sheets" -msgstr "temaval for arkutforming (layout); reknearkcellestilar; veljavelja; formateringstemarekneark; formateringstemaformat; tema for arkformatering; tema for arklayout, sjå utforming" +msgstr "temaval for arkutforming (layout); reknearkcellestilar; veljavelja; formateringstemarekneark; formateringstemaformat; tema for reknearkformatering; tema for arklayout, sjå utforming" #: design.xhp msgctxt "" @@ -5531,7 +5531,7 @@ "20\n" "help.text" msgid "You can assign a format to any group of cells by first selecting the cells (for multiple selection, hold down the CommandCtrl key when clicking), and then activating the Format Cells dialog in Format - Cell. In this dialog, you can select attributes such as shadows and backgrounds." -msgstr "Du kan tildela eit format til ei cellegrupper ved å først merkja cellene (for å merkja fleire cellegrupper, hald nede CmdCtrl når du klikkar) og så aktivera dialogen Celleeigenskapar frå Format → Celler. I denne dialogen kan du velja innstillingar som for eksempel tekst med skygge eller velja bakgrunnar." +msgstr "Du kan tildela eit format til ei cellegrupper ved å først merkja cellene (for å merkja fleire cellegrupper, hald nede CmdCtrl når du klikkar) og så aktivera dialogen Celleeigenskapar frå Format → Celler. I denne dialogen kan du velja innstillingar som for eksempel tekst med skugge eller velja bakgrunnar." #: format_table.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/schart/01.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/schart/01.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/schart/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/schart/01.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-07-23 19:35+0000\n" +"PO-Revision-Date: 2015-11-22 17:10+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437680146.000000\n" +"X-POOTLE-MTIME: 1448212234.000000\n" #: 03010000.xhp msgctxt "" @@ -4602,7 +4602,7 @@ "par_id9852900\n" "help.text" msgid "When shading is enabled and you rotate a chart, the lights are rotated as if they are fixed to the chart." -msgstr "Viss skyggelegging er slått på og du roterer diagrammet, følgjer lysa med diagrammet som om dei var festa til det." +msgstr "Viss skuggelegging er slått på og du roterer diagrammet, følgjer lysa med diagrammet som om dei var festa til det." #: three_d_view.xhp msgctxt "" @@ -4714,7 +4714,7 @@ "par_id1579027\n" "help.text" msgid "Mark Shading to use the Gouraud method for rendering the surface, otherwise a flat method is used." -msgstr "Slå på Skyggelegging for å bruka Gourauds metode for å teikna opp overflata, elles vert «flat» skyggelegging brukt." +msgstr "Slå på Skuggelegging for å bruka Gourauds metode for å teikna opp overflata, elles vert «flat» skuggelegging brukt." #: three_d_view.xhp msgctxt "" @@ -4722,7 +4722,7 @@ "par_id5624561\n" "help.text" msgid "The flat method sets a single color and brightness for each polygon. The edges are visible, soft gradients and spot lights are not possible." -msgstr "Flat skyggelegging bruker éin enkelt farge og lysstyrke for kvar mangekant. Kantane er synlege, mjuke overgangar og spotlight er ikkje mogleg." +msgstr "Flat skuggelegging bruker éin enkelt farge og lysstyrke for kvar mangekant. Kantane er synlege, mjuke overgangar og spotlight er ikkje mogleg." #: three_d_view.xhp msgctxt "" @@ -4762,7 +4762,7 @@ "par_id9183935\n" "help.text" msgid "Applies Gouraud shading if marked, or flat shading if unmarked." -msgstr "Slår på Gouraud-skyggelegging, elles vert flat skyggeleggjing brukt." +msgstr "Slår på Gouraud-skuggelegging, elles vert flat skuggeleggjing brukt." #: three_d_view.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/sdraw/guide.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/sdraw/guide.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/sdraw/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/sdraw/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-20 20:36+0000\n" +"PO-Revision-Date: 2015-11-22 17:11+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437424575.000000\n" +"X-POOTLE-MTIME: 1448212262.000000\n" #: align_arrange.xhp msgctxt "" @@ -1627,7 +1627,7 @@ "56\n" "help.text" msgid "You can select single objects in a group by entering the group. Double-click a group to enter it and click on the object to select it. You can also add or delete objects to and from a group in this mode. The objects that are not part of the group are grayed out." -msgstr "Du kan velja enkeltobjekt i ei gruppe ved å «gå inn i» gruppa. Dobbeltklikk på ei gruppe for å gå inn i gruppa og trykk på eit av objekta for å velja det. Du kan òg leggja til eller sletta objekt i ei gruppe i denne modusen. Objekta som ikkje er ein del av gruppa vert skyggelagde." +msgstr "Du kan velja enkeltobjekt i ei gruppe ved å «gå inn i» gruppa. Dobbeltklikk på ei gruppe for å gå inn i gruppa og trykk på eit av objekta for å velja det. Du kan òg leggja til eller sletta objekt i ei gruppe i denne modusen. Objekta som ikkje er ein del av gruppa vert skuggelagde." #: groups.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/sdraw.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/sdraw.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/sdraw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/sdraw.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-12 11:36+0000\n" +"PO-Revision-Date: 2015-11-22 17:10+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436700979.000000\n" +"X-POOTLE-MTIME: 1448212242.000000\n" #: main0000.xhp msgctxt "" @@ -744,7 +744,7 @@ "hd_id3341471\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: main0210.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/00.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/00.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/00.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/00.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-23 20:47+0000\n" +"PO-Revision-Date: 2015-11-22 17:12+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437684457.000000\n" +"X-POOTLE-MTIME: 1448212362.000000\n" #: 00000001.xhp msgctxt "" @@ -10565,7 +10565,7 @@ "91\n" "help.text" msgid "Open the context menu of the 3D object, choose 3D Effects - Shading tab " -msgstr "Opnar lokalmenyen (høgreklikk) Format - 3D-effektar - Skyggelegging " +msgstr "Opna lokalmenyen (høgreklikk) for 3D-objektet og vel fana Format → 3D-effektar → Skuggelegging " #: 00040500.xhp msgctxt "" @@ -12406,7 +12406,7 @@ "30\n" "help.text" msgid "Choose Format - Object - Graphic - Area - Shadow tab " -msgstr "Vel fana Format → Objekt → Bilete → Område → Skygge" +msgstr "Vel fana Format → Objekt → Bilete → Område → Skugge" #: 00040502.xhp msgctxt "" @@ -12741,7 +12741,7 @@ "128\n" "help.text" msgid "Open context menu - choose Style - Shadow" -msgstr "Opna lokalmenyen - vel Stil → Skygge" +msgstr "Opna lokalmenyen - vel Stil → Skugge" #: 00040502.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-25 08:38+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-31 15:24+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440491891.000000\n" +"X-POOTLE-MTIME: 1454253851.000000\n" #: 01010000.xhp msgctxt "" @@ -8723,7 +8723,7 @@ "28\n" "help.text" msgid "Shadowed" -msgstr "Skyggelagd" +msgstr "Skuggelagd" #: 02100200.xhp msgctxt "" @@ -8732,7 +8732,7 @@ "29\n" "help.text" msgid "Finds the Shadowed attribute." -msgstr "Finn eigenskapen Skyggelagd." +msgstr "Finn eigenskapen Skuggelagd." #: 02100200.xhp msgctxt "" @@ -11019,8 +11019,8 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." -msgstr "Viser biletmappa, slik at du kan klikka og redigera lenkjeområda." +msgid "Displays the image map, so that you can click and edit the hotspots." +msgstr "Viser biletmappa, slik at du kan klikka og redigera lenkjeområda." #: 02220000.xhp msgctxt "" @@ -15106,7 +15106,7 @@ "74\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05020200.xhp msgctxt "" @@ -15115,7 +15115,7 @@ "75\n" "help.text" msgid "Adds a shadow that casts below and to the right of the selected characters." -msgstr "Legg ein skygge under og til høgre for det valde teiknet." +msgstr "Legg ein skugge under og til høgre for det valde teiknet." #: 05020200.xhp msgctxt "" @@ -20140,7 +20140,7 @@ "31\n" "help.text" msgid "Shadow style" -msgstr "Skyggestil" +msgstr "Skuggestil" #: 05030500.xhp msgctxt "" @@ -20149,7 +20149,7 @@ "32\n" "help.text" msgid "You can also apply a shadow effect to borders. For the best results, only apply this effect when all four borders are visible." -msgstr "Du kan òg bruka ein skyggeeffekt på rammer. For best resultat bør du berre bruka denne effekten når alle fire kantlinjene er synlege." +msgstr "Du kan òg bruka ein skuggeeffekt på rammer. For best resultat bør du berre bruka denne effekten når alle fire kantlinjene er synlege." #: 05030500.xhp msgctxt "" @@ -20176,7 +20176,7 @@ "34\n" "help.text" msgid "Click a shadow style for the selected borders." -msgstr "Klikk på ein skyggestil for dei merkte kantane." +msgstr "Klikk på ein skuggestil for dei merkte kantane." #: 05030500.xhp msgctxt "" @@ -20194,7 +20194,7 @@ "36\n" "help.text" msgid "Enter the width of the shadow." -msgstr "Vel kor brei skyggen skal vera." +msgstr "Vel kor brei skuggen skal vera." #: 05030500.xhp msgctxt "" @@ -20212,7 +20212,7 @@ "38\n" "help.text" msgid "Select a color for the shadow." -msgstr "Vel kva farge skyggen skal ha." +msgstr "Vel kva farge skuggen skal ha." #: 05030500.xhp msgctxt "" @@ -20244,7 +20244,7 @@ "par_idN10A3E\n" "help.text" msgid "Merges the border style and the shadow style of the current paragraph with the next paragraph. These styles are only merged if the indent, border, and shadow styles of the next paragraph are the same as the current paragraph. This option is also available for Paragraph Styles." -msgstr "Flettar kantlinjestilen og skyggestilen i avsnittet med neste avsnitt. Desse stilane vert berre fletta dersom innrykk, kantlinjer og skyggestil i neste avsnitt er dei same som i dette. Denne innstillinga er òg tilgjengeleg for avsnittsstilar." +msgstr "Flettar kantlinjestilen og skuggestilen i avsnittet med neste avsnitt. Desse stilane vert berre fletta dersom innrykk, kantlinjer og skuggestil i neste avsnitt er dei same som i dette. Denne innstillinga er òg tilgjengeleg for avsnittsstilar." #: 05030500.xhp msgctxt "" @@ -23905,7 +23905,7 @@ "bm_id3154545\n" "help.text" msgid "text; shadowedcharacters; shadowedshadows;characters, using context menu" -msgstr "tekst; med skygge teikn; med skygge skygge; teikn, bruka sprettoppmenyen" +msgstr "tekst; med skugge teikn; med skugge skugge; teikn, bruka sprettoppmenyen" #: 05110500.xhp msgctxt "" @@ -23923,7 +23923,7 @@ "2\n" "help.text" msgid "Adds a shadow to the selected text, or if the cursor is in a word, to the entire word." -msgstr "Legg ein skygge til den merkte teksten. Viss skrivemerket er i eit ord, vert det lagt skygge til heile ordet." +msgstr "Legg ein skugge til den merkte teksten. Viss skrivemerket er i eit ord, vert det lagt skugge til heile ordet." #: 05110600m.xhp msgctxt "" @@ -26506,7 +26506,7 @@ "tit\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05210600.xhp msgctxt "" @@ -26523,7 +26523,7 @@ "1\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05210600.xhp msgctxt "" @@ -26532,7 +26532,7 @@ "2\n" "help.text" msgid "Add a shadow to the selected drawing object, and define the properties of the shadow." -msgstr "Legg til ein skygge på det valde teikneobjektet og vel skygge-eigenskapane." +msgstr "Legg til ein skugge på det valde teikneobjektet og styrar skugge-eigenskapane." #: 05210600.xhp msgctxt "" @@ -26550,7 +26550,7 @@ "4\n" "help.text" msgid "Set the properties of the shadow that you want to apply." -msgstr "Set eigenskapane for skyggen." +msgstr "Set eigenskapane for skuggen." #: 05210600.xhp msgctxt "" @@ -26559,7 +26559,7 @@ "5\n" "help.text" msgid "Use shadow" -msgstr "Bruk skygge" +msgstr "Bruk skugge" #: 05210600.xhp msgctxt "" @@ -26568,7 +26568,7 @@ "6\n" "help.text" msgid "Adds a shadow to the selected drawing object." -msgstr "Legg til ein skygge til det merkte objektet." +msgstr "Legg ein skugge til det merkte objektet." #: 05210600.xhp msgctxt "" @@ -26586,7 +26586,7 @@ "8\n" "help.text" msgid "Click where you want to cast the shadow." -msgstr "Trykk der du vil kasta skyggen." +msgstr "Trykk der du vil kasta skuggen." #: 05210600.xhp msgctxt "" @@ -26604,7 +26604,7 @@ "10\n" "help.text" msgid "Enter the distance that you want the shadow to be offset from the selected object." -msgstr "Skriv inn kor langt skyggen skal forskyvast frå det valde objektet." +msgstr "Skriv inn kor langt skuggen skal forskyvast frå det valde objektet." #: 05210600.xhp msgctxt "" @@ -26622,7 +26622,7 @@ "12\n" "help.text" msgid "Select a color for the shadow." -msgstr "Vel ein farge for skyggen." +msgstr "Vel ein skuggefarge." #: 05210600.xhp msgctxt "" @@ -26640,7 +26640,7 @@ "14\n" "help.text" msgid "Enter a percentage from 0% (opaque) to 100% (transparent) to specify the transparency of the shadow." -msgstr "Skriv inn kor gjennomsiktig skyggen skal vera. Du kan velja ein verdi mellom 0% (ikkje gjennomsiktig) og 100% (heilt gjennomsiktig)." +msgstr "Skriv inn kor gjennomsiktig skuggen skal vera. Du kan velja ein verdi mellom 0% (ikkje gjennomsiktig) og 100% (heilt gjennomsiktig)." #: 05210600.xhp msgctxt "" @@ -26649,7 +26649,7 @@ "17\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05210600.xhp msgctxt "" @@ -26658,7 +26658,7 @@ "15\n" "help.text" msgid "Adds a shadow to the selected object. If the object already has a shadow, the shadow is removed. If you click this icon when no object is selected, the shadow is added to the next object that you draw." -msgstr "Legg til skygge på det valde objektet. Viss objektet har skygge frå før, vert skyggen fjerna. Viss du trykkjer på denne knappen utan å ha vald eit objekt, vil det neste objektet du teiknar få skygge." +msgstr "Legg skugge på det valde objektet. Viss objektet har skugge frå før, vert skuggen fjerna. Viss du trykkjer på denne knappen utan å ha merkt eit objekt, vil det neste objektet du teiknar få skugge." #: 05210600.xhp msgctxt "" @@ -26675,7 +26675,7 @@ "16\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05210700.xhp msgctxt "" @@ -29066,7 +29066,7 @@ "40\n" "help.text" msgid "Removes the shadow effects that you applied to the text." -msgstr "Fjern skyggeeffekten du tilførte teksten." +msgstr "Fjern skuggeeffekten du brukte på teksten." #: 05280000.xhp msgctxt "" @@ -29083,7 +29083,7 @@ "39\n" "help.text" msgid "No Shadow" -msgstr "Ingen skygge" +msgstr "Ingen skugge" #: 05280000.xhp msgctxt "" @@ -29092,7 +29092,7 @@ "42\n" "help.text" msgid "Adds a shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes." -msgstr "Legg til ein skygge på teksten i det valde objektet. Trykk på denne knappen og skriv inn storleiken på skyggen i boksane for Avstand X og Avstand Y." +msgstr "Legg til ein skugge på teksten i det valde objektet. Trykk på denne knappen og skriv inn storleiken på skuggen i boksane for Avstand X og Avstand Y." #: 05280000.xhp msgctxt "" @@ -29118,7 +29118,7 @@ "44\n" "help.text" msgid "Adds a slant shadow to the text in the selected object. Click this button, and then enter the dimensions of the shadow in the Distance X and the Distance Y boxes." -msgstr "Legg til ein skråstilt skygge til teksten i det valde objektet. Trykk på knappen og skriv inn storleiken på skyggen i boksane for Avstand X og Avstand Y." +msgstr "Legg ein skråstilt skugge til teksten i det valde objektet. Trykk på knappen og skriv inn storleiken på skuggen i boksane for Avstand X og Avstand Y." #: 05280000.xhp msgctxt "" @@ -29153,7 +29153,7 @@ "46\n" "help.text" msgid "Enter the horizontal distance between the text characters and the edge of the shadow." -msgstr "Skriv inn den vassrette avstanden mellom tekstteikna og kanten av skyggen." +msgstr "Skriv inn den vassrette avstanden mellom tekstteikna og kanten av skuggen." #: 05280000.xhp msgctxt "" @@ -29188,7 +29188,7 @@ "48\n" "help.text" msgid "Enter the vertical distance between the text characters and the edge of the shadow." -msgstr "Skriv inn den loddrette avstanden mellom tekstteikna og kanten av skyggen." +msgstr "Skriv inn den loddrette avstanden mellom tekstteikna og kanten av skuggen." #: 05280000.xhp msgctxt "" @@ -29214,7 +29214,7 @@ "49\n" "help.text" msgid "Shadow Color" -msgstr "Skyggefarge" +msgstr "Skuggefarge" #: 05280000.xhp msgctxt "" @@ -29223,7 +29223,7 @@ "50\n" "help.text" msgid "Select a color for the text shadow." -msgstr "Vel ein farge for tekstskyggen." +msgstr "Vel ein farge for tekstskuggen." #: 05290000.xhp msgctxt "" @@ -31645,7 +31645,7 @@ "tit\n" "help.text" msgid "Shading" -msgstr "Skyggeleggjing" +msgstr "Skuggelegging" #: 05350300.xhp msgctxt "" @@ -31654,7 +31654,7 @@ "1\n" "help.text" msgid "Shading" -msgstr "Skygge" +msgstr "Skugge" #: 05350300.xhp msgctxt "" @@ -31663,7 +31663,7 @@ "2\n" "help.text" msgid "Sets the shading and shadow options for the selected 3D object." -msgstr "Set skyggen og skyggeinnstillingane for det valde 3D-objektet." +msgstr "Set skuggen og skuggeinnstillingane for det merkte 3D-objektet." #: 05350300.xhp msgctxt "" @@ -31672,7 +31672,7 @@ "4\n" "help.text" msgid "Shading" -msgstr "Skyggeleggjing" +msgstr "Skuggelegging" #: 05350300.xhp msgctxt "" @@ -31681,7 +31681,7 @@ "5\n" "help.text" msgid "Specify the type of shading to apply to the selected 3D object." -msgstr "Vel skyggetypen som skal brukast på det valde 3D-objektet." +msgstr "Vel skuggetypen som skal brukast på det merkte 3D-objektet." #: 05350300.xhp msgctxt "" @@ -31699,7 +31699,7 @@ "7\n" "help.text" msgid "Select the shading method that you want to use. Flat shading assigns a single color to a single polygon on the surface of the object. Gouraud shading blends colors across the polygons. Phong shading averages the color of each pixel based on the pixels that surround it, and requires the most processing power." -msgstr "Vel kva for skyggeleggjing du vil bruka. Flat skygge gjer kvar enkelt mangekant på overflata einsfarga «Gouraud-skyggeleggjing» avstemmer fargane over mangekantane. «Phong skyggeleggjing» gjev eit omtrentleg gjennomsnitt av fargen på kvar piksel ut frå pikslane omkring og treng mest prosessorkraft." +msgstr "Vel kva for skuggeleggjing du vil bruka. Flat skugge gjer kvar enkelt mangekant på overflata einsfarga «Gouraud-skuggelegging» avstemmer fargane over mangekantane. «Phong skuggelegging» gjev eit omtrentleg gjennomsnitt av fargen på kvar piksel ut frå pikslane omkring og treng mest prosessorkraft." #: 05350300.xhp msgctxt "" @@ -31708,7 +31708,7 @@ "8\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: 05350300.xhp msgctxt "" @@ -31717,7 +31717,7 @@ "9\n" "help.text" msgid "Adds or removes a shadow from the selected 3D object." -msgstr "Legg til eller fjernar ein skygge frå det valde 3D-objektet." +msgstr "Legg til eller fjernar ein skugge frå det merkte 3D-objektet." #: 05350300.xhp msgctxt "" @@ -31734,7 +31734,7 @@ "10\n" "help.text" msgid "3D Shadowing On/Off" -msgstr "3D-skyggeleggjing på/av" +msgstr "3D-skuggelegging på/av" #: 05350300.xhp msgctxt "" @@ -31752,7 +31752,7 @@ "12\n" "help.text" msgid "Enter an angle from 0 to 90 degrees for casting the shadow." -msgstr "Skriv inn ein vinkel mellom 0 og 90 grader for skyggekastinga." +msgstr "Skriv inn ein vinkel mellom 0 og 90 grader for skuggekastinga." #: 05350300.xhp msgctxt "" @@ -32133,7 +32133,7 @@ "15\n" "help.text" msgid "Show or hide shading." -msgstr "Vis eller gøym skygger." +msgstr "Vis eller gøym skuggar." #: 05350500.xhp msgctxt "" @@ -32151,7 +32151,7 @@ "17\n" "help.text" msgid "Applies the texture without shading." -msgstr "Legg til teksturen utan skygge." +msgstr "Legg til teksturen utan skugge." #: 05350500.xhp msgctxt "" @@ -32177,7 +32177,7 @@ "19\n" "help.text" msgid "Texture and Shading" -msgstr "Tekstur og skyggeleggjing" +msgstr "Tekstur og skuggelegging" #: 05350500.xhp msgctxt "" @@ -32186,7 +32186,7 @@ "20\n" "help.text" msgid "Applies the texture with shading. To define the shading options for the texture, click the Shading button in this dialog." -msgstr "Legg til teksturen med skyggeleggjing. Trykk på knappen Skyggeleggjing for å velja oppsett av teksturar." +msgstr "Legg til teksturen med skuggelegging. Trykk på knappen Skuggelegging for å velja oppsett for teksturar." #: 05350500.xhp msgctxt "" @@ -32203,7 +32203,7 @@ "21\n" "help.text" msgid "Texture and Shading" -msgstr "Tekstur og skyggeleggjing" +msgstr "Tekstur og skuggelegging" #: 05350500.xhp msgctxt "" @@ -36683,7 +36683,7 @@ "tit\n" "help.text" msgid "Position" -msgstr "Posisjon" +msgstr "Plassering" #: 06050600.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/02.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/02.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/02.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/02.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-25 10:49+0000\n" +"PO-Revision-Date: 2016-02-01 20:15+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437821395.000000\n" +"X-POOTLE-MTIME: 1454357701.000000\n" #: 01110000.xhp msgctxt "" @@ -253,7 +253,7 @@ "21\n" "help.text" msgid "Draws an oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag." -msgstr "Teiknar ein oval ved å dra musepeikaren inne i dokumentet. Trykk der du vil teikna ovalen og dra han ut i den storleiken du vil ha. For å teikna ein sirkel, hold nede Shift medan du dreg med musa." +msgstr "Teiknar ein ellipse ved å dra musepeikaren inne i dokumentet. Trykk der du vil teikna ellipsen og dra han ut i den storleiken du vil ha. For å teikna ein sirkel, hold nede Shift medan du dreg med musa." #: 01140000.xhp msgctxt "" @@ -375,7 +375,7 @@ "66\n" "help.text" msgid "Draws an arc in the current document. To draw an arc, drag an oval to the size you want, and then click to define the starting point of the arc. Move your pointer to where you want to place the endpoint and click. You do not need to click on the oval. To draw an arc that is based on a circle, hold down Shift while you drag." -msgstr "Teiknar ein boge i dokumentet. For å teikna ein boge, dra ein oval til den storleiken du vil ha, trykk så for å setja startpunktet på bogen. Flytt musepeikaren til der du vil ha endepunketet og trykk der. Du treng ikkje trykkje på sjølve bogen. Hald inne «Shift» medan du dreg for å teikna ein boge som er basert på ein sirkel." +msgstr "Teiknar ein boge i dokumentet. For å teikna ein boge, dra ein ellipse til den storleiken du vil ha, trykk så for å setja startpunktet på bogen. Flytt musepeikaren til der du vil ha endepunketet og trykk der. Du treng ikkje trykkje på sjølve bogen. Hald inne «Shift» medan du dreg for å teikna ein boge som er basert på ein sirkel." #: 01140000.xhp msgctxt "" @@ -401,7 +401,7 @@ "67\n" "help.text" msgid "Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag." -msgstr "Teiknar ei fylt form styrt av bogen til ein oval og to radiuslinjer i dokumentet. Du teiknar ein ellipsesektor ved å dra ein oval til den storleiken du vil og så trykkja der fyrste radius skal vera. Flytt musepeikaren til der du vil leggja den andre radiusen og trykk. Du treng ikkje trykkja på ovalen. Du teiknar ein sirkelsektor ved å halda nede «Shift» medan du dreg." +msgstr "Teiknar ei fylt form styrt av bogen til ein ellipse og to radiuslinjer i dokumentet. Du teiknar ein ellipsesektor ved å dra ein ellipse til den storleiken du vil og så trykkja der fyrste radius skal vera. Flytt musepeikaren til der du vil leggja den andre radiusen og trykk. Du treng ikkje trykkja på ellipsen. Du teiknar ein sirkelsektor ved å halda nede «Shift» medan du dreg." #: 01140000.xhp msgctxt "" @@ -505,7 +505,7 @@ "70\n" "help.text" msgid "Draws a line that ends in a rectangular callout with horizontal text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand." -msgstr "Teiknar ei linje som endar i ei rektangulær snakkeboble med vassrett tekstretning. Klikk og dra ut linja i dokumentet. Dra i eit handtak på forklaringsruta for å endra storleiken på ho. Trykk på kanten av forklaringsruta for å skriva eller lima inn tekst. For å endra frå ei rektangulær rute til ei oval rute, kan du dra i dei største hjørne handtaka når musepeikaren vert til ei hand." +msgstr "Teiknar ei linje som endar i ei rektangulær snakkeboble med vassrett tekstretning. Klikk og dra ut linja i dokumentet. Dra i eit handtak på forklaringsruta for å endra storleiken på ho. Trykk på kanten av forklaringsruta for å skriva eller lima inn tekst. For å endra frå ei rektangulær rute til ei ellipseforma rute, dreg du dei største hjørnehandtaka når musepeikaren vert til ei hand." #: 01140000.xhp msgctxt "" @@ -571,7 +571,7 @@ "76\n" "help.text" msgid "Draws a line that ends in a rectangular callout with vertical text direction from where you drag in the current document. Drag a handle of the callout to resize the callout. To add text, click the edge of the callout, and then type or paste your text. To change a rectangular callout to a rounded callout, drag the largest corner handle when the pointer changes to a hand. Only available when Asian language support is enabled." -msgstr "Teiknar ei linje som endar i ei rektangulær snakkeboble med vassrett tekstretning. Klikk og dra ut linja i dokumentet. Dra i eit handtak på snakkebobla for å endra storleiken på ho. Trykk på kanten av snakkebobla for å skriva eller lima inn tekst. For å endra frå ei rektangulær boble til ei oval boble, kan du dra i dei største hjørnehandtaka når musepeikaren vert til ei hand. Er berre tilgjengeleg når støtte for asiatiske språk er slått på." +msgstr "Teiknar ei linje som endar i ei rektangulær snakkeboble med vassrett tekstretning. Klikk og dra ut linja i dokumentet. Dra i eit handtak på snakkebobla for å endra storleiken på ho. Trykk på kanten av snakkebobla for å skriva eller lima inn tekst. For å endra frå ei rektangulær boble til ei ellipseforma boble, dra i dei største hjørnehandtaka når musepeikaren vert til ei hand. Er berre tilgjengeleg når støtte for asiatiske språk er slått på." #: 01140000.xhp msgctxt "" @@ -17905,7 +17905,7 @@ "120\n" "help.text" msgid "Displays a dialog for creating reliefs. You can choose the position of the imaginary light source that determines the type of shadow created, and how the graphic image looks in relief." -msgstr "Viser eit dialogvindauge der du kan laga relieff. Du kan velja kvar den tenkte lyskjelda som avgjer skyggen skal vera og korleis biletet skal sjå ut i relieff." +msgstr "Viser eit dialogvindauge der du kan laga relieff. Du kan velja kvar den tenkte lyskjelda som avgjer skuggen skal vera og korleis biletet skal sjå ut i relieff." #: 24010000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/04.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/04.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/04.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/04.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-07-19 12:18+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-22 17:27+0000\n" +"Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437308284.000000\n" +"X-POOTLE-MTIME: 1448213264.000000\n" #: 01010000.xhp msgctxt "" @@ -111,7 +111,7 @@ "11\n" "help.text" msgid "Pressing ESC closes the dialog without saving changes. If you place the focus on a button, not only will you see the dotted line framing the name of the button, but also a thicker shadow under the button selected. This indicates that if you exit the dialog by pressing the Enter key, it is the equivalent of pressing that button itself." -msgstr "Dialogvindauget vert lukka viss du trykkjer Escape, men då vert ikkje endringar du har gjort lagra. Viss du set fokus på ein knapp vert dette vist med ei stipla ramme rundt namnet på knappen, men legg også merkje til at det vert vist ein tjukkare skygge under knappen som er vald. Dette viser at viss du går ut av dialogvindauget ved å trykkja Enter-tasten, vil dette ha same verknad som om du trykkjer sjølve knappen." +msgstr "Dialogvindauget vert lukka viss du trykkjer Escape, men då vert ikkje endringar du har gjort lagra. Viss du set fokus på ein knapp, vert dette vist med ei stipla ramme rundt namnet på knappen, men legg også merkje til at det vert vist ein tjukkare skugge under knappen som er vald. Dette viser at viss du går ut av dialogvindauget ved å trykkja Enter-tasten, vil dette ha same verknad som om du trykkjer sjølve knappen." #: 01010000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/optionen.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/optionen.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/shared/optionen.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/shared/optionen.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-23 19:18+0000\n" +"PO-Revision-Date: 2015-11-22 17:28+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437679082.000000\n" +"X-POOTLE-MTIME: 1448213287.000000\n" #: 01000000.xhp msgctxt "" @@ -8942,7 +8942,7 @@ "43\n" "help.text" msgid "Apply border and shadow" -msgstr "Legg til kantlinje og skygge" +msgstr "Legg til kantlinje og skugge" #: 01041100.xhp msgctxt "" @@ -13427,7 +13427,7 @@ "4\n" "help.text" msgid "Microsoft Office has two character attributes similar to $[officename] character background. Select the appropriate attribute (highlighting or shading) which you would like to use during export to Microsoft Office file formats." -msgstr "Microsoft Office har to teikninnstillingar tilsvarande dei som er brukte for teiknbakgrunnar i $[officename]. Merk av for den innstillinga (utheving eller skyggelegging) du vil bruka ved eksport til Microsoft Office sine filformat." +msgstr "Microsoft Office har to teikninnstillingar tilsvarande dei som er brukte for teiknbakgrunnar i $[officename]. Merk av for den innstillinga (utheving eller skuggelegging) du vil bruka ved eksport til Microsoft Office sine filformat." #: 01140000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress/02.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress/02.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress/02.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress/02.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-07-20 21:04+0000\n" +"PO-Revision-Date: 2016-02-01 20:21+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437426276.000000\n" +"X-POOTLE-MTIME: 1454358073.000000\n" #: 04010000.xhp msgctxt "" @@ -2174,7 +2174,7 @@ "13\n" "help.text" msgid "Draws a filled shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag." -msgstr "Teikn ein fylt figur som er basert på bogen i ein oval og to radiuslinjer i dette dokumentet. For å teikna ein ellipsesektor, dra ellipsen til den storleiken du ønskjer, og trykk så for å laga den første radiuslinja.Flytt musepeikaren til der du ønskjer å plassera den andre radiuslinja og trykk igjen. Du treng ikkje trykkja på ellipsen. Hald nede «Shift» medan du dreg for å teikna ein sirkelsektor." +msgstr "Teiknar ein fylt figur som er basert på bogen i ein ellipse og to radiuslinjer i dette dokumentet. For å teikna ein ellipsesektor, dra ellipsen til den storleiken du ønskjer, og trykk så for å laga den første radiuslinja.Flytt musepeikaren til der du ønskjer å plassera den andre radiuslinja og trykk igjen. Du treng ikkje trykkja på ellipsen. Hald nede «Shift» medan du dreg for å teikna ein sirkelsektor." #: 10070000.xhp msgctxt "" @@ -2244,7 +2244,7 @@ "19\n" "help.text" msgid "Draws a filled shape that is defined by the arc of an oval and a diameter line in the current document. To draw an ellipse segment, drag an ellipse to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the ellipse. To draw a circle segment, hold down Shift while you drag." -msgstr "Teiknar ein fylt figur som er basert på bogen i ein oval og ei diameterlinje. For å teikna eit ellipsesegment, dra ut ellipsen til den storleiken du vil ha, trykk så der du vil ha startpunktet til linja. Flytt musepeikaren til der du vil ha endepunktet og trykk. Du treng ikkje trykkja på ellipsebogen. Hald nede «Shift»-tasten medan du dreg for å teikna eit segment som er basert på ein sirkel." +msgstr "Teiknar ein fylt figur som er basert på bogen i ein ellipse og ei diameterlinje. For å teikna eit ellipsesegment, dra ut ellipsen til den storleiken du vil ha, trykk så der du vil ha startpunktet til linja. Flytt musepeikaren til der du vil ha endepunktet og trykk. Du treng ikkje trykkja på ellipsebogen. Hald nede «Shift»-tasten medan du dreg for å teikna eit segment som er basert på ein sirkel." #: 10070000.xhp msgctxt "" @@ -2314,7 +2314,7 @@ "25\n" "help.text" msgid "Draws an empty oval where you drag in the current document. Click where you want to draw the oval, and drag to the size you want. To draw a circle, hold down Shift while you drag." -msgstr "Teiknar ein tom oval. Venstreklikk med musa der du ønskjer å plassera ovalen og hald nede medan du dreg ut ovalen til den storleiken du vil ha. Hald nede «Shift»-tasten samtidig som du dreg for å teikna ein sirkel." +msgstr "Teiknar ein tom ellipse. Venstreklikk med musa der du ønskjer å plassera ellipsen og hald nede medan du dreg ut ellipsen til den storleiken du vil ha. Hald nede «Shift»-tasten samtidig som du dreg for å teikna ein sirkel." #: 10070000.xhp msgctxt "" @@ -2384,7 +2384,7 @@ "31\n" "help.text" msgid "Draws an empty shape that is defined by the arc of an oval and two radius lines in the current document. To draw an ellipse pie, drag an oval to the size you want, and then click to define the first radius line. Move your pointer to where you want to place the second radius line and click. You do not need to click on the oval. To draw a circle pie, hold down Shift while you drag." -msgstr "Teiknar ein tom figur som er laga av bogen i ein oval og to radiuslinjer. For å teikna ein ellipsesektor, dra ein oval til den storleiken du ønskjer og klikk deretter for å definera den første radiuslinja. Flytt musepeikaren til der du vil ha den andre radiuslinja og klikk. Du treng ikkje å klikka på ovalen. Hald nede «Shift»-tasten medan du dreg for å teikna ein sirkelsektor." +msgstr "Teiknar ein tom figur som er laga av bogen i ein ellipse og to radiuslinjer. For å teikna ein ellipsesektor, dra ein oval til den storleiken du ønskjer og klikk deretter for å definera den første radiuslinja. Flytt musepeikaren til der du vil ha den andre radiuslinja og klikk. Du treng ikkje å klikka på ellipsen. Hald nede «Shift»-tasten medan du dreg for å teikna ein sirkelsektor." #: 10070000.xhp msgctxt "" @@ -2454,7 +2454,7 @@ "37\n" "help.text" msgid "Draws an empty shape that is defined by the arc of an oval and a diameter line in the current document. To draw an ellipse segment, drag an ellipse to the size you want, and then click to define the starting point of the diameter line. Move your pointer to where you want to place the endpoint of the diameter line and click. You do not need to click on the ellipse. To draw a circle segment, hold down Shift while you drag." -msgstr "Teiknar ein tom figur som er basert på bogen i ein oval og ei diameterlinje. For å teikna eit ellipsesegment, dra ellipsen til den storleiken du vil ha, trykk så der du vil ha startpunktet til linja. Flytt musepeikaren til der du vil ha endepunktet og trykk. Du treng ikkje trykkja på ellipsebogen. Hald nede «Shift»-tasten medan du dreg for å teikna eit segment som er basert på ein sirkel." +msgstr "Teiknar ein tom figur som er basert på bogen i ein ellipse og ei diameterlinje. For å teikna eit ellipsesegment, dra ellipsen til den storleiken du vil ha, trykk så der du vil ha startpunktet til linja. Flytt musepeikaren til der du vil ha endepunktet og trykk. Du treng ikkje trykkja på ellipsebogen. Hald nede «Shift»-tasten medan du dreg for å teikna eit segment som er basert på ein sirkel." #: 10070000.xhp msgctxt "" @@ -3029,7 +3029,7 @@ "13\n" "help.text" msgid "Draws a cylinder that is based on a circle where you drag in the slide. To draw a cylinder that is based on an oval, hold down Shift while you drag." -msgstr "Teikn ein sylinder som er basert på ein sirkel du dreg. Hald nede «Shift»-tasten medan du dreg opp figuren for å teikna ein sylinder som er basert på ei oval." +msgstr "Teikn ein sylinder som er basert på ein sirkel der du dreg i lysbiletet. Hald nede «Shift»-tasten medan du dreg opp figuren for å teikna ein sylinder som er basert på ein ellipse." #: 10090000.xhp msgctxt "" @@ -3064,7 +3064,7 @@ "16\n" "help.text" msgid "Draws a cone that is based on a circle where you drag in the slide. To draw a cone that is based on an oval, hold down Shift while you drag." -msgstr "Teikn ei kjegle som er basert på ein sirkel. Vil du teikna ei kjegle som er basert på ein oval, hald nede «Shift»-tasten medan du dreg opp figuren." +msgstr "Teikn ei kjegle som er basert på ein sirkel. Vil du teikna ei kjegle som er basert på ein ellipse, hald nede «Shift»-tasten medan du dreg opp figuren." #: 10090000.xhp msgctxt "" @@ -3134,7 +3134,7 @@ "22\n" "help.text" msgid "Draws a ring-shaped object that is based on a circle where you drag in the slide. To draw a torus that is based on an oval, hold down Shift while you drag." -msgstr "Teikn eit ringforma objekt (smultring) basert på ein sirkel. Vil du teikna ein «smultring» basert på ein oval, hald nede «Shift»-tasten medan du dreg opp figuren." +msgstr "Teikn eit ringforma objekt (smultring) basert på ein sirkel. Vil du teikna ein «smultring» basert på ein ellipse, hald nede «Shift»-tasten medan du dreg opp figuren." #: 10090000.xhp msgctxt "" @@ -3169,7 +3169,7 @@ "25\n" "help.text" msgid "Draws a bowl-shaped object that is based on a circle where you drag in the slide. To draw a shell that is based on an oval, hold down Shift while you drag." -msgstr "Teiknar eit skal med form som ein bolle basert på ein sirkel.Vil du teikna eit skal som er basert på ein oval, hald nede «Shift»-tasten medan du dreg opp figuren." +msgstr "Teiknar eit bolleforma objekt basert på ein sirkel der du dreg i lysbiletet. Vil du teikna ein bolle som er basert på ein ellipse, hald nede «Shift»-tasten medan du dreg opp figuren." #: 10090000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress/guide.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress/guide.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress/guide.po 2016-02-04 16:41:28.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-05-11 16:11+0200\n" -"PO-Revision-Date: 2015-07-21 08:37+0000\n" +"PO-Revision-Date: 2015-11-22 17:28+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437467854.000000\n" +"X-POOTLE-MTIME: 1448213316.000000\n" #: 3d_create.xhp msgctxt "" @@ -75,7 +75,7 @@ "51\n" "help.text" msgid "3D object with shading and a light source" -msgstr "3D-objekt med skygge og éi lyskjelde" +msgstr "3D-objekt med skugge og éi lyskjelde" #: 3d_create.xhp msgctxt "" @@ -84,7 +84,7 @@ "52\n" "help.text" msgid "3D rotation object with shading and a light source" -msgstr "3D-rotasjonsobjekt med skygge og éi lyskjelde" +msgstr "3D-rotasjonsobjekt med skugge og éi lyskjelde" #: 3d_create.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/simpress.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/simpress.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-07-20 20:39+0000\n" +"PO-Revision-Date: 2015-11-22 17:28+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437424794.000000\n" +"X-POOTLE-MTIME: 1448213293.000000\n" #: main0000.xhp msgctxt "" @@ -919,7 +919,7 @@ "7\n" "help.text" msgid "Shadow" -msgstr "Skygge" +msgstr "Skugge" #: main0203.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/00.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/00.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/00.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/00.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-07-19 15:43+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-03 15:59+0000\n" +"Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437320611.000000\n" +"X-POOTLE-MTIME: 1446566359.000000\n" #: 00000004.xhp msgctxt "" @@ -1921,7 +1921,7 @@ "74\n" "help.text" msgid "Choose Table - Table Properties" -msgstr "Vel Tabell → Tabellformat" +msgstr "Vel Tabell → Tabelleigenskapar" #: 00000405.xhp msgctxt "" @@ -1948,7 +1948,7 @@ "75\n" "help.text" msgid "Choose Table - Table Properties - Table tab " -msgstr "Vel Tabell → Tabellformat → Tabell" +msgstr "Vel Tabell → Tabelleigenskapar → Tabell" #: 00000405.xhp msgctxt "" @@ -1966,7 +1966,7 @@ "77\n" "help.text" msgid "Choose Table - Table Properties - Text Flow tab " -msgstr "Vel Tabell → Tabellformat → Tekstflyt" +msgstr "Vel Tabell → Tabelleigenskapar → Tekstflyt" #: 00000405.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-08-21 18:56+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-31 15:24+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440183383.000000\n" +"X-POOTLE-MTIME: 1454253878.000000\n" #: 01120000.xhp msgctxt "" @@ -3671,7 +3671,7 @@ "tit\n" "help.text" msgid "Field Shadings" -msgstr "Feltskygge" +msgstr "Feltskugge" #: 03080000.xhp msgctxt "" @@ -3680,7 +3680,7 @@ "18\n" "help.text" msgid "Field Shadings" -msgstr "Feltskygge" +msgstr "Feltskugge" #: 03080000.xhp msgctxt "" @@ -4174,8 +4174,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "Bolk" +msgid "Section" +msgstr "Bolk" #: 04020100.xhp msgctxt "" @@ -5121,7 +5121,7 @@ "43\n" "help.text" msgid "Apply border and shadow" -msgstr "Legg til kantlinje og skygge" +msgstr "Legg til kantlinje og skugge" #: 04060100.xhp msgctxt "" @@ -5130,7 +5130,7 @@ "44\n" "help.text" msgid "Applies the border and shadow of the object to the caption frame." -msgstr "Legg til kantlinja og skyggen av objektet i bilettekstramma." +msgstr "Legg til kantlinja og skuggen frå objektet i bilettekstramma." #: 04070000.xhp msgctxt "" @@ -16143,15 +16143,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Denne fana er ikkje tilgjengeleg i utskriftoppsettet." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -22424,7 +22415,7 @@ "2\n" "help.text" msgid "Automatically applies formats to the current table, including fonts, shading, and borders." -msgstr "Formaterer den gjeldande tabellen automatisk, inkludert skrift, skyggeleggjing og kantlinjer." +msgstr "Formaterer den gjeldande tabellen automatisk, inkludert skrift, skuggelegging og kantlinjer." #: 05150101.xhp msgctxt "" @@ -23764,7 +23755,7 @@ "55\n" "help.text" msgid "To highlight the screen display of outline numbers, choose View -Field Shadings." -msgstr "Du kan visa disposisjonsnumra tydelegare på skjermen ved å velja Vis → Feltskygge." +msgstr "Du kan visa disposisjonsnumra tydelegare på skjermen ved å velja Vis → Feltskugge." #: 06060000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/guide.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/guide.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-07-25 10:41+0000\n" +"PO-Revision-Date: 2015-11-22 17:31+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437820892.000000\n" +"X-POOTLE-MTIME: 1448213516.000000\n" #: anchor_object.xhp msgctxt "" @@ -1276,7 +1276,7 @@ "13\n" "help.text" msgid "Choose Table - Table Properties." -msgstr "Vel Tabell → Tabellformat." +msgstr "Vel Tabell → Tabelleigenskapar." #: background.xhp msgctxt "" @@ -1386,7 +1386,7 @@ "par_id3148413\n" "help.text" msgid "If two adjacent text ranges' all border properties are identical (same style, width, color, padding and shadow), then those two ranges will be considered to be part of the same border group and rendered within the same border in the document." -msgstr "Dersom kanteigenskapane for to tilstøytande tekstområde er like, dvs. same stil, breidd, farge avstand og skygge, vert desse to områda sett på som delar av den same kantgruppa og vert difor viste med same kant i dokumentet." +msgstr "Dersom kanteigenskapane for to tilstøytande tekstområde er like, dvs. same stil, breidd, farge avstand og skugge, vert desse to områda sett på som delar av den same kantgruppa og vert difor viste med same kant i dokumentet." #: border_character.xhp msgctxt "" @@ -1847,7 +1847,7 @@ "par_id6129947\n" "help.text" msgid "Choose Table - Table properties." -msgstr "Vel Tabell → Tabellformat." +msgstr "Vel Tabell → Tabelleigenskapar." #: borders.xhp msgctxt "" @@ -6803,7 +6803,7 @@ "23\n" "help.text" msgid "To add a border or a shadow to the header or the footer, click More. The Border/Background dialog opens." -msgstr "For å leggja til kantlinjer eller skygge på topp- eller botnteksten, trykk på Andre. Dialogvindauget Kantlinje/bakgrunn vert då opna." +msgstr "For å leggja til kantlinjer eller skugge på topp- eller botnteksten, trykk på Andre. Dialogvindauget Kantlinje/bakgrunn vert då opna." #: header_with_line.xhp msgctxt "" @@ -7588,7 +7588,7 @@ "12\n" "help.text" msgid "Index entries are inserted as fields into your document. To view fields in your document, choose View and ensure that Field Shadings is selected." -msgstr "Registeroppføringar vert sette inn som felt i dokumentet. For å vise felt i dokumentet vel Vis og Feltskygge." +msgstr "Registeroppføringar vert sette inn som felt i dokumentet. For å visa felt i dokumentet vel Vis og Feltskugge." #: indices_delete.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/librelogo.po libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/librelogo.po --- libreoffice-5.0.2/translations/source/nn/helpcontent2/source/text/swriter/librelogo.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/helpcontent2/source/text/swriter/librelogo.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-14 10:30+0000\n" +"PO-Revision-Date: 2015-11-08 15:23+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439548232.000000\n" +"X-POOTLE-MTIME: 1446996203.000000\n" #: LibreLogo.xhp msgctxt "" @@ -1502,7 +1502,7 @@ "hd_1860\n" "help.text" msgid "IF" -msgstr "VISS, DERSOM" +msgstr "VISS (IF på engelsk)" #: LibreLogo.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/sc/source/ui/drawfunc.po libreoffice-5.0.5~rc2/translations/source/nn/sc/source/ui/drawfunc.po --- libreoffice-5.0.2/translations/source/nn/sc/source/ui/drawfunc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sc/source/ui/drawfunc.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-05-28 12:37+0000\n" -"Last-Translator: Kolbjørn \n" +"PO-Revision-Date: 2015-10-31 21:42+0000\n" +"Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432816668.000000\n" +"X-POOTLE-MTIME: 1446327736.000000\n" #: drformsh.src msgctxt "" @@ -86,7 +86,7 @@ "SUBMENU_ANCHOR\n" "menuitem.text" msgid "An~chor" -msgstr "~Anker" +msgstr "For~ankring" #: drformsh.src msgctxt "" @@ -256,7 +256,7 @@ "SUBMENU_ANCHOR\n" "menuitem.text" msgid "An~chor" -msgstr "~Anker" +msgstr "For~ankring" #: objdraw.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/nn/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/nn/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-22 18:45+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-12 08:04+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: none\n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437590711.000000\n" +"X-POOTLE-MTIME: 1452585892.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "Den minste verdien må vera mindre enn den største verdien." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Sjølvvald" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/nn/sfx2/source/doc.po libreoffice-5.0.5~rc2/translations/source/nn/sfx2/source/doc.po --- libreoffice-5.0.2/translations/source/nn/sfx2/source/doc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sfx2/source/doc.po 2016-02-04 16:41:28.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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-07-16 20:47+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-09-24 12:15+0000\n" +"Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437079643.000000\n" +"X-POOTLE-MTIME: 1443096936.000000\n" #: doc.src msgctxt "" @@ -54,7 +54,7 @@ "STR_SAVEACOPY\n" "string.text" msgid "Save a Copy..." -msgstr "Lagra ein _kopi …" +msgstr "Lagra ein kopi …" #: doc.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/nn/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/nn/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-25 15:18+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-12 08:07+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: none\n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437837517.000000\n" +"X-POOTLE-MTIME: 1452586046.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,17 +749,17 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 er gjort tilgjengeleg under vilkåra i Mozilla Public License, v. 2.0. Du kan få ein kopi av MP-lisensen på http://mozilla.org/MPL/2.0/.\n" "\n" -"Meldingar om opphavsrett på kode frå tredjepart og lisensvilkåra som vert brukte på delar av programmet finn du i fila LICENSE.html. Vel «Vis lisens» for å sjå detaljane på engelsk.\n" +"Meldingar om opphavsrett på kode frå tredjepart og lisensvilkåra som vert brukte på delar av programmet finn du i fila LICENSE.html. Vel «Show License» for å sjå detaljane (på engelsk).\n" "\n" "Alle varemerke og registrerte varemerker som er nemnde her tilhøyrer dei respektive eigarane.\n" "\n" -"Ophavsrett © 2000, 2015: LibreOffice-bidragsytarane. \n" +"Ophavsrett © 2000, 2016: LibreOffice-bidragsytarane. \n" "\n" "Dette produktet er laga av %OOOVENDOR, basert på OpenOffice.org som er underlagt opphavsrett 2000, 2011 Oracle og/eller partnarane. %OOOVENDOR vedkjenner seg alle medlemmar av fellesskapet, sjå http://www.libreoffice.org/ for fleire detaljar." diff -Nru libreoffice-5.0.2/translations/source/nn/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/nn/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/nn/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/svx/source/dialog.po 2016-02-04 16:41:28.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-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-07-17 19:30+0000\n" +"PO-Revision-Date: 2016-01-31 12:02+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437161457.000000\n" +"X-POOTLE-MTIME: 1454241747.000000\n" #: bmpmask.src msgctxt "" @@ -4588,7 +4588,7 @@ "RID_SUBSETSTR_DINGBATS\n" "string.text" msgid "Dingbats" -msgstr "Dingbats" +msgstr "Dingbats (ornament)" #: ucsubset.src msgctxt "" @@ -6343,7 +6343,7 @@ "RID_SUBSETSTR_ORNAMENTAL_DINGBATS\n" "string.text" msgid "Ornamental Dingbats" -msgstr "Ornamental Dingbats" +msgstr "Ornamentiske dingbats" #: ucsubset.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/nn/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/nn/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-16 21:19+0000\n" -"Last-Translator: Kolbjørn Stuestøl \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:34+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437081540.000000\n" +"X-POOTLE-MTIME: 1439591661.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Tilpass målestokken" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/nn/sw/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/nn/sw/source/ui/app.po --- libreoffice-5.0.2/translations/source/nn/sw/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sw/source/ui/app.po 2016-02-04 16:41:28.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-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-09-10 19:25+0000\n" +"PO-Revision-Date: 2015-10-31 21:42+0000\n" "Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: LANGUAGE \n" "Language: nn\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441913117.000000\n" +"X-POOTLE-MTIME: 1446327748.000000\n" #: app.src msgctxt "" @@ -2202,7 +2202,7 @@ "FN_TOOL_ANCHOR\n" "menuitem.text" msgid "An~chor" -msgstr "~Anker" +msgstr "For~ankring" #: mn.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nn/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/nn/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/nn/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nn/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/nn/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/nn/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nn/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-14 22:48+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-31 21:41+0000\n" +"Last-Translator: Kolbjørn Stuestøl \n" "Language-Team: none\n" "Language: nn\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439592531.000000\n" +"X-POOTLE-MTIME: 1446327669.000000\n" #: abstractdialog.ui msgctxt "" @@ -5625,7 +5625,7 @@ "label\n" "string.text" msgid "Anchor" -msgstr "Anker" +msgstr "Forankring" #: frmtypepage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/nr/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/nr/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/nr/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 21:11+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Jamiselela" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Ububanzi" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ukuphakama:" #: borderpage.ui msgctxt "" @@ -4332,13 +4335,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ukuphakama:" #: distributionpage.ui #, fuzzy @@ -6508,13 +6512,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkdocpage.ui msgctxt "" @@ -6643,13 +6648,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkinternetpage.ui msgctxt "" @@ -6742,13 +6748,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkmailpage.ui msgctxt "" @@ -6895,13 +6902,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinknewdocpage.ui msgctxt "" @@ -7717,13 +7725,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Indlela:" #: linetabpage.ui msgctxt "" @@ -7781,13 +7790,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -7799,13 +7809,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -7871,13 +7882,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -10591,13 +10603,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Ubukhulu:" #: optfontspage.ui #, fuzzy @@ -13227,13 +13240,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ukuphakama:" #: pageformatpage.ui msgctxt "" @@ -13626,13 +13640,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ukuphakama:" #: paragalignpage.ui msgctxt "" @@ -14661,22 +14676,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ubujamo X" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ubujamo X" #: possizetabpage.ui msgctxt "" @@ -14698,13 +14715,14 @@ msgstr "Ubujamo X" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: possizetabpage.ui #, fuzzy @@ -15151,22 +15169,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ubujamo X" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ubujamo X" #: rotationtabpage.ui msgctxt "" @@ -17626,57 +17646,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/nr/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/nr/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/nr/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:11+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/nr/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/nr/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/nr/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nr/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/nr/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/nr/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 05:45+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:24+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: nr\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431495952.000000\n" +"X-POOTLE-MTIME: 1439591055.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/nr/starmath/source.po libreoffice-5.0.5~rc2/translations/source/nr/starmath/source.po --- libreoffice-5.0.2/translations/source/nr/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nr/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/nr/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/nr/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-13 05:52+0000\n" -"Last-Translator: Anonymous Pootle User\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:33+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: nr\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431496346.000000\n" +"X-POOTLE-MTIME: 1439591583.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/nr/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/nr/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/nr/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nr/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nso/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/nso/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/nso/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 21:08+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "Tšeela legato" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Bophara" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Bophagamo" #: borderpage.ui msgctxt "" @@ -4327,13 +4330,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Bophagamo" #: distributionpage.ui #, fuzzy @@ -6509,13 +6513,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkdocpage.ui msgctxt "" @@ -6644,13 +6649,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkinternetpage.ui msgctxt "" @@ -6743,13 +6749,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkmailpage.ui msgctxt "" @@ -6896,13 +6903,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinknewdocpage.ui msgctxt "" @@ -7721,13 +7729,14 @@ msgstr "Mothalwana" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Setaele" #: linetabpage.ui msgctxt "" @@ -7785,13 +7794,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7803,13 +7813,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7875,13 +7886,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -10593,13 +10605,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Bogolo" #: optfontspage.ui #, fuzzy @@ -13229,13 +13242,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Bophagamo" #: pageformatpage.ui msgctxt "" @@ -13628,13 +13642,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Bophagamo" #: paragalignpage.ui msgctxt "" @@ -14656,22 +14671,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Maemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Maemo" #: possizetabpage.ui msgctxt "" @@ -14693,13 +14710,14 @@ msgstr "Maemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: possizetabpage.ui #, fuzzy @@ -15146,22 +15164,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Maemo" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Maemo" #: rotationtabpage.ui msgctxt "" @@ -17623,57 +17643,3 @@ "string.text" msgid "View Layout" msgstr "Lebelela tlhamego" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/nso/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/nso/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/nso/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nso/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/nso/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/nso/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:06+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/nso/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/nso/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/nso/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 06:14+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:24+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: nso\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431497657.000000\n" +"X-POOTLE-MTIME: 1439591072.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/nso/starmath/source.po libreoffice-5.0.5~rc2/translations/source/nso/starmath/source.po --- libreoffice-5.0.2/translations/source/nso/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/nso/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/nso/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/nso/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-02-17 21:18+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:34+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: nso\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1361135886.000000\n" +"X-POOTLE-MTIME: 1439591692.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/nso/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/nso/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/nso/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/nso/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/oc/basic/source/classes.po libreoffice-5.0.5~rc2/translations/source/oc/basic/source/classes.po --- libreoffice-5.0.2/translations/source/oc/basic/source/classes.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/basic/source/classes.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-31 14:40+0000\n" -"Last-Translator: Cédric \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-11-05 20:31+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1422715240.000000\n" +"X-POOTLE-MTIME: 1446755468.000000\n" #: sb.src msgctxt "" @@ -437,7 +437,7 @@ "SbERR_DDE_CHANNEL_LOCKED & ERRCODE_RES_MASK\n" "string.text" msgid "DDE channel locked." -msgstr "Lo canal DDE es varrolhat." +msgstr "Lo canal DDE es verrolhat." #: sb.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/cui/source/tabpages.po libreoffice-5.0.5~rc2/translations/source/oc/cui/source/tabpages.po --- libreoffice-5.0.2/translations/source/oc/cui/source/tabpages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/cui/source/tabpages.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-02-01 12:59+0000\n" +"PO-Revision-Date: 2015-11-05 20:31+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1422795543.000000\n" +"X-POOTLE-MTIME: 1446755478.000000\n" #: border.src msgctxt "" @@ -1031,7 +1031,7 @@ "RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK\n" "string.text" msgid "Correct accidental use of cAPS LOCK key" -msgstr "Corregir l'usatge accidental de la tòca Varrolhatge mAJ" +msgstr "Corregir l'usatge accidental de la tòca Verrolhatge mAJ" #: strings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/oc/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/oc/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-04 06:16+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 21:21+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438668972.000000\n" +"X-POOTLE-MTIME: 1439587277.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME es una seguida burotica open source, modèrna e de bon utilizar, pel tractament de tèxte, los classadors, las presentacions e plan mai encara." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2014 Contributors de LibreOffice." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/oc/desktop/source/app.po libreoffice-5.0.5~rc2/translations/source/oc/desktop/source/app.po --- libreoffice-5.0.2/translations/source/oc/desktop/source/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/desktop/source/app.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-04-16 15:46+0000\n" -"Last-Translator: Cédric \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-05 20:31+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1429199211.000000\n" +"X-POOTLE-MTIME: 1446755488.000000\n" #: desktop.src msgctxt "" @@ -217,7 +217,7 @@ "\n" "Do you really want to continue?" msgstr "" -"Una autra instància de %PRODUCTNAME es a accedir a vòstres paramètres personals o aqueles darrièrs son varrolhats.\n" +"Una autra instància de %PRODUCTNAME es a accedir a vòstres paramètres personals o aqueles darrièrs son verrolhats.\n" "Un accès simultanèu pòt provocar d'incoeréncias dins vòstres paramètres personals. Abans de contunhar, asseguratz-vos que l'utilizaire '$u' quite plan %PRODUCTNAME sus l'òste '$h'.\n" "\n" "Sètz segur que volètz contunhar ?" diff -Nru libreoffice-5.0.2/translations/source/oc/desktop/source/deployment/unopkg.po libreoffice-5.0.5~rc2/translations/source/oc/desktop/source/deployment/unopkg.po --- libreoffice-5.0.2/translations/source/oc/desktop/source/deployment/unopkg.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/desktop/source/deployment/unopkg.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:01+0100\n" -"PO-Revision-Date: 2013-08-05 05:59+0000\n" -"Last-Translator: Cédric \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-05 20:31+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1375682340.0\n" +"X-POOTLE-MTIME: 1446755505.000000\n" #: unopkg.src msgctxt "" @@ -86,7 +86,7 @@ "RID_STR_CONCURRENTINSTANCE\n" "string.text" msgid "unopkg cannot be started. The lock file indicates it as already running. If this does not apply, delete the lock file at:" -msgstr "Se pòt pas aviar unopkg . Lo fichièr de varrolh indica qu'es ja lançat. Podètz escafar lo varrolh a:" +msgstr "Se pòt pas aviar unopkg. Lo fichièr de verrolh indica qu'es ja lançat. Podètz escafar lo verrolh a:" #: unopkg.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/oc/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/oc/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-14 21:38+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-05 20:32+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439588287.000000\n" +"X-POOTLE-MTIME: 1446755531.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -567,7 +567,6 @@ #. – (U+02013), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EN_DASH\n" @@ -577,7 +576,6 @@ #. — (U+02014), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EM_DASH\n" @@ -587,7 +585,6 @@ #. ’ (U+02019), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "RIGHT_SINGLE_QUOTATION_MARK\n" @@ -633,7 +630,6 @@ #. … (U+02026), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "HORIZONTAL_ELLIPSIS\n" @@ -679,7 +675,6 @@ #. ‼ (U+0203C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "DOUBLE_EXCLAMATION_MARK\n" @@ -689,7 +684,6 @@ #. ⁉ (U+02049), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "EXCLAMATION_QUESTION_MARK\n" @@ -1095,7 +1089,6 @@ #. − (U+02212), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MINUS_SIGN\n" @@ -1114,7 +1107,6 @@ #. ∕ (U+02215), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "DIVISION_SLASH\n" @@ -1124,7 +1116,6 @@ #. ∖ (U+02216), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SET_MINUS\n" @@ -1341,7 +1332,6 @@ #. ≪ (U+0226A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MUCH_LESS-THAN\n" @@ -1351,7 +1341,6 @@ #. ≫ (U+0226B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MUCH_GREATER-THAN\n" @@ -3305,7 +3294,6 @@ #. ❓ (U+02753), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BLACK_QUESTION_MARK_ORNAMENT\n" @@ -3324,7 +3312,6 @@ #. ❕ (U+02755), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_EXCLAMATION_MARK_ORNAMENT\n" @@ -7389,7 +7376,7 @@ "INCOMING_ENVELOPE\n" "LngText.text" msgid "envelope2" -msgstr "" +msgstr "envolopa2" #. 📩 (U+1F4E9), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7398,7 +7385,7 @@ "ENVELOPE_WITH_DOWNWARDS_ARROW_ABOVE\n" "LngText.text" msgid "envelope3" -msgstr "" +msgstr "envolopa3" #. 📪 (U+1F4EA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7407,7 +7394,7 @@ "CLOSED_MAILBOX_WITH_LOWERED_FLAG\n" "LngText.text" msgid "mailbox" -msgstr "" +msgstr "bóstia de letras" #. 📫 (U+1F4EB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7416,7 +7403,7 @@ "CLOSED_MAILBOX_WITH_RAISED_FLAG\n" "LngText.text" msgid "mailbox2" -msgstr "" +msgstr "bóstia de letras2" #. 📬 (U+1F4EC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7425,7 +7412,7 @@ "OPEN_MAILBOX_WITH_RAISED_FLAG\n" "LngText.text" msgid "mailbox3" -msgstr "" +msgstr "bóstia de letras3" #. 📭 (U+1F4ED), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7434,7 +7421,7 @@ "OPEN_MAILBOX_WITH_LOWERED_FLAG\n" "LngText.text" msgid "mailbox4" -msgstr "" +msgstr "bóstia de letras4" #. 📮 (U+1F4EE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7443,7 +7430,7 @@ "POSTBOX\n" "LngText.text" msgid "postbox" -msgstr "" +msgstr "bóstia postala" #. 📯 (U+1F4EF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7452,7 +7439,7 @@ "POSTAL_HORN\n" "LngText.text" msgid "horn" -msgstr "" +msgstr "còrn de pòsta" #. 📰 (U+1F4F0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7461,7 +7448,7 @@ "NEWSPAPER\n" "LngText.text" msgid "newspaper" -msgstr "" +msgstr "jornal" #. 📱 (U+1F4F1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7470,7 +7457,7 @@ "MOBILE_PHONE\n" "LngText.text" msgid "mobile" -msgstr "" +msgstr "portable" #. 📲 (U+1F4F2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7479,7 +7466,7 @@ "MOBILE_PHONE_WITH_RIGHTWARDS_ARROW_AT_LEFT\n" "LngText.text" msgid "calling" -msgstr "" +msgstr "sonada" #. 📳 (U+1F4F3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7488,7 +7475,7 @@ "VIBRATION_MODE\n" "LngText.text" msgid "vibration mode" -msgstr "" +msgstr "vibrador" #. 📴 (U+1F4F4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7497,7 +7484,7 @@ "MOBILE_PHONE_OFF\n" "LngText.text" msgid "mobile phone off" -msgstr "" +msgstr "portable atudat" #. 📵 (U+1F4F5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7506,7 +7493,7 @@ "NO_MOBILE_PHONES\n" "LngText.text" msgid "no mobile" -msgstr "" +msgstr "portable defendut" #. 📶 (U+1F4F6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7515,7 +7502,7 @@ "ANTENNA_WITH_BARS\n" "LngText.text" msgid "signal strength" -msgstr "" +msgstr "poténcia senhal" #. 📷 (U+1F4F7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7533,7 +7520,7 @@ "VIDEO_CAMERA\n" "LngText.text" msgid "video camera" -msgstr "" +msgstr "camèra vidèo" #. 📺 (U+1F4FA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7542,7 +7529,7 @@ "TELEVISION\n" "LngText.text" msgid "tv" -msgstr "" +msgstr "tv" #. 📻 (U+1F4FB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7551,7 +7538,7 @@ "RADIO\n" "LngText.text" msgid "radio" -msgstr "" +msgstr "ràdio" #. 📼 (U+1F4FC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7560,7 +7547,7 @@ "VIDEOCASSETTE\n" "LngText.text" msgid "vhs" -msgstr "" +msgstr "vhs" #. 🔅 (U+1F505), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7569,7 +7556,7 @@ "LOW_BRIGHTNESS_SYMBOL\n" "LngText.text" msgid "brightness" -msgstr "" +msgstr "luminositat" #. 🔆 (U+1F506), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7578,7 +7565,7 @@ "HIGH_BRIGHTNESS_SYMBOL\n" "LngText.text" msgid "brightness2" -msgstr "" +msgstr "luminositat2" #. 🔇 (U+1F507), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7587,7 +7574,7 @@ "SPEAKER_WITH_CANCELLATION_STROKE\n" "LngText.text" msgid "mute" -msgstr "" +msgstr "mut" #. 🔈 (U+1F508), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7596,7 +7583,7 @@ "SPEAKER\n" "LngText.text" msgid "speaker" -msgstr "" +msgstr "naut-parlaire2" #. 🔉 (U+1F509), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7605,7 +7592,7 @@ "SPEAKER_WITH_ONE_SOUND_WAVE\n" "LngText.text" msgid "sound" -msgstr "" +msgstr "son" #. 🔊 (U+1F50A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7614,7 +7601,7 @@ "SPEAKER_WITH_THREE_SOUND_WAVES\n" "LngText.text" msgid "loud sound" -msgstr "" +msgstr "son fòrt" #. 🔋 (U+1F50B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7623,7 +7610,7 @@ "BATTERY\n" "LngText.text" msgid "battery" -msgstr "" +msgstr "batariá" #. 🔌 (U+1F50C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7632,7 +7619,7 @@ "ELECTRIC_PLUG\n" "LngText.text" msgid "plug" -msgstr "" +msgstr "presa electrica" #. 🔍 (U+1F50D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7641,7 +7628,7 @@ "LEFT-POINTING_MAGNIFYING_GLASS\n" "LngText.text" msgid "mag" -msgstr "" +msgstr "lópia" #. 🔎 (U+1F50E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7650,7 +7637,7 @@ "RIGHT-POINTING_MAGNIFYING_GLASS\n" "LngText.text" msgid "mag2" -msgstr "" +msgstr "lópia2" #. 🔏 (U+1F50F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7659,7 +7646,7 @@ "LOCK_WITH_INK_PEN\n" "LngText.text" msgid "lock2" -msgstr "" +msgstr "verrolhat2" #. 🔐 (U+1F510), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7668,7 +7655,7 @@ "CLOSED_LOCK_WITH_KEY\n" "LngText.text" msgid "lock3" -msgstr "" +msgstr "verrolhat3" #. 🔑 (U+1F511), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7677,7 +7664,7 @@ "KEY\n" "LngText.text" msgid "key" -msgstr "" +msgstr "clau" #. 🔒 (U+1F512), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7686,7 +7673,7 @@ "LOCK\n" "LngText.text" msgid "lock" -msgstr "" +msgstr "verrolhat" #. 🔓 (U+1F513), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7695,7 +7682,7 @@ "OPEN_LOCK\n" "LngText.text" msgid "unlock" -msgstr "" +msgstr "desverrolhat" #. 🔔 (U+1F514), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7704,7 +7691,7 @@ "BELL\n" "LngText.text" msgid "bell" -msgstr "" +msgstr "senhal" #. 🔕 (U+1F515), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7713,7 +7700,7 @@ "BELL_WITH_CANCELLATION_STROKE\n" "LngText.text" msgid "no bell" -msgstr "" +msgstr "silenci" #. 🔖 (U+1F516), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7722,7 +7709,7 @@ "BOOKMARK\n" "LngText.text" msgid "bookmark2" -msgstr "" +msgstr "marcapaginas2" #. 🔗 (U+1F517), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7731,7 +7718,7 @@ "LINK_SYMBOL\n" "LngText.text" msgid "link" -msgstr "" +msgstr "ligam" #. 🔘 (U+1F518), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7740,7 +7727,7 @@ "RADIO_BUTTON\n" "LngText.text" msgid "radio button" -msgstr "" +msgstr "boton ràdio" #. 🔞 (U+1F51E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7749,7 +7736,7 @@ "NO_ONE_UNDER_EIGHTEEN_SYMBOL\n" "LngText.text" msgid "underage" -msgstr "" +msgstr "menor" #. 🔤 (U+1F524), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7758,7 +7745,7 @@ "INPUT_SYMBOL_FOR_LATIN_LETTERS\n" "LngText.text" msgid "abc" -msgstr "" +msgstr "abc" #. 🔥 (U+1F525), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7767,7 +7754,7 @@ "FIRE\n" "LngText.text" msgid "fire" -msgstr "" +msgstr "fuòc" #. 🔦 (U+1F526), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7776,7 +7763,7 @@ "ELECTRIC_TORCH\n" "LngText.text" msgid "flashlight" -msgstr "" +msgstr "lampa tòrcha" #. 🔧 (U+1F527), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7785,7 +7772,7 @@ "WRENCH\n" "LngText.text" msgid "wrench" -msgstr "" +msgstr "clau anglesa" #. 🔨 (U+1F528), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7794,7 +7781,7 @@ "HAMMER\n" "LngText.text" msgid "hammer" -msgstr "" +msgstr "martèl" #. 🔩 (U+1F529), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7803,7 +7790,7 @@ "NUT_AND_BOLT\n" "LngText.text" msgid "nut and bolt" -msgstr "" +msgstr "vis e escron" #. 🔪 (U+1F52A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7812,7 +7799,7 @@ "HOCHO\n" "LngText.text" msgid "knife" -msgstr "" +msgstr "cotèl" #. 🔫 (U+1F52B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7821,7 +7808,7 @@ "PISTOL\n" "LngText.text" msgid "pistol" -msgstr "" +msgstr "pistolet" #. 🔬 (U+1F52C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7830,7 +7817,7 @@ "MICROSCOPE\n" "LngText.text" msgid "microscope" -msgstr "" +msgstr "microscòpi" #. 🔭 (U+1F52D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7839,7 +7826,7 @@ "TELESCOPE\n" "LngText.text" msgid "telescope" -msgstr "" +msgstr "telescòpi" #. 🔮 (U+1F52E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7848,7 +7835,7 @@ "CRYSTAL_BALL\n" "LngText.text" msgid "crystal ball" -msgstr "" +msgstr "bola de cristal" #. 🔰 (U+1F530), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7857,7 +7844,7 @@ "JAPANESE_SYMBOL_FOR_BEGINNER\n" "LngText.text" msgid "beginner" -msgstr "" +msgstr "debutant" #. 🔱 (U+1F531), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7866,7 +7853,7 @@ "TRIDENT_EMBLEM\n" "LngText.text" msgid "trident" -msgstr "" +msgstr "trident" #. 🔲 (U+1F532), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7875,7 +7862,7 @@ "BLACK_SQUARE_BUTTON\n" "LngText.text" msgid "button2" -msgstr "" +msgstr "boton2" #. 🔳 (U+1F533), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7884,7 +7871,7 @@ "WHITE_SQUARE_BUTTON\n" "LngText.text" msgid "button" -msgstr "" +msgstr "boton" #. 🕐 (U+1F550), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7893,7 +7880,7 @@ "CLOCK_FACE_ONE_OCLOCK\n" "LngText.text" msgid "1" -msgstr "" +msgstr "1" #. 🕑 (U+1F551), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7902,7 +7889,7 @@ "CLOCK_FACE_TWO_OCLOCK\n" "LngText.text" msgid "2" -msgstr "" +msgstr "2" #. 🕒 (U+1F552), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7911,7 +7898,7 @@ "CLOCK_FACE_THREE_OCLOCK\n" "LngText.text" msgid "3" -msgstr "" +msgstr "3" #. 🕓 (U+1F553), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7920,7 +7907,7 @@ "CLOCK_FACE_FOUR_OCLOCK\n" "LngText.text" msgid "4" -msgstr "" +msgstr "4" #. 🕔 (U+1F554), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7929,7 +7916,7 @@ "CLOCK_FACE_FIVE_OCLOCK\n" "LngText.text" msgid "5" -msgstr "" +msgstr "5" #. 🕕 (U+1F555), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7938,7 +7925,7 @@ "CLOCK_FACE_SIX_OCLOCK\n" "LngText.text" msgid "6" -msgstr "" +msgstr "6" #. 🕖 (U+1F556), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7947,7 +7934,7 @@ "CLOCK_FACE_SEVEN_OCLOCK\n" "LngText.text" msgid "7" -msgstr "" +msgstr "7" #. 🕗 (U+1F557), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7956,7 +7943,7 @@ "CLOCK_FACE_EIGHT_OCLOCK\n" "LngText.text" msgid "8" -msgstr "" +msgstr "8" #. 🕘 (U+1F558), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7965,7 +7952,7 @@ "CLOCK_FACE_NINE_OCLOCK\n" "LngText.text" msgid "9" -msgstr "" +msgstr "9" #. 🕙 (U+1F559), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7974,7 +7961,7 @@ "CLOCK_FACE_TEN_OCLOCK\n" "LngText.text" msgid "10" -msgstr "" +msgstr "10" #. 🕚 (U+1F55A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7983,7 +7970,7 @@ "CLOCK_FACE_ELEVEN_OCLOCK\n" "LngText.text" msgid "11" -msgstr "" +msgstr "11" #. 🕛 (U+1F55B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7992,7 +7979,7 @@ "CLOCK_FACE_TWELVE_OCLOCK\n" "LngText.text" msgid "12" -msgstr "" +msgstr "12" #. 🕜 (U+1F55C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8001,7 +7988,7 @@ "CLOCK_FACE_ONE-THIRTY\n" "LngText.text" msgid "1.30" -msgstr "" +msgstr "1.30" #. 🕝 (U+1F55D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8010,7 +7997,7 @@ "CLOCK_FACE_TWO-THIRTY\n" "LngText.text" msgid "2.30" -msgstr "" +msgstr "2.30" #. 🕞 (U+1F55E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8019,7 +8006,7 @@ "CLOCK_FACE_THREE-THIRTY\n" "LngText.text" msgid "3.30" -msgstr "" +msgstr "3.30" #. 🕟 (U+1F55F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8028,7 +8015,7 @@ "CLOCK_FACE_FOUR-THIRTY\n" "LngText.text" msgid "4.30" -msgstr "" +msgstr "4.30" #. 🕠 (U+1F560), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8037,7 +8024,7 @@ "CLOCK_FACE_FIVE-THIRTY\n" "LngText.text" msgid "5.30" -msgstr "" +msgstr "5.30" #. 🕡 (U+1F561), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8046,7 +8033,7 @@ "CLOCK_FACE_SIX-THIRTY\n" "LngText.text" msgid "6.30" -msgstr "" +msgstr "6.30" #. 🕢 (U+1F562), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8055,7 +8042,7 @@ "CLOCK_FACE_SEVEN-THIRTY\n" "LngText.text" msgid "7.30" -msgstr "" +msgstr "7.30" #. 🕣 (U+1F563), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8064,7 +8051,7 @@ "CLOCK_FACE_EIGHT-THIRTY\n" "LngText.text" msgid "8.30" -msgstr "" +msgstr "8.30" #. 🕤 (U+1F564), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8073,7 +8060,7 @@ "CLOCK_FACE_NINE-THIRTY\n" "LngText.text" msgid "9.30" -msgstr "" +msgstr "9.30" #. 🕥 (U+1F565), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8082,7 +8069,7 @@ "CLOCK_FACE_TEN-THIRTY\n" "LngText.text" msgid "10.30" -msgstr "" +msgstr "10.30" #. 🕦 (U+1F566), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8091,7 +8078,7 @@ "CLOCK_FACE_ELEVEN-THIRTY\n" "LngText.text" msgid "11.30" -msgstr "" +msgstr "11.30" #. 🕧 (U+1F567), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8100,7 +8087,7 @@ "CLOCK_FACE_TWELVE-THIRTY\n" "LngText.text" msgid "12.30" -msgstr "" +msgstr "12.30" #. 🗻 (U+1F5FB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8109,7 +8096,7 @@ "MOUNT_FUJI\n" "LngText.text" msgid "Fuji" -msgstr "" +msgstr "Fuji" #. 🗼 (U+1F5FC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8118,7 +8105,7 @@ "TOKYO_TOWER\n" "LngText.text" msgid "tower" -msgstr "" +msgstr "torre" #. 🗽 (U+1F5FD), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8127,7 +8114,7 @@ "STATUE_OF_LIBERTY\n" "LngText.text" msgid "liberty" -msgstr "" +msgstr "libertat" #. 🗾 (U+1F5FE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8136,7 +8123,7 @@ "SILHOUETTE_OF_JAPAN\n" "LngText.text" msgid "Japan" -msgstr "" +msgstr "japon" #. 🗿 (U+1F5FF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8145,7 +8132,7 @@ "MOYAI\n" "LngText.text" msgid "statue" -msgstr "" +msgstr "estatua" #. 😀 (U+1F600), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8154,7 +8141,7 @@ "GRINNING_FACE\n" "LngText.text" msgid "grinning" -msgstr "" +msgstr "grimaçant" #. 😁 (U+1F601), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8163,7 +8150,7 @@ "GRINNING_FACE_WITH_SMILING_EYES\n" "LngText.text" msgid "grin" -msgstr "" +msgstr "grimaça" #. 😂 (U+1F602), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8172,7 +8159,7 @@ "FACE_WITH_TEARS_OF_JOY\n" "LngText.text" msgid "joy" -msgstr "" +msgstr "jòia" #. 😃 (U+1F603), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8181,7 +8168,7 @@ "SMILING_FACE_WITH_OPEN_MOUTH\n" "LngText.text" msgid "smiley" -msgstr "" +msgstr "sorisent" #. 😄 (U+1F604), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8190,7 +8177,7 @@ "SMILING_FACE_WITH_OPEN_MOUTH_AND_SMILING_EYES\n" "LngText.text" msgid "smile" -msgstr "" +msgstr "sorire3" #. 😅 (U+1F605), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8199,7 +8186,7 @@ "SMILING_FACE_WITH_OPEN_MOUTH_AND_COLD_SWEAT\n" "LngText.text" msgid "sweat smile" -msgstr "" +msgstr "sorire susor" #. 😆 (U+1F606), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8208,7 +8195,7 @@ "SMILING_FACE_WITH_OPEN_MOUTH_AND_TIGHTLY-CLOSED_EYES\n" "LngText.text" msgid "laughing" -msgstr "" +msgstr "rire" #. 😇 (U+1F607), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8217,7 +8204,7 @@ "SMILING_FACE_WITH_HALO\n" "LngText.text" msgid "innocent" -msgstr "" +msgstr "innocent" #. 😈 (U+1F608), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8226,7 +8213,7 @@ "SMILING_FACE_WITH_HORNS\n" "LngText.text" msgid "smiling imp" -msgstr "" +msgstr "fadet sorisent" #. 😉 (U+1F609), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8235,7 +8222,7 @@ "WINKING_FACE\n" "LngText.text" msgid "wink" -msgstr "" +msgstr "cluquejada" #. 😊 (U+1F60A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8244,7 +8231,7 @@ "SMILING_FACE_WITH_SMILING_EYES\n" "LngText.text" msgid "blush" -msgstr "" +msgstr "rogir" #. 😋 (U+1F60B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8253,7 +8240,7 @@ "FACE_SAVOURING_DELICIOUS_FOOD\n" "LngText.text" msgid "yum" -msgstr "" +msgstr "miam" #. 😌 (U+1F60C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8262,7 +8249,7 @@ "RELIEVED_FACE\n" "LngText.text" msgid "relieved" -msgstr "" +msgstr "solaçat" #. 😍 (U+1F60D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8271,7 +8258,7 @@ "SMILING_FACE_WITH_HEART-SHAPED_EYES\n" "LngText.text" msgid "heart eyes" -msgstr "" +msgstr "còr uèlhs" #. 😎 (U+1F60E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8280,7 +8267,7 @@ "SMILING_FACE_WITH_SUNGLASSES\n" "LngText.text" msgid "sunglasses" -msgstr "" +msgstr "lunetas solelh" #. 😏 (U+1F60F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8289,7 +8276,7 @@ "SMIRKING_FACE\n" "LngText.text" msgid "smirk" -msgstr "" +msgstr "trufandièr" #. 😐 (U+1F610), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8298,7 +8285,7 @@ "NEUTRAL_FACE\n" "LngText.text" msgid "neutral face" -msgstr "" +msgstr "neutre" #. 😑 (U+1F611), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8307,7 +8294,7 @@ "EXPRESSIONLESS_FACE\n" "LngText.text" msgid "expressionless" -msgstr "" +msgstr "sens expression" #. 😒 (U+1F612), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8316,7 +8303,7 @@ "UNAMUSED_FACE\n" "LngText.text" msgid "unamused" -msgstr "" +msgstr "desplaser" #. 😓 (U+1F613), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8325,7 +8312,7 @@ "FACE_WITH_COLD_SWEAT\n" "LngText.text" msgid "sweat" -msgstr "" +msgstr "susor" #. 😔 (U+1F614), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8334,7 +8321,7 @@ "PENSIVE_FACE\n" "LngText.text" msgid "pensive" -msgstr "" +msgstr "pensiu" #. 😕 (U+1F615), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8343,7 +8330,7 @@ "CONFUSED_FACE\n" "LngText.text" msgid "confused" -msgstr "" +msgstr "confús" #. 😖 (U+1F616), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9009,7 +8996,7 @@ "POLICE_CAR\n" "LngText.text" msgid "police car" -msgstr "" +msgstr "veitura polícia" #. 🚔 (U+1F694), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9018,7 +9005,7 @@ "ONCOMING_POLICE_CAR\n" "LngText.text" msgid "police car2" -msgstr "" +msgstr "veitura polícia2" #. 🚕 (U+1F695), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9027,7 +9014,7 @@ "TAXI\n" "LngText.text" msgid "taxi" -msgstr "" +msgstr "taxi" #. 🚖 (U+1F696), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9036,7 +9023,7 @@ "ONCOMING_TAXI\n" "LngText.text" msgid "taxi2" -msgstr "" +msgstr "taxi2" #. 🚗 (U+1F697), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9045,7 +9032,7 @@ "AUTOMOBILE\n" "LngText.text" msgid "car" -msgstr "" +msgstr "veitura" #. 🚘 (U+1F698), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9054,7 +9041,7 @@ "ONCOMING_AUTOMOBILE\n" "LngText.text" msgid "car2" -msgstr "" +msgstr "veitura2" #. 🚙 (U+1F699), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9063,7 +9050,7 @@ "RECREATIONAL_VEHICLE\n" "LngText.text" msgid "car3" -msgstr "" +msgstr "veitura3" #. 🚚 (U+1F69A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9072,7 +9059,7 @@ "DELIVERY_TRUCK\n" "LngText.text" msgid "truck2" -msgstr "" +msgstr "camion2" #. 🚛 (U+1F69B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -9643,7 +9630,6 @@ #. ⁻ (U+0207B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUPERSCRIPT_MINUS\n" @@ -9662,7 +9648,6 @@ #. ⁽ (U+0207D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUPERSCRIPT_LEFT_PARENTHESIS\n" @@ -9672,7 +9657,6 @@ #. ⁾ (U+0207E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUPERSCRIPT_RIGHT_PARENTHESIS\n" @@ -9781,7 +9765,6 @@ #. ₋ (U+0208B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUBSCRIPT_MINUS\n" @@ -9800,7 +9783,6 @@ #. ₍ (U+0208D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUBSCRIPT_LEFT_PARENTHESIS\n" @@ -9810,7 +9792,6 @@ #. ₎ (U+0208E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUBSCRIPT_RIGHT_PARENTHESIS\n" diff -Nru libreoffice-5.0.2/translations/source/oc/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/oc/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/oc/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1013,7 +1013,6 @@ msgstr "" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" diff -Nru libreoffice-5.0.2/translations/source/oc/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/oc/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/oc/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-14 22:07+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-11 15:06+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439590051.000000\n" +"X-POOTLE-MTIME: 1444575964.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -3302,14 +3302,13 @@ msgstr "Suprimir lo ~saut de pagina" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Popups..uno:FillCellsMenu\n" "Label\n" "value.text" msgid "F~ill" -msgstr "Emplenar" +msgstr "Emp~lenar" #: CalcCommands.xcu msgctxt "" @@ -15149,14 +15148,13 @@ msgstr "Piu~ses e numerotacion..." #: GenericCommands.xcu -#, fuzzy msgctxt "" "GenericCommands.xcu\n" "..GenericCommands.UserInterface.Commands..uno:EditDoc\n" "Label\n" "value.text" msgid "E~dit Mode" -msgstr "Mòde E~ditar" +msgstr "Mòde E~dicion" #: GenericCommands.xcu msgctxt "" @@ -15546,14 +15544,13 @@ msgstr "Color de rèire plan" #: GenericCommands.xcu -#, fuzzy msgctxt "" "GenericCommands.xcu\n" "..GenericCommands.UserInterface.Commands..uno:CharBackColor\n" "Label\n" "value.text" msgid "Text Background Color" -msgstr "Color de rèire plan" +msgstr "Color de rèire plan del tèxte" #: GenericCommands.xcu msgctxt "" @@ -20227,7 +20224,6 @@ msgstr "Afichar ~tot" #: MathCommands.xcu -#, fuzzy msgctxt "" "MathCommands.xcu\n" "..MathCommands.UserInterface.Commands..uno:ElementsDockingWindow\n" @@ -20885,14 +20881,13 @@ msgstr "Esbòs" #: Sidebar.xcu -#, fuzzy msgctxt "" "Sidebar.xcu\n" "..Sidebar.Content.PanelList.StylesPropertyPanel\n" "Title\n" "value.text" msgid "Styles" -msgstr "~Estils" +msgstr "Estils" #: Sidebar.xcu msgctxt "" @@ -23055,14 +23050,13 @@ msgstr "~Colomnas..." #: WriterCommands.xcu -#, fuzzy msgctxt "" "WriterCommands.xcu\n" "..WriterCommands.UserInterface.Commands..uno:InsertColumnsBefore\n" "Label\n" "value.text" msgid "Insert Columns Left" -msgstr "Inserir de co~lomnas a esquèrra" +msgstr "Inserir de colomnas a esquèrra" #: WriterCommands.xcu msgctxt "" @@ -23083,7 +23077,6 @@ msgstr "Inserir de colomnas a drecha" #: WriterCommands.xcu -#, fuzzy msgctxt "" "WriterCommands.xcu\n" "..WriterCommands.UserInterface.Commands..uno:InsertColumnsAfter\n" diff -Nru libreoffice-5.0.2/translations/source/oc/officecfg/registry/data/org/openoffice/Office.po libreoffice-5.0.5~rc2/translations/source/oc/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-5.0.2/translations/source/oc/officecfg/registry/data/org/openoffice/Office.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/officecfg/registry/data/org/openoffice/Office.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-04 06:01+0000\n" +"PO-Revision-Date: 2015-10-11 15:04+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438668061.000000\n" +"X-POOTLE-MTIME: 1444575899.000000\n" #: Addons.xcu msgctxt "" @@ -89,14 +89,13 @@ msgstr "" #: Addons.xcu -#, fuzzy msgctxt "" "Addons.xcu\n" ".Addons.AddonUI.OfficeToolBar.LibreLogo.OfficeToolBar.m10\n" "Title\n" "value.text" msgid "Logo command line (press Enter for command execution or F1 for help)" -msgstr "Linha de comanda Logo (apujatz sus Entrée per executar la comanda o sus F1 per l'ajuda)" +msgstr "Linha de comanda Lògo (quichatz sus Entrada per executar la comanda o sus F1 per l'ajuda)" #: Addons.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/readlicense_oo/docs.po libreoffice-5.0.5~rc2/translations/source/oc/readlicense_oo/docs.po --- libreoffice-5.0.2/translations/source/oc/readlicense_oo/docs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/readlicense_oo/docs.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-08-04 06:11+0000\n" +"PO-Revision-Date: 2015-11-05 20:34+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438668700.000000\n" +"X-POOTLE-MTIME: 1446755644.000000\n" #: readme.xrm msgctxt "" @@ -606,7 +606,7 @@ "gfh6w\n" "readmeitem.text" msgid "File Locking" -msgstr "Varrolhatge de fichièr" +msgstr "Verrolhatge de fichièr" #: readme.xrm msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/oc/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/oc/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sc/source/ui/src.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-14 22:21+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-05 20:34+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439590863.000000\n" +"X-POOTLE-MTIME: 1446755659.000000\n" #: condformatdlg.src msgctxt "" @@ -737,7 +737,6 @@ msgstr "3 simbòls 2" #: condformatdlg.src -#, fuzzy msgctxt "" "condformatdlg.src\n" "RID_COND_ENTRY.LB_ICONSET_TYPE\n" @@ -765,7 +764,6 @@ msgstr "" #: condformatdlg.src -#, fuzzy msgctxt "" "condformatdlg.src\n" "RID_COND_ENTRY.LB_ICONSET_TYPE\n" @@ -4677,9 +4675,9 @@ "\n" "Sharing mode of a locked file cannot be disabled. Try again later." msgstr "" -"Lo fuèlh de calcul partejat es varrolhat a causa d'una fusion en cors per l'utilizaire : '%1'\n" +"Lo fuèlh de calcul partejat es verrolhat a causa d'una fusion en cors per l'utilizaire : '%1'\n" "\n" -"Lo mòde partejat d'un fichièr varrolhat pòt pas èsser desactivat. Ensajatz tornarmai pus tard." +"Lo mòde partejat d'un fichièr verrolhat pòt pas èsser desactivat. Ensajatz tornarmai pus tard." #: globstr.src msgctxt "" @@ -4692,7 +4690,7 @@ "\n" "Try again later to save your changes." msgstr "" -"Lo fuèlh de calcul partejat es varrolhat a causa d'una fusion en cors par l'utilizaire : '%1'\n" +"Lo fuèlh de calcul partejat es verrolhat a causa d'una fusion en cors par l'utilizaire : '%1'\n" "\n" "Ensajatz d'enregistrar vòstras modificacions pus tard." @@ -5995,14 +5993,13 @@ msgstr "Inserir un co~mentari" #: popup.src -#, fuzzy msgctxt "" "popup.src\n" "RID_POPUP_CELLS\n" "SID_EDIT_POSTIT\n" "menuitem.text" msgid "Edit Co~mment" -msgstr "Editar lo comentari" +msgstr "Editar lo co~mentari" #: popup.src msgctxt "" @@ -8234,14 +8231,13 @@ msgstr "Determina la data correnta de l'ordenador." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DAY_OF_WEEK\n" "1\n" "string.text" msgid "Returns the day of the week for the date value as an integer." -msgstr "Renvia lo jorn de la setmana (comprés entre 1 e 7) que correspond a l'argument numèro_seria." +msgstr "Renvia lo jorn de la setmana per la valor de data jos la forma d'un nombre entièr." #: scfuncs.src msgctxt "" @@ -11979,14 +11975,13 @@ msgstr "Numèro_seria" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_ARC_COT_HYP\n" "3\n" "string.text" msgid "A value smaller than -1 or greater than 1 for which the inverse hyperbolic cotangent is to be returned." -msgstr "Una valor superiora o egala a 1 per la quala lo cosinus iperbolic invèrse deu èsser renviat." +msgstr "Una valor superiora a -1 o soperiora a 1 que l'arc cotangenta iperbolic deu èsser calculat." #: scfuncs.src msgctxt "" @@ -12007,14 +12002,13 @@ msgstr "Numèro_seria" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_ARC_TAN_HYP\n" "3\n" "string.text" msgid "A value between -1 and 1 for which the inverse hyperbolic tangent is to be returned." -msgstr "Una valor entre -1 e 1 que l'arc cosinus ne deu èsser calculat." +msgstr "Una valor entre -1 e 1 que la tangenta iperbolica invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -13430,27 +13424,24 @@ msgstr "" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" "2\n" "string.text" msgid "Number" -msgstr "Numèro_seria" +msgstr "Nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" "3\n" "string.text" msgid "The number to be rounded down." -msgstr "La valor d'arredondir en tendent cap a zèro." +msgstr "La valor d'arredondir per valor inferiora." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" @@ -13460,17 +13451,15 @@ msgstr "Precision" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" "5\n" "string.text" msgid "The number to whose multiple the value is to be rounded down." -msgstr "Lo multiple al qual cal arredondir lo nombre." +msgstr "Lo nombre al multiple del qual la valor deu èsser arredondida per valor inferiora." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" @@ -13498,27 +13487,24 @@ msgstr "" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_PRECISE\n" "2\n" "string.text" msgid "Number" -msgstr "Numèro_seria" +msgstr "Nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_PRECISE\n" "3\n" "string.text" msgid "The number to be rounded down." -msgstr "La valor d'arredondir en tendent cap a zèro." +msgstr "La valor d'arredondir per valor inferiora." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_PRECISE\n" @@ -14005,14 +13991,13 @@ msgstr "Tipe_de_drecha" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_LINEST\n" "7\n" "string.text" msgid "If type = 0 the linears will be calculated through the zero point, or else moved linears." -msgstr "Calcula las drechas pel punt zèro se Tipe = 0 ; siquenon drechas decaladas." +msgstr "Calcula las drechas per l'origina se Tipe = 0 ; siquenon drechas decaladas." #: scfuncs.src msgctxt "" @@ -14321,14 +14306,13 @@ msgstr "Valor " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_COUNT_2\n" "3\n" "string.text" msgid "Value 1, value 2, ... are 1 to 30 arguments representing the values to be counted." -msgstr "Valor 1, Valor 2, ... son de 1 a 30 arguments que representan los encaissaments o los descaissaments." +msgstr "Valor 1, Valor 2, ... son de 1 a 30 arguments que correspondon a las valors de comptar." #: scfuncs.src msgctxt "" @@ -14403,24 +14387,22 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_MIN\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments for which the smallest number is to be determined." -msgstr "Nombre 1, nombre 2 ... son de 1 a 30 arguments demest los quals lo nombre lo mai grand deu èsser determinat." +msgstr "Nombre 1, nombre 2 ... son de 1 a 30 arguments demest los quals lo nombre lo mai pichon ne deu èsser determinat." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_MIN_A\n" "1\n" "string.text" msgid "Returns the smallest value in a list of arguments. Text is evaluated as zero." -msgstr "Renvia la mai granda valor d'una lista d'arguments. La valor 0 es atribuida al tèxte." +msgstr "Renvia la mai pichona valor d'una lista d'arguments. La valor 0 es atribuida al tèxte." #: scfuncs.src msgctxt "" @@ -14432,14 +14414,13 @@ msgstr "Valor " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_MIN_A\n" "3\n" "string.text" msgid "Value 1; value 2;... are 1 to 30 arguments whose smallest number is to be determined." -msgstr "Valor 1, valor 2, ... representan de 1 a 30 arguments que la valor maximala ne deu èsser determinada." +msgstr "Valor 1, valor 2, ... representan d'1 a 30 arguments que la valor minimala ne deu èsser determinada." #: scfuncs.src msgctxt "" @@ -14460,14 +14441,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_VAR\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan l'escandalhatge d'una populacion." #: scfuncs.src msgctxt "" @@ -14488,14 +14468,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_VAR_S\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan l'escandalhatge d'una populacion." #: scfuncs.src msgctxt "" @@ -14543,14 +14522,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_VAR_P\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which represent a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que correspondon a una populacion." #: scfuncs.src msgctxt "" @@ -14571,14 +14549,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_VAR_P_MS\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which represent a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan una populacion." #: scfuncs.src msgctxt "" @@ -14599,14 +14576,13 @@ msgstr "Valor " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_VAR_P_A\n" "3\n" "string.text" msgid "Value 1; value 2;... are 1 to 30 arguments representing a population." -msgstr "Valor 1, Valor 2, ... son de 1 a 30 arguments que representan los encaissaments o los descaissaments." +msgstr "Valor 1, Valor 2, ... representan d'1 a 30 arguments que correspodon a una populacion." #: scfuncs.src msgctxt "" @@ -14627,14 +14603,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ST_DEV\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan l'escandalhatge d'una populacion." #: scfuncs.src msgctxt "" @@ -14655,14 +14630,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ST_DEV_S\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample of a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan l'escandalhatge d'una populacion." #: scfuncs.src msgctxt "" @@ -14710,14 +14684,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ST_DEV_P\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan una populacion." #: scfuncs.src msgctxt "" @@ -14738,14 +14711,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ST_DEV_P_MS\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a population." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan una populacion." #: scfuncs.src msgctxt "" @@ -14847,14 +14819,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_DEV_SQ\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan un escandalhatge." #: scfuncs.src msgctxt "" @@ -14875,14 +14846,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_AVE_DEV\n" "3\n" "string.text" msgid "Number 1, number 2;...are 1 to 30 numerical arguments representing a sample." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan un escandalhatge." #: scfuncs.src msgctxt "" @@ -14903,14 +14873,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_SKEW\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments portraying a sample of the distribution." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge de la distribucion." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan un escandalhatge de la distribucion." #: scfuncs.src msgctxt "" @@ -15066,14 +15035,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_MODAL_VALUE_MS\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 30 numerical arguments which portray a sample." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 30 arguments numerics que representan un escandalhatge." #: scfuncs.src msgctxt "" @@ -15094,14 +15062,13 @@ msgstr "nombre " #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_MODAL_VALUE_MULTI\n" "3\n" "string.text" msgid "Number 1, number 2, ... are 1 to 254 numerical arguments which portray a sample." -msgstr "Nombre 1, nombre 2, ... son de 1 a 30 arguments numerics que representan un escandalhatge." +msgstr "Nombre 1, nombre 2, ... son d'1 a 254 arguments numerics que representan un escandalhatge." #: scfuncs.src msgctxt "" @@ -16337,7 +16304,6 @@ msgstr "C" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BINOM_DIST_MS\n" @@ -16923,14 +16889,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_NORM_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la distribucion normala invèrsa." #: scfuncs.src msgctxt "" @@ -16987,14 +16952,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_NORM_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la distribucion normala invèrsa." #: scfuncs.src msgctxt "" @@ -17123,14 +17087,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_S_NORM_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse standard normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion normala estandarda invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -17151,14 +17114,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_S_NORM_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse standard normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion normala estandarda invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -17341,14 +17303,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_LOG_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse log normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion lognormala invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -17405,14 +17366,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_LOG_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse log normal distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion lognormala invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -17757,14 +17717,13 @@ msgstr "Numèro_seria" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_GAMMA_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse gamma distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la distribucion Gamma." #: scfuncs.src msgctxt "" @@ -17821,14 +17780,13 @@ msgstr "Numèro_seria" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_GAMMA_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse gamma distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la distribucion Gamma." #: scfuncs.src msgctxt "" @@ -18083,14 +18041,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse beta distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion bèta invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -18300,14 +18257,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_BETA_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse beta distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala la distribucion bèta invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -18958,14 +18914,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_T_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse T distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion T invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19004,14 +18959,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_T_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse T distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion T invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19050,14 +19004,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_T_INV_2T\n" "3\n" "string.text" msgid "The probability value for which the inverse T distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion T invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19303,14 +19256,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_F_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse F distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion F invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19367,14 +19319,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_F_INV_LT\n" "3\n" "string.text" msgid "The probability value for which the inverse F distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion F invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19431,14 +19382,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_F_INV_RT\n" "3\n" "string.text" msgid "The probability value for which the inverse F distribution is to be calculated." -msgstr "La valor per la quala volètz calcular la distribucion normala." +msgstr "La valor de probabilitat per la quala la distribucion F invèrsa deu èsser calculada." #: scfuncs.src msgctxt "" @@ -19711,14 +19661,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_CHI_INV\n" "3\n" "string.text" msgid "The probability value for which the inverse chi square distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la lei Khi-dos invèrsa." #: scfuncs.src msgctxt "" @@ -19757,14 +19706,13 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_CHI_INV_MS\n" "3\n" "string.text" msgid "The probability value for which the inverse chi square distribution is to be calculated." -msgstr "La valor a la quala la foncion es d'evaluar" +msgstr "La valor de probabilitat per la quala volètz calcular la lei Khi-dos invèrsa." #: scfuncs.src msgctxt "" @@ -22478,7 +22426,6 @@ msgstr "nombre" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_CHAR\n" @@ -22596,7 +22543,6 @@ msgstr "" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_FIND\n" @@ -23092,14 +23038,13 @@ msgstr "" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_LEFT\n" "1\n" "string.text" msgid "Returns the first character or characters of a text." -msgstr "Renvia lo o los darrièrs caractèrs d'un tèxte, amb DBCS" +msgstr "Renvia lo o los primièrs caractèrs d'un tèxte." #: scfuncs.src msgctxt "" @@ -23138,14 +23083,13 @@ msgstr "Lo nombre de caractèrs que volètz extraire." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_RIGHT\n" "1\n" "string.text" msgid "Returns the last character or characters of a text." -msgstr "Renvia lo o los darrièrs caractèrs d'un tèxte, amb DBCS" +msgstr "Renvia lo o los darrièrs caractèrs d'un tèxte." #: scfuncs.src msgctxt "" @@ -24157,14 +24101,13 @@ msgstr "Lo nombre de caractèrs que volètz extraire." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_LEFTB\n" "1\n" "string.text" msgid "Returns the first character or characters of a text,with DBCS" -msgstr "Renvia lo o los darrièrs caractèrs d'un tèxte, amb DBCS" +msgstr "Renvia lo o los primièrs caractèrs d'un tèxte, amb DBCS" #: scfuncs.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/oc/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/oc/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-14 22:26+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-11-05 20:34+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439591173.000000\n" +"X-POOTLE-MTIME: 1446755665.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalizat" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -1994,22 +2004,24 @@ msgstr "URL :" #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_markup\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "Sasissètz aicí l'URL del document sorga dins lo sistèma de fichièr local o sus Internet." #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_text\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "Sasissètz aicí l'URL del document sorga dins lo sistèma de fichièr local o sus Internet." #: datastreams.ui msgctxt "" @@ -6275,7 +6287,7 @@ "label\n" "string.text" msgid "P_rotect this sheet and the contents of protected cells" -msgstr "P_rotegir aqueste fuèlh e lo contengut de las cellulas varrolhadas" +msgstr "P_rotegir aqueste fuèlh e lo contengut de las cellulas verrolhadas" #: protectsheetdlg.ui msgctxt "" @@ -7808,14 +7820,13 @@ msgstr "Seleccionatz l'angle de rotacion." #: sidebarcellappearance.ui -#, fuzzy msgctxt "" "sidebarcellappearance.ui\n" "cellbackgroundlabel\n" "label\n" "string.text" msgid "_Background:" -msgstr "Rèire plan" +msgstr "_Rèire plan :" #: sidebarcellappearance.ui msgctxt "" @@ -8070,7 +8081,6 @@ msgstr "" #: sidebarnumberformat.ui -#, fuzzy msgctxt "" "sidebarnumberformat.ui\n" "negativenumbersred\n" @@ -10751,86 +10761,3 @@ "string.text" msgid "Grouped by" msgstr "Gropat per" - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "Alinhèa a es_quèrra :" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "Empilat a la verticala" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Alinha lo tèxte verticalament." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Alinha lo tèxte verticalament." - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "Rèire plan de _cellula :" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "_Bordadura de cellula :" - -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "_Categoria :" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "_Nombres negatius en roge" diff -Nru libreoffice-5.0.2/translations/source/oc/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/oc/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/oc/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/oc/sd/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/oc/sd/source/ui/app.po --- libreoffice-5.0.2/translations/source/oc/sd/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sd/source/ui/app.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-08 10:48+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-11 17:12+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1433760503.000000\n" +"X-POOTLE-MTIME: 1444583562.000000\n" #: menuids3_tmpl.src msgctxt "" @@ -161,14 +161,13 @@ msgstr "~Reparticion..." #: menuids_tmpl.src -#, fuzzy msgctxt "" "menuids_tmpl.src\n" "MN_INSERT_GRAPHIC\n" "SID_INSERT_GRAPHIC\n" "menuitem.text" msgid "Insert I~mage..." -msgstr "Inserir un imatge" +msgstr "Inserir un i~matge..." #: menuids_tmpl.src msgctxt "" @@ -855,14 +854,13 @@ msgstr "" #: menuids_tmpl.src -#, fuzzy msgctxt "" "menuids_tmpl.src\n" "MN_CROP\n" "SID_OBJECT_CROP\n" "menuitem.text" msgid "Crop I~mage" -msgstr "Rosegar l'imatge" +msgstr "Rosegar l'~imatge" #: menuids_tmpl.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/sd/uiconfig/sdraw/ui.po libreoffice-5.0.5~rc2/translations/source/oc/sd/uiconfig/sdraw/ui.po --- libreoffice-5.0.2/translations/source/oc/sd/uiconfig/sdraw/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sd/uiconfig/sdraw/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +4,17 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-05-26 16:52+0000\n" -"Last-Translator: Cédric \n" +"PO-Revision-Date: 2015-11-05 20:34+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432659142.000000\n" +"X-POOTLE-MTIME: 1446755671.000000\n" #: breakdialog.ui msgctxt "" @@ -680,7 +680,7 @@ "label\n" "string.text" msgid "_Locked" -msgstr "_Varrolhada" +msgstr "_Verrolhada" #: insertslidesdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/sd/uiconfig/simpress/ui.po libreoffice-5.0.5~rc2/translations/source/oc/sd/uiconfig/simpress/ui.po --- libreoffice-5.0.2/translations/source/oc/sd/uiconfig/simpress/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sd/uiconfig/simpress/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-30 05:15+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-11 17:12+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432962913.000000\n" +"X-POOTLE-MTIME: 1444583577.000000\n" #: assistentdialog.ui msgctxt "" @@ -3311,7 +3311,6 @@ msgstr "" #: slidetransitionspanel.ui -#, fuzzy msgctxt "" "slidetransitionspanel.ui\n" "auto_preview\n" diff -Nru libreoffice-5.0.2/translations/source/oc/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/oc/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/oc/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-26 05:42+0000\n" -"Last-Translator: Cédric Valmary \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:38+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432618927.000000\n" +"X-POOTLE-MTIME: 1439591908.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -1995,11 +1995,3 @@ "string.text" msgid "Existing Versions" msgstr "Versions existentas" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Reïnicializar" diff -Nru libreoffice-5.0.2/translations/source/oc/starmath/uiconfig/smath/ui.po libreoffice-5.0.5~rc2/translations/source/oc/starmath/uiconfig/smath/ui.po --- libreoffice-5.0.2/translations/source/oc/starmath/uiconfig/smath/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/starmath/uiconfig/smath/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-09 11:07+0000\n" +"PO-Revision-Date: 2015-10-11 17:13+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431169652.000000\n" +"X-POOTLE-MTIME: 1444583588.000000\n" #: alignmentdialog.ui msgctxt "" @@ -125,7 +125,6 @@ msgstr "Desconegut" #: dockingelements.ui -#, fuzzy msgctxt "" "dockingelements.ui\n" "DockingElements\n" diff -Nru libreoffice-5.0.2/translations/source/oc/svtools/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/oc/svtools/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/oc/svtools/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/svtools/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-26 05:20+0000\n" +"PO-Revision-Date: 2015-10-11 17:13+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432617655.000000\n" +"X-POOTLE-MTIME: 1444583633.000000\n" #: GraphicExportOptionsDialog.ui msgctxt "" @@ -908,14 +908,13 @@ msgstr "Per que la bibliografia foncione corrèctament, %PRODUCTNAME deu èsser reaviat." #: restartdialog.ui -#, fuzzy msgctxt "" "restartdialog.ui\n" "reason_mailmerge_install\n" "label\n" "string.text" msgid "For the mail merge to work properly, %PRODUCTNAME must be restarted." -msgstr "Per que la bibliografia foncione corrèctament, %PRODUCTNAME deu èsser reaviat." +msgstr "%PRODUCTNAME deu èsser reaviat per que lo publipostatge foncionne corrèctament." #: restartdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/svx/source/src.po libreoffice-5.0.5~rc2/translations/source/oc/svx/source/src.po --- libreoffice-5.0.2/translations/source/oc/svx/source/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/svx/source/src.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-31 14:14+0000\n" -"Last-Translator: Cédric \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-11-05 20:34+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1422713646.000000\n" +"X-POOTLE-MTIME: 1446755677.000000\n" #: errtxt.src msgctxt "" @@ -203,7 +203,7 @@ "ERRCODE_CLASS_LOCKING\n" "string.text" msgid "Locking problem" -msgstr "Problèma de varrolhatge" +msgstr "Problèma de verrolhatge" #: errtxt.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/oc/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/oc/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-25 15:58+0000\n" -"Last-Translator: Cédric \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:47+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: oc\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432569504.000000\n" +"X-POOTLE-MTIME: 1439592472.000000\n" #: stbctrls.src msgctxt "" @@ -160,14 +160,6 @@ #: stbctrls.src msgctxt "" "stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Ajustar lo nivèl de zoom" - -#: stbctrls.src -msgctxt "" -"stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" msgid "Zoom In" @@ -290,40 +282,44 @@ msgstr "50%" #: stbctrls.src +#, fuzzy msgctxt "" "stbctrls.src\n" "RID_SVXMNU_ZOOM\n" "ZOOM_75\n" "menuitem.text" msgid "75%" -msgstr "" +msgstr "75%" #: stbctrls.src +#, fuzzy msgctxt "" "stbctrls.src\n" "RID_SVXMNU_ZOOM\n" "ZOOM_100\n" "menuitem.text" msgid "100%" -msgstr "" +msgstr "100%" #: stbctrls.src +#, fuzzy msgctxt "" "stbctrls.src\n" "RID_SVXMNU_ZOOM\n" "ZOOM_150\n" "menuitem.text" msgid "150%" -msgstr "" +msgstr "150%" #: stbctrls.src +#, fuzzy msgctxt "" "stbctrls.src\n" "RID_SVXMNU_ZOOM\n" "ZOOM_200\n" "menuitem.text" msgid "200%" -msgstr "" +msgstr "200%" #: stbctrls.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/oc/sw/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/oc/sw/source/ui/app.po --- libreoffice-5.0.2/translations/source/oc/sw/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sw/source/ui/app.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-08 10:52+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-11 17:14+0000\n" +"Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1433760769.000000\n" +"X-POOTLE-MTIME: 1444583646.000000\n" #: app.src msgctxt "" @@ -1578,7 +1578,6 @@ msgstr "" #: mn.src -#, fuzzy msgctxt "" "mn.src\n" "MN_TABLE.DUMMY\n" @@ -1606,7 +1605,6 @@ msgstr "" #: mn.src -#, fuzzy msgctxt "" "mn.src\n" "MN_TABLE.DUMMY\n" diff -Nru libreoffice-5.0.2/translations/source/oc/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/oc/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/oc/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/oc/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/oc/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/oc/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-05-25 16:02+0000\n" +"PO-Revision-Date: 2015-10-11 17:14+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: none\n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432569779.000000\n" +"X-POOTLE-MTIME: 1444583675.000000\n" #: abstractdialog.ui msgctxt "" @@ -2969,7 +2969,6 @@ msgstr "Am_b senhal" #: editsectiondialog.ui -#, fuzzy msgctxt "" "editsectiondialog.ui\n" "password\n" @@ -5467,7 +5466,6 @@ msgstr "" #: frmaddpage.ui -#, fuzzy msgctxt "" "frmaddpage.ui\n" "liststore1\n" @@ -10596,7 +10594,6 @@ msgstr "_Colomna :" #: opttablepage.ui -#, fuzzy msgctxt "" "opttablepage.ui\n" "label14\n" diff -Nru libreoffice-5.0.2/translations/source/oc/uui/source.po libreoffice-5.0.5~rc2/translations/source/oc/uui/source.po --- libreoffice-5.0.2/translations/source/oc/uui/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/uui/source.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-04-16 17:19+0000\n" +"PO-Revision-Date: 2015-11-05 21:19+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" @@ -14,10 +14,9 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1429204770.000000\n" +"X-POOTLE-MTIME: 1446758387.000000\n" #: alreadyopen.src -#, fuzzy msgctxt "" "alreadyopen.src\n" "STR_ALREADYOPEN_TITLE\n" @@ -725,7 +724,7 @@ "(ERRCODE_UUI_LOCKING_LOCKED & ERRCODE_RES_MASK)\n" "string.text" msgid "The file $(ARG1) is locked by another user. Currently, another write access to this file cannot be granted." -msgstr "Lo fichièr $(ARG1) es varrolhat per un autre utilizaire. Actualament, un drech novèl d'escritura sus aqueste fichièr pòt èsser acordat. " +msgstr "Lo fichièr $(ARG1) es verrolhat per un autre utilizaire. Actualament, un drech novèl d'escritura sus aqueste fichièr pòt èsser acordat. " #: ids.src msgctxt "" @@ -734,7 +733,7 @@ "(ERRCODE_UUI_LOCKING_LOCKED_SELF & ERRCODE_RES_MASK)\n" "string.text" msgid "The file $(ARG1) is locked by yourself. Currently, another write access to this file cannot be granted." -msgstr "Lo fichièr $(ARG1) es varrolhat per vos-meteis. Actualament, un drech novèl d'escritura sus aqueste fichièr pòt pas èsser acordat." +msgstr "Lo fichièr $(ARG1) es verrolhat per vos-meteis. Actualament, un drech novèl d'escritura sus aqueste fichièr pòt pas èsser acordat." #: ids.src msgctxt "" @@ -755,7 +754,7 @@ "The previously obtained lock for file $(ARG1) has expired.\n" "This can happen due to problems on the server managing the file lock. It cannot be guaranteed that write operations on this file will not overwrite changes done by other users!" msgstr "" -"Lo varolh obtengut precedentament pel fichièr $(ARG1) a expirat.\n" +"Lo verrolh obtengut precedentament pel fichièr $(ARG1) a expirat.\n" "Es benlèu un problèma sul servidor que gerís lo fichièr de blocatges. Donc, i a pas de garantida que las operacions d'escritura sul fichièr esfaçaràn pas las modificacions fachas per un autre utilizaire ! " #: ids.src diff -Nru libreoffice-5.0.2/translations/source/oc/uui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/oc/uui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/oc/uui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/oc/uui/uiconfig/ui.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-09 11:15+0000\n" +"PO-Revision-Date: 2015-10-11 17:15+0000\n" "Last-Translator: Cédric Valmary \n" "Language-Team: LANGUAGE \n" "Language: oc\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431170103.000000\n" +"X-POOTLE-MTIME: 1444583712.000000\n" #: authfallback.ui msgctxt "" @@ -178,14 +178,13 @@ msgstr "Lo document conten de macros de document signadas per :" #: macrowarnmedium.ui -#, fuzzy msgctxt "" "macrowarnmedium.ui\n" "descr1aLabel\n" "label\n" "string.text" msgid "The document contains document macros." -msgstr "Lo document conten de macros de document signadas per :" +msgstr "Lo document conten de macros de document." #: macrowarnmedium.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/om/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/om/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/om/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 21:20+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Bakka buusi" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Dalgee" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Dalgee" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Hojjaa" #: borderpage.ui msgctxt "" @@ -4335,13 +4338,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Hojjaa" #: distributionpage.ui #, fuzzy @@ -6514,13 +6518,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Maqaa" #: hyperlinkdocpage.ui msgctxt "" @@ -6649,13 +6654,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Maqaa" #: hyperlinkinternetpage.ui msgctxt "" @@ -6748,13 +6754,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Maqaa" #: hyperlinkmailpage.ui msgctxt "" @@ -6901,13 +6908,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Maqaa" #: hyperlinknewdocpage.ui msgctxt "" @@ -7731,13 +7739,14 @@ msgstr "Mursaa" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Haalata" #: linetabpage.ui msgctxt "" @@ -7795,13 +7804,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Dalgee" #: linetabpage.ui msgctxt "" @@ -7813,13 +7823,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Dalgee" #: linetabpage.ui msgctxt "" @@ -7885,13 +7896,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Dalgee" #: linetabpage.ui msgctxt "" @@ -10604,13 +10616,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Hammamtaa" #: optfontspage.ui #, fuzzy @@ -13240,13 +13253,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Hojjaa" #: pageformatpage.ui msgctxt "" @@ -13639,13 +13653,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Hojjaa" #: paragalignpage.ui msgctxt "" @@ -14671,22 +14686,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Qubannoo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Qubannoo" #: possizetabpage.ui msgctxt "" @@ -14708,13 +14725,14 @@ msgstr "Qubannoo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Dalgee" #: possizetabpage.ui #, fuzzy @@ -15161,22 +15179,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Qubannoo" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Qubannoo" #: rotationtabpage.ui msgctxt "" @@ -17644,57 +17664,3 @@ "string.text" msgid "View Layout" msgstr "Teessuma Mul'isi" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/om/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/om/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/om/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 19:46+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11029,12 +11029,13 @@ msgstr "Mul'annoo Saxatooo" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Maappii calqqee akka hotspotsii cuqaasu fi gulaaluu dhandesuutti agarsiisa." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/om/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/om/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/om/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 21:10+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -41,12 +41,13 @@ msgstr "Durargii fuula maxxansamee agarsiisa, yk durargii cufa." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Galmee keessa maruuf yk galmee maxxansuuf, sajoo Kabala Durargii Fuulaa irraa, fayyadami." #: 01120000.xhp msgctxt "" @@ -66,12 +67,13 @@ msgstr "Durargii Fuulaa keessaa Ossoo jirtuu galmee kee gulaaluu hindandeesu." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Durargii Fuulaa keessaa bahuuf, qabduu Durargii Cufi jedhu cuqaasi." #: 01120000.xhp msgctxt "" @@ -108,13 +110,14 @@ msgstr "Qaaqa Makiinsa Ergannoo xalyaawwan irraa maxxansuu fi olka'uuf sigargaaru bana." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Yamuu maxxansuu, odeeffannoon kuusadeetaa, dirreewwan kuusadeetaa walsimaaniin bakka buusa (iddooqoota). Dirreewwan kuusadeetaa saaguuf odeeffannoo itti dabaalataaf, caancala Kuusa Deetaa jala fuulaa, Saagi - Dirree - Kabirroo wabeefadhu." #: 01150000.xhp msgctxt "" @@ -842,13 +845,14 @@ msgstr "Kan Darbe" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Gara maalimaa galmee keessa duraanitti utaala. Akaakuu maalimaa itti utaaluuf barbaadduu Ifteessuuf, sajoo Naanna'insa cuqaasitii, Akaakuu maalimaa - fakkeenyaaf, \"Saxaatoo\" irra cuqaasi. Gara maalimaa duraanii galmee keessaatti utaala. Sajoo Naanna'insa cuqaasitii Akaakuu maalimaa - fakkeenyaaf, \"Saxaatoo\" irra cuqaasi." #: 02110000.xhp msgctxt "" @@ -877,13 +881,14 @@ msgstr "Itti aanee" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Gara maalimaa galmee keessa itti aanuutti utaala. Akaakuu maalimaa itti utaaluuf barbaadduu Ifteessuuf, sajoo Naanna'insa cuqaasitii Akaakuu maalimaa - fakkeenyaaf, \"Saxaatoo\" irra cuqaasi. Gara maalimaa itti aanuu galmee keessaatti utaala. Naanna'insa cuqaasitii Akaakuu maalimaa - fakkeenyaaf, \"Saxaatoo\" irra cuqaasi." #: 02110000.xhp msgctxt "" @@ -2916,12 +2921,13 @@ msgstr "Gara dirree duraanii galmee keessaa Akaakuun walfakkataanitti utaala. Qabduun kun kan ka'uu danda'uu, yammuu galmeen dirree akkaakuu tokko ol ofkeessaa qabatee dha." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02140000.xhp msgctxt "" @@ -2951,12 +2957,13 @@ msgstr "Gara dirree itti aanuu galmee keessaa Akaakuun walfakkataanitti utaala. qabduun kun kan ka'uu yoo galmeen dirree Akaakuun wal fakakataan tokkoo ol of keessa qabaate qofa." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02140000.xhp msgctxt "" @@ -3138,12 +3145,13 @@ msgstr "Galmicha keessaa gara korkoddii miiljalee yk ibsadabalataa duraaniiti siqsa." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02150000.xhp msgctxt "" @@ -3173,12 +3181,13 @@ msgstr "Galmicha keessaa gara korkoddii miiljalee yk ibsadabalataa itti aanantii siqsa." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02150000.xhp msgctxt "" @@ -3378,12 +3387,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02160000.xhp msgctxt "" @@ -3413,12 +3423,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02160000.xhp msgctxt "" @@ -3483,12 +3494,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Sajoo" #: 02160000.xhp msgctxt "" @@ -3684,13 +3696,14 @@ msgstr "Gaaddiddeessaa Dirree" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Galmee kee keessaa gaaddiddeessaa dirree akkasuumaas, iddoo duwwaalaa, murfiilee mammiloo, Kasaaleef miiljaleewwan agarsiisa yk dhoksa." #: 03080000.xhp msgctxt "" @@ -4170,13 +4183,14 @@ msgstr "sections;inserting sections by DDEDDE; command for inserting sections" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Kutaa" #: 04020100.xhp msgctxt "" @@ -4197,13 +4211,14 @@ msgstr "Kutaa Haaraa" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Kutaa haaraa kanaaf maqaa tokko barreessi. Durtiin, $[officename] ufmaan maqaa \"Kutaa X\" jedhu kutaalee haaraatti ramada, (yammuu Xn lakkoofsa tartiibaan walitti aanan jechuu ta'u)." #: 04020100.xhp msgctxt "" @@ -4224,13 +4239,14 @@ msgstr "Geessituu" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Qabeentoota galmee yk kutaa galmee biroo keessaa gara kutaa irra jiruu keessaatti saaga." #: 04020100.xhp msgctxt "" @@ -4242,13 +4258,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Geessituu DDE tokko uuma. Saanduqa filaannoo kana erga filattee booda, DDE ajaja fayyadamuu barbaaddu saagi. filaannoon DDE kun kan jiraatus yoo saanduqii filaannoo Geessituu jedhu filatame qofa ta'a." #: 04020100.xhp msgctxt "" @@ -4269,22 +4286,24 @@ msgstr "Fakkeenyaaf, filaannoo \"kutaa1\" moggaafame tokko barruu galmee abc.sxw $[officename] irraa, geessituu DDEtti saaguuf, ajaja: \"soffice x:\\abc.sxw Section1\" jedhu fayyadami. Faayila wardii MS Ekseelii \"abc.xls\" jedhamu tokko keessaa qabiiyyee man'ee isa jalqabaa saaguuf, ajaja: \"excel x:\\[abc.xls]Sheet1 z1s1\" jedhu faayadami. Akkasumaas, miiltoowwan saaguu barbaaddu, akka geessituu DDEtti gargalchuun booda, Gulaalii - Maxxansa Addaarawwaachuu nidandeessa. Kana booda, qabiiyyee keessaa Gulaalii - Dirreewwan filatte ajaja DDE san dawwaachuu nidandeessa." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Maqaa faayilii / Ajaja DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Faayilii wara saagu barbaadduuf, maqaa faayiliif xuree saagi ykn bakka qubsuma faayilii agarsiisuuf ... qabduu sakattaa,ii cuqaasi. Yoo sanduuqii filannoo DDE filataame, ajaja DDE isa fayyadamuu barbaaddu saagi. " #: 04020100.xhp msgctxt "" @@ -4413,13 +4432,14 @@ msgstr "Dhoksi" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Kutichii filatame akka hinmaxxanfamne dhoksuu akkasumaas ugguruuf fayyada.dameewwaan kutaa dhokataa tokkoo Naanna'aa keessatti bifa daalachaan mul'ata. Akeektuu hantuutee damee dhokataa Naanna'aa keessaa irra yeroo keessu, qaccee Gargaarsaa \"dhokataa\" jedhutu mul'ata." #: 04020100.xhp msgctxt "" @@ -4440,13 +4460,14 @@ msgstr "Haalaan" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Haala kutaa dhoksu sidanda'eesisu saagi. haalii kun himannoo yaayaatti kuniisi; \"SALUTATION EQ Mr.\". faakeenyaaf; yoo makiinsa ergannoo amala xalayaa unkaa dirree kuusaa deetaa akka kanatti wamamuu \"Yooyoo\" \"Obboo\", \"Aaddee\" ykn \"Gooftaa ykn Giiftii\" hikuuf fayyadamtee; kana booda egaa kutaan tokko yoo Yooyoon isaa \"Obboo\" tahe qofa akka maxxanfamu ifteessuu nidandeessa." #: 04020100.xhp msgctxt "" @@ -10180,13 +10201,14 @@ msgstr "Barruu otoola lakkoofsa fuulaawwanii tokko irratti hundaa'uun agarsiisuuf:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Saagi - Dirreewwan - Kabirroo filadhuutii, kana booda, caancala Dalagalee cuqaasi." #: 04090200.xhp msgctxt "" @@ -10243,13 +10265,14 @@ msgstr "Jijjiirama hiika fayyadamaa irratti hundaa'uun barruu otoolaa agarsiissuu" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Saagi - Dirreewwan - Kabirroo filadhuutii, kana booda, caancala Jijjiiramoota cuqaasi." #: 04090200.xhp msgctxt "" @@ -10360,13 +10383,14 @@ msgstr "Fakkeenyi kutaa jalqabaa iddoo dirreewwan galmee keessaa \"Maqaa Jalqabaa\" fi \"Maqaa Abbaa\" gidduu jiru yammuu saagu, fakkeenyi kutaa lamattaa immoo, barruu qabeentoota dirree tokko irratti hundaa'anii saaga. fakkeenyi hini kun maddii deetaa teessoo $[officename] waliin galma'ee barbaada." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Saagi - Dirreewwan - Kabirroo filadhuutii, kana booda, caancala Kuusdeetaa cuqaasi." #: 04090200.xhp msgctxt "" @@ -13933,13 +13957,14 @@ msgstr "Maqaa" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "Gabatichaaf maqaa tokko galchi." #: 04150000.xhp msgctxt "" @@ -14023,13 +14048,14 @@ msgstr "Mataduree" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "Gabatichaaf maqaa tokko galchi." #: 04150000.xhp msgctxt "" @@ -16146,15 +16172,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Caancalii kun, mul'annoo Teessuma Maxxansaa keessa hinjiru." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16609,22 +16626,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Hamamtaa, qubannoo, fi amaloowwan ka biroo kan saxaatoo filatamee, dhangeessa." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Amaloowwan saxaatoo filatamee, qabduuwwan qaxxaamura tiin hama tahe jijjiiru nidandeessa." #: 05060000.xhp #, fuzzy @@ -17054,13 +17073,14 @@ msgstr "Ijaarsa dirqala hiriira surdala, fuulawwan guutuu irraa, waljijijiira." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Akkasuumas, fuuloota lak. guutuu fi lak. mangoo irratti teessuma wantoota qindeessuudhaaf, dirqaawwan meelchi Saxaatoo fayyadamuu nidandeessa." #: 05060100.xhp msgctxt "" @@ -18172,13 +18192,14 @@ msgstr "Marsi" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Saxaatoo filatamaadhaaf, dirqalawwan meelchi fi geessituu ifteessi." #: 05060300.xhp msgctxt "" @@ -18199,13 +18220,14 @@ msgstr "Sarjinaan" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Sarjinaan saxaatoo filatamaa meelcha." #: 05060300.xhp msgctxt "" @@ -18217,13 +18239,14 @@ msgstr "Sardalaan" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Sardalaan saxaatoo filatamaa meelcha." #: 05060300.xhp msgctxt "" @@ -18235,13 +18258,14 @@ msgstr "Fuulawwan mara irratti" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Fuulawwan mara irratti, surdalaan saxaatoo filatame meelcha." #: 05060300.xhp msgctxt "" @@ -18253,13 +18277,14 @@ msgstr "Fuulawwan bitaa irraa" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Fuulawwan guutuu irratti qofa, surdalaan saxaatoo filatame meelcha." #: 05060300.xhp msgctxt "" @@ -18271,13 +18296,14 @@ msgstr "Fuulawwan mirgaa irraa" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Fuulawwan mangoo irratti qofa, surdalaan saxaatoo filatame meelcha." #: 05060300.xhp msgctxt "" @@ -20994,13 +21020,14 @@ msgstr "Bal'ina" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "Yabbina isa wanta filatameef barbaaddu galchi." #: 05120200.xhp msgctxt "" @@ -22977,13 +23004,14 @@ msgstr "Qaaqa, iddoo ati jijjiirama OfiinSirreessaa fudhattu ykn gattu bana. Jijjiiramoota barreessaa gooree tokkoon yk guyyaa gooree tokko irratti tahe, akkasuuma mul'isuu nidandeessa." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Jijjiirama Fudhu ykn Gati, caancala Gingilchaa" #: 05170000.xhp msgctxt "" @@ -25871,13 +25899,14 @@ msgstr "Addaan Fageegna" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "Tarjaawwan gidduuti, iddoo hamma dhiisuu barbaadduu galchi." #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/om/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/om/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/om/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:24+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/om/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/om/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/om/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/om/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/om/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/om/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 07:18+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:37+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: om\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431501507.000000\n" +"X-POOTLE-MTIME: 1439591841.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/om/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/om/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/om/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-02-17 21:18+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:46+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: om\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1361135926.000000\n" +"X-POOTLE-MTIME: 1439592416.000000\n" #: stbctrls.src msgctxt "" @@ -161,14 +161,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/om/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/om/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/om/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/om/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/or/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/or/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/or/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-13 07:37+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 21:30+0000\n" "Last-Translator: system user <>\n" "Language-Team: Oriya \n" "Language: or\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431502648.000000\n" +"X-POOTLE-MTIME: 1439587832.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "ସ୍ୱତ୍ୱାଧିକାର © 2000 - 2014 LibreOffice ଅବଦାନକାରୀମାନେ।" #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/or/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/or/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/or/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/or/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/or/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/or/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:34+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1567,6 +1567,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "ଇଚ୍ଛାରୂପଣ" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -2019,22 +2029,24 @@ msgstr "" #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_markup\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "ମୂଳଦଲିଲ୍ ର URL କୁ ସ୍ଥାନୀୟ ଫାଇଲତନ୍ତ୍ର କିମ୍ବା ଇଣ୍ଟରନେଟରେ ଭରଣ କରନ୍ତୁ।" #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_text\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "ମୂଳଦଲିଲ୍ ର URL କୁ ସ୍ଥାନୀୟ ଫାଇଲତନ୍ତ୍ର କିମ୍ବା ଇଣ୍ଟରନେଟରେ ଭରଣ କରନ୍ତୁ।" #: datastreams.ui msgctxt "" @@ -3427,13 +3439,14 @@ msgstr "" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "days\n" "label\n" "string.text" msgid "Number of _days:" -msgstr "" +msgstr "ପୃଷ୍ଠା ସଂଖ୍ଯା (_u):" #: groupbydate.ui msgctxt "" @@ -3923,13 +3936,14 @@ msgstr "ଅକ୍ଷର ସମୁହ" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "ଟେଷ୍ଟ ସୀମାନିର୍ଦ୍ଦେଶକ" #: imoptdialog.ui #, fuzzy @@ -5575,13 +5589,14 @@ msgstr "ସମସ୍ତଙ୍କୁ ଲଗାନ୍ତୁ (_P)" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "ଟେକ୍ସଟ" #: pastespecial.ui msgctxt "" @@ -5647,13 +5662,14 @@ msgstr "ମନୋନଯନ" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "ଟିପ୍ପଣୀ" #: pastespecial.ui msgctxt "" @@ -5792,13 +5808,14 @@ msgstr "ବିକଳ୍ପଗୁଡିକ (_p)..." #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "ଟିପ୍ପଣୀ" #: pivotfielddialog.ui #, fuzzy @@ -6664,22 +6681,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "ପ୍ରବେଶ ସଂକେତ (_P)" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "ନିଶ୍ଚିତ କର" #: retypepassworddialog.ui msgctxt "" @@ -9498,22 +9517,24 @@ msgstr "ପୃଷ୍ଠା ସଂଖ୍ଯା (_u):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label5\n" "label\n" "string.text" msgid "Number of Cells:" -msgstr "" +msgstr "ପୃଷ୍ଠା ସଂଖ୍ଯା (_u):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label2\n" "label\n" "string.text" msgid "Number of Sheets:" -msgstr "" +msgstr "ପୃଷ୍ଠା ସଂଖ୍ଯା (_u):" #: statisticsinfopage.ui msgctxt "" @@ -10462,22 +10483,24 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "minft\n" "label\n" "string.text" msgid "_Minimum:" -msgstr "" +msgstr "ସର୍ବନିମ୍ନ (_u)" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "ସର୍ବାଧିକ" #: validationcriteriapage.ui msgctxt "" @@ -10858,93 +10881,3 @@ "string.text" msgid "Grouped by" msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/or/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/or/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/or/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 07:51+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:47+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: or\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431503496.000000\n" +"X-POOTLE-MTIME: 1439592471.000000\n" #: alienwarndialog.ui msgctxt "" @@ -760,7 +760,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2025,11 +2025,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "ପୁନଃସ୍ଥାପନ କରନ୍ତୁ" diff -Nru libreoffice-5.0.2/translations/source/or/starmath/source.po libreoffice-5.0.5~rc2/translations/source/or/starmath/source.po --- libreoffice-5.0.2/translations/source/or/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/or/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/or/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/or/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-01-21 05:45+0000\n" -"Last-Translator: surath \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:58+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Oriya \n" "Language: or\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421819152.000000\n" +"X-POOTLE-MTIME: 1439593115.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/or/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/or/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/or/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/or/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pa-IN/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pa-IN/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:05+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -5296,13 +5296,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "ftForm\n" "label\n" "string.text" msgid "Form:" -msgstr "" +msgstr "F_or" #: fmsearchdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/pa-IN/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/pa-IN/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/pa-IN/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/pa-IN/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:50+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1247,13 +1247,14 @@ msgstr "" #: databaroptions.ui +#, fuzzy msgctxt "" "databaroptions.ui\n" "label4\n" "label\n" "string.text" msgid "Minimum:" -msgstr "" +msgstr "ਵੱਧੋ-ਵੱਧ(_m)" #: databaroptions.ui #, fuzzy @@ -1558,6 +1559,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "ਕਸਟਮ" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3916,13 +3927,14 @@ msgstr "ਅੱਖਰ ਸੈੱਟ(_a)" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "ਪਾਠ ਸੀਮਾਬੰਧਕ(_x)" #: imoptdialog.ui #, fuzzy @@ -4108,13 +4120,14 @@ msgstr "" #: insertsheet.ui +#, fuzzy msgctxt "" "insertsheet.ui\n" "nameft\n" "label\n" "string.text" msgid "Na_me:" -msgstr "" +msgstr "ਨਾਂ" #: insertsheet.ui msgctxt "" @@ -5567,13 +5580,14 @@ msgstr "" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "ਟੈਕਸਟ(_T)" #: pastespecial.ui msgctxt "" @@ -5639,13 +5653,14 @@ msgstr "ਚੁਣੇ" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "ਨੋਟ" #: pastespecial.ui msgctxt "" @@ -5784,13 +5799,14 @@ msgstr "ਚੋਣ(_p)..." #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "ਨੋਟ" #: pivotfielddialog.ui #, fuzzy @@ -6654,22 +6670,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "ਪਾਸਵਰਡ(_P)" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "ਪੁਸ਼ਟੀ(_C)" #: retypepassworddialog.ui msgctxt "" @@ -10455,13 +10473,14 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "ਵੱਧੋ-ਵੱਧ(_m)" #: validationcriteriapage.ui msgctxt "" @@ -10842,93 +10861,3 @@ "string.text" msgid "Grouped by" msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pa-IN/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pa-IN/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 08:24+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:03+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: pa_IN\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431505455.000000\n" +"X-POOTLE-MTIME: 1439593430.000000\n" #: alienwarndialog.ui msgctxt "" @@ -754,7 +754,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/starmath/source.po libreoffice-5.0.5~rc2/translations/source/pa-IN/starmath/source.po --- libreoffice-5.0.2/translations/source/pa-IN/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/pa-IN/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/pa-IN/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/pa-IN/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pa-IN/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-11-19 20:01+0000\n" -"Last-Translator: A S Alam \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:12+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: pa_IN\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1416427296.000000\n" +"X-POOTLE-MTIME: 1439593964.000000\n" #: stbctrls.src msgctxt "" @@ -157,14 +157,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/pl/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pl/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pl/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-09-02 02:21+0000\n" "Last-Translator: Konrad Kmieciak \n" "Language-Team: none\n" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME to nowoczesny i łatwy w użyciu zestaw programów biurowych, do których należą m.in. edytor tekstów, arkusz kalkulacyjny, program do prezentacji i więcej." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015. Prawa autorskie należą do autorów LibreOffice." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/pl/editeng/source/editeng.po libreoffice-5.0.5~rc2/translations/source/pl/editeng/source/editeng.po --- libreoffice-5.0.2/translations/source/pl/editeng/source/editeng.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/editeng/source/editeng.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:06+0200\n" -"PO-Revision-Date: 2014-10-04 09:21+0000\n" -"Last-Translator: Konrad \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-11-14 11:42+0000\n" +"Last-Translator: Konrad Kmieciak \n" "Language-Team: LANGUAGE \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1412414471.000000\n" +"X-POOTLE-MTIME: 1447501352.000000\n" #: editeng.src msgctxt "" @@ -62,7 +62,7 @@ "RID_EDITUNDO_RESETATTRIBS\n" "string.text" msgid "Reset attributes" -msgstr "Zastąp atrybuty" +msgstr "Resetuj atrybuty" #: editeng.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pl/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/pl/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/pl/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/pl/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/pl/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/pl/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-31 14:07+0000\n" "Last-Translator: Konrad Kmieciak \n" "Language-Team: LANGUAGE \n" @@ -11014,12 +11014,13 @@ msgstr "Widok obrazu" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Wyświetla mapę obrazkową, umożliwiając kliknięcie i edycję punktów aktywnych." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/pl/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/pl/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/pl/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 21:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -4169,12 +4169,13 @@ msgstr "sekcje;wstawianie sekcji przez DDEDDE; polecenie wstawiania sekcji" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" +msgid "Section" msgstr "Sekcja" #: 04020100.xhp @@ -16142,15 +16143,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Karta ta nie jest dostępna w widoku Układ wydruku." - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-02 21:50+0000\n" +"PO-Revision-Date: 2015-11-14 22:41+0000\n" "Last-Translator: Konrad Kmieciak \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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441230640.000000\n" +"X-POOTLE-MTIME: 1447540865.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -11282,7 +11282,7 @@ "Label\n" "value.text" msgid "Checkerboard Across" -msgstr "Szachownica poziomo" +msgstr "Szachownica w poprzek" #: Effects.xcu msgctxt "" @@ -11291,7 +11291,7 @@ "Label\n" "value.text" msgid "Checkerboard Down" -msgstr "Szachownica pionowo" +msgstr "Szachownica w dół" #: Effects.xcu msgctxt "" @@ -11831,7 +11831,7 @@ "Label\n" "value.text" msgid "Iris" -msgstr "Soczewka" +msgstr "Przysłona" #: Effects.xcu msgctxt "" @@ -13424,7 +13424,7 @@ "Label\n" "value.text" msgid "Plain Text" -msgstr "Prosto" +msgstr "Zwykły tekst" #: GenericCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pl/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/pl/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/pl/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-09-04 17:20+0000\n" "Last-Translator: Konrad Kmieciak \n" "Language-Team: none\n" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Wartość minimalna musi być mniejsza od wartości maksymalnej." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Niestandardowe" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/pl/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pl/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pl/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-01 06:12+0000\n" -"Last-Translator: Mateusz Zasuwik \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:12+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: pl\n" "MIME-Version: 1.0\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438409556.000000\n" +"X-POOTLE-MTIME: 1439593966.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "_Pokaż licencję" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/pl/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/pl/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/pl/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-05 17:46+0000\n" -"Last-Translator: Mateusz Zasuwik \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:25+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: pl\n" "MIME-Version: 1.0\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438796812.000000\n" +"X-POOTLE-MTIME: 1439594705.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Dostosowuje powiększenie dokumentu" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/pl/svx/source/svdraw.po libreoffice-5.0.5~rc2/translations/source/pl/svx/source/svdraw.po --- libreoffice-5.0.2/translations/source/pl/svx/source/svdraw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pl/svx/source/svdraw.po 2016-02-04 16:41:28.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: 2015-07-25 17:08+0000\n" +"PO-Revision-Date: 2015-10-08 15:06+0000\n" "Last-Translator: Konrad Kmieciak \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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437844113.000000\n" +"X-POOTLE-MTIME: 1444316780.000000\n" #: svdstr.src msgctxt "" @@ -3894,7 +3894,7 @@ "SIP_SA_EDGENODE2VERTDIST\n" "string.text" msgid "Vert. spacing object 2" -msgstr "Odstęp poziomy do obiektu 2" +msgstr "Pionowy odstęp do obiektu 2" #: svdstr.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/chart2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt/chart2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt/chart2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/chart2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:22+0100\n" -"PO-Revision-Date: 2014-11-19 18:06+0000\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-11 23:37+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1416420367.000000\n" +"X-POOTLE-MTIME: 1447285023.000000\n" #: 3dviewdialog.ui msgctxt "" @@ -1625,7 +1625,7 @@ "label\n" "string.text" msgid "Minor:" -msgstr "Secundário:" +msgstr "Secundária:" #: tp_AxisPositions.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-27 21:51+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-10 18:49+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: none\n" "Language: pt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440712278.000000\n" +"X-POOTLE-MTIME: 1452451789.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 Colaboradores do LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 - 2016 Colaboradores do LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/extensions/source/dbpilots.po libreoffice-5.0.5~rc2/translations/source/pt/extensions/source/dbpilots.po --- libreoffice-5.0.2/translations/source/pt/extensions/source/dbpilots.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/extensions/source/dbpilots.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-06 21:30+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-12 00:01+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438896619.000000\n" +"X-POOTLE-MTIME: 1447286517.000000\n" #: commonpagesdbp.src msgctxt "" @@ -126,7 +126,7 @@ "RID_STR_FIELDINFO_LISTBOX\n" "string.text" msgid "The contents of the selected field will be shown in the list box if the linked fields are identical." -msgstr "O conteúdo do campo selecionado será mostrado na caixa de lista se os campos vinculados forem idênticos." +msgstr "O conteúdo do campo selecionado será mostrado na caixa de lista se os campos ligados forem idênticos." #: listcombopages.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/extensions/uiconfig/sabpilot/ui.po libreoffice-5.0.5~rc2/translations/source/pt/extensions/uiconfig/sabpilot/ui.po --- libreoffice-5.0.2/translations/source/pt/extensions/uiconfig/sabpilot/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/extensions/uiconfig/sabpilot/ui.po 2016-02-04 16:41:28.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-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-26 10:18+0000\n" +"PO-Revision-Date: 2015-11-12 00:02+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435313909.000000\n" +"X-POOTLE-MTIME: 1447286539.000000\n" #: contentfieldpage.ui msgctxt "" @@ -686,7 +686,7 @@ "\n" "Please note that the settings made on this page will take effect immediately upon leaving the page." msgstr "" -"Atualmente, o formulário a que o controlo pertence não está (pelo menos, não totalmente) vinculado a uma origem de dados.\n" +"Atualmente, o formulário a que o controlo pertence não está (pelo menos, não totalmente) ligado a uma origem de dados.\n" "\n" "Escolha uma origem de dados e uma tabela.\n" "\n" diff -Nru libreoffice-5.0.2/translations/source/pt/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/pt/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/pt/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/formula/source/core/resource.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-09-08 13:02+0000\n" +"PO-Revision-Date: 2015-12-28 13:45+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441717370.000000\n" +"X-POOTLE-MTIME: 1451310330.000000\n" #: core_resource.src msgctxt "" @@ -2642,7 +2642,7 @@ "SC_OPCODE_PERCENT_RANK_INC\n" "string.text" msgid "PERCENTRANK.INC" -msgstr "ORDEMPERCENTUAL.INC" +msgstr "ORDEM.PERCENTUAL.INC" #: core_resource.src msgctxt "" @@ -2678,7 +2678,7 @@ "SC_OPCODE_PERCENT_RANK_EXC\n" "string.text" msgid "PERCENTRANK.EXC" -msgstr "ORDEMPERCENTUAL.EXC" +msgstr "ORDEM.PERCENTUAL.EXC" #: core_resource.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/sbasic/shared.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/sbasic/shared.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/sbasic/shared.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/sbasic/shared.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-26 18:51+0000\n" +"PO-Revision-Date: 2015-11-12 00:04+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440615062.000000\n" +"X-POOTLE-MTIME: 1447286692.000000\n" #: 00000002.xhp msgctxt "" @@ -36900,7 +36900,7 @@ "bm_id3153894\n" "help.text" msgid "events;linked to objects" -msgstr "eventos;vinculados a objetos" +msgstr "eventos;ligados a objetos" #: 05060700.xhp msgctxt "" @@ -36945,7 +36945,7 @@ "23\n" "help.text" msgid "The following table describes the macros and the events that can by linked to objects in your document:" -msgstr "A seguinte tabela descreve as macros e os eventos que podem ser vinculados a objetos no seu documento:" +msgstr "A seguinte tabela descreve as macros e os eventos que podem ser ligados a objetos no seu documento:" #: 05060700.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/scalc/01.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/scalc/01.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/scalc/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/scalc/01.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-09-08 13:02+0000\n" +"PO-Revision-Date: 2015-12-28 13:47+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441717366.000000\n" +"X-POOTLE-MTIME: 1451310430.000000\n" #: 01120000.xhp msgctxt "" @@ -47908,7 +47908,7 @@ "bm_id2848807\n" "help.text" msgid "PERCENTRANK.EXC function" -msgstr "ORDEMPERCENTUAL.EXC (função)" +msgstr "ORDEM.PERCENTUAL.EXC (função)" #: 04060184.xhp msgctxt "" @@ -47917,7 +47917,7 @@ "121\n" "help.text" msgid "PERCENTRANK.EXC" -msgstr "ORDEMPERCENTUAL.EXC" +msgstr "ORDEM.PERCENTUAL.EXC" #: 04060184.xhp msgctxt "" @@ -47934,7 +47934,7 @@ "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 "A diferença entre ORDEMPERCENTUAL.EXC e ORDEMPERCENTUAL.INC é que, no caso da função ORDEMPERCENTUAL.INC, o valor k está entre 0 e 1 inclusivo e, no caso de ORDEMPERCENTUAL.EXC, o valor k está entre 0 e 1 exclusivo." +msgstr "A diferença entre ORDEM.PERCENTUAL.EXC e ORDEM.PERCENTUAL.INC é que, no caso da função ORDEM.PERCENTUAL.INC, o valor k está entre 0 e 1 inclusivo e, no caso de ORDEM.PERCENTUAL.EXC, o valor k está entre 0 e 1 exclusivo." #: 04060184.xhp msgctxt "" @@ -47952,7 +47952,7 @@ "124\n" "help.text" msgid "PERCENTRANK.EXC(Data; Value; Significance)" -msgstr "ORDEMPERCENTUAL.EXC(matriz_dados; valor; significância)" +msgstr "ORDEM.PERCENTUAL.EXC(matriz_dados; valor; significância)" #: 04060184.xhp msgctxt "" @@ -48005,7 +48005,7 @@ "bm_id2948807\n" "help.text" msgid "PERCENTRANK.INC function" -msgstr "ORDEMPERCENTUAL.INC (função)" +msgstr "ORDEM.PERCENTUAL.INC (função)" #: 04060184.xhp msgctxt "" @@ -48014,7 +48014,7 @@ "121\n" "help.text" msgid "PERCENTRANK.INC" -msgstr "ORDEMPERCENTUAL.INC" +msgstr "ORDEM.PERCENTUAL.INC" #: 04060184.xhp msgctxt "" @@ -48031,7 +48031,7 @@ "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 "A diferença entre ORDEMPERCENTUAL.EXC e ORDEMPERCENTUAL.INC é que, no caso da função ORDEMPERCENTUAL.INC, o valor k está entre 0 e 1 inclusivo e, no caso de ORDEMPERCENTUAL.EXC, o valor k está entre 0 e 1 exclusivo." +msgstr "A diferença entre ORDEM.PERCENTUAL.EXC e ORDEM.PERCENTUAL.INC é que, no caso da função ORDEM.PERCENTUAL.INC, o valor k está entre 0 e 1 inclusivo e, no caso de ORDEM.PERCENTUAL.EXC, o valor k está entre 0 e 1 exclusivo." #: 04060184.xhp msgctxt "" @@ -48049,7 +48049,7 @@ "124\n" "help.text" msgid "PERCENTRANK.INC(Data; Value; Significance)" -msgstr "ORDEMPERCENTUAL.INC(matriz_dados; valor; significância)" +msgstr "ORDEM.PERCENTUAL.INC(matriz_dados; valor; significância)" #: 04060184.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/scalc/guide.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/scalc/guide.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/scalc/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/scalc/guide.po 2016-02-04 16:41:28.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:39+0200\n" -"PO-Revision-Date: 2015-09-01 22:05+0000\n" +"PO-Revision-Date: 2015-11-11 23:34+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441145108.000000\n" +"X-POOTLE-MTIME: 1447284840.000000\n" #: address_auto.xhp msgctxt "" @@ -11103,7 +11103,7 @@ "4\n" "help.text" msgid "To hide grid lines:" -msgstr "Para ocultar as linhas de grelha:" +msgstr "Para ocultar as linhas da grelha:" #: table_view.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/schart/00.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/schart/00.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/schart/00.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/schart/00.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:14+0200\n" -"PO-Revision-Date: 2014-05-26 14:02+0000\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-11 23:38+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1401112970.000000\n" +"X-POOTLE-MTIME: 1447285122.000000\n" #: 00000004.xhp msgctxt "" @@ -350,7 +350,7 @@ "35\n" "help.text" msgid "Choose Format - Grid - X, Y, Z Axis Major Grid/ X, Y, Z Minor Grid/ All Axis Grids (Charts)" -msgstr "Escolha Formatar - Grelha - Grelha principal do eixo X, Y, Z/ Grelha auxiliar do eixo X, Y, Z/ Grelhas de todos os eixos (Gráficos) " +msgstr "Escolha Formatar - Grelha - Grelha principal do eixo X, Y, Z/ Grelha secundária do eixo X, Y, Z/ Grelhas de todos os eixos (Gráficos) " #: 00000004.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/schart/01.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/schart/01.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/schart/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/schart/01.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-07-30 20:57+0000\n" +"PO-Revision-Date: 2015-11-11 23: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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438289848.000000\n" +"X-POOTLE-MTIME: 1447285289.000000\n" #: 03010000.xhp msgctxt "" @@ -2180,7 +2180,7 @@ "7\n" "help.text" msgid "The Horizontal Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the X axis. Note: This only works if the Minor grid check boxes in Insert - Grids are cleared. Otherwise, the minor grid remains visible when the major grid is turned off." -msgstr "O ícone Ativar/desativar grelha horizontal, na barra Formatação, alterna a visibilidade da grelha do eixo X. Nota: só funciona se as caixas de verificação da Grelha secundária em Inserir - Grelhas forem desmarcadas. Caso contrário, a grelha auxiliar permanece visível, mesmo se a grelha principal for desativada." +msgstr "O ícone Ativar/desativar grelha horizontal, na barra Formatação, alterna a visibilidade da grelha do eixo X. Nota: só funciona se as caixas de verificação da Grelha secundária em Inserir - Grelhas forem desmarcadas. Caso contrário, a grelha secundária permanece visível, mesmo se a grelha principal for desativada." #: 04070000.xhp msgctxt "" @@ -2207,7 +2207,7 @@ "10\n" "help.text" msgid "The Vertical Grid On/Off icon on the Formatting bar toggles the visibility of the grid display for the Y axis. Note: This only works if the X-axis Minor grid is not selected in Insert - Grids. Otherwise, the minor grid remains visible when the major grid is turned off." -msgstr "O ícone Ativar/desativar grelha vertical, na barra Formatação alterna a visibilidade da grelha para o eixo Y. Nota: só funciona se a Grelha secundária do eixo X não for selecionada em Inserir - Grelhas. Caso contrário, a grelha auxiliar permanece visível quando a grelha principal for desativada." +msgstr "O ícone Ativar/desativar grelha vertical, na barra Formatação alterna a visibilidade da grelha para o eixo Y. Nota: só funciona se a Grelha secundária do eixo X não for selecionada em Inserir - Grelhas. Caso contrário, a grelha secundária permanece visível quando a grelha principal for desativada." #: 04070000.xhp msgctxt "" @@ -2243,7 +2243,7 @@ "14\n" "help.text" msgid "Use this area to assign a minor grid for each axis. Assigning minor grids to the axis reduces the distance between the major grids." -msgstr "Utilize esta área para atribuir uma grelha auxiliar para cada eixo. A atribuição de grelhas auxiliares aos eixos reduz a distância entre as grelhas principais." +msgstr "Utilize esta área para atribuir uma grelha secundária para cada eixo. A atribuição de grelhas secundárias aos eixos reduz a distância entre as grelhas principais." #: 04070000.xhp msgctxt "" @@ -3724,7 +3724,7 @@ "68\n" "help.text" msgid "Minor:" -msgstr "Auxiliar:" +msgstr "Secundária:" #: 05040202.xhp msgctxt "" @@ -3751,7 +3751,7 @@ "75\n" "help.text" msgid "Specifies that minor interval marks are placed on the inner side of the axis." -msgstr "Especifica que são colocadas marcas de intervalo auxiliares na parte interior do eixo." +msgstr "Especifica que são colocadas marcas de intervalo secundárias na parte interior do eixo." #: 05040202.xhp msgctxt "" @@ -3769,7 +3769,7 @@ "76\n" "help.text" msgid "Specifies that minor interval marks are placed on the outer side of the axis." -msgstr "Especifica que são colocadas marcas de intervalo auxiliares na parte exterior do eixo." +msgstr "Especifica que são colocadas marcas de intervalo secundárias na parte exterior do eixo." #: 05040202.xhp msgctxt "" @@ -3855,7 +3855,7 @@ "6\n" "help.text" msgid "X Axis Minor Grid" -msgstr "Grelha auxiliar do eixo X" +msgstr "Grelha secundária do eixo X" #: 05050000.xhp msgctxt "" @@ -3864,7 +3864,7 @@ "7\n" "help.text" msgid "Y Axis Minor Grid" -msgstr "Grelha auxiliar do eixo Y" +msgstr "Grelha secundária do eixo Y" #: 05050000.xhp msgctxt "" @@ -3873,7 +3873,7 @@ "8\n" "help.text" msgid "Z Axis minor Grid" -msgstr "Grelha auxiliar do eixo Z" +msgstr "Grelha secundária do eixo Z" #: 05050000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-13 20:16+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-18 22:21+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439496966.000000\n" +"X-POOTLE-MTIME: 1453155711.000000\n" #: 01010000.xhp msgctxt "" @@ -11019,8 +11019,8 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." -msgstr "Mostra o mapa de imagens, para que seja possível clicar e editar os pontos de acesso." +msgid "Displays the image map, so that you can click and edit the hotspots." +msgstr "Mostra o mapa de imagem, para que seja possível clicar e editar os pontos de acesso." #: 02220000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/pt/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-07-17 16:53+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-18 22:22+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437152038.000000\n" +"X-POOTLE-MTIME: 1453155721.000000\n" #: 01120000.xhp msgctxt "" @@ -4174,8 +4174,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "Secção" +msgid "Section" +msgstr "Secção" #: 04020100.xhp msgctxt "" @@ -16142,15 +16142,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Este separador não se encontra disponível na vista Esquema de impressão." - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/pt/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/pt/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/pt/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-03 21:34+0000\n" +"PO-Revision-Date: 2015-11-11 23:37+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441316091.000000\n" +"X-POOTLE-MTIME: 1447285057.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -3218,7 +3218,7 @@ "Label\n" "value.text" msgid "Toggle Grid Lines for Current Sheet" -msgstr "Alternar linhas da grelha para a folha atual" +msgstr "Mostrar/ocultar linhas da grelha" #: CalcCommands.xcu msgctxt "" @@ -4442,7 +4442,7 @@ "Label\n" "value.text" msgid "Insert Minor Grid" -msgstr "Inserir grelha auxiliar" +msgstr "Inserir grelha secundária" #: ChartCommands.xcu msgctxt "" @@ -4451,7 +4451,7 @@ "Label\n" "value.text" msgid "Delete Minor Grid" -msgstr "Eliminar grelha auxiliar" +msgstr "Eliminar grelha secundária" #: ChartCommands.xcu msgctxt "" @@ -4460,7 +4460,7 @@ "Label\n" "value.text" msgid "Format Minor Grid..." -msgstr "Formatar grelha auxiliar..." +msgstr "Formatar grelha secundária..." #: ChartCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/pt/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/pt/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sc/source/ui/src.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-09-03 21:34+0000\n" +"PO-Revision-Date: 2015-11-12 00:02+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441316099.000000\n" +"X-POOTLE-MTIME: 1447286570.000000\n" #: condformatdlg.src msgctxt "" @@ -25538,7 +25538,7 @@ "SCSTR_EXTDOC_NOT_LOADED\n" "string.text" msgid "The following external file could not be loaded. Data linked from this file did not get updated." -msgstr "Não foi possível carregar o ficheiro externo. Os dados vinculados deste ficheiro não foram atualizados." +msgstr "Não foi possível carregar o ficheiro externo. Os dados ligados a este ficheiro não foram atualizados." #: scstring.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/pt/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/pt/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-14 23:06+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-10 18:49+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: none\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439593587.000000\n" +"X-POOTLE-MTIME: 1452451798.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "O valor mínimo tem de ser inferior ao valor máximo." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalizada" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/pt/sccomp/source/solver.po libreoffice-5.0.5~rc2/translations/source/pt/sccomp/source/solver.po --- libreoffice-5.0.2/translations/source/pt/sccomp/source/solver.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sccomp/source/solver.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:14+0200\n" -"PO-Revision-Date: 2014-05-07 00:03+0000\n" -"Last-Translator: Sérgio \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-12 00:02+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1399421021.000000\n" +"X-POOTLE-MTIME: 1447286579.000000\n" #: solver.src msgctxt "" @@ -102,7 +102,7 @@ "RID_ERROR_UNBOUNDED\n" "string.text" msgid "The model is unbounded." -msgstr "O modelo é desvinculado." +msgstr "O modelo é ilimitado." #: solver.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/sfx2/source/doc.po libreoffice-5.0.5~rc2/translations/source/pt/sfx2/source/doc.po --- libreoffice-5.0.2/translations/source/pt/sfx2/source/doc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sfx2/source/doc.po 2016-02-04 16:41:28.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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-08-06 21:32+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-12 00:03+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438896724.000000\n" +"X-POOTLE-MTIME: 1447286585.000000\n" #: doc.src msgctxt "" @@ -210,7 +210,7 @@ "STR_HIDDENINFO_LINKDATA\n" "string.text" msgid "Linked data..." -msgstr "Dados vinculados..." +msgstr "Dados ligados..." #: doc.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-26 12:29+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-10 18:50+0000\n" "Last-Translator: Sérgio Marques \n" "Language-Team: none\n" "Language: pt\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435321754.000000\n" +"X-POOTLE-MTIME: 1452451807.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -759,7 +759,7 @@ "\n" "Todas as marcas aqui mencionadas, registadas ou não, são propriedade dos seus detentores.\n" "\n" -"Copyright © 2000-2015, os colaboradores do LibreOffice. Todos os direitos reservados.\n" +"Copyright © 2000-2016, os colaboradores do LibreOffice. Todos os direitos reservados.\n" "\n" "Este produto foi criado pela %OOOVENDOR e teve como base de desenvolvimento o OpenOffice.org, cujos detentores dos seus direitos entre 2000 e 2011 são a Oracle e/ou os seus afiliados. A %OOOVENDOR agradece a todos os membros da comunidade. Aceda ao sítio http://www.libreoffice.org/ para saber mais detalhes." diff -Nru libreoffice-5.0.2/translations/source/pt/svx/source/gallery2.po libreoffice-5.0.5~rc2/translations/source/pt/svx/source/gallery2.po --- libreoffice-5.0.2/translations/source/pt/svx/source/gallery2.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/svx/source/gallery2.po 2016-02-04 16:41:28.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: 2015-08-06 21:32+0000\n" +"PO-Revision-Date: 2015-11-12 00:03+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438896752.000000\n" +"X-POOTLE-MTIME: 1447286590.000000\n" #: gallery.src msgctxt "" @@ -94,7 +94,7 @@ "RID_SVXSTR_GALLERY_DELETEDD\n" "string.text" msgid "Do you want to delete the linked file?" -msgstr "Pretende eliminar o ficheiro vinculado?" +msgstr "Pretende eliminar o ficheiro ligado?" #: gallery.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/pt/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/pt/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-17 15:55+0000\n" -"Last-Translator: Sérgio Marques \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:33+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437148547.000000\n" +"X-POOTLE-MTIME: 1439595227.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Ajustar ampliação" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/pt/svx/source/svdraw.po libreoffice-5.0.5~rc2/translations/source/pt/svx/source/svdraw.po --- libreoffice-5.0.2/translations/source/pt/svx/source/svdraw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/svx/source/svdraw.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-06 21:35+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-12 00:03+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438896932.000000\n" +"X-POOTLE-MTIME: 1447286634.000000\n" #: svdstr.src msgctxt "" @@ -718,7 +718,7 @@ "STR_ObjNameSingulGRAFMTFLNK\n" "string.text" msgid "Linked Metafile" -msgstr "Meta-ficheiro vinculado" +msgstr "Meta-ficheiro ligado" #: svdstr.src msgctxt "" @@ -726,7 +726,7 @@ "STR_ObjNamePluralGRAFMTFLNK\n" "string.text" msgid "Linked Metafiles" -msgstr "Meta-ficheiros vinculados" +msgstr "Meta-ficheiros ligados" #: svdstr.src msgctxt "" @@ -750,7 +750,7 @@ "STR_ObjNameSingulGRAFBMPLNK\n" "string.text" msgid "Linked Bitmap" -msgstr "Mapa de bits vinculado" +msgstr "Mapa de bits ligado" #: svdstr.src msgctxt "" @@ -758,7 +758,7 @@ "STR_ObjNameSingulGRAFBMPTRANSLNK\n" "string.text" msgid "Linked bitmap with transparency" -msgstr "Mapa de bits vinculado com transparência" +msgstr "Mapa de bits ligado com transparência" #: svdstr.src msgctxt "" @@ -782,7 +782,7 @@ "STR_ObjNamePluralGRAFBMPLNK\n" "string.text" msgid "Linked bitmaps" -msgstr "Mapas de bits vinculados" +msgstr "Mapas de bits ligados" #: svdstr.src msgctxt "" @@ -790,7 +790,7 @@ "STR_ObjNamePluralGRAFBMPTRANSLNK\n" "string.text" msgid "Linked bitmaps with transparency" -msgstr "Mapas de bits vinculados com transparência" +msgstr "Mapas de bits ligados com transparência" #: svdstr.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/svx/source/tbxctrls.po libreoffice-5.0.5~rc2/translations/source/pt/svx/source/tbxctrls.po --- libreoffice-5.0.2/translations/source/pt/svx/source/tbxctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/svx/source/tbxctrls.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-26 13:34+0000\n" +"PO-Revision-Date: 2015-12-13 22:33+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435325665.000000\n" +"X-POOTLE-MTIME: 1450046021.000000\n" #: colrctrl.src msgctxt "" @@ -568,7 +568,7 @@ "RID_SVXSTR_EXTRAS_CHARBACKGROUND\n" "string.text" msgid "Highlighting" -msgstr "Destacar" +msgstr "Realce" #: tbcontrl.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/svx/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt/svx/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt/svx/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/svx/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-14 23:39+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-12 00:04+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439595582.000000\n" +"X-POOTLE-MTIME: 1447286647.000000\n" #: acceptrejectchangesdialog.ui msgctxt "" @@ -4027,7 +4027,7 @@ "text\n" "string.text" msgid "This graphic object is linked to the document." -msgstr "Este objeto gráfico está vinculado ao documento." +msgstr "Este objeto gráfico está ligado ao documento." #: queryunlinkgraphicsdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/pt/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/pt/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-14 23:56+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-11 23:33+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: none\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439596564.000000\n" +"X-POOTLE-MTIME: 1447284791.000000\n" #: abstractdialog.ui msgctxt "" @@ -14207,7 +14207,7 @@ "label\n" "string.text" msgid "Grid Layout" -msgstr "Esquema de grelha" +msgstr "Esquema da grelha" #: textgridpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/swext/mediawiki/help.po libreoffice-5.0.5~rc2/translations/source/pt/swext/mediawiki/help.po --- libreoffice-5.0.2/translations/source/pt/swext/mediawiki/help.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/swext/mediawiki/help.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-07-17 15:58+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-11 23:38+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437148721.000000\n" +"X-POOTLE-MTIME: 1447285083.000000\n" #: help.tree msgctxt "" @@ -278,7 +278,7 @@ "par_id4123661\n" "help.text" msgid "This is a minor edit: Check this box to mark the uploaded page as a minor edit of the already existing page with the same title." -msgstr "Esta é uma edição secundária: selecione esta caixa para assinalar a página enviada como uma correção a uma página já existente com o mesmo título." +msgstr "Esta é uma edição menor: selecione esta caixa para assinalar a página enviada como uma correção a uma página já existente com o mesmo título." #: wiki.xhp msgctxt "" @@ -670,7 +670,7 @@ "par_id823999\n" "help.text" msgid "This is a minor edit: Check this box to mark the uploaded page as a minor edit of the already existing page with the same title." -msgstr "Esta é uma edição secundária: selecione esta caixa para assinalar a página enviada como correção a uma página já existente com o mesmo título." +msgstr "Esta é uma edição menor: selecione esta caixa para assinalar a página enviada como correção a uma página já existente com o mesmo título." #: wikisend.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po libreoffice-5.0.5~rc2/translations/source/pt/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po --- libreoffice-5.0.2/translations/source/pt/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,18 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:05+0200\n" -"PO-Revision-Date: 2012-02-22 13:33+0200\n" -"Last-Translator: Sérgio \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:39+0200\n" +"PO-Revision-Date: 2015-11-11 23:38+0000\n" +"Last-Translator: Sérgio Marques \n" "Language-Team: LANGUAGE \n" "Language: pt\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1447285097.000000\n" #: WikiExtension.xcu msgctxt "" @@ -229,7 +230,7 @@ "Dlg_SendToMediaWiki_MinorCheck\n" "value.text" msgid "This is a ~minor edit" -msgstr "Esta é u~ma edição secundária" +msgstr "Esta é u~ma edição menor" #: WikiExtension.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt/uui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt/uui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt/uui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt/uui/uiconfig/ui.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-26 13:46+0000\n" +"PO-Revision-Date: 2015-10-18 00:05+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435326360.000000\n" +"X-POOTLE-MTIME: 1445126710.000000\n" #: authfallback.ui msgctxt "" @@ -175,7 +175,7 @@ "label\n" "string.text" msgid "The document contains document macros signed by:" -msgstr "O documento contém macros de documento assinadas por:" +msgstr "O documento contém macros assinadas por:" #: macrowarnmedium.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt-BR/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt-BR/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-09-05 11:56+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 20:48+0000\n" "Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441454163.000000\n" +"X-POOTLE-MTIME: 1452286083.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -184,8 +184,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 Colaboradores do LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 - 2016 Colaboradores do LibreOffice." #: aboutdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/pt-BR/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/pt-BR/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-07-24 02:02+0000\n" -"Last-Translator: André Marcelo Alvarenga \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-20 21:49+0000\n" +"Last-Translator: Olivier Hallot \n" "Language-Team: LANGUAGE \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437703320.000000\n" +"X-POOTLE-MTIME: 1453326549.000000\n" #: 01010000.xhp msgctxt "" @@ -9619,7 +9619,7 @@ "27\n" "help.text" msgid "When you open a file that contains links, you are prompted to update the links. Depending on where the linked files are stored, the update process can take several minutes to complete." -msgstr "Ao abrir um arquivo que contém vínculos, você será solicitado a atualizar os vínculos. Dependo do local onde os arquivos vinculados estiverem armazenados, o processo de atualização pode levar vários minutos." +msgstr "Ao abrir um arquivo que contém vínculos, você será solicitado a atualizar os vínculos. Dependendo do local onde os arquivos vinculados estiverem armazenados, o processo de atualização pode levar vários minutos." #: 02180000.xhp msgctxt "" @@ -11019,8 +11019,8 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." -msgstr "Exibe um mapa de imagens que permite a você clicar nos pontos de acesso e editá-los." +msgid "Displays the image map, so that you can click and edit the hotspots." +msgstr "Exibe um mapa de imagem, para que seja possível clicar e editar os pontos de acesso." #: 02220000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/pt-BR/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/pt-BR/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-08-13 21:43+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2016-01-20 21:47+0000\n" +"Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439502233.000000\n" +"X-POOTLE-MTIME: 1453326462.000000\n" #: 01120000.xhp msgctxt "" @@ -4174,8 +4174,8 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "Seção" +msgid "Section" +msgstr "Seção" #: 04020100.xhp msgctxt "" @@ -16142,15 +16142,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Esta guia não estará disponível na exibição Layout de impressão." - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/pt-BR/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/pt-BR/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-27 14:11+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 20:48+0000\n" "Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435414260.000000\n" +"X-POOTLE-MTIME: 1452286111.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "O valor mínimo deve ser inferior ao valor máximo." +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalizado" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/pt-BR/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/pt-BR/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-28 00:47+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 20:55+0000\n" "Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435452440.000000\n" +"X-POOTLE-MTIME: 1452286521.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,19 +749,19 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" -"O %PRODUCTNAME é disponibilizado nos termos da Mozilla Public License, v. 2.0. Uma cópia da licença pode ser obtida em http://mozilla.org/MPL/2.0/.\n" +"O %PRODUCTNAME é disponibilizado nos termos da Mozilla Public License, v. 2.0. Uma cópia da licença MPL pode ser obtida em http://mozilla.org/MPL/2.0/.\n" "\n" -"Copyright e termos das licenças de terceiros estão descritas no arquivo LICENSE.html. Escolha Mostrar a licença para ver os detalhes do arquivo (em inglês).\n" +"As notificações de copyright dos códigos adicionais de terceiros e os termos de licenciamento aplicáveis à partes do software estão descritas no arquivo LICENSE.html. Selecione Mostrar a licença para ver os detalhes exatos em inglês.\n" "\n" "Todas as marcas, registradas ou não, aqui mencionadas são propriedade dos seus titulares.\n" "\n" -"Copyright © 2000-2015 os colaboradores do LibreOffice. Todos os direitos reservados.\n" +"Copyright © 2000-2016 os colaboradores do LibreOffice. Todos os direitos reservados.\n" "\n" -"Este produto foi criado pela %OOOVENDOR e teve como base de desenvolvimento o OpenOffice.org, cujos detentores dos seus direitos entre 2000 e 2011 são a Oracle e/ou os seus afiliados. A %OOOVENDOR agradece a todos os membros da comunidade. Acesse a página http://www.libreoffice.org/ para mais detalhes." +"Este produto foi criado pela %OOOVENDOR e teve como base de desenvolvimento o OpenOffice.org, cujos detentores dos seus direitos entre 2000 e 2011 são a Oracle e/ou os seus afiliados. A %OOOVENDOR agradece a todos os membros da comunidade. Acesse a página http://www.libreoffice.org/ para mais detalhes." #: linkeditdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/pt-BR/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/pt-BR/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/pt-BR/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/pt-BR/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "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: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-11-26 15:26-0200\n" -"Last-Translator: Olivier Hallot \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-08 20:57+0000\n" +"Last-Translator: Olivier Hallot \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\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-Generator: Lokalize 1.5\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1401572582.000000\n" +"X-POOTLE-MTIME: 1452286674.000000\n" #: stbctrls.src msgctxt "" @@ -160,14 +160,6 @@ #: stbctrls.src msgctxt "" "stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Ajustar escala do zoom" - -#: stbctrls.src -msgctxt "" -"stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" msgid "Zoom In" @@ -184,6 +176,78 @@ #: stbctrls.src msgctxt "" "stbctrls.src\n" +"RID_SVXSTR_ZOOM_25\n" +"string.text" +msgid "25%" +msgstr "25%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_50\n" +"string.text" +msgid "50%" +msgstr "50%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_75\n" +"string.text" +msgid "75%" +msgstr "75%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_100\n" +"string.text" +msgid "100%" +msgstr "100%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_150\n" +"string.text" +msgid "150%" +msgstr "150%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_200\n" +"string.text" +msgid "200%" +msgstr "200%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_WHOLE_PAGE\n" +"string.text" +msgid "Entire Page" +msgstr "Página inteira" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_PAGE_WIDTH\n" +"string.text" +msgid "Page Width" +msgstr "Largura da página" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXSTR_ZOOM_OPTIMAL_VIEW\n" +"string.text" +msgid "Optimal View" +msgstr "Visualização ideal" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" "RID_SVXMNU_ZOOM\n" "ZOOM_WHOLE_PAGE\n" "menuitem.text" @@ -210,6 +274,51 @@ #: stbctrls.src msgctxt "" +"stbctrls.src\n" +"RID_SVXMNU_ZOOM\n" +"ZOOM_50\n" +"menuitem.text" +msgid "50%" +msgstr "50%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXMNU_ZOOM\n" +"ZOOM_75\n" +"menuitem.text" +msgid "75%" +msgstr "75%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXMNU_ZOOM\n" +"ZOOM_100\n" +"menuitem.text" +msgid "100%" +msgstr "100%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXMNU_ZOOM\n" +"ZOOM_150\n" +"menuitem.text" +msgid "150%" +msgstr "150%" + +#: stbctrls.src +msgctxt "" +"stbctrls.src\n" +"RID_SVXMNU_ZOOM\n" +"ZOOM_200\n" +"menuitem.text" +msgid "200%" +msgstr "200%" + +#: stbctrls.src +msgctxt "" "stbctrls.src\n" "RID_SVXMNU_PSZ_FUNC\n" "PSZ_FUNC_AVG\n" diff -Nru libreoffice-5.0.2/translations/source/ro/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ro/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ro/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-30 13:05+0000\n" -"Last-Translator: Jobava \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 22:40+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438261548.000000\n" +"X-POOTLE-MTIME: 1439592059.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME este o suită de productivitate cu sursă deschisă, modernă, ușor de folosit, pentru editări de texte, tabele, prezentări și altele." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 LibreOffice contribuitori." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/ro/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/ro/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/ro/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ro/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ro/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ro/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-14 23:31+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-13 08:56+0000\n" +"Last-Translator: cristimsb \n" "Language-Team: none\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439595109.000000\n" +"X-POOTLE-MTIME: 1452675368.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Valoarea minimă trebuie să fie mai mică decât valoarea maximă." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Personalizat" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -10751,85 +10761,3 @@ "string.text" msgid "Grouped by" msgstr "Grupat: " - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "_Indentare stânga:" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "Cumulat vertical" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Aliniază textul vertical." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Aliniază textul vertical." - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "_Fundal celulă:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "_Bordură celulă:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "Arată liniile de _grilă pentru celule" - -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "_Categorie:" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "Arată liniile de grilă pentru celule." - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "_Numere negative cu roșu" diff -Nru libreoffice-5.0.2/translations/source/ro/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ro/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ro/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-02 12:02+0000\n" -"Last-Translator: Ákos Nagy \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-13 09:01+0000\n" +"Last-Translator: cristimsb \n" "Language-Team: none\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435838566.000000\n" +"X-POOTLE-MTIME: 1452675663.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "_Afișare licență" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2004,11 +2005,3 @@ "string.text" msgid "Existing Versions" msgstr "Versiuni existente" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Resetare" diff -Nru libreoffice-5.0.2/translations/source/ro/starmath/source.po libreoffice-5.0.5~rc2/translations/source/ro/starmath/source.po --- libreoffice-5.0.2/translations/source/ro/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ro/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ro/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ro/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ro/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-06-29 13:16+0000\n" -"Last-Translator: Ákos Nagy \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:59+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435583783.000000\n" +"X-POOTLE-MTIME: 1439596761.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Ajustare nivel zoom" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/ru/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ru/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ru/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-31 12:35+0000\n" -"Last-Translator: bormant \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-12-14 19:07+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Russian \n" "Language: ru\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441024501.000000\n" +"X-POOTLE-MTIME: 1450120027.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME - это современное, с открытым кодом, простое в использовании средство обработки текстов, электронных таблиц, презентаций и т.п." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 участники сообщества LibreOffice." #: aboutdialog.ui @@ -12571,7 +12572,7 @@ "label\n" "string.text" msgid "Force OpenGL even if blacklisted" -msgstr "OpenCL вопреки чёрному списку" +msgstr "OpenGL вопреки чёрному списку" #: optviewpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/scalc/05.po libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/scalc/05.po --- libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/scalc/05.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/scalc/05.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "Project-Id-Version: 05\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-03-01 15:04+0000\n" -"Last-Translator: bormant \n" +"PO-Revision-Date: 2015-11-01 10:50+0000\n" +"Last-Translator: rumiantcev \n" "Language-Team: Russian \n" "Language: ru\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1425222256.000000\n" +"X-POOTLE-MTIME: 1446375011.000000\n" #: 02140000.xhp msgctxt "" @@ -971,7 +971,7 @@ "par_id9635914\n" "help.text" msgid "Use OpenCL only for a subset of operations" -msgstr "" +msgstr "Использовать OpenCL не для всех операций" #: OpenCL_options.xhp msgctxt "" @@ -979,7 +979,7 @@ "par_id2476577\n" "help.text" msgid "Use OpenCL only for some of the operations that spreadsheet formulas are translated to." -msgstr "" +msgstr "Использовать OpenCL для отдельных операций, в которые преобразуются формулы листа." #: OpenCL_options.xhp msgctxt "" @@ -1011,7 +1011,7 @@ "par_id4524674\n" "help.text" msgid "The list of operators and function opcodes for which to use OpenCL. If a formula contains only these operators and functions, it might be calculated using OpenCL." -msgstr "" +msgstr "Список операторов и функций, вычисляемых при помощи OpenCL. Если формула содержит только эти операторы и функции, для неё OpenCL может быть использован." #: empty_cells.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: 01\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-09-08 08:15+0000\n" "Last-Translator: bormant \n" "Language-Team: Russian \n" @@ -11030,12 +11030,13 @@ msgstr "Представление графического объекта" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Отображение сенсорного изображения с тем, чтобы можно было щёлкнуть и редактировать гиперобъекты." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/ru/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-03-01 15:04+0000\n" -"Last-Translator: bormant \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 22:21+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ru\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1425222256.000000\n" +"X-POOTLE-MTIME: 1439504474.000000\n" #: 01120000.xhp msgctxt "" @@ -42,12 +42,13 @@ msgstr "Отображает или скрывает предварительный просмотр печатаемой страницы." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Используйте значки панели Предварительный просмотр для листания страниц или печати документа." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "В режиме предварительного просмотра редактировать документ невозможно." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Для выхода из режима предварительного просмотра нажмите кнопку Закрыть предварительный просмотр." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Открывается диалоговое окно Рассылка писем, которое облегчает печать и сохранение стандартных писем." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Во время печати информация из базы данных заменяет соответствующие поля в базе данных (местозаполнители). Дополнительные сведения о вставке полей в базе данных см. на вкладке База данных, которая доступна после последовательного выбора пунктов меню Вставка - Поля - Дополнительно." #: 01150000.xhp msgctxt "" @@ -3687,13 +3690,14 @@ msgstr "Затенение полей" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Отображает или скрывает затенение полей в документе, включая неразрывные пробелы, заданные пользователем переносы, указатели и сноски." #: 03080000.xhp msgctxt "" @@ -4173,13 +4177,14 @@ msgstr "разделы;вставка разделов с помощью DDEDDE; команда для вставки разделов" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Раздел" #: 04020100.xhp msgctxt "" @@ -4200,13 +4205,14 @@ msgstr "Новый раздел" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Введите здесь имя нового раздела. По умолчанию $[officename] автоматически присваивает новым разделам имя \"Раздел X\", где Х - последовательный номер." #: 04020100.xhp msgctxt "" @@ -4227,13 +4233,14 @@ msgstr "Связь" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Вставляет в текущий раздел содержимое другого документа или его раздела." #: 04020100.xhp msgctxt "" @@ -4245,13 +4252,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Создаёт связьDDE. Установите этот флажок, а затем введите команду DDE, которую необходимо использовать. Параметр DDE доступен, только если установлен флажок Связь." #: 04020100.xhp msgctxt "" @@ -4272,22 +4280,24 @@ msgstr "Например, для вставки раздела \"Раздел1\" из текстового документа $[officename] abc.sxw как DDE связь используйте: \"soffice x:\\abc.sxw Раздел1\". Для вставки содержимого первой ячейки из электронной таблицы MS Excel \"abc.xls\" используйте команду: \"excel x:\\[abc.xls]Sheet1 z1s1\". Также можно скопировать элемент, который нужно вставить как DDE связь, и вставить с помощью пунктов меню Правка - Вставить как. Для просмотра команд DDE выделите содержимое и выберите Правка - Поля." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Имя файла / Команда DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Введите путь и имя файла, который необходимо вставить, или нажмите кнопку обзора (...), чтобы найти файл.Если установлен флажок DDE, введите команду DDE, которая будет использоваться. " #: 04020100.xhp msgctxt "" @@ -4416,13 +4426,14 @@ msgstr "Скрыть" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Скрывает выбранный раздел и предотвращает его вывод на печать. Компоненты скрытых разделов затеняются серым цветом в Навигаторе. Если поместить указатель мыши на скрытый компонент в Навигаторе, появится подсказка \"скрытый\"." #: 04020100.xhp msgctxt "" @@ -4443,13 +4454,14 @@ msgstr "Условие" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Введите условие, которое должно быть выполнено для того, чтобы раздел был скрыт. Условием является логическое выражение, например, \"ПРИВЕТСТВИЕ EQ Г-н\". Так, например, если для определения поля базы данных, имя которого \"Приветствие\" и оно содержит слова \"Г-н\", \"Г-жа\" или \"Уважаемые\", используется функция стандартного письма слияние, то можно затем указать, что этот раздел должен печататься, только если в приветствии имеется слово \"Г-н\"." #: 04020100.xhp msgctxt "" @@ -10183,13 +10195,14 @@ msgstr "Для отображения текста с условием на основе числа страниц поступайте следующим образом:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Выберите пункты менюВставка - Поля - Дополнительно и откройте вкладку Функции." #: 04090200.xhp msgctxt "" @@ -10246,13 +10259,14 @@ msgstr "Для отображения текста с условием на основе пользовательской переменной:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Выберите вкладку Вставка - Поля - Дополнительно - Переменные." #: 04090200.xhp msgctxt "" @@ -10363,13 +10377,14 @@ msgstr "В первой части данного примера в документ вставляется пробел между полями «Имя» и «Фамилия», а во второй части вставляется текст, основанный на содержимом поля. В данном примере требуется зарегистрированный в $[officename] источник адресов." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Выберите пункты менюВставка - Поля - Дополнительно и откройте вкладку База данных." #: 04090200.xhp msgctxt "" @@ -16148,15 +16163,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Если выбрано представление Схема печати, эта вкладка недоступна." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16611,22 +16617,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Задаёт размер, расположение и другие свойства выбранного графического объекта." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Некоторые свойства выбранного графического объекта можно также изменять, используя сочетания клавиш." #: 05060000.xhp #, fuzzy @@ -17056,13 +17064,14 @@ msgstr "Применяет для чётных страниц обратные значения параметров выравнивания по горизонтали." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Для настройки расположения объектов на чётных и нечётных страницах можно также использовать параметры отражения в диалоговом окне Изображение." #: 05060100.xhp msgctxt "" @@ -18174,13 +18183,14 @@ msgstr "Обтекание" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Задайте параметры отражения и связи для выбранного графического объекта." #: 05060300.xhp msgctxt "" @@ -18201,13 +18211,14 @@ msgstr "Вертикально" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Отражает выбранный графический объект по вертикали." #: 05060300.xhp msgctxt "" @@ -18219,13 +18230,14 @@ msgstr "Горизонтально" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Отражает выбранный графический объект по горизонтали." #: 05060300.xhp msgctxt "" @@ -18237,13 +18249,14 @@ msgstr "на всех страницах" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Отражает выбранный графический объект по горизонтали на всех страницах." #: 05060300.xhp msgctxt "" @@ -18255,13 +18268,14 @@ msgstr "на левых страницах" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Отражает выбранный графический объект по горизонтали только на чётных страницах." #: 05060300.xhp msgctxt "" @@ -18273,13 +18287,14 @@ msgstr "на правых страницах" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Отражает выбранный графический объект по горизонтали только на нечётных страницах." #: 05060300.xhp msgctxt "" @@ -22979,13 +22994,14 @@ msgstr "Открывает диалоговое окно, в котором вас попросят принять или отклонить изменения Автозамены. Вы сможете также просмотреть изменения, внесённые интересующим вас автором или в интересующее вас время." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Принять или отклонить изменения, вкладка Фильтр" #: 05170000.xhp msgctxt "" @@ -23583,13 +23599,14 @@ msgstr "Чтобы вставить неразрывный (защищённый) дефис непосредственно в документ, щёлкните по требуемому слову, а затем нажмите Shift+CommandCtrl+дефис(-)." #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Чтобы скрыть мягкие переносы, выберите команду %PRODUCTNAME - ПараметрыСервис - Параметры - %PRODUCTNAME Writer - Знаки форматирования и снимите флажок Мягкие переносы." #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ru/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ru/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ru/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-04 12:20+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-11-01 07:57+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436012421.000000\n" +"X-POOTLE-MTIME: 1446364636.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Минимальное значение должно быть меньше максимального." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Особый:" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ru/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ru/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ru/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-28 13:20+0000\n" -"Last-Translator: bormant \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:03+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Russian \n" "Language: ru\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435497640.000000\n" +"X-POOTLE-MTIME: 1439597039.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "Показать лицензию" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ru/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/ru/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/ru/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/svx/source/dialog.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: dialog\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-07-04 12:20+0000\n" +"PO-Revision-Date: 2015-12-13 21:22+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436012452.000000\n" +"X-POOTLE-MTIME: 1450041744.000000\n" #: bmpmask.src msgctxt "" @@ -6235,7 +6235,7 @@ "RID_SUBSETSTR_KHUDAWADI\n" "string.text" msgid "Khudawadi" -msgstr "" +msgstr "Худавади" #: ucsubset.src msgctxt "" @@ -6388,7 +6388,7 @@ "RID_SUBSETSTR_SHORTHAND_FORMAT_CONTROLS\n" "string.text" msgid "Shorthand Format Controls" -msgstr "" +msgstr "Управляющие символы стенографии" #: ucsubset.src msgctxt "" @@ -6397,7 +6397,7 @@ "RID_SUBSETSTR_SIDDHAM\n" "string.text" msgid "Siddham" -msgstr "" +msgstr "Сиддхам" #: ucsubset.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ru/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ru/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ru/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: stbctrls\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: 2015-02-07 09:18+0000\n" -"Last-Translator: bormant \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:14+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1423300702.000000\n" +"X-POOTLE-MTIME: 1439597668.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Настроить масштаб" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/ru/svx/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ru/svx/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ru/svx/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/svx/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-28 16:30+0000\n" +"PO-Revision-Date: 2015-12-15 11:01+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435509013.000000\n" +"X-POOTLE-MTIME: 1450177278.000000\n" #: acceptrejectchangesdialog.ui msgctxt "" @@ -5647,7 +5647,7 @@ "label\n" "string.text" msgid "_Flip:" -msgstr "Отражение:" +msgstr "Отразить:" #: sidebarpossize.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ru/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/ru/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/ru/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ru/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-19 14:24+0000\n" +"PO-Revision-Date: 2015-12-18 11:57+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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439994277.000000\n" +"X-POOTLE-MTIME: 1450439878.000000\n" #: abstractdialog.ui msgctxt "" @@ -12632,7 +12632,7 @@ "tooltip_text\n" "string.text" msgid "Columns" -msgstr "Столбцы" +msgstr "Колонки" #: sidebarpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/rw/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/rw/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/rw/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/rw/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 22:53+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Gusimbura" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Ubugari" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ubugari" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ubuhagarike" #: borderpage.ui msgctxt "" @@ -4326,13 +4329,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ubuhagarike" #: distributionpage.ui #, fuzzy @@ -6496,13 +6500,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Izina" #: hyperlinkdocpage.ui msgctxt "" @@ -6631,13 +6636,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Izina" #: hyperlinkinternetpage.ui msgctxt "" @@ -6730,13 +6736,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Izina" #: hyperlinkmailpage.ui msgctxt "" @@ -6883,13 +6890,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Izina" #: hyperlinknewdocpage.ui msgctxt "" @@ -7704,13 +7712,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Umususire" #: linetabpage.ui msgctxt "" @@ -7768,13 +7777,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ubugari" #: linetabpage.ui msgctxt "" @@ -7786,13 +7796,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Ubugari" #: linetabpage.ui msgctxt "" @@ -7858,13 +7869,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Ubugari" #: linetabpage.ui msgctxt "" @@ -10576,13 +10588,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Ingano" #: optfontspage.ui #, fuzzy @@ -13212,13 +13225,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ubuhagarike" #: pageformatpage.ui msgctxt "" @@ -13611,13 +13625,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ubuhagarike" #: paragalignpage.ui msgctxt "" @@ -14638,22 +14653,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ibirindiro" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ibirindiro" #: possizetabpage.ui msgctxt "" @@ -14675,13 +14692,14 @@ msgstr "Ibirindiro" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ubugari" #: possizetabpage.ui #, fuzzy @@ -15128,22 +15146,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ibirindiro" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ibirindiro" #: rotationtabpage.ui msgctxt "" @@ -17601,57 +17621,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/rw/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/rw/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/rw/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/rw/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:39+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/rw/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/rw/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/rw/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/rw/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 11:38+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:51+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: rw\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431517124.000000\n" +"X-POOTLE-MTIME: 1439596307.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/rw/starmath/source.po libreoffice-5.0.5~rc2/translations/source/rw/starmath/source.po --- libreoffice-5.0.2/translations/source/rw/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/rw/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/rw/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/rw/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/rw/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/rw/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 16:07+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:02+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: rw\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377619650.000000\n" +"X-POOTLE-MTIME: 1439596966.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sa-IN/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sa-IN/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:03+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -430,13 +430,14 @@ msgstr "प्रतिस्थापय" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "परिणाहः" #: acorreplacepage.ui msgctxt "" @@ -881,13 +882,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "परिणाहः" #: areatabpage.ui #, fuzzy @@ -1552,13 +1554,14 @@ msgstr "वैचित्र्यसंपादकः" #: bitmaptabpage.ui +#, fuzzy msgctxt "" "bitmaptabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "पृष्ठपटलवर्णः" #: bitmaptabpage.ui #, fuzzy @@ -5274,13 +5277,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "rbSearchForText\n" "label\n" "string.text" msgid "_Text:" -msgstr "" +msgstr "विषयः" #: fmsearchdialog.ui msgctxt "" @@ -5891,13 +5895,14 @@ msgstr "" #: gradientpage.ui +#, fuzzy msgctxt "" "gradientpage.ui\n" "colortoft\n" "label\n" "string.text" msgid "_To:" -msgstr "" +msgstr "उर्धं :" #: gradientpage.ui msgctxt "" @@ -6322,13 +6327,14 @@ msgstr "" #: hatchpage.ui +#, fuzzy msgctxt "" "hatchpage.ui\n" "linetypeft\n" "label\n" "string.text" msgid "_Line type:" -msgstr "" +msgstr "फैल् वर्गः" #: hatchpage.ui msgctxt "" @@ -6566,22 +6572,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "नाम" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "फार्म्" #: hyperlinkdocpage.ui msgctxt "" @@ -6701,22 +6709,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "नाम" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "फार्म्" #: hyperlinkinternetpage.ui msgctxt "" @@ -6800,22 +6810,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "नाम" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "फार्म्" #: hyperlinkmailpage.ui msgctxt "" @@ -6958,22 +6970,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "नाम" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "फार्म्" #: hyperlinknewdocpage.ui msgctxt "" @@ -7793,22 +7807,24 @@ msgstr "डैश्" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "शैली" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "Colo_r:" -msgstr "" +msgstr "वर्णः" #: linetabpage.ui #, fuzzy @@ -7859,13 +7875,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "परिणाहः" #: linetabpage.ui #, fuzzy @@ -7878,13 +7895,14 @@ msgstr "Centre" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "परिणाहः" #: linetabpage.ui #, fuzzy @@ -7951,13 +7969,14 @@ msgstr "वृणु" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "परिणाहः" #: linetabpage.ui #, fuzzy @@ -8671,13 +8690,14 @@ msgstr "" #: newtoolbardialog.ui +#, fuzzy msgctxt "" "newtoolbardialog.ui\n" "label2\n" "label\n" "string.text" msgid "_Save in:" -msgstr "" +msgstr "अस्मिन् सञ्चय" #: numberingformatpage.ui msgctxt "" @@ -10711,13 +10731,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "परिमाणः" #: optfontspage.ui #, fuzzy @@ -12773,13 +12794,14 @@ msgstr "सञ्चिकानाम" #: optuserpage.ui +#, fuzzy msgctxt "" "optuserpage.ui\n" "eastnameft\n" "label\n" "string.text" msgid "Last/first _name/initials:" -msgstr "" +msgstr "Forename/Sur_name/Initials" #: optuserpage.ui msgctxt "" @@ -14823,22 +14845,24 @@ msgstr "भङ्गीकृतं तथा च कोणत्रिजीवा" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "स्थानम्" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "स्थानम्" #: possizetabpage.ui msgctxt "" @@ -14859,13 +14883,14 @@ msgstr "स्थानम्" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "परिणाहः" #: possizetabpage.ui #, fuzzy @@ -15316,22 +15341,24 @@ msgstr "रेकोर्ड् कर्तुं गच्छ" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "स्थानम्" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "स्थानम्" #: rotationtabpage.ui msgctxt "" @@ -16259,13 +16286,14 @@ msgstr "तिर्यग्रूपम्" #: splitcellsdialog.ui +#, fuzzy msgctxt "" "splitcellsdialog.ui\n" "vert\n" "label\n" "string.text" msgid "_Vertically" -msgstr "" +msgstr "ऋजु" #: splitcellsdialog.ui msgctxt "" @@ -17817,57 +17845,3 @@ "string.text" msgid "View Layout" msgstr "परिलेखं पश्य" - -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "पृष्टपटलः" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "पृष्ठपटलवर्णः" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/sa-IN/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/sa-IN/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sa-IN/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sa-IN/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:05+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1568,6 +1568,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "इष्टः" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sa-IN/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sa-IN/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 13:21+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:23+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sa_IN\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431523312.000000\n" +"X-POOTLE-MTIME: 1439598211.000000\n" #: alienwarndialog.ui msgctxt "" @@ -755,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/starmath/source.po libreoffice-5.0.5~rc2/translations/source/sa-IN/starmath/source.po --- libreoffice-5.0.2/translations/source/sa-IN/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sa-IN/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sa-IN/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sa-IN/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sa-IN/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-09-29 06:53+0000\n" -"Last-Translator: babitashinde123 \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:35+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sa_IN\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411973588.000000\n" +"X-POOTLE-MTIME: 1439598901.000000\n" #: stbctrls.src msgctxt "" @@ -162,14 +162,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sat/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sat/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sat/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:02+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/sat/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/sat/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/sat/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sat/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sat/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sat/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:08+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1567,6 +1567,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "कुसियाक्" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3450,13 +3460,14 @@ msgstr "Number of Pages:" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "intervals\n" "label\n" "string.text" msgid "_Intervals:" -msgstr "" +msgstr "फांक" #: groupbydate.ui msgctxt "" @@ -3943,13 +3954,14 @@ msgstr "_Character set" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "Te_xt delimiter" #: imoptdialog.ui #, fuzzy @@ -6067,13 +6079,14 @@ msgstr "" #: pivottablelayoutdialog.ui +#, fuzzy msgctxt "" "pivottablelayoutdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Page Fields:" -msgstr "" +msgstr "डाटा जायगा" #: pivottablelayoutdialog.ui msgctxt "" @@ -6699,22 +6712,24 @@ msgstr "दानाङ साबाद दोहड़ा ओल मे" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "_Password" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "_Confirm" #: retypepassworddialog.ui #, fuzzy @@ -10914,91 +10929,3 @@ "string.text" msgid "Grouped by" msgstr "दोल दाराय ते" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Aligns text vertically." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Aligns text vertically." - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "_Negative numbers red" diff -Nru libreoffice-5.0.2/translations/source/sat/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sat/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sat/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 12:26+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:23+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sat\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431520000.000000\n" +"X-POOTLE-MTIME: 1439598205.000000\n" #: alienwarndialog.ui msgctxt "" @@ -760,7 +760,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/sat/starmath/source.po libreoffice-5.0.5~rc2/translations/source/sat/starmath/source.po --- libreoffice-5.0.2/translations/source/sat/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sat/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sat/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sat/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sat/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-09-24 10:28+0000\n" -"Last-Translator: chandrakantd \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:37+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sat\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411554497.000000\n" +"X-POOTLE-MTIME: 1439599057.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sd/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sd/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sd/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:09+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -433,13 +433,14 @@ msgstr "بدل سدل ڪريو" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "ويڪر" #: acorreplacepage.ui msgctxt "" @@ -884,13 +885,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "ويڪر" #: areatabpage.ui #, fuzzy @@ -1555,13 +1557,14 @@ msgstr "نمونن جو سمپادڪ" #: bitmaptabpage.ui +#, fuzzy msgctxt "" "bitmaptabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "پس منظر جو رنگ" #: bitmaptabpage.ui #, fuzzy @@ -1870,13 +1873,14 @@ msgstr "ويڪر" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "label17\n" "label\n" "string.text" msgid "_Color:" -msgstr "" +msgstr "رنگ" #: borderpage.ui msgctxt "" @@ -1965,13 +1969,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "shadowcolorft\n" "label\n" "string.text" msgid "C_olor:" -msgstr "" +msgstr "رنگ" #: borderpage.ui #, fuzzy @@ -3318,13 +3323,14 @@ msgstr "نالو" #: colorpage.ui +#, fuzzy msgctxt "" "colorpage.ui\n" "label6\n" "label\n" "string.text" msgid "C_olor:" -msgstr "" +msgstr "رنگ" #: colorpage.ui #, fuzzy @@ -5277,13 +5283,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "rbSearchForText\n" "label\n" "string.text" msgid "_Text:" -msgstr "" +msgstr "متن" #: fmsearchdialog.ui msgctxt "" @@ -5892,13 +5899,14 @@ msgstr "" #: gradientpage.ui +#, fuzzy msgctxt "" "gradientpage.ui\n" "colortoft\n" "label\n" "string.text" msgid "_To:" -msgstr "" +msgstr "مٿي:" #: gradientpage.ui msgctxt "" @@ -6323,13 +6331,14 @@ msgstr "" #: hatchpage.ui +#, fuzzy msgctxt "" "hatchpage.ui\n" "linetypeft\n" "label\n" "string.text" msgid "_Line type:" -msgstr "" +msgstr "فائل جو قسم" #: hatchpage.ui msgctxt "" @@ -6567,22 +6576,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "نالو" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "روُپ" #: hyperlinkdocpage.ui msgctxt "" @@ -6702,22 +6713,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "نالو" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "روُپ" #: hyperlinkinternetpage.ui msgctxt "" @@ -6801,22 +6814,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "نالو" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "روُپ" #: hyperlinkmailpage.ui msgctxt "" @@ -6959,22 +6974,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "نالو" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "روُپ" #: hyperlinknewdocpage.ui msgctxt "" @@ -7794,22 +7811,24 @@ msgstr "ننڍي ليڪ" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "نمونو" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "Colo_r:" -msgstr "" +msgstr "رنگ" #: linetabpage.ui #, fuzzy @@ -7860,13 +7879,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "ويڪر" #: linetabpage.ui #, fuzzy @@ -7879,13 +7899,14 @@ msgstr "مرڪز" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "ويڪر" #: linetabpage.ui #, fuzzy @@ -7952,13 +7973,14 @@ msgstr "چونڊيو..." #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "ويڪر" #: linetabpage.ui #, fuzzy @@ -8670,13 +8692,14 @@ msgstr "" #: newtoolbardialog.ui +#, fuzzy msgctxt "" "newtoolbardialog.ui\n" "label2\n" "label\n" "string.text" msgid "_Save in:" -msgstr "" +msgstr "۾ سانڍيو" #: numberingformatpage.ui msgctxt "" @@ -10708,13 +10731,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "آڪارُ" #: optfontspage.ui #, fuzzy @@ -12413,13 +12437,14 @@ msgstr "مئڪروز هلائڻ لاءِ سلامتيءَ جي سطح ٺهڪايو ۽ وشواس جوڳا مئڪرو رچيندڙ ڄاڻايو۔" #: optsecuritypage.ui +#, fuzzy msgctxt "" "optsecuritypage.ui\n" "macro\n" "label\n" "string.text" msgid "Macro Securit_y..." -msgstr "" +msgstr "مئڪرو سلامتي" #: optsecuritypage.ui #, fuzzy @@ -14821,22 +14846,24 @@ msgstr "لاڙو ۽ ڪنڊ جو نيم قطر" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "حالت" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "حالت" #: possizetabpage.ui msgctxt "" @@ -14857,13 +14884,14 @@ msgstr "حالت" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "ويڪر" #: possizetabpage.ui #, fuzzy @@ -15314,22 +15342,24 @@ msgstr "رڪارڊ ڏانهن وڃو" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "حالت" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "حالت" #: rotationtabpage.ui msgctxt "" @@ -15779,13 +15809,14 @@ msgstr "شفافيت" #: shadowtabpage.ui +#, fuzzy msgctxt "" "shadowtabpage.ui\n" "FT_SHADOW_COLOR\n" "label\n" "string.text" msgid "_Color:" -msgstr "" +msgstr "رنگ" #: shadowtabpage.ui msgctxt "" @@ -16257,13 +16288,14 @@ msgstr "اُفقي" #: splitcellsdialog.ui +#, fuzzy msgctxt "" "splitcellsdialog.ui\n" "vert\n" "label\n" "string.text" msgid "_Vertically" -msgstr "" +msgstr "عُموُدي" #: splitcellsdialog.ui msgctxt "" @@ -17806,57 +17838,3 @@ "string.text" msgid "View Layout" msgstr "ليئائوٽ نظر مان ڪڍو" - -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "پس منظر" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "پس منظر جو رنگ" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sd/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/sd/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/sd/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sd/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/sd/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/sd/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sd/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sd/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sd/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:10+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1565,6 +1565,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "ريت" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3449,13 +3459,14 @@ msgstr ":صفحن جو تعدادُ" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "intervals\n" "label\n" "string.text" msgid "_Intervals:" -msgstr "" +msgstr "ڪالانتر" #: groupbydate.ui msgctxt "" @@ -4555,13 +4566,14 @@ msgstr "گهڻ قسما ڪاريہ" #: multipleoperationsdialog.ui +#, fuzzy msgctxt "" "multipleoperationsdialog.ui\n" "formulasft\n" "label\n" "string.text" msgid "_Formulas:" -msgstr "" +msgstr "نسخو" #: multipleoperationsdialog.ui msgctxt "" @@ -6065,13 +6077,14 @@ msgstr "" #: pivottablelayoutdialog.ui +#, fuzzy msgctxt "" "pivottablelayoutdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Page Fields:" -msgstr "" +msgstr "سامگري کيتر" #: pivottablelayoutdialog.ui msgctxt "" @@ -10902,93 +10915,3 @@ "string.text" msgid "Grouped by" msgstr "ذريعي گروپ ڪريو" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sd/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sd/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sd/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 14:29+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sd\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431527348.000000\n" +"X-POOTLE-MTIME: 1439598377.000000\n" #: alienwarndialog.ui msgctxt "" @@ -754,7 +754,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/sd/starmath/source.po libreoffice-5.0.5~rc2/translations/source/sd/starmath/source.po --- libreoffice-5.0.2/translations/source/sd/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sd/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sd/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sd/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-09-09 08:34+0000\n" -"Last-Translator: shanmugamr \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:38+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sd\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1410251666.000000\n" +"X-POOTLE-MTIME: 1439599090.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sd/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/sd/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/sd/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sd/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/si/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/si/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/si/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -5291,13 +5291,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "ftForm\n" "label\n" "string.text" msgid "Form:" -msgstr "" +msgstr "සඳහා (_o)" #: fmsearchdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/si/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/si/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/si/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/si/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/si/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/si/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 20:33+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -538,12 +538,13 @@ msgstr "" #: 01010001.xhp +#, fuzzy msgctxt "" "01010001.xhp\n" "par_id3149828\n" "help.text" msgid "Navigator for Master Documents" -msgstr "" +msgstr "වර්ණ" #: 01010100.xhp msgctxt "" @@ -5422,13 +5423,14 @@ msgstr "වර්ණ" #: 01160000.xhp +#, fuzzy msgctxt "" "01160000.xhp\n" "hd_id3153345\n" "6\n" "help.text" msgid "Create HTML Document" -msgstr "" +msgstr "වර්ණ" #: 01160000.xhp msgctxt "" @@ -5598,13 +5600,14 @@ msgstr "වත්මන් මැක්‍රෝව ධාවනය වීම නවත්වයි. ඔබට Shift+Ctrl+Q එබීමටද හැක." #: 01170000.xhp +#, fuzzy msgctxt "" "01170000.xhp\n" "par_id3154184\n" "6\n" "help.text" msgid "Close the current document" -msgstr "" +msgstr "වර්ණ" #: 01180000.xhp msgctxt "" @@ -6654,13 +6657,14 @@ msgstr "සිරස්" #: 02070000.xhp +#, fuzzy msgctxt "" "02070000.xhp\n" "par_id3145169\n" "58\n" "help.text" msgid "Set the shift options for the target cells when the clipboard content is inserted. " -msgstr "" +msgstr "ස්ව නීවැරදි වීම" #: 02070000.xhp msgctxt "" @@ -11056,7 +11060,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -15727,12 +15731,13 @@ msgstr "" #: 05020300.xhp +#, fuzzy msgctxt "" "05020300.xhp\n" "par_id3145364\n" "help.text" msgid "Number format codes" -msgstr "" +msgstr "මෙනුව" #: 05020300.xhp #, fuzzy @@ -21712,13 +21717,14 @@ msgstr "වගු පෙළගැසුම" #: 05040200.xhp +#, fuzzy msgctxt "" "05040200.xhp\n" "par_id3150417\n" "48\n" "help.text" msgid "Specify the alignment options for the cells on a printed page." -msgstr "" +msgstr "ස්ව නීවැරදි වීම" #: 05040200.xhp msgctxt "" @@ -22791,12 +22797,13 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "bm_id9598376\n" "help.text" msgid "Asian Phonetic Guidephonetic guide" -msgstr "" +msgstr "වස්තුව; සංස්කරණය කරමින්සංස්කරණය කරමින්; වස්තුව" #: 05060000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/si/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/si/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/si/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 21:30+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "මුද්‍රිත පිටුවේ පෙරදසුනක් දර්ශනය කරයි නැතිනම් පෙරදසුන වසා දමයි." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "ලේඛනයේ පිටු හරහා ස්ක්‍රෝල් කිරීමට හෝ ලේඛනය මුද්‍රණය කිරීමට පිටු පෙරදසුන් තීරුවේ අයිකන භාවිතා කරන්න." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "ඔබ පෙර දසුනේ සිටිනා විට ලේඛනය සැකසීමට නොහැක." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "පිටු පෙරදසුනෙන් ඉවත් වීමට පෙරදසුන වසාදමන්න බොත්තම ක්ලික් කරන්න." #: 01120000.xhp msgctxt "" @@ -2924,12 +2926,13 @@ msgstr "" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02140000.xhp msgctxt "" @@ -2959,12 +2962,13 @@ msgstr "" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02140000.xhp msgctxt "" @@ -3146,12 +3150,13 @@ msgstr "" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02150000.xhp msgctxt "" @@ -3181,12 +3186,13 @@ msgstr "" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02150000.xhp msgctxt "" @@ -3386,12 +3392,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02160000.xhp msgctxt "" @@ -3421,12 +3428,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02160000.xhp msgctxt "" @@ -3491,12 +3499,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "අයිකනය" #: 02160000.xhp msgctxt "" @@ -4180,13 +4189,14 @@ msgstr "" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "සූචක" #: 04020100.xhp msgctxt "" @@ -13260,13 +13270,14 @@ msgstr "" #: 04120229.xhp +#, fuzzy msgctxt "" "04120229.xhp\n" "par_id3147091\n" "12\n" "help.text" msgid "Formatting bibliography entries" -msgstr "" +msgstr "ග්‍රන්ථ නාමාවලිය" #: 04120250.xhp msgctxt "" @@ -16174,15 +16185,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -21673,13 +21675,14 @@ msgstr "අකුරු මෝස්තර" #: 05130002.xhp +#, fuzzy msgctxt "" "05130002.xhp\n" "hd_id3148489\n" "1\n" "help.text" msgid "Character Style" -msgstr "" +msgstr "සූචක" #: 05130002.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/si/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/si/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/si/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:13+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1248,13 +1248,14 @@ msgstr "" #: databaroptions.ui +#, fuzzy msgctxt "" "databaroptions.ui\n" "label4\n" "label\n" "string.text" msgid "Minimum:" -msgstr "" +msgstr "උපරිම (_M)" #: databaroptions.ui #, fuzzy @@ -1559,6 +1560,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "රිසි" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3917,13 +3928,14 @@ msgstr "අනු ලකුණු කුලකය (_a)" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "පෙළ පරිසීමකය (_x)" #: imoptdialog.ui #, fuzzy @@ -4109,13 +4121,14 @@ msgstr "" #: insertsheet.ui +#, fuzzy msgctxt "" "insertsheet.ui\n" "nameft\n" "label\n" "string.text" msgid "Na_me:" -msgstr "" +msgstr "නම" #: insertsheet.ui msgctxt "" @@ -5568,13 +5581,14 @@ msgstr "" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "පෙළ (_T)" #: pastespecial.ui msgctxt "" @@ -5640,13 +5654,14 @@ msgstr "තේරීම" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "සටහන" #: pastespecial.ui msgctxt "" @@ -5785,13 +5800,14 @@ msgstr "අභිරුචි... (_p)" #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "සටහන" #: pivotfielddialog.ui #, fuzzy @@ -6653,22 +6669,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "මුරපදය (_P)" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "තහවුරු කරන්න (_C)" #: retypepassworddialog.ui msgctxt "" @@ -10453,13 +10471,14 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "උපරිම (_M)" #: validationcriteriapage.ui msgctxt "" @@ -10840,93 +10859,3 @@ "string.text" msgid "Grouped by" msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/si/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/si/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/si/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/si/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/si/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/si/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 15:30+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: si\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431531050.000000\n" +"X-POOTLE-MTIME: 1439598368.000000\n" #: alienwarndialog.ui msgctxt "" @@ -625,13 +625,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "අදහස් (_C)" #: helpcontrol.ui msgctxt "" @@ -754,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2013,11 +2014,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "නැවත පිහිටුවන්න" diff -Nru libreoffice-5.0.2/translations/source/si/starmath/source.po libreoffice-5.0.5~rc2/translations/source/si/starmath/source.po --- libreoffice-5.0.2/translations/source/si/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/si/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/si/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/si/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/si/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-02-17 21:25+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:37+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: si\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1361136304.000000\n" +"X-POOTLE-MTIME: 1439599051.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sid/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sid/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sid/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sid/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: LO4-1\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:20+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -877,13 +877,14 @@ msgstr "Lawaancho" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "_Baqqo" #: areatabpage.ui #, fuzzy @@ -1537,13 +1538,14 @@ msgstr "" #: bitmaptabpage.ui +#, fuzzy msgctxt "" "bitmaptabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "_Bidhiidi kuula" #: bitmaptabpage.ui #, fuzzy @@ -2032,31 +2034,34 @@ msgstr "" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "CalloutDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: calloutdialog.ui msgctxt "" @@ -2555,13 +2560,14 @@ msgstr "Leddi..." #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "Dijiitete malaattara horoonsi'rate netoorkete agarooshshi owaante taje doori. " #: certdialog.ui #, fuzzy @@ -5191,13 +5197,14 @@ msgstr "Huni" #: eventsconfigpage.ui +#, fuzzy msgctxt "" "eventsconfigpage.ui\n" "label2\n" "label\n" "string.text" msgid "Save in:" -msgstr "" +msgstr "Giddo Suuqi" #: eventsconfigpage.ui msgctxt "" @@ -6528,22 +6535,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Su'ma" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "-ra" #: hyperlinkdocpage.ui msgctxt "" @@ -6663,22 +6672,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Su'ma" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "-ra" #: hyperlinkinternetpage.ui msgctxt "" @@ -6762,22 +6773,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Su'ma" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "-ra" #: hyperlinkmailpage.ui msgctxt "" @@ -6916,22 +6929,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Su'ma" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "-ra" #: hyperlinknewdocpage.ui msgctxt "" @@ -7728,22 +7743,24 @@ msgstr "Daashsho" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Akata" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "Colo_r:" -msgstr "" +msgstr "Kuula" #: linetabpage.ui msgctxt "" @@ -7792,13 +7809,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "_Baqqo" #: linetabpage.ui #, fuzzy @@ -7811,13 +7829,14 @@ msgstr "Mereero" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "_Baqqo" #: linetabpage.ui #, fuzzy @@ -7884,13 +7903,14 @@ msgstr "Doori..." #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "_Baqqo" #: linetabpage.ui #, fuzzy @@ -9494,13 +9514,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "indent\n" "label\n" "string.text" msgid "Indent:" -msgstr "" +msgstr "Hu_llo" #: numberingpositionpage.ui msgctxt "" @@ -10626,13 +10647,14 @@ msgstr "Borrangicho" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Bikka" #: optfontspage.ui msgctxt "" @@ -14694,31 +14716,34 @@ msgstr "Riki'meessama" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "PositionAndSizeDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Ofollanna Fooqqisa" #: positionsizedialog.ui msgctxt "" @@ -14739,22 +14764,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ofolla" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ofolla" #: possizetabpage.ui msgctxt "" @@ -14775,13 +14802,14 @@ msgstr "Ofolla" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "_Baqqo" #: possizetabpage.ui #, fuzzy @@ -15230,22 +15258,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ofolla" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ofolla" #: rotationtabpage.ui msgctxt "" @@ -15676,13 +15706,14 @@ msgstr "" #: shadowtabpage.ui +#, fuzzy msgctxt "" "shadowtabpage.ui\n" "FT_DISTANCE\n" "label\n" "string.text" msgid "_Distance:" -msgstr "" +msgstr "Fan_fe" #: shadowtabpage.ui #, fuzzy @@ -16376,13 +16407,14 @@ msgstr "" #: swpossizepage.ui +#, fuzzy msgctxt "" "swpossizepage.ui\n" "horitoft\n" "label\n" "string.text" msgid "_to:" -msgstr "" +msgstr "-Ra" #: swpossizepage.ui #, fuzzy @@ -17154,13 +17186,14 @@ msgstr "Suuti-kuulishsha" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "FT_TRGR_TYPE\n" "label\n" "string.text" msgid "Ty_pe:" -msgstr "" +msgstr "Dana" #: transparencytabpage.ui #, fuzzy @@ -17709,58 +17742,3 @@ "string.text" msgid "View Layout" msgstr "Illachu ofollo" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "_Bidhiidi kuula" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sid/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sid/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sid/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sid/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: LO4-1\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 16:24+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sid\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431534253.000000\n" +"X-POOTLE-MTIME: 1439597706.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1567,6 +1567,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Woyyado:" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/sid/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sid/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sid/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sid/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: LO4-1\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 16:28+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:27+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sid\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=n > 1;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431534495.000000\n" +"X-POOTLE-MTIME: 1439598422.000000\n" #: alienwarndialog.ui msgctxt "" @@ -625,13 +625,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "_Hedo" #: helpcontrol.ui msgctxt "" @@ -754,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2018,11 +2019,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Marqineessi" diff -Nru libreoffice-5.0.2/translations/source/sid/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sid/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sid/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sid/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: LO4-1\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: 2013-08-29 07:31+0000\n" -"Last-Translator: Tadele Assefa \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:38+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Sdaama ICT\n" "Language: sid\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1377761498.000000\n" +"X-POOTLE-MTIME: 1439599080.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sid/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/sid/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/sid/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sid/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sk/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sk/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sk/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-29 20:02+0000\n" -"Last-Translator: Miloš Šrámek \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-14 23:38+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sk\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435608127.000000\n" +"X-POOTLE-MTIME: 1439595518.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME je moderný a ľahko použiteľný kancelársky balík s otvoreným kódom na spracovanie textu, tabuliek, prezentácií a ďalších dokumentov." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 prispievatelia LibreOffice." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/sk/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/sk/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/sk/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-22 07:55+0000\n" "Last-Translator: Miloš Šrámek \n" "Language-Team: LANGUAGE \n" @@ -11040,7 +11040,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -23296,13 +23296,14 @@ msgstr "Text" #: 05080300.xhp +#, fuzzy msgctxt "" "05080300.xhp\n" "par_id3152876\n" "2\n" "help.text" msgid "Centers the selected paragraph(s) on the page." -msgstr "" +msgstr "Zarovná označené odseky k ľavému okraju strany." #: 05080400.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sk/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/sk/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/sk/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 22:08+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "Zobrazí náhľad strany pre tlač alebo zavrie náhľad." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Použite ikonky na paneli nástrojov Náhľad strany k posunu po stránkach dokumentu či k jeho vytlačeniu." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "Dokument v režime náhľadu stránky sa nedá upravovať." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Náhľad stránky ukončíte kliknutím na tlačidlo Zatvoriť náhľad." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Otvorí dialóg Hromadná korešpondencia, kde je možné tlačiť a ukladať listy hromadnej korešpondencie." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Počas tlače sa zodpovedajúce databázové polia (tzv. zástupné znaky) nahradia údajmi z databázy. Viac informácií o vkladaní databázových polí nájdete v pomocníkovi v záložke Databáza, ktorá sa nachádza v ponuke Vložiť - Polia - Ďalšie." #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "Predchádzajúci" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Preskočí na predchádzajúcu položku v dokumente. Typ položky určíte kliknutím na ikonu Navigácia a potom na kategóriu, napr. \"Grafika\". Preskočí na predchádzajúcu položku v dokumente. Typ položky určíte pomocí kliknutia na ikonu Navigácia a potom na kategóriu, napr. \"Grafika\"." #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "Ďalej" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Preskočí na nasledujúcu položku v dokumente. Typ položky určíte pomocou kliknutia na ikonu Navigácia a potom na kategóriu, napr. \"Grafika\". Preskočí na nasledujúcu položku v dokumentu. Typ položky určíte pomocí kliknutia na ikonu Navigácia a potom na kategóriu, napr. \"Grafika\"." #: 02110000.xhp msgctxt "" @@ -2917,12 +2922,13 @@ msgstr "Prejde na predchádzajúce pole rovnakého typu nachádzajúce sa v dokumente. Toto tlačidlo je aktívne iba v prípade, že dokument obsahuje viac ako jedno pole rovnakého typu." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "ikonka" #: 02140000.xhp msgctxt "" @@ -2952,12 +2958,13 @@ msgstr "Prejde na nasledujúce pole rovnakého typu nachádzajúce sa v dokumente. Toto tlačidlo je aktívne iba v prípade, že dokument obsahuje viac ako jedno pole rovnakého typu." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Ikonka" #: 02140000.xhp msgctxt "" @@ -3139,12 +3146,13 @@ msgstr "Prejde k predchádzajúcej značke poznámky pod čiarou alebo vysvetlivky v dokumente." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Ikonka" #: 02150000.xhp msgctxt "" @@ -3174,12 +3182,13 @@ msgstr "Prejde k nasledujúcej značke poznámky pod čiarou alebo vysvetlivky v dokumente." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "ikonka" #: 02150000.xhp msgctxt "" @@ -3379,12 +3388,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Ikona" #: 02160000.xhp msgctxt "" @@ -3414,12 +3424,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Ikonka" #: 02160000.xhp msgctxt "" @@ -3484,12 +3495,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Ikonka" #: 02160000.xhp msgctxt "" @@ -3685,13 +3697,14 @@ msgstr "Tieňovania poľa" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Zobrazuje alebo skrýva tieňovania polí vo vašom dokumente vrátane nezalomiteľných medzier, vlastných pomlčiek, indexov a poznámok pod čiarou." #: 03080000.xhp msgctxt "" @@ -3791,13 +3804,14 @@ msgstr "Pokiaľ zmažete znak konca odseku, prevezme výsledný zlúčený odsek formátovanie toho odseku, v ktorom sa nachádzal kurzor." #: 03100000.xhp +#, fuzzy msgctxt "" "03100000.xhp\n" "par_id3147511\n" "6\n" "help.text" msgid "To specify which nonprinting characters are displayed, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then select the options that you want in the Display of area." -msgstr "" +msgstr "Skryje odsek, ak je splnená zadaná podmienka. Ak chcete funkciu použiť, zvoľte ponuku %PRODUCTNAME - NastaveniaNástroje - Možnosti... - %PRODUCTNAME Writer - Pomôcky pro formátovanie a zrušte zaškrtnutie políčka Polia: Skryté odseky." #: 03120000.xhp msgctxt "" @@ -3878,13 +3892,14 @@ msgstr "Zobrazí alebo skryje skryté odseky. Táto voľba ovplyvní iba zobrazenie na obrazovke a nie tlač skrytých odsekov." #: 03140000.xhp +#, fuzzy msgctxt "" "03140000.xhp\n" "par_id3157875\n" "3\n" "help.text" msgid "To enable this feature, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and ensure that the Hidden paragraphs check box in the Display of area is selected." -msgstr "" +msgstr "Skryje odsek, ak je splnená zadaná podmienka. Ak chcete funkciu použiť, zvoľte ponuku %PRODUCTNAME - NastaveniaNástroje - Možnosti... - %PRODUCTNAME Writer - Pomôcky pro formátovanie a zrušte zaškrtnutie políčka Polia: Skryté odseky." #: 03140000.xhp msgctxt "" @@ -4171,13 +4186,14 @@ msgstr "oblasti; vkladanie oblastí pomocou DDEDDE; príkaz pre vkladanie oblastí" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Oblasti" #: 04020100.xhp msgctxt "" @@ -4198,13 +4214,14 @@ msgstr "Nová oblasť" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Zadajte meno novej oblasti. $[officename] novým oblastiam automaticky priradí meno \"Oblasť X\", pričom X je číslo o jednu väčšie ako číslo predchádzajúcej automaticky vloženej oblasti." #: 04020100.xhp msgctxt "" @@ -4225,13 +4242,14 @@ msgstr "Odkaz" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Vloží obsah iného dokumentu alebo oblasti z iného dokumentu do aktuálnej oblasti." #: 04020100.xhp msgctxt "" @@ -4243,13 +4261,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Vytvorí DDE odkaz. Zaškrtnite toto políčko a potom zadajte DDE príkaz, ktorý chcete použiť. Voľba DDE je dostupná iba ak je zaškrtnuté políčko Odkaz." #: 04020100.xhp msgctxt "" @@ -4270,22 +4289,24 @@ msgstr "Príklad: Ak chcete vložiť oblasť pomenovanú \"Oblasť 1\" z textového dokumentu $[officename] abc.sxw ako DDE odkaz, použite príkaz \"soffice x:abc.sxw Section 1\". Pre vloženie obsahu prvej bunky zo súboru \"abc.xls\" (vo formátu MS Excel) použite príkaz \"excel c:[abc.xls] List1 R1C1\". Môžete tiež skopírovať (Ctrl+C) prvky, ktoré chcete vložiť ako DDE odkaz, a potom zvoliť Úpravy - Vložiť ako. DDE príkaz takto vytvoreného odkazu si potom prehliadnete tak, že označíte obsah odkazu a zvolíte Úpravy - Polia." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Názov súboru / Príkaz DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Zadajte názov súboru (vrátane cesty), ktorý chcete vložiť, alebo súbor vyhľadajte po kliknutí na tlačidlo ....Ak je zaškrtnuté políčko DDE, zadajte DDE príkaz, ktorý chcete použiť. " #: 04020100.xhp msgctxt "" @@ -4414,13 +4435,14 @@ msgstr "Skryť" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Skryje zvolenú oblasť a zabráni, aby bola vytlačená. Súčasti skrytých oblastí sa v Navigátore zobrazujú šedo. Ak necháte v Navigátore chvíli stáť kurzor myši nad skrytým komponentom, zobrazí sa tip \"skrytý\"." #: 04020100.xhp msgctxt "" @@ -4441,13 +4463,14 @@ msgstr "S podmienkou" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Zadajte podmienku, ktorá musí byť pri skrytí oblasti splnená. Podmienkou sa rozumie logický výraz, napríklad \"Titul EQ Slečna\". Pokiaľ napríklad použijete hromadnú korešpondenciu k definícii databázového poľa TITUL, ktorý obsahuje \"Pán\", \"Pani\", \"Slečna\", môžete určiť, aby bola oblasť vytlačená iba, pokiaľ titul bude \"Slečna\"." #: 04020100.xhp msgctxt "" @@ -6524,12 +6547,13 @@ msgstr "Tento formát obsahuje iba číslo odkazu." #: 04090001.xhp +#, fuzzy msgctxt "" "04090001.xhp\n" "par_id0902200804313432\n" "help.text" msgid "Inserts the field as static content, that is, the field cannot be updated." -msgstr "" +msgstr "Vloží pole ako statický obsah. To znamená, že takéto pole nemôže byť aktualizované." #: 04090001.xhp msgctxt "" @@ -10181,13 +10205,14 @@ msgstr "Ak chcete zobraziť podmienený text v závislosti na číslovaní stránok:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Vyberte Vložiť - Pole - Iné a kliknite na záložku Funkcie." #: 04090200.xhp msgctxt "" @@ -10244,13 +10269,14 @@ msgstr "Ak chcete zobraziť podmienený text v závislosti na používateľom definované premenné:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Vyberte Vložiť - Pole - Iné a kliknite na záložku Premenné." #: 04090200.xhp msgctxt "" @@ -10361,13 +10387,14 @@ msgstr "Prvá časť príkladu vloží medzeru medzi \"Meno\" a \"Priezvisko\" poľami v dokumente, druhá časť vloží podmienený text v závislosti na poli. Pre správnu funkciu príkladu je potrebné v $[officename] zaregistrovať dátový zdroj adries." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Vyberte Vložiť - Pole - Iné a kliknite na záložku Databázy." #: 04090200.xhp msgctxt "" @@ -13933,13 +13960,14 @@ msgstr "Názov" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "Vloženie názvu pre hypertextový odkaz." #: 04150000.xhp msgctxt "" @@ -14023,13 +14051,14 @@ msgstr "Nadpis" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "Vloženie názvu pre hypertextový odkaz." #: 04150000.xhp msgctxt "" @@ -16146,15 +16175,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16609,22 +16629,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Naformátuje veľkosť, umiestnenie a ďalšie vlastnosti vybraného obrázku." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Niektoré vlastnosti vybraného obrázku môžete tiež upraviť pomocou klávesových skratiek." #: 05060000.xhp #, fuzzy @@ -16698,13 +16720,14 @@ msgstr "Šírka" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3151180\n" "6\n" "help.text" msgid "Enter the width that you want for the selected object." -msgstr "" +msgstr "Vloženie požadovanej šírky stĺpca." #: 05060100.xhp msgctxt "" @@ -16750,13 +16773,14 @@ msgstr "Výška" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3154099\n" "10\n" "help.text" msgid "Enter the height that you want for the selected object." -msgstr "" +msgstr "Vloženie výšky, ktorú chcete pre vybraný(é) riadok(ky)." #: 05060100.xhp msgctxt "" @@ -18172,13 +18196,14 @@ msgstr "Obtekanie" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Nastavenie možností prevrátenia a odkazu pre vybraný obrázok." #: 05060300.xhp msgctxt "" @@ -18199,13 +18224,14 @@ msgstr "Zvisle" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Prevrátenie vybraného obrázku zvisle." #: 05060300.xhp msgctxt "" @@ -18217,13 +18243,14 @@ msgstr "Vodorovne" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Prevrátenie vybraného obrázku vodorovne." #: 05060300.xhp msgctxt "" @@ -18235,13 +18262,14 @@ msgstr "Na všetkých stranách" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Prevrátenie vybraného obrázku vodorovne na všetkých stranách." #: 05060300.xhp msgctxt "" @@ -18253,13 +18281,14 @@ msgstr "Na ľavých stranách" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Prevrátenie vybraného obrázku vodorovne iba na párnych stranách." #: 05060300.xhp msgctxt "" @@ -18271,13 +18300,14 @@ msgstr "Na pravých stranách" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Prevrátenie vybraného obrázku vodorovne iba na nepárnych stranách." #: 05060300.xhp msgctxt "" @@ -20994,13 +21024,14 @@ msgstr "Šírka" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "Vloženie požadovanej šírky stĺpca." #: 05120200.xhp msgctxt "" @@ -23581,13 +23612,14 @@ msgstr "" #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Skryje odsek, ak je splnená zadaná podmienka. Ak chcete funkciu použiť, zvoľte ponuku %PRODUCTNAME - NastaveniaNástroje - Možnosti... - %PRODUCTNAME Writer - Pomôcky pro formátovanie a zrušte zaškrtnutie políčka Polia: Skryté odseky." #: 06030000.xhp msgctxt "" @@ -23809,13 +23841,14 @@ msgstr "" #: 06060000.xhp +#, fuzzy msgctxt "" "06060000.xhp\n" "par_id3150350\n" "60\n" "help.text" msgid "Select the predefined numbering style that you want to assign to the selected outline level." -msgstr "" +msgstr "Vyberte štýl číslovania, ktorý chcete použiť pre zvolenú úroveň osnovy." #: 06060000.xhp msgctxt "" @@ -25869,13 +25902,14 @@ msgstr "Rozostupy" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "Zadajte medzeru, ktorú chcete vynechať medzi dvoma stĺpcami." #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sk/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sk/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sk/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-30 20:14+0000\n" -"Last-Translator: Miloš Šrámek \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:34+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sk\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435695284.000000\n" +"X-POOTLE-MTIME: 1439598887.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Minimálna hodnota musí byť menšia ako maximálna." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Vlastné" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/sk/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sk/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sk/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-06-29 20:02+0000\n" -"Last-Translator: Miloš Šrámek \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:48+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sk\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435608172.000000\n" +"X-POOTLE-MTIME: 1439599701.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "_Zobraziť licenciu" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/sk/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sk/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sk/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sk/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-29 15:24+0000\n" -"Last-Translator: Miloš \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:00+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432913069.000000\n" +"X-POOTLE-MTIME: 1439600415.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Upraviť úroveň zväčšenia" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/sq/accessibility/source/helper.po libreoffice-5.0.5~rc2/translations/source/sq/accessibility/source/helper.po --- libreoffice-5.0.2/translations/source/sq/accessibility/source/helper.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/accessibility/source/helper.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-06-16 17:55+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-11-26 17:59+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434477318.000000\n" +"X-POOTLE-MTIME: 1448560745.000000\n" #: accessiblestrings.src msgctxt "" @@ -22,7 +22,7 @@ "RID_STR_ACC_NAME_BROWSEBUTTON\n" "string.text" msgid "Browse" -msgstr "Shfleto" +msgstr "Shfleto " #: accessiblestrings.src msgctxt "" @@ -30,7 +30,7 @@ "STR_SVT_ACC_ACTION_EXPAND\n" "string.text" msgid "Expand" -msgstr "Zgjero" +msgstr "Zgjero " #: accessiblestrings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/basctl/source/basicide.po libreoffice-5.0.5~rc2/translations/source/sq/basctl/source/basicide.po --- libreoffice-5.0.2/translations/source/sq/basctl/source/basicide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/basctl/source/basicide.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,18 +4,18 @@ "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:40+0200\n" -"PO-Revision-Date: 2015-05-28 10:17+0000\n" -"Last-Translator: Indrit \n" +"PO-Revision-Date: 2015-10-15 17:44+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: sq\n" "Language: sq\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1432808248.000000\n" +"X-POOTLE-MTIME: 1444931099.000000\n" #: basicprint.src msgctxt "" @@ -24,7 +24,7 @@ "Print range\n" "itemlist.text" msgid "Print range" -msgstr "Intervali i shtypjes" +msgstr "Intervali i shtypjes " #: basicprint.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/basic/source/classes.po libreoffice-5.0.5~rc2/translations/source/sq/basic/source/classes.po --- libreoffice-5.0.2/translations/source/sq/basic/source/classes.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/basic/source/classes.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-04 10:36+0000\n" -"Last-Translator: Dashamir Hoxha \n" +"PO-Revision-Date: 2015-11-02 13:32+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LibreOffice Albanian Translators\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1436006206.000000\n" +"X-POOTLE-MTIME: 1446471176.000000\n" #: sb.src msgctxt "" @@ -51,7 +51,7 @@ "SbERR_BAD_ARGUMENT & ERRCODE_RES_MASK\n" "string.text" msgid "Invalid procedure call." -msgstr "Thirrje procedure e pavlefshme." +msgstr "Thirrje e pavlefshme proçedure." #: sb.src msgctxt "" @@ -168,7 +168,7 @@ "SbERR_PROC_UNDEFINED & ERRCODE_RES_MASK\n" "string.text" msgid "Sub-procedure or function procedure not defined." -msgstr "Nën-procedura ose procedura e funksionit nuk është përcaktuar." +msgstr "Nën-proçedura ose proçedura e funksionit nuk është përcaktuar." #: sb.src msgctxt "" @@ -258,7 +258,7 @@ "SbERR_BAD_RECORD_LENGTH & ERRCODE_RES_MASK\n" "string.text" msgid "Incorrect record length." -msgstr "" +msgstr "Gjatësia e të dhënës është e pasaktë." #: sb.src msgctxt "" @@ -348,7 +348,7 @@ "SbERR_ACCESS_ERROR & ERRCODE_RES_MASK\n" "string.text" msgid "Path/File access error." -msgstr "" +msgstr "Gabim në qasje të shtegut/dosjes." #: sb.src msgctxt "" @@ -375,7 +375,7 @@ "SbERR_BAD_PATTERN & ERRCODE_RES_MASK\n" "string.text" msgid "Invalid string pattern." -msgstr "" +msgstr "Modeli i lidhëses është i pavlefshëm." #: sb.src msgctxt "" @@ -555,7 +555,7 @@ "SbERR_DDE_LINK_INV_TOPIC & ERRCODE_RES_MASK\n" "string.text" msgid "Link mode cannot be set due to invalid link topic." -msgstr "" +msgstr "Mënyra e linkut nuk mund të bëhet për shkak të temës së linkut." #: sb.src msgctxt "" @@ -708,7 +708,7 @@ "SbERR_BAD_LOCALE & ERRCODE_RES_MASK\n" "string.text" msgid "The current locale setting is not supported by the given object." -msgstr "" +msgstr "Vendodhja aktuale nuk është e përkrahur nga objekti i dhënë." #: sb.src msgctxt "" @@ -753,7 +753,7 @@ "SbERR_BAD_ORDINAL & ERRCODE_RES_MASK\n" "string.text" msgid "Invalid ordinal number." -msgstr "" +msgstr "Numër i gabuar i renditjes." #: sb.src msgctxt "" @@ -771,7 +771,7 @@ "SbERR_BAD_CLIPBD_FORMAT & ERRCODE_RES_MASK\n" "string.text" msgid "Invalid clipboard format." -msgstr "" +msgstr "Format i pavlefshëm i bllokut" #: sb.src msgctxt "" @@ -1207,7 +1207,7 @@ "ERRCODE_BASMGR_MGROPEN & ERRCODE_RES_MASK\n" "string.text" msgid "The BASIC from the file '$(ARG1)' could not be initialized." -msgstr "" +msgstr "BASIC nga skedari '$(ARG1)' nuk mund të fillohej" #: sb.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/chart2/source/controller/dialogs.po libreoffice-5.0.5~rc2/translations/source/sq/chart2/source/controller/dialogs.po --- libreoffice-5.0.2/translations/source/sq/chart2/source/controller/dialogs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/chart2/source/controller/dialogs.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-06-21 23:06+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2016-01-15 13:58+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LibreOffice Albanian Translators\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1434927971.000000\n" +"X-POOTLE-MTIME: 1452866283.000000\n" #: Strings.src msgctxt "" @@ -23,7 +23,7 @@ "STR_DLG_CHART_WIZARD\n" "string.text" msgid "Chart Wizard" -msgstr "" +msgstr "udhëzues tabelë " #: Strings.src msgctxt "" @@ -31,7 +31,7 @@ "STR_DLG_SMOOTH_LINE_PROPERTIES\n" "string.text" msgid "Smooth Lines" -msgstr "" +msgstr "Vija të lëmuara" #: Strings.src msgctxt "" @@ -527,7 +527,7 @@ "STR_OBJECT_CURVE\n" "string.text" msgid "Trend Line" -msgstr "" +msgstr "Linjë Tendencë" #: Strings.src msgctxt "" @@ -535,7 +535,7 @@ "STR_OBJECT_CURVES\n" "string.text" msgid "Trend Lines" -msgstr "" +msgstr "Linjë Tendencë" #: Strings.src msgctxt "" @@ -663,7 +663,7 @@ "STR_TIP_DATAPOINT_INDEX\n" "string.text" msgid "Data Point %POINTNUMBER" -msgstr "" +msgstr "Pika e të dhënave %POINTNUMBER" #: Strings.src msgctxt "" @@ -767,7 +767,7 @@ "STR_ACTION_TOGGLE_GRID_HORZ\n" "string.text" msgid "Horizontal grid major/major&minor/off" -msgstr "" +msgstr "Rreshti i madh horizontal/i madh&i vogël/çkyçur" #: Strings.src msgctxt "" @@ -775,7 +775,7 @@ "STR_ACTION_TOGGLE_GRID_VERTICAL\n" "string.text" msgid "Vertical grid major/major&minor/off" -msgstr "" +msgstr "Rreshti i madh vertikal/i madh&i vogël/çkyçur" #: Strings.src msgctxt "" @@ -871,7 +871,7 @@ "STR_DATA_ROLE_X_ERROR_POSITIVE\n" "string.text" msgid "Positive X-Error-Bars" -msgstr "" +msgstr "Random Bars Horizontal" #: Strings.src msgctxt "" @@ -895,7 +895,7 @@ "STR_DATA_ROLE_Y_ERROR_POSITIVE\n" "string.text" msgid "Positive Y-Error-Bars" -msgstr "" +msgstr "Random Bars Horizontal" #: Strings.src msgctxt "" @@ -1083,7 +1083,7 @@ "STR_PIE_EXPLODED\n" "string.text" msgid "Exploded Pie Chart" -msgstr "" +msgstr "Rrëmujë shkatërruese nga $(PERCENT) përqindja" #: Strings_ChartTypes.src msgctxt "" @@ -1115,7 +1115,7 @@ "STR_TYPE_XY\n" "string.text" msgid "XY (Scatter)" -msgstr "" +msgstr "XY (Shpërndarje)" #: Strings_ChartTypes.src msgctxt "" @@ -1171,7 +1171,7 @@ "STR_LINE_STACKEDCOLUMN\n" "string.text" msgid "Stacked Columns and Lines" -msgstr "" +msgstr "Kolona dhe rreshta të grumbulluar" #: Strings_ChartTypes.src msgctxt "" @@ -1187,7 +1187,7 @@ "STR_TYPE_STOCK\n" "string.text" msgid "Stock" -msgstr "" +msgstr "Material Diagrami" #: Strings_ChartTypes.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/chart2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sq/chart2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sq/chart2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/chart2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-03 17:39+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2016-01-15 15:43+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LibreOffice Albanian Translators\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1438623591.000000\n" +"X-POOTLE-MTIME: 1452872611.000000\n" #: 3dviewdialog.ui msgctxt "" @@ -123,7 +123,7 @@ "label\n" "string.text" msgid "Move Series Right" -msgstr "" +msgstr "Lëviz Seritë në të Djathtë" #: chartdatadialog.ui msgctxt "" @@ -159,7 +159,7 @@ "title\n" "string.text" msgid "Data Labels for all Data Series" -msgstr "" +msgstr "Etiketat e të Dhënave për të gjitha Seritë e të Dhënave" #: dlg_DataLabel.ui msgctxt "" @@ -195,7 +195,7 @@ "label\n" "string.text" msgid "Show _legend key" -msgstr "" +msgstr "Trego_ikonën e legjendës" #: dlg_DataLabel.ui msgctxt "" @@ -591,7 +591,7 @@ "label\n" "string.text" msgid "Select Range for Positive Error Bars" -msgstr "" +msgstr "selekto rangun për gabime pozitive të grafikut" #: dlg_InsertErrorBars.ui msgctxt "" @@ -600,7 +600,7 @@ "label\n" "string.text" msgid "Select Range for Negative Error Bars" -msgstr "" +msgstr "selekto rangun për gabime negative të grafikut" #: dlg_InsertErrorBars.ui msgctxt "" @@ -636,7 +636,7 @@ "2\n" "stringlist.text" msgid "Variance" -msgstr "" +msgstr "varianca" #: dlg_InsertErrorBars.ui msgctxt "" @@ -645,7 +645,7 @@ "3\n" "stringlist.text" msgid "Error Margin" -msgstr "" +msgstr "Diferencë e Gabuar" #: dlg_InsertLegend.ui msgctxt "" @@ -870,7 +870,7 @@ "label\n" "string.text" msgid "Minor Grids" -msgstr "" +msgstr "Rrjetat e Vogla" #: inserttitledlg.ui msgctxt "" @@ -1230,7 +1230,7 @@ "2\n" "stringlist.text" msgid "Custom" -msgstr "" +msgstr "Personalizo" #: tp_3D_SceneGeometry.ui msgctxt "" @@ -1545,7 +1545,7 @@ "label\n" "string.text" msgid "Axis Line" -msgstr "" +msgstr "Boshti i Linjës" #: tp_AxisPositions.ui msgctxt "" @@ -1554,7 +1554,7 @@ "label\n" "string.text" msgid "_Place labels" -msgstr "" +msgstr "Vendos Etiketat" #: tp_AxisPositions.ui msgctxt "" @@ -1581,7 +1581,7 @@ "2\n" "stringlist.text" msgid "Outside start" -msgstr "" +msgstr "fillo jashtë" #: tp_AxisPositions.ui msgctxt "" @@ -1590,7 +1590,7 @@ "3\n" "stringlist.text" msgid "Outside end" -msgstr "" +msgstr "mbaro jashtë" #: tp_AxisPositions.ui msgctxt "" @@ -1617,7 +1617,7 @@ "label\n" "string.text" msgid "Major:" -msgstr "" +msgstr "kryesor" #: tp_AxisPositions.ui msgctxt "" @@ -1671,7 +1671,7 @@ "label\n" "string.text" msgid "Place _marks" -msgstr "" +msgstr "Vendos shenjat" #: tp_AxisPositions.ui msgctxt "" @@ -1707,7 +1707,7 @@ "label\n" "string.text" msgid "Interval Marks" -msgstr "" +msgstr "Interval Shënimesh" #: tp_AxisPositions.ui msgctxt "" @@ -1725,7 +1725,7 @@ "label\n" "string.text" msgid "_Show minor grid" -msgstr "" +msgstr "_Trego rrjetat e vogla" #: tp_AxisPositions.ui msgctxt "" @@ -1806,7 +1806,7 @@ "label\n" "string.text" msgid "_Stack series" -msgstr "" +msgstr "_Seri Grumbujsh" #: tp_ChartType.ui msgctxt "" @@ -1977,7 +1977,7 @@ "label\n" "string.text" msgid "Show _legend key" -msgstr "" +msgstr "Trego_ikonën e legjendës" #: tp_DataLabel.ui msgctxt "" @@ -2247,7 +2247,7 @@ "label\n" "string.text" msgid "Customize Data Ranges for Individual Data Series" -msgstr "" +msgstr "Personalizo Vargjet e të Dhënave për Serinë e të Dhënave Individuale" #: tp_DataSource.ui msgctxt "" @@ -2256,7 +2256,7 @@ "label\n" "string.text" msgid "Data _series:" -msgstr "" +msgstr "Të Dhënat_serike:" #: tp_DataSource.ui msgctxt "" @@ -2310,7 +2310,7 @@ "label\n" "string.text" msgid "Data _labels" -msgstr "" +msgstr "Të Dhëna_etiketash" #: tp_ErrorBars.ui msgctxt "" @@ -2499,7 +2499,7 @@ "2\n" "stringlist.text" msgid "Variance" -msgstr "" +msgstr "Mospërputhje" #: tp_ErrorBars.ui msgctxt "" @@ -2670,7 +2670,7 @@ "label\n" "string.text" msgid "Data series in _rows" -msgstr "" +msgstr "Të dhëna serike në_rreshta" #: tp_RangeChooser.ui msgctxt "" @@ -2679,7 +2679,7 @@ "label\n" "string.text" msgid "Data series in _columns" -msgstr "" +msgstr "Të dhëna serike në_kolona" #: tp_RangeChooser.ui msgctxt "" @@ -2724,7 +2724,7 @@ "label\n" "string.text" msgid "End Table Index" -msgstr "" +msgstr "Treguesi i Fundit të Tabelës" #: tp_RangeChooser.ui msgctxt "" @@ -2967,7 +2967,7 @@ "label\n" "string.text" msgid "Align Data Series to" -msgstr "" +msgstr "Rradhit Të Dhënat Serike në" #: tp_SeriesToAxis.ui msgctxt "" @@ -3174,7 +3174,7 @@ "label\n" "string.text" msgid "Force _Intercept" -msgstr "" +msgstr "_Ndërprerje me forcë" #: tp_Trendline.ui msgctxt "" @@ -3453,7 +3453,7 @@ "label\n" "string.text" msgid "Choose Titles, Legend, and Grid Settings" -msgstr "" +msgstr "Zgjidh Titujt, Hartat dhe Rregullimet e Rrjetës" #: wizelementspage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po --- libreoffice-5.0.2/translations/source/sq/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-31 12:27+0000\n" -"Last-Translator: Indrit \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-10-08 17:08+0000\n" +"Last-Translator: DenisaRucaj \n" "Language-Team: LANGUAGE \n" "Language: sq\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1422707223.000000\n" +"X-POOTLE-MTIME: 1444324133.000000\n" #: Drivers.xcu msgctxt "" @@ -41,4 +41,4 @@ "DriverTypeDisplayName\n" "value.text" msgid "Groupwise" -msgstr "" +msgstr "Groupwise" diff -Nru libreoffice-5.0.2/translations/source/sq/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po --- libreoffice-5.0.2/translations/source/sq/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-12-30 12:48+0000\n" -"Last-Translator: Indrit \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-10-08 17:13+0000\n" +"Last-Translator: DenisaRucaj \n" "Language-Team: LANGUAGE \n" "Language: sq\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1419943709.000000\n" +"X-POOTLE-MTIME: 1444324437.000000\n" #: Drivers.xcu msgctxt "" @@ -23,7 +23,7 @@ "DriverTypeDisplayName\n" "value.text" msgid "Firebird Embedded" -msgstr "" +msgstr "Skedar Firebird" #: Drivers.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po --- libreoffice-5.0.2/translations/source/sq/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:01+0100\n" -"PO-Revision-Date: 2013-10-30 14:11+0000\n" -"Last-Translator: AleksanderKoko \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-10-08 17:16+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LANGUAGE \n" "Language: sq\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1383142302.0\n" +"X-POOTLE-MTIME: 1444324596.000000\n" #: Drivers.xcu msgctxt "" @@ -23,4 +23,4 @@ "DriverTypeDisplayName\n" "value.text" msgid "HSQLDB Embedded" -msgstr "" +msgstr "HSQLDB Ndërfutje" diff -Nru libreoffice-5.0.2/translations/source/sq/connectivity/source/resource.po libreoffice-5.0.5~rc2/translations/source/sq/connectivity/source/resource.po --- libreoffice-5.0.2/translations/source/sq/connectivity/source/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/connectivity/source/resource.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-03 17:43+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2016-01-15 15:45+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438623785.000000\n" +"X-POOTLE-MTIME: 1452872726.000000\n" #: conn_error_message.src msgctxt "" @@ -46,7 +46,7 @@ "256 + 2*301 + 0\n" "string.text" msgid "$1$ is no SQL conform identifier." -msgstr "" +msgstr "$1$ nuk është nje identifikues i përshtatshëm SQL" #: conn_error_message.src msgctxt "" @@ -224,7 +224,7 @@ "STR_STMT_TYPE_NOT_SUPPORTED\n" "string.text" msgid "This statement type not supported by this database driver." -msgstr "" +msgstr "Kjo lloj deklaratë nuk mbështetet nga ky driver i bazës së të dhënave." #: conn_shared_res.src msgctxt "" @@ -376,7 +376,7 @@ "STR_NO_INPUTSTREAM\n" "string.text" msgid "The input stream was not set." -msgstr "" +msgstr "Burimi i të dhënave hyrëse nuk ishte vendosur" #: conn_shared_res.src msgctxt "" @@ -392,7 +392,7 @@ "STR_INVALID_BOOKMARK\n" "string.text" msgid "Invalid bookmark value" -msgstr "" +msgstr "Vlera e pavlefshme e faqerojtësit." #: conn_shared_res.src msgctxt "" @@ -424,7 +424,7 @@ "STR_ERRORMSG_SEQUENCE\n" "string.text" msgid "Function sequence error." -msgstr "" +msgstr "Sekuencë e gabuar funksioni" #: conn_shared_res.src msgctxt "" @@ -432,7 +432,7 @@ "STR_INVALID_INDEX\n" "string.text" msgid "Invalid descriptor index." -msgstr "" +msgstr "Indeksi i objektit është i pavlefshëm" #: conn_shared_res.src msgctxt "" @@ -464,7 +464,7 @@ "STR_STRING_LENGTH_EXCEEDED\n" "string.text" msgid "The string '$string$' exceeds the maximum length of $maxlen$ characters when converted to the target character set '$charset$'." -msgstr "" +msgstr "Vargu '$ string $' tejkalon gjatësinë maksimale prej $ maxlen $ karaktere, kur është konvertuar në grupin e synuar të karaktereve '$ e karaktereve $'." #: conn_shared_res.src msgctxt "" @@ -670,7 +670,7 @@ "STR_COULD_NOT_DELETE_INDEX\n" "string.text" msgid "The index could not be deleted. An unknown error while accessing the file system occurred." -msgstr "" +msgstr "Treguesi nuk mund të fshihet. Ndodhi një gabim i panjohur gjatë aksesimit në sistem. " #: conn_shared_res.src msgctxt "" @@ -1120,4 +1120,4 @@ "STR_ERROR_NEW_VERSION\n" "string.text" msgid "The connection could not be established. The database was created by a newer version of %PRODUCTNAME." -msgstr "" +msgstr "Lidhja nuk mund të krijohet. Baza e të dhënave është krijuar nga një version më i ri i %PRODUCTNAME." diff -Nru libreoffice-5.0.2/translations/source/sq/cui/source/customize.po libreoffice-5.0.5~rc2/translations/source/sq/cui/source/customize.po --- libreoffice-5.0.2/translations/source/sq/cui/source/customize.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/cui/source/customize.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-17 15:51+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-02 19:47+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439826718.000000\n" +"X-POOTLE-MTIME: 1443815240.000000\n" #: acccfg.src msgctxt "" @@ -435,7 +435,7 @@ "RID_SVXSTR_EVENT_MODIFYCHANGED\n" "string.text" msgid "'Modified' status was changed" -msgstr "" +msgstr "Statusi \"Ndryshuar\" është ndërruar." #: macropg.src msgctxt "" @@ -891,7 +891,7 @@ "RID_SVXSTR_EVENT_DOUBLECLICK\n" "string.text" msgid "Double click" -msgstr "Klikoni dy herë" +msgstr "Kërcitje dyshe" #: macropg.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/cui/source/dialogs.po libreoffice-5.0.5~rc2/translations/source/sq/cui/source/dialogs.po --- libreoffice-5.0.2/translations/source/sq/cui/source/dialogs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/cui/source/dialogs.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-17 21:22+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-10-04 13:40+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434576177.000000\n" +"X-POOTLE-MTIME: 1443966027.000000\n" #: cuires.src msgctxt "" @@ -111,7 +111,7 @@ "RID_SVXSTR_ENGINEERING\n" "string.text" msgid "Engineering notation" -msgstr "" +msgstr "Shënim inxhinierik" #: cuires.src msgctxt "" @@ -239,7 +239,7 @@ "RID_STR_SEARCH_NORECORD\n" "string.text" msgid "No records corresponding to your data found." -msgstr "" +msgstr "Asnjë e dhënë nuk korespondon me të dhënat e gjetura." #: fmsearch.src msgctxt "" @@ -271,7 +271,7 @@ "RID_STR_SEARCH_COUNTING\n" "string.text" msgid "counting records" -msgstr "" +msgstr "duke numëruar të dhënat" #: gallery.src msgctxt "" @@ -375,7 +375,7 @@ "RID_SVXSTR_HYPERDLG_HLINETTP_HELP\n" "string.text" msgid "This is where you create a hyperlink to a Web page or FTP server connection." -msgstr "" +msgstr "Këtu mund të krijoni një ndërlidhje në një faqe Web-i ose një lidhje serveri FTP." #: hyperdlg.src msgctxt "" @@ -383,7 +383,7 @@ "RID_SVXSTR_HYPERDLG_HLMAILTP\n" "string.text" msgid "Mail" -msgstr "" +msgstr "Posta" #: hyperdlg.src msgctxt "" @@ -391,7 +391,7 @@ "RID_SVXSTR_HYPERDLG_HLMAILTP_HELP\n" "string.text" msgid "This is where you create a hyperlink to an e-mail address." -msgstr "" +msgstr "Këtu ju krijoni një ndërlidhje në një adresë e-maili." #: hyperdlg.src msgctxt "" @@ -407,7 +407,7 @@ "RID_SVXSTR_HYPERDLG_HLDOCTP_HELP\n" "string.text" msgid "This is where you create a hyperlink to an existing document or a target within a document." -msgstr "" +msgstr "Këtu ju mund të krijoni një ndërlidhje në një dokument ekzistues ose një objektiv brenda dokumentit." #: hyperdlg.src msgctxt "" @@ -423,7 +423,7 @@ "RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP\n" "string.text" msgid "This is where you create a new document to which the new link points." -msgstr "" +msgstr "Këtu ju krijoni një dokument të ri në të cilin linku i ri nënvizohet." #: hyperdlg.src msgctxt "" @@ -487,7 +487,7 @@ "RID_SVXSTR_ADD_IMAGE\n" "string.text" msgid "Add Image" -msgstr "" +msgstr "Shto një figurë" #: passwdomdlg.src msgctxt "" @@ -527,7 +527,7 @@ "RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2\n" "string.text" msgid "Set the password by entering the same password in both boxes." -msgstr "" +msgstr "Vendos fjalëkalimin duke shkruar të njëjtin fjalëkalim në të dyja kutitë." #: scriptdlg.src msgctxt "" @@ -639,7 +639,7 @@ "RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED\n" "string.text" msgid "The scripting language %LANGUAGENAME is not supported." -msgstr "" +msgstr "Gjuha e shkruar %LANGUAGENAME nuk aprovohet. " #: scriptdlg.src msgctxt "" @@ -679,7 +679,7 @@ "RID_SVXSTR_FRAMEWORK_ERROR_RUNNING\n" "string.text" msgid "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME." -msgstr "" +msgstr "Ndodhi një gabim në të shkruar në sistem gjatë ekzekutimit të skriptit %LANGUAGENAME %SCRIPTNAME." #: scriptdlg.src msgctxt "" @@ -687,7 +687,7 @@ "RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE\n" "string.text" msgid "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER." -msgstr "" +msgstr "Ndodhi një gabim gjatë ekzekutimit të skriptit %LANGUAGENAME %SCRIPTNAME në rreshtin: %LINENUMBER." #: scriptdlg.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/cui/source/options.po libreoffice-5.0.5~rc2/translations/source/sq/cui/source/options.po --- libreoffice-5.0.2/translations/source/sq/cui/source/options.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/cui/source/options.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-06-17 22:13+0000\n" +"PO-Revision-Date: 2015-11-10 10:52+0000\n" "Last-Translator: Indrit Bashkimi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434579191.000000\n" +"X-POOTLE-MTIME: 1447152741.000000\n" #: connpooloptions.src msgctxt "" @@ -22,7 +22,7 @@ "RID_SVXSTR_DRIVER_NAME\n" "string.text" msgid "Driver name" -msgstr "" +msgstr "Emri i drejtuesit" #: connpooloptions.src msgctxt "" @@ -30,7 +30,7 @@ "RID_SVXSTR_POOLED_FLAG\n" "string.text" msgid "Pool" -msgstr "" +msgstr "Bashkësi" #: connpooloptions.src msgctxt "" @@ -126,7 +126,7 @@ "RID_SVXSTR_DIAGRAM_ROW\n" "string.text" msgid "Data Series $(ROW)" -msgstr "" +msgstr "Vargu i të dhënave $(ROW)" #: optchart.src msgctxt "" @@ -134,7 +134,7 @@ "RID_OPTSTR_COLOR_CHART_DELETE\n" "string.text" msgid "Chart Color Deletion" -msgstr "" +msgstr "Konfirmo fshirjen e ngjyrës së grafikut" #: optcolor.src msgctxt "" @@ -202,7 +202,7 @@ "RID_SVXSTR_HEADER1\n" "string.text" msgid "[L]" -msgstr "" +msgstr "[L]" #: optfltr.src msgctxt "" @@ -210,7 +210,7 @@ "RID_SVXSTR_HEADER2\n" "string.text" msgid "[S]" -msgstr "" +msgstr "[S]" #: optfltr.src msgctxt "" @@ -283,6 +283,8 @@ "The folder you selected does not contain a Java runtime environment.\n" "Please select a different folder." msgstr "" +"Dosja që ju zgjodhët nuk përmban një mjedis ekzekutimi në Java.\n" +"Ju lutemi zgjidhni një dosje tjetër." #: optjava.src msgctxt "" @@ -293,6 +295,8 @@ "The Java runtime environment you selected is not the required version.\n" "Please select a different folder." msgstr "" +"Mjedisi i ekzekutimit në Java që ju zgjodhët nuk është versioni i kërkuar.\n" +"Ju lutemi zgjidhni një dosje tjetër." #: optjava.src msgctxt "" @@ -360,7 +364,7 @@ "RID_SVXSTR_SPELL_SPECIAL\n" "string.text" msgid "Check special regions" -msgstr "" +msgstr "Kontrollo rajonet e veçanta" #: optlingu.src msgctxt "" @@ -392,7 +396,7 @@ "RID_SVXSTR_NUM_PRE_BREAK\n" "string.text" msgid "Characters before line break: " -msgstr "" +msgstr "Karakteret para linjës ndarëse:" #: optlingu.src msgctxt "" @@ -400,7 +404,7 @@ "RID_SVXSTR_NUM_POST_BREAK\n" "string.text" msgid "Characters after line break: " -msgstr "" +msgstr "Karakteret pas linjës ndarëse:" #: optlingu.src msgctxt "" @@ -416,7 +420,7 @@ "RID_SVXSTR_HYPH_SPECIAL\n" "string.text" msgid "Hyphenate special regions" -msgstr "" +msgstr "Hifeno rajonet e veçanta" #: optlingu.src msgctxt "" @@ -432,7 +436,7 @@ "RID_SVXSTR_LINGU_DICS_EDIT_DIC\n" "string.text" msgid "Edit User-defined dictionaries" -msgstr "" +msgstr "Ndrysho fjalorët e përdoruesve të përcaktuar" #: optlingu.src msgctxt "" @@ -584,7 +588,7 @@ "RID_SVXSTR_KEY_ADDINS_PATH\n" "string.text" msgid "Add-ins" -msgstr "" +msgstr "Shtesat" #: optpath.src msgctxt "" @@ -616,7 +620,7 @@ "RID_SVXSTR_KEY_LINGUISTIC_DIR\n" "string.text" msgid "Writing aids" -msgstr "" +msgstr "Duke shkruar ndihmën" #: personalization.src msgctxt "" @@ -732,7 +736,7 @@ "Memory\n" "itemlist.text" msgid "Memory" -msgstr "Memoria" +msgstr "Kujtesa" #: treeopt.src msgctxt "" @@ -795,7 +799,7 @@ "Personalization\n" "itemlist.text" msgid "Personalization" -msgstr "" +msgstr "Personalizim" #: treeopt.src msgctxt "" @@ -813,7 +817,7 @@ "Accessibility\n" "itemlist.text" msgid "Accessibility" -msgstr "" +msgstr "Aksesueshmëria" #: treeopt.src msgctxt "" @@ -831,7 +835,7 @@ "Basic IDE Options\n" "itemlist.text" msgid "Basic IDE Options" -msgstr "" +msgstr "Mundësitë e ideve bazë" #: treeopt.src msgctxt "" @@ -876,7 +880,7 @@ "Writing Aids\n" "itemlist.text" msgid "Writing Aids" -msgstr "" +msgstr "Duke shkruar ndihmën" #: treeopt.src msgctxt "" @@ -903,7 +907,7 @@ "Complex Text Layout\n" "itemlist.text" msgid "Complex Text Layout" -msgstr "" +msgstr "Planimetri e Komplikuar e Tekstit" #: treeopt.src msgctxt "" @@ -966,7 +970,7 @@ "Formatting Aids\n" "itemlist.text" msgid "Formatting Aids" -msgstr "" +msgstr "Duke formatuar ndihmën" #: treeopt.src msgctxt "" @@ -1056,7 +1060,7 @@ "AutoCaption\n" "itemlist.text" msgid "AutoCaption" -msgstr "" +msgstr "TitullAutomatik" #: treeopt.src msgctxt "" @@ -1092,7 +1096,7 @@ "Formatting Aids\n" "itemlist.text" msgid "Formatting Aids" -msgstr "" +msgstr "Duke formatuar ndihmën" #: treeopt.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/cui/source/tabpages.po libreoffice-5.0.5~rc2/translations/source/sq/cui/source/tabpages.po --- libreoffice-5.0.2/translations/source/sq/cui/source/tabpages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/cui/source/tabpages.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-17 09:08+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-11-02 13:37+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434532080.000000\n" +"X-POOTLE-MTIME: 1446471467.000000\n" #: border.src msgctxt "" @@ -22,7 +22,7 @@ "RID_SVXSTR_TABLE_PRESET_NONE\n" "string.text" msgid "Set No Borders" -msgstr "" +msgstr "Mos Vendos Asnjë Kufi" #: border.src msgctxt "" @@ -30,7 +30,7 @@ "RID_SVXSTR_TABLE_PRESET_ONLYOUTER\n" "string.text" msgid "Set Outer Border Only" -msgstr "" +msgstr "Vendos Vetëm Kufijtë e Jashtëm" #: border.src msgctxt "" @@ -38,7 +38,7 @@ "RID_SVXSTR_TABLE_PRESET_OUTERHORI\n" "string.text" msgid "Set Outer Border and Horizontal Lines" -msgstr "" +msgstr "Vendos Kufijtë e Jashtëm dhe Linjat Horizontale" #: border.src msgctxt "" @@ -46,7 +46,7 @@ "RID_SVXSTR_TABLE_PRESET_OUTERALL\n" "string.text" msgid "Set Outer Border and All Inner Lines" -msgstr "" +msgstr "Vendos Kufijtë e Jashtëm dhe të Gjitha Linjat e Brendshme" #: border.src msgctxt "" @@ -54,7 +54,7 @@ "RID_SVXSTR_TABLE_PRESET_OUTERINNER\n" "string.text" msgid "Set Outer Border Without Changing Inner Lines" -msgstr "" +msgstr "Vendos Kufijtë e Jashtëm Pa Ndryshuar Linjat e Brendshme" #: border.src msgctxt "" @@ -62,7 +62,7 @@ "RID_SVXSTR_PARA_PRESET_DIAGONAL\n" "string.text" msgid "Set Diagonal Lines Only" -msgstr "" +msgstr "Vendos Vetëm Linjat Diagonale" #: border.src msgctxt "" @@ -70,7 +70,7 @@ "RID_SVXSTR_PARA_PRESET_ALL\n" "string.text" msgid "Set All Four Borders" -msgstr "" +msgstr "Vendos të Katërt Kufijtë" #: border.src msgctxt "" @@ -78,7 +78,7 @@ "RID_SVXSTR_PARA_PRESET_LEFTRIGHT\n" "string.text" msgid "Set Left and Right Borders Only" -msgstr "" +msgstr "Vendos Vetëm Kufijtë Majtas dhe Djathtas" #: border.src msgctxt "" @@ -86,7 +86,7 @@ "RID_SVXSTR_PARA_PRESET_TOPBOTTOM\n" "string.text" msgid "Set Top and Bottom Borders Only" -msgstr "" +msgstr "Vendos Vetëm Kufijtë e Sipërm dhe të Poshtëm" #: border.src msgctxt "" @@ -94,7 +94,7 @@ "RID_SVXSTR_PARA_PRESET_ONLYLEFT\n" "string.text" msgid "Set Left Border Only" -msgstr "" +msgstr "Vendos Vetëm Kufirin Majtas" #: border.src msgctxt "" @@ -102,7 +102,7 @@ "RID_SVXSTR_HOR_PRESET_ONLYHOR\n" "string.text" msgid "Set Top and Bottom Borders, and All Inner Lines" -msgstr "" +msgstr "Vendos Kufijtë e Sipërm dhe të Poshtëm, dhe të Gjitha Linjat e Brendshme" #: border.src msgctxt "" @@ -110,7 +110,7 @@ "RID_SVXSTR_VER_PRESET_ONLYVER\n" "string.text" msgid "Set Left and Right Borders, and All Inner Lines" -msgstr "" +msgstr "Vendos Kufijtë Majtas dhe Djathtas, dhe të Gjitha Linjat e Brendshme" #: border.src msgctxt "" @@ -126,7 +126,7 @@ "RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT\n" "string.text" msgid "Cast Shadow to Bottom Right" -msgstr "" +msgstr "Hidh Hije Poshtë- Djathtas" #: border.src msgctxt "" @@ -142,7 +142,7 @@ "RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT\n" "string.text" msgid "Cast Shadow to Bottom Left" -msgstr "" +msgstr "Hidh Hije Poshtë- Majtas" #: border.src msgctxt "" @@ -150,7 +150,7 @@ "RID_SVXSTR_SHADOW_STYLE_TOPLEFT\n" "string.text" msgid "Cast Shadow to Top Left" -msgstr "" +msgstr "Hidh Hije Lart- Majtas" #: frmdirlbox.src msgctxt "" @@ -296,7 +296,7 @@ "Long Bond\n" "itemlist.text" msgid "Long Bond" -msgstr "" +msgstr "lidhje të gjatë" #: page.src msgctxt "" @@ -593,7 +593,7 @@ "Long Bond\n" "itemlist.text" msgid "Long Bond" -msgstr "" +msgstr "Lidhje e gjatë" #: page.src msgctxt "" @@ -807,7 +807,7 @@ "RID_SVXSTR_DESC_EXT_BITMAP\n" "string.text" msgid "Please enter a name for the external bitmap:" -msgstr "" +msgstr "Ju lutem jepni një emër për bitmap-in e jashtëm:" #: strings.src msgctxt "" @@ -818,6 +818,8 @@ "The bitmap was modified without saving. \n" "Modify the selected bitmap or add a new bitmap." msgstr "" +"Bitmap është modifikuar pa u ruajtur. \n" +"Modifiko bitmap-in e zgjedhur ose shto një të re." #: strings.src msgctxt "" @@ -845,7 +847,7 @@ "RID_SVXSTR_DESC_HATCH\n" "string.text" msgid "Please enter a name for the hatching:" -msgstr "" +msgstr "Ju lutem jepni një emër për pjesen e vijëzuar:" #: strings.src msgctxt "" @@ -856,6 +858,8 @@ "The hatching type was modified but not saved. \n" "Modify the selected hatching type or add a new hatching type." msgstr "" +"Lloji i vijëzimit u ndryshua, por nuk u ruajt. \n" +"Ndrysho llojin e vijëzimit të përzgjedhjes ose shto një lloj të ri vijëzimi." #: strings.src msgctxt "" @@ -963,7 +967,7 @@ "RID_SVXSTR_CHARNAME_HIGHLIGHTING\n" "string.text" msgid "Highlighting Color" -msgstr "" +msgstr "Ngjyrë dalluese" #: strings.src msgctxt "" @@ -995,7 +999,7 @@ "RID_SVXSTR_BOLD_UNDER\n" "string.text" msgid "Automatic *bold* and _underline_" -msgstr "" +msgstr "Automatikisht *e theksuar* dhe _nënvijëzuar_" #: strings.src msgctxt "" @@ -1027,7 +1031,7 @@ "RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK\n" "string.text" msgid "Correct accidental use of cAPS LOCK key" -msgstr "" +msgstr "Korrigjo përdorimin e gabuar të çelësit cAPS LOCK" #: strings.src msgctxt "" @@ -1035,7 +1039,7 @@ "RID_SVXSTR_NON_BREAK_SPACE\n" "string.text" msgid "Add non-breaking space before specific punctuation marks in French text" -msgstr "" +msgstr "Shto hapësirën jo-boshe përpara shenjave të pikësimit të shenjuara në tekstin Francez " #: strings.src msgctxt "" @@ -1043,7 +1047,7 @@ "RID_SVXSTR_ORDINAL\n" "string.text" msgid "Format ordinal numbers suffixes (1st -> 1^st)" -msgstr "" +msgstr "Formati i prapashtesave të numrave rendor(1st -> 1^st) " #: strings.src msgctxt "" @@ -1059,7 +1063,7 @@ "RID_SVXSTR_USER_STYLE\n" "string.text" msgid "Replace Custom Styles" -msgstr "" +msgstr "Zëvendëso stilet e zakonshme" #: strings.src msgctxt "" @@ -1075,7 +1079,7 @@ "RID_SVXSTR_RIGHT_MARGIN\n" "string.text" msgid "Combine single line paragraphs if length greater than" -msgstr "" +msgstr "Kombino paragrafët me një fjali nëse gjatësia më e madhe se" #: strings.src msgctxt "" @@ -1083,7 +1087,7 @@ "RID_SVXSTR_NUM\n" "string.text" msgid "Apply numbering - symbol: " -msgstr "" +msgstr "Aplikoni numërimin - simbol:" #: strings.src msgctxt "" @@ -1091,7 +1095,7 @@ "RID_SVXSTR_BORDER\n" "string.text" msgid "Apply border" -msgstr "" +msgstr "Apliko kufirin" #: strings.src msgctxt "" @@ -1123,7 +1127,7 @@ "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES\n" "string.text" msgid "Delete spaces and tabs at end and start of line" -msgstr "Fshin hapësirat dhe tabulatorët në fund dhe fillim të rreshtit" +msgstr "Fshij hapësirat dhe tabulatorët në fund dhe fillim të rreshtit" #: strings.src msgctxt "" @@ -1131,7 +1135,7 @@ "RID_SVXSTR_CONNECTOR\n" "string.text" msgid "Connector" -msgstr "Lidhës" +msgstr "Lidhësi" #: strings.src msgctxt "" @@ -1139,7 +1143,7 @@ "RID_SVXSTR_DIMENSION_LINE\n" "string.text" msgid "Dimension line" -msgstr "" +msgstr "Linjë dimensioni " #: strings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sq/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sq/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-17 15:51+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-12-15 17:37+0000\n" +"Last-Translator: Indrit Bashkimi \n" "Language-Team: LibreOffice Albanian Translators\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -15,7 +15,7 @@ "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" "X-Project-Style: openoffice\n" -"X-POOTLE-MTIME: 1439826716.000000\n" +"X-POOTLE-MTIME: 1450201051.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -78,7 +78,7 @@ "label\n" "string.text" msgid "Edit" -msgstr "Modifiko" +msgstr "Ndrysho" #: aboutconfigdialog.ui msgctxt "" @@ -141,7 +141,7 @@ "label\n" "string.text" msgid "_Website" -msgstr "" +msgstr "_Faqe ndërrjeti" #: aboutdialog.ui msgctxt "" @@ -159,7 +159,7 @@ "label\n" "string.text" msgid "Build ID: $BUILDID" -msgstr "" +msgstr "Ndërto ID: $BUILDID" #: aboutdialog.ui msgctxt "" @@ -168,7 +168,7 @@ "label\n" "string.text" msgid "Locale: $LOCALE" -msgstr "" +msgstr "Lokale: $LOCALE" #: aboutdialog.ui msgctxt "" @@ -180,13 +180,14 @@ msgstr "%PRODUCTNAME është një suitë bashkëkohore me burim të hapur për zyrën dhe e thjeshtë për t'u përdorur për redaktimit e teksteve, fletëve elektronike, prezantimeve dhe më shumë." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 Kontribuuesit e LibreOffice." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 - 2015 Kontribuesit e LibreOffice." #: aboutdialog.ui msgctxt "" @@ -231,7 +232,7 @@ "label\n" "string.text" msgid "Shortcut Keys" -msgstr "" +msgstr "Tastet përshpejtuese" #: accelconfigpage.ui msgctxt "" @@ -321,7 +322,7 @@ "label\n" "string.text" msgid "_AutoInclude" -msgstr "" +msgstr "_AutoInclude" #: acorexceptpage.ui msgctxt "" @@ -357,7 +358,7 @@ "label\n" "string.text" msgid "Abbreviations (no Subsequent Capital)" -msgstr "" +msgstr "Shkurtime (pa gërmë kapitale vijuese)" #: acorexceptpage.ui msgctxt "" @@ -366,7 +367,7 @@ "label\n" "string.text" msgid "A_utoInclude" -msgstr "" +msgstr "A_utoInclude" #: acorexceptpage.ui msgctxt "" @@ -483,7 +484,7 @@ "label\n" "string.text" msgid "[M]: Replace while modifying existing text" -msgstr "" +msgstr "[M]: Zëvendëso ndërkohë që ndryshon tekstin ekzistues" #: applyautofmtpage.ui msgctxt "" @@ -492,7 +493,7 @@ "label\n" "string.text" msgid "[T]: AutoCorrect while typing" -msgstr "" +msgstr "[T]: Vetëkorrigjo gjatë shkrimit " #: applyautofmtpage.ui msgctxt "" @@ -501,7 +502,7 @@ "label\n" "string.text" msgid "[M]" -msgstr "" +msgstr "[M]" #: applyautofmtpage.ui msgctxt "" @@ -510,7 +511,7 @@ "label\n" "string.text" msgid "[T]" -msgstr "" +msgstr "[T]" #: applylocalizedpage.ui msgctxt "" @@ -519,7 +520,7 @@ "label\n" "string.text" msgid "[M]" -msgstr "" +msgstr "[M]" #: applylocalizedpage.ui msgctxt "" @@ -528,7 +529,7 @@ "label\n" "string.text" msgid "[T]" -msgstr "" +msgstr "[T]" #: applylocalizedpage.ui msgctxt "" @@ -546,7 +547,7 @@ "label\n" "string.text" msgid "_Start quote:" -msgstr "" +msgstr "_Fillo citimin:" #: applylocalizedpage.ui msgctxt "" @@ -576,13 +577,14 @@ msgstr "E parazgje_dhur" #: applylocalizedpage.ui +#, fuzzy msgctxt "" "applylocalizedpage.ui\n" "defaultsingle-atkobject\n" "AtkObject::accessible-name\n" "string.text" msgid "Single quotes default" -msgstr "" +msgstr "Citime të dyfishta të parazgjedhura" #: applylocalizedpage.ui msgctxt "" @@ -591,7 +593,7 @@ "label\n" "string.text" msgid "_End quote:" -msgstr "" +msgstr "_Mbaro citimin" #: applylocalizedpage.ui msgctxt "" @@ -600,7 +602,7 @@ "AtkObject::accessible-name\n" "string.text" msgid "End quote of single quotes" -msgstr "" +msgstr "Mbaro citimin e citimeve të vetme" #: applylocalizedpage.ui msgctxt "" @@ -618,7 +620,7 @@ "label\n" "string.text" msgid "Single Quotes" -msgstr "" +msgstr "Citime të vetme" #: applylocalizedpage.ui msgctxt "" @@ -636,7 +638,7 @@ "label\n" "string.text" msgid "_Start quote:" -msgstr "" +msgstr "_Fillo citimin" #: applylocalizedpage.ui msgctxt "" @@ -645,7 +647,7 @@ "AtkObject::accessible-name\n" "string.text" msgid "Start quote of double quotes" -msgstr "" +msgstr "Fillo citimin e citimeve të dyfishta" #: applylocalizedpage.ui msgctxt "" @@ -672,7 +674,7 @@ "AtkObject::accessible-name\n" "string.text" msgid "Double quotes default" -msgstr "" +msgstr "Citime të dyfishta të parazgjedhura" #: applylocalizedpage.ui msgctxt "" @@ -681,7 +683,7 @@ "label\n" "string.text" msgid "_End quote:" -msgstr "" +msgstr "_Mbaro citimin" #: applylocalizedpage.ui msgctxt "" @@ -690,7 +692,7 @@ "AtkObject::accessible-name\n" "string.text" msgid "End quote of double quotes" -msgstr "" +msgstr "Mbaro citimin e citimeve të dyfishta" #: applylocalizedpage.ui msgctxt "" @@ -708,7 +710,7 @@ "label\n" "string.text" msgid "Double Quotes" -msgstr "" +msgstr "Citime të dyfishta" #: areadialog.ui msgctxt "" @@ -762,7 +764,7 @@ "label\n" "string.text" msgid "Gradients" -msgstr "" +msgstr "Shkallëzimet" #: areadialog.ui msgctxt "" @@ -780,7 +782,7 @@ "label\n" "string.text" msgid "Bitmaps" -msgstr "" +msgstr "Bitmap-et" #: areatabpage.ui msgctxt "" @@ -825,7 +827,7 @@ "label\n" "string.text" msgid "Increments" -msgstr "" +msgstr "Hapa" #: areatabpage.ui msgctxt "" @@ -897,7 +899,7 @@ "label\n" "string.text" msgid "_X offset:" -msgstr "" +msgstr "_X offset:" #: areatabpage.ui msgctxt "" @@ -906,7 +908,7 @@ "label\n" "string.text" msgid "_Y offset:" -msgstr "" +msgstr "_Y offset:" #: areatabpage.ui msgctxt "" @@ -951,7 +953,7 @@ "label\n" "string.text" msgid "Colu_mn" -msgstr "_Kolona" +msgstr "Kolo_na" #: areatabpage.ui msgctxt "" @@ -960,7 +962,7 @@ "label\n" "string.text" msgid "Offset" -msgstr "" +msgstr "Offset" #: areatabpage.ui msgctxt "" @@ -969,7 +971,7 @@ "label\n" "string.text" msgid "Import Graphic..." -msgstr "Importo grafik..." +msgstr "Importo grafikun..." #: areatabpage.ui msgctxt "" @@ -996,7 +998,7 @@ "2\n" "stringlist.text" msgid "Gradient" -msgstr "" +msgstr "Gradient" #: areatabpage.ui msgctxt "" @@ -1023,7 +1025,7 @@ "label\n" "string.text" msgid "Apply list of forbidden characters to the beginning and end of lines" -msgstr "Zbato listën e karaktereve të ndaluara në fillim dhe në fund të rreshtit" +msgstr "Zbato listën e karaktereve të ndaluar në fillim dhe në fund të rreshtit" #: asiantypography.ui msgctxt "" @@ -1032,7 +1034,7 @@ "label\n" "string.text" msgid "Allow hanging punctuation" -msgstr "" +msgstr "Lejo pikëzimin e varur në fund të rreshtit" #: asiantypography.ui msgctxt "" @@ -1050,7 +1052,7 @@ "label\n" "string.text" msgid "Line Change" -msgstr "" +msgstr "Ndryshim rreshti" #: assigncomponentdialog.ui msgctxt "" @@ -1131,7 +1133,7 @@ "label\n" "string.text" msgid "Localized Options" -msgstr "" +msgstr "Opsione lokalizimi" #: autocorrectdialog.ui msgctxt "" @@ -1149,7 +1151,7 @@ "label\n" "string.text" msgid "Smart Tags" -msgstr "" +msgstr "Etiketat inteligjente" #: backgroundpage.ui msgctxt "" @@ -1212,7 +1214,7 @@ "1\n" "stringlist.text" msgid "Character" -msgstr "Germë" +msgstr "Gërmë" #: backgroundpage.ui msgctxt "" @@ -1347,7 +1349,7 @@ "1\n" "stringlist.text" msgid "Graphic" -msgstr "" +msgstr "Grafik" #: baselinksdialog.ui msgctxt "" @@ -1500,7 +1502,7 @@ "label\n" "string.text" msgid "Pattern Editor:" -msgstr "" +msgstr "Ndryshuesi i modelit:" #: bitmaptabpage.ui msgctxt "" @@ -1509,7 +1511,7 @@ "AtkObject::accessible-name\n" "string.text" msgid "Pattern Editor" -msgstr "" +msgstr "Ndryshuesi i modelit:" #: bitmaptabpage.ui msgctxt "" @@ -1518,7 +1520,7 @@ "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "_Ngjyra e Fontit:" #: bitmaptabpage.ui msgctxt "" @@ -1653,7 +1655,7 @@ "label\n" "string.text" msgid "Driver version:" -msgstr "" +msgstr "Derivati i drajverit" #: blackorwhitelistentrydialog.ui msgctxt "" @@ -1662,7 +1664,7 @@ "label\n" "string.text" msgid "Edit OpenCL Blacklist Entry" -msgstr "" +msgstr "Ndrysho Hyrjen e Blacklist OpenCL" #: blackorwhitelistentrydialog.ui msgctxt "" @@ -1671,7 +1673,7 @@ "label\n" "string.text" msgid "Create OpenCL Blacklist Entry" -msgstr "" +msgstr "Krijo Hyrjen e Blacklist OpenCL" #: blackorwhitelistentrydialog.ui msgctxt "" @@ -1680,7 +1682,7 @@ "label\n" "string.text" msgid "Edit OpenCL Whitelist Entry" -msgstr "" +msgstr "Ndrysho Hyrjen e Whitelist OpenCL" #: blackorwhitelistentrydialog.ui msgctxt "" @@ -1689,7 +1691,7 @@ "label\n" "string.text" msgid "Create OpenCL Whitelist Entry" -msgstr "" +msgstr "Krijo Hyrjen e Whitelist OpenCL" #: blackorwhitelistentrydialog.ui msgctxt "" @@ -1707,7 +1709,7 @@ "0\n" "stringlist.text" msgid "Any" -msgstr "" +msgstr "Çdo" #: borderareatransparencydialog.ui msgctxt "" @@ -1941,7 +1943,7 @@ "label\n" "string.text" msgid "_Merge adjacent line styles" -msgstr "_Bashko stilet e rreshtave të ngjitura" +msgstr "_Bashko stilet e rreshtave të ngjitur" #: borderpage.ui msgctxt "" @@ -1968,7 +1970,7 @@ "label\n" "string.text" msgid "Characters Before Break" -msgstr "" +msgstr "Karakteret para linjës ndarëse:" #: breaknumberoption.ui msgctxt "" @@ -1977,7 +1979,7 @@ "label\n" "string.text" msgid "Characters After Break" -msgstr "" +msgstr "Karakteret pas linjës ndarëse:" #: breaknumberoption.ui msgctxt "" @@ -2148,7 +2150,7 @@ "1\n" "stringlist.text" msgid "Angled Line" -msgstr "" +msgstr "Linja Kënddrejtë" #: calloutpage.ui msgctxt "" @@ -2229,7 +2231,7 @@ "label\n" "string.text" msgid "Vertically s_tacked" -msgstr "" +msgstr "Pirgu vertikal" #: cellalignment.ui msgctxt "" @@ -2238,7 +2240,7 @@ "label\n" "string.text" msgid "Asian layout _mode" -msgstr "" +msgstr "Formëdhënja Aziatike" #: cellalignment.ui msgctxt "" @@ -2256,7 +2258,7 @@ "label\n" "string.text" msgid "_Wrap text automatically" -msgstr "" +msgstr "_Përfundo tekstin automatikisht" #: cellalignment.ui msgctxt "" @@ -2301,7 +2303,7 @@ "label\n" "string.text" msgid "Hori_zontal" -msgstr "Hori_zontal" +msgstr "Hori_zontalisht" #: cellalignment.ui msgctxt "" @@ -2310,7 +2312,7 @@ "label\n" "string.text" msgid "_Vertical" -msgstr "_Vertikal" +msgstr "_Vertikalisht" #: cellalignment.ui msgctxt "" @@ -2355,7 +2357,7 @@ "label\n" "string.text" msgid "Text Extension Inside Cell" -msgstr "Prapashtesim i tekstit brenda qelisë" +msgstr "Prapashtesim i Tekstit Brenda Qelisë" #: cellalignment.ui msgctxt "" @@ -2826,13 +2828,14 @@ msgstr "Kontrolli automatik i drejtshkrimit" #: colorconfigwin.ui +#, fuzzy msgctxt "" "colorconfigwin.ui\n" "smarttags\n" "label\n" "string.text" msgid "Smart Tags" -msgstr "" +msgstr "Etiketat inteligjente" #: colorconfigwin.ui msgctxt "" @@ -2850,7 +2853,7 @@ "label\n" "string.text" msgid "Grid" -msgstr "" +msgstr "Rrjetat e kordinatave" #: colorconfigwin.ui msgctxt "" @@ -2859,7 +2862,7 @@ "label\n" "string.text" msgid "Script Indicator" -msgstr "" +msgstr "Treguesi i shkrimit" #: colorconfigwin.ui msgctxt "" @@ -2877,7 +2880,7 @@ "label\n" "string.text" msgid "Index and table shadings" -msgstr "" +msgstr "Treguesit dhe nuancat e tabelave" #: colorconfigwin.ui msgctxt "" @@ -2913,7 +2916,7 @@ "label\n" "string.text" msgid "Direct Cursor" -msgstr "" +msgstr "Kursor direkt" #: colorconfigwin.ui msgctxt "" @@ -2931,7 +2934,7 @@ "label\n" "string.text" msgid "SGML syntax highlighting" -msgstr "" +msgstr "SGML hijëzimi i sintaksës" #: colorconfigwin.ui msgctxt "" @@ -3021,7 +3024,7 @@ "label\n" "string.text" msgid "Detective error" -msgstr "" +msgstr "Gabim i zbulueshëm" #: colorconfigwin.ui msgctxt "" @@ -3057,7 +3060,7 @@ "label\n" "string.text" msgid "Grid" -msgstr "" +msgstr "Rrjetat e kordinatave" #: colorconfigwin.ui msgctxt "" @@ -3102,7 +3105,7 @@ "label\n" "string.text" msgid "String" -msgstr "" +msgstr "Varg" #: colorconfigwin.ui msgctxt "" @@ -3120,7 +3123,7 @@ "label\n" "string.text" msgid "Reserved expression" -msgstr "" +msgstr "Shprehje e rezervuar" #: colorconfigwin.ui msgctxt "" @@ -3132,13 +3135,14 @@ msgstr "Gabim" #: colorconfigwin.ui +#, fuzzy msgctxt "" "colorconfigwin.ui\n" "sql\n" "label\n" "string.text" msgid "SQL Syntax Highlighting" -msgstr "" +msgstr "SGML hijëzimi i sintaksës" #: colorconfigwin.ui msgctxt "" @@ -3165,7 +3169,7 @@ "label\n" "string.text" msgid "String" -msgstr "" +msgstr "Varg" #: colorconfigwin.ui msgctxt "" @@ -3300,7 +3304,7 @@ "label\n" "string.text" msgid "_G" -msgstr "" +msgstr "_G" #: colorpage.ui msgctxt "" @@ -3309,7 +3313,7 @@ "label\n" "string.text" msgid "_R" -msgstr "" +msgstr "_R" #: colorpage.ui msgctxt "" @@ -3318,7 +3322,7 @@ "label\n" "string.text" msgid "_C" -msgstr "" +msgstr "_C" #: colorpage.ui msgctxt "" @@ -3327,7 +3331,7 @@ "label\n" "string.text" msgid "_M" -msgstr "" +msgstr "_M" #: colorpage.ui msgctxt "" @@ -3336,7 +3340,7 @@ "label\n" "string.text" msgid "_K" -msgstr "" +msgstr "_K" #: colorpage.ui msgctxt "" @@ -3345,7 +3349,7 @@ "label\n" "string.text" msgid "_Y" -msgstr "" +msgstr "_Y" #: colorpage.ui msgctxt "" @@ -3354,7 +3358,7 @@ "label\n" "string.text" msgid "_Pick…" -msgstr "" +msgstr "_Zgjidh…" #: colorpage.ui msgctxt "" @@ -3408,7 +3412,7 @@ "label\n" "string.text" msgid "Embed" -msgstr "" +msgstr "Ndërfute" #: colorpage.ui msgctxt "" @@ -3525,7 +3529,7 @@ "label\n" "string.text" msgid "_Magenta:" -msgstr "" +msgstr "_Magenda:" #: colorpickerdialog.ui msgctxt "" @@ -3669,7 +3673,7 @@ "label\n" "string.text" msgid "_Begin horizontal:" -msgstr "" +msgstr "_Fillo horizontal:" #: connectortabpage.ui msgctxt "" @@ -3687,7 +3691,7 @@ "label\n" "string.text" msgid "Begin _vertical:" -msgstr "" +msgstr "Fillimi _vertikal:" #: connectortabpage.ui msgctxt "" @@ -3777,7 +3781,7 @@ "label\n" "string.text" msgid "Connection Pool" -msgstr "" +msgstr "Urë lidhëse" #: croppage.ui msgctxt "" @@ -4491,13 +4495,14 @@ msgstr "Relievi:" #: effectspage.ui +#, fuzzy msgctxt "" "effectspage.ui\n" "label46\n" "label\n" "string.text" msgid "Overlining:" -msgstr "" +msgstr "I nënvizuar:" #: effectspage.ui msgctxt "" @@ -4518,13 +4523,14 @@ msgstr "I nënvizuar:" #: effectspage.ui +#, fuzzy msgctxt "" "effectspage.ui\n" "overlinecolorft\n" "label\n" "string.text" msgid "Overline color:" -msgstr "" +msgstr "Ngjyra e nënvizimit:" #: effectspage.ui msgctxt "" @@ -4839,7 +4845,7 @@ "4\n" "stringlist.text" msgid "Dotted" -msgstr "" +msgstr "Pikëzuar" #: effectspage.ui msgctxt "" @@ -4914,13 +4920,14 @@ msgstr "Pikë pikë vizë" #: effectspage.ui +#, fuzzy msgctxt "" "effectspage.ui\n" "liststore6\n" "13\n" "stringlist.text" msgid "Dot Dot Dash (Bold)" -msgstr "" +msgstr "Pikë vizë lidhëse (të trashura)" #: effectspage.ui msgctxt "" @@ -5109,7 +5116,7 @@ "title\n" "string.text" msgid "Record Search" -msgstr "" +msgstr "Regjistro kërkimin" #: fmsearchdialog.ui msgctxt "" @@ -5172,7 +5179,7 @@ "label\n" "string.text" msgid "_All fields" -msgstr "" +msgstr "_Të gjitha fushat" #: fmsearchdialog.ui msgctxt "" @@ -5235,7 +5242,7 @@ "label\n" "string.text" msgid "S_imilarity search" -msgstr "" +msgstr "Kërkim për _ngjashmëri" #: fmsearchdialog.ui msgctxt "" @@ -5685,16 +5692,17 @@ "label\n" "string.text" msgid "Center _X:" -msgstr "" +msgstr "Qendër _X:" #: gradientpage.ui +#, fuzzy msgctxt "" "gradientpage.ui\n" "centeryft\n" "label\n" "string.text" msgid "Center _Y:" -msgstr "" +msgstr "Qendër _X:" #: gradientpage.ui msgctxt "" @@ -6336,22 +6344,24 @@ msgstr "URL:" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "browse\n" "label\n" "string.text" msgid "Target in Document" -msgstr "" +msgstr "Objektivi në Dokument" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "browse\n" "tooltip_text\n" "string.text" msgid "Target in Document" -msgstr "" +msgstr "Objektivi në Dokument" #: hyperlinkdocpage.ui msgctxt "" @@ -6363,13 +6373,14 @@ msgstr "Teksti për provë" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "label3\n" "label\n" "string.text" msgid "Target in Document" -msgstr "" +msgstr "Objektivi në Dokument" #: hyperlinkdocpage.ui msgctxt "" @@ -6666,7 +6677,7 @@ "title\n" "string.text" msgid "Target in Document" -msgstr "" +msgstr "Objektivi në Dokument" #: hyperlinkmarkdialog.ui msgctxt "" @@ -7288,7 +7299,7 @@ "label\n" "string.text" msgid "Java start _parameter" -msgstr "_Parametrat e nisjes për Java" +msgstr "_Përcaktuesi i nisjes për Java" #: javastartparametersdialog.ui msgctxt "" @@ -8758,13 +8769,14 @@ msgstr "Fillo me:" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "bitmapft\n" "label\n" "string.text" msgid "Graphics:" -msgstr "" +msgstr "Grafik" #: numberingoptionspage.ui msgctxt "" @@ -9037,13 +9049,14 @@ msgstr "Pika" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "liststore1\n" "2\n" "stringlist.text" msgid "Graphics" -msgstr "" +msgstr "Grafik" #: numberingoptionspage.ui msgctxt "" @@ -11054,7 +11067,7 @@ "label\n" "string.text" msgid "Complex _text layout (CTL):" -msgstr "" +msgstr "Kompleks_ faqosje e tekstit (CTL):" #: optlanguagespage.ui msgctxt "" @@ -11270,7 +11283,7 @@ "label\n" "string.text" msgid "Graphics Cache" -msgstr "" +msgstr "Qilari i Grafikave" #: optmemorypage.ui msgctxt "" @@ -11534,13 +11547,14 @@ msgstr "Pajisja" #: optopenclpage.ui +#, fuzzy msgctxt "" "optopenclpage.ui\n" "driverversion\n" "label\n" "string.text" msgid "Driver version" -msgstr "" +msgstr "Derivati i drajverit" #: optopenclpage.ui msgctxt "" @@ -11612,7 +11626,7 @@ "label\n" "string.text" msgid "Path" -msgstr "" +msgstr "Mënyra" #: optpathspage.ui msgctxt "" @@ -11705,13 +11719,14 @@ msgstr "" #: optproxypage.ui +#, fuzzy msgctxt "" "optproxypage.ui\n" "httpsft\n" "label\n" "string.text" msgid "HTTP_S proxy:" -msgstr "" +msgstr "Proxy HT_TP:" #: optproxypage.ui msgctxt "" @@ -14618,22 +14633,24 @@ msgstr "" #: querychangelineenddialog.ui +#, fuzzy msgctxt "" "querychangelineenddialog.ui\n" "AskChangeLineEndDialog\n" "text\n" "string.text" msgid "The arrowhead was modified without saving." -msgstr "" +msgstr "Lista është ndryshuar pa e ruajtur." #: querychangelineenddialog.ui +#, fuzzy msgctxt "" "querychangelineenddialog.ui\n" "AskChangeLineEndDialog\n" "secondary_text\n" "string.text" msgid "Would you like to save the arrowhead now?" -msgstr "" +msgstr "Dëshiron ta ruash listën tani?" #: querydeletebitmapdialog.ui msgctxt "" @@ -14735,13 +14752,14 @@ msgstr "" #: querydeletegradientdialog.ui +#, fuzzy msgctxt "" "querydeletegradientdialog.ui\n" "AskDelGradientDialog\n" "text\n" "string.text" msgid "Do you want to delete the gradient?" -msgstr "" +msgstr "Dëshiron të fshish ngjyrën?" #: querydeletehatchdialog.ui msgctxt "" @@ -14753,13 +14771,14 @@ msgstr "" #: querydeletehatchdialog.ui +#, fuzzy msgctxt "" "querydeletehatchdialog.ui\n" "AskDelHatchDialog\n" "text\n" "string.text" msgid "Do you want to delete the hatching?" -msgstr "" +msgstr "Dëshiron të fshish ngjyrën?" #: querydeletelineenddialog.ui msgctxt "" @@ -14771,13 +14790,14 @@ msgstr "" #: querydeletelineenddialog.ui +#, fuzzy msgctxt "" "querydeletelineenddialog.ui\n" "AskDelLineEndDialog\n" "text\n" "string.text" msgid "Do you really want to delete the arrowhead?" -msgstr "" +msgstr "Dëshiron me vërtetë të fshish ngjyrën e diagramit?" #: querydeletelineenddialog.ui msgctxt "" @@ -15356,13 +15376,14 @@ msgstr "_Shto..." #: selectpathdialog.ui +#, fuzzy msgctxt "" "selectpathdialog.ui\n" "label1\n" "label\n" "string.text" msgid "Paths" -msgstr "" +msgstr "Mënyra" #: shadowtabpage.ui msgctxt "" @@ -15437,13 +15458,14 @@ msgstr "Kolonat e mëtejshme janë të fshehura. Zgjidh fushat që do të shfaqësh dhe shtyp OK." #: similaritysearchdialog.ui +#, fuzzy msgctxt "" "similaritysearchdialog.ui\n" "SimilaritySearchDialog\n" "title\n" "string.text" msgid "Similarity Search" -msgstr "" +msgstr "Kërkim për _ngjashmëri" #: similaritysearchdialog.ui msgctxt "" @@ -15590,13 +15612,14 @@ msgstr "" #: solarizedialog.ui +#, fuzzy msgctxt "" "solarizedialog.ui\n" "invert\n" "label\n" "string.text" msgid "_Invert" -msgstr "" +msgstr "_Fut" #: solarizedialog.ui msgctxt "" @@ -15905,13 +15928,14 @@ msgstr "" #: storedwebconnectiondialog.ui +#, fuzzy msgctxt "" "storedwebconnectiondialog.ui\n" "website\n" "label\n" "string.text" msgid "Website" -msgstr "" +msgstr "_Faqe ndërrjeti" #: storedwebconnectiondialog.ui msgctxt "" @@ -16301,13 +16325,14 @@ msgstr "" #: textanimtabpage.ui +#, fuzzy msgctxt "" "textanimtabpage.ui\n" "FT_AMOUNT\n" "label\n" "string.text" msgid "Increment:" -msgstr "" +msgstr "Hapa" #: textanimtabpage.ui msgctxt "" @@ -16805,13 +16830,14 @@ msgstr "_Tejdukshmëria:" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "RBT_TRANS_GRADIENT\n" "label\n" "string.text" msgid "_Gradient" -msgstr "" +msgstr "Gradient" #: transparencytabpage.ui msgctxt "" @@ -16823,22 +16849,24 @@ msgstr "Llo_ji:" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "FT_TRGR_CENTER_X\n" "label\n" "string.text" msgid "Center _X:" -msgstr "" +msgstr "Qendër _X:" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "FT_TRGR_CENTER_Y\n" "label\n" "string.text" msgid "Center _Y:" -msgstr "" +msgstr "Qendër _X:" #: transparencytabpage.ui msgctxt "" @@ -17361,56 +17389,3 @@ "string.text" msgid "View Layout" msgstr "" - -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "Sfondi i germave" - -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "Sfondi" - -#: aboutdialog.ui -#, fuzzy -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://www.libreoffice.org/about-us/credits/" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "Ngjyra e sfondit" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "Sistemi operativ:" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sq/extensions/uiconfig/sbibliography/ui.po libreoffice-5.0.5~rc2/translations/source/sq/extensions/uiconfig/sbibliography/ui.po --- libreoffice-5.0.2/translations/source/sq/extensions/uiconfig/sbibliography/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/extensions/uiconfig/sbibliography/ui.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-06-18 09:33+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-11-10 11:17+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434620034.000000\n" +"X-POOTLE-MTIME: 1447154252.000000\n" #: choosedatasourcedialog.ui msgctxt "" @@ -68,7 +68,7 @@ "label\n" "string.text" msgid "_Publisher" -msgstr "" +msgstr "_Botues" #: generalpage.ui msgctxt "" @@ -131,7 +131,7 @@ "label\n" "string.text" msgid "Editor" -msgstr "" +msgstr "Botuesi" #: generalpage.ui msgctxt "" @@ -149,7 +149,7 @@ "label\n" "string.text" msgid "Ed_ition" -msgstr "" +msgstr "Bo_timi" #: generalpage.ui msgctxt "" @@ -158,7 +158,7 @@ "label\n" "string.text" msgid "Volume" -msgstr "" +msgstr "Vëllimi" #: generalpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/filter/source/config/fragments/filters.po libreoffice-5.0.5~rc2/translations/source/sq/filter/source/config/fragments/filters.po --- libreoffice-5.0.2/translations/source/sq/filter/source/config/fragments/filters.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/filter/source/config/fragments/filters.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-03 14:27+0000\n" -"Last-Translator: Dashamir Hoxha \n" +"PO-Revision-Date: 2015-11-10 10:57+0000\n" +"Last-Translator: Indrit Bashkimi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435933639.000000\n" +"X-POOTLE-MTIME: 1447153066.000000\n" #: AbiWord.xcu msgctxt "" @@ -608,7 +608,7 @@ "UIName\n" "value.text" msgid "MacDraft" -msgstr "" +msgstr "MacDraft" #: MacDrawPro_Draw.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/sq/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/sq/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 00:07+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -11029,7 +11029,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -40676,13 +40676,14 @@ msgstr "" #: 06200000.xhp +#, fuzzy msgctxt "" "06200000.xhp\n" "hd_id3149290\n" "41\n" "help.text" msgid "Replace by character" -msgstr "" +msgstr "Karakteri i rrotulluar nga $(ARG1)" #: 06200000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/sq/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/sq/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 21:52+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -4175,7 +4175,7 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" +msgid "Section" msgstr "" #: 04020100.xhp @@ -6848,13 +6848,14 @@ msgstr "" #: 04090002.xhp +#, fuzzy msgctxt "" "04090002.xhp\n" "hd_id3154333\n" "21\n" "help.text" msgid "Insert reference to" -msgstr "" +msgstr "Shto referencën" #: 04090002.xhp msgctxt "" @@ -9460,13 +9461,14 @@ msgstr "" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3147417\n" "32\n" "help.text" msgid "x == 1 or x EQ 1" -msgstr "" +msgstr "OSE logjike" #: 04090200.xhp msgctxt "" @@ -9478,13 +9480,14 @@ msgstr "" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3145259\n" "34\n" "help.text" msgid "x != 1 or x NEQ 1" -msgstr "" +msgstr "OSE logjike" #: 04090200.xhp msgctxt "" @@ -16144,15 +16147,6 @@ msgstr "" #: 05040700.xhp -msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp msgctxt "" "05040700.xhp\n" "hd_id3153538\n" diff -Nru libreoffice-5.0.2/translations/source/sq/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/sq/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/sq/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sq/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sq/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sq/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:36+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3740,13 +3749,14 @@ msgstr "" #: headerfootercontent.ui +#, fuzzy msgctxt "" "headerfootercontent.ui\n" "label1\n" "label\n" "string.text" msgid "Note" -msgstr "" +msgstr "Asnjë" #: headerfootercontent.ui msgctxt "" @@ -5594,13 +5604,14 @@ msgstr "Përzgjedhje" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "Asnjë" #: pastespecial.ui msgctxt "" @@ -10751,86 +10762,3 @@ "string.text" msgid "Grouped by" msgstr "" - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "_Kryeradha majtas:" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Rreshto tekstin vertikalisht." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Rreshto tekstin vertikalisht." - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "_Sfondi i qelisë:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "_Bordi i qelisë:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "Shfaqi vijat e _rrjetës së qelive" - -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "_Kategoria:" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "_Numrat negativë me të kuqe" diff -Nru libreoffice-5.0.2/translations/source/sq/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sq/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sq/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:47+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -665,13 +665,14 @@ msgstr "_Shfaq" #: helpindexpage.ui +#, fuzzy msgctxt "" "helpindexpage.ui\n" "label1\n" "label\n" "string.text" msgid "_Search term" -msgstr "" +msgstr "_Kërko për:" #: helpsearchpage.ui msgctxt "" @@ -683,13 +684,14 @@ msgstr "_Shfaq" #: helpsearchpage.ui +#, fuzzy msgctxt "" "helpsearchpage.ui\n" "label1\n" "label\n" "string.text" msgid "_Search term" -msgstr "" +msgstr "_Kërko për:" #: helpsearchpage.ui msgctxt "" @@ -749,7 +751,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -1995,12 +1997,3 @@ "string.text" msgid "Existing Versions" msgstr "Versionet ekzistuese" - -#: documentinfopage.ui -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sq/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sq/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sq/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-28 10:10+0000\n" -"Last-Translator: Indrit \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:58+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sq\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-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432807849.000000\n" +"X-POOTLE-MTIME: 1439600293.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Rregullo zmadhimin" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/sq/svx/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sq/svx/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sq/svx/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/svx/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-15 01:01+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-02 14:07+0000\n" +"Last-Translator: Belinda Dibra \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439600516.000000\n" +"X-POOTLE-MTIME: 1446473229.000000\n" #: acceptrejectchangesdialog.ui msgctxt "" @@ -23,7 +23,7 @@ "title\n" "string.text" msgid "Manage Changes" -msgstr "" +msgstr "Menaxho Ndryshimet" #: acceptrejectchangesdialog.ui msgctxt "" @@ -50,7 +50,7 @@ "label\n" "string.text" msgid "A_ccept All" -msgstr "" +msgstr "P_ranoji Të Gjitha" #: acceptrejectchangesdialog.ui msgctxt "" @@ -59,7 +59,7 @@ "label\n" "string.text" msgid "R_eject All" -msgstr "" +msgstr "R_efuzoji Të Gjitha" #: addconditiondialog.ui msgctxt "" @@ -86,7 +86,7 @@ "label\n" "string.text" msgid "_Result:" -msgstr "" +msgstr "_Rezultati:" #: addconditiondialog.ui msgctxt "" @@ -95,7 +95,7 @@ "label\n" "string.text" msgid "_Edit Namespaces..." -msgstr "" +msgstr "_Ndrysho Hapësirat e Emrave..." #: adddataitemdialog.ui msgctxt "" @@ -140,7 +140,7 @@ "label\n" "string.text" msgid "_Data type:" -msgstr "Lloji i të _dhënave:" +msgstr "_Lloji i të dhënave:" #: adddataitemdialog.ui msgctxt "" @@ -149,7 +149,7 @@ "label\n" "string.text" msgid "_Required" -msgstr "" +msgstr "_Kërkohet" #: adddataitemdialog.ui msgctxt "" @@ -167,7 +167,7 @@ "label\n" "string.text" msgid "R_elevant" -msgstr "" +msgstr "R_elevant" #: adddataitemdialog.ui msgctxt "" @@ -239,7 +239,7 @@ "label\n" "string.text" msgid "Settings" -msgstr "Parametrat" +msgstr "Rregullimet" #: addinstancedialog.ui msgctxt "" @@ -302,7 +302,7 @@ "title\n" "string.text" msgid "Add Model" -msgstr "" +msgstr "Shto Modelin" #: addmodeldialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/sw/source/ui/app.po libreoffice-5.0.5~rc2/translations/source/sq/sw/source/ui/app.po --- libreoffice-5.0.2/translations/source/sq/sw/source/ui/app.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/sw/source/ui/app.po 2016-02-04 16:41:28.000000000 +0000 @@ -5,7 +5,7 @@ "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-06-24 17:05+0200\n" "PO-Revision-Date: 2015-08-17 15:50+0000\n" -"Last-Translator: system user <>\n" +"Last-Translator: nertilarystemi \n" "Language-Team: American English \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -57,7 +57,7 @@ "Hidden Styles\n" "filterlist.text" msgid "Hidden Styles" -msgstr "Stilet e fshehura" +msgstr "Stilet e Fshehura" #: app.src msgctxt "" @@ -1584,7 +1584,7 @@ "FN_TABLE_INSERT_ROW_AFTER\n" "menuitem.text" msgid "Rows Below" -msgstr "" +msgstr "Rreshtat më Poshtë" #: mn.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/sw/source/uibase/docvw.po libreoffice-5.0.5~rc2/translations/source/sq/sw/source/uibase/docvw.po --- libreoffice-5.0.2/translations/source/sq/sw/source/uibase/docvw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/sw/source/uibase/docvw.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-08-02 11:13+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-08-15 01:05+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438514019.000000\n" +"X-POOTLE-MTIME: 1439600752.000000\n" #: docvw.src msgctxt "" @@ -149,7 +149,7 @@ "MN_READONLY_TOGALLERYLINK\n" "menuitem.text" msgid "As Link" -msgstr "Si lidhje" +msgstr "Si Lidhje" #: docvw.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/sw/uiconfig/swriter/ui.po libreoffice-5.0.5~rc2/translations/source/sq/sw/uiconfig/swriter/ui.po --- libreoffice-5.0.2/translations/source/sq/sw/uiconfig/swriter/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/sw/uiconfig/swriter/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -131,7 +131,7 @@ "tooltip_text\n" "string.text" msgid "Move right" -msgstr "Lëvize djathtas" +msgstr "Lëviz djathtas" #: addressblockdialog.ui msgctxt "" @@ -8843,7 +8843,7 @@ "label\n" "string.text" msgid "B_rowse..." -msgstr "Sh_fleto..." +msgstr "Shfleto..." #: mmselectpage.ui msgctxt "" @@ -10225,7 +10225,7 @@ "5\n" "stringlist.text" msgid "Strikethrough" -msgstr "" +msgstr "Gjerësia e shkronjave" #: optredlinepage.ui msgctxt "" @@ -11368,7 +11368,7 @@ "label\n" "string.text" msgid "Pictures and other graphic objects" -msgstr "" +msgstr "Piktura dhe objekte të tjera grafike" #: printeroptions.ui msgctxt "" @@ -14340,7 +14340,7 @@ "label\n" "string.text" msgid "Insert new title pages" -msgstr "" +msgstr "Fut emrin e ri të faqeve" #: titlepage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sq/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po libreoffice-5.0.5~rc2/translations/source/sq/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po --- libreoffice-5.0.2/translations/source/sq/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sq/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom.po 2016-02-04 16:41:28.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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-06-20 16:30+0000\n" -"Last-Translator: Indrit Bashkimi \n" +"PO-Revision-Date: 2015-11-02 14:07+0000\n" +"Last-Translator: nertilarystemi \n" "Language-Team: LANGUAGE \n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434817809.000000\n" +"X-POOTLE-MTIME: 1446473247.000000\n" #: WikiExtension.xcu msgctxt "" @@ -32,7 +32,7 @@ "NoWikiFilter\n" "value.text" msgid "The MediaWiki export filter cannot be found. Choose 'Tools-XML Filter Settings' to install the filter, or use the setup to install the component." -msgstr "" +msgstr "Filtri eksportues i MediaWiki nuk mund të gjendet. Zgjidh 'Mjetet-XML Rregullimet e Filtrit' për të instaluar filtrin, ose përdor rregullimet për të instaluar komponentin." #: WikiExtension.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ss/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ss/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ss/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ss/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-14 23:56+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -2155,13 +2155,14 @@ msgstr "" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "position\n" "5\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Kuphakama:" #: calloutpage.ui #, fuzzy @@ -2437,13 +2438,14 @@ msgstr "" #: cellalignment.ui +#, fuzzy msgctxt "" "cellalignment.ui\n" "liststoreHorzAlign\n" "3\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Kuphakama:" #: cellalignment.ui msgctxt "" @@ -9101,13 +9103,14 @@ msgstr "" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "numalign\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Kuphakama:" #: numberingoptionspage.ui #, fuzzy @@ -9557,13 +9560,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "liststore1\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Kuphakama:" #: numberingpositionpage.ui msgctxt "" @@ -16445,13 +16449,14 @@ msgstr "" #: textanimtabpage.ui +#, fuzzy msgctxt "" "textanimtabpage.ui\n" "BTN_RIGHT-atkobject\n" "AtkObject::accessible-name\n" "string.text" msgid "Right" -msgstr "" +msgstr "Kuphakama:" #: textanimtabpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ss/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ss/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ss/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ss/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:39+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ss/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ss/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ss/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ss/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 18:55+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:48+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ss\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431543346.000000\n" +"X-POOTLE-MTIME: 1439599705.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ss/starmath/source.po libreoffice-5.0.5~rc2/translations/source/ss/starmath/source.po --- libreoffice-5.0.2/translations/source/ss/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ss/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ss/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ss/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ss/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ss/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 15:53+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:57+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ss\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377618792.000000\n" +"X-POOTLE-MTIME: 1439600220.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/st/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/st/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/st/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:09+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "Keny~a bakeng sa" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Bophara" #: acorreplacepage.ui msgctxt "" @@ -880,13 +881,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: areatabpage.ui #, fuzzy @@ -1880,13 +1882,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Bophahamo" #: borderpage.ui msgctxt "" @@ -4333,13 +4336,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Bophahamo" #: distributionpage.ui #, fuzzy @@ -6507,13 +6511,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Lebitso" #: hyperlinkdocpage.ui msgctxt "" @@ -6642,13 +6647,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Lebitso" #: hyperlinkinternetpage.ui msgctxt "" @@ -6741,13 +6747,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Lebitso" #: hyperlinkmailpage.ui msgctxt "" @@ -6894,13 +6901,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Lebitso" #: hyperlinknewdocpage.ui msgctxt "" @@ -7717,13 +7725,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Setaele" #: linetabpage.ui msgctxt "" @@ -7781,13 +7790,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7799,13 +7809,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7871,13 +7882,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -10590,13 +10602,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Boholo:" #: optfontspage.ui #, fuzzy @@ -13226,13 +13239,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Bophahamo" #: pageformatpage.ui msgctxt "" @@ -13625,13 +13639,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Bophahamo" #: paragalignpage.ui msgctxt "" @@ -14660,22 +14675,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Boemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Boemo" #: possizetabpage.ui msgctxt "" @@ -14697,13 +14714,14 @@ msgstr "Boemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: possizetabpage.ui #, fuzzy @@ -15150,22 +15168,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Boemo" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Boemo" #: rotationtabpage.ui msgctxt "" @@ -17622,57 +17642,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/st/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/st/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/st/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/st/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/st/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/st/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:51+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/st/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/st/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/st/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/st/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/st/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/st/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 19:35+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:04+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: st\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431545713.000000\n" +"X-POOTLE-MTIME: 1439600648.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/st/starmath/source.po libreoffice-5.0.5~rc2/translations/source/st/starmath/source.po --- libreoffice-5.0.2/translations/source/st/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/st/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/st/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/st/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/st/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 15:51+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:14+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: st\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377618669.000000\n" +"X-POOTLE-MTIME: 1439601250.000000\n" #: stbctrls.src msgctxt "" @@ -160,14 +160,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/sv/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sv/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sv/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-05 09:01+0000\n" -"Last-Translator: Niklas Johansson \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:18+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436086890.000000\n" +"X-POOTLE-MTIME: 1439597891.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME är ett modernt och användarvänligt kontorspaket för ordbehandling, kalkylering och presentationer med mera." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 LibreOffice bidragsgivare." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/sv/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/sv/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/sv/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-15 00:29+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-09-22 13:17+0000\n" +"Last-Translator: Niklas Johansson \n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439598577.000000\n" +"X-POOTLE-MTIME: 1442927857.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1787,7 +1787,7 @@ "UMBRELLA_WITH_RAIN_DROPS\n" "LngText.text" msgid "rain" -msgstr "" +msgstr "regn" #. ☕ (U+02615), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1796,7 +1796,7 @@ "HOT_BEVERAGE\n" "LngText.text" msgid "coffee" -msgstr "" +msgstr "kaffe" #. ☚ (U+0261A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1805,7 +1805,7 @@ "BLACK_LEFT_POINTING_INDEX\n" "LngText.text" msgid "left3" -msgstr "" +msgstr "vänster3" #. ☛ (U+0261B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1814,7 +1814,7 @@ "BLACK_RIGHT_POINTING_INDEX\n" "LngText.text" msgid "right3" -msgstr "" +msgstr "höger3" #. ☜ (U+0261C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1823,7 +1823,7 @@ "WHITE_LEFT_POINTING_INDEX\n" "LngText.text" msgid "left" -msgstr "" +msgstr "vänster" #. ☝ (U+0261D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1832,7 +1832,7 @@ "WHITE_UP_POINTING_INDEX\n" "LngText.text" msgid "up" -msgstr "" +msgstr "upp" #. ☞ (U+0261E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1841,7 +1841,7 @@ "WHITE_RIGHT_POINTING_INDEX\n" "LngText.text" msgid "right" -msgstr "" +msgstr "höger" #. ☟ (U+0261F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1850,7 +1850,7 @@ "WHITE_DOWN_POINTING_INDEX\n" "LngText.text" msgid "down" -msgstr "" +msgstr "ner" #. ☠ (U+02620), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1859,7 +1859,7 @@ "SKULL_AND_CROSSBONES\n" "LngText.text" msgid "poison" -msgstr "" +msgstr "gift" #. ☡ (U+02621), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1868,7 +1868,7 @@ "CAUTION_SIGN\n" "LngText.text" msgid "caution" -msgstr "" +msgstr "försiktig" #. ☢ (U+02622), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1877,7 +1877,7 @@ "RADIOACTIVE_SIGN\n" "LngText.text" msgid "radioactive" -msgstr "" +msgstr "radioaktiv" #. ☣ (U+02623), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1886,7 +1886,7 @@ "BIOHAZARD_SIGN\n" "LngText.text" msgid "biohazard" -msgstr "" +msgstr "biologiskt riskavfall" #. ☤ (U+02624), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1985,7 +1985,7 @@ "PEACE_SYMBOL\n" "LngText.text" msgid "peace" -msgstr "" +msgstr "fred" #. ☯ (U+0262F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1994,7 +1994,7 @@ "YIN_YANG\n" "LngText.text" msgid "yin yang" -msgstr "" +msgstr "yin yang" #. ☹ (U+02639), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2012,7 +2012,7 @@ "WHITE_SMILING_FACE\n" "LngText.text" msgid "smiling" -msgstr "" +msgstr "leende" #. ☻ (U+0263B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2021,17 +2021,16 @@ "BLACK_SMILING_FACE\n" "LngText.text" msgid "smiling2" -msgstr "" +msgstr "leende2" #. ☼ (U+0263C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_SUN_WITH_RAYS\n" "LngText.text" msgid "Sun2" -msgstr "Sol" +msgstr "Sol2" #. ☽ (U+0263D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2040,7 +2039,7 @@ "FIRST_QUARTER_MOON\n" "LngText.text" msgid "Moon" -msgstr "" +msgstr "Måne" #. ☾ (U+0263E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2049,7 +2048,7 @@ "LAST_QUARTER_MOON\n" "LngText.text" msgid "Moon2" -msgstr "" +msgstr "Måne2" #. ☿ (U+0263F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2058,7 +2057,7 @@ "MERCURY\n" "LngText.text" msgid "Mercury" -msgstr "" +msgstr "Kvicksilver" #. ♀ (U+02640), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2067,7 +2066,7 @@ "FEMALE_SIGN\n" "LngText.text" msgid "female" -msgstr "" +msgstr "kvinna" #. ♁ (U+02641), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2076,7 +2075,7 @@ "EARTH\n" "LngText.text" msgid "Earth" -msgstr "" +msgstr "Jorden" #. ♂ (U+02642), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2085,7 +2084,7 @@ "MALE_SIGN\n" "LngText.text" msgid "male" -msgstr "" +msgstr "man" #. ♃ (U+02643), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2094,7 +2093,7 @@ "JUPITER\n" "LngText.text" msgid "Jupiter" -msgstr "" +msgstr "Jupiter" #. ♄ (U+02644), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2103,7 +2102,7 @@ "SATURN\n" "LngText.text" msgid "Saturn" -msgstr "" +msgstr "Saturnus" #. ♅ (U+02645), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2112,7 +2111,7 @@ "URANUS\n" "LngText.text" msgid "Uranus" -msgstr "" +msgstr "Uranus" #. ♆ (U+02646), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2121,7 +2120,7 @@ "NEPTUNE\n" "LngText.text" msgid "Neptune" -msgstr "" +msgstr "Neptun" #. ♇ (U+02647), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2130,7 +2129,7 @@ "PLUTO\n" "LngText.text" msgid "Pluto" -msgstr "" +msgstr "Pluto" #. ♈ (U+02648), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2139,7 +2138,7 @@ "ARIES\n" "LngText.text" msgid "Aries" -msgstr "" +msgstr "Väduren" #. ♉ (U+02649), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2148,7 +2147,7 @@ "TAURUS\n" "LngText.text" msgid "Taurus" -msgstr "" +msgstr "Oxen" #. ♊ (U+0264A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2157,7 +2156,7 @@ "GEMINI\n" "LngText.text" msgid "Gemini" -msgstr "" +msgstr "Tvillingarna" #. ♋ (U+0264B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2166,7 +2165,7 @@ "CANCER\n" "LngText.text" msgid "Cancer" -msgstr "" +msgstr "Kräftan" #. ♌ (U+0264C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2175,7 +2174,7 @@ "LEO\n" "LngText.text" msgid "Leo" -msgstr "" +msgstr "Lejonet" #. ♍ (U+0264D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2184,7 +2183,7 @@ "VIRGO\n" "LngText.text" msgid "Virgo" -msgstr "" +msgstr "Jungfrun" #. ♎ (U+0264E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2193,7 +2192,7 @@ "LIBRA\n" "LngText.text" msgid "Libra" -msgstr "" +msgstr "Vågen" #. ♏ (U+0264F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2202,7 +2201,7 @@ "SCORPIUS\n" "LngText.text" msgid "Scorpius" -msgstr "" +msgstr "Skorpionen" #. ♐ (U+02650), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2211,7 +2210,7 @@ "SAGITTARIUS\n" "LngText.text" msgid "Sagittarius" -msgstr "" +msgstr "Skytten" #. ♑ (U+02651), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2220,7 +2219,7 @@ "CAPRICORN\n" "LngText.text" msgid "Capricorn" -msgstr "" +msgstr "Stenbocken" #. ♒ (U+02652), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2229,7 +2228,7 @@ "AQUARIUS\n" "LngText.text" msgid "Aquarius" -msgstr "" +msgstr "Vattumannen" #. ♓ (U+02653), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2238,7 +2237,7 @@ "PISCES\n" "LngText.text" msgid "Pisces" -msgstr "" +msgstr "Fiskarna" #. ♔ (U+02654), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2247,7 +2246,7 @@ "WHITE_CHESS_KING\n" "LngText.text" msgid "white king" -msgstr "" +msgstr "vit kung" #. ♕ (U+02655), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2256,7 +2255,7 @@ "WHITE_CHESS_QUEEN\n" "LngText.text" msgid "white queen" -msgstr "" +msgstr "vit dam" #. ♖ (U+02656), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2265,7 +2264,7 @@ "WHITE_CHESS_ROOK\n" "LngText.text" msgid "white rook" -msgstr "" +msgstr "vitt torn" #. ♗ (U+02657), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2274,7 +2273,7 @@ "WHITE_CHESS_BISHOP\n" "LngText.text" msgid "white bishop" -msgstr "" +msgstr "vit löpare" #. ♘ (U+02658), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2283,7 +2282,7 @@ "WHITE_CHESS_KNIGHT\n" "LngText.text" msgid "white knight" -msgstr "" +msgstr "vit springare" #. ♙ (U+02659), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2292,7 +2291,7 @@ "WHITE_CHESS_PAWN\n" "LngText.text" msgid "white pawn" -msgstr "" +msgstr "vit bonde" #. ♚ (U+0265A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2301,7 +2300,7 @@ "BLACK_CHESS_KING\n" "LngText.text" msgid "black king" -msgstr "" +msgstr "svart kung" #. ♛ (U+0265B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2310,7 +2309,7 @@ "BLACK_CHESS_QUEEN\n" "LngText.text" msgid "black queen" -msgstr "" +msgstr "svart dam" #. ♜ (U+0265C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2319,7 +2318,7 @@ "BLACK_CHESS_ROOK\n" "LngText.text" msgid "black rook" -msgstr "" +msgstr "svart torn" #. ♝ (U+0265D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2328,7 +2327,7 @@ "BLACK_CHESS_BISHOP\n" "LngText.text" msgid "black bishop" -msgstr "" +msgstr "svart löpare" #. ♞ (U+0265E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2337,7 +2336,7 @@ "BLACK_CHESS_KNIGHT\n" "LngText.text" msgid "black knight" -msgstr "" +msgstr "svart springare" #. ♟ (U+0265F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2346,7 +2345,7 @@ "BLACK_CHESS_PAWN\n" "LngText.text" msgid "black pawn" -msgstr "" +msgstr "svart bonde" #. ♠ (U+02660), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2355,7 +2354,7 @@ "BLACK_SPADE_SUIT\n" "LngText.text" msgid "spades" -msgstr "" +msgstr "spader" #. ♡ (U+02661), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2364,7 +2363,7 @@ "WHITE_HEART_SUIT\n" "LngText.text" msgid "hearts2" -msgstr "" +msgstr "hjärter2" #. ♢ (U+02662), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2373,7 +2372,7 @@ "WHITE_DIAMOND_SUIT\n" "LngText.text" msgid "diamonds2" -msgstr "" +msgstr "ruter2" #. ♣ (U+02663), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2382,7 +2381,7 @@ "BLACK_CLUB_SUIT\n" "LngText.text" msgid "clubs" -msgstr "" +msgstr "klöver" #. ♤ (U+02664), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2391,7 +2390,7 @@ "WHITE_SPADE_SUIT\n" "LngText.text" msgid "spades2" -msgstr "" +msgstr "spader2" #. ♥ (U+02665), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2400,7 +2399,7 @@ "BLACK_HEART_SUIT\n" "LngText.text" msgid "hearts" -msgstr "" +msgstr "hjärter" #. ♦ (U+02666), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2409,7 +2408,7 @@ "BLACK_DIAMOND_SUIT\n" "LngText.text" msgid "diamonds" -msgstr "" +msgstr "ruter" #. ♧ (U+02667), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2418,7 +2417,7 @@ "WHITE_CLUB_SUIT\n" "LngText.text" msgid "clubs2" -msgstr "" +msgstr "klöver2" #. ♨ (U+02668), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2431,13 +2430,12 @@ #. ♩ (U+02669), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "QUARTER_NOTE\n" "LngText.text" msgid "note" -msgstr "icke" +msgstr "not" #. ♪ (U+0266A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2446,7 +2444,7 @@ "EIGHTH_NOTE\n" "LngText.text" msgid "note2" -msgstr "" +msgstr "not2" #. ♫ (U+0266B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2455,7 +2453,7 @@ "BEAMED_EIGHTH_NOTES\n" "LngText.text" msgid "notes" -msgstr "" +msgstr "noter" #. ♬ (U+0266C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2464,7 +2462,7 @@ "BEAMED_SIXTEENTH_NOTES\n" "LngText.text" msgid "notes2" -msgstr "" +msgstr "noter2" #. ♭ (U+0266D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2473,7 +2471,7 @@ "MUSIC_FLAT_SIGN\n" "LngText.text" msgid "flat" -msgstr "" +msgstr "b förtecken" #. ♮ (U+0266E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2482,7 +2480,7 @@ "MUSIC_NATURAL_SIGN\n" "LngText.text" msgid "natural" -msgstr "" +msgstr "återställningstecken" #. ♯ (U+0266F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2491,7 +2489,7 @@ "MUSIC_SHARP_SIGN\n" "LngText.text" msgid "sharp" -msgstr "" +msgstr "korsförtecken" #. ♲ (U+02672), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2500,7 +2498,7 @@ "UNIVERSAL_RECYCLING_SYMBOL\n" "LngText.text" msgid "recycling" -msgstr "" +msgstr "återvinning" #. ♻ (U+0267B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2509,7 +2507,7 @@ "BLACK_UNIVERSAL_RECYCLING_SYMBOL\n" "LngText.text" msgid "recycling2" -msgstr "" +msgstr "återvinning2" #. ♼ (U+0267C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2518,7 +2516,7 @@ "RECYCLED_PAPER\n" "LngText.text" msgid "recycled paper" -msgstr "" +msgstr "återvunnet papper" #. ♾ (U+0267E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2527,7 +2525,7 @@ "PERMANENT_PAPER\n" "LngText.text" msgid "permanent paper" -msgstr "" +msgstr "permanent papper" #. ♿ (U+0267F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2536,7 +2534,7 @@ "WHEELCHAIR_SYMBOL\n" "LngText.text" msgid "wheelchair" -msgstr "" +msgstr "rullstol" #. ⚀ (U+02680), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2545,7 +2543,7 @@ "DIE_FACE-1\n" "LngText.text" msgid "dice1" -msgstr "" +msgstr "tärning1" #. ⚁ (U+02681), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2554,7 +2552,7 @@ "DIE_FACE-2\n" "LngText.text" msgid "dice2" -msgstr "" +msgstr "tärning2" #. ⚂ (U+02682), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2563,7 +2561,7 @@ "DIE_FACE-3\n" "LngText.text" msgid "dice3" -msgstr "" +msgstr "tärning3" #. ⚃ (U+02683), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2572,7 +2570,7 @@ "DIE_FACE-4\n" "LngText.text" msgid "dice4" -msgstr "" +msgstr "tärning4" #. ⚄ (U+02684), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2581,7 +2579,7 @@ "DIE_FACE-5\n" "LngText.text" msgid "dice5" -msgstr "" +msgstr "tärning5" #. ⚅ (U+02685), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2590,7 +2588,7 @@ "DIE_FACE-6\n" "LngText.text" msgid "dice6" -msgstr "" +msgstr "tärning6" #. ⚐ (U+02690), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2599,7 +2597,7 @@ "WHITE_FLAG\n" "LngText.text" msgid "flag" -msgstr "" +msgstr "flagga" #. ⚑ (U+02691), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2608,7 +2606,7 @@ "BLACK_FLAG\n" "LngText.text" msgid "flag2" -msgstr "" +msgstr "flagga2" #. ⚒ (U+02692), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2617,7 +2615,7 @@ "HAMMER_AND_PICK\n" "LngText.text" msgid "hammer and pick" -msgstr "" +msgstr "hammare och hacka" #. ⚓ (U+02693), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2626,7 +2624,7 @@ "ANCHOR\n" "LngText.text" msgid "anchor" -msgstr "" +msgstr "ankare" #. ⚔ (U+02694), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2635,7 +2633,7 @@ "CROSSED_SWORDS\n" "LngText.text" msgid "swords" -msgstr "" +msgstr "svärd" #. ⚕ (U+02695), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2644,7 +2642,7 @@ "STAFF_OF_AESCULAPIUS\n" "LngText.text" msgid "medical" -msgstr "" +msgstr "eskulapstav" #. ⚖ (U+02696), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2653,7 +2651,7 @@ "SCALES\n" "LngText.text" msgid "scales" -msgstr "" +msgstr "balansvåg" #. ⚗ (U+02697), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2671,7 +2669,7 @@ "FLOWER\n" "LngText.text" msgid "flower" -msgstr "" +msgstr "blomma" #. ⚙ (U+02699), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2680,7 +2678,7 @@ "GEAR\n" "LngText.text" msgid "gear" -msgstr "" +msgstr "kugghjul" #. ⚚ (U+0269A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2698,7 +2696,7 @@ "ATOM_SYMBOL\n" "LngText.text" msgid "atom" -msgstr "" +msgstr "atom" #. ⚜ (U+0269C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2707,7 +2705,7 @@ "FLEUR-DE-LIS\n" "LngText.text" msgid "fleur de lis" -msgstr "" +msgstr "fransk lilja" #. ⚠ (U+026A0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2716,7 +2714,7 @@ "WARNING_SIGN\n" "LngText.text" msgid "warning" -msgstr "" +msgstr "varning" #. ⚡ (U+026A1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2725,7 +2723,7 @@ "HIGH_VOLTAGE_SIGN\n" "LngText.text" msgid "zap" -msgstr "" +msgstr "hög spänning" #. ⚪ (U+026AA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2734,7 +2732,7 @@ "MEDIUM_WHITE_CIRCLE\n" "LngText.text" msgid "white circle" -msgstr "" +msgstr "vit cirkel" #. ⚫ (U+026AB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2743,7 +2741,7 @@ "MEDIUM_BLACK_CIRCLE\n" "LngText.text" msgid "black circle" -msgstr "" +msgstr "svart cirkel" #. ⚭ (U+026AD), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2752,7 +2750,7 @@ "MARRIAGE_SYMBOL\n" "LngText.text" msgid "marriage" -msgstr "" +msgstr "äktenskap" #. ⚮ (U+026AE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2761,7 +2759,7 @@ "DIVORCE_SYMBOL\n" "LngText.text" msgid "divorce" -msgstr "" +msgstr "skilsmässa" #. ⚰ (U+026B0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2770,7 +2768,7 @@ "COFFIN\n" "LngText.text" msgid "coffin" -msgstr "" +msgstr "kista" #. ⚱ (U+026B1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2801,23 +2799,21 @@ #. ⛄ (U+026C4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SNOWMAN_WITHOUT_SNOW\n" "LngText.text" msgid "snowman2" -msgstr "snögubbe" +msgstr "snögubbe2" #. ⛅ (U+026C5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUN_BEHIND_CLOUD\n" "LngText.text" msgid "cloud2" -msgstr "moln" +msgstr "moln2" #. ⛆ (U+026C6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2826,17 +2822,16 @@ "RAIN\n" "LngText.text" msgid "rain2" -msgstr "" +msgstr "regn2" #. ⛈ (U+026C8), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "THUNDER_CLOUD_AND_RAIN\n" "LngText.text" msgid "cloud3" -msgstr "moln" +msgstr "moln3" #. ⛎ (U+026CE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2939,13 +2934,12 @@ #. ⛱ (U+026F1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "UMBRELLA_ON_GROUND\n" "LngText.text" msgid "umbrella3" -msgstr "paraply" +msgstr "paraply3" #. ⛲ (U+026F2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2981,17 +2975,16 @@ "SAILBOAT\n" "LngText.text" msgid "sailboat" -msgstr "" +msgstr "segelbåt" #. ⛺ (U+026FA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "TENT\n" "LngText.text" msgid "tent" -msgstr "cent" +msgstr "tält" #. ⛷ (U+026F7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3112,13 +3105,12 @@ #. ✋ (U+0270B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "RAISED_HAND\n" "LngText.text" msgid "hand" -msgstr "och" +msgstr "hand" #. ✌ (U+0270C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3419,13 +3411,12 @@ #. ⬤ (U+02B24), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BLACK_LARGE_CIRCLE\n" "LngText.text" msgid "large circle2" -msgstr "stor cirkel" +msgstr "stor cirkel2" #. ⬭ (U+02B2D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3438,33 +3429,30 @@ #. ⭐ (U+02B50), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_MEDIUM_STAR\n" "LngText.text" msgid "medium star" -msgstr "medelstor kvadrat" +msgstr "medelstor stjärna" #. ⭑ (U+02B51), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BLACK_SMALL_STAR\n" "LngText.text" msgid "small star2" -msgstr "liten kvadrat2" +msgstr "liten stjärna2" #. ⭒ (U+02B52), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_SMALL_STAR\n" "LngText.text" msgid "small star" -msgstr "liten kvadrat" +msgstr "liten stjärna" #. ff (U+0FB00), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3473,7 +3461,7 @@ "LATIN_SMALL_LIGATURE_FF\n" "LngText.text" msgid "ff" -msgstr "" +msgstr "ff" #. fi (U+0FB01), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3482,7 +3470,7 @@ "LATIN_SMALL_LIGATURE_FI\n" "LngText.text" msgid "fi" -msgstr "" +msgstr "fi" #. fl (U+0FB02), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3491,7 +3479,7 @@ "LATIN_SMALL_LIGATURE_FL\n" "LngText.text" msgid "fl" -msgstr "" +msgstr "fl" #. ffi (U+0FB03), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3500,7 +3488,7 @@ "LATIN_SMALL_LIGATURE_FFI\n" "LngText.text" msgid "ffi" -msgstr "" +msgstr "ffi" #. ffl (U+0FB04), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3509,7 +3497,7 @@ "LATIN_SMALL_LIGATURE_FFL\n" "LngText.text" msgid "ffl" -msgstr "" +msgstr "ffl" #. 𝄞 (U+1D11E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3702,13 +3690,12 @@ #. 🌂 (U+1F302), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CLOSED_UMBRELLA\n" "LngText.text" msgid "umbrella2" -msgstr "paraply" +msgstr "paraply2" #. 🌃 (U+1F303), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3739,13 +3726,12 @@ #. 🌆 (U+1F306), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CITYSCAPE_AT_DUSK\n" "LngText.text" msgid "sunset" -msgstr "delmängd" +msgstr "solnedgång" #. 🌇 (U+1F307), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3754,7 +3740,7 @@ "SUNSET_OVER_BUILDINGS\n" "LngText.text" msgid "sunrise3" -msgstr "" +msgstr "solnedgång3" #. 🌈 (U+1F308), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3763,7 +3749,7 @@ "RAINBOW\n" "LngText.text" msgid "rainbow" -msgstr "" +msgstr "regnbåge" #. 🌉 (U+1F309), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3772,7 +3758,7 @@ "BRIDGE_AT_NIGHT\n" "LngText.text" msgid "bridge" -msgstr "" +msgstr "bro" #. 🌊 (U+1F30A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3781,7 +3767,7 @@ "WATER_WAVE\n" "LngText.text" msgid "ocean" -msgstr "" +msgstr "hav" #. 🌋 (U+1F30B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3790,7 +3776,7 @@ "VOLCANO\n" "LngText.text" msgid "volcano" -msgstr "" +msgstr "vulkan" #. 🌌 (U+1F30C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-5.0.2/translations/source/sv/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/sv/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/sv/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-06-24 12:02+0000\n" -"Last-Translator: Niklas Johansson \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 21:25+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435147335.000000\n" +"X-POOTLE-MTIME: 1439501151.000000\n" #: 01010000.xhp msgctxt "" @@ -11023,12 +11023,13 @@ msgstr "Grafikvy" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Visar en image map där du kan klicka och redigera stödpunkterna." #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/sv/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/sv/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/sv/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-06-22 13:45+0000\n" -"Last-Translator: Niklas Johansson \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-13 23:04+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434980739.000000\n" +"X-POOTLE-MTIME: 1439507097.000000\n" #: 01120000.xhp msgctxt "" @@ -42,12 +42,13 @@ msgstr "Visar en förhandsgranskning av den utskrivna sidan eller stänger förhandsgranskningen." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Använd ikonerna i Förhandsgranskningsraden om du vill bläddra igenom eller skriva ut sidorna i ett dokument." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "Du kan inte redigera dokumentet när du är i förhandsgranskning." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Vill du avsluta förhandsgranskning klickar du på knappen Stäng förhandsgranskning." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Öppnar dialogrutan Kopplad utskrift, med funktioner för att skriva ut och spara standardbrev." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Databasinformationen infogas först vid utskriften vid databasfältkommandonas (platshållarnas) positioner. Information om att infoga databasfältkommandon finns under Infoga - Fältkommando - Andra under fliken Databas." #: 01150000.xhp msgctxt "" @@ -3685,13 +3688,14 @@ msgstr "Markeringar" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Visar eller döljer markeringar i dokumentet, t.ex. fasta mellanslag, manuella avstavningar, sakregisterposter och fotnoter." #: 03080000.xhp msgctxt "" @@ -4171,13 +4175,14 @@ msgstr "Områden; infoga områden med DDEDDE-kommando; infoga områden" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Område" #: 04020100.xhp msgctxt "" @@ -4198,13 +4203,14 @@ msgstr "Nytt område" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Skriv ett namn för det nya området. Som standard tilldelar $[officename] automatiskt nya områden namnet \"Område X\", där X är ett nummer i ordningsföljd." #: 04020100.xhp msgctxt "" @@ -4225,13 +4231,14 @@ msgstr "Länk" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Infogar innehållet från ett annat dokument eller från ett område i ett annat dokument i det aktuella området." #: 04020100.xhp msgctxt "" @@ -4243,13 +4250,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Skapar en DDE-länk. Markera den här kryssrutan och ange sedan det DDE-kommando som du vill använda. DDE-alternativet är bara tillgängligt om kryssrutan Länka är markerad." #: 04020100.xhp msgctxt "" @@ -4270,22 +4278,24 @@ msgstr "Om du t.ex. vill infoga området \"Område1\" från $[officename] textdokumentet abc.sxw som en DDE-länk, så använder du följande kommando: \"soffice x:\\abc.sxw Område1\". Om du vill infoga innehållet från den första cellen i Microsoft Excel-kalkylbladet \"abc.xls\", så använder du följande kommando: \"excel x:\\[abc.xls]Tabell1 z1s1\". Du kan också kopiera element som du vill infoga som en DDE-länk, och sedan välja Redigera - Klistra in innehåll. Du kan sedan visa DDE-kommandot för länken genom att markera innehållet och välja Redigera - Fältkommando." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Filnamn / DDE-kommando " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Ange sökvägen och filnamnet för den fil du vill infoga, eller klicka på bläddringsknappen (...) för att leta upp filen.Om kryssrutan DDE är markerad kan du ange det DDE-kommando som du vill använda. " #: 04020100.xhp msgctxt "" @@ -4414,13 +4424,14 @@ msgstr "Dölj" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Döljer och skyddar det valda området från att skrivas ut. Innehållet i dolda områden visas i grått i Navigator. När du håller muspekaren över en dold komponent i Navigator visas tipshjälpen \"dolt\"." #: 04020100.xhp msgctxt "" @@ -4441,13 +4452,14 @@ msgstr "Med villkor" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Ange ett villkor som ska uppfyllas för att området ska döljas. Ett villkor är ett logiskt uttryck, som t.ex. \"HÄLSNINGSFRAS EQ Mr.\". Om du använder t.ex. funktionen för serieutskrift av standardbrev för att definiera databasfältet \"Hälsningsfras\" som innehåller \"Mr.\", \"Ms.\" eller \"Sir or Madam\", kan du sedan ange att ett område bara ska skrivas ut om hälsningsfrasen är \"Mr.\"." #: 04020100.xhp msgctxt "" @@ -10181,13 +10193,14 @@ msgstr "Så här visar du villkorlig text baserat på antalet sidor:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Välj Infoga - Fältkommando - Andra och klicka sedan på fliken Funktioner." #: 04090200.xhp msgctxt "" @@ -10244,13 +10257,14 @@ msgstr "Så här visar du villkorlig text baserad på en användardefinierad variabel" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Välj Infoga - Fältkommando - Andra och klicka sedan på fliken Variabler." #: 04090200.xhp msgctxt "" @@ -10361,13 +10375,14 @@ msgstr "I den första delen av exemplet infogas ett mellanslag mellan fälten \"Förnamn\" och \"Efternamn\" i ett dokument, och i den andra delen infogas text baserad på innehållet i ett fält. I exemplet förutsätts att en adressdatakälla är registrerad i $[officename]." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Välj Infoga - Fältkommando - Andra och klicka sedan på fliken Databas." #: 04090200.xhp msgctxt "" @@ -16145,15 +16160,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Den här fliken är inte tillgänglig i vyn Utskriftslayout." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16608,22 +16614,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Ändrar storlek, placering och andra egenskaper för den markerade bilden." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Du kan också ändra vissa av egenskaperna med kortkommandon." #: 05060000.xhp #, fuzzy @@ -17053,13 +17061,14 @@ msgstr "Spegelvänder inställningarna för horisontell justering på jämna sidor." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Du kan även använda alternativen för Bild för att justera objektlayout för jämna och udda sidor." #: 05060100.xhp msgctxt "" @@ -18171,13 +18180,14 @@ msgstr "Textanpassning" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Ange alternativ för spegelvändning och länkning för den markerade bilden." #: 05060300.xhp msgctxt "" @@ -18198,13 +18208,14 @@ msgstr "Lodrätt" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Spegelvänder den markerade bilden lodrätt." #: 05060300.xhp msgctxt "" @@ -18216,13 +18227,14 @@ msgstr "horisontalt, på" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Spegelvänder den markerade bilden vågrätt." #: 05060300.xhp msgctxt "" @@ -18234,13 +18246,14 @@ msgstr "på alla sidor" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Vänder den markerade bilden horisontellt på alla sidor." #: 05060300.xhp msgctxt "" @@ -18252,13 +18265,14 @@ msgstr "på vänstersidor" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Vänder den markerade bilden horisontellt på alla jämna sidor." #: 05060300.xhp msgctxt "" @@ -18270,13 +18284,14 @@ msgstr "på högersidor" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Vänder den markerade bilden horisontellt på alla udda sidor." #: 05060300.xhp msgctxt "" @@ -22976,13 +22991,14 @@ msgstr "Öppnar en dialogruta där du kan acceptera eller ignorera Autokorrigeringsändringar. Du kan också visa ändringar som är gjorda av en viss författare eller på ett visst datum." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Acceptera eller ignorera ändringar, fliken Filter" #: 05170000.xhp msgctxt "" @@ -23580,13 +23596,14 @@ msgstr "Du kan infoga ett hårt (skyddat) bindestreck direkt i dokumentet genom att klicka i ordet där bindestrecket ska läggas till och trycka på Skift+Kommando+Ctrl+minustecken (-)." #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Du kan dölja användardefinierade bindestreck genom att välja %PRODUCTNAME – InställningarVerktyg – Alternativ – %PRODUCTNAME Writer – Formateringshjälp och avmarkera kryssrutan Användardefinierade bindestreck." #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sv/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/sv/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/sv/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-17 11:43+0000\n" +"PO-Revision-Date: 2016-01-20 16:44+0000\n" "Last-Translator: Niklas Johansson \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439811805.000000\n" +"X-POOTLE-MTIME: 1453308259.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -1328,7 +1328,7 @@ "ContextLabel\n" "value.text" msgid "~Down" -msgstr "Ne~d" +msgstr "~nedåt" #: CalcCommands.xcu msgctxt "" @@ -1346,7 +1346,7 @@ "ContextLabel\n" "value.text" msgid "~Right" -msgstr "Höge~r" +msgstr "åt ~höger" #: CalcCommands.xcu msgctxt "" @@ -1364,7 +1364,7 @@ "ContextLabel\n" "value.text" msgid "~Up" -msgstr "~Upp" +msgstr "~uppåt" #: CalcCommands.xcu msgctxt "" @@ -1382,7 +1382,7 @@ "ContextLabel\n" "value.text" msgid "~Left" -msgstr "~Vänster" +msgstr "åt ~vänster" #: CalcCommands.xcu msgctxt "" @@ -1454,7 +1454,7 @@ "ContextLabel\n" "value.text" msgid "R~andom Number..." -msgstr "Slumpmässiga tal" +msgstr "~Slumpmässiga tal..." #: CalcCommands.xcu msgctxt "" @@ -3302,7 +3302,6 @@ msgstr "Ta bort sid~brytning" #: CalcCommands.xcu -#, fuzzy msgctxt "" "CalcCommands.xcu\n" "..CalcCommands.UserInterface.Popups..uno:FillCellsMenu\n" @@ -15149,7 +15148,6 @@ msgstr "~Punktuppställningstecken..." #: GenericCommands.xcu -#, fuzzy msgctxt "" "GenericCommands.xcu\n" "..GenericCommands.UserInterface.Commands..uno:EditDoc\n" diff -Nru libreoffice-5.0.2/translations/source/sv/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/sv/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/sv/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/sc/source/ui/src.po 2016-02-04 16:41:28.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-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-18 07:04+0000\n" +"PO-Revision-Date: 2015-12-14 06:36+0000\n" "Last-Translator: Niklas Johansson \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439881453.000000\n" +"X-POOTLE-MTIME: 1450074965.000000\n" #: condformatdlg.src msgctxt "" @@ -4920,7 +4920,6 @@ msgstr "Namn" #: globstr.src -#, fuzzy msgctxt "" "globstr.src\n" "RID_GLOBSTR\n" @@ -8232,7 +8231,6 @@ msgstr "Bestämmer det aktuella datumet för datorn." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_GET_DAY_OF_WEEK\n" @@ -13288,7 +13286,7 @@ "5\n" "string.text" msgid "If given the number to whose multiple the value is rounded, else 1." -msgstr "" +msgstr "Om angivet så är det, det tal till vars multipel värdet ska avrundas, annars 1." #: scfuncs.src msgctxt "" @@ -13306,7 +13304,7 @@ "7\n" "string.text" msgid "For negative numbers; if given and not equal to zero then rounds away from zero, else rounds towards zero." -msgstr "" +msgstr "För negativa tal: om angivet och inte lika med noll så avrundas bort från noll, annars avrundas mot noll." #: scfuncs.src msgctxt "" @@ -13428,17 +13426,15 @@ msgstr "Avrundar ett tal nedåt till närmsta multipel av signifikans, oavsett tecken på signifikans." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" "2\n" "string.text" msgid "Number" -msgstr "tal" +msgstr "Tal" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" @@ -13448,14 +13444,13 @@ msgstr "Talet som ska avrundas neråt." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_MATH\n" "4\n" "string.text" msgid "Significance" -msgstr "signifikans" +msgstr "Signifikans" #: scfuncs.src #, fuzzy @@ -13507,7 +13502,6 @@ msgstr "tal" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS1.SC_OPCODE_FLOOR_PRECISE\n" @@ -16472,7 +16466,6 @@ msgstr "0 eller FALSK beräknar sannolikhets- och täthetsfunktionen. Andra värden eller SANT beräknar den kumulativa fördelningsfunktionen." #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_CRIT_BINOM\n" @@ -21998,7 +21991,7 @@ "1\n" "string.text" msgid "Returns a number corresponding to one of the error values or #N/A if no error exists" -msgstr "" +msgstr "Returnerar ett tal som motsvarar ett av felvärdena eller #SAKNAS om det inte finns något fel" #: scfuncs.src msgctxt "" @@ -22016,7 +22009,7 @@ "3\n" "string.text" 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 "" +msgstr "Felvärdet vars identifieringsnummer du vill hitta. Kan vara ett faktiskt felvärde eller en referens till en cell som du vill testa." #: scfuncs.src msgctxt "" @@ -24396,14 +24389,13 @@ msgstr "Text" #: scfuncs.src -#, fuzzy msgctxt "" "scfuncs.src\n" "RID_SC_FUNCTION_DESCRIPTIONS2.SC_OPCODE_ENCODEURL\n" "3\n" "string.text" msgid "A string to be URL-encoded" -msgstr "En textsträng som ska URL-kodas" +msgstr "En textsträng som ska kodas som en URL" #: scfuncs.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sv/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sv/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sv/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-15 01:10+0000\n" -"Last-Translator: system user <>\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-09-18 21:04+0000\n" +"Last-Translator: Niklas Johansson \n" "Language-Team: none\n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439601021.000000\n" +"X-POOTLE-MTIME: 1442610251.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Minimumsvärdet måste vara mindre än maximumsvärdet." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Användardefinierat" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -7706,7 +7716,7 @@ "label\n" "string.text" msgid "_Indent:" -msgstr "" +msgstr "_Indrag:" #: sidebaralignment.ui msgctxt "" @@ -7808,14 +7818,13 @@ msgstr "Välj rotationsvinkel." #: sidebarcellappearance.ui -#, fuzzy msgctxt "" "sidebarcellappearance.ui\n" "cellbackgroundlabel\n" "label\n" "string.text" msgid "_Background:" -msgstr "Bakgrund" +msgstr "_Bakgrund:" #: sidebarcellappearance.ui msgctxt "" @@ -8070,7 +8079,6 @@ msgstr "Ange maximalt antal nollor som ska visas innan decimaltecknet." #: sidebarnumberformat.ui -#, fuzzy msgctxt "" "sidebarnumberformat.ui\n" "negativenumbersred\n" @@ -10751,85 +10759,3 @@ "string.text" msgid "Grouped by" msgstr "Grupperad efter" - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "Indrag vänster:" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "Vertikalt staplad" - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Justerar text vertikalt." - -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "Justerar text vertikalt." - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "Cellbakgrund:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "Cellinramning:" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "Visa rutnät för celler" - -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "Visa ett rutnät runt cellerna." - -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "Kategori:" - -#: sidebarnumberformat.ui -#, fuzzy -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "Negativa värden i rött" diff -Nru libreoffice-5.0.2/translations/source/sv/sd/source/ui/view.po libreoffice-5.0.5~rc2/translations/source/sv/sd/source/ui/view.po --- libreoffice-5.0.2/translations/source/sv/sd/source/ui/view.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/sd/source/ui/view.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-15 01:21+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-09-18 21:16+0000\n" +"Last-Translator: Niklas Johansson \n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439601672.000000\n" +"X-POOTLE-MTIME: 1442610985.000000\n" #: DocumentRenderer.src msgctxt "" @@ -104,7 +104,7 @@ "According to layout\n" "itemlist.text" msgid "According to layout" -msgstr "" +msgstr "Enligt layout" #: DocumentRenderer.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sv/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sv/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sv/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-21 21:51+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-12-14 06:29+0000\n" "Last-Translator: Niklas Johansson \n" "Language-Team: none\n" "Language: sv\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437515508.000000\n" +"X-POOTLE-MTIME: 1450074599.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "_Visa licens" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,10 +750,19 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 görs tillgängliga i enlighet med villkoren i Mozilla Public License version 3. En kopia av MPL-licensen kan hittas på http://www.mozilla.org/MPL/2.0/.Ytterligare meddelanden om upphovsrätt och licensvillkor för kod från tredje part, som gäller delar av programvaran, anges i LICENSE.html filen, välj Visa-licens för att se exakta uppgifter på engelska.Alla varumärken och registrerade varumärken som nämns häri tillhör sina respektive ägare.Copyright © 2000, 2015 LibreOffice bidragsgivare. Alla rättigheter förbehålls. Denna produkt skapades av %OOOVENDOR, baserad på OpenOffice.org, som är Copyright 2000, 2011 Oracle och/eller dess dotterbolag. %OOOVENDOR erkänner alla gemenskapens medlemmar, se http://www.libreoffice.org/ för mer information." +msgstr "" +"%PRODUCTNAME görs tillgänglig i enlighet med villkoren i Mozilla Public License version 2.0. En kopia av MPL-licensen kan hittas på http://mozilla.org/MPL/2.0/.\n" +"\n" +"Ytterligare meddelanden om upphovsrätt och licensvillkor för kod från tredje part, som gäller delar av programvaran, anges i filen LICENSE.html. Välj Visa licens för att se exakta uppgifter på engelska.\n" +"\n" +"Alla varumärken och registrerade varumärken som nämns häri tillhör sina respektive ägare.\n" +"\n" +"Copyright © 2000, 2015 LibreOffice bidragsgivare. Alla rättigheter förbehålls.\n" +"\n" +"Denna produkt skapades av %OOOVENDOR, baserad på OpenOffice.org, som är Copyright 2000, 2011 Oracle och/eller dess dotterbolag. %OOOVENDOR erkänner alla gemenskapens medlemmar, se http://www.libreoffice.org/ för mer information." #: linkeditdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sv/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/sv/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/sv/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/svx/source/dialog.po 2016-02-04 16:41:28.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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-07-12 20:11+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-10 12:03+0000\n" +"Last-Translator: Niklas Johansson \n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436731918.000000\n" +"X-POOTLE-MTIME: 1444478636.000000\n" #: bmpmask.src msgctxt "" @@ -6319,14 +6319,13 @@ msgstr "" #: ucsubset.src -#, fuzzy msgctxt "" "ucsubset.src\n" "RID_SUBSETMAP\n" "RID_SUBSETSTR_OLD_NORTH_ARABIAN\n" "string.text" msgid "Old North Arabian" -msgstr "Fornsydarabiska" +msgstr "Fornnordarabiska" #: ucsubset.src msgctxt "" @@ -6335,7 +6334,7 @@ "RID_SUBSETSTR_OLD_PERMIC\n" "string.text" msgid "Old Permic" -msgstr "" +msgstr "Fornpermiska" #: ucsubset.src msgctxt "" @@ -6344,7 +6343,7 @@ "RID_SUBSETSTR_ORNAMENTAL_DINGBATS\n" "string.text" msgid "Ornamental Dingbats" -msgstr "" +msgstr "Dingbats ornament" #: ucsubset.src msgctxt "" @@ -6353,7 +6352,7 @@ "RID_SUBSETSTR_PAHAWH_HMONG\n" "string.text" msgid "Pahawh Hmong" -msgstr "" +msgstr "Pahawh Hmong" #: ucsubset.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/sv/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sv/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sv/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sv/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-07-10 23:16+0000\n" -"Last-Translator: Niklas Johansson \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:37+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sv\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436570192.000000\n" +"X-POOTLE-MTIME: 1439602649.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Justera zoom" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/sw-TZ/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sw-TZ/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sw-TZ/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sw-TZ/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:31+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Badilisha" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Upana" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Upana" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Height" #: borderpage.ui msgctxt "" @@ -4326,13 +4329,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Height" #: distributionpage.ui #, fuzzy @@ -6500,13 +6504,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Jina" #: hyperlinkdocpage.ui msgctxt "" @@ -6635,13 +6640,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Jina" #: hyperlinkinternetpage.ui msgctxt "" @@ -6734,13 +6740,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Jina" #: hyperlinkmailpage.ui msgctxt "" @@ -6887,13 +6894,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Jina" #: hyperlinknewdocpage.ui msgctxt "" @@ -7710,13 +7718,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Mtindo" #: linetabpage.ui msgctxt "" @@ -7774,13 +7783,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Upana" #: linetabpage.ui msgctxt "" @@ -7792,13 +7802,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Upana" #: linetabpage.ui msgctxt "" @@ -7864,13 +7875,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Upana" #: linetabpage.ui msgctxt "" @@ -10582,13 +10594,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Saizi" #: optfontspage.ui #, fuzzy @@ -13218,13 +13231,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Height" #: pageformatpage.ui msgctxt "" @@ -13617,13 +13631,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Height" #: paragalignpage.ui msgctxt "" @@ -14645,22 +14660,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Position" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Position" #: possizetabpage.ui msgctxt "" @@ -14682,13 +14699,14 @@ msgstr "Position" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Upana" #: possizetabpage.ui #, fuzzy @@ -15135,22 +15153,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Position" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Position" #: rotationtabpage.ui msgctxt "" @@ -17606,57 +17626,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/sw-TZ/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/sw-TZ/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/sw-TZ/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sw-TZ/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:17+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/sw-TZ/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/sw-TZ/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/sw-TZ/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sw-TZ/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 21:06+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:29+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: sw_TZ\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431551207.000000\n" +"X-POOTLE-MTIME: 1439602187.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/sw-TZ/starmath/source.po libreoffice-5.0.5~rc2/translations/source/sw-TZ/starmath/source.po --- libreoffice-5.0.2/translations/source/sw-TZ/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sw-TZ/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/sw-TZ/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/sw-TZ/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/sw-TZ/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/sw-TZ/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-02-17 21:27+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:45+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: sw_TZ\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1361136479.000000\n" +"X-POOTLE-MTIME: 1439603131.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/ta/basctl/uiconfig/basicide/ui.po libreoffice-5.0.5~rc2/translations/source/ta/basctl/uiconfig/basicide/ui.po --- libreoffice-5.0.2/translations/source/ta/basctl/uiconfig/basicide/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/basctl/uiconfig/basicide/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-05-13 21:25+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"PO-Revision-Date: 2015-09-20 04:01+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: none\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431552355.000000\n" +"X-POOTLE-MTIME: 1442721706.000000\n" #: basicmacrodialog.ui msgctxt "" @@ -125,24 +125,22 @@ msgstr "பயனர் முகப்பு முன்னிருப்பு மொழியை அமை" #: defaultlanguage.ui -#, fuzzy msgctxt "" "defaultlanguage.ui\n" "defaultlabel\n" "label\n" "string.text" msgid "Default language:" -msgstr "முன்னிருப்பு மொழி" +msgstr "முன்னிருப்பு மொழி:" #: defaultlanguage.ui -#, fuzzy msgctxt "" "defaultlanguage.ui\n" "checkedlabel\n" "label\n" "string.text" msgid "Available languages:" -msgstr "இருக்கின்ற மொழிகள்" +msgstr "கிடைக்கும் மொழிகள்:" #: defaultlanguage.ui msgctxt "" @@ -199,14 +197,13 @@ msgstr "நீங்கள்தேர்ந்த மொழிகளின் வளங்களை அழிக்கும் தருவாயில் உள்ளீர்கள். தேர்ந்த மொழிகளுக்கான அனைத்து பயனாளர்களின் பயனர்முகப்பு சரங்கள் அழிக்கப்படும்." #: dialogpage.ui -#, fuzzy msgctxt "" "dialogpage.ui\n" "label1\n" "label\n" "string.text" msgid "Dialog:" -msgstr "உரையாடல்" +msgstr "உரையாடல்:" #: dialogpage.ui msgctxt "" @@ -281,24 +278,22 @@ msgstr "BASIC நூலகமாக ஏற்றுமதிசெய்" #: gotolinedialog.ui -#, fuzzy msgctxt "" "gotolinedialog.ui\n" "GotoLineDialog\n" "title\n" "string.text" msgid "Go to Line" -msgstr "கோட்டுக்குச் செல்" +msgstr "வரிக்குச் செல்" #: gotolinedialog.ui -#, fuzzy msgctxt "" "gotolinedialog.ui\n" "area\n" "label\n" "string.text" msgid "_Line number:" -msgstr "_கோட்டு எண்:" +msgstr "வரி எண்:" #: importlibdialog.ui msgctxt "" @@ -337,24 +332,22 @@ msgstr "விருப்பத்தேர்வு" #: libpage.ui -#, fuzzy msgctxt "" "libpage.ui\n" "label1\n" "label\n" "string.text" msgid "L_ocation:" -msgstr "இடம்" +msgstr "இடம்:" #: libpage.ui -#, fuzzy msgctxt "" "libpage.ui\n" "lingudictsft\n" "label\n" "string.text" msgid "_Library:" -msgstr "_நூலகம்" +msgstr "_நூலகம்:" #: libpage.ui msgctxt "" @@ -411,7 +404,6 @@ msgstr "இயக்கத்திலுள்ள" #: managebreakpoints.ui -#, fuzzy msgctxt "" "managebreakpoints.ui\n" "label2\n" @@ -439,14 +431,13 @@ msgstr "பயனர் முகப்பு மொழிகளை நிர்வகி [$1]" #: managelanguages.ui -#, fuzzy msgctxt "" "managelanguages.ui\n" "label1\n" "label\n" "string.text" msgid "Present languages:" -msgstr "தற்போதைய மொழிகள்" +msgstr "தற்போதைய மொழிகள்:" #: managelanguages.ui msgctxt "" @@ -476,14 +467,13 @@ msgstr "முன்னிருப்பு" #: modulepage.ui -#, fuzzy msgctxt "" "modulepage.ui\n" "label1\n" "label\n" "string.text" msgid "M_odule:" -msgstr "நிரல்கூறு" +msgstr "நிரல்கூறு:" #: modulepage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/connectivity/source/resource.po libreoffice-5.0.5~rc2/translations/source/ta/connectivity/source/resource.po --- libreoffice-5.0.2/translations/source/ta/connectivity/source/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/connectivity/source/resource.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-01-08 09:03+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"PO-Revision-Date: 2015-09-20 04:03+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: LANGUAGE \n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1420707819.000000\n" +"X-POOTLE-MTIME: 1442721813.000000\n" #: conn_error_message.src msgctxt "" @@ -1120,4 +1120,4 @@ "STR_ERROR_NEW_VERSION\n" "string.text" msgid "The connection could not be established. The database was created by a newer version of %PRODUCTNAME." -msgstr "" +msgstr "இணைப்பை ஏற்படுத்த முடியவில்லை. %PRODUCTNAME இன் புது பதிப்பினால் தரவுத்தளம் உருவாக்கப்பட்டுள்ளது." diff -Nru libreoffice-5.0.2/translations/source/ta/cui/source/dialogs.po libreoffice-5.0.5~rc2/translations/source/ta/cui/source/dialogs.po --- libreoffice-5.0.2/translations/source/ta/cui/source/dialogs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/cui/source/dialogs.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-22 07:10+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-13 12:43+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432278601.000000\n" +"X-POOTLE-MTIME: 1444740225.000000\n" #: cuires.src msgctxt "" @@ -103,7 +103,7 @@ "RID_SVXSTR_THOUSAND_SEP\n" "string.text" msgid "Thousands separator" -msgstr "" +msgstr "ஆயிரப் பிரிப்பி" #: cuires.src msgctxt "" @@ -111,7 +111,7 @@ "RID_SVXSTR_ENGINEERING\n" "string.text" msgid "Engineering notation" -msgstr "" +msgstr "பொறியியல் குறிப்பு" #: cuires.src msgctxt "" @@ -383,7 +383,7 @@ "RID_SVXSTR_HYPERDLG_HLMAILTP\n" "string.text" msgid "Mail" -msgstr "" +msgstr "அஞ்சல்" #: hyperdlg.src msgctxt "" @@ -391,7 +391,7 @@ "RID_SVXSTR_HYPERDLG_HLMAILTP_HELP\n" "string.text" msgid "This is where you create a hyperlink to an e-mail address." -msgstr "" +msgstr "இங்குதான் ஒரு மின்னஞ்சலுக்கான மீத்தொடுப்பை நீங்கள் உருவாக்க வேண்டும்." #: hyperdlg.src msgctxt "" @@ -487,7 +487,7 @@ "RID_SVXSTR_ADD_IMAGE\n" "string.text" msgid "Add Image" -msgstr "" +msgstr "பிம்பத்தைச் சேர்" #: passwdomdlg.src msgctxt "" @@ -527,7 +527,7 @@ "RID_SVXSTR_INVALID_STATE_FOR_OK_BUTTON_V2\n" "string.text" msgid "Set the password by entering the same password in both boxes." -msgstr "" +msgstr "இரு பெட்டிகளிலும் ஒரே கடவுச்சொல்லை உள்ளிட்டு கடவுச்சொல்லை அமை." #: scriptdlg.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/cui/source/tabpages.po libreoffice-5.0.5~rc2/translations/source/ta/cui/source/tabpages.po --- libreoffice-5.0.2/translations/source/ta/cui/source/tabpages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/cui/source/tabpages.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-01-11 15:43+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"PO-Revision-Date: 2015-10-13 12:44+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil \n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1420991038.000000\n" +"X-POOTLE-MTIME: 1444740261.000000\n" #: border.src msgctxt "" @@ -967,7 +967,7 @@ "RID_SVXSTR_CHARNAME_HIGHLIGHTING\n" "string.text" msgid "Highlighting Color" -msgstr "" +msgstr "முன்னிலைப்படுத்தும் நிறம்" #: strings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ta/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ta/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-06-16 13:46+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-12-05 08:14+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Tamil <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1434462362.000000\n" +"X-POOTLE-MTIME: 1449303287.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,8 +185,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "பதிப்புரிமை © 2000 - 2014 லிப்ரெஓபிஸ் பங்களிப்பாளர்கள்." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "பதிப்புரிமை © 2000 - 2015 லிப்ரெஓபிஸ் பங்களிப்பாளர்கள்." #: aboutdialog.ui msgctxt "" @@ -216,7 +216,6 @@ msgstr "இந்த வெளியீடு %OOOVENDOR ஆல் வழங்கப்பட்டது." #: aboutdialog.ui -#, fuzzy msgctxt "" "aboutdialog.ui\n" "link\n" @@ -1225,7 +1224,6 @@ msgstr "ஒளிஊடுருவல்:" #: backgroundpage.ui -#, fuzzy msgctxt "" "backgroundpage.ui\n" "background_label\n" @@ -3465,7 +3463,7 @@ "label\n" "string.text" msgid "Hex _#:" -msgstr "பதின்னறும:" +msgstr "Hex _#:" #: colorpickerdialog.ui msgctxt "" @@ -9815,7 +9813,7 @@ "label\n" "string.text" msgid "_No compression" -msgstr "அமுக்கம் இல்லை" +msgstr "_அமுக்கம் இல்லை" #: optasianpage.ui msgctxt "" @@ -9824,7 +9822,7 @@ "label\n" "string.text" msgid "_Compress punctuation only" -msgstr "நிறுத்த அழுத்தி மட்டுமே" +msgstr "~நிறுத்தக்குறியை மட்டும் இறுக்கு" #: optasianpage.ui msgctxt "" @@ -9833,7 +9831,7 @@ "label\n" "string.text" msgid "Compress punctuation and Japanese Kana" -msgstr "நிறுத்தற்குறிகளையும் சப்பானிய கானாவையும் அமுக்கு" +msgstr "நிறுத்தற்குறியையும் சப்பானிய கானாவையும் இறுக்கு" #: optasianpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/dbaccess/source/ext/macromigration.po libreoffice-5.0.5~rc2/translations/source/ta/dbaccess/source/ext/macromigration.po --- libreoffice-5.0.2/translations/source/ta/dbaccess/source/ext/macromigration.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/dbaccess/source/ext/macromigration.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "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: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-20 06:25+0000\n" -"Last-Translator: அருண் குமார் \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-09-29 13:24+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil \n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421735100.000000\n" +"X-POOTLE-MTIME: 1443533088.000000\n" #: macromigration.src msgctxt "" @@ -80,7 +80,7 @@ "STR_OVERALL_PROGRESS\n" "string.text" msgid "document $current$ of $overall$" -msgstr "$overall$ இல் $current$ ஆவணம்" +msgstr "$overall$ ஆவணங்களில் $current$ வது" #: macromigration.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/dbaccess/source/ui/dlg.po libreoffice-5.0.5~rc2/translations/source/ta/dbaccess/source/ui/dlg.po --- libreoffice-5.0.2/translations/source/ta/dbaccess/source/ui/dlg.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/dbaccess/source/ui/dlg.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "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: 2015-01-07 11:08+0100\n" -"PO-Revision-Date: 2015-01-20 06:44+0000\n" -"Last-Translator: அருண் குமார் \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-10-17 18:41+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English <>\n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421736276.000000\n" +"X-POOTLE-MTIME: 1445107262.000000\n" #: AutoControls.src msgctxt "" @@ -688,7 +688,7 @@ "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n" "%PRODUCTNAME will open this file in read-only mode." msgstr "" -"ஒரு %PRODUCTNAME விரிதாள் அல்லது மைக்ரோசாஃப்ட் எக்செல் பணிபுத்தகத்தைத் தேர்ந்தெடுக்க 'உலாவு...' என்பதைச் சொடுக்கு.\n" +"ஒரு %PRODUCTNAME விரிதாள் அல்லது மைக்ரோசாப்ட் எக்செல் பணிபுத்தகத்தைத் தேர்ந்தெடுக்க 'உலாவு...' என்பதைச் சொடுக்கு.\n" "இக்கோப்பினை %PRODUCTNAME வாசிக்க-மட்டுமான முறைமையில் திறக்கும்." #: dbadminsetup.src diff -Nru libreoffice-5.0.2/translations/source/ta/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/ta/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/ta/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.000000000 +0000 @@ -5,7 +5,7 @@ "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-09-02 14:42+0200\n" "PO-Revision-Date: 2015-08-15 00:48+0000\n" -"Last-Translator: system user <>\n" +"Last-Translator: அருண் குமார் Arun Kumar \n" "Language-Team: LANGUAGE \n" "Language: ta\n" "MIME-Version: 1.0\n" diff -Nru libreoffice-5.0.2/translations/source/ta/filter/source/config/fragments/filters.po libreoffice-5.0.5~rc2/translations/source/ta/filter/source/config/fragments/filters.po --- libreoffice-5.0.2/translations/source/ta/filter/source/config/fragments/filters.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/filter/source/config/fragments/filters.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-13 21:45+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-17 18:46+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English \n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431553558.000000\n" +"X-POOTLE-MTIME: 1445107563.000000\n" #: AbiWord.xcu msgctxt "" @@ -392,7 +392,7 @@ "UIName\n" "value.text" msgid "Microsoft Excel 2003 XML" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 2003 XML" +msgstr "மைக்ரோசாப்ட் எக்செல் 2003 XML" #: MS_Excel_4_0.xcu msgctxt "" @@ -401,7 +401,7 @@ "UIName\n" "value.text" msgid "Microsoft Excel 4.0" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 4.0" +msgstr "மைக்ரோசாப்ட் எக்செல் 4.0" #: MS_Excel_4_0_Vorlage_Template.xcu msgctxt "" @@ -419,7 +419,7 @@ "UIName\n" "value.text" msgid "Microsoft Excel 5.0" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 5.0" +msgstr "மைக்ரோசாப்ட் எக்செல் 5.0" #: MS_Excel_5_0_95_Vorlage_Template.xcu msgctxt "" @@ -437,7 +437,7 @@ "UIName\n" "value.text" msgid "Microsoft Excel 95" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 95" +msgstr "மைக்ரோசாப்ட் எக்செல் 95" #: MS_Excel_95_Vorlage_Template.xcu msgctxt "" @@ -446,7 +446,7 @@ "UIName\n" "value.text" msgid "Microsoft Excel 95 Template" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 95 வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் எக்செல் 95 வார்ப்புரு" #: MS_Excel_97.xcu msgctxt "" @@ -458,44 +458,40 @@ msgstr "" #: MS_Excel_97_Vorlage_Template.xcu -#, fuzzy msgctxt "" "MS_Excel_97_Vorlage_Template.xcu\n" "MS Excel 97 Vorlage/Template\n" "UIName\n" "value.text" msgid "Microsoft Excel 97-2003 Template" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 95 வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் எக்செல் 97-2003 வார்ப்புரு" #: MS_PowerPoint_97.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_97.xcu\n" "MS PowerPoint 97\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 97-2003" -msgstr "மைக்ரோசாஃப்ட் பவர்பாய்ண்ட் 97/2000/XP/2003" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 97-2003" #: MS_PowerPoint_97_AutoPlay.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_97_AutoPlay.xcu\n" "MS PowerPoint 97 AutoPlay\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 97-2003 AutoPlay" -msgstr "மைக்ரோசாஃப்ட் பவர்பாய்ண்ட் 97/2000/XP/2003 தானியோட்டம்" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 97-2003 தானியோட்டம்" #: MS_PowerPoint_97_Vorlage.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_97_Vorlage.xcu\n" "MS PowerPoint 97 Vorlage\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 97-2003 Template" -msgstr "மைக்ரோசாஃப்ட் பவர்பாய்ண்ட் 97/2000/XP/2003 வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 97-2003 வார்ப்புரு" #: MS_WinWord_5.xcu msgctxt "" @@ -504,7 +500,7 @@ "UIName\n" "value.text" msgid "Microsoft WinWord 1/2/5" -msgstr "மைக்ரோசாஃப்ட் விண்வேர்டு 1/2/5" +msgstr "மைக்ரோசாப்ட் விண்வேர்டு 1/2/5" #: MS_WinWord_6_0.xcu msgctxt "" @@ -513,7 +509,7 @@ "UIName\n" "value.text" msgid "Microsoft Word 6.0" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 6.0" +msgstr "மைக்ரோசாப்ட் வேர்டு 6.0" #: MS_Word_2003_XML.xcu msgctxt "" @@ -522,27 +518,25 @@ "UIName\n" "value.text" msgid "Microsoft Word 2003 XML" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2003 XML" +msgstr "மைக்ரோசாப்ட் வேர்டு 2003 XML" #: MS_Word_2007_XML.xcu -#, fuzzy msgctxt "" "MS_Word_2007_XML.xcu\n" "MS Word 2007 XML\n" "UIName\n" "value.text" msgid "Microsoft Word 2007-2013 XML" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2003 XML" +msgstr "மைக்ரோசாப்ட் வேர்டு 2007-2013 XML" #: MS_Word_2007_XML_Template.xcu -#, fuzzy msgctxt "" "MS_Word_2007_XML_Template.xcu\n" "MS Word 2007 XML Template\n" "UIName\n" "value.text" msgid "Microsoft Word 2007-2013 XML Template" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2007/2010/2013 XML வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் வேர்டு 2007-2013 XML வார்ப்புரு" #: MS_Word_95.xcu msgctxt "" @@ -551,7 +545,7 @@ "UIName\n" "value.text" msgid "Microsoft Word 95" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 95" +msgstr "மைக்ரோசாப்ட் வேர்டு 95" #: MS_Word_95_Vorlage.xcu msgctxt "" @@ -560,7 +554,7 @@ "UIName\n" "value.text" msgid "Microsoft Word 95 Template" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 95 வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் வேர்டு 95 வார்ப்புரு" #: MS_Word_97.xcu msgctxt "" @@ -572,14 +566,13 @@ msgstr "" #: MS_Word_97_Vorlage.xcu -#, fuzzy msgctxt "" "MS_Word_97_Vorlage.xcu\n" "MS Word 97 Vorlage\n" "UIName\n" "value.text" msgid "Microsoft Word 97-2003 Template" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 95 வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் வேர்டு 97-2003 வார்ப்புரு" #: MS_Works.xcu msgctxt "" @@ -588,7 +581,7 @@ "UIName\n" "value.text" msgid "Microsoft Works Document" -msgstr "மைக்ரோசாஃப்ட் வேர்க்ஸ் ஆவணம்" +msgstr "மைக்ரோசாப்ட் வேர்க்ஸ் ஆவணம்" #: MS_Works_Calc.xcu msgctxt "" @@ -597,7 +590,7 @@ "UIName\n" "value.text" msgid "Microsoft Works Document" -msgstr "மைக்ரோசாஃப்ட் வேர்க்ஸ் ஆவணம்" +msgstr "மைக்ரோசாப்ட் வேர்க்ஸ் ஆவணம்" #: MacDoc.xcu msgctxt "" @@ -894,7 +887,7 @@ "UIName\n" "value.text" msgid "Microsoft Publisher 98-2010" -msgstr "மைக்ரோசாஃப்ட் பப்லிஷர் 98-2010" +msgstr "மைக்ரோசாப்ட் பப்லிஷர் 98-2010" #: QPro.xcu msgctxt "" @@ -1209,7 +1202,7 @@ "UIName\n" "value.text" msgid "Microsoft Visio 2000-2013" -msgstr "மைக்ரோசாஃப்ட் விசியோ 2000-2013" +msgstr "மைக்ரோசாப்ட் விசியோ 2000-2013" #: WMF___MS_Windows_Metafile.xcu msgctxt "" @@ -1335,27 +1328,25 @@ "UIName\n" "value.text" msgid "Microsoft Excel 2007 Binary" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 2007 இருமைக்கூடு" +msgstr "மைக்ரோசாப்ட் எக்செல் 2007 இருமைக்கூடு" #: calc_MS_Excel_2007_XML.xcu -#, fuzzy msgctxt "" "calc_MS_Excel_2007_XML.xcu\n" "Calc MS Excel 2007 XML\n" "UIName\n" "value.text" msgid "Microsoft Excel 2007-2013 XML" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 2003 XML" +msgstr "மைக்ரோசாப்ட் எக்செல் 2007-2013 XML" #: calc_MS_Excel_2007_XML_Template.xcu -#, fuzzy msgctxt "" "calc_MS_Excel_2007_XML_Template.xcu\n" "Calc MS Excel 2007 XML Template\n" "UIName\n" "value.text" msgid "Microsoft Excel 2007-2013 XML Template" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 2007/2010/2013 XML வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் எக்செல் 2007-2013 XML வார்ப்புரு" #: calc_OOXML.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/filter/source/config/fragments/types.po libreoffice-5.0.5~rc2/translations/source/ta/filter/source/config/fragments/types.po --- libreoffice-5.0.2/translations/source/ta/filter/source/config/fragments/types.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/filter/source/config/fragments/types.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-05-13 21:46+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"PO-Revision-Date: 2015-10-17 18:47+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: LANGUAGE \n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431553562.000000\n" +"X-POOTLE-MTIME: 1445107656.000000\n" #: MS_Excel_2007_Binary.xcu msgctxt "" @@ -36,44 +36,40 @@ msgstr "மைரோசாஃப்ட் எக்செல் 2003 XML" #: MS_Excel_2007_XML_Template.xcu -#, fuzzy msgctxt "" "MS_Excel_2007_XML_Template.xcu\n" "MS Excel 2007 XML Template\n" "UIName\n" "value.text" msgid "Microsoft Excel 2007-2013 XML Template" -msgstr "மைக்ரோசாஃப்ட் எக்செல் 2007/2010/2013 XML வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் எக்செல் 2007-2013 XML வார்ப்புரு" #: MS_PowerPoint_2007_XML.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_2007_XML.xcu\n" "MS PowerPoint 2007 XML\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 2007-2013 XML" -msgstr "மைக்ரோசாஃப்ட் பவர்பொய்ண்ட் 2007/2010/2013 XML" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 2007-2013 XML" #: MS_PowerPoint_2007_XML_AutoPlay.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_2007_XML_AutoPlay.xcu\n" "MS PowerPoint 2007 XML AutoPlay\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 2007-2013 XML" -msgstr "மைக்ரோசாஃப்ட் பவர்பொய்ண்ட் 2007/2010/2013 XML" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 2007-2013 XML" #: MS_PowerPoint_2007_XML_Template.xcu -#, fuzzy msgctxt "" "MS_PowerPoint_2007_XML_Template.xcu\n" "MS PowerPoint 2007 XML Template\n" "UIName\n" "value.text" msgid "Microsoft PowerPoint 2007-2013 XML Template" -msgstr "மைக்ரோசாஃப்ட் பவர்பொய்ண்ட் 2007/2010/2013 XML வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் 2007-2013 XML வார்ப்புரு" #: StarBase.xcu msgctxt "" @@ -262,27 +258,25 @@ "UIName\n" "value.text" msgid "Microsoft Word 2003 XML" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2003 XML" +msgstr "மைக்ரோசாப்ட் வேர்டு 2003 XML" #: writer_MS_Word_2007_XML.xcu -#, fuzzy msgctxt "" "writer_MS_Word_2007_XML.xcu\n" "writer_MS_Word_2007\n" "UIName\n" "value.text" msgid "Microsoft Word 2007-2013 XML" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2003 XML" +msgstr "மைக்ரோசாப்ட் வேர்டு 2007-2013 XML" #: writer_MS_Word_2007_XML_Template.xcu -#, fuzzy msgctxt "" "writer_MS_Word_2007_XML_Template.xcu\n" "writer_MS_Word_2007_Template\n" "UIName\n" "value.text" msgid "Microsoft Word 2007-2013 XML Template" -msgstr "மைக்ரோசாஃப்ட் வேர்டு 2007/2010/2013 XML வார்ப்புரு" +msgstr "மைக்ரோசாப்ட் வேர்டு 2007-2013 XML வார்ப்புரு" #: writer_ODT_FlatXML.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/filter/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ta/filter/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ta/filter/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/filter/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +4,17 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-01-20 17:11+0000\n" -"Last-Translator: அருண் குமார் \n" +"PO-Revision-Date: 2015-10-04 15:37+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil <>\n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421773881.000000\n" +"X-POOTLE-MTIME: 1443973065.000000\n" #: impswfdialog.ui msgctxt "" @@ -225,7 +225,7 @@ "label\n" "string.text" msgid "_Lossless compression" -msgstr "இழப்பில்லா சுருக்கம்" +msgstr "இழப்பில்லா அமுக்கம்" #: pdfgeneralpage.ui msgctxt "" @@ -234,7 +234,7 @@ "label\n" "string.text" msgid "_JPEG compression" -msgstr "JPEG சுருக்கம்" +msgstr "_JPEG அமுக்கம்" #: pdfgeneralpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/ta/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/ta/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +4,17 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2014-08-01 19:44+0000\n" -"Last-Translator: Elanjelian \n" +"PO-Revision-Date: 2015-10-17 18:47+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil <>\n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1406922259.000000\n" +"X-POOTLE-MTIME: 1445107670.000000\n" #: ActionTe.ulf msgctxt "" @@ -2622,7 +2622,7 @@ "OOO_CONTROL_273\n" "LngText.text" msgid "Microsoft &Visio Documents" -msgstr "மைக்ரோசாஃப்ட் &விஷியோ ஆவணங்கள்" +msgstr "மைக்ரோசாப்ட் &விசியோ ஆவணங்கள்" #: Control.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/ta/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/ta/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-15 01:10+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-17 18:48+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439601050.000000\n" +"X-POOTLE-MTIME: 1445107700.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -7924,7 +7924,7 @@ "Label\n" "value.text" msgid "E-mail as ~Microsoft PowerPoint Presentation..." -msgstr "மைக்ரோசாஃப்ட் பவர்பொய்ண்ட் வழங்கலாக அஞ்சலனுப்பு..." +msgstr "மைக்ரோசாப்ட் பவர்பாயிண்ட் வழங்கலாக அஞ்சலனுப்பு..." #: DrawImpressCommands.xcu msgctxt "" @@ -19515,7 +19515,7 @@ "Label\n" "value.text" msgid "E-mail as ~Microsoft Format..." -msgstr "மைக்ரோசாஃப்ட் வடிவூட்டத்தில் அஞ்சலனுப்பு..." +msgstr "மைக்ரோசாப்ட் வடிவூட்டத்தில் அஞ்சலனுப்பு..." #: GenericCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/officecfg/registry/data/org/openoffice/Office.po libreoffice-5.0.5~rc2/translations/source/ta/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-5.0.2/translations/source/ta/officecfg/registry/data/org/openoffice/Office.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/officecfg/registry/data/org/openoffice/Office.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-05-13 21:48+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-17 18:48+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: Tamil <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431553688.000000\n" +"X-POOTLE-MTIME: 1445107684.000000\n" #: Addons.xcu msgctxt "" @@ -11609,7 +11609,7 @@ "DisplayName\n" "value.text" msgid "Microsoft Word 6.0 / 95" -msgstr "மைக்ரோசாஃப்ட் வேர்ட் 6.0 / 95" +msgstr "மைக்ரோசாப்ட் வேர்டு 6.0 / 95" #: UI.xcu msgctxt "" @@ -12104,7 +12104,7 @@ "Name\n" "value.text" msgid "Microsoft Office documents" -msgstr "மைக்ரோசாஃப்ட் ஆபிஸ் ஆவணங்கள்" +msgstr "மைக்ரோசாப்ட் ஆபிஸ் ஆவணங்கள்" #: WebWizard.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/readlicense_oo/docs.po libreoffice-5.0.5~rc2/translations/source/ta/readlicense_oo/docs.po --- libreoffice-5.0.2/translations/source/ta/readlicense_oo/docs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/readlicense_oo/docs.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,8 +4,8 @@ "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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-09-13 05:03+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"PO-Revision-Date: 2015-10-17 18:49+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1442120585.000000\n" +"X-POOTLE-MTIME: 1445107787.000000\n" #: readme.xrm msgctxt "" @@ -126,7 +126,7 @@ "s2s3sdf21\n" "readmeitem.text" msgid "Microsoft Windows XP SP2, Vista, Windows 7, or Windows 8" -msgstr "மைக்ரோசாஃப்ட் விண்டோஸ் எக்ஸ்பி, விஷ்டா, விண்டோஸ் 7 அல்லது விண்டோஸ் 8" +msgstr "மைக்ரோசாப்ட் விண்டோசு XP SP2, விஸ்ட்டா, விண்டோசு 7 அல்லது விண்டோசு 8" #: readme.xrm msgctxt "" @@ -150,7 +150,7 @@ "MSOReg2\n" "readmeitem.text" msgid "REGISTER_ALL_MSO_TYPES=1 will force registration of ${PRODUCTNAME} as default application for Microsoft Office formats." -msgstr "REGISTER_ALL_MSO_TYPES=1 ${PRODUCTNAME} ஐ மைக்ரோசாஃப்ட் ஓபிஸ் வடிவூட்டங்களுக்கான முன்னிருப்பு பயன்பாடாகப் பதிவு செய்யக் கட்டாயப்படுத்தும்." +msgstr "REGISTER_ALL_MSO_TYPES=1 ${PRODUCTNAME} ஐ மைக்ரோசாப்ட் ஓபிஸ் வடிவூட்டங்களுக்கான முன்னிருப்பு பயன்பாடாகப் பதிவு செய்யக் கட்டாயப்படுத்தும்." #: readme.xrm msgctxt "" @@ -158,7 +158,7 @@ "MSOReg3\n" "readmeitem.text" msgid "REGISTER_NO_MSO_TYPES=1 will suppress registration of ${PRODUCTNAME} as default application for Microsoft Office formats." -msgstr "REGISTER_NO_MSO_TYPES=1 ${PRODUCTNAME} ஐ மைக்ரோசாஃப்ட் ஓபிஸ் வடிவூட்டங்களுக்கான முன்னிருப்பு பயன்பாடாகப் பதிவு செய்வதைத் தடுக்கும்." +msgstr "REGISTER_NO_MSO_TYPES=1 ${PRODUCTNAME} ஐ மைக்ரோசாப்ட் ஓபிஸ் வடிவூட்டங்களுக்கான முன்னிருப்பு பயன்பாடாகப் பதிவு செய்வதைத் தடுக்கும்." #: readme.xrm msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ta/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ta/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 22:03+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: Tamil <>\n" "Language: ta\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431554614.000000\n" +"X-POOTLE-MTIME: 1439601984.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "தனிப்பயன்" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ta/scp2/source/activex.po libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/activex.po --- libreoffice-5.0.2/translations/source/ta/scp2/source/activex.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/activex.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,18 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:05+0200\n" -"PO-Revision-Date: 2011-04-06 02:29+0200\n" -"Last-Translator: ifelix25 \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: 2015-10-17 18:50+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: LANGUAGE \n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1445107816.000000\n" #: module_activex.ulf msgctxt "" @@ -29,4 +30,4 @@ "STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL\n" "LngText.text" msgid "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." -msgstr "மைக்ரோசாஃப்ட் இண்டர்நெட் எக்ஸ்ப்ளோரரில் %PRODUCTNAME ஆவணங்களை காட்ட செய்ய செயல்படுத்தும் கூறுகள்." +msgstr "மைக்ரோசாப்ட் இண்டர்நெட் எக்ஸ்ப்ளோரரில் %PRODUCTNAME ஆவணங்களைக் காட்டச் செய்ய செயல்படுத்தும் கூறுகள்." diff -Nru libreoffice-5.0.2/translations/source/ta/scp2/source/draw.po libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/draw.po --- libreoffice-5.0.2/translations/source/ta/scp2/source/draw.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/draw.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "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: 2014-05-02 00:05+0200\n" -"PO-Revision-Date: 2014-07-20 08:12+0000\n" -"Last-Translator: அருண் குமார் \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-10-17 18:50+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English \n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1405843934.000000\n" +"X-POOTLE-MTIME: 1445107848.000000\n" #: folderitem_draw.ulf msgctxt "" @@ -142,7 +142,7 @@ "STR_REG_VAL_MS_PUBLISHER_DOCUMENT\n" "LngText.text" msgid "Microsoft Publisher Document" -msgstr "மைக்ரோசாஃப்ட் பதிப்பாளர் ஆவணம்" +msgstr "மைக்ரோசாப்ட் பப்லிஷர் ஆவணம்" #: registryitem_draw.ulf msgctxt "" @@ -198,7 +198,7 @@ "STR_REG_VAL_MS_WINDOWS_METAFILE\n" "LngText.text" msgid "Microsoft Windows Metafile" -msgstr "மைக்ரோசாஃப்ட் விண்டோஸ் மீகோப்பு" +msgstr "மைக்ரோசாப்ட் விண்டோசு மீகோப்பு" #: registryitem_draw.ulf msgctxt "" @@ -206,7 +206,7 @@ "STR_REG_VAL_MS_WINDOWS_BITMAP\n" "LngText.text" msgid "Microsoft Windows Bitmap File" -msgstr "மைக்ரோசாஃப்ட் விண்டோஸ் பிட்டுபடக் கோப்பு" +msgstr "மைக்ரோசாப்ட் விண்டோசு பிட்டுபடக் கோப்பு" #: registryitem_draw.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ta/scp2/source/winexplorerext.po libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/winexplorerext.po --- libreoffice-5.0.2/translations/source/ta/scp2/source/winexplorerext.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/scp2/source/winexplorerext.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:05+0200\n" -"PO-Revision-Date: 2014-07-04 00:53+0000\n" -"Last-Translator: Elanjelian \n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-10-17 18:51+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: LANGUAGE \n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1404435202.000000\n" +"X-POOTLE-MTIME: 1445107863.000000\n" #: module_winexplorerext.ulf msgctxt "" @@ -30,4 +30,4 @@ "STR_DESC_MODULE_OPTIONAL_WINDOWS_EXPLORER_EXTENSIONS\n" "LngText.text" msgid "Enables the Microsoft Windows Explorer to show information about %PRODUCTNAME documents, such as thumbnail previews." -msgstr "குறும்பட முன்னோட்டங்கள் போன்ற %PRODUCTNAME ஆவணங்களைப் பற்றிய விவரங்களைக் காட்ட மைக்ரோசாஃப்ட் விண்டோஸ் எக்ஸ்ப்ளோரரை செயல்படுத்துகிறது." +msgstr "குறும்பட முன்னோட்டங்கள் போன்ற %PRODUCTNAME ஆவணங்களைப் பற்றிய விவரங்களைக் காட்ட மைக்ரோசாப்ட் விண்டோசு எக்ஸ்ப்ளோரரை செயல்படுத்துகிறது." diff -Nru libreoffice-5.0.2/translations/source/ta/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ta/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ta/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 22:11+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:45+0000\n" "Last-Translator: system user <>\n" "Language-Team: Tamil <>\n" "Language: ta\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431555081.000000\n" +"X-POOTLE-MTIME: 1439603151.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -1996,11 +1996,3 @@ "string.text" msgid "Existing Versions" msgstr "இருக்கும் பதிப்புகள்" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "மீட்டமை" diff -Nru libreoffice-5.0.2/translations/source/ta/starmath/source.po libreoffice-5.0.5~rc2/translations/source/ta/starmath/source.po --- libreoffice-5.0.2/translations/source/ta/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ta/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ta/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ta/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-13 22:20+0000\n" -"Last-Translator: அருண் குமார் Arun Kumar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:57+0000\n" +"Last-Translator: system user <>\n" "Language-Team: American English <>\n" "Language: ta\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431555640.000000\n" +"X-POOTLE-MTIME: 1439603846.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "பெருக்க மட்டத்தை சரிசெய்" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/ta/sw/source/ui/dbui.po libreoffice-5.0.5~rc2/translations/source/ta/sw/source/ui/dbui.po --- libreoffice-5.0.2/translations/source/ta/sw/source/ui/dbui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ta/sw/source/ui/dbui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "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: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-22 05:55+0000\n" -"Last-Translator: அருண் குமார் \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-10-17 18:51+0000\n" +"Last-Translator: வே. இளஞ்செழியன் (Ve. Elanjelian) \n" "Language-Team: American English \n" "Language: ta\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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421906141.000000\n" +"X-POOTLE-MTIME: 1445107871.000000\n" #: dbui.src msgctxt "" @@ -196,7 +196,7 @@ "STR_FILTER_XLS\n" "string.text" msgid "Microsoft Excel (*.xls)" -msgstr "மைக்ரோசாஃப்ட் எக்ஸல் (*.xls)" +msgstr "மைக்ரோசாப்ட் எக்செல் (*.xls)" #: dbui.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/te/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/te/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/te/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-13 22:54+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 00:39+0000\n" "Last-Translator: system user <>\n" "Language-Team: Telugu \n" "Language: te\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431557673.000000\n" +"X-POOTLE-MTIME: 1439599145.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "కాపీరైట్ © 2000 - 2014 లిబ్రేఆఫీస్ సహాయకులు." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/te/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/te/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/te/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 23:15+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:28+0000\n" "Last-Translator: system user <>\n" "Language-Team: Telugu \n" "Language: te\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431558913.000000\n" +"X-POOTLE-MTIME: 1439602102.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1564,6 +1564,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "మలచిన" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/te/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/te/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/te/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 23:19+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:46+0000\n" "Last-Translator: system user <>\n" "Language-Team: Telugu \n" "Language: te\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431559166.000000\n" +"X-POOTLE-MTIME: 1439603216.000000\n" #: alienwarndialog.ui msgctxt "" @@ -625,13 +625,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "వ్యాఖ్యలు(_C)" #: helpcontrol.ui msgctxt "" @@ -754,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2018,11 +2019,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "తిరిగివుంచు" diff -Nru libreoffice-5.0.2/translations/source/te/starmath/source.po libreoffice-5.0.5~rc2/translations/source/te/starmath/source.po --- libreoffice-5.0.2/translations/source/te/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/te/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/te/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/te/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-10-29 15:53+0000\n" -"Last-Translator: Krishnababu Krothapalli \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:59+0000\n" +"Last-Translator: system user <>\n" "Language-Team: Telugu \n" "Language: te\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1414597991.000000\n" +"X-POOTLE-MTIME: 1439603986.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/te/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/te/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/te/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/te/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/tg/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tg/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tg/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 00:45+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "Ивазкунӣ" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Бар" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Бар" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Баландӣ" #: borderpage.ui msgctxt "" @@ -4327,13 +4330,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Баландӣ" #: distributionpage.ui #, fuzzy @@ -6501,13 +6505,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Ном" #: hyperlinkdocpage.ui msgctxt "" @@ -6636,13 +6641,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Ном" #: hyperlinkinternetpage.ui msgctxt "" @@ -6735,13 +6741,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Ном" #: hyperlinkmailpage.ui msgctxt "" @@ -6888,13 +6895,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Ном" #: hyperlinknewdocpage.ui msgctxt "" @@ -7711,13 +7719,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Сабк" #: linetabpage.ui msgctxt "" @@ -7775,13 +7784,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Бар" #: linetabpage.ui msgctxt "" @@ -7793,13 +7803,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Бар" #: linetabpage.ui msgctxt "" @@ -7865,13 +7876,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Бар" #: linetabpage.ui msgctxt "" @@ -10583,13 +10595,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Андоза" #: optfontspage.ui #, fuzzy @@ -13219,13 +13232,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Баландӣ" #: pageformatpage.ui msgctxt "" @@ -13618,13 +13632,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Баландӣ" #: paragalignpage.ui msgctxt "" @@ -14646,22 +14661,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ҷойгиршавӣ" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ҷойгиршавӣ" #: possizetabpage.ui msgctxt "" @@ -14683,13 +14700,14 @@ msgstr "Ҷойгиршавӣ" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Бар" #: possizetabpage.ui #, fuzzy @@ -15136,22 +15154,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Ҷойгиршавӣ" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Ҷойгиршавӣ" #: rotationtabpage.ui msgctxt "" @@ -17609,57 +17629,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/tg/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/tg/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/tg/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 22:10+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -518,13 +518,14 @@ msgstr "Ҳуҷҷати асосӣ" #: 01010001.xhp +#, fuzzy msgctxt "" "01010001.xhp\n" "hd_id3153514\n" "1\n" "help.text" msgid "Master Document" -msgstr "" +msgstr "Ҳуруфот" #: 01010001.xhp msgctxt "" @@ -827,12 +828,13 @@ msgstr "" #: 01010100.xhp +#, fuzzy msgctxt "" "01010100.xhp\n" "par_id3149379\n" "help.text" msgid "File properties" -msgstr "" +msgstr "Кушодан" #: 01010200.xhp msgctxt "" @@ -4231,13 +4233,14 @@ msgstr "" #: 01110300.xhp +#, fuzzy msgctxt "" "01110300.xhp\n" "hd_id3160463\n" "1\n" "help.text" msgid "Saving (Templates)" -msgstr "" +msgstr "Кушодан" #: 01110300.xhp msgctxt "" @@ -11067,7 +11070,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -13966,13 +13969,14 @@ msgstr "" #: 04140000.xhp +#, fuzzy msgctxt "" "04140000.xhp\n" "hd_id3154350\n" "1\n" "help.text" msgid "Inserting Pictures" -msgstr "" +msgstr "Кушодан" #: 04140000.xhp msgctxt "" @@ -18593,12 +18597,13 @@ msgstr "Кушодан" #: 05020400.xhp +#, fuzzy msgctxt "" "05020400.xhp\n" "par_id3152933\n" "help.text" msgid "Assign macro" -msgstr "" +msgstr "Ҳуруфот" #: 05020500.xhp msgctxt "" @@ -19118,13 +19123,14 @@ msgstr "" #: 05020700.xhp +#, fuzzy msgctxt "" "05020700.xhp\n" "hd_id3155620\n" "1\n" "help.text" msgid "Asian Typography" -msgstr "" +msgstr "Гурӯҳбандӣ" #: 05020700.xhp msgctxt "" @@ -23021,13 +23027,14 @@ msgstr "" #: 05070000.xhp +#, fuzzy msgctxt "" "05070000.xhp\n" "hd_id3149987\n" "1\n" "help.text" msgid "Alignment (Objects)" -msgstr "" +msgstr "Ҳуруфот" #: 05070000.xhp msgctxt "" @@ -23109,13 +23116,14 @@ msgstr "Марказонидани уфуқӣ" #: 05070200.xhp +#, fuzzy msgctxt "" "05070200.xhp\n" "hd_id3150278\n" "1\n" "help.text" msgid "Center Horizontal" -msgstr "" +msgstr "Ҳуруфот" #: 05070200.xhp msgctxt "" @@ -28357,13 +28365,14 @@ msgstr "Ҷойгиркунӣ ба пас" #: 05250300.xhp +#, fuzzy msgctxt "" "05250300.xhp\n" "hd_id3150146\n" "1\n" "help.text" msgid "Send Backward" -msgstr "" +msgstr "Ҳуруфот" #: 05250300.xhp msgctxt "" @@ -33185,13 +33194,14 @@ msgstr "" #: 06010000.xhp +#, fuzzy msgctxt "" "06010000.xhp\n" "hd_id3153882\n" "1\n" "help.text" msgid "Spelling and Grammar" -msgstr "" +msgstr "Интихоби ҳама" #: 06010000.xhp msgctxt "" @@ -37128,12 +37138,13 @@ msgstr "" #: 06050600.xhp +#, fuzzy msgctxt "" "06050600.xhp\n" "par_id3147228\n" "help.text" msgid "Paragraph alignment" -msgstr "" +msgstr "Ҳуруфот" #: 06130000.xhp msgctxt "" @@ -37829,12 +37840,13 @@ msgstr "" #: 06130001.xhp +#, fuzzy msgctxt "" "06130001.xhp\n" "par_idN105D3\n" "help.text" msgid "Organize Dialogs" -msgstr "" +msgstr "Сабт кардан ҳамчун" #: 06130001.xhp msgctxt "" @@ -38020,12 +38032,13 @@ msgstr "" #: 06130200.xhp +#, fuzzy msgctxt "" "06130200.xhp\n" "par_idN1057F\n" "help.text" msgid "%PRODUCTNAME Basic" -msgstr "" +msgstr "Сабт кардан ҳамчун" #: 06130200.xhp msgctxt "" @@ -38036,12 +38049,13 @@ msgstr "" #: 06130200.xhp +#, fuzzy msgctxt "" "06130200.xhp\n" "par_idN105AA\n" "help.text" msgid "JavaScript" -msgstr "" +msgstr "Сабт кардан ҳамчун" #: 06130200.xhp msgctxt "" @@ -38061,12 +38075,13 @@ msgstr "" #: 06130200.xhp +#, fuzzy msgctxt "" "06130200.xhp\n" "par_idN10597\n" "help.text" msgid "BeanShell" -msgstr "" +msgstr "Сабт кардан ҳамчун" #: 06130200.xhp msgctxt "" @@ -41222,12 +41237,13 @@ msgstr "" #: 06990000.xhp +#, fuzzy msgctxt "" "06990000.xhp\n" "par_id2551957\n" "help.text" msgid "Spellcheck dialog" -msgstr "" +msgstr "Интихоби ҳама" #: 07010000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tg/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/tg/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/tg/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 23:55+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -25,12 +25,13 @@ msgstr "" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "hd_id2013916\n" "help.text" msgid "Print Preview" -msgstr "" +msgstr "Печонидан" #: 01120000.xhp msgctxt "" @@ -107,13 +108,14 @@ msgstr "Mail Merge-ро мекушояд диалоге, ки ба шумо барои чоп ва сабт кардани ҳарфҳои форма кӯмак мекунад." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Ҳангоми чопкунӣ, иттилооти махъзани далелҳо ҷои майдони мувофиқи махзани далелҳоро иваз мекунад (ҷойнишинҳо). Барои маълумоти иловагӣ оиди дарҷи майдонҳои махзани далелҳо муроҷиат намоед баDatabase tab page under Insert - Fields - Other." #: 01150000.xhp msgctxt "" @@ -700,13 +702,14 @@ msgstr "Роҳбалад" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "hd_id3151177\n" "85\n" "help.text" msgid "Navigator" -msgstr "" +msgstr "Печонидан" #: 02110000.xhp msgctxt "" @@ -2976,13 +2979,14 @@ msgstr "Иловакунии зерлавҳа" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "hd_id3143276\n" "1\n" "help.text" msgid "Footnote/Endnote" -msgstr "" +msgstr "Печонидан" #: 02150000.xhp msgctxt "" @@ -3652,13 +3656,14 @@ msgstr "" #: 03070000.xhp +#, fuzzy msgctxt "" "03070000.xhp\n" "hd_id3145418\n" "1\n" "help.text" msgid "Text Boundaries" -msgstr "" +msgstr "Печонидан" #: 03070000.xhp msgctxt "" @@ -3678,13 +3683,14 @@ msgstr "Соянокии майдонҳо" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "hd_id3151177\n" "18\n" "help.text" msgid "Field Shadings" -msgstr "" +msgstr "Печонидан" #: 03080000.xhp msgctxt "" @@ -3713,13 +3719,14 @@ msgstr "Майдонҳо" #: 03090000.xhp +#, fuzzy msgctxt "" "03090000.xhp\n" "hd_id3154505\n" "1\n" "help.text" msgid "Field Names" -msgstr "" +msgstr "Печонидан" #: 03090000.xhp msgctxt "" @@ -3749,13 +3756,14 @@ msgstr "" #: 03090000.xhp +#, fuzzy msgctxt "" "03090000.xhp\n" "par_id3145579\n" "3\n" "help.text" msgid "Insert - Fields." -msgstr "" +msgstr "Печонидан" #: 03100000.xhp msgctxt "" @@ -3810,13 +3818,14 @@ msgstr "Режими веб-саҳифа" #: 03120000.xhp +#, fuzzy msgctxt "" "03120000.xhp\n" "hd_id3145243\n" "1\n" "help.text" msgid "Web Layout" -msgstr "" +msgstr "Печонидан" #: 03120000.xhp msgctxt "" @@ -3836,13 +3845,14 @@ msgstr "" #: 03130000.xhp +#, fuzzy msgctxt "" "03130000.xhp\n" "hd_id3150018\n" "1\n" "help.text" msgid "Print Layout" -msgstr "" +msgstr "Печонидан" #: 03130000.xhp msgctxt "" @@ -4178,7 +4188,7 @@ "hd_id3157557\n" "37\n" "help.text" -msgid "Section" +msgid "Section" msgstr "" #: 04020100.xhp @@ -4495,13 +4505,14 @@ msgstr "" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3150032\n" "19\n" "help.text" msgid "Field commands" -msgstr "" +msgstr "Печонидан" #: 04020100.xhp msgctxt "" @@ -4576,13 +4587,14 @@ msgstr "" #: 04020200.xhp +#, fuzzy msgctxt "" "04020200.xhp\n" "par_id3149032\n" "7\n" "help.text" msgid "Field commands" -msgstr "" +msgstr "Печонидан" #: 04030000.xhp msgctxt "" @@ -4593,13 +4605,14 @@ msgstr "Иловакунии зерлавҳа" #: 04030000.xhp +#, fuzzy msgctxt "" "04030000.xhp\n" "hd_id3145241\n" "1\n" "help.text" msgid "Footnote/Endnote" -msgstr "" +msgstr "Печонидан" #: 04030000.xhp msgctxt "" @@ -5276,13 +5289,14 @@ msgstr "Мактуб" #: 04070100.xhp +#, fuzzy msgctxt "" "04070100.xhp\n" "hd_id3145243\n" "1\n" "help.text" msgid "Envelope" -msgstr "" +msgstr "Мактуб" #: 04070100.xhp msgctxt "" @@ -5743,13 +5757,14 @@ msgstr "Чопкунак" #: 04070300.xhp +#, fuzzy msgctxt "" "04070300.xhp\n" "hd_id3154104\n" "1\n" "help.text" msgid "Printer" -msgstr "" +msgstr "Печонидан" #: 04070300.xhp msgctxt "" @@ -6047,13 +6062,14 @@ msgstr "Ҳуҷҷат" #: 04090001.xhp +#, fuzzy msgctxt "" "04090001.xhp\n" "hd_id3150017\n" "1\n" "help.text" msgid "Document" -msgstr "" +msgstr "Печонидан" #: 04090001.xhp msgctxt "" @@ -7160,13 +7176,14 @@ msgstr "Функтсияҳо" #: 04090003.xhp +#, fuzzy msgctxt "" "04090003.xhp\n" "hd_id3149123\n" "1\n" "help.text" msgid "Functions" -msgstr "" +msgstr "Печонидан" #: 04090003.xhp msgctxt "" @@ -7787,13 +7804,14 @@ msgstr "Маълумот оиди ҳуҷҷат" #: 04090004.xhp +#, fuzzy msgctxt "" "04090004.xhp\n" "hd_id3154479\n" "1\n" "help.text" msgid "DocInformation" -msgstr "" +msgstr "Печонидан" #: 04090004.xhp msgctxt "" @@ -8088,13 +8106,14 @@ msgstr "" #: 04090005.xhp +#, fuzzy msgctxt "" "04090005.xhp\n" "hd_id3153716\n" "1\n" "help.text" msgid "Variables" -msgstr "" +msgstr "Печонидан" #: 04090005.xhp msgctxt "" @@ -8556,13 +8575,14 @@ msgstr "Махзани далелҳо" #: 04090006.xhp +#, fuzzy msgctxt "" "04090006.xhp\n" "hd_id3153536\n" "1\n" "help.text" msgid "Database" -msgstr "" +msgstr "Печонидан" #: 04090006.xhp msgctxt "" @@ -8906,13 +8926,14 @@ msgstr "" #: 04090007.xhp +#, fuzzy msgctxt "" "04090007.xhp\n" "hd_id3154106\n" "1\n" "help.text" msgid "Special Tags" -msgstr "" +msgstr "Печонидан" #: 04090007.xhp msgctxt "" @@ -10507,13 +10528,14 @@ msgstr "" #: 04120000.xhp +#, fuzzy msgctxt "" "04120000.xhp\n" "hd_id3151380\n" "1\n" "help.text" msgid "Indexes and Tables" -msgstr "" +msgstr "Печонидан" #: 04120000.xhp msgctxt "" @@ -10543,13 +10565,14 @@ msgstr "Печонидан" #: 04120000.xhp +#, fuzzy msgctxt "" "04120000.xhp\n" "hd_id3147501\n" "4\n" "help.text" msgid "Indexes and Tables" -msgstr "" +msgstr "Печонидан" #: 04120000.xhp msgctxt "" @@ -11081,13 +11104,14 @@ msgstr "Намуд" #: 04120210.xhp +#, fuzzy msgctxt "" "04120210.xhp\n" "hd_id3150933\n" "1\n" "help.text" msgid "Index/Table" -msgstr "" +msgstr "Печонидан" #: 04120210.xhp msgctxt "" @@ -11135,13 +11159,14 @@ msgstr "" #: 04120210.xhp +#, fuzzy msgctxt "" "04120210.xhp\n" "hd_id3151265\n" "7\n" "help.text" msgid "Index of Tables" -msgstr "" +msgstr "Печонидан" #: 04120210.xhp msgctxt "" @@ -11153,13 +11178,14 @@ msgstr "" #: 04120210.xhp +#, fuzzy msgctxt "" "04120210.xhp\n" "hd_id3149759\n" "9\n" "help.text" msgid "Table of Objects" -msgstr "" +msgstr "Печонидан" #: 04120210.xhp msgctxt "" @@ -12177,13 +12203,14 @@ msgstr "Муқарраркунии услуб" #: 04120219.xhp +#, fuzzy msgctxt "" "04120219.xhp\n" "hd_id3155621\n" "1\n" "help.text" msgid "Assign Styles" -msgstr "" +msgstr "Печонидан" #: 04120219.xhp msgctxt "" @@ -12313,13 +12340,14 @@ msgstr "" #: 04120220.xhp +#, fuzzy msgctxt "" "04120220.xhp\n" "hd_id3150761\n" "7\n" "help.text" msgid "Index of Tables" -msgstr "" +msgstr "Печонидан" #: 04120220.xhp msgctxt "" @@ -12331,13 +12359,14 @@ msgstr "" #: 04120220.xhp +#, fuzzy msgctxt "" "04120220.xhp\n" "hd_id3151175\n" "9\n" "help.text" msgid "Table of Objects" -msgstr "" +msgstr "Печонидан" #: 04120220.xhp msgctxt "" @@ -12864,13 +12893,14 @@ msgstr "" #: 04120224.xhp +#, fuzzy msgctxt "" "04120224.xhp\n" "hd_id3147406\n" "1\n" "help.text" msgid "Entries (index of tables)" -msgstr "" +msgstr "Печонидан" #: 04120224.xhp msgctxt "" @@ -13895,13 +13925,14 @@ msgstr "Ҷадвал" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "hd_id3147402\n" "1\n" "help.text" msgid "Table" -msgstr "" +msgstr "Печонидан" #: 04150000.xhp msgctxt "" @@ -14775,13 +14806,14 @@ msgstr "" #: 05030200.xhp +#, fuzzy msgctxt "" "05030200.xhp\n" "hd_id3083447\n" "1\n" "help.text" msgid "Text Flow" -msgstr "" +msgstr "Печонидан" #: 05030200.xhp msgctxt "" @@ -15295,13 +15327,14 @@ msgstr "Сохтори рақамгузорӣ" #: 05030800.xhp +#, fuzzy msgctxt "" "05030800.xhp\n" "hd_id3151173\n" "1\n" "help.text" msgid "Outline & Numbering" -msgstr "" +msgstr "Печонидан" #: 05030800.xhp msgctxt "" @@ -15953,13 +15986,14 @@ msgstr "Зерлавҳа" #: 05040600.xhp +#, fuzzy msgctxt "" "05040600.xhp\n" "hd_id3154767\n" "1\n" "help.text" msgid "Footnote" -msgstr "" +msgstr "Печонидан" #: 05040600.xhp msgctxt "" @@ -16159,13 +16193,14 @@ msgstr "Сарэзоҳ/Зерэзоҳ" #: 05040700.xhp +#, fuzzy msgctxt "" "05040700.xhp\n" "hd_id3149028\n" "1\n" "help.text" msgid "Footnotes/Endnotes" -msgstr "" +msgstr "Печонидан" #: 05040700.xhp msgctxt "" @@ -16179,15 +16214,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16472,13 +16498,14 @@ msgstr "" #: 05040800.xhp +#, fuzzy msgctxt "" "05040800.xhp\n" "hd_id3150760\n" "18\n" "help.text" msgid "Text Grid" -msgstr "" +msgstr "Печонидан" #: 05040800.xhp msgctxt "" @@ -19573,13 +19600,14 @@ msgstr "" #: 05060900.xhp +#, fuzzy msgctxt "" "05060900.xhp\n" "par_id3150689\n" "34\n" "help.text" msgid "Text direction." -msgstr "" +msgstr "Печонидан" #: 05080000.xhp msgctxt "" @@ -20268,13 +20296,14 @@ msgstr "" #: 05090300.xhp +#, fuzzy msgctxt "" "05090300.xhp\n" "hd_id3154558\n" "1\n" "help.text" msgid "Text Flow" -msgstr "" +msgstr "Печонидан" #: 05090300.xhp msgctxt "" @@ -20663,13 +20692,14 @@ msgstr "" #: 05100400.xhp +#, fuzzy msgctxt "" "05100400.xhp\n" "hd_id3149052\n" "1\n" "help.text" msgid "Unprotect" -msgstr "" +msgstr "Печонидан" #: 05100400.xhp msgctxt "" @@ -20736,22 +20766,24 @@ msgstr "Печонидан" #: 05110000.xhp +#, fuzzy msgctxt "" "05110000.xhp\n" "hd_id3149349\n" "5\n" "help.text" msgid "Optimal Height" -msgstr "" +msgstr "Печонидан" #: 05110000.xhp +#, fuzzy msgctxt "" "05110000.xhp\n" "hd_id3149883\n" "4\n" "help.text" msgid "Insert..." -msgstr "" +msgstr "Печонидан" #: 05110100.xhp msgctxt "" @@ -20950,31 +20982,34 @@ msgstr "" #: 05120000.xhp +#, fuzzy msgctxt "" "05120000.xhp\n" "hd_id3146322\n" "4\n" "help.text" msgid "Width..." -msgstr "" +msgstr "Печонидан" #: 05120000.xhp +#, fuzzy msgctxt "" "05120000.xhp\n" "hd_id3154558\n" "6\n" "help.text" msgid "Optimal width" -msgstr "" +msgstr "Печонидан" #: 05120000.xhp +#, fuzzy msgctxt "" "05120000.xhp\n" "hd_id3150564\n" "5\n" "help.text" msgid "Insert..." -msgstr "" +msgstr "Печонидан" #: 05120100.xhp msgctxt "" @@ -21714,13 +21749,14 @@ msgstr "Ус~луби рақамгузорӣ" #: 05130004.xhp +#, fuzzy msgctxt "" "05130004.xhp\n" "hd_id3155961\n" "1\n" "help.text" msgid "Numbering Style" -msgstr "" +msgstr "Печонидан" #: 05130004.xhp msgctxt "" @@ -21757,13 +21793,14 @@ msgstr "" #: 05130100.xhp +#, fuzzy msgctxt "" "05130100.xhp\n" "hd_id3154656\n" "1\n" "help.text" msgid "Condition" -msgstr "" +msgstr "Интихоб" #: 05130100.xhp msgctxt "" @@ -21998,13 +22035,14 @@ msgstr "" #: 05140000.xhp +#, fuzzy msgctxt "" "05140000.xhp\n" "hd_id3154505\n" "1\n" "help.text" msgid "Styles and Formatting" -msgstr "" +msgstr "Печонидан" #: 05140000.xhp msgctxt "" @@ -22350,13 +22388,14 @@ msgstr "" #: 05150000.xhp +#, fuzzy msgctxt "" "05150000.xhp\n" "hd_id3153925\n" "1\n" "help.text" msgid "AutoCorrect" -msgstr "" +msgstr "Автоматн" #: 05150000.xhp msgctxt "" @@ -22401,13 +22440,14 @@ msgstr "" #: 05150100.xhp +#, fuzzy msgctxt "" "05150100.xhp\n" "hd_id3147436\n" "1\n" "help.text" msgid "While Typing" -msgstr "" +msgstr "Печонидан" #: 05150100.xhp msgctxt "" @@ -22437,13 +22477,14 @@ msgstr "" #: 05150100.xhp +#, fuzzy msgctxt "" "05150100.xhp\n" "par_id3150536\n" "25\n" "help.text" msgid "Other AutoCorrect rules" -msgstr "" +msgstr "Автоматн" #: 05150101.xhp msgctxt "" @@ -23260,13 +23301,14 @@ msgstr "Печонидан" #: 05180000.xhp +#, fuzzy msgctxt "" "05180000.xhp\n" "hd_id3149027\n" "5\n" "help.text" msgid "Dynamic page wrap" -msgstr "" +msgstr "Печонидан" #: 05180000.xhp #, fuzzy @@ -23279,13 +23321,14 @@ msgstr "Печонидан" #: 05180000.xhp +#, fuzzy msgctxt "" "05180000.xhp\n" "hd_id3156321\n" "7\n" "help.text" msgid "In background" -msgstr "" +msgstr "Печонидан" #: 05180000.xhp #, fuzzy @@ -23298,13 +23341,14 @@ msgstr "Печонидан" #: 05180000.xhp +#, fuzzy msgctxt "" "05180000.xhp\n" "hd_id3147566\n" "9\n" "help.text" msgid "Edit Contour" -msgstr "" +msgstr "Печонидан" #: 05180000.xhp msgctxt "" @@ -23342,13 +23386,14 @@ msgstr "" #: 05190000.xhp +#, fuzzy msgctxt "" "05190000.xhp\n" "hd_id3153246\n" "1\n" "help.text" msgid "Split Table" -msgstr "" +msgstr "Печонидан" #: 05190000.xhp msgctxt "" @@ -23466,13 +23511,14 @@ msgstr "" #: 05200000.xhp +#, fuzzy msgctxt "" "05200000.xhp\n" "hd_id3154652\n" "1\n" "help.text" msgid "Merge Table" -msgstr "" +msgstr "Печонидан" #: 05200000.xhp msgctxt "" @@ -23752,12 +23798,13 @@ msgstr "" #: 06040000.xhp +#, fuzzy msgctxt "" "06040000.xhp\n" "par_idN10542\n" "help.text" msgid "Word Count" -msgstr "" +msgstr "Печонидан" #: 06040000.xhp msgctxt "" @@ -23917,13 +23964,14 @@ msgstr "Рақамгузорӣ" #: 06060100.xhp +#, fuzzy msgctxt "" "06060100.xhp\n" "hd_id3151387\n" "34\n" "help.text" msgid "Numbering" -msgstr "" +msgstr "Печонидан" #: 06060100.xhp msgctxt "" @@ -24293,13 +24341,14 @@ msgstr "Зерлавҳаҳо" #: 06080100.xhp +#, fuzzy msgctxt "" "06080100.xhp\n" "hd_id3154705\n" "1\n" "help.text" msgid "Footnotes" -msgstr "" +msgstr "Печонидан" #: 06080100.xhp msgctxt "" @@ -24858,13 +24907,14 @@ msgstr "Зерэзоҳ" #: 06080200.xhp +#, fuzzy msgctxt "" "06080200.xhp\n" "hd_id3156321\n" "1\n" "help.text" msgid "Endnotes" -msgstr "" +msgstr "Печонидан" #: 06080200.xhp msgctxt "" @@ -25642,13 +25692,14 @@ msgstr "" #: 06110000.xhp +#, fuzzy msgctxt "" "06110000.xhp\n" "hd_id3154505\n" "1\n" "help.text" msgid "Calculate" -msgstr "" +msgstr "Печонидан" #: 06110000.xhp msgctxt "" @@ -25668,13 +25719,14 @@ msgstr "Форматсозии саҳифа" #: 06120000.xhp +#, fuzzy msgctxt "" "06120000.xhp\n" "hd_id3155961\n" "1\n" "help.text" msgid "Page Formatting" -msgstr "" +msgstr "Печонидан" #: 06120000.xhp msgctxt "" @@ -25774,13 +25826,14 @@ msgstr "" #: 06170000.xhp +#, fuzzy msgctxt "" "06170000.xhp\n" "hd_id3149875\n" "1\n" "help.text" msgid "All Indexes and Tables" -msgstr "" +msgstr "Печонидан" #: 06170000.xhp msgctxt "" @@ -26095,13 +26148,14 @@ msgstr "Ҷадидсозии ҳама" #: 06190000.xhp +#, fuzzy msgctxt "" "06190000.xhp\n" "hd_id3145824\n" "1\n" "help.text" msgid "Update All" -msgstr "" +msgstr "Печонидан" #: 06190000.xhp msgctxt "" @@ -26175,13 +26229,14 @@ msgstr "" #: 06220000.xhp +#, fuzzy msgctxt "" "06220000.xhp\n" "hd_id3155959\n" "1\n" "help.text" msgid "All Charts" -msgstr "" +msgstr "Печонидан" #: 06220000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tg/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/tg/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/tg/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:26+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/tg/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tg/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tg/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-13 23:58+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:44+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: tg\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431561510.000000\n" +"X-POOTLE-MTIME: 1439603057.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/tg/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/tg/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/tg/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-01-06 13:02+0000\n" -"Last-Translator: Victor Ibragimov \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 01:54+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: tg\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1389013344.000000\n" +"X-POOTLE-MTIME: 1439603677.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/tg/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/tg/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/tg/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tg/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/th/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/th/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/th/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:07+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -4361,13 +4361,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "vernone\n" "label\n" "string.text" msgid "N_one" -msgstr "" +msgstr "ไ_ม่มี" #: distributionpage.ui msgctxt "" @@ -6852,13 +6853,14 @@ msgstr "เลือกเส้นทางที่เก็บไฟล์" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "types_label\n" "label\n" "string.text" msgid "File _type:" -msgstr "" +msgstr "ชนิดของเ_ส้น" #: hyperlinknewdocpage.ui msgctxt "" @@ -14142,13 +14144,14 @@ msgstr "" #: paratabspage.ui +#, fuzzy msgctxt "" "paratabspage.ui\n" "radiobuttonBTN_FILLCHAR_NO\n" "label\n" "string.text" msgid "N_one" -msgstr "" +msgstr "ไ_ม่มี" #: paratabspage.ui #, fuzzy @@ -17659,56 +17662,3 @@ "string.text" msgid "View Layout" msgstr "" - -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "พื้นหลัง" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "สีพื้นหลัง" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/th/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/th/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/th/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.000000000 +0000 @@ -5,7 +5,7 @@ "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-09-02 14:42+0200\n" "PO-Revision-Date: 2015-08-15 01:17+0000\n" -"Last-Translator: system user <>\n" +"Last-Translator: jteera \n" "Language-Team: LANGUAGE \n" "Language: th\n" "MIME-Version: 1.0\n" diff -Nru libreoffice-5.0.2/translations/source/th/readlicense_oo/docs.po libreoffice-5.0.5~rc2/translations/source/th/readlicense_oo/docs.po --- libreoffice-5.0.2/translations/source/th/readlicense_oo/docs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/readlicense_oo/docs.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-10 08:35+0000\n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-09-18 07:41+0000\n" "Last-Translator: jteera \n" "Language-Team: LANGUAGE \n" "Language: th\n" @@ -12,9 +12,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1420878923.000000\n" +"X-POOTLE-MTIME: 1442562084.000000\n" #: readme.xrm msgctxt "" @@ -647,7 +647,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 http://www.microsoft.com to search the Microsoft Knowledge Base for \"mapi dll\"." -msgstr "เมื่อส่งเอกสารผ่านทาง 'แฟ้ม - ส่ง - เอกสารเป็นอีเมล' หรือ 'การแนบเอกสาร PDF' ปัญหาจะเกิดขึ้น (โปรแกรมจะล้มเหลวหรือหยุดทำงานกระทันหัน) ปัญหานี้เกิดขึ้นจากแฟ้มระบบวินโดสว์ \"Mapi\" (ข้อความแอพพลิเคชันโปรแกรมอินเทอร์เฟซ) ซึ่งเกิดปัญหาเพราะแฟ้มบางเวอร์ชัน โชคไม่ดีที่, ปัญหาไม่สามารถจำกัดให้แคบลงว่าเป็นหมายเลขเวอร์ชันใด สำหรับข้อมูลเพิ่มเติมโปรดเข้าไปที่ http://www.microsoft.com ในการค้นหาข้อมูลความรู้พื้นฐานไมโครซอฟท์สำหรับ \"mapi.dll\" " +msgstr "เมื่อส่งเอกสารผ่านทาง 'แฟ้ม - ส่ง - เอกสารเป็นอีเมล' หรือ 'เป็นเอกสารแนบ PDF' ปัญหาอาจจะเกิดขึ้น (โปรแกรมล้มเหลวหรือหยุดทำงานกระทันหัน) ปัญหานี้เกิดขึ้นจากแฟ้มระบบวินโดวส์ \"Mapi\" (Messaging Application Programming Interface - ส่วนต่อประสานโปรแกรมประยุกต์ด้านรับส่งข้อความ) ซึ่งเกิดปัญหากับแฟ้มบางเวอร์ชัน โชคไม่ดีที่ไม่สามารถจำกัดปัญหาให้แคบลงว่าเป็นหมายเลขเวอร์ชันใด สำหรับข้อมูลเพิ่มเติมโปรดเข้าไปที่ http://www.microsoft.com เพื่อค้นหา \"mapi.dll\" ในฐานความรู้ไมโครซอฟท์" #: readme.xrm msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/th/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/th/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/th/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:00+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1555,6 +1555,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "กำหนดเอง" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -2170,13 +2180,14 @@ msgstr "เลือกช่วงฐานข้อมูล" #: definedatabaserangedialog.ui +#, fuzzy msgctxt "" "definedatabaserangedialog.ui\n" "Name\n" "label\n" "string.text" msgid "Name" -msgstr "" +msgstr "_ชื่อ:" #: definedatabaserangedialog.ui msgctxt "" @@ -3763,13 +3774,14 @@ msgstr "" #: headerfootercontent.ui +#, fuzzy msgctxt "" "headerfootercontent.ui\n" "label1\n" "label\n" "string.text" msgid "Note" -msgstr "" +msgstr "ไ_ม่มี" #: headerfootercontent.ui msgctxt "" @@ -5625,13 +5637,14 @@ msgstr "สิ่งที่เลือก" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "ไ_ม่มี" #: pastespecial.ui msgctxt "" @@ -7377,13 +7390,14 @@ msgstr "หมายเหตุ: การเปลี่ยนแปลงลักษณะประจำของรูปแบบเช่น แบบตัวอักษร สี และรูปแบบตัวเลขจะไม่ถูกบันทึก และความสามารถบางอย่างเช่นการแก้ไขแผนภูมิและวัตถุภาพวาดจะไม่มีในภาวะใช้ร่วมกับผู้อื่น (แชร์โหมด) ถ้าต้องการการแก้ไขหรือความสามารถเหล่านั้นจำเป็นต้องมีการเข้าถึงเฉพาะตัวโดยการปิดแชร์โหมด" #: sharedocumentdlg.ui +#, fuzzy msgctxt "" "sharedocumentdlg.ui\n" "name\n" "label\n" "string.text" msgid "Name" -msgstr "" +msgstr "_ชื่อ:" #: sharedocumentdlg.ui msgctxt "" @@ -8235,22 +8249,24 @@ msgstr "" #: solverdlg.ui +#, fuzzy msgctxt "" "solverdlg.ui\n" "min\n" "label\n" "string.text" msgid "Minim_um" -msgstr "" +msgstr "_ต่ำสุด:" #: solverdlg.ui +#, fuzzy msgctxt "" "solverdlg.ui\n" "max\n" "label\n" "string.text" msgid "_Maximum" -msgstr "" +msgstr "_สูงสุด:" #: solverdlg.ui msgctxt "" @@ -10799,92 +10815,3 @@ "string.text" msgid "Grouped by" msgstr "" - -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "ระยะเ~ยื้องซ้าย:" - -#, fuzzy -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "ซ้อนกันแนว~ตั้ง" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/th/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/th/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/th/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:06+0200\n" -"PO-Revision-Date: 2014-09-28 11:42+0000\n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-09-18 08:05+0000\n" "Last-Translator: jteera \n" "Language-Team: LANGUAGE \n" "Language: th\n" @@ -12,9 +12,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411904568.000000\n" +"X-POOTLE-MTIME: 1442563546.000000\n" #: analysis.src msgctxt "" @@ -4703,7 +4703,7 @@ "1\n" "string.text" msgid "Returns the price per $100 face value of a security with an odd first period" -msgstr "ส่งกลับราคาต่อ 100 หน่วยเงิน ของเงินประกันด้วยงวดแรกคี่" +msgstr "ส่งกลับราคาต่อ $100 ของมูลค่าที่ตราไว้ของหลักทรัพย์ซึ่งมี odd first period คือไม่ได้เริ่มงวดแรกที่ปลายงวด" #: analysis.src msgctxt "" @@ -5045,7 +5045,7 @@ "1\n" "string.text" msgid "Returns the price per $100 face value of a security with an odd last period" -msgstr "ส่งกลับราคาต่อ 100 หน่วยเงิน ของเงินประกันด้วยงวดคี่สุดท้าย" +msgstr "ส่งกลับราคาต่อ $100 ของมูลค่าที่ตราไว้ของหลักทรัพย์ซึ่งมีงวดสุดท้ายไม่ปกติ" #: analysis.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/th/scp2/source/accessories.po libreoffice-5.0.5~rc2/translations/source/th/scp2/source/accessories.po --- libreoffice-5.0.2/translations/source/th/scp2/source/accessories.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/scp2/source/accessories.po 2016-02-04 16:41:28.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: 2015-02-24 01:06+0000\n" +"PO-Revision-Date: 2015-09-30 04:18+0000\n" "Last-Translator: jteera \n" "Language-Team: LANGUAGE \n" "Language: th\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1424739961.000000\n" +"X-POOTLE-MTIME: 1443586692.000000\n" #: module_accessories.ulf msgctxt "" @@ -2883,7 +2883,7 @@ "STR_DESC_MODULE_LANGPACK_RO\n" "LngText.text" msgid "Installs Romanian support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "อัลบาเนียน" +msgstr "ติดตั้งการสนับสนุนภาษาโรมาเนียใน %PRODUCTNAME %PRODUCTVERSION" #: module_templates_accessories.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/th/sd/source/ui/annotations.po libreoffice-5.0.5~rc2/translations/source/th/sd/source/ui/annotations.po --- libreoffice-5.0.2/translations/source/th/sd/source/ui/annotations.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/sd/source/ui/annotations.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:01+0100\n" -"PO-Revision-Date: 2014-02-05 14:40+0000\n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-09-30 04:23+0000\n" "Last-Translator: jteera \n" "Language-Team: LANGUAGE \n" "Language: th\n" @@ -12,9 +12,9 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1391611211.0\n" +"X-POOTLE-MTIME: 1443586986.000000\n" #: annotations.src msgctxt "" @@ -175,13 +175,12 @@ msgstr "%PRODUCTNAME Impress มาถึงท้ายการนำเสนอ คุณต้องการทำต่อที่จุดเริ่มต้นหรือไม่?" #: annotations.src -#, fuzzy msgctxt "" "annotations.src\n" "STR_ANNOTATION_WRAP_BACKWARD\n" "string.text" msgid "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?" -msgstr "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?%PRODUCTNAME Impress ได้ค้นหาไปที่จุดเริ่มต้นของงานนำเสนอ คุณต้องการค้นหาไปจนถึงจุดสิ้นสุดหรือไม่?" +msgstr "%PRODUCTNAME Impress มาถึงจุดเริ่มต้นของงานนำเสนอ คุณต้องการทำต่อที่จุดสุดท้ายหรือไม่?" #: annotations.src #, fuzzy diff -Nru libreoffice-5.0.2/translations/source/th/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/th/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/th/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-04-25 15:02+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:14+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: th\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1429974139.000000\n" +"X-POOTLE-MTIME: 1439604864.000000\n" #: alienwarndialog.ui msgctxt "" @@ -753,7 +753,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2004,11 +2004,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "ตั้งค่าใหม่" diff -Nru libreoffice-5.0.2/translations/source/th/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/th/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/th/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/th/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-02-24 01:06+0000\n" -"Last-Translator: jteera \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:25+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: th\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1424739961.000000\n" +"X-POOTLE-MTIME: 1439605506.000000\n" #: stbctrls.src msgctxt "" @@ -161,14 +161,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/tn/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tn/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tn/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:09+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "~Busetsa" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Bophara" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Boleele" #: borderpage.ui msgctxt "" @@ -4330,13 +4333,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Boleele" #: distributionpage.ui #, fuzzy @@ -6505,13 +6509,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkdocpage.ui msgctxt "" @@ -6640,13 +6645,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkinternetpage.ui msgctxt "" @@ -6739,13 +6745,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinkmailpage.ui msgctxt "" @@ -6892,13 +6899,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Leina" #: hyperlinknewdocpage.ui msgctxt "" @@ -7717,13 +7725,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Mokgwa" #: linetabpage.ui msgctxt "" @@ -7781,13 +7790,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7799,13 +7809,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -7871,13 +7882,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Bophara" #: linetabpage.ui msgctxt "" @@ -10593,13 +10605,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Bogolo:" #: optfontspage.ui #, fuzzy @@ -13229,13 +13242,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Boleele" #: pageformatpage.ui msgctxt "" @@ -13628,13 +13642,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Boleele" #: paragalignpage.ui msgctxt "" @@ -14658,22 +14673,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Maemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Maemo" #: possizetabpage.ui msgctxt "" @@ -14695,13 +14712,14 @@ msgstr "Maemo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Bophara" #: possizetabpage.ui #, fuzzy @@ -15148,22 +15166,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Maemo" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Maemo" #: rotationtabpage.ui msgctxt "" @@ -17623,57 +17643,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/tn/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/tn/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/tn/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/tn/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/tn/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/tn/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:52+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/tn/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/tn/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/tn/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/tn/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tn/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tn/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 01:29+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:04+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: tn\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431566995.000000\n" +"X-POOTLE-MTIME: 1439604288.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/tn/starmath/source.po libreoffice-5.0.5~rc2/translations/source/tn/starmath/source.po --- libreoffice-5.0.2/translations/source/tn/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/tn/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/tn/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/tn/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 12:58+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:13+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: tn\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377608299.000000\n" +"X-POOTLE-MTIME: 1439604815.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/tn/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/tn/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/tn/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tn/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/tr/cui/source/dialogs.po libreoffice-5.0.5~rc2/translations/source/tr/cui/source/dialogs.po --- libreoffice-5.0.2/translations/source/tr/cui/source/dialogs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/cui/source/dialogs.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-13 23:14+0000\n" +"PO-Revision-Date: 2015-11-05 08:11+0000\n" "Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436829285.000000\n" +"X-POOTLE-MTIME: 1446711084.000000\n" #: cuires.src msgctxt "" @@ -647,7 +647,7 @@ "RID_SVXSTR_ERROR_RUNNING\n" "string.text" msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME." -msgstr "%SCRIPTNAME %LANGUAGENAME betiği çalıştırılırken bir hata oluştu." +msgstr "%SCRIPTNAME %LANGUAGENAME betiği çalıştırılırken bir hata oluştu." #: scriptdlg.src msgctxt "" @@ -663,7 +663,7 @@ "RID_SVXSTR_ERROR_AT_LINE\n" "string.text" msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER." -msgstr "%SCRIPTNAME %LANGUAGENAME betiği çalıştırılırken %LINENUMBER nolu satırda bir hata oluştu." +msgstr "%SCRIPTNAME %LANGUAGENAME betiği çalıştırılırken %LINENUMBER nolu satırda bir hata oluştu." #: scriptdlg.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/cui/source/tabpages.po libreoffice-5.0.5~rc2/translations/source/tr/cui/source/tabpages.po --- libreoffice-5.0.2/translations/source/tr/cui/source/tabpages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/cui/source/tabpages.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-13 23:17+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-11-05 07:41+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436829434.000000\n" +"X-POOTLE-MTIME: 1446709261.000000\n" #: border.src msgctxt "" @@ -422,7 +422,7 @@ "#6¾ Envelope\n" "itemlist.text" msgid "#6¾ Envelope" -msgstr "C6 Zarf" +msgstr "#6¾ Zarf" #: page.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tr/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tr/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-13 23:19+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-11-05 08:11+0000\n" "Last-Translator: Necdet Yucel \n" "Language-Team: none\n" "Language: tr\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436829579.000000\n" +"X-POOTLE-MTIME: 1446711092.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME; kelime işlemci, hesap tablosu, sunum ve çok daha fazlası için modern, kullanımı kolay ve açık kaynaklı bir üretkenlik takımıdır." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Telif Hakkı © 2000 - 2015 LibreOffice katkıcıları." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/tr/dbaccess/source/ui/querydesign.po libreoffice-5.0.5~rc2/translations/source/tr/dbaccess/source/ui/querydesign.po --- libreoffice-5.0.2/translations/source/tr/dbaccess/source/ui/querydesign.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/dbaccess/source/ui/querydesign.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2015-01-11 22:11+0000\n" -"Last-Translator: Necdet \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-05 08:12+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1421014280.000000\n" +"X-POOTLE-MTIME: 1446711157.000000\n" #: query.src msgctxt "" @@ -508,4 +508,4 @@ "STR_QUERY_NATURAL_JOIN\n" "string.text" msgid "Contains only one column for each pair of equally-named columns from '%1' and from '%2'." -msgstr "'%2' den ve '%1' den sütunların eşit olarak adlandırılmış her çift için sadece bir sütun içerir." +msgstr "'%1' den ve '%2' den sütunların eşit olarak adlandırılmış her çift için sadece bir sütun içerir." diff -Nru libreoffice-5.0.2/translations/source/tr/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/tr/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/tr/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-11-27 22:29+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3359,7 +3359,7 @@ "SC_OPCODE_ERROR_DIVZERO\n" "string.text" msgid "#DIV/0!" -msgstr "#SAYI/0!" +msgstr "#BÖLÜ/0!" #: core_resource.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/scalc/guide.po libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/scalc/guide.po --- libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/scalc/guide.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/scalc/guide.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-24 19:30+0000\n" -"Last-Translator: Necdet \n" +"PO-Revision-Date: 2015-12-01 21:45+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432495826.000000\n" +"X-POOTLE-MTIME: 1449006330.000000\n" #: address_auto.xhp msgctxt "" @@ -6017,7 +6017,7 @@ "53\n" "help.text" msgid "If you do not want values and texts to be automatically adjusted, then hold down the CommandCtrl key when dragging. Formulas, however, are always adjusted accordingly." -msgstr "Eğer metinler ve değerlerin otomatik ayarlanmasını istemiyorsanız, öyleyse CommandCtrl tuşuna basılı tutarken, fareyi sürükleyin. Yinede formüller daima göreceli ayarlanır." +msgstr "Eğer metinler ve değerlerin otomatik ayarlanmasını istemiyorsanız, öyleyse CommandCtrl tuşuna basılı tutarken, fareyi sürükleyin. Yine de formüller daima göreceli ayarlanır." #: formula_enter.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-09-01 17:30+0000\n" -"Last-Translator: Christian Lohmaier \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-12-01 21:49+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441128603.000000\n" +"X-POOTLE-MTIME: 1449006563.000000\n" #: 01010000.xhp msgctxt "" @@ -11014,12 +11014,13 @@ msgstr "Grafik Görünümü" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Sıcak noktalara tıklayıp düzenleyebilin diye, görüntü haritasını gösterir." #: 02220000.xhp @@ -40318,7 +40319,7 @@ "4\n" "help.text" msgid "Displays the current selection." -msgstr "Şuanki seçimi gösterir." +msgstr "Geçerli seçimi görüntüler." #: 06200000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/tr/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" -"PO-Revision-Date: 2015-05-24 11:17+0000\n" -"Last-Translator: Necdet \n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-09-01 17:30+0000\n" +"Last-Translator: Christian Lohmaier \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432466244.000000\n" +"X-POOTLE-MTIME: 1441128646.000000\n" #: 01120000.xhp msgctxt "" @@ -4169,12 +4169,13 @@ msgstr "bölümler; DDE tarafından bölüm eklemeDDE; bölüm eklemek için komut" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" +msgid "Section" msgstr "Bölüm" #: 04020100.xhp @@ -16142,15 +16143,6 @@ #: 05040700.xhp msgctxt "" -"05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Bu sekme Yazdırma Düzeni görünümünde etkin değildir." - -#: 05040700.xhp -msgctxt "" "05040700.xhp\n" "hd_id3153538\n" "4\n" diff -Nru libreoffice-5.0.2/translations/source/tr/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/tr/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/tr/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-05-24 21:22+0000\n" -"Last-Translator: Necdet \n" +"PO-Revision-Date: 2015-11-05 08:14+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432502552.000000\n" +"X-POOTLE-MTIME: 1446711279.000000\n" #: ActionTe.ulf msgctxt "" @@ -3134,7 +3134,7 @@ "OOO_ERROR_44\n" "LngText.text" msgid "A network error occurred while attempting to open the source file cabinet [2]." -msgstr "Kaynak dosya kabini açma sırasında ağ hatası oluştu." +msgstr "Kaynak dosya kabini [2] açma sırasında ağ hatası oluştu." #: Error.ulf msgctxt "" @@ -3342,7 +3342,7 @@ "OOO_ERROR_70\n" "LngText.text" msgid "The file [2][3] is being held in use {by the following process: Name: [4], ID: [5], Window Title: [6]}. Close that application and retry." -msgstr "[2][3] dosyası kullanılıyor {kullanan işlem: Ad: [4], ID: [5], Pencere Başlığı: [6]}. Bu uygulamayı kapatın ve yeniden deneyin." +msgstr "[2][3] dosyası kullanılıyor {kullanan işlem: Ad: [4], ID: [5], Pencere Başlığı: [6]}. Bu uygulamayı kapatın ve yeniden deneyin." #: Error.ulf msgctxt "" @@ -3406,7 +3406,7 @@ "OOO_ERROR_78\n" "LngText.text" msgid "You must restart your system for the configuration changes made to [2] to take effect. Click Yes to restart now or No if you plan to restart later." -msgstr "Yapılandırma değişikliklerinin etkinleşmesi için sisteminizi tekrar başlatmanız gerekiyor. Şimdi yeniden başlatmak Evet'e tıklayın veya daha sonra yapmayı planlıyorsanız Hayır'ı tıklayın." +msgstr "Yapılandırma değişikliklerinin [2] etkinleşmesi için sisteminizi tekrar başlatmanız gerekiyor. Şimdi yeniden başlatmak Evet'e tıklayın veya daha sonra yapmayı planlıyorsanız Hayır'ı tıklayın." #: Error.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-09-05 13:27+0000\n" -"Last-Translator: Zeki Bildirici \n" +"PO-Revision-Date: 2015-11-05 08:22+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441459668.000000\n" +"X-POOTLE-MTIME: 1446711771.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -20176,7 +20176,7 @@ "Label\n" "value.text" msgid "Zoom 100%" -msgstr "Büyüt %100" +msgstr "Büyüt %100" #: MathCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/readlicense_oo/docs.po libreoffice-5.0.5~rc2/translations/source/tr/readlicense_oo/docs.po --- libreoffice-5.0.2/translations/source/tr/readlicense_oo/docs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/readlicense_oo/docs.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-09-14 10:49+0000\n" -"Last-Translator: Zeki Bildirici \n" +"PO-Revision-Date: 2015-11-05 08:21+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1442227743.000000\n" +"X-POOTLE-MTIME: 1446711676.000000\n" #: readme.xrm msgctxt "" @@ -214,7 +214,7 @@ "wd2dff\n" "readmeitem.text" msgid "Gnome 2.16 or higher, with the gail 1.9 and the at-spi 1.7 packages (required for support for assistive technology [AT] tools), or another compatible GUI (such as KDE, among others)." -msgstr "Gail 1.9 ve at-spi 1.7 (yardımcıı teknoloji (AT) araçları desteği için gerekli) ile Gnome 2.16 veya daha üstü ya da diğer uyumlu grafiksel kullanıcı arayüzü (KDE gibi)." +msgstr "Gail 1.9 ve at-spi 1.7 (yardımcı teknoloji [AT] araçları desteği için gerekli) ile Gnome 2.16 veya daha üstü ya da diğer uyumlu grafiksel kullanıcı arayüzü (KDE gibi)." #: readme.xrm msgctxt "" @@ -614,7 +614,7 @@ "pji76w\n" "readmeitem.text" msgid "File locking is enabled by default in ${PRODUCTNAME}. On a network that uses the Network File System protocol (NFS), the locking daemon for NFS clients must be active. To disable file locking, edit the soffice script and change the line \"export SAL_ENABLE_FILE_LOCKING\" to \"# export SAL_ENABLE_FILE_LOCKING\". If you disable file locking, the write access of a document is not restricted to the user who first opens the document." -msgstr "Dosya kilitlemek {PRODUCTNAME} ile varsayılan olarak gelmektedir. Network File System protocol (NFS) kullanan bir ağda NFS için kilitleme artalan işlemcisi(daeomon) aktif edilmelidir. Dosya kilitlemeyi kapatmak için, soffice betiğini düzenlemeniz ve \"export SAL_ENABLE_FILE_LOCKING\" satırını \"# export SAL_ENABLE_FILE_LOCKING\" olarak değiştirmeniz gerekmektedir. Eğer dosya kilitlemeyi kapatırsanız, bir belgenin yazma hakkını o belgeyi ilk açan kişi ile sınırlamayı kaldırmış olursunuz." +msgstr "Dosya kilitlemek {PRODUCTNAME} ile varsayılan olarak gelmektedir. Ağ Dosya Sistemi protokolü (NFS) kullanan bir ağda NFS için kilitleme artalan süreci etkinleştirilmelidir. Dosya kilitlemeyi kapatmak için, soffice betiğini düzenlemeniz ve \"export SAL_ENABLE_FILE_LOCKING\" satırını \"# export SAL_ENABLE_FILE_LOCKING\" olarak değiştirmeniz gerekmektedir. Eğer dosya kilitlemeyi kapatırsanız, bir belgenin yazma hakkını o belgeyi ilk açan kişi ile sınırlamayı kaldırmış olursunuz." #: readme.xrm msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/tr/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/tr/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-09-14 10:47+0000\n" -"Last-Translator: Zeki Bildirici \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-11-05 08:11+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: none\n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1442227665.000000\n" +"X-POOTLE-MTIME: 1446711066.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "En düşük değer en yüksek değerden az olmalıdır." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Özel" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/tr/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/tr/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/tr/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-13 22:58+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:27+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: tr\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436828286.000000\n" +"X-POOTLE-MTIME: 1439605642.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "_Lisansı göster" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/tr/svx/source/dialog.po libreoffice-5.0.5~rc2/translations/source/tr/svx/source/dialog.po --- libreoffice-5.0.2/translations/source/tr/svx/source/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/svx/source/dialog.po 2016-02-04 16:41:28.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: 2015-05-11 16:12+0200\n" -"PO-Revision-Date: 2015-09-06 14:22+0000\n" -"Last-Translator: Zeki Bildirici \n" +"PO-Revision-Date: 2015-11-05 08:24+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441549327.000000\n" +"X-POOTLE-MTIME: 1446711884.000000\n" #: bmpmask.src msgctxt "" @@ -78,7 +78,7 @@ "STR_IMAGE_CAPACITY\n" "string.text" msgid "$(CAPACITY) kiB" -msgstr "$(KAPASİTE) klB" +msgstr "$(CAPACITY) kiB" #: compressgraphicdialog.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/tr/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/tr/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/tr/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-25 03:33+0000\n" -"Last-Translator: Necdet \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-11-05 08:25+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.5.1\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432524798.000000\n" +"X-POOTLE-MTIME: 1446711958.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Yakınlaştırma düzeyini ayarla" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/tr/uui/source.po libreoffice-5.0.5~rc2/translations/source/tr/uui/source.po --- libreoffice-5.0.2/translations/source/tr/uui/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/tr/uui/source.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-13 23:33+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-12-01 21:49+0000\n" +"Last-Translator: Necdet Yucel \n" "Language-Team: LANGUAGE \n" "Language: tr\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436830409.000000\n" +"X-POOTLE-MTIME: 1449006575.000000\n" #: alreadyopen.src msgctxt "" @@ -107,7 +107,7 @@ "Do you want to save anyway?\n" "\n" msgstr "" -"%PRODUCTNAME düzenleme için açıldığından dosyada değişiklikler oluştu. Belgeyi şuanki haliyle kaydederseniz yapılan diğer değişikliklerin üzerine yazılacaktır.\n" +"%PRODUCTNAME düzenleme için açıldığından dosyada değişiklikler oluştu. Belgeyi geçerli haliyle kaydederseniz yapılan diğer değişikliklerin üzerine yazılacaktır.\n" "\n" "Yine de kaydetmek istiyor musunuz?\n" "\n" diff -Nru libreoffice-5.0.2/translations/source/ts/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ts/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ts/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:16+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Siva" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Vu~anami" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vu~anami" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Vulehi:" #: borderpage.ui msgctxt "" @@ -4332,13 +4335,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Vulehi:" #: distributionpage.ui #, fuzzy @@ -6506,13 +6510,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Vito" #: hyperlinkdocpage.ui msgctxt "" @@ -6641,13 +6646,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Vito" #: hyperlinkinternetpage.ui msgctxt "" @@ -6740,13 +6746,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Vito" #: hyperlinkmailpage.ui msgctxt "" @@ -6893,13 +6900,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Vito" #: hyperlinknewdocpage.ui msgctxt "" @@ -7715,13 +7723,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Switayili" #: linetabpage.ui msgctxt "" @@ -7779,13 +7788,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vu~anami" #: linetabpage.ui msgctxt "" @@ -7797,13 +7807,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Vu~anami" #: linetabpage.ui msgctxt "" @@ -7869,13 +7880,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Vu~anami" #: linetabpage.ui msgctxt "" @@ -10589,13 +10601,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Sayizi" #: optfontspage.ui #, fuzzy @@ -13224,13 +13237,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Vulehi:" #: pageformatpage.ui msgctxt "" @@ -13623,13 +13637,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Vulehi:" #: paragalignpage.ui msgctxt "" @@ -14656,22 +14671,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "XiyimoX" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "XiyimoX" #: possizetabpage.ui msgctxt "" @@ -14693,13 +14710,14 @@ msgstr "XiyimoX" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vu~anami" #: possizetabpage.ui #, fuzzy @@ -15146,22 +15164,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "XiyimoX" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "XiyimoX" #: rotationtabpage.ui msgctxt "" @@ -17621,57 +17641,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/ts/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ts/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ts/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:00+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ts/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/ts/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/ts/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ts/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ts/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ts/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 03:13+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:12+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ts\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431573200.000000\n" +"X-POOTLE-MTIME: 1439604745.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ts/starmath/source.po libreoffice-5.0.5~rc2/translations/source/ts/starmath/source.po --- libreoffice-5.0.2/translations/source/ts/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ts/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ts/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ts/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ts/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 12:56+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:21+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ts\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377608160.000000\n" +"X-POOTLE-MTIME: 1439605269.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/ug/connectivity/source/resource.po libreoffice-5.0.5~rc2/translations/source/ug/connectivity/source/resource.po --- libreoffice-5.0.2/translations/source/ug/connectivity/source/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/connectivity/source/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,7 +4,7 @@ "Project-Id-Version: resource\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" "POT-Creation-Date: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-14 04:19+0000\n" +"PO-Revision-Date: 2015-12-24 14:58+0000\n" "Last-Translator: system user <>\n" "Language-Team: Uyghur Computer Science Association \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431577178.000000\n" +"X-POOTLE-MTIME: 1450969129.000000\n" #: conn_error_message.src msgctxt "" @@ -90,7 +90,6 @@ #. This must be the term referring to address books in the user's Mozilla/Seamonkey profile in the system. #: conn_shared_res.src -#, fuzzy msgctxt "" "conn_shared_res.src\n" "STR_MOZILLA_ADDRESSBOOKS\n" @@ -100,7 +99,6 @@ #. This must be the term referring to address books in the user's Thunderbird profile in the system. #: conn_shared_res.src -#, fuzzy msgctxt "" "conn_shared_res.src\n" "STR_THUNDERBIRD_ADDRESSBOOKS\n" @@ -109,7 +107,6 @@ msgstr "Thunderbird ئادرېس دەپتەر مۇندەرىجىسى" #: conn_shared_res.src -#, fuzzy msgctxt "" "conn_shared_res.src\n" "STR_OE_ADDRESSBOOK\n" @@ -118,7 +115,6 @@ msgstr "Outlook Express ئادرېس دەپتىرى" #: conn_shared_res.src -#, fuzzy msgctxt "" "conn_shared_res.src\n" "STR_OUTLOOK_MAPI_ADDRESSBOOK\n" @@ -180,7 +176,7 @@ "STR_MOZILLA_IS_RUNNIG_NO_CHANGES\n" "string.text" msgid "You can't make any changes to Mozilla Address Book when Mozilla is running." -msgstr "" +msgstr "mozilla ئىجرا قىلىنىۋاتقاندا mozilla ئادرېس دەپتىرىگە ھېچقانداق ئۆزگەرتىش ئېلىپ بارالمايسىز." #: conn_shared_res.src msgctxt "" @@ -738,7 +734,7 @@ "STR_COULD_NOT_RENAME_FILE\n" "string.text" msgid "The file could not be renamed to $filename$." -msgstr "" +msgstr "بۇ ھۆججەتنىڭ ئاتىنى $filename$ غا ئۆزگەرتەلمىدى." #: conn_shared_res.src msgctxt "" @@ -1076,7 +1072,7 @@ "STR_NO_STORAGE\n" "string.text" msgid "The connection can not be established. No storage or URL was given." -msgstr "" +msgstr "باغلىنالمىدى. ساقلىغۇچ ياكى URL بېرىلمىگەن." #: conn_shared_res.src msgctxt "" @@ -1124,4 +1120,4 @@ "STR_ERROR_NEW_VERSION\n" "string.text" msgid "The connection could not be established. The database was created by a newer version of %PRODUCTNAME." -msgstr "" +msgstr "باغلىنالمىدى. بۇ ساندان %PRODUCTNAME نىڭ يېڭى نەشرىدە قۇرۇلغان." diff -Nru libreoffice-5.0.2/translations/source/ug/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 01:28+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "نەشر ھوقۇقىغا ئىگە © 2000 - 2014 LibreOffice تۆھپىكارلار." #: aboutdialog.ui @@ -5303,13 +5303,14 @@ msgstr "" #: fmsearchdialog.ui +#, fuzzy msgctxt "" "fmsearchdialog.ui\n" "ftForm\n" "label\n" "string.text" msgid "Form:" -msgstr "" +msgstr "غا(_O)" #: fmsearchdialog.ui msgctxt "" @@ -10832,40 +10833,44 @@ msgstr "" #: opthtmlpage.ui +#, fuzzy msgctxt "" "opthtmlpage.ui\n" "size7FT\n" "label\n" "string.text" msgid "Size _7:" -msgstr "" +msgstr "سىزىق _3" #: opthtmlpage.ui +#, fuzzy msgctxt "" "opthtmlpage.ui\n" "size6FT\n" "label\n" "string.text" msgid "Size _6:" -msgstr "" +msgstr "سىزىق _3" #: opthtmlpage.ui +#, fuzzy msgctxt "" "opthtmlpage.ui\n" "size5FT\n" "label\n" "string.text" msgid "Size _5:" -msgstr "" +msgstr "سىزىق _3" #: opthtmlpage.ui +#, fuzzy msgctxt "" "opthtmlpage.ui\n" "size4FT\n" "label\n" "string.text" msgid "Size _4:" -msgstr "" +msgstr "سىزىق _3" #: opthtmlpage.ui #, fuzzy diff -Nru libreoffice-5.0.2/translations/source/ug/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/ug/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/ug/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/formula/source/core/resource.po 2016-02-04 16:41:28.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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-05-14 04:33+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-02 16:02+0000\n" +"Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431577997.000000\n" +"X-POOTLE-MTIME: 1451750527.000000\n" #: core_resource.src msgctxt "" @@ -59,7 +59,7 @@ "SC_OPCODE_TABLE_REF_ITEM_ALL\n" "string.text" msgid "#All" -msgstr "" +msgstr "#All" #: core_resource.src msgctxt "" @@ -68,7 +68,7 @@ "SC_OPCODE_TABLE_REF_ITEM_HEADERS\n" "string.text" msgid "#Headers" -msgstr "" +msgstr "#Headers" #: core_resource.src msgctxt "" @@ -77,7 +77,7 @@ "SC_OPCODE_TABLE_REF_ITEM_DATA\n" "string.text" msgid "#Data" -msgstr "" +msgstr "#Data" #: core_resource.src msgctxt "" @@ -86,7 +86,7 @@ "SC_OPCODE_TABLE_REF_ITEM_TOTALS\n" "string.text" msgid "#Totals" -msgstr "" +msgstr "#Totals" #: core_resource.src msgctxt "" @@ -95,7 +95,7 @@ "SC_OPCODE_TABLE_REF_ITEM_THIS_ROW\n" "string.text" msgid "#This Row" -msgstr "" +msgstr "#This Row" #: core_resource.src msgctxt "" @@ -863,14 +863,13 @@ msgstr "NORMSDIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_STD_NORM_DIST_MS\n" "string.text" msgid "NORM.S.DIST" -msgstr "NORMSDIST" +msgstr "NORM.S.DIST" #: core_resource.src msgctxt "" @@ -900,14 +899,13 @@ msgstr "NORMSINV" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_S_NORM_INV_MS\n" "string.text" msgid "NORM.S.INV" -msgstr "NORMSINV" +msgstr "NORM.S.INV" #: core_resource.src msgctxt "" @@ -925,7 +923,7 @@ "SC_OPCODE_GAMMA_LN_MS\n" "string.text" msgid "GAMMALN.PRECISE" -msgstr "" +msgstr "GAMMALN.PRECISE" #: core_resource.src msgctxt "" @@ -937,14 +935,13 @@ msgstr "ERRORTYPE" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_ERROR_TYPE_ODF\n" "string.text" msgid "ERROR.TYPE" -msgstr "ERRORTYPE" +msgstr "ERROR.TYPE" #: core_resource.src msgctxt "" @@ -980,7 +977,7 @@ "SC_OPCODE_CEIL_MATH\n" "string.text" msgid "CEILING.MATH" -msgstr "" +msgstr "CEILING.MATH" #: core_resource.src msgctxt "" @@ -998,7 +995,7 @@ "SC_OPCODE_CEIL_MS\n" "string.text" msgid "CEILING.XCL" -msgstr "" +msgstr "CEILING.XCL" #: core_resource.src msgctxt "" @@ -1007,7 +1004,7 @@ "SC_OPCODE_CEIL_PRECISE\n" "string.text" msgid "CEILING.PRECISE" -msgstr "" +msgstr "CEILING.PRECISE" #: core_resource.src msgctxt "" @@ -1016,7 +1013,7 @@ "SC_OPCODE_CEIL_ISO\n" "string.text" msgid "ISO.CEILING" -msgstr "" +msgstr "ISO.CEILING" #: core_resource.src msgctxt "" @@ -1034,7 +1031,7 @@ "SC_OPCODE_FLOOR_MS\n" "string.text" msgid "FLOOR.XCL" -msgstr "" +msgstr "FLOOR.XCL" #: core_resource.src msgctxt "" @@ -1043,7 +1040,7 @@ "SC_OPCODE_FLOOR_MATH\n" "string.text" msgid "FLOOR.MATH" -msgstr "" +msgstr "FLOOR.MATH" #: core_resource.src msgctxt "" @@ -1052,7 +1049,7 @@ "SC_OPCODE_FLOOR_PRECISE\n" "string.text" msgid "FLOOR.PRECISE" -msgstr "" +msgstr "FLOOR.PRECISE" #: core_resource.src msgctxt "" @@ -1478,14 +1475,13 @@ msgstr "NORMDIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_NORM_DIST_MS\n" "string.text" msgid "NORM.DIST" -msgstr "NORMDIST" +msgstr "NORM.DIST" #: core_resource.src msgctxt "" @@ -2307,14 +2303,13 @@ msgstr "LOGNORMDIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_LOG_NORM_DIST_MS\n" "string.text" msgid "LOGNORM.DIST" -msgstr "LOGNORMDIST" +msgstr "LOGNORM.DIST" #: core_resource.src msgctxt "" @@ -2326,34 +2321,31 @@ msgstr "TDIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_DIST_2T\n" "string.text" msgid "T.DIST.2T" -msgstr "F.DIST.RT" +msgstr "T.DIST.2T" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_DIST_MS\n" "string.text" msgid "T.DIST" -msgstr "TDIST" +msgstr "T.DIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_DIST_RT\n" "string.text" msgid "T.DIST.RT" -msgstr "F.DIST.RT" +msgstr "T.DIST.RT" #: core_resource.src msgctxt "" @@ -2428,14 +2420,13 @@ msgstr "NEGBINOMDIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_NEG_BINOM_DIST_MS\n" "string.text" msgid "NEGBINOM.DIST" -msgstr "NEGBINOMDIST" +msgstr "NEGBINOM.DIST" #: core_resource.src msgctxt "" @@ -2552,7 +2543,7 @@ "SC_OPCODE_MODAL_VALUE_MS\n" "string.text" msgid "MODE.SNGL" -msgstr "" +msgstr "MODE.SNGL" #: core_resource.src msgctxt "" @@ -2561,7 +2552,7 @@ "SC_OPCODE_MODAL_VALUE_MULTI\n" "string.text" msgid "MODE.MULT" -msgstr "" +msgstr "MODE.MULT" #: core_resource.src msgctxt "" @@ -2573,14 +2564,13 @@ msgstr "ZTEST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_Z_TEST_MS\n" "string.text" msgid "Z.TEST" -msgstr "ZTEST" +msgstr "Z.TEST" #: core_resource.src msgctxt "" @@ -2589,7 +2579,7 @@ "SC_OPCODE_AGGREGATE\n" "string.text" msgid "AGGREGATE" -msgstr "" +msgstr "AGGREGATE" #: core_resource.src msgctxt "" @@ -2601,14 +2591,13 @@ msgstr "TTEST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_TEST_MS\n" "string.text" msgid "T.TEST" -msgstr "TTEST" +msgstr "T.TEST" #: core_resource.src msgctxt "" @@ -2644,7 +2633,7 @@ "SC_OPCODE_PERCENTILE_INC\n" "string.text" msgid "PERCENTILE.INC" -msgstr "" +msgstr "PERCENTILE.INC" #: core_resource.src msgctxt "" @@ -2653,7 +2642,7 @@ "SC_OPCODE_PERCENT_RANK_INC\n" "string.text" msgid "PERCENTRANK.INC" -msgstr "" +msgstr "PERCENTRANK.INC" #: core_resource.src msgctxt "" @@ -2662,7 +2651,7 @@ "SC_OPCODE_QUARTILE_INC\n" "string.text" msgid "QUARTILE.INC" -msgstr "" +msgstr "QUARTILE.INC" #: core_resource.src msgctxt "" @@ -2671,7 +2660,7 @@ "SC_OPCODE_RANK_EQ\n" "string.text" msgid "RANK.EQ" -msgstr "" +msgstr "RANK.EQ" #: core_resource.src msgctxt "" @@ -2680,7 +2669,7 @@ "SC_OPCODE_PERCENTILE_EXC\n" "string.text" msgid "PERCENTILE.EXC" -msgstr "" +msgstr "PERCENTILE.EXC" #: core_resource.src msgctxt "" @@ -2689,7 +2678,7 @@ "SC_OPCODE_PERCENT_RANK_EXC\n" "string.text" msgid "PERCENTRANK.EXC" -msgstr "" +msgstr "PERCENTRANK.EXC" #: core_resource.src msgctxt "" @@ -2698,7 +2687,7 @@ "SC_OPCODE_QUARTILE_EXC\n" "string.text" msgid "QUARTILE.EXC" -msgstr "" +msgstr "QUARTILE.EXC" #: core_resource.src msgctxt "" @@ -2707,7 +2696,7 @@ "SC_OPCODE_RANK_AVG\n" "string.text" msgid "RANK.AVG" -msgstr "" +msgstr "RANK.AVG" #: core_resource.src msgctxt "" @@ -2755,14 +2744,13 @@ msgstr "NORMINV" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_NORM_INV_MS\n" "string.text" msgid "NORM.INV" -msgstr "NORMINV" +msgstr "NORM.INV" #: core_resource.src msgctxt "" @@ -2981,14 +2969,13 @@ msgstr "GAMMADIST" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_GAMMA_DIST_MS\n" "string.text" msgid "GAMMA.DIST" -msgstr "GAMMADIST" +msgstr "GAMMA.DIST" #: core_resource.src msgctxt "" @@ -3000,14 +2987,13 @@ msgstr "GAMMAINV" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_GAMMA_INV_MS\n" "string.text" msgid "GAMMA.INV" -msgstr "GAMMAINV" +msgstr "GAMMA.INV" #: core_resource.src msgctxt "" @@ -3019,24 +3005,22 @@ msgstr "TINV" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_INV_2T\n" "string.text" msgid "T.INV.2T" -msgstr "F.INV.RT" +msgstr "T.INV.2T" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_T_INV_MS\n" "string.text" msgid "T.INV" -msgstr "TINV" +msgstr "T.INV" #: core_resource.src msgctxt "" @@ -3093,14 +3077,13 @@ msgstr "LOGINV" #: core_resource.src -#, fuzzy msgctxt "" "core_resource.src\n" "RID_STRLIST_FUNCTION_NAMES\n" "SC_OPCODE_LOG_INV_MS\n" "string.text" msgid "LOGNORM.INV" -msgstr "LOGNORMDIST" +msgstr "LOGNORM.INV" #: core_resource.src msgctxt "" @@ -3181,7 +3164,7 @@ "SC_OPCODE_NETWORKDAYS\n" "string.text" msgid "NETWORKDAYS" -msgstr "" +msgstr "NETWORKDAYS" #: core_resource.src msgctxt "" @@ -3190,7 +3173,7 @@ "SC_OPCODE_NETWORKDAYS_MS\n" "string.text" msgid "NETWORKDAYS.INTL" -msgstr "" +msgstr "NETWORKDAYS.INTL" #: core_resource.src msgctxt "" @@ -3199,7 +3182,7 @@ "SC_OPCODE_WORKDAY_MS\n" "string.text" msgid "WORKDAY.INTL" -msgstr "" +msgstr "WORKDAY.INTL" #: core_resource.src msgctxt "" @@ -3487,7 +3470,7 @@ "SC_OPCODE_COLOR\n" "string.text" msgid "COLOR" -msgstr "" +msgstr "COLOR" #: core_resource.src msgctxt "" @@ -3505,7 +3488,7 @@ "SC_OPCODE_ERF_MS\n" "string.text" msgid "ERF.PRECISE" -msgstr "" +msgstr "ERF.PRECISE" #: core_resource.src msgctxt "" @@ -3514,7 +3497,7 @@ "SC_OPCODE_ERFC_MS\n" "string.text" msgid "ERFC.PRECISE" -msgstr "" +msgstr "ERFC.PRECISE" #: core_resource.src msgctxt "" @@ -3523,4 +3506,4 @@ "SC_OPCODE_ENCODEURL\n" "string.text" msgid "ENCODEURL" -msgstr "" +msgstr "ENCODEURL" diff -Nru libreoffice-5.0.2/translations/source/ug/formula/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/formula/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/formula/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/formula/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,16 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:22+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-02 16:06+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1451750810.000000\n" #: formuladialog.ui msgctxt "" @@ -21,7 +23,7 @@ "label\n" "string.text" msgid "Array" -msgstr "" +msgstr "سانلار قاتارى" #: formuladialog.ui msgctxt "" @@ -30,7 +32,7 @@ "label\n" "string.text" msgid "<< _Back" -msgstr "" +msgstr "<< قايت(_B)" #: formuladialog.ui msgctxt "" @@ -39,7 +41,7 @@ "label\n" "string.text" msgid "_Next >>" -msgstr "" +msgstr "كېيىنكى(_N)>>" #: formuladialog.ui msgctxt "" @@ -48,7 +50,7 @@ "label\n" "string.text" msgid "Functions" -msgstr "" +msgstr "فونكىسىيە" #: formuladialog.ui msgctxt "" @@ -57,7 +59,7 @@ "label\n" "string.text" msgid "Structure" -msgstr "" +msgstr "قۇرۇلما" #: formuladialog.ui msgctxt "" @@ -66,7 +68,7 @@ "label\n" "string.text" msgid "Function result" -msgstr "" +msgstr "فونكىسىيە نەتىجىسى" #: formuladialog.ui msgctxt "" @@ -75,7 +77,7 @@ "label\n" "string.text" msgid "For_mula" -msgstr "" +msgstr "فورمۇلا(_M)" #: formuladialog.ui msgctxt "" @@ -84,7 +86,7 @@ "label\n" "string.text" msgid "Result" -msgstr "" +msgstr "نەتىجە" #: formuladialog.ui msgctxt "" @@ -93,7 +95,7 @@ "tooltip_text\n" "string.text" msgid "Maximize" -msgstr "" +msgstr "چوڭايت" #: functionpage.ui msgctxt "" @@ -102,7 +104,7 @@ "label\n" "string.text" msgid "_Category" -msgstr "" +msgstr "كاتېگورىيە(_C)" #: functionpage.ui msgctxt "" @@ -111,7 +113,7 @@ "0\n" "stringlist.text" msgid "Last Used" -msgstr "" +msgstr "ئاخىرقى ئىشلىتىش" #: functionpage.ui msgctxt "" @@ -120,7 +122,7 @@ "1\n" "stringlist.text" msgid "All" -msgstr "" +msgstr "ھەممىسى" #: functionpage.ui msgctxt "" @@ -129,7 +131,7 @@ "label\n" "string.text" msgid "_Function" -msgstr "" +msgstr "فونكىسىيە(_F)" #: parameter.ui msgctxt "" @@ -138,7 +140,7 @@ "label\n" "string.text" msgid "Function not known" -msgstr "" +msgstr "نامەلۇم فونكىسىيە" #: parameter.ui msgctxt "" @@ -147,7 +149,7 @@ "tooltip_text\n" "string.text" msgid "Select" -msgstr "" +msgstr "تاللا" #: parameter.ui msgctxt "" @@ -156,7 +158,7 @@ "tooltip_text\n" "string.text" msgid "Select" -msgstr "" +msgstr "تاللا" #: parameter.ui msgctxt "" @@ -165,7 +167,7 @@ "tooltip_text\n" "string.text" msgid "Select" -msgstr "" +msgstr "تاللا" #: parameter.ui msgctxt "" @@ -174,7 +176,7 @@ "tooltip_text\n" "string.text" msgid "Select" -msgstr "" +msgstr "تاللا" #: structpage.ui msgctxt "" @@ -183,4 +185,4 @@ "label\n" "string.text" msgid "_Structure" -msgstr "" +msgstr "قۇرۇلما(~S)" diff -Nru libreoffice-5.0.2/translations/source/ug/fpicker/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/fpicker/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/fpicker/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/fpicker/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,15 +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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2015-12-24 14:49+0000\n" +"Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1450968599.000000\n" #: explorerfiledialog.ui msgctxt "" @@ -21,7 +23,7 @@ "label\n" "string.text" msgid "Servers..." -msgstr "" +msgstr "مۇلازىمېتىرلار…" #: explorerfiledialog.ui msgctxt "" @@ -30,7 +32,7 @@ "tooltip_markup\n" "string.text" msgid "Connect To Server" -msgstr "" +msgstr "مۇلازىمېتىرغا باغلان" #: explorerfiledialog.ui msgctxt "" @@ -39,7 +41,7 @@ "tooltip_text\n" "string.text" msgid "Connect To Server" -msgstr "" +msgstr "مۇلازىمېتىرغا باغلان" #: explorerfiledialog.ui msgctxt "" @@ -48,7 +50,7 @@ "tooltip_markup\n" "string.text" msgid "Create New Folder" -msgstr "" +msgstr "يېڭى قىسقۇچ قۇر" #: explorerfiledialog.ui msgctxt "" @@ -57,7 +59,7 @@ "tooltip_text\n" "string.text" msgid "Create New Folder" -msgstr "" +msgstr "يېڭى قىسقۇچ قۇر" #: explorerfiledialog.ui msgctxt "" @@ -66,7 +68,7 @@ "label\n" "string.text" msgid "File _name:" -msgstr "" +msgstr "ھۆججەت ئىسمى(_N)" #: explorerfiledialog.ui msgctxt "" @@ -75,7 +77,7 @@ "label\n" "string.text" msgid "File _type:" -msgstr "" +msgstr "ھۆججەت تىپى(_T):" #: explorerfiledialog.ui msgctxt "" @@ -84,7 +86,7 @@ "label\n" "string.text" msgid "_Read-only" -msgstr "" +msgstr "ئوقۇشقىلا بولىدۇ(_R)" #: explorerfiledialog.ui msgctxt "" @@ -93,7 +95,7 @@ "label\n" "string.text" msgid "Save with password" -msgstr "" +msgstr "ئىم بىلەن ساقلا" #: explorerfiledialog.ui msgctxt "" @@ -102,7 +104,7 @@ "label\n" "string.text" msgid "_Automatic file name extension" -msgstr "" +msgstr "ئاپتوماتىك ھۆججەت ئاتى كېڭەيتىلمىسى(_A)" #: explorerfiledialog.ui msgctxt "" @@ -111,7 +113,7 @@ "label\n" "string.text" msgid "Edit _filter settings" -msgstr "" +msgstr "سۈزگۈچ تەڭشەك تەھرىر(_F)" #: foldernamedialog.ui msgctxt "" @@ -120,7 +122,7 @@ "title\n" "string.text" msgid "Folder Name ?" -msgstr "" +msgstr "قىسقۇچ ئىسمى؟" #: foldernamedialog.ui msgctxt "" @@ -129,7 +131,7 @@ "label\n" "string.text" msgid "Na_me" -msgstr "" +msgstr "ئاتى(_M)" #: foldernamedialog.ui msgctxt "" @@ -138,4 +140,4 @@ "label\n" "string.text" msgid "Create New Folder" -msgstr "" +msgstr "يېڭى قىسقۇچ قۇر" diff -Nru libreoffice-5.0.2/translations/source/ug/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/ug/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/ug/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 22:41+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -536,12 +536,13 @@ msgstr "" #: 01010001.xhp +#, fuzzy msgctxt "" "01010001.xhp\n" "par_id3149828\n" "help.text" msgid "Navigator for Master Documents" -msgstr "" +msgstr "فورمۇلا" #: 01010100.xhp msgctxt "" @@ -5403,13 +5404,14 @@ msgstr "فورمۇلا" #: 01160000.xhp +#, fuzzy msgctxt "" "01160000.xhp\n" "hd_id3153345\n" "6\n" "help.text" msgid "Create HTML Document" -msgstr "" +msgstr "فورمۇلا" #: 01160000.xhp msgctxt "" @@ -5579,13 +5581,14 @@ msgstr "نۆۋەتتە ئىجر قىلىنىۋاتقان ماكرونى توختات. سىز Shift+Ctrl+Q بىرىكمە كۇنۇپكىنى باسسىڭىزمۇ بولىدۇ.." #: 01170000.xhp +#, fuzzy msgctxt "" "01170000.xhp\n" "par_id3154184\n" "6\n" "help.text" msgid "Close the current document" -msgstr "" +msgstr "فورمۇلا" #: 01180000.xhp msgctxt "" @@ -11032,7 +11035,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -15703,12 +15706,13 @@ msgstr "" #: 05020300.xhp +#, fuzzy msgctxt "" "05020300.xhp\n" "par_id3145364\n" "help.text" msgid "Number format codes" -msgstr "" +msgstr "گۇرۇپپا يەش" #: 05020300.xhp #, fuzzy diff -Nru libreoffice-5.0.2/translations/source/ug/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/ug/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/ug/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 00:20+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -4171,13 +4171,14 @@ msgstr "" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "باشقا" #: 04020100.xhp msgctxt "" @@ -11148,13 +11149,14 @@ msgstr "چۆرىدەت" #: 04120210.xhp +#, fuzzy msgctxt "" "04120210.xhp\n" "hd_id3145410\n" "10\n" "help.text" msgid "Bibliography" -msgstr "" +msgstr "چۆرىدەت" #: 04120210.xhp msgctxt "" @@ -12318,13 +12320,14 @@ msgstr "چۆرىدەت" #: 04120220.xhp +#, fuzzy msgctxt "" "04120220.xhp\n" "hd_id3147506\n" "10\n" "help.text" msgid "Bibliography" -msgstr "" +msgstr "چۆرىدەت" #: 04120221.xhp msgctxt "" @@ -12947,13 +12950,14 @@ msgstr "" #: 04120227.xhp +#, fuzzy msgctxt "" "04120227.xhp\n" "hd_id3151388\n" "1\n" "help.text" msgid "Entries (bibliography)" -msgstr "" +msgstr "چۆرىدەت" #: 04120227.xhp msgctxt "" @@ -16150,15 +16154,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -21643,13 +21638,14 @@ msgstr "ھەرپ ئۇسلۇبى" #: 05130002.xhp +#, fuzzy msgctxt "" "05130002.xhp\n" "hd_id3148489\n" "1\n" "help.text" msgid "Character Style" -msgstr "" +msgstr "چۆرىدەت" #: 05130002.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/readlicense_oo/docs.po libreoffice-5.0.5~rc2/translations/source/ug/readlicense_oo/docs.po --- libreoffice-5.0.2/translations/source/ug/readlicense_oo/docs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/readlicense_oo/docs.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-10 17:22+0000\n" +"PO-Revision-Date: 2015-12-24 17:00+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441905754.000000\n" +"X-POOTLE-MTIME: 1450976453.000000\n" #: readme.xrm msgctxt "" @@ -30,7 +30,7 @@ "LatestUpdates\n" "readmeitem.text" msgid "For the latest updates to this readme file, see http://www.libreoffice.org/welcome/readme.html" -msgstr "" +msgstr "ئەڭ يېڭى تونۇشتۇرۇش ھۆججىتىنى كۆرمەكچى بولسىڭىز، http://www.libreoffice.org/welcome/readme.html نى كۆرۈڭ" #: readme.xrm msgctxt "" @@ -118,16 +118,15 @@ "macxiOSX\n" "readmeitem.text" msgid "MacOSX 10.8 (Mountain Lion) or higher" -msgstr "" +msgstr "MacOSX 10.8 (Mountain Lion) ياكى يۇقىرى نەشرى" #: readme.xrm -#, fuzzy msgctxt "" "readme.xrm\n" "s2s3sdf21\n" "readmeitem.text" msgid "Microsoft Windows XP SP2, Vista, Windows 7, or Windows 8" -msgstr "Microsoft Windows XP،Vista، Windows 7 ياكى Windows 8" +msgstr "Microsoft Windows XP SP2، Vista، Windows 7 ياكى Windows 8" #: readme.xrm msgctxt "" @@ -407,7 +406,7 @@ "otherinstall2\n" "readmeitem.text" msgid "The RPMS (or DEBS, respectively) directory also contains a package named libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (or libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb, respectively, or similar). This is a package for all Linux distributions that support the Freedesktop.org specifications/recommendations (http://en.wikipedia.org/wiki/Freedesktop.org), and is provided for installation on other Linux distributions not covered in the aforementioned instructions." -msgstr "" +msgstr "بۇ RPMS (ياكى DEBS، بوغچا باشقۇرغۇچىڭىزنىڭ ئوخشىماسلىقىغا ئاساسەن بەلگىلىنىدۇ) مۇندەرىجىدە libreoffice${PRODUCTVERSION}-freedesktop-menus-${PRODUCTVERSION}.0.1-1.noarch.rpm (ياكى libreoffice${PRODUCTVERSION}-debian-menus_${PRODUCTVERSION}.0.1-1_all.deb، بوغچا باشقۇرغۇچىڭىزنىڭ ئوخشىماسلىقىغا ئاساسەن بەلگىلىنىدۇ، ياكى باشقا ئوخشىشىپ كېتىدىغان ئىسىم بولۇشى مۇمكىن) يۇمشاق دېتال بوغچىسى بار. بۇ يۇمشاق دېتال بوغچىسى Freedesktop.org قوللايدىغان ئۆلچەم/تەشەببۇسنى قوللايدۇ (http://en.wikipedia.org/wiki/Freedesktop.org)، ھەر قانداق Linux تارقىتىلغان نەشرى ئىشلىتەلەيدۇ، يۇقىرىقى مەزمۇندا تىلغا ئېلىنمىغان باشقا Linux تارقىتىلغان نەشرىگىمۇ ئورناتقىلى بولىدۇ." #: readme.xrm msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/reportdesign/uiconfig/dbreport/ui.po libreoffice-5.0.5~rc2/translations/source/ug/reportdesign/uiconfig/dbreport/ui.po --- libreoffice-5.0.2/translations/source/ug/reportdesign/uiconfig/dbreport/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/reportdesign/uiconfig/dbreport/ui.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-15 02:03+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2016-01-02 15:06+0000\n" +"Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439604223.000000\n" +"X-POOTLE-MTIME: 1451747163.000000\n" #: backgrounddialog.ui msgctxt "" @@ -23,7 +23,7 @@ "title\n" "string.text" msgid "Section Setup" -msgstr "" +msgstr "دائىرە تەڭشەك" #: backgrounddialog.ui msgctxt "" @@ -32,7 +32,7 @@ "label\n" "string.text" msgid "Background" -msgstr "" +msgstr "تەگلىك" #: chardialog.ui msgctxt "" @@ -41,7 +41,7 @@ "title\n" "string.text" msgid "Character Settings" -msgstr "" +msgstr "ھەرپ تەڭشەكلەر" #: chardialog.ui msgctxt "" @@ -50,7 +50,7 @@ "label\n" "string.text" msgid "Font" -msgstr "" +msgstr "خەت نۇسخا" #: chardialog.ui msgctxt "" @@ -59,7 +59,7 @@ "label\n" "string.text" msgid "Font Effects" -msgstr "" +msgstr "خەت نۇسخا ئۈنۈمى" #: chardialog.ui msgctxt "" @@ -77,7 +77,7 @@ "label\n" "string.text" msgid "Asian Layout" -msgstr "" +msgstr "ئاسىيا ئۇسلۇبى" #: chardialog.ui msgctxt "" @@ -86,17 +86,16 @@ "label\n" "string.text" msgid "Highlighting" -msgstr "" +msgstr "يورۇتۇش" #: chardialog.ui -#, fuzzy msgctxt "" "chardialog.ui\n" "alignment\n" "label\n" "string.text" msgid "Alignment" -msgstr "توغرىلاش(_A):" +msgstr "توغرىلا" #: condformatdialog.ui msgctxt "" @@ -105,7 +104,7 @@ "title\n" "string.text" msgid "Conditional Formatting" -msgstr "" +msgstr "شەرت پىچىم" #: conditionwin.ui msgctxt "" @@ -114,7 +113,7 @@ "0\n" "stringlist.text" msgid "Field Value Is" -msgstr "" +msgstr "سۆز بۆلەك قىممىتى" #: conditionwin.ui msgctxt "" @@ -123,7 +122,7 @@ "1\n" "stringlist.text" msgid "Expression Is" -msgstr "" +msgstr "ئىپادە" #: conditionwin.ui msgctxt "" @@ -132,7 +131,7 @@ "0\n" "stringlist.text" msgid "between" -msgstr "" +msgstr "ئارىسىدا" #: conditionwin.ui msgctxt "" @@ -141,7 +140,7 @@ "1\n" "stringlist.text" msgid "not between" -msgstr "" +msgstr "ئارىسىدا ئەمەس" #: conditionwin.ui msgctxt "" @@ -150,7 +149,7 @@ "2\n" "stringlist.text" msgid "equal to" -msgstr "" +msgstr "تەڭ" #: conditionwin.ui msgctxt "" @@ -159,7 +158,7 @@ "3\n" "stringlist.text" msgid "not equal to" -msgstr "" +msgstr "تەڭ ئەمەس" #: conditionwin.ui msgctxt "" @@ -168,7 +167,7 @@ "4\n" "stringlist.text" msgid "greater than" -msgstr "" +msgstr "چوڭ" #: conditionwin.ui msgctxt "" @@ -177,7 +176,7 @@ "5\n" "stringlist.text" msgid "less than" -msgstr "" +msgstr "كىچىك" #: conditionwin.ui msgctxt "" @@ -186,7 +185,7 @@ "6\n" "stringlist.text" msgid "greater than or equal to" -msgstr "" +msgstr "چوڭ ياكى تەڭ" #: conditionwin.ui msgctxt "" @@ -195,17 +194,16 @@ "7\n" "stringlist.text" msgid "less than or equal to" -msgstr "" +msgstr "كىچىك ياكى تەڭ" #: conditionwin.ui -#, fuzzy msgctxt "" "conditionwin.ui\n" "lhsButton\n" "label\n" "string.text" msgid "..." -msgstr "..." +msgstr "…" #: conditionwin.ui msgctxt "" @@ -214,17 +212,16 @@ "label\n" "string.text" msgid "and" -msgstr "" +msgstr "ۋە" #: conditionwin.ui -#, fuzzy msgctxt "" "conditionwin.ui\n" "rhsButton\n" "label\n" "string.text" msgid "..." -msgstr "..." +msgstr "…" #: conditionwin.ui msgctxt "" @@ -233,7 +230,7 @@ "label\n" "string.text" msgid "Bold" -msgstr "" +msgstr "توم" #: conditionwin.ui msgctxt "" @@ -242,7 +239,7 @@ "label\n" "string.text" msgid "Italic" -msgstr "" +msgstr "يانتۇ" #: conditionwin.ui msgctxt "" @@ -251,7 +248,7 @@ "label\n" "string.text" msgid "Underline" -msgstr "" +msgstr "ئاستى سىزىق" #: conditionwin.ui msgctxt "" @@ -260,7 +257,7 @@ "label\n" "string.text" msgid "Background Color" -msgstr "" +msgstr "تەگلىك رەڭگى" #: conditionwin.ui msgctxt "" @@ -269,7 +266,7 @@ "label\n" "string.text" msgid "Font Color" -msgstr "" +msgstr "خەت رەڭگى" #: conditionwin.ui msgctxt "" @@ -278,10 +275,9 @@ "label\n" "string.text" msgid "Character Formatting" -msgstr "" +msgstr "ھەرپ پىچىمى" #: conditionwin.ui -#, fuzzy msgctxt "" "conditionwin.ui\n" "removeButton\n" @@ -297,7 +293,7 @@ "label\n" "string.text" msgid "+" -msgstr "" +msgstr "+" #: datetimedialog.ui msgctxt "" @@ -351,7 +347,7 @@ "title\n" "string.text" msgid "Report navigator" -msgstr "" +msgstr "دوكلات يولباشچى" #: floatingsort.ui msgctxt "" @@ -360,7 +356,7 @@ "title\n" "string.text" msgid "Sorting and Grouping" -msgstr "" +msgstr "تەرتىپلەش ۋە گۇرۇپپىلاش" #: floatingsort.ui msgctxt "" @@ -369,7 +365,7 @@ "label\n" "string.text" msgid "Group actions" -msgstr "" +msgstr "گۇرۇپپا مەشغۇلاتى" #: floatingsort.ui msgctxt "" @@ -378,7 +374,7 @@ "label\n" "string.text" msgid "Move up" -msgstr "" +msgstr "ئۈستىگە يۆتكە" #: floatingsort.ui msgctxt "" @@ -387,7 +383,7 @@ "label\n" "string.text" msgid "Move down" -msgstr "" +msgstr "ئاستىغا يۆتكە" #: floatingsort.ui msgctxt "" @@ -396,7 +392,7 @@ "label\n" "string.text" msgid "Delete" -msgstr "" +msgstr "ئۆچۈر" #: floatingsort.ui msgctxt "" @@ -405,7 +401,7 @@ "label\n" "string.text" msgid "Groups" -msgstr "" +msgstr "گۇرۇپپا" #: floatingsort.ui msgctxt "" @@ -414,7 +410,7 @@ "label\n" "string.text" msgid "Sorting" -msgstr "" +msgstr "تەرتىپلەش" #: floatingsort.ui msgctxt "" @@ -423,7 +419,7 @@ "label\n" "string.text" msgid "Group Header" -msgstr "" +msgstr "گۇرۇپپا بەت قاشى" #: floatingsort.ui msgctxt "" @@ -432,7 +428,7 @@ "label\n" "string.text" msgid "Group Footer" -msgstr "" +msgstr "گۇرۇپپا بەت ئاستى" #: floatingsort.ui msgctxt "" @@ -441,7 +437,7 @@ "label\n" "string.text" msgid "Group On" -msgstr "" +msgstr "گۇرۇپپىلا" #: floatingsort.ui msgctxt "" @@ -450,7 +446,7 @@ "label\n" "string.text" msgid "Group Interval" -msgstr "" +msgstr "گۇرۇپپا ئارىلىقى" #: floatingsort.ui msgctxt "" @@ -459,7 +455,7 @@ "label\n" "string.text" msgid "Keep Together" -msgstr "" +msgstr "بىرگە قوي" #: floatingsort.ui msgctxt "" @@ -468,7 +464,7 @@ "0\n" "stringlist.text" msgid "Ascending" -msgstr "" +msgstr "ئۆسكۈچى" #: floatingsort.ui msgctxt "" @@ -477,7 +473,7 @@ "1\n" "stringlist.text" msgid "Descending" -msgstr "" +msgstr "كېمەيگۈچى" #: floatingsort.ui msgctxt "" @@ -486,7 +482,7 @@ "0\n" "stringlist.text" msgid "Present" -msgstr "" +msgstr "مەۋجۇت" #: floatingsort.ui msgctxt "" @@ -495,7 +491,7 @@ "1\n" "stringlist.text" msgid "Not present" -msgstr "" +msgstr "مەۋجۇت ئەمەس" #: floatingsort.ui msgctxt "" @@ -504,7 +500,7 @@ "0\n" "stringlist.text" msgid "No" -msgstr "" +msgstr "ياق" #: floatingsort.ui msgctxt "" @@ -513,7 +509,7 @@ "1\n" "stringlist.text" msgid "Whole Group" -msgstr "" +msgstr "بارلىق گۇرۇپپا" #: floatingsort.ui msgctxt "" @@ -522,7 +518,7 @@ "2\n" "stringlist.text" msgid "With First Detail" -msgstr "" +msgstr "بىرىنچى تەپسىلات" #: floatingsort.ui msgctxt "" @@ -531,7 +527,7 @@ "0\n" "stringlist.text" msgid "Present" -msgstr "" +msgstr "مەۋجۇت" #: floatingsort.ui msgctxt "" @@ -540,7 +536,7 @@ "1\n" "stringlist.text" msgid "Not present" -msgstr "" +msgstr "مەۋجۇت ئەمەس" #: floatingsort.ui msgctxt "" @@ -549,7 +545,7 @@ "0\n" "stringlist.text" msgid "Each Value" -msgstr "" +msgstr "ھەر بىر قىممەت" #: floatingsort.ui msgctxt "" @@ -558,7 +554,7 @@ "label\n" "string.text" msgid "Properties" -msgstr "" +msgstr "خاسلىقلار" #: floatingsort.ui msgctxt "" @@ -567,7 +563,7 @@ "label\n" "string.text" msgid "Help" -msgstr "" +msgstr "ياردەم" #: pagedialog.ui msgctxt "" @@ -576,7 +572,7 @@ "title\n" "string.text" msgid "Page Setup" -msgstr "" +msgstr "بەت تەڭشەك" #: pagedialog.ui msgctxt "" @@ -585,7 +581,7 @@ "label\n" "string.text" msgid "Page" -msgstr "" +msgstr "بەت" #: pagedialog.ui msgctxt "" @@ -594,7 +590,7 @@ "label\n" "string.text" msgid "Background" -msgstr "" +msgstr "تەگلىك" #: pagenumberdialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ug/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ug/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:17+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1564,6 +1564,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "ئىختىيارى" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -2016,22 +2026,24 @@ msgstr "" #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_markup\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "بۇ جايغا يەرلىك ھۆججەت سىستېمىسىدىكى ياكى ئىنتېرنېتتىكى مەنبە پۈتۈكنىڭ URL نى كىرگۈزۈڭ." #: datastreams.ui +#, fuzzy msgctxt "" "datastreams.ui\n" "url\n" "tooltip_text\n" "string.text" msgid "Enter the URL of the source document in the local file system or Internet here." -msgstr "" +msgstr "بۇ جايغا يەرلىك ھۆججەت سىستېمىسىدىكى ياكى ئىنتېرنېتتىكى مەنبە پۈتۈكنىڭ URL نى كىرگۈزۈڭ." #: datastreams.ui msgctxt "" @@ -3424,13 +3436,14 @@ msgstr "" #: groupbydate.ui +#, fuzzy msgctxt "" "groupbydate.ui\n" "days\n" "label\n" "string.text" msgid "Number of _days:" -msgstr "" +msgstr "بەت سانى(_U):" #: groupbydate.ui msgctxt "" @@ -3920,13 +3933,14 @@ msgstr "ھەرپ توپلىمى(_A)" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "تېكست ئايرىش بەلگىسى(_X)" #: imoptdialog.ui #, fuzzy @@ -5572,13 +5586,14 @@ msgstr "ھەممىنى چاپلا(_P)" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "تېكست(_T)" #: pastespecial.ui msgctxt "" @@ -5644,13 +5659,14 @@ msgstr "تاللا" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "ئىزاھ" #: pastespecial.ui msgctxt "" @@ -5789,13 +5805,14 @@ msgstr "تاللانما(_P)…" #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "ئىزاھ" #: pivotfielddialog.ui #, fuzzy @@ -6661,22 +6678,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "ئىم(_P)" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "جەزملە(_C)" #: retypepassworddialog.ui msgctxt "" @@ -9495,22 +9514,24 @@ msgstr "بەت سانى(_U):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label5\n" "label\n" "string.text" msgid "Number of Cells:" -msgstr "" +msgstr "بەت سانى(_U):" #: statisticsinfopage.ui +#, fuzzy msgctxt "" "statisticsinfopage.ui\n" "label2\n" "label\n" "string.text" msgid "Number of Sheets:" -msgstr "" +msgstr "بەت سانى(_U):" #: statisticsinfopage.ui msgctxt "" @@ -10459,22 +10480,24 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "minft\n" "label\n" "string.text" msgid "_Minimum:" -msgstr "" +msgstr "ئەڭ كىچىك(_U)" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "ئەڭ چوڭ(_M)" #: validationcriteriapage.ui msgctxt "" @@ -10855,93 +10878,3 @@ "string.text" msgid "Grouped by" msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/ug/scp2/source/accessories.po libreoffice-5.0.5~rc2/translations/source/ug/scp2/source/accessories.po --- libreoffice-5.0.2/translations/source/ug/scp2/source/accessories.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/scp2/source/accessories.po 2016-02-04 16:41:28.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: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2016-01-02 16:13+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1451751193.000000\n" #: module_accessories.ulf msgctxt "" @@ -233,13 +233,12 @@ msgstr "پورتۇگالچە (بىرازىلىيە)" #: module_samples_accessories.ulf -#, fuzzy msgctxt "" "module_samples_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_PT_BR\n" "LngText.text" msgid "Installs Portuguese (Brazil) support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە (بىرازىلىيە) قوللاشنى ئورنىتىدۇ" #: module_samples_accessories.ulf msgctxt "" @@ -839,16 +838,15 @@ "STR_NAME_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_samples_accessories.ulf -#, fuzzy msgctxt "" "module_samples_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تامىلچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا ئودىياچە قوللاشنى ئورنىتىدۇ" #: module_samples_accessories.ulf msgctxt "" @@ -856,16 +854,15 @@ "STR_NAME_MODULE_LANGPACK_OR_IN\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_samples_accessories.ulf -#, fuzzy msgctxt "" "module_samples_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_OR_IN\n" "LngText.text" msgid "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تامىلچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا ئودىياچە قوللاشنى ئورنىتىدۇ" #: module_samples_accessories.ulf msgctxt "" @@ -1321,16 +1318,15 @@ "STR_NAME_MODULE_LANGPACK_SR_LATN\n" "LngText.text" msgid "Serbian (Latin)" -msgstr "" +msgstr "سىربچە (لاتىن)" #: module_samples_accessories.ulf -#, fuzzy msgctxt "" "module_samples_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_SR_LATN\n" "LngText.text" msgid "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا سېربچە (سلاۋيان) قوللاشنى قاچىلا" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا سېربچە (لاتىن) قوللاشنى ئورنىتىدۇ" #: module_samples_accessories.ulf msgctxt "" @@ -1642,16 +1638,15 @@ "STR_NAME_MODULE_LANGPACK_KMR_LATN\n" "LngText.text" msgid "Kurdish" -msgstr "" +msgstr "كۇردچە" #: module_samples_accessories.ulf -#, fuzzy msgctxt "" "module_samples_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_KMR_LATN\n" "LngText.text" msgid "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تۈركچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا كۇردچە قوللاشنى ئورنىتىدۇ" #: module_samples_accessories.ulf msgctxt "" @@ -2014,13 +2009,12 @@ msgstr "پورتۇگالچە (بىرازىلىيە)" #: module_templates_accessories.ulf -#, fuzzy msgctxt "" "module_templates_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_PT_BR\n" "LngText.text" msgid "Installs Portuguese (Brazil) support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە (بىرازىلىيە) قوللاشنى ئورنىتىدۇ" #: module_templates_accessories.ulf msgctxt "" @@ -2620,16 +2614,15 @@ "STR_NAME_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_templates_accessories.ulf -#, fuzzy msgctxt "" "module_templates_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تامىلچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا ئودىياچە قوللاشنى ئورنىتىدۇ" #: module_templates_accessories.ulf msgctxt "" @@ -2637,16 +2630,15 @@ "STR_NAME_MODULE_LANGPACK_OR_IN\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_templates_accessories.ulf -#, fuzzy msgctxt "" "module_templates_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_OR_IN\n" "LngText.text" msgid "Installs Odia support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تامىلچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا ئودىياچە قوللاشنى ئورنىتىدۇ" #: module_templates_accessories.ulf msgctxt "" @@ -3102,16 +3094,15 @@ "STR_NAME_MODULE_LANGPACK_SR_LATN\n" "LngText.text" msgid "Serbian (Latin)" -msgstr "" +msgstr "سىربچە (لاتىن)" #: module_templates_accessories.ulf -#, fuzzy msgctxt "" "module_templates_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_SR_LATN\n" "LngText.text" msgid "Installs Serbian (Latin) support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا سېربچە (سلاۋيان) قوللاشنى قاچىلا" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا سېربچە (لاتىن) قوللاشنى ئورنىتىدۇ" #: module_templates_accessories.ulf msgctxt "" @@ -3423,16 +3414,15 @@ "STR_NAME_MODULE_LANGPACK_KMR_LATN\n" "LngText.text" msgid "Kurdish" -msgstr "" +msgstr "كۇردچە" #: module_templates_accessories.ulf -#, fuzzy msgctxt "" "module_templates_accessories.ulf\n" "STR_DESC_MODULE_LANGPACK_KMR_LATN\n" "LngText.text" msgid "Installs Kurdish support in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا تۈركچە قوللاشنى قاچىلايدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا كۇردچە قوللاشنى ئورنىتىدۇ" #: module_templates_accessories.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/scp2/source/ooo.po libreoffice-5.0.5~rc2/translations/source/ug/scp2/source/ooo.po --- libreoffice-5.0.2/translations/source/ug/scp2/source/ooo.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/scp2/source/ooo.po 2016-02-04 16:41:28.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: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2016-01-02 16:17+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1451751434.000000\n" #: folderitem_ooo.ulf msgctxt "" @@ -177,13 +177,12 @@ msgstr "پورتۇگالچە (بىرازىلىيە)" #: module_helppack.ulf -#, fuzzy msgctxt "" "module_helppack.ulf\n" "STR_DESC_MODULE_HELPPACK_PT_BR\n" "LngText.text" msgid "Installs Portuguese (Brazil) help in %PRODUCTNAME %PRODUCTVERSION" -msgstr " %PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە ياردەمنى ئورنىتىدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا پورتۇگالچە (بىرازىلىيە) قوللاشنى ئورنىتىدۇ" #: module_helppack.ulf msgctxt "" @@ -687,16 +686,15 @@ "STR_NAME_MODULE_HELPPACK_OR\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_helppack.ulf -#, fuzzy msgctxt "" "module_helppack.ulf\n" "STR_DESC_MODULE_HELPPACK_OR\n" "LngText.text" msgid "Installs Odia help in %PRODUCTNAME %PRODUCTVERSION" -msgstr " %PRODUCTNAME %PRODUCTVERSION غا ئوكسىتانچە ياردەمنى ئورنىتىدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا ئودىياچە قوللاشنى ئورنىتىدۇ" #: module_helppack.ulf msgctxt "" @@ -1387,22 +1385,20 @@ msgstr "%PRODUCTNAME %PRODUCTVERSION غا گۇجاراتىچە ياردەمنى ئورنىتىدۇ" #: module_helppack.ulf -#, fuzzy msgctxt "" "module_helppack.ulf\n" "STR_NAME_MODULE_HELPPACK_GUG\n" "LngText.text" msgid "Guarani" -msgstr "گۇجاراتى" +msgstr "گۇئارانى" #: module_helppack.ulf -#, fuzzy msgctxt "" "module_helppack.ulf\n" "STR_DESC_MODULE_HELPPACK_GUG\n" "LngText.text" msgid "Installs Guarani help in %PRODUCTNAME %PRODUCTVERSION" -msgstr "%PRODUCTNAME %PRODUCTVERSION غا گۇجاراتىچە ياردەمنى ئورنىتىدۇ" +msgstr "%PRODUCTNAME %PRODUCTVERSION غا گۇئارانىچە ياردەمنى ئورنىتىدۇ" #: module_helppack.ulf msgctxt "" @@ -2482,16 +2478,15 @@ "STR_NAME_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Odia" -msgstr "" +msgstr "ئودىيا" #: module_langpack.ulf -#, fuzzy msgctxt "" "module_langpack.ulf\n" "STR_DESC_MODULE_LANGPACK_OR\n" "LngText.text" msgid "Installs the Odia user interface" -msgstr "ئوكسىتانچە ئىشلەتكۈچى ئارايۈزىنى ئورنىتىدۇ" +msgstr "ئودىيا ئىشلەتكۈچى ئارايۈزىنى ئورنىتىدۇ" #: module_langpack.ulf msgctxt "" @@ -3182,22 +3177,20 @@ msgstr "گۇجاراتچە ئىشلەتكۈچى ئارايۈزىنى ئورنىتىدۇ" #: module_langpack.ulf -#, fuzzy msgctxt "" "module_langpack.ulf\n" "STR_NAME_MODULE_LANGPACK_GUG\n" "LngText.text" msgid "Guarani" -msgstr "گۇجاراتى" +msgstr "گۇئارانى" #: module_langpack.ulf -#, fuzzy msgctxt "" "module_langpack.ulf\n" "STR_DESC_MODULE_LANGPACK_GUG\n" "LngText.text" msgid "Installs the Guarani user interface" -msgstr "گۇجاراتچە ئىشلەتكۈچى ئارايۈزىنى ئورنىتىدۇ" +msgstr "گۇئارانىچە ئىشلەتكۈچى ئارايۈزىنى ئورنىتىدۇ" #: module_langpack.ulf msgctxt "" @@ -4269,7 +4262,7 @@ "STR_DESC_MODULE_EXTENSION_DICTIONARY_PT_BR\n" "LngText.text" msgid "Portuguese (Brazil) spelling Dictionary (1990 Spelling Agreement), and hyphenation rules" -msgstr "" +msgstr "پورتۇگالچە (بىرازىلىيە) ئىملا لۇغىتى (1990 ئىملا قائىدىسى) ۋە ھەرپ ئۇلاش قائىدىسى" #: module_ooo.ulf msgctxt "" @@ -4541,7 +4534,7 @@ "STR_REG_VAL_SO60_CONFIGFILE\n" "LngText.text" msgid "%PRODUCTNAME Configuration File" -msgstr "" +msgstr "%PRODUCTNAME سەپلىمە ھۆججەت" #: registryitem_ooo.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 04:42+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:31+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431578548.000000\n" +"X-POOTLE-MTIME: 1439605906.000000\n" #: alienwarndialog.ui msgctxt "" @@ -758,7 +758,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ug/starmath/source.po libreoffice-5.0.5~rc2/translations/source/ug/starmath/source.po --- libreoffice-5.0.2/translations/source/ug/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ug/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ug/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ug/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-03-11 10:16+0000\n" -"Last-Translator: Abduqadir Abliz \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:43+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1439606607.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/ug/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/ug/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/ug/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/ug/vcl/source/src.po libreoffice-5.0.5~rc2/translations/source/ug/vcl/source/src.po --- libreoffice-5.0.2/translations/source/ug/vcl/source/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/vcl/source/src.po 2016-02-04 16:41:28.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: 2015-09-10 17:23+0000\n" +"PO-Revision-Date: 2015-12-24 17:30+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441905808.000000\n" +"X-POOTLE-MTIME: 1450978235.000000\n" #. This is used on buttons for platforms other than windows, there should be a ~ mnemonic in this string #: btntext.src @@ -354,7 +354,7 @@ "STR_FPICKER_IMAGE_TEMPLATE\n" "string.text" msgid "Frame Style: " -msgstr "" +msgstr "كاندۇك ئۇسلۇبى: " #: fpicker.src msgctxt "" @@ -1131,16 +1131,15 @@ "SV_PRINT_QUERYFAXNUMBER_TXT\n" "string.text" msgid "Please enter the fax number" -msgstr "" +msgstr "فاكس نومۇرىنى كىرگۈزۈڭ" #: print.src -#, fuzzy msgctxt "" "print.src\n" "SV_PRINT_INVALID_TXT\n" "string.text" msgid "" -msgstr "" +msgstr "<پەرۋا قىلما>" #: print.src msgctxt "" @@ -1148,7 +1147,7 @@ "SV_PRINT_CUSTOM_TXT\n" "string.text" msgid "Custom" -msgstr "" +msgstr "ئىختىيارىچە" #: stdtext.src msgctxt "" @@ -1208,7 +1207,7 @@ "SV_EDIT_WARNING_STR\n" "string.text" msgid "The inserted text exceeded the maximum length of this text field. The text was truncated." -msgstr "" +msgstr "قىستۇرغان تېكست بۇ تېكست سۆز بۆلىكىنىڭ چېكىدىن ئېشىپ كەتتى. تېكست قىسقارتىلىدۇ." #: stdtext.src msgctxt "" @@ -1404,7 +1403,7 @@ "pixels\n" "itemlist.text" msgid "pixels" -msgstr "" +msgstr "پىكسېل" #: units.src msgctxt "" @@ -1413,10 +1412,9 @@ "pixel\n" "itemlist.text" msgid "pixel" -msgstr "" +msgstr "پىكسېل" #: units.src -#, fuzzy msgctxt "" "units.src\n" "SV_FUNIT_STRINGS\n" @@ -1432,7 +1430,7 @@ "sec\n" "itemlist.text" msgid "sec" -msgstr "" +msgstr "سېكۇنت" #: units.src msgctxt "" @@ -1441,4 +1439,4 @@ "ms\n" "itemlist.text" msgid "ms" -msgstr "" +msgstr "مىللىسېكۇنت" diff -Nru libreoffice-5.0.2/translations/source/ug/vcl/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/vcl/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/vcl/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/vcl/uiconfig/ui.po 2016-02-04 16:41:28.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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2016-01-02 14:49+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: none\n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1451746197.000000\n" #: cupspassworddialog.ui msgctxt "" @@ -23,7 +23,7 @@ "title\n" "string.text" msgid "Authentication Request" -msgstr "" +msgstr "دەلىللەش ئىلتىماسى" #: cupspassworddialog.ui msgctxt "" @@ -32,7 +32,7 @@ "label\n" "string.text" msgid "_User:" -msgstr "" +msgstr "ئىشلەتكۈچى(_U):" #: cupspassworddialog.ui msgctxt "" @@ -41,7 +41,7 @@ "label\n" "string.text" msgid "_Password:" -msgstr "" +msgstr "ئىم(_P):" #: cupspassworddialog.ui msgctxt "" @@ -50,7 +50,7 @@ "label\n" "string.text" msgid "Please enter your authentication data for server “%s”" -msgstr "" +msgstr "سىز «%s» مۇلازىمېتىردىكى دەلىللەش سانلىق مەلۇماتىڭىزنى كىرگۈزۈڭ" #: errornocontentdialog.ui msgctxt "" @@ -296,7 +296,6 @@ msgstr "ئەكسى بەت تەرتىپىدە باس" #: printdialog.ui -#, fuzzy msgctxt "" "printdialog.ui\n" "label13\n" @@ -495,7 +494,6 @@ msgstr "ئىچىدە" #: printdialog.ui -#, fuzzy msgctxt "" "printdialog.ui\n" "label3\n" @@ -694,14 +692,13 @@ msgstr "توغرا يۆنىلىش" #: printerdevicepage.ui -#, fuzzy msgctxt "" "printerdevicepage.ui\n" "label7\n" "label\n" "string.text" msgid "_Option:" -msgstr "تاللانمالار" +msgstr "تاللانمالار(_O):" #: printerdevicepage.ui msgctxt "" @@ -710,7 +707,7 @@ "label\n" "string.text" msgid "Current _value:" -msgstr "" +msgstr "نۆۋەتتىكى قىممەت(_V):" #: printerdevicepage.ui msgctxt "" @@ -719,7 +716,7 @@ "label\n" "string.text" msgid "Color _depth:" -msgstr "" +msgstr "رەڭ چوڭقۇرلۇقى(_D):" #: printerdevicepage.ui msgctxt "" @@ -728,7 +725,7 @@ "label\n" "string.text" msgid "Co_lor:" -msgstr "" +msgstr "رەڭ(_L):" #: printerdevicepage.ui msgctxt "" @@ -737,7 +734,7 @@ "label\n" "string.text" msgid "Printer language _type:" -msgstr "" +msgstr "پىرىنتېر تىل تىپى(_T):" #: printerdevicepage.ui msgctxt "" @@ -746,7 +743,7 @@ "0\n" "stringlist.text" msgid "From driver" -msgstr "" +msgstr "قوزغاتقۇچتىن" #: printerdevicepage.ui msgctxt "" @@ -755,7 +752,7 @@ "1\n" "stringlist.text" msgid "Color" -msgstr "" +msgstr "رەڭ" #: printerdevicepage.ui msgctxt "" @@ -764,7 +761,7 @@ "2\n" "stringlist.text" msgid "Grayscale" -msgstr "" +msgstr "كۈلرەڭلىكى" #: printerdevicepage.ui msgctxt "" @@ -773,7 +770,7 @@ "0\n" "stringlist.text" msgid "8 Bit" -msgstr "" +msgstr "8 بىت" #: printerdevicepage.ui msgctxt "" @@ -782,7 +779,7 @@ "1\n" "stringlist.text" msgid "24 Bit" -msgstr "" +msgstr "24 بىت" #: printerdevicepage.ui msgctxt "" @@ -791,7 +788,7 @@ "0\n" "stringlist.text" msgid "Automatic : %s" -msgstr "" +msgstr "ئاپتوماتىك: %s" #: printerdevicepage.ui msgctxt "" @@ -800,7 +797,7 @@ "1\n" "stringlist.text" msgid "PostScript (Level from driver)" -msgstr "" +msgstr "PostScript (قوزغاتقۇچتىن ئالغان دەرىجىسى)" #: printerdevicepage.ui msgctxt "" @@ -809,7 +806,7 @@ "2\n" "stringlist.text" msgid "PostScript Level 1" -msgstr "" +msgstr "PostScript دەرىجە 1" #: printerdevicepage.ui msgctxt "" @@ -818,7 +815,7 @@ "3\n" "stringlist.text" msgid "PostScript Level 2" -msgstr "" +msgstr "PostScript دەرىجە 2" #: printerdevicepage.ui msgctxt "" @@ -827,7 +824,7 @@ "4\n" "stringlist.text" msgid "PostScript Level 3" -msgstr "" +msgstr "PostScript دەرىجە 3" #: printerdevicepage.ui msgctxt "" @@ -836,7 +833,7 @@ "5\n" "stringlist.text" msgid "PDF" -msgstr "" +msgstr "PDF" #: printerpaperpage.ui msgctxt "" @@ -845,17 +842,16 @@ "label\n" "string.text" msgid "_Paper size:" -msgstr "" +msgstr "قەغەز چوڭلۇقى(_P)" #: printerpaperpage.ui -#, fuzzy msgctxt "" "printerpaperpage.ui\n" "label4\n" "label\n" "string.text" msgid "_Orientation:" -msgstr "يۆنىلىشى" +msgstr "يۆنىلىش(_O):" #: printerpaperpage.ui msgctxt "" @@ -864,7 +860,7 @@ "label\n" "string.text" msgid "_Duplex:" -msgstr "" +msgstr "قوش يۈز(_D):" #: printerpaperpage.ui msgctxt "" @@ -873,7 +869,7 @@ "label\n" "string.text" msgid "Paper tray:" -msgstr "" +msgstr "قەغەز قۇتىسى:" #: printerpaperpage.ui msgctxt "" @@ -900,7 +896,7 @@ "title\n" "string.text" msgid "Properties of %s" -msgstr "" +msgstr "%s نىڭ خاسلىقى" #: printerpropertiesdialog.ui msgctxt "" @@ -909,7 +905,7 @@ "label\n" "string.text" msgid "Paper" -msgstr "" +msgstr "قەغەز" #: printerpropertiesdialog.ui msgctxt "" @@ -918,7 +914,7 @@ "label\n" "string.text" msgid "Device" -msgstr "" +msgstr "ئۈسكۈنە" #: printprogressdialog.ui msgctxt "" @@ -927,7 +923,7 @@ "title\n" "string.text" msgid "Printing" -msgstr "" +msgstr "بېسىۋاتىدۇ" #: printprogressdialog.ui msgctxt "" @@ -936,7 +932,7 @@ "label\n" "string.text" msgid "Page %p of %n" -msgstr "" +msgstr "بەت %p/%n" #: querydialog.ui msgctxt "" @@ -945,4 +941,4 @@ "title\n" "string.text" msgid "New Data Type" -msgstr "" +msgstr "يېڭى سانلىق مەلۇمات تىپى" diff -Nru libreoffice-5.0.2/translations/source/ug/wizards/source/euro.po libreoffice-5.0.5~rc2/translations/source/ug/wizards/source/euro.po --- libreoffice-5.0.2/translations/source/ug/wizards/source/euro.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/wizards/source/euro.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-10 17:20+0000\n" +"PO-Revision-Date: 2015-12-24 14:39+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441905633.000000\n" +"X-POOTLE-MTIME: 1450967954.000000\n" #: euro.src msgctxt "" @@ -321,7 +321,6 @@ msgstr "نىشان مۇندەرىجە تاللا" #: euro.src -#, fuzzy msgctxt "" "euro.src\n" "MESSAGES + 4\n" @@ -639,7 +638,7 @@ "CURRENCIES + 18\n" "string.text" msgid "Lithuanian Litas" -msgstr "" +msgstr "لىتۋا لىتاسى" #: euro.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/ug/wizards/source/formwizard.po libreoffice-5.0.5~rc2/translations/source/ug/wizards/source/formwizard.po --- libreoffice-5.0.2/translations/source/ug/wizards/source/formwizard.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/wizards/source/formwizard.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2015-12-24 14:42+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1450968160.000000\n" #: dbwizres.src msgctxt "" @@ -2036,7 +2036,7 @@ "RID_DB_REPORT_WIZARD_START + 74\n" "string.text" msgid "The sort criterion '' was chosen twice. Each criterion can only be chosen once." -msgstr "" +msgstr "بۇ '' تەرتىپلەش شەرتى ئىككى قېتىم تاللاندى. ھەر بىر شەرتنى بىرلا قېتىم تاللىغىلى بولىدۇ." #: dbwizres.src msgctxt "" @@ -3852,13 +3852,12 @@ msgstr "زامانىۋى شەخسىي فاكس" #: dbwizres.src -#, fuzzy msgctxt "" "dbwizres.src\n" "RID_FAXWIZARDDIALOG_START + 56\n" "string.text" msgid "Fax" -msgstr "فاكس:" +msgstr "فاكس" #: dbwizres.src msgctxt "" @@ -5878,7 +5877,7 @@ "RID_AGENDAWIZARDDIALOG_START +87\n" "string.text" msgid "Blue" -msgstr "" +msgstr "كۆك" #: dbwizres.src msgctxt "" @@ -5886,7 +5885,7 @@ "RID_AGENDAWIZARDDIALOG_START +88\n" "string.text" msgid "Classic" -msgstr "" +msgstr "كىلاسسىك" #: dbwizres.src msgctxt "" @@ -5894,7 +5893,7 @@ "RID_AGENDAWIZARDDIALOG_START +89\n" "string.text" msgid "Colorful" -msgstr "" +msgstr "رەڭلىك" #: dbwizres.src msgctxt "" @@ -5910,7 +5909,7 @@ "RID_AGENDAWIZARDDIALOG_START +91\n" "string.text" msgid "Green" -msgstr "" +msgstr "يېشىل" #: dbwizres.src msgctxt "" @@ -5918,7 +5917,7 @@ "RID_AGENDAWIZARDDIALOG_START +92\n" "string.text" msgid "Grey" -msgstr "" +msgstr "كۈلرەڭ" #: dbwizres.src msgctxt "" @@ -5934,7 +5933,7 @@ "RID_AGENDAWIZARDDIALOG_START +94\n" "string.text" msgid "Orange" -msgstr "" +msgstr "قىزغۇچ سېرىق" #: dbwizres.src msgctxt "" @@ -5942,7 +5941,7 @@ "RID_AGENDAWIZARDDIALOG_START +95\n" "string.text" msgid "Red" -msgstr "" +msgstr "قىزىل" #: dbwizres.src msgctxt "" @@ -5950,4 +5949,4 @@ "RID_AGENDAWIZARDDIALOG_START +96\n" "string.text" msgid "Simple" -msgstr "" +msgstr "ئاددىي" diff -Nru libreoffice-5.0.2/translations/source/ug/xmlsecurity/source/component.po libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/source/component.po --- libreoffice-5.0.2/translations/source/ug/xmlsecurity/source/component.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/source/component.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,17 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2011-04-06 04:12+0200\n" -"Last-Translator: Andras \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2016-01-02 16:18+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ug\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1451751506.000000\n" #: warnbox.src msgctxt "" @@ -21,4 +22,4 @@ "RID_XMLSECWB_NO_MOZILLA_PROFILE\n" "string.text" msgid "Digital signatures functionality could not be used, because no Mozilla user profile was found. Please check the Mozilla installation." -msgstr "" +msgstr "رەقەملىك ئىمزا ئىقتىدارىنى ئىشلەتكىلى بولمايدۇ، سەۋەبى Mozilla نىڭ ئىشلەتكۈچى سەپلەش ھۆججىتى تېپىلمىدى. Mozilla قاچىلاشنى تەكشۈرۈڭ." diff -Nru libreoffice-5.0.2/translations/source/ug/xmlsecurity/source/dialogs.po libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/source/dialogs.po --- libreoffice-5.0.2/translations/source/ug/xmlsecurity/source/dialogs.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/source/dialogs.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2016-01-02 16:20+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1451751613.000000\n" #: certificateviewer.src msgctxt "" @@ -138,6 +138,9 @@ "\n" "Save document in ODF 1.2 format and add all desired signatures again." msgstr "" +"بۇ پۈتۈكتە ODF 1.1 (OpenOffice.org 2.x) پىچىمىدىكى ئىمزا بار. %PRODUCTNAME %PRODUCTVERSION دىكى ئىمزالىق پۈتۈك ODF 1.2 پىچىمىدىكى نەشرىگە ئېھتىياجلىق. شۇڭلاشقا، مەزكۇر پۈتۈككە ئىمزا قوشۇپ ياكى چىقىرىۋېتەلمەيسىز.\n" +"\n" +"پۈتۈكنى ODF 1.2 پىچىمىدا ساقلاپ لازىملىق ئىمزانى قايتىدىن قوشۇڭ." #: digitalsignaturesdialog.src msgctxt "" @@ -148,3 +151,5 @@ "Adding or removing a macro signature will remove all document signatures.\n" "Do you really want to continue?" msgstr "" +"ماكرو ئىمزاسى قوشۇلسا ياكى ئۆچۈرۈلسە، پۈتكۈل پۈتۈكنىڭ ئىمزاسى ئۆچۈرۈلىدۇ.\n" +"راستىنلا داۋاملاشتۇرامسىز؟" diff -Nru libreoffice-5.0.2/translations/source/ug/xmlsecurity/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ug/xmlsecurity/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ug/xmlsecurity/uiconfig/ui.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2014-03-11 10:16+0000\n" +"PO-Revision-Date: 2016-01-02 16:24+0000\n" "Last-Translator: Abduqadir Abliz \n" "Language-Team: LANGUAGE \n" "Language: ug\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1394533001.000000\n" +"X-POOTLE-MTIME: 1451751868.000000\n" #: certgeneral.ui msgctxt "" @@ -23,7 +23,7 @@ "label\n" "string.text" msgid "Certificate Information" -msgstr "" +msgstr "گۇۋاھنامە ئۇچۇرى" #: certgeneral.ui msgctxt "" @@ -32,27 +32,25 @@ "label\n" "string.text" msgid "This certificate is validated." -msgstr "" +msgstr "بۇ گۇۋاھنامە دەلىللەنگەن." #: certgeneral.ui -#, fuzzy msgctxt "" "certgeneral.ui\n" "label3\n" "label\n" "string.text" msgid "Issued to: " -msgstr "تارقىتىلغۇچى" +msgstr "تارقىتىلغۇچى: " #: certgeneral.ui -#, fuzzy msgctxt "" "certgeneral.ui\n" "issued_by\n" "label\n" "string.text" msgid "Issued by: " -msgstr "تارقاتقۇچى" +msgstr "تارقاتقۇچى: " #: certgeneral.ui msgctxt "" @@ -61,7 +59,7 @@ "label\n" "string.text" msgid "Valid from:" -msgstr "" +msgstr "ئىناۋەتلىك مۇددەت باشلىنىشى:" #: certgeneral.ui msgctxt "" @@ -70,7 +68,7 @@ "label\n" "string.text" msgid "You have a private key that corresponds to this certificate." -msgstr "" +msgstr "بۇ گۇۋاھنامىگە ماس خاس شىفىرلىق ئاچقۇچىڭىز بار." #: certgeneral.ui msgctxt "" @@ -79,7 +77,7 @@ "label\n" "string.text" msgid "Valid to:" -msgstr "" +msgstr "ئىناۋەتلىك مۇددەت ئاخىرلىشىشى:" #: certpage.ui msgctxt "" @@ -88,7 +86,7 @@ "label\n" "string.text" msgid "Certification path" -msgstr "" +msgstr "گۇۋاھنامە يولى" #: certpage.ui msgctxt "" @@ -106,7 +104,7 @@ "label\n" "string.text" msgid "Certification status" -msgstr "" +msgstr "گۇۋاھنامە ھالىتى" #: certpage.ui msgctxt "" @@ -115,17 +113,16 @@ "label\n" "string.text" msgid "The certificate is OK." -msgstr "" +msgstr "گۇۋاھنامە توغرا." #: certpage.ui -#, fuzzy msgctxt "" "certpage.ui\n" "certnotok\n" "label\n" "string.text" msgid "The certificate could not be validated." -msgstr "گۇۋاھنامىنى دەلىللىيەلمىدى" +msgstr "گۇۋاھنامىنى دەلىللىيەلمىدى." #: digitalsignaturesdialog.ui msgctxt "" @@ -375,7 +372,6 @@ msgstr "ئىناۋەتلىك قەرەلى" #: securitytrustpage.ui -#, fuzzy msgctxt "" "securitytrustpage.ui\n" "label3\n" @@ -403,7 +399,6 @@ msgstr "قوش(_D)…" #: securitytrustpage.ui -#, fuzzy msgctxt "" "securitytrustpage.ui\n" "label4\n" @@ -449,14 +444,13 @@ msgstr "ئىناۋەتلىك قەرەلى" #: selectcertificatedialog.ui -#, fuzzy msgctxt "" "selectcertificatedialog.ui\n" "label1\n" "label\n" "string.text" msgid "Select the certificate you want to use for signing:" -msgstr "ئىمزا قويۇشقا ئىشلىتىدىغان گۇۋاھنامىنى تاللاڭ" +msgstr "ئىمزا قويۇشقا ئىشلىتىدىغان گۇۋاھنامىنى تاللاڭ:" #: selectcertificatedialog.ui msgctxt "" @@ -468,14 +462,13 @@ msgstr "گۇۋاھنامە كۆرسەت…" #: viewcertdialog.ui -#, fuzzy msgctxt "" "viewcertdialog.ui\n" "ViewCertDialog\n" "title\n" "string.text" msgid "View Certificate" -msgstr "گۇۋاھنامە كۆرسەت…" +msgstr "گۇۋاھنامە كۆرسەت" #: viewcertdialog.ui msgctxt "" @@ -484,7 +477,7 @@ "label\n" "string.text" msgid "General" -msgstr "" +msgstr "ئادەتتىكى" #: viewcertdialog.ui msgctxt "" @@ -493,7 +486,7 @@ "label\n" "string.text" msgid "Details" -msgstr "" +msgstr "تەپسىلاتلار" #: viewcertdialog.ui msgctxt "" @@ -502,4 +495,4 @@ "label\n" "string.text" msgid "Certification Path" -msgstr "" +msgstr "گۇۋاھنامە يولى" diff -Nru libreoffice-5.0.2/translations/source/uk/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/uk/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/uk/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-22 19:44+0000\n" -"Last-Translator: Андрій Бандура \n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: uk\n" "MIME-Version: 1.0\n" @@ -179,12 +179,13 @@ msgstr "%PRODUCTNAME — це сучасний, з відкритим кодом, простий у використанні засіб обробки тексту, електронних таблиць, презентацій тощо." #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "Copyright © 2000 - 2015 учасники громади LibreOffice." #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/uk/extensions/uiconfig/sabpilot/ui.po libreoffice-5.0.5~rc2/translations/source/uk/extensions/uiconfig/sabpilot/ui.po --- libreoffice-5.0.2/translations/source/uk/extensions/uiconfig/sabpilot/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/extensions/uiconfig/sabpilot/ui.po 2016-02-04 16:41:28.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-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-22 19:44+0000\n" +"PO-Revision-Date: 2015-09-19 05:50+0000\n" "Last-Translator: Андрій Бандура \n" "Language-Team: LANGUAGE \n" "Language: uk\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1440272697.000000\n" +"X-POOTLE-MTIME: 1442641821.000000\n" #: contentfieldpage.ui msgctxt "" @@ -121,14 +121,13 @@ msgstr "Вбудувати в поточний документ визначення цієї адресної книги." #: datasourcepage.ui -#, fuzzy msgctxt "" "datasourcepage.ui\n" "locationft\n" "label\n" "string.text" msgid "Location" -msgstr "Розташування" +msgstr "Місце розташування" #: datasourcepage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/uk/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/uk/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-15 01:51+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-25 10:05+0000\n" +"Last-Translator: Olexandr Pylypchuk \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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439603513.000000\n" +"X-POOTLE-MTIME: 1445767528.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -104,7 +104,7 @@ "MIDDLE_DOT\n" "LngText.text" msgid "middle dot" -msgstr "" +msgstr "крапка посередині" #. × (U+000D7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -113,7 +113,7 @@ "MULTIPLICATION_SIGN\n" "LngText.text" msgid "x" -msgstr "" +msgstr "x" #. Α (U+00391), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -662,7 +662,7 @@ "PRIME\n" "LngText.text" msgid "prime" -msgstr "" +msgstr "штрих" #. ″ (U+02033), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -878,7 +878,7 @@ "LEFTWARDS_DOUBLE_ARROW\n" "LngText.text" msgid "W2" -msgstr "" +msgstr "З2" #. ⇑ (U+021D1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -887,7 +887,7 @@ "UPWARDS_DOUBLE_ARROW\n" "LngText.text" msgid "N2" -msgstr "" +msgstr "Пн2" #. ⇒ (U+021D2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -896,7 +896,7 @@ "RIGHTWARDS_DOUBLE_ARROW\n" "LngText.text" msgid "E2" -msgstr "" +msgstr "Сх2" #. ⇓ (U+021D3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -905,7 +905,7 @@ "DOWNWARDS_DOUBLE_ARROW\n" "LngText.text" msgid "S2" -msgstr "" +msgstr "Пд2" #. ⇔ (U+021D4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -914,7 +914,7 @@ "LEFT_RIGHT_DOUBLE_ARROW\n" "LngText.text" msgid "EW2" -msgstr "" +msgstr "СхЗх2" #. ⇕ (U+021D5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -923,7 +923,7 @@ "UP_DOWN_DOUBLE_ARROW\n" "LngText.text" msgid "NS2" -msgstr "" +msgstr "ПнПд2" #. ⇖ (U+021D6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -932,7 +932,7 @@ "NORTH_WEST_DOUBLE_ARROW\n" "LngText.text" msgid "NW2" -msgstr "" +msgstr "ПнЗх2" #. ⇗ (U+021D7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -941,7 +941,7 @@ "NORTH_EAST_DOUBLE_ARROW\n" "LngText.text" msgid "NE2" -msgstr "" +msgstr "ПнСх2" #. ⇘ (U+021D8), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -950,7 +950,7 @@ "SOUTH_EAST_DOUBLE_ARROW\n" "LngText.text" msgid "SE2" -msgstr "" +msgstr "ПдСх2" #. ⇙ (U+021D9), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -959,7 +959,7 @@ "SOUTH_WEST_DOUBLE_ARROW\n" "LngText.text" msgid "SW2" -msgstr "" +msgstr "ПдЗх2" #. ∀ (U+02200), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -968,7 +968,7 @@ "FOR_ALL\n" "LngText.text" msgid "for all" -msgstr "" +msgstr "для всіх" #. ∂ (U+02202), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -977,7 +977,7 @@ "PARTIAL_DIFFERENTIAL\n" "LngText.text" msgid "partial" -msgstr "" +msgstr "часткова похідна" #. ∃ (U+02203), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -986,7 +986,7 @@ "THERE_EXISTS\n" "LngText.text" msgid "exists" -msgstr "" +msgstr "існує" #. ∄ (U+02204), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -995,7 +995,7 @@ "THERE_DOES_NOT_EXIST\n" "LngText.text" msgid "not exists" -msgstr "" +msgstr "не існує" #. ∅ (U+02205), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1004,7 +1004,7 @@ "EMPTY_SET\n" "LngText.text" msgid "empty set" -msgstr "" +msgstr "порожня множина" #. ∈ (U+02208), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1013,7 +1013,7 @@ "ELEMENT_OF\n" "LngText.text" msgid "in" -msgstr "" +msgstr "належить" #. ∉ (U+02209), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1022,7 +1022,7 @@ "NOT_AN_ELEMENT_OF\n" "LngText.text" msgid "not in" -msgstr "" +msgstr "не належить" #. ∊ (U+0220A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1031,7 +1031,7 @@ "SMALL_ELEMENT_OF\n" "LngText.text" msgid "small in" -msgstr "" +msgstr "мале належить" #. ∋ (U+0220B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1040,7 +1040,7 @@ "CONTAINS_AS_MEMBER\n" "LngText.text" msgid "ni" -msgstr "" +msgstr "містить" #. ∌ (U+0220C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1049,7 +1049,7 @@ "DOES_NOT_CONTAIN_AS_MEMBER\n" "LngText.text" msgid "not ni" -msgstr "" +msgstr "не містить" #. ∍ (U+0220D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1058,7 +1058,7 @@ "SMALL_CONTAINS_AS_MEMBER\n" "LngText.text" msgid "small ni" -msgstr "" +msgstr "мале містить" #. ∎ (U+0220E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1067,7 +1067,7 @@ "END_OF_PROOF\n" "LngText.text" msgid "end of proof" -msgstr "" +msgstr "кінець доведення" #. ∏ (U+0220F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1076,7 +1076,7 @@ "N-ARY_PRODUCT\n" "LngText.text" msgid "product" -msgstr "" +msgstr "добуток" #. ∑ (U+02211), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1085,17 +1085,16 @@ "N-ARY_SUMMATION\n" "LngText.text" msgid "sum" -msgstr "" +msgstr "сума" #. − (U+02212), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MINUS_SIGN\n" "LngText.text" msgid "-" -msgstr "-" +msgstr "- " #. ∓ (U+02213), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1104,7 +1103,7 @@ "MINUS-OR-PLUS_SIGN\n" "LngText.text" msgid "-+" -msgstr "" +msgstr "-+" #. ∕ (U+02215), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1133,7 +1132,7 @@ "SQUARE_ROOT\n" "LngText.text" msgid "sqrt" -msgstr "" +msgstr "корінь" #. ∛ (U+0221B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1142,7 +1141,7 @@ "CUBE_ROOT\n" "LngText.text" msgid "cube root" -msgstr "" +msgstr "кубічний корінь" #. ∜ (U+0221C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1151,7 +1150,7 @@ "FOURTH_ROOT\n" "LngText.text" msgid "fourth root" -msgstr "" +msgstr "корінь четвертого степеня" #. ∞ (U+0221E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1160,7 +1159,7 @@ "INFINITY\n" "LngText.text" msgid "infinity" -msgstr "" +msgstr "нескінченність" #. ∠ (U+02220), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1169,7 +1168,7 @@ "ANGLE\n" "LngText.text" msgid "angle" -msgstr "" +msgstr "кут" #. ∡ (U+02221), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1178,7 +1177,7 @@ "MEASURED_ANGLE\n" "LngText.text" msgid "angle2" -msgstr "" +msgstr "кут2" #. ∣ (U+02223), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1187,7 +1186,7 @@ "DIVIDES\n" "LngText.text" msgid "divides" -msgstr "" +msgstr "ділиться" #. ∤ (U+02224), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1196,7 +1195,7 @@ "DOES_NOT_DIVIDE\n" "LngText.text" msgid "not divides" -msgstr "" +msgstr "не ділиться" #. ∥ (U+02225), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1205,7 +1204,7 @@ "PARALLEL_TO\n" "LngText.text" msgid "parallel" -msgstr "" +msgstr "паралельно" #. ∦ (U+02226), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1214,7 +1213,7 @@ "NOT_PARALLEL_TO\n" "LngText.text" msgid "nparallel" -msgstr "" +msgstr "не паралельне" #. ∧ (U+02227), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1223,7 +1222,7 @@ "LOGICAL_AND\n" "LngText.text" msgid "and" -msgstr "" +msgstr "та" #. ∨ (U+02228), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1232,7 +1231,7 @@ "LOGICAL_OR\n" "LngText.text" msgid "or" -msgstr "" +msgstr "або" #. ∩ (U+02229), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1241,7 +1240,7 @@ "INTERSECTION\n" "LngText.text" msgid "intersection" -msgstr "" +msgstr "перетин" #. ∪ (U+0222A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1250,7 +1249,7 @@ "UNION\n" "LngText.text" msgid "union" -msgstr "" +msgstr "об'єднання" #. ∫ (U+0222B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1259,7 +1258,7 @@ "INTEGRAL\n" "LngText.text" msgid "integral" -msgstr "" +msgstr "інтеграл" #. ∬ (U+0222C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1268,7 +1267,7 @@ "DOUBLE_INTEGRAL\n" "LngText.text" msgid "integral2" -msgstr "" +msgstr "подвійний інтеграл" #. ∭ (U+0222D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1277,7 +1276,7 @@ "TRIPLE_INTEGRAL\n" "LngText.text" msgid "integral3" -msgstr "" +msgstr "потрійний інтеграл" #. ∮ (U+0222E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1286,7 +1285,7 @@ "CONTOUR_INTEGRAL\n" "LngText.text" msgid "integral4" -msgstr "" +msgstr "криволінійний інтеграл" #. ∰ (U+02230), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1295,7 +1294,7 @@ "VOLUME_INTEGRAL\n" "LngText.text" msgid "integral5" -msgstr "" +msgstr "інтеграл за об'ємом" #. ≈ (U+02248), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1304,7 +1303,7 @@ "ALMOST_EQUAL_TO\n" "LngText.text" msgid "~" -msgstr "" +msgstr "наближено дорівнює" #. ≠ (U+02260), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1313,7 +1312,7 @@ "NOT_EQUAL_TO\n" "LngText.text" msgid "not equal" -msgstr "" +msgstr "не дорівнює" #. ≤ (U+02264), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1322,7 +1321,7 @@ "LESS-THAN_OR_EQUAL_TO\n" "LngText.text" msgid "<=" -msgstr "" +msgstr "менше або дорівнює" #. ≥ (U+02265), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1331,27 +1330,25 @@ "GREATER-THAN_OR_EQUAL_TO\n" "LngText.text" msgid ">=" -msgstr "" +msgstr "більше або дорівнює" #. ≪ (U+0226A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MUCH_LESS-THAN\n" "LngText.text" msgid "<<" -msgstr "<<" +msgstr "набагато менше" #. ≫ (U+0226B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MUCH_GREATER-THAN\n" "LngText.text" msgid ">>" -msgstr ">>" +msgstr "набагато більше" #. ⊂ (U+02282), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1360,7 +1357,7 @@ "SUBSET_OF\n" "LngText.text" msgid "subset" -msgstr "" +msgstr "підмножина" #. ⊃ (U+02283), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1369,7 +1366,7 @@ "SUPERSET_OF\n" "LngText.text" msgid "superset" -msgstr "" +msgstr "надмножина" #. ⊄ (U+02284), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1378,7 +1375,7 @@ "NOT_A_SUBSET_OF\n" "LngText.text" msgid "not subset" -msgstr "" +msgstr "не підмножина" #. ⊅ (U+02285), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1387,7 +1384,7 @@ "NOT_A_SUPERSET_OF\n" "LngText.text" msgid "not superset" -msgstr "" +msgstr "не надмножина" #. ⊿ (U+022BF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1396,7 +1393,7 @@ "RIGHT_TRIANGLE\n" "LngText.text" msgid "right triangle" -msgstr "" +msgstr "прямокутний трикутник" #. ⌚ (U+0231A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1405,7 +1402,7 @@ "WATCH\n" "LngText.text" msgid "watch" -msgstr "" +msgstr "годинник" #. ⌛ (U+0231B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1414,7 +1411,7 @@ "HOURGLASS\n" "LngText.text" msgid "hourglass" -msgstr "" +msgstr "пісочний годинник" #. ⌨ (U+02328), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1423,7 +1420,7 @@ "KEYBOARD\n" "LngText.text" msgid "keyboard" -msgstr "" +msgstr "клавіатура" #. ⏢ (U+023E2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1432,7 +1429,7 @@ "WHITE_TRAPEZIUM\n" "LngText.text" msgid "trapezium" -msgstr "" +msgstr "трапеція" #. ⏰ (U+023F0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1441,7 +1438,7 @@ "ALARM_CLOCK\n" "LngText.text" msgid "alarm clock" -msgstr "" +msgstr "будильник" #. ⏱ (U+023F1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1450,7 +1447,7 @@ "STOPWATCH\n" "LngText.text" msgid "stopwatch" -msgstr "" +msgstr "секундомір" #. ⏲ (U+023F2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1459,7 +1456,7 @@ "TIMER_CLOCK\n" "LngText.text" msgid "timer clock" -msgstr "" +msgstr "таймер" #. ⏳ (U+023F3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1468,7 +1465,7 @@ "HOURGLASS_WITH_FLOWING_SAND\n" "LngText.text" msgid "hourglass2" -msgstr "" +msgstr "пісочний годинник 2" #. ■ (U+025A0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1477,7 +1474,7 @@ "BLACK_SQUARE\n" "LngText.text" msgid "square2" -msgstr "" +msgstr "квадрат 2" #. □ (U+025A1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1486,7 +1483,7 @@ "WHITE_SQUARE\n" "LngText.text" msgid "square" -msgstr "" +msgstr "квадрат" #. ▪ (U+025AA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1495,7 +1492,7 @@ "BLACK_SMALL_SQUARE\n" "LngText.text" msgid "small square2" -msgstr "" +msgstr "малий квадрат 2" #. ▫ (U+025AB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1504,7 +1501,7 @@ "WHITE_SMALL_SQUARE\n" "LngText.text" msgid "small square" -msgstr "" +msgstr "малий квадрат" #. ▬ (U+025AC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1513,7 +1510,7 @@ "BLACK_RECTANGLE\n" "LngText.text" msgid "rectangle2" -msgstr "" +msgstr "прямокутник 2" #. ▭ (U+025AD), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1522,7 +1519,7 @@ "WHITE_RECTANGLE\n" "LngText.text" msgid "rectangle" -msgstr "" +msgstr "прямокутник" #. ▰ (U+025B0), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1531,7 +1528,7 @@ "BLACK_PARALLELOGRAM\n" "LngText.text" msgid "parallelogram2" -msgstr "" +msgstr "паралелограм 2" #. ▱ (U+025B1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1540,7 +1537,7 @@ "WHITE_PARALLELOGRAM\n" "LngText.text" msgid "parallelogram" -msgstr "" +msgstr "паралелограм" #. ▲ (U+025B2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1549,7 +1546,7 @@ "BLACK_UP-POINTING_TRIANGLE\n" "LngText.text" msgid "triangle2" -msgstr "" +msgstr "трикутник 2" #. △ (U+025B3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1558,7 +1555,7 @@ "WHITE_UP-POINTING_TRIANGLE\n" "LngText.text" msgid "triangle" -msgstr "" +msgstr "трикутник" #. ◊ (U+025CA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1567,7 +1564,7 @@ "LOZENGE\n" "LngText.text" msgid "lozenge" -msgstr "" +msgstr "ромб" #. ○ (U+025CB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1576,7 +1573,7 @@ "WHITE_CIRCLE\n" "LngText.text" msgid "circle" -msgstr "" +msgstr "коло" #. ● (U+025CF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1585,17 +1582,16 @@ "BLACK_CIRCLE\n" "LngText.text" msgid "circle2" -msgstr "" +msgstr "коло 2" #. ◦ (U+025E6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_BULLET\n" "LngText.text" msgid "bullet3" -msgstr "маркер" +msgstr "маркер 3" #. ◯ (U+025EF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1604,7 +1600,7 @@ "LARGE_CIRCLE\n" "LngText.text" msgid "large circle" -msgstr "" +msgstr "велике коло" #. ◻ (U+025FB), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1613,7 +1609,7 @@ "WHITE_MEDIUM_SQUARE\n" "LngText.text" msgid "medium square" -msgstr "" +msgstr "середній квадрат" #. ◼ (U+025FC), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1622,7 +1618,7 @@ "BLACK_MEDIUM_SQUARE\n" "LngText.text" msgid "medium square2" -msgstr "" +msgstr "середній квадрат 2" #. ◽ (U+025FD), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1631,7 +1627,7 @@ "WHITE_MEDIUM_SMALL_SQUARE\n" "LngText.text" msgid "smaller square" -msgstr "" +msgstr "менший квадрат" #. ◾ (U+025FE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1640,7 +1636,7 @@ "BLACK_MEDIUM_SMALL_SQUARE\n" "LngText.text" msgid "smaller square2" -msgstr "" +msgstr "менший квадрат 2" #. ☀ (U+02600), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1649,7 +1645,7 @@ "BLACK_SUN_WITH_RAYS\n" "LngText.text" msgid "sunny" -msgstr "" +msgstr "сонячно" #. ☁ (U+02601), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1658,7 +1654,7 @@ "CLOUD\n" "LngText.text" msgid "cloud" -msgstr "" +msgstr "хмара" #. ☂ (U+02602), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1667,7 +1663,7 @@ "UMBRELLA\n" "LngText.text" msgid "umbrella" -msgstr "" +msgstr "парасолька" #. ☃ (U+02603), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1676,7 +1672,7 @@ "SNOWMAN\n" "LngText.text" msgid "snowman" -msgstr "" +msgstr "сніговик" #. ☄ (U+02604), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1685,7 +1681,7 @@ "COMET\n" "LngText.text" msgid "comet" -msgstr "" +msgstr "комета" #. ★ (U+02605), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1694,7 +1690,7 @@ "BLACK_STAR\n" "LngText.text" msgid "star" -msgstr "" +msgstr "зірка" #. ☆ (U+02606), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -1703,7 +1699,7 @@ "WHITE_STAR\n" "LngText.text" msgid "star2" -msgstr "" +msgstr "зірка 2" #. ☇ (U+02607), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf diff -Nru libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/scalc/01.po libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/scalc/01.po --- libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/scalc/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/scalc/01.po 2016-02-04 16:41:28.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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-13 22:10+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-12-22 23:34+0000\n" +"Last-Translator: Olexandr Pylypchuk \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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439503850.000000\n" +"X-POOTLE-MTIME: 1450827246.000000\n" #: 01120000.xhp msgctxt "" @@ -28118,7 +28118,7 @@ "tit\n" "help.text" msgid "Add-in for Programming in $[officename] Calc" -msgstr "" +msgstr "Надбудова для програмування в $[officename] Calc" #: 04060112.xhp msgctxt "" @@ -28135,7 +28135,7 @@ "1\n" "help.text" msgid "Add-in for Programming in $[officename] Calc" -msgstr "" +msgstr "Надбудова для програмування в $[officename] Calc" #: 04060112.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-13 23:08+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -545,12 +545,13 @@ msgstr "" #: 01010001.xhp +#, fuzzy msgctxt "" "01010001.xhp\n" "par_id3149828\n" "help.text" msgid "Navigator for Master Documents" -msgstr "" +msgstr "Складений документ" #: 01010100.xhp msgctxt "" @@ -3814,13 +3815,14 @@ msgstr "Перемістити комірки " #: 01100400.xhp +#, fuzzy msgctxt "" "01100400.xhp\n" "par_id3156114\n" "31\n" "help.text" msgid "Number of cells with content in the file. " -msgstr "" +msgstr "Приведення " #: 01100400.xhp #, fuzzy @@ -3871,13 +3873,14 @@ msgstr "Скасувати " #: 01100400.xhp +#, fuzzy msgctxt "" "01100400.xhp\n" "par_id3156156\n" "12\n" "help.text" msgid "Number of paragraphs (including blank paragraphs) in the file. " -msgstr "" +msgstr "Приведення " #: 01100400.xhp #, fuzzy @@ -5433,13 +5436,14 @@ msgstr "Складений документ" #: 01160000.xhp +#, fuzzy msgctxt "" "01160000.xhp\n" "hd_id3153345\n" "6\n" "help.text" msgid "Create HTML Document" -msgstr "" +msgstr "Складений документ" #: 01160000.xhp msgctxt "" @@ -6049,12 +6053,13 @@ msgstr "Повторити " #: 02030000.xhp +#, fuzzy msgctxt "" "02030000.xhp\n" "bm_id3150279\n" "help.text" msgid "repeating; commandscommands; repeating" -msgstr "" +msgstr "буфер обміну; Unixкопіювання; в Unix" #: 02030000.xhp msgctxt "" @@ -11107,7 +11112,7 @@ "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "" #: 02220000.xhp @@ -13129,12 +13134,13 @@ msgstr "" #: 03040000.xhp +#, fuzzy msgctxt "" "03040000.xhp\n" "bm_id3159079\n" "help.text" msgid "IME;showing/hidinginput method window" -msgstr "" +msgstr "скасування;змінизміни;скасування" #: 03040000.xhp msgctxt "" @@ -15788,12 +15794,13 @@ msgstr "" #: 05020300.xhp +#, fuzzy msgctxt "" "05020300.xhp\n" "par_id3145364\n" "help.text" msgid "Number format codes" -msgstr "" +msgstr "Нетипові властивості" #: 05020300.xhp #, fuzzy @@ -23298,12 +23305,13 @@ msgstr "" #: 05080000.xhp +#, fuzzy msgctxt "" "05080000.xhp\n" "bm_id3152942\n" "help.text" msgid "aligning; text objectstext objects; alignment" -msgstr "" +msgstr "буфер обміну; Unixкопіювання; в Unix" #: 05080000.xhp msgctxt "" @@ -23952,12 +23960,13 @@ msgstr "" #: 05110300.xhp +#, fuzzy msgctxt "" "05110300.xhp\n" "bm_id3150756\n" "help.text" msgid "characters;underliningunderlining;characters" -msgstr "" +msgstr "скасування;змінизміни;скасування" #: 05110300.xhp msgctxt "" @@ -24108,12 +24117,13 @@ msgstr "Відкрийте панель інструментів Оптимізація з панелі Таблиця і натисніть" #: 05110600m.xhp +#, fuzzy msgctxt "" "05110600m.xhp\n" "par_id3145297\n" "help.text" msgid "Icon" -msgstr "" +msgstr "піктограма" #: 05110600m.xhp msgctxt "" @@ -24341,12 +24351,13 @@ msgstr "Відкрийте панель інструментів Оптимізація з панелі Таблиця і натисніть" #: 05120600.xhp +#, fuzzy msgctxt "" "05120600.xhp\n" "par_id3145179\n" "help.text" msgid "Icon" -msgstr "" +msgstr "піктограма" #: 05120600.xhp msgctxt "" @@ -26647,12 +26658,13 @@ msgstr "" #: 05210600.xhp +#, fuzzy msgctxt "" "05210600.xhp\n" "bm_id3150014\n" "help.text" msgid "areas; shadowsshadows; areas" -msgstr "" +msgstr "скасування;змінизміни;скасування" #: 05210600.xhp msgctxt "" @@ -28128,12 +28140,13 @@ msgstr "Віддзеркалити" #: 05240000.xhp +#, fuzzy msgctxt "" "05240000.xhp\n" "bm_id3151264\n" "help.text" msgid "draw objects; flippingflipping draw objects" -msgstr "" +msgstr "скасування;змінизміни;скасування" #: 05240000.xhp msgctxt "" @@ -37087,13 +37100,14 @@ msgstr "" #: 06050600.xhp +#, fuzzy msgctxt "" "06050600.xhp\n" "hd_id3156194\n" "8\n" "help.text" msgid "Minimum space between numbering and text" -msgstr "" +msgstr "Приведення " #: 06050600.xhp msgctxt "" @@ -41232,12 +41246,13 @@ msgstr "" #: 07010000.xhp +#, fuzzy msgctxt "" "07010000.xhp\n" "bm_id6323129\n" "help.text" msgid "new windowswindows;new" -msgstr "" +msgstr "буфер обміну; Unixкопіювання; в Unix" #: 07010000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/uk/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 00:50+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -41,12 +41,13 @@ msgstr "Відображення або приховання попереднього перегляду друкованої сторінки." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Для прокрутки сторінок документа або друку використовуються значки на панелі попереднього перегляду." #: 01120000.xhp msgctxt "" @@ -65,12 +66,13 @@ msgstr "Ви не можете відредагувати документ у режимі попереднього перегляду." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Щоб вийти з режиму попереднього перегляду натисніть кнопку Закрити попередній перегляд." #: 01120000.xhp msgctxt "" @@ -3683,13 +3685,14 @@ msgstr "Затінення полів" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Показує або приховує затінювання полів документа, включаючи нерозривні пробіли, перенесення, задані користувачем, індекси та знесення." #: 03080000.xhp msgctxt "" @@ -4169,13 +4172,14 @@ msgstr "розділи;вставлення розділів за допомогою DDEDDE; команда для вставлення розділів" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Розділ" #: 04020100.xhp msgctxt "" @@ -4196,13 +4200,14 @@ msgstr "Новий розділ" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Введіть тут назву нового розділу. Типово $[officename] автоматично надає новим розділам назви \"РозділX\", де Х - черговий номер." #: 04020100.xhp msgctxt "" @@ -4223,13 +4228,14 @@ msgstr "Зв'язок" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Вставляє вміст іншого документа або розділу з іншого документа в поточний розділ." #: 04020100.xhp msgctxt "" @@ -4241,13 +4247,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Створює посилання DDE. Встановіть цей прапорець, а потім введіть команду DDE, яку необхідно використати. Параметр DDE доступний лише, коли встановлено прапорець Зв'язати." #: 04020100.xhp msgctxt "" @@ -4268,22 +4275,24 @@ msgstr "Наприклад, щоб вставити розділ \"Розділ1\" з текстового документа $[officename] abc.sxw як зв'язок DDE, використайте команду: \"soffice x:\\abc.sxw Розділ1\". Щоб вставити вміст першої комірки з електронної таблиці MS Excel \"abc.xls\", скористайтесь командою: \"excel x:\\[abc.xls]Sheet1 z1s1\". Також можна скопіювати елемент, котрий слід вставити як зв'язок DDE, і вставити Зміни - Вставити як. Для перегляду команд для зв'язків DDE виділіть вміст і виберіть Зміни - Поля." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Назва файлу / команда DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Введіть шлях та назву файлу, який потрібно вставити, або натисніть кнопку огляду (...), щоб знайти файл.Якщо встановлено прапорець DDE, то введіть команду DDE, яку буде використано. " #: 04020100.xhp msgctxt "" @@ -4412,13 +4421,14 @@ msgstr "Приховати" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Приховує вибраний розділ і запобігає його друку. Компоненти прихованих розділів затінюються у Навігаторі сірим. Якщо помістити вказівник миші у Навігаторі на прихований компонент, то з'явиться підказка \"прихований\"." #: 04020100.xhp msgctxt "" @@ -4439,13 +4449,14 @@ msgstr "За умови" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Введіть умову, при виконанні якої розділ буде приховано. Умова - це логічний вираз, наприклад, \"ВІТАННЯ EQ Пан\". Наприклад, якщо для визначення поля бази даних, яке має назву \"Вітання\" і містить \"Пане\", \"Пані\" або \"Шановні\", використовується функція стандартного листа розсилання листів, то можна вказати, що цей розділ має друкуватися, лише якщо вітання має вигляд \"Пане\"." #: 04020100.xhp msgctxt "" @@ -8335,12 +8346,13 @@ msgstr "Введіть назву визначеного користувачем поля, яке потрібно створити." #: 04090005.xhp +#, fuzzy msgctxt "" "04090005.xhp\n" "par_id0903200802243951\n" "help.text" msgid "Enter the contents that you want to add to a user-defined field." -msgstr "" +msgstr "Введіть вміст, який ви хочете додати у користувацькі поля." #: 04090005.xhp msgctxt "" @@ -8360,20 +8372,22 @@ msgstr "Вибір" #: 04090005.xhp +#, fuzzy msgctxt "" "04090005.xhp\n" "par_id7453535\n" "help.text" msgid "Lists the available fields for the field type selected in the Type list. To insert a field, click the field, and then click Insert." -msgstr "" +msgstr "Містить перелік доступних полів вибраного типу у списку Тип. Щоб вставити поле, клацніть його, а потім клацніть кнопку Вставити." #: 04090005.xhp +#, fuzzy msgctxt "" "04090005.xhp\n" "par_id3326822\n" "help.text" msgid "To quickly insert a field from the list, hold down Command Ctrl and double-click the field." -msgstr "" +msgstr "Щоб швидко вставити поле зі списку, утримуючи клавішу Command Ctrl, двічі клацніть поле." #: 04090005.xhp msgctxt "" @@ -8563,12 +8577,13 @@ msgstr "" #: 04090006.xhp +#, fuzzy msgctxt "" "04090006.xhp\n" "par_id090220080439090\n" "help.text" msgid "Lists the available field types. To add a field to your document, click a field type, click a field in the Select list, and then click Insert." -msgstr "" +msgstr "Виводить список доступних типів полів. Для додавання поля в документ, клацніть за типом поля, потім по полю в списку Формат, а потім натисніть кнопкуВставити." #: 04090006.xhp msgctxt "" @@ -13702,13 +13717,14 @@ msgstr "" #: 04120300.xhp +#, fuzzy msgctxt "" "04120300.xhp\n" "par_id3149172\n" "22\n" "help.text" msgid "Tips for working with bibliography entries" -msgstr "" +msgstr "Підказки для роботи з бібліографічними посиланнями." #: 04130000.xhp msgctxt "" @@ -14523,13 +14539,14 @@ msgstr "..." #: 04200000.xhp +#, fuzzy msgctxt "" "04200000.xhp\n" "par_id3154188\n" "20\n" "help.text" msgid "Locate the script file that you want to link to, and then click Insert." -msgstr "" +msgstr "Знайдіть файл, посилання на який необхідно вставити, а потім натисніть Вставити." #: 04200000.xhp msgctxt "" @@ -15713,13 +15730,14 @@ msgstr "Ширина" #: 05040500.xhp +#, fuzzy msgctxt "" "05040500.xhp\n" "par_id3152963\n" "43\n" "help.text" msgid "Enter the width of the column." -msgstr "" +msgstr " Введіть ширину конверта." #: 05040500.xhp msgctxt "" @@ -16144,15 +16162,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -17545,13 +17554,14 @@ msgstr "Зліва" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3150678\n" "36\n" "help.text" msgid "Enter the amount of space that you want between the left edge of the object and the text." -msgstr "" +msgstr "Зазначте, скільки місця слід залишити між лівим краєм конверта і полем \"Відправник\"." #: 05060200.xhp msgctxt "" @@ -17563,13 +17573,14 @@ msgstr "Справа" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3149956\n" "38\n" "help.text" msgid "Enter the amount of space that you want between the right edge of the object and the text." -msgstr "" +msgstr "Зазначте, скільки місця слід залишити між лівим краєм конверта і полем \"Відправник\"." #: 05060200.xhp msgctxt "" @@ -17581,13 +17592,14 @@ msgstr "Зверху" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3147284\n" "40\n" "help.text" msgid "Enter the amount of space that you want between the top edge of the object and the text." -msgstr "" +msgstr "Введіть, скільки місця слід залишити між верхнім краєм конверта і полем \"Відправник\"." #: 05060200.xhp msgctxt "" @@ -17599,13 +17611,14 @@ msgstr "Знизу" #: 05060200.xhp +#, fuzzy msgctxt "" "05060200.xhp\n" "par_id3157884\n" "42\n" "help.text" msgid "Enter the amount of space that you want between the bottom edge of the object and the text." -msgstr "" +msgstr "Введіть, скільки місця слід залишити між верхнім краєм конверта і полем \"Відправник\"." #: 05060201.xhp msgctxt "" @@ -18321,13 +18334,14 @@ msgstr "..." #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151373\n" "14\n" "help.text" msgid "Locate the new graphic file that you want to link to, and then click Open." -msgstr "" +msgstr "Знайдіть файл, посилання на який необхідно вставити, а потім натисніть Вставити." #: 05060300.xhp msgctxt "" @@ -19780,13 +19794,14 @@ msgstr "Справа" #: 05090100.xhp +#, fuzzy msgctxt "" "05090100.xhp\n" "par_id3154567\n" "20\n" "help.text" msgid "Aligns the right edge of the table to the right page margin." -msgstr "" +msgstr "Вирівнює лівий край таблиці за лівим полем сторінки. " #: 05090100.xhp msgctxt "" @@ -19879,13 +19894,14 @@ msgstr "" #: 05090100.xhp +#, fuzzy msgctxt "" "05090100.xhp\n" "par_id3152771\n" "32\n" "help.text" msgid "Enter the amount of space that you want to leave between the top edge of the table and the text above the table." -msgstr "" +msgstr "Вкажіть, скільки місця слід залишати між верхнім краєм конверта та полем \"Одержувач\"." #: 05090100.xhp msgctxt "" @@ -19897,13 +19913,14 @@ msgstr "" #: 05090100.xhp +#, fuzzy msgctxt "" "05090100.xhp\n" "par_id3145763\n" "34\n" "help.text" msgid "Enter the amount of space that you want to leave between the bottom edge of the table and the text below the table." -msgstr "" +msgstr "Вкажіть, скільки місця слід залишати між верхнім краєм конверта та полем \"Одержувач\"." #: 05090100.xhp msgctxt "" @@ -20022,13 +20039,14 @@ msgstr "Ширина стовпця" #: 05090200.xhp +#, fuzzy msgctxt "" "05090200.xhp\n" "par_id3159193\n" "12\n" "help.text" msgid "Enter the width that you want for the column." -msgstr "" +msgstr " Введіть ширину конверта." #: 05090200.xhp msgctxt "" @@ -23249,13 +23267,14 @@ msgstr "Редагування контурів" #: 05180000.xhp +#, fuzzy msgctxt "" "05180000.xhp\n" "hd_id3149294\n" "8\n" "help.text" msgid "First paragraph" -msgstr "" +msgstr "Приховані абзаци" #: 05180000.xhp msgctxt "" @@ -23576,13 +23595,14 @@ msgstr "" #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "Приховує абзац при виконанні зазначеної умови. Для виклику цієї функції виберіть пункти меню%PRODUCTNAME - ПараметриСервіс - Параметри - %PRODUCTNAME Writer - Знаки форматування і зніміть прапорець Поля: прихований абзац." #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/officecfg/registry/data/org/openoffice/Office/UI.po libreoffice-5.0.5~rc2/translations/source/uk/officecfg/registry/data/org/openoffice/Office/UI.po --- libreoffice-5.0.2/translations/source/uk/officecfg/registry/data/org/openoffice/Office/UI.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/officecfg/registry/data/org/openoffice/Office/UI.po 2016-02-04 16:41:28.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: 2015-09-02 14:43+0200\n" -"PO-Revision-Date: 2015-08-15 02:14+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-21 05:23+0000\n" +"Last-Translator: Андрій Бандура \n" "Language-Team: translation@linux.org.ua\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439604872.000000\n" +"X-POOTLE-MTIME: 1445405012.000000\n" #: BaseWindowState.xcu msgctxt "" @@ -21825,7 +21825,7 @@ "Label\n" "value.text" msgid "~More Fields..." -msgstr "~Додаткові поля..." +msgstr "~Інші поля..." #: WriterCommands.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/uk/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/uk/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/sc/source/ui/src.po 2016-02-04 16:41:28.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: 2015-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-08-15 02:27+0000\n" -"Last-Translator: system user <>\n" +"PO-Revision-Date: 2015-10-28 10:52+0000\n" +"Last-Translator: Olexandr Pylypchuk \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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1439605627.000000\n" +"X-POOTLE-MTIME: 1446029546.000000\n" #: condformatdlg.src msgctxt "" @@ -17281,7 +17281,7 @@ "7\n" "string.text" msgid "The standard deviation of the log normal distribution." -msgstr "Стандартне відхилення нормального логарифмічного розподілу." +msgstr "Стандартне відхилення логнормального розподілу." #: scfuncs.src msgctxt "" @@ -17362,7 +17362,7 @@ "7\n" "string.text" msgid "Standard deviation. The standard deviation of the log normal distribution." -msgstr "Стандартне відхилення. Стандартне відхилення нормального логарифмічного розподілу." +msgstr "Стандартне відхилення. Стандартне відхилення логнормального розподілу." #: scfuncs.src msgctxt "" @@ -17425,7 +17425,7 @@ "7\n" "string.text" msgid "Standard deviation. The standard deviation of the log normal distribution." -msgstr "Стандартне відхилення. Стандартне відхилення нормального логарифмічного розподілу." +msgstr "Стандартне відхилення. Стандартне відхилення логнормального розподілу." #: scfuncs.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/uk/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/uk/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-09-04 13:41+0000\n" "Last-Translator: Андрій Бандура \n" "Language-Team: none\n" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "Мінімальне значення повинно бути менше максимального." +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Власний" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/uk/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/uk/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/uk/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:46+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -737,6 +737,7 @@ msgstr "Показати _ліцензію" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/uk/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/uk/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/uk/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-05 06:51+0000\n" -"Last-Translator: Андрій \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-10-28 10:53+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1430808678.000000\n" +"X-POOTLE-MTIME: 1446029584.000000\n" #: stbctrls.src msgctxt "" @@ -48,7 +48,7 @@ "SELECTION_STANDARD\n" "menuitem.text" msgid "Standard selection" -msgstr "Стандартне відхилення" +msgstr "Стандартний вибір" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "Змінити рівень масштабу" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/uk/sw/source/ui/utlui.po libreoffice-5.0.5~rc2/translations/source/uk/sw/source/ui/utlui.po --- libreoffice-5.0.2/translations/source/uk/sw/source/ui/utlui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/sw/source/ui/utlui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-17 13:57+0200\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/uk/sw/source/uibase/ribbar.po libreoffice-5.0.5~rc2/translations/source/uk/sw/source/uibase/ribbar.po --- libreoffice-5.0.2/translations/source/uk/sw/source/uibase/ribbar.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/sw/source/uibase/ribbar.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:23+0100\n" -"PO-Revision-Date: 2014-12-15 07:51+0000\n" -"Last-Translator: Olexandr \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-10-21 05:23+0000\n" +"Last-Translator: Андрій Бандура \n" "Language-Team: LANGUAGE \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1418629860.000000\n" +"X-POOTLE-MTIME: 1445405017.000000\n" #: inputwin.src msgctxt "" @@ -397,7 +397,7 @@ "FN_INSERT_FIELD\n" "menuitem.text" msgid "More Fields..." -msgstr "Додаткові поля..." +msgstr "Інші поля..." #: workctrl.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uk/wizards/source/formwizard.po libreoffice-5.0.5~rc2/translations/source/uk/wizards/source/formwizard.po --- libreoffice-5.0.2/translations/source/uk/wizards/source/formwizard.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uk/wizards/source/formwizard.po 2016-02-04 16:41:28.000000000 +0000 @@ -4,17 +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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2015-05-06 11:13+0000\n" -"Last-Translator: Olexandr \n" +"PO-Revision-Date: 2015-10-21 05:23+0000\n" +"Last-Translator: Андрій Бандура \n" "Language-Team: LANGUAGE \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "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-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1430910824.000000\n" +"X-POOTLE-MTIME: 1445405025.000000\n" #: dbwizres.src msgctxt "" @@ -415,8 +415,8 @@ "Binary fields are always listed and selectable from the left list.\n" "If possible, they are interpreted as images." msgstr "" -"Двійкові поля завжди будуть перелічені та їх можна вибрати у списку.\n" -"Вони виводитимуться як зображення, якщо це можливо. " +"Двійкові поля завжди будуть перелічені та їх можна вибрати у списку ліворуч.\n" +"Вони виводитимуться як зображення, якщо це можливо." #: dbwizres.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uz/accessibility/source/helper.po libreoffice-5.0.5~rc2/translations/source/uz/accessibility/source/helper.po --- libreoffice-5.0.2/translations/source/uz/accessibility/source/helper.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/accessibility/source/helper.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,16 +3,17 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-05-02 00:06+0200\n" -"PO-Revision-Date: 2011-04-06 15:18+0200\n" -"Last-Translator: Anonymous Pootle User\n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-11-12 18:12+0000\n" +"Last-Translator: uzadmin \n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1447351943.000000\n" #: accessiblestrings.src msgctxt "" @@ -28,7 +29,7 @@ "STR_SVT_ACC_ACTION_EXPAND\n" "string.text" msgid "Expand" -msgstr "" +msgstr "Yoyish" #: accessiblestrings.src msgctxt "" @@ -36,7 +37,7 @@ "STR_SVT_ACC_ACTION_COLLAPSE\n" "string.text" msgid "Collapse" -msgstr "" +msgstr "Yig‘ish" #: accessiblestrings.src msgctxt "" @@ -44,7 +45,7 @@ "STR_SVT_ACC_LISTENTRY_SELCTED_STATE\n" "string.text" msgid "(Selected)" -msgstr "" +msgstr "(Tanlandi)" #: accessiblestrings.src msgctxt "" @@ -52,7 +53,7 @@ "RID_STR_ACC_NAME_PREVIEW\n" "string.text" msgid "Preview" -msgstr "" +msgstr "Ko‘rib chiqish" #: accessiblestrings.src msgctxt "" @@ -60,7 +61,7 @@ "RID_STR_ACC_ACTION_CHECK\n" "string.text" msgid "Check" -msgstr "" +msgstr "Belgilash" #: accessiblestrings.src msgctxt "" @@ -68,7 +69,7 @@ "RID_STR_ACC_ACTION_UNCHECK\n" "string.text" msgid "Uncheck" -msgstr "" +msgstr "Belgilashni olib tashlash" #: accessiblestrings.src msgctxt "" @@ -76,7 +77,7 @@ "RID_STR_ACC_ACTION_DOUBLE_CLICK\n" "string.text" msgid "Double click" -msgstr "" +msgstr "Ikki marta bosish" #: accessiblestrings.src msgctxt "" @@ -84,7 +85,7 @@ "RID_STR_ACC_SCROLLBAR_NAME_VERTICAL\n" "string.text" msgid "Vertical scroll bar" -msgstr "" +msgstr "Vertikal varaqlash paneli" #: accessiblestrings.src msgctxt "" @@ -92,7 +93,7 @@ "RID_STR_ACC_SCROLLBAR_NAME_HORIZONTAL\n" "string.text" msgid "Horizontal scroll bar" -msgstr "" +msgstr "Gorizontal varaqlash paneli" #: accessiblestrings.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uz/avmedia/source/viewer.po libreoffice-5.0.5~rc2/translations/source/uz/avmedia/source/viewer.po --- libreoffice-5.0.2/translations/source/uz/avmedia/source/viewer.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/avmedia/source/viewer.po 2016-02-04 16:41:28.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: 2015-04-22 23:40+0200\n" -"PO-Revision-Date: 2013-08-27 12:28+0000\n" -"Last-Translator: Andras Timar \n" +"PO-Revision-Date: 2015-11-12 19:47+0000\n" +"Last-Translator: uzadmin \n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377606481.000000\n" +"X-POOTLE-MTIME: 1447357645.000000\n" #: mediawindow.src msgctxt "" @@ -21,7 +21,7 @@ "AVMEDIA_STR_INSERTMEDIA_DLG\n" "string.text" msgid "Insert Audio or Video" -msgstr "" +msgstr "Audio yoki video kiritish" #: mediawindow.src msgctxt "" @@ -29,7 +29,7 @@ "AVMEDIA_STR_OPENMEDIA_DLG\n" "string.text" msgid "Open Audio and Video Dialog" -msgstr "" +msgstr "Audio va video oynasini ochish" #: mediawindow.src msgctxt "" @@ -37,7 +37,7 @@ "AVMEDIA_STR_ALL_MEDIAFILES\n" "string.text" msgid "All audio and video files" -msgstr "" +msgstr "Barcha audio va video fayllar" #: mediawindow.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uz/basic/source/classes.po libreoffice-5.0.5~rc2/translations/source/uz/basic/source/classes.po --- libreoffice-5.0.2/translations/source/uz/basic/source/classes.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/basic/source/classes.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,16 +3,17 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:01+0100\n" -"PO-Revision-Date: 2011-04-06 15:18+0200\n" -"Last-Translator: Anonymous Pootle User\n" +"POT-Creation-Date: 2015-04-22 23:41+0200\n" +"PO-Revision-Date: 2015-12-23 18:07+0000\n" +"Last-Translator: uzadmin \n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1450894046.000000\n" #: sb.src msgctxt "" @@ -984,7 +985,7 @@ "SbERR_BAD_BRACKETS & ERRCODE_RES_MASK\n" "string.text" msgid "Parentheses do not match." -msgstr "" +msgstr "Qavslar mos kelmadi." #: sb.src msgctxt "" @@ -1056,7 +1057,7 @@ "SbERR_WRONG_DIMS & ERRCODE_RES_MASK\n" "string.text" msgid "Dimension specifications do not match." -msgstr "" +msgstr "O‘lcham ko‘rsatkichlari mos kelmadi." #: sb.src msgctxt "" @@ -1092,7 +1093,7 @@ "SbERR_NO_STRINGS_ARRAYS & ERRCODE_RES_MASK\n" "string.text" msgid "Strings or arrays not permitted." -msgstr "" +msgstr "Qatorlar yoki massivlardan foydalanishga ruxsat berilmaydi. " #: sb.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uz/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/uz/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/uz/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:13+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "~Almashtirish" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Kengligi" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Kengligi" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Balandligi" #: borderpage.ui msgctxt "" @@ -4329,13 +4332,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Balandligi" #: distributionpage.ui #, fuzzy @@ -6505,13 +6509,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Nomi" #: hyperlinkdocpage.ui msgctxt "" @@ -6640,13 +6645,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Nomi" #: hyperlinkinternetpage.ui msgctxt "" @@ -6739,13 +6745,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Nomi" #: hyperlinkmailpage.ui msgctxt "" @@ -6892,13 +6899,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Nomi" #: hyperlinknewdocpage.ui msgctxt "" @@ -7718,13 +7726,14 @@ msgstr "Chiziqcha" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Uslub" #: linetabpage.ui msgctxt "" @@ -7782,13 +7791,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Kengligi" #: linetabpage.ui msgctxt "" @@ -7800,13 +7810,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Kengligi" #: linetabpage.ui msgctxt "" @@ -7872,13 +7883,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Kengligi" #: linetabpage.ui msgctxt "" @@ -10590,13 +10602,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Oʻlchami" #: optfontspage.ui #, fuzzy @@ -13226,13 +13239,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Balandligi" #: pageformatpage.ui msgctxt "" @@ -13625,13 +13639,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Balandligi" #: paragalignpage.ui msgctxt "" @@ -14654,22 +14669,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Oʻrni" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Oʻrni" #: possizetabpage.ui msgctxt "" @@ -14691,13 +14708,14 @@ msgstr "Oʻrni" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Kengligi" #: possizetabpage.ui #, fuzzy @@ -15144,22 +15162,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Oʻrni" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Oʻrni" #: rotationtabpage.ui msgctxt "" @@ -17619,57 +17639,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/uz/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/uz/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/uz/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:54+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/uz/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/uz/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/uz/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 05:40+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:05+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: uz\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431582050.000000\n" +"X-POOTLE-MTIME: 1439607921.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/uz/shell/source/win32/shlxthandler/res.po libreoffice-5.0.5~rc2/translations/source/uz/shell/source/win32/shlxthandler/res.po --- libreoffice-5.0.2/translations/source/uz/shell/source/win32/shlxthandler/res.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/shell/source/win32/shlxthandler/res.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,16 +3,17 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:01+0100\n" -"PO-Revision-Date: 2011-04-06 15:23+0200\n" -"Last-Translator: Anonymous Pootle User\n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-12-23 18:04+0000\n" +"Last-Translator: uzadmin \n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1450893862.000000\n" #: shlxthdl.ulf msgctxt "" @@ -116,7 +117,7 @@ "%GRAPHICS%\n" "LngText.text" msgid "Images" -msgstr "" +msgstr "Rasmlar" #: shlxthdl.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/uz/starmath/source.po libreoffice-5.0.5~rc2/translations/source/uz/starmath/source.po --- libreoffice-5.0.2/translations/source/uz/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/uz/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/uz/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/uz/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 12:28+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:21+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377606481.000000\n" +"X-POOTLE-MTIME: 1439608895.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/uz/tubes/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/uz/tubes/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/uz/tubes/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/uz/tubes/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,17 +2,18 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:06+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \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:40+0200\n" +"PO-Revision-Date: 2015-12-23 18:03+0000\n" +"Last-Translator: uzadmin \n" "Language-Team: LANGUAGE \n" "Language: uz\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1450893835.000000\n" #: contacts.ui msgctxt "" @@ -21,7 +22,7 @@ "label\n" "string.text" msgid "Listen" -msgstr "" +msgstr "Tinglash" #: contacts.ui msgctxt "" @@ -30,7 +31,7 @@ "label\n" "string.text" msgid "Invite" -msgstr "" +msgstr "Taklif qilish" #: contacts.ui msgctxt "" @@ -39,7 +40,7 @@ "label\n" "string.text" msgid "StartDemoSession" -msgstr "" +msgstr "StartDemoSession" #: contacts.ui msgctxt "" @@ -48,7 +49,7 @@ "label\n" "string.text" msgid "StartBuddySession" -msgstr "" +msgstr "StartBuddySession" #: contacts.ui msgctxt "" @@ -57,7 +58,7 @@ "label\n" "string.text" msgid "StartGroupSession" -msgstr "" +msgstr "StartGroupSession" #: contacts.ui msgctxt "" @@ -66,4 +67,4 @@ "label\n" "string.text" msgid "Select a contact to collaborate with" -msgstr "" +msgstr "Hamkorlik qilish uchun aloqani tanlang" diff -Nru libreoffice-5.0.2/translations/source/ve/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ve/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ve/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ve/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:17+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -428,13 +428,14 @@ msgstr "~Vhuedzedzani" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Vhuphara" #: acorreplacepage.ui msgctxt "" @@ -879,13 +880,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vhuphara" #: areatabpage.ui #, fuzzy @@ -1879,13 +1881,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Vhulapfu:" #: borderpage.ui msgctxt "" @@ -4332,13 +4335,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Vhulapfu:" #: distributionpage.ui #, fuzzy @@ -6507,13 +6511,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Dzina" #: hyperlinkdocpage.ui msgctxt "" @@ -6642,13 +6647,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Dzina" #: hyperlinkinternetpage.ui msgctxt "" @@ -6741,13 +6747,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Dzina" #: hyperlinkmailpage.ui msgctxt "" @@ -6894,13 +6901,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Dzina" #: hyperlinknewdocpage.ui msgctxt "" @@ -7716,13 +7724,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Tshitaela:" #: linetabpage.ui msgctxt "" @@ -7780,13 +7789,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vhuphara" #: linetabpage.ui msgctxt "" @@ -7798,13 +7808,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Vhuphara" #: linetabpage.ui msgctxt "" @@ -7870,13 +7881,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Vhuphara" #: linetabpage.ui msgctxt "" @@ -10589,13 +10601,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Muelo:" #: optfontspage.ui #, fuzzy @@ -13225,13 +13238,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Vhulapfu:" #: pageformatpage.ui msgctxt "" @@ -13624,13 +13638,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Vhulapfu:" #: paragalignpage.ui msgctxt "" @@ -14659,22 +14674,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Vhuimo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Vhuimo" #: possizetabpage.ui msgctxt "" @@ -14696,13 +14713,14 @@ msgstr "Vhuimo" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Vhuphara" #: possizetabpage.ui #, fuzzy @@ -15149,22 +15167,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Vhuimo" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Vhuimo" #: rotationtabpage.ui msgctxt "" @@ -17622,57 +17642,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/ve/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/ve/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/ve/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ve/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:57+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/ve/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/ve/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/ve/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ve/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 05:59+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:14+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: ve\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431583142.000000\n" +"X-POOTLE-MTIME: 1439608493.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/ve/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/ve/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/ve/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/ve/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-26 18:39+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:30+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: ve\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377542392.000000\n" +"X-POOTLE-MTIME: 1439609410.000000\n" #: stbctrls.src msgctxt "" @@ -160,14 +160,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/vi/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/vi/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/vi/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:25+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -878,13 +878,14 @@ msgstr "Tương đố_i" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Chiều _rộng:" #: areatabpage.ui #, fuzzy @@ -1538,13 +1539,14 @@ msgstr "" #: bitmaptabpage.ui +#, fuzzy msgctxt "" "bitmaptabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "_Foreground color:" -msgstr "" +msgstr "Màu nền" #: bitmaptabpage.ui #, fuzzy @@ -2033,31 +2035,34 @@ msgstr "" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "CalloutDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: calloutdialog.ui +#, fuzzy msgctxt "" "calloutdialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: calloutdialog.ui msgctxt "" @@ -2555,13 +2560,14 @@ msgstr "" #: certdialog.ui +#, fuzzy msgctxt "" "certdialog.ui\n" "label2\n" "label\n" "string.text" msgid "Select or add the correct Network Security Services Certificate directory to use for digital signatures:" -msgstr "" +msgstr "Chọn thư mục chứa dịch vụ bảo mật mạng chứa chữ ký điện tử." #: certdialog.ui #, fuzzy @@ -6526,22 +6532,24 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Tên" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Ch_o" #: hyperlinkdocpage.ui msgctxt "" @@ -6661,22 +6669,24 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Tên" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Ch_o" #: hyperlinkinternetpage.ui msgctxt "" @@ -6760,22 +6770,24 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Tên" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Ch_o" #: hyperlinkmailpage.ui msgctxt "" @@ -6914,22 +6926,24 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Tên" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "form_label\n" "label\n" "string.text" msgid "F_orm:" -msgstr "" +msgstr "Ch_o" #: hyperlinknewdocpage.ui msgctxt "" @@ -7728,22 +7742,24 @@ msgstr "Gạch" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Kiểu" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_COLOR\n" "label\n" "string.text" msgid "Colo_r:" -msgstr "" +msgstr "Màu" #: linetabpage.ui msgctxt "" @@ -7792,13 +7808,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Chiều _rộng:" #: linetabpage.ui #, fuzzy @@ -7811,13 +7828,14 @@ msgstr "Giữa" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Chiều _rộng:" #: linetabpage.ui #, fuzzy @@ -7884,13 +7902,14 @@ msgstr "Chọn..." #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Chiều _rộng:" #: linetabpage.ui #, fuzzy @@ -9489,13 +9508,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "indent\n" "label\n" "string.text" msgid "Indent:" -msgstr "" +msgstr "Căn _lề" #: numberingpositionpage.ui msgctxt "" @@ -10618,13 +10638,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Cỡ" #: optfontspage.ui msgctxt "" @@ -12309,13 +12330,14 @@ msgstr "Điều chỉnh mức bảo mật để thực thi vĩ lệnh, và chỉ định các nhà phát triển vĩ lệnh đáng tin." #: optsecuritypage.ui +#, fuzzy msgctxt "" "optsecuritypage.ui\n" "macro\n" "label\n" "string.text" msgid "Macro Securit_y..." -msgstr "" +msgstr "Bảo mật vĩ lệnh" #: optsecuritypage.ui #, fuzzy @@ -14667,31 +14689,34 @@ msgstr "Nén lại" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "PositionAndSizeDialog\n" "title\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_POSITION_SIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: positionsizedialog.ui +#, fuzzy msgctxt "" "positionsizedialog.ui\n" "RID_SVXPAGE_SWPOSSIZE\n" "label\n" "string.text" msgid "Position and Size" -msgstr "" +msgstr "Vị trí và GIãn cách" #: positionsizedialog.ui msgctxt "" @@ -14712,22 +14737,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Vị trí" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Vị trí" #: possizetabpage.ui msgctxt "" @@ -14748,13 +14775,14 @@ msgstr "Vị trí" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Chiều _rộng:" #: possizetabpage.ui #, fuzzy @@ -15203,22 +15231,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "Vị trí" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "Vị trí" #: rotationtabpage.ui msgctxt "" @@ -15649,13 +15679,14 @@ msgstr "" #: shadowtabpage.ui +#, fuzzy msgctxt "" "shadowtabpage.ui\n" "FT_DISTANCE\n" "label\n" "string.text" msgid "_Distance:" -msgstr "" +msgstr "Khoảng _cách" #: shadowtabpage.ui #, fuzzy @@ -16346,13 +16377,14 @@ msgstr "" #: swpossizepage.ui +#, fuzzy msgctxt "" "swpossizepage.ui\n" "horitoft\n" "label\n" "string.text" msgid "_to:" -msgstr "" +msgstr "Tớ_i" #: swpossizepage.ui #, fuzzy @@ -17124,13 +17156,14 @@ msgstr "Dải màu" #: transparencytabpage.ui +#, fuzzy msgctxt "" "transparencytabpage.ui\n" "FT_TRGR_TYPE\n" "label\n" "string.text" msgid "Ty_pe:" -msgstr "" +msgstr "Kiểu" #: transparencytabpage.ui #, fuzzy @@ -17687,58 +17720,3 @@ "string.text" msgid "View Layout" msgstr "Xem bố trí" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "http://vi.libreoffice.org/gioi-thieu/" - -#: backgroundpage.ui -#, fuzzy -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "Màu nền" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/vi/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/vi/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/vi/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/vi/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/vi/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/vi/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 00:03+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11030,12 +11030,13 @@ msgstr "Xem đồ họa" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "Hiển thị sơ đồ ảnh, để cho bạn nhấn vào và chỉnh sửa các điểm nóng." #: 02220000.xhp @@ -14800,13 +14801,14 @@ msgstr "Mặt chữ" #: 05020100.xhp +#, fuzzy msgctxt "" "05020100.xhp\n" "par_id3155922\n" "11\n" "help.text" msgid "Select the formatting that you want to apply." -msgstr "" +msgstr "Chọn kiểu dải màu bạn muốn tạo hay áp dụng." #: 05020100.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/vi/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/vi/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/vi/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 01:25+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "Hiển thị ô xem thử của trang đã in ra, hoặc đóng ô xem thử." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "Hãy dùng các biểu tượng nằm trên Thanh Xem thử trang để cuộn qua những trang của tài liệu, hoặc để in ra tài liệu." #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "Không thể soạn thảo tài liệu trong ô xem thử trang." #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "Để rời khỏi ô xem thử trang, nhấn vào nút Đóng ô." #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "Mở hộp thoại Trộn thư. Hộp thoại này giúp bạn in và lưu các thư theo mẫu." #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "Trong khi in ấn, thông tin cơ sở dữ liệu thì thay thế các trường cơ sở dữ liệu (bộ giữ chỗ) tương ứng. Để tìm thêm thông tin về cách chèn trường cơ sở dữ liệu, xem trang thẻ Cơ sở dữ liệu dưới mục trình đơn Chèn > Trường > Khác." #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "Lùi" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Nhảy về mục trước trong tài liệu. Để ghi rõ kiểu mục tới đó cần nhảy, nhấn vào biểu tượng Điều hướng, sau đó nhấn vào một phân loại mục (v.d. « Đồ họa »). Nhảy về mục trước trong tài liệu. Để ghi rõ kiểu mục tới đó cần nhảy, nhấn vào biểu tượng Điều hướng, sau đó nhấn vào một phân loại mục (v.d. « Đồ họa »)." #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "Tiếp" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "Nhảy tới mục kế tiếp trong tài liệu. Để ghi rõ kiểu mục tới đó cần nhảy, nhấn vào biểu tượng Điều hướng, sau đó nhấn vào một phân loại mục nào đó (v.d. « Đồ họa »). Nhảy tới mục kế tiếp trong tài liệu. Để ghi rõ kiểu mục tới đó cần nhảy, nhấn vào biểu tượng Điều hướng, sau đó nhấn vào một phân loại mục nào đó (v.d. « Đồ họa »)." #: 02110000.xhp msgctxt "" @@ -2920,12 +2925,13 @@ msgstr "Nhảy về trường trước có cùng kiểu trong tài liệu. Nút này thì chỉ hoạt động khi tài liệu chứa nhiều trường cùng kiểu." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02140000.xhp msgctxt "" @@ -2955,12 +2961,13 @@ msgstr "Nhảy tới trường kế tiếp có cùng kiểu trong tài liệu. Nút này thì chỉ hoạt động khi tài liệu chứa nhiều trường cùng kiểu." #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02140000.xhp msgctxt "" @@ -3142,12 +3149,13 @@ msgstr "Di chuyển về neo cước/kết chú trước trong tài liệu." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02150000.xhp msgctxt "" @@ -3177,12 +3185,13 @@ msgstr "Di chuyển tới neo cước/kết chú kế tiếp trong tài liệu." #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02150000.xhp msgctxt "" @@ -3382,12 +3391,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02160000.xhp msgctxt "" @@ -3417,12 +3427,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02160000.xhp msgctxt "" @@ -3487,12 +3498,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "Biểu tượng" #: 02160000.xhp msgctxt "" @@ -3688,13 +3700,14 @@ msgstr "Đánh dấu trường" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "Hiển thị hay ẩn đánh dấu trường trong tài liệu, gồm có đối với các dấu cách không ngắt, dấu nối tự chọn, chỉ mục và cước chú." #: 03080000.xhp msgctxt "" @@ -4174,13 +4187,14 @@ msgstr "phần;chèn phần theo DDEDDE; lệnh để chèn phần" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "Phần" #: 04020100.xhp msgctxt "" @@ -4201,13 +4215,14 @@ msgstr "Phần mới" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "Gõ tên cho phần mới. Mặc định là $[officename] tự động gán tên « Phần X » cho các phần mới, mà X là số thứ tự (Phần 1, Phần 2 v.v.)." #: 04020100.xhp msgctxt "" @@ -4228,13 +4243,14 @@ msgstr "Liên kết" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "Chèn nội dung hay phần của một tài liệu khác vào phần hiện tại." #: 04020100.xhp msgctxt "" @@ -4246,13 +4262,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "Tạo một liên kết DDE . Đánh dấu trong hộp chọn này, sau đó gõ lệnh DDE bạn muốn sử dụng. Tùy chọn DDE chỉ sẵn sàng nếu hộp chọn Liên kết cũng được đánh dấu." #: 04020100.xhp msgctxt "" @@ -4273,22 +4290,24 @@ msgstr "Chẳng hạn, để chèn dạng liên kết DDE một phần có tên « Phần1 » từ tài liệu văn bản $[officename] « abc.sxw », dùng lệnh « soffice x:\\abc.sxw Phần1 ». Để chèn nội dung của ô thứ nhất từ tập tin bảng tính MS Excel « abc.xls », dùng lệnh « excel x:\\[abc.xls]Sheet1 z1s1 ». Bạn cũng có thể sao chép những phần tử bạn muốn chèn dạng liên kết DDE, sau đó chọn lệnh Sửa > Dán đặc biệt. Lúc đó, bạn có thể xem câu lệnh DDE cho liên kết, bằng cách tô sáng nội dung, sau đó chọn lệnh Sửa > Trường." #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "Tên tập tin / lệnh DDE " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "Gõ đường dẫn và tên tập tin của tập tin bạn muốn chèn, hoặc bấm nút duyệt (...) để tìm tập tin.Nếu hộp chọn DDE đã được bật, nhập lệnh DDE bạn muốn sử dụng. " #: 04020100.xhp msgctxt "" @@ -4417,13 +4436,14 @@ msgstr "Ẩn" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "Ẩn phần đã chọn, cũng ngăn cản in nó. Các thành phần của phần bị ẩn thì được hiển thị màu xám trong Bộ điều hướng. Góp ý trợ giúp « bị ẩn » cũng tự mở khi con trỏ ở trên." #: 04020100.xhp msgctxt "" @@ -4444,13 +4464,14 @@ msgstr "Với điều kiện" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "Gõ điều kiện mà phải được thoả để ẩn phần. Điều kiện là một biểu thức luận lý, như « THÀNH PHỐ EQ Hà Nội ». Chẳng hạn, nếu bạn sử dụng tính năng thư mẫu trộn thư để xác định một trường cơ sở dữ liệu tên « Thành phố » mà chứa phần thành phố của địa chỉ của các khách hàng, bạn thì có khả năng xác định điều kiện rằng một phần riêng (v.d. giá đặc biệt ở nhánh địa phương) sẽ chỉ được in nếu thành phố là « Hà Nội »." #: 04020100.xhp msgctxt "" @@ -10184,13 +10205,14 @@ msgstr "Để hiển thị văn bản điều kiện dựa vào số trang:" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "Chọn lệnh Chèn > Trường > Khác, sau đó nhấn vào thẻ Hàm." #: 04090200.xhp msgctxt "" @@ -10247,13 +10269,14 @@ msgstr "Để hiển thị văn bản điều kiện dựa vào một biến tự xác định" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "Chọn lệnh Chèn > Trường > Khác, sau đó nhấn vào thẻ Biến." #: 04090200.xhp msgctxt "" @@ -10364,13 +10387,14 @@ msgstr "Phần thứ nhất của mẫu thí dụ này chèn một dấu cách vào giữa hai trường « Họ » và « Tên » trong một tài liệu, và phần thứ hai chèn văn bản dựa vào nội dung của một trường. Mẫu thí dụ này cần thiết có một nguồn dữ liệu địa chỉ được đăng ký với $[officename]." #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "Chọn lệnh Chèn > Trường > Khác, sau đó nhấn vào thẻ Cơ sở dữ liệu." #: 04090200.xhp msgctxt "" @@ -13936,13 +13960,14 @@ msgstr "Tên" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "Điền tên cho siêu liên kết." #: 04150000.xhp msgctxt "" @@ -14026,13 +14051,14 @@ msgstr "Tiêu đề" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "Điền tên cho siêu liên kết." #: 04150000.xhp msgctxt "" @@ -16149,15 +16175,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "Thẻ này không có hiệu lực trong Dàn trang in xem." - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16612,22 +16629,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "Định dạng cỡ, vị trí và các đặc tính khác của phần đồ họa đã chọn." #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "Bạn cũng có thể thay đổi một vài đặc tính của phần đồ họa đã chọn với Phím tắt." #: 05060000.xhp #, fuzzy @@ -17057,13 +17076,14 @@ msgstr "Đảo ngược các thiết lập canh lề ngang hiện tại cho các trang chẵn." #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "Bạn có thể dùng các lựa chọnĐồ họa để điều chỉnh cách bố trí của đối tượng trên các trang chẵn và lẻ." #: 05060100.xhp msgctxt "" @@ -18175,13 +18195,14 @@ msgstr "Cuộn" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "Định rõ các tùy chọn về liên kết và lật cho phần đồ họa." #: 05060300.xhp msgctxt "" @@ -18202,13 +18223,14 @@ msgstr "Thẳng đứng" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "Lật thẳng đứng phần đồ họa đã chọn." #: 05060300.xhp msgctxt "" @@ -18220,13 +18242,14 @@ msgstr "Ngang" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "Lật ngang phần đồ họa đã chọn." #: 05060300.xhp msgctxt "" @@ -18238,13 +18261,14 @@ msgstr "Trên mọi trang" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "Lật ngang phần đồ họa ở tất cả các trang." #: 05060300.xhp msgctxt "" @@ -18256,13 +18280,14 @@ msgstr "Trên các trang bên trái" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "Lật ngang phần đồ họa chỉ cho các trang chẵn." #: 05060300.xhp msgctxt "" @@ -18274,13 +18299,14 @@ msgstr "Trên các trang bên phải" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "Lật ngang phần đồ họa chỉ cho các trang lẻ. " #: 05060300.xhp msgctxt "" @@ -20998,13 +21024,14 @@ msgstr "Bề rộng" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "Điền độ rộng của đối tượng bôi đen." #: 05120200.xhp msgctxt "" @@ -22981,13 +23008,14 @@ msgstr "Mở một hộp thoại trong đó bạn có thể chấp nhận hoặc từ chối các thay đổi về chức năng Tự động Sửa. Bạn cũng có thể xem các thay đổi được làm bởi một tác giả nào đó vào một ngày tháng nào đó." #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "Chấp nhận hay Từ chối các Thay đổi Tự động Sửa, thẻ Lọc" #: 05170000.xhp msgctxt "" @@ -25873,13 +25901,14 @@ msgstr "Giãn cách" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "Điền lượng giãn cách mà bạn muốn chừa lại ở giữa các cột." #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/vi/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/vi/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/vi/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 03:15+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1248,13 +1248,14 @@ msgstr "" #: databaroptions.ui +#, fuzzy msgctxt "" "databaroptions.ui\n" "label4\n" "label\n" "string.text" msgid "Minimum:" -msgstr "" +msgstr "Tối đ_a" #: databaroptions.ui #, fuzzy @@ -1559,6 +1560,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "Tự chọn" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -3917,13 +3928,14 @@ msgstr "Bộ _ký tự" #: imoptdialog.ui +#, fuzzy msgctxt "" "imoptdialog.ui\n" "fieldft\n" "label\n" "string.text" msgid "_Field delimiter:" -msgstr "" +msgstr "Dấu tách _văn bản" #: imoptdialog.ui #, fuzzy @@ -4109,13 +4121,14 @@ msgstr "" #: insertsheet.ui +#, fuzzy msgctxt "" "insertsheet.ui\n" "nameft\n" "label\n" "string.text" msgid "Na_me:" -msgstr "" +msgstr "Tên" #: insertsheet.ui msgctxt "" @@ -5568,13 +5581,14 @@ msgstr "" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "text\n" "label\n" "string.text" msgid "Te_xt" -msgstr "" +msgstr "_Văn bản" #: pastespecial.ui msgctxt "" @@ -5640,13 +5654,14 @@ msgstr "Lựa chọn" #: pastespecial.ui +#, fuzzy msgctxt "" "pastespecial.ui\n" "none\n" "label\n" "string.text" msgid "Non_e" -msgstr "" +msgstr "Ghi chú" #: pastespecial.ui msgctxt "" @@ -5785,13 +5800,14 @@ msgstr "Tù_y chọn..." #: pivotfielddialog.ui +#, fuzzy msgctxt "" "pivotfielddialog.ui\n" "none\n" "label\n" "string.text" msgid "_None" -msgstr "" +msgstr "Ghi chú" #: pivotfielddialog.ui #, fuzzy @@ -6653,22 +6669,24 @@ msgstr "" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label4\n" "label\n" "string.text" msgid "Pa_ssword:" -msgstr "" +msgstr "_Mật khẩu" #: retypepassworddialog.ui +#, fuzzy msgctxt "" "retypepassworddialog.ui\n" "label5\n" "label\n" "string.text" msgid "Confi_rm:" -msgstr "" +msgstr "_Xác nhận" #: retypepassworddialog.ui msgctxt "" @@ -10453,13 +10471,14 @@ msgstr "" #: validationcriteriapage.ui +#, fuzzy msgctxt "" "validationcriteriapage.ui\n" "maxft\n" "label\n" "string.text" msgid "Ma_ximum:" -msgstr "" +msgstr "Tối đ_a" #: validationcriteriapage.ui msgctxt "" @@ -10840,93 +10859,3 @@ "string.text" msgid "Grouped by" msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"leftindentlabel\n" -"label\n" -"string.text" -msgid "Left _indent:" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"label\n" -"string.text" -msgid "Vertically stacked" -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_markup\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebaralignment.ui -msgctxt "" -"sidebaralignment.ui\n" -"verticallystacked\n" -"tooltip_text\n" -"string.text" -msgid "Aligns text vertically." -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellbackgroundlabel\n" -"label\n" -"string.text" -msgid "_Cell background:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellborderlabel\n" -"label\n" -"string.text" -msgid "Cell _border:" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"label\n" -"string.text" -msgid "Show cell _grid lines" -msgstr "" - -#: sidebarcellappearance.ui -msgctxt "" -"sidebarcellappearance.ui\n" -"cellgridlines\n" -"tooltip_text\n" -"string.text" -msgid "Show the grid lines of the cells." -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"categorylabel\n" -"label\n" -"string.text" -msgid "_Category:" -msgstr "" - -#: sidebarnumberformat.ui -msgctxt "" -"sidebarnumberformat.ui\n" -"negativenumbersred\n" -"label\n" -"string.text" -msgid "_Negative numbers red" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/vi/scaddins/source/analysis.po libreoffice-5.0.5~rc2/translations/source/vi/scaddins/source/analysis.po --- libreoffice-5.0.2/translations/source/vi/scaddins/source/analysis.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/scaddins/source/analysis.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/vi/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/vi/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/vi/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 06:25+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:35+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: vi\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431584735.000000\n" +"X-POOTLE-MTIME: 1439609715.000000\n" #: alienwarndialog.ui msgctxt "" @@ -625,13 +625,14 @@ msgstr "" #: helpcontrol.ui +#, fuzzy msgctxt "" "helpcontrol.ui\n" "contents\n" "label\n" "string.text" msgid "Contents" -msgstr "" +msgstr "_Bình luận" #: helpcontrol.ui msgctxt "" @@ -754,7 +755,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" @@ -2014,11 +2015,3 @@ "string.text" msgid "Existing Versions" msgstr "" - -msgctxt "" -"documentinfopage.ui\n" -"reset\n" -"label\n" -"string.text" -msgid "Reset" -msgstr "Đặt lại" diff -Nru libreoffice-5.0.2/translations/source/vi/starmath/source.po libreoffice-5.0.5~rc2/translations/source/vi/starmath/source.po --- libreoffice-5.0.2/translations/source/vi/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/vi/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/vi/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/vi/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/vi/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2014-09-21 08:36+0000\n" -"Last-Translator: serval2412 \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:49+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: vi\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1411288615.000000\n" +"X-POOTLE-MTIME: 1439610589.000000\n" #: stbctrls.src msgctxt "" @@ -158,14 +158,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/xh/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/xh/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/xh/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/xh/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:31+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -184,7 +184,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -427,13 +427,14 @@ msgstr "Susa~ubeke okunye endaweni yako" #: acorreplacepage.ui +#, fuzzy msgctxt "" "acorreplacepage.ui\n" "label2\n" "label\n" "string.text" msgid "_With:" -msgstr "" +msgstr "Ububanzi" #: acorreplacepage.ui msgctxt "" @@ -878,13 +879,14 @@ msgstr "" #: areatabpage.ui +#, fuzzy msgctxt "" "areatabpage.ui\n" "FT_X_SIZE\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: areatabpage.ui #, fuzzy @@ -1878,13 +1880,14 @@ msgstr "" #: borderpage.ui +#, fuzzy msgctxt "" "borderpage.ui\n" "rightft\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ukuphakama:" #: borderpage.ui msgctxt "" @@ -4331,13 +4334,14 @@ msgstr "" #: distributionpage.ui +#, fuzzy msgctxt "" "distributionpage.ui\n" "horright\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ukuphakama:" #: distributionpage.ui #, fuzzy @@ -6506,13 +6510,14 @@ msgstr "" #: hyperlinkdocpage.ui +#, fuzzy msgctxt "" "hyperlinkdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkdocpage.ui msgctxt "" @@ -6641,13 +6646,14 @@ msgstr "" #: hyperlinkinternetpage.ui +#, fuzzy msgctxt "" "hyperlinkinternetpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkinternetpage.ui msgctxt "" @@ -6740,13 +6746,14 @@ msgstr "" #: hyperlinkmailpage.ui +#, fuzzy msgctxt "" "hyperlinkmailpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinkmailpage.ui msgctxt "" @@ -6893,13 +6900,14 @@ msgstr "" #: hyperlinknewdocpage.ui +#, fuzzy msgctxt "" "hyperlinknewdocpage.ui\n" "name_label\n" "label\n" "string.text" msgid "N_ame:" -msgstr "" +msgstr "Amagama" #: hyperlinknewdocpage.ui msgctxt "" @@ -7713,13 +7721,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_STYLE\n" "label\n" "string.text" msgid "_Style:" -msgstr "" +msgstr "Isimbo" #: linetabpage.ui msgctxt "" @@ -7777,13 +7786,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_START_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -7795,13 +7805,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_LINE_END_WIDTH\n" "label\n" "string.text" msgid "W_idth:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -7867,13 +7878,14 @@ msgstr "" #: linetabpage.ui +#, fuzzy msgctxt "" "linetabpage.ui\n" "FT_SYMBOL_WIDTH\n" "label\n" "string.text" msgid "Widt_h:" -msgstr "" +msgstr "Ububanzi" #: linetabpage.ui msgctxt "" @@ -10586,13 +10598,14 @@ msgstr "" #: optfontspage.ui +#, fuzzy msgctxt "" "optfontspage.ui\n" "label9\n" "label\n" "string.text" msgid "_Size:" -msgstr "" +msgstr "Ubukhulu" #: optfontspage.ui #, fuzzy @@ -13222,13 +13235,14 @@ msgstr "" #: pageformatpage.ui +#, fuzzy msgctxt "" "pageformatpage.ui\n" "labelRightMargin\n" "label\n" "string.text" msgid "Right:" -msgstr "" +msgstr "Ukuphakama:" #: pageformatpage.ui msgctxt "" @@ -13621,13 +13635,14 @@ msgstr "" #: paragalignpage.ui +#, fuzzy msgctxt "" "paragalignpage.ui\n" "radioBTN_RIGHTALIGN\n" "label\n" "string.text" msgid "_Right" -msgstr "" +msgstr "Ukuphakama:" #: paragalignpage.ui msgctxt "" @@ -14655,22 +14670,24 @@ msgstr "" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "IndawoX" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "IndawoX" #: possizetabpage.ui msgctxt "" @@ -14692,13 +14709,14 @@ msgstr "IndawoX" #: possizetabpage.ui +#, fuzzy msgctxt "" "possizetabpage.ui\n" "FT_WIDTH\n" "label\n" "string.text" msgid "Wi_dth:" -msgstr "" +msgstr "Ububanzi" #: possizetabpage.ui #, fuzzy @@ -15145,22 +15163,24 @@ msgstr "" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_X\n" "label\n" "string.text" msgid "Position _X:" -msgstr "" +msgstr "IndawoX" #: rotationtabpage.ui +#, fuzzy msgctxt "" "rotationtabpage.ui\n" "FT_POS_Y\n" "label\n" "string.text" msgid "Position _Y:" -msgstr "" +msgstr "IndawoX" #: rotationtabpage.ui msgctxt "" @@ -17620,57 +17640,3 @@ "string.text" msgid "View Layout" msgstr "" - -#: aboutdialog.ui -msgctxt "" -"aboutdialog.ui\n" -"link\n" -"label\n" -"string.text" -msgid "http://www.libreoffice.org/about-us/credits/" -msgstr "" - -#: backgroundpage.ui -msgctxt "" -"backgroundpage.ui\n" -"label5\n" -"label\n" -"string.text" -msgid "Background Color" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Operating System:" -msgstr "" - -#: blackorwhitelistentrydialog.ui -msgctxt "" -"blackorwhitelistentrydialog.ui\n" -"label8\n" -"label\n" -"string.text" -msgid "Driver Version:" -msgstr "" - -#: optfltrembedpage.ui -msgctxt "" -"optfltrembedpage.ui\n" -"label4\n" -"label\n" -"string.text" -msgid "Character Background" -msgstr "" - -#: searchformatdialog.ui -msgctxt "" -"searchformatdialog.ui\n" -"background\n" -"label\n" -"string.text" -msgid "Background" -msgstr "" diff -Nru libreoffice-5.0.2/translations/source/xh/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/xh/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/xh/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/xh/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 03:18+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1539,6 +1539,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/xh/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/xh/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/xh/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/xh/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 06:48+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:35+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: xh\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431586090.000000\n" +"X-POOTLE-MTIME: 1439609746.000000\n" #: alienwarndialog.ui msgctxt "" @@ -749,7 +749,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/xh/starmath/source.po libreoffice-5.0.5~rc2/translations/source/xh/starmath/source.po --- libreoffice-5.0.2/translations/source/xh/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/xh/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/xh/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/xh/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/xh/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/xh/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 12:15+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:48+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: xh\n" "MIME-Version: 1.0\n" @@ -13,7 +13,7 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377605701.000000\n" +"X-POOTLE-MTIME: 1439610533.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zh-CN/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zh-CN/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-07-02 02:00+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-01-19 04:34+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: none\n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1435802439.000000\n" +"X-POOTLE-MTIME: 1453178062.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -177,7 +177,7 @@ "string.text" msgid "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more." msgstr "" -"%PRODUCTNAME 是一款现代化的、易用的、开放源代码的生产力套件，\n" +"%PRODUCTNAME 是一款现代化的、易用的、开放源代码的办公套件，\n" "可用于文字处理、电子表格、演示文稿等工作。" #: aboutdialog.ui @@ -186,8 +186,8 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." -msgstr "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." +msgstr "Copyright © 2000 - 2016 LibreOffice 的贡献者。" #: aboutdialog.ui msgctxt "" @@ -3787,7 +3787,7 @@ "label\n" "string.text" msgid "Keep _scale" -msgstr "保持比列(_S)" +msgstr "保持比例(_S)" #: croppage.ui msgctxt "" @@ -10839,7 +10839,7 @@ "label\n" "string.text" msgid "'re_peat character' marks" -msgstr "重复字符标记 [ヽヾゝゞ々] (_P)" +msgstr "\"重复字符\"标记 (_P)" #: optjsearchpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/dbaccess/source/ui/uno.po libreoffice-5.0.5~rc2/translations/source/zh-CN/dbaccess/source/ui/uno.po --- libreoffice-5.0.2/translations/source/zh-CN/dbaccess/source/ui/uno.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/dbaccess/source/ui/uno.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,17 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-11-20 13:02+0100\n" -"PO-Revision-Date: 2011-04-06 04:43+0200\n" -"Last-Translator: Dean \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-12-04 02:20+0000\n" +"Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1449195619.000000\n" #: copytablewizard.src msgctxt "" @@ -61,7 +62,7 @@ "STR_CTW_UNSUPPORTED_COLUMN_TYPE\n" "string.text" msgid "Unsupported source column type ($type$) at column position $pos$." -msgstr "在列 $pos$ 位置，不支持源列类型 ($type$)。" +msgstr "在列位置 $pos$ 出现了不被支持的源列类型 ($type$) 。" #: copytablewizard.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/dictionaries/en/dialog.po libreoffice-5.0.5~rc2/translations/source/zh-CN/dictionaries/en/dialog.po --- libreoffice-5.0.2/translations/source/zh-CN/dictionaries/en/dialog.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/dictionaries/en/dialog.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,18 +3,18 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2014-11-18 11:22+0100\n" -"PO-Revision-Date: 2014-12-16 05:55+0000\n" -"Last-Translator: 琨珑 \n" +"POT-Creation-Date: 2015-04-22 23:40+0200\n" +"PO-Revision-Date: 2015-09-21 00:17+0000\n" +"Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1418709331.000000\n" +"X-POOTLE-MTIME: 1442794624.000000\n" #: en_en_US.properties msgctxt "" @@ -286,7 +286,7 @@ "hlp_numsep\n" "property.text" msgid "Common (1000000 → 1,000,000) or ISO (1000000 → 1 000 000)." -msgstr "通常分隔 (1000000 → 1,000,000) 或 ISO (1000000 → 1 000 000)。" +msgstr "常规分隔 (1000000 → 1,000,000) 或 ISO (1000000 → 1 000 000)。" #: en_en_US.properties msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/extras/source/autocorr/emoji.po libreoffice-5.0.5~rc2/translations/source/zh-CN/extras/source/autocorr/emoji.po --- libreoffice-5.0.2/translations/source/zh-CN/extras/source/autocorr/emoji.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/extras/source/autocorr/emoji.po 2016-02-04 16:41:28.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-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-09-08 05:24+0000\n" +"PO-Revision-Date: 2015-11-12 01:47+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441689862.000000\n" +"X-POOTLE-MTIME: 1447292870.000000\n" #. ¢ (U+000A2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2156,7 +2156,7 @@ "GEMINI\n" "LngText.text" msgid "Gemini" -msgstr "" +msgstr "双子座" #. ♋ (U+0264B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2165,7 +2165,7 @@ "CANCER\n" "LngText.text" msgid "Cancer" -msgstr "双子座" +msgstr "巨蟹座" #. ♌ (U+0264C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2174,7 +2174,7 @@ "LEO\n" "LngText.text" msgid "Leo" -msgstr "" +msgstr "狮子座" #. ♍ (U+0264D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2183,7 +2183,7 @@ "VIRGO\n" "LngText.text" msgid "Virgo" -msgstr "" +msgstr "处女座" #. ♎ (U+0264E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2192,7 +2192,7 @@ "LIBRA\n" "LngText.text" msgid "Libra" -msgstr "" +msgstr "天秤座" #. ♏ (U+0264F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2201,7 +2201,7 @@ "SCORPIUS\n" "LngText.text" msgid "Scorpius" -msgstr "" +msgstr "天蝎座" #. ♐ (U+02650), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2210,7 +2210,7 @@ "SAGITTARIUS\n" "LngText.text" msgid "Sagittarius" -msgstr "" +msgstr "射手座" #. ♑ (U+02651), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2219,7 +2219,7 @@ "CAPRICORN\n" "LngText.text" msgid "Capricorn" -msgstr "" +msgstr "摩羯座" #. ♒ (U+02652), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2228,7 +2228,7 @@ "AQUARIUS\n" "LngText.text" msgid "Aquarius" -msgstr "" +msgstr "水瓶座" #. ♓ (U+02653), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2237,7 +2237,7 @@ "PISCES\n" "LngText.text" msgid "Pisces" -msgstr "" +msgstr "双鱼座" #. ♔ (U+02654), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2246,7 +2246,7 @@ "WHITE_CHESS_KING\n" "LngText.text" msgid "white king" -msgstr "" +msgstr "白方国王" #. ♕ (U+02655), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2255,7 +2255,7 @@ "WHITE_CHESS_QUEEN\n" "LngText.text" msgid "white queen" -msgstr "" +msgstr "白方皇后" #. ♖ (U+02656), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2264,7 +2264,7 @@ "WHITE_CHESS_ROOK\n" "LngText.text" msgid "white rook" -msgstr "" +msgstr "白方车" #. ♗ (U+02657), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2273,7 +2273,7 @@ "WHITE_CHESS_BISHOP\n" "LngText.text" msgid "white bishop" -msgstr "" +msgstr "白方象" #. ♘ (U+02658), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2282,7 +2282,7 @@ "WHITE_CHESS_KNIGHT\n" "LngText.text" msgid "white knight" -msgstr "" +msgstr "白方马" #. ♙ (U+02659), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2291,7 +2291,7 @@ "WHITE_CHESS_PAWN\n" "LngText.text" msgid "white pawn" -msgstr "" +msgstr "白方兵" #. ♚ (U+0265A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2300,7 +2300,7 @@ "BLACK_CHESS_KING\n" "LngText.text" msgid "black king" -msgstr "" +msgstr "黑方国王" #. ♛ (U+0265B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2309,7 +2309,7 @@ "BLACK_CHESS_QUEEN\n" "LngText.text" msgid "black queen" -msgstr "" +msgstr "黑方皇后" #. ♜ (U+0265C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2318,7 +2318,7 @@ "BLACK_CHESS_ROOK\n" "LngText.text" msgid "black rook" -msgstr "" +msgstr "黑方车" #. ♝ (U+0265D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2327,7 +2327,7 @@ "BLACK_CHESS_BISHOP\n" "LngText.text" msgid "black bishop" -msgstr "" +msgstr "黑方象" #. ♞ (U+0265E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2336,7 +2336,7 @@ "BLACK_CHESS_KNIGHT\n" "LngText.text" msgid "black knight" -msgstr "" +msgstr "黑方马" #. ♟ (U+0265F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2345,7 +2345,7 @@ "BLACK_CHESS_PAWN\n" "LngText.text" msgid "black pawn" -msgstr "" +msgstr "黑方兵" #. ♠ (U+02660), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2354,7 +2354,7 @@ "BLACK_SPADE_SUIT\n" "LngText.text" msgid "spades" -msgstr "" +msgstr "黑桃" #. ♡ (U+02661), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2363,7 +2363,7 @@ "WHITE_HEART_SUIT\n" "LngText.text" msgid "hearts2" -msgstr "" +msgstr "红桃2" #. ♢ (U+02662), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2372,7 +2372,7 @@ "WHITE_DIAMOND_SUIT\n" "LngText.text" msgid "diamonds2" -msgstr "" +msgstr "方块2" #. ♣ (U+02663), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2381,7 +2381,7 @@ "BLACK_CLUB_SUIT\n" "LngText.text" msgid "clubs" -msgstr "" +msgstr "梅花" #. ♤ (U+02664), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2390,7 +2390,7 @@ "WHITE_SPADE_SUIT\n" "LngText.text" msgid "spades2" -msgstr "" +msgstr "黑桃2" #. ♥ (U+02665), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2399,7 +2399,7 @@ "BLACK_HEART_SUIT\n" "LngText.text" msgid "hearts" -msgstr "" +msgstr "红桃" #. ♦ (U+02666), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2408,7 +2408,7 @@ "BLACK_DIAMOND_SUIT\n" "LngText.text" msgid "diamonds" -msgstr "" +msgstr "方块" #. ♧ (U+02667), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2417,7 +2417,7 @@ "WHITE_CLUB_SUIT\n" "LngText.text" msgid "clubs2" -msgstr "" +msgstr "梅花2" #. ♨ (U+02668), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2426,17 +2426,16 @@ "HOT_SPRINGS\n" "LngText.text" msgid "hot springs" -msgstr "" +msgstr "温泉" #. ♩ (U+02669), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "QUARTER_NOTE\n" "LngText.text" msgid "note" -msgstr "非" +msgstr "音符" #. ♪ (U+0266A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2445,7 +2444,7 @@ "EIGHTH_NOTE\n" "LngText.text" msgid "note2" -msgstr "" +msgstr "音符2" #. ♫ (U+0266B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2454,7 +2453,7 @@ "BEAMED_EIGHTH_NOTES\n" "LngText.text" msgid "notes" -msgstr "" +msgstr "全拍音符" #. ♬ (U+0266C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2463,7 +2462,7 @@ "BEAMED_SIXTEENTH_NOTES\n" "LngText.text" msgid "notes2" -msgstr "" +msgstr "全拍音符2" #. ♭ (U+0266D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2611,13 +2610,12 @@ #. ⚒ (U+02692), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "HAMMER_AND_PICK\n" "LngText.text" msgid "hammer and pick" -msgstr "锤子和镰刀" +msgstr "锤子和镰刀2" #. ⚓ (U+02693), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2626,7 +2624,7 @@ "ANCHOR\n" "LngText.text" msgid "anchor" -msgstr "" +msgstr "锚定" #. ⚔ (U+02694), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2801,43 +2799,39 @@ #. ⛄ (U+026C4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SNOWMAN_WITHOUT_SNOW\n" "LngText.text" msgid "snowman2" -msgstr "雪人" +msgstr "雪人2" #. ⛅ (U+026C5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SUN_BEHIND_CLOUD\n" "LngText.text" msgid "cloud2" -msgstr "云" +msgstr "云2" #. ⛆ (U+026C6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "RAIN\n" "LngText.text" msgid "rain2" -msgstr "雨" +msgstr "雨2" #. ⛈ (U+026C8), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "THUNDER_CLOUD_AND_RAIN\n" "LngText.text" msgid "cloud3" -msgstr "云" +msgstr "云3" #. ⛎ (U+026CE), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2940,13 +2934,12 @@ #. ⛱ (U+026F1), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "UMBRELLA_ON_GROUND\n" "LngText.text" msgid "umbrella3" -msgstr "雨伞" +msgstr "雨伞3" #. ⛲ (U+026F2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -2986,13 +2979,12 @@ #. ⛺ (U+026FA), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "TENT\n" "LngText.text" msgid "tent" -msgstr "分" +msgstr "帐篷" #. ⛷ (U+026F7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3082,7 +3074,7 @@ "TELEPHONE_LOCATION\n" "LngText.text" msgid "telephone" -msgstr "" +msgstr "电话" #. ✈ (U+02708), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3091,7 +3083,7 @@ "AIRPLANE\n" "LngText.text" msgid "airplane" -msgstr "" +msgstr "飞机" #. ✉ (U+02709), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3100,7 +3092,7 @@ "ENVELOPE\n" "LngText.text" msgid "envelope" -msgstr "" +msgstr "信封" #. ✊ (U+0270A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3109,17 +3101,16 @@ "RAISED_FIST\n" "LngText.text" msgid "fist" -msgstr "" +msgstr "拳头" #. ✋ (U+0270B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "RAISED_HAND\n" "LngText.text" msgid "hand" -msgstr "与" +msgstr "手" #. ✌ (U+0270C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3128,7 +3119,7 @@ "VICTORY_HAND\n" "LngText.text" msgid "victory" -msgstr "" +msgstr "胜利" #. ✍ (U+0270D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3137,7 +3128,7 @@ "WRITING_HAND\n" "LngText.text" msgid "writing" -msgstr "" +msgstr "书写" #. ✎ (U+0270E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3146,7 +3137,7 @@ "LOWER_RIGHT_PENCIL\n" "LngText.text" msgid "pencil" -msgstr "" +msgstr "铅笔" #. ✏ (U+0270F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3155,7 +3146,7 @@ "PENCIL\n" "LngText.text" msgid "pencil2" -msgstr "" +msgstr "铅笔2" #. ✐ (U+02710), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -3164,7 +3155,7 @@ "UPPER_RIGHT_PENCIL\n" "LngText.text" msgid "pencil3" -msgstr "" +msgstr "铅笔3" #. ✑ (U+02711), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6009,33 +6000,30 @@ #. 👇 (U+1F447), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_DOWN_POINTING_BACKHAND_INDEX\n" "LngText.text" msgid "down2" -msgstr "下" +msgstr "下2" #. 👈 (U+1F448), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_LEFT_POINTING_BACKHAND_INDEX\n" "LngText.text" msgid "left2" -msgstr "左" +msgstr "左2" #. 👉 (U+1F449), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "WHITE_RIGHT_POINTING_BACKHAND_INDEX\n" "LngText.text" msgid "right2" -msgstr "右" +msgstr "右2" #. 👊 (U+1F44A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6044,7 +6032,7 @@ "FISTED_HAND_SIGN\n" "LngText.text" msgid "fist2" -msgstr "" +msgstr "拳头2" #. 👋 (U+1F44B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6053,7 +6041,7 @@ "WAVING_HAND_SIGN\n" "LngText.text" msgid "wave" -msgstr "" +msgstr "挥手" #. 👌 (U+1F44C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6062,7 +6050,7 @@ "OK_HAND_SIGN\n" "LngText.text" msgid "ok" -msgstr "" +msgstr "ok" #. 👍 (U+1F44D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6071,7 +6059,7 @@ "THUMBS_UP_SIGN\n" "LngText.text" msgid "yes" -msgstr "" +msgstr "yes" #. 👎 (U+1F44E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6080,7 +6068,7 @@ "THUMBS_DOWN_SIGN\n" "LngText.text" msgid "no" -msgstr "" +msgstr "no" #. 👏 (U+1F44F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6089,7 +6077,7 @@ "CLAPPING_HANDS_SIGN\n" "LngText.text" msgid "clap" -msgstr "" +msgstr "拍手" #. 👐 (U+1F450), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6098,17 +6086,16 @@ "OPEN_HANDS_SIGN\n" "LngText.text" msgid "open hands" -msgstr "" +msgstr "打开双手" #. 👑 (U+1F451), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CROWN\n" "LngText.text" msgid "crown" -msgstr "皱眉" +msgstr "皇冠" #. 👒 (U+1F452), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6117,7 +6104,7 @@ "WOMANS_HAT\n" "LngText.text" msgid "hat" -msgstr "" +msgstr "帽子" #. 👓 (U+1F453), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6126,7 +6113,7 @@ "EYEGLASSES\n" "LngText.text" msgid "eyeglasses" -msgstr "" +msgstr "眼镜" #. 👔 (U+1F454), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6135,7 +6122,7 @@ "NECKTIE\n" "LngText.text" msgid "necktie" -msgstr "" +msgstr "领带" #. 👕 (U+1F455), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6144,7 +6131,7 @@ "T-SHIRT\n" "LngText.text" msgid "shirt" -msgstr "" +msgstr "衬衫" #. 👖 (U+1F456), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6153,7 +6140,7 @@ "JEANS\n" "LngText.text" msgid "jeans" -msgstr "" +msgstr "牛仔裤" #. 👗 (U+1F457), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6171,7 +6158,7 @@ "KIMONO\n" "LngText.text" msgid "kimono" -msgstr "" +msgstr "和服" #. 👙 (U+1F459), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6180,7 +6167,7 @@ "BIKINI\n" "LngText.text" msgid "bikini" -msgstr "" +msgstr "比基尼" #. 👚 (U+1F45A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6189,7 +6176,7 @@ "WOMANS_CLOTHES\n" "LngText.text" msgid "clothes" -msgstr "" +msgstr "衣服" #. 👛 (U+1F45B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6198,7 +6185,7 @@ "PURSE\n" "LngText.text" msgid "purse" -msgstr "" +msgstr "钱包" #. 👜 (U+1F45C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6207,7 +6194,7 @@ "HANDBAG\n" "LngText.text" msgid "handbag" -msgstr "" +msgstr "手包" #. 👝 (U+1F45D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6225,7 +6212,7 @@ "MANS_SHOE\n" "LngText.text" msgid "shoe" -msgstr "" +msgstr "鞋" #. 👟 (U+1F45F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6234,7 +6221,7 @@ "ATHLETIC_SHOE\n" "LngText.text" msgid "shoe2" -msgstr "" +msgstr "鞋2" #. 👠 (U+1F460), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6243,7 +6230,7 @@ "HIGH-HEELED_SHOE\n" "LngText.text" msgid "shoe3" -msgstr "" +msgstr "鞋3" #. 👡 (U+1F461), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6252,7 +6239,7 @@ "WOMANS_SANDAL\n" "LngText.text" msgid "sandal" -msgstr "" +msgstr "凉鞋" #. 👢 (U+1F462), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6261,7 +6248,7 @@ "WOMANS_BOOTS\n" "LngText.text" msgid "boot" -msgstr "" +msgstr "靴子" #. 👣 (U+1F463), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6270,7 +6257,7 @@ "FOOTPRINTS\n" "LngText.text" msgid "footprints" -msgstr "" +msgstr "脚印" #. 👤 (U+1F464), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6297,7 +6284,7 @@ "BOY\n" "LngText.text" msgid "boy" -msgstr "" +msgstr "男孩" #. 👧 (U+1F467), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6306,7 +6293,7 @@ "GIRL\n" "LngText.text" msgid "girl" -msgstr "" +msgstr "女孩" #. 👨 (U+1F468), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6315,7 +6302,7 @@ "MAN\n" "LngText.text" msgid "man" -msgstr "" +msgstr "男人" #. 👩 (U+1F469), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6324,7 +6311,7 @@ "WOMAN\n" "LngText.text" msgid "woman" -msgstr "" +msgstr "女人" #. 👪 (U+1F46A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6333,7 +6320,7 @@ "FAMILY\n" "LngText.text" msgid "family" -msgstr "" +msgstr "家庭" #. 👫 (U+1F46B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6342,7 +6329,7 @@ "MAN_AND_WOMAN_HOLDING_HANDS\n" "LngText.text" msgid "couple" -msgstr "" +msgstr "夫妻" #. 👬 (U+1F46C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6351,7 +6338,7 @@ "TWO_MEN_HOLDING_HANDS\n" "LngText.text" msgid "couple2" -msgstr "" +msgstr "夫妻2" #. 👭 (U+1F46D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6360,7 +6347,7 @@ "TWO_WOMEN_HOLDING_HANDS\n" "LngText.text" msgid "couple3" -msgstr "" +msgstr "夫妻3" #. 👮 (U+1F46E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6369,7 +6356,7 @@ "POLICE_OFFICER\n" "LngText.text" msgid "cop" -msgstr "" +msgstr "警察" #. 👯 (U+1F46F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6378,7 +6365,7 @@ "WOMAN_WITH_BUNNY_EARS\n" "LngText.text" msgid "bunny ears" -msgstr "" +msgstr "兔子耳朵" #. 👰 (U+1F470), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6387,7 +6374,7 @@ "BRIDE_WITH_VEIL\n" "LngText.text" msgid "bride" -msgstr "" +msgstr "桥" #. 👱 (U+1F471), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6396,7 +6383,7 @@ "PERSON_WITH_BLOND_HAIR\n" "LngText.text" msgid "blond hair" -msgstr "" +msgstr "金发" #. 👲 (U+1F472), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6405,7 +6392,7 @@ "MAN_WITH_GUA_PI_MAO\n" "LngText.text" msgid "hat2" -msgstr "" +msgstr "帽子2" #. 👳 (U+1F473), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6414,7 +6401,7 @@ "MAN_WITH_TURBAN\n" "LngText.text" msgid "turban" -msgstr "" +msgstr "头巾" #. 👴 (U+1F474), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6423,7 +6410,7 @@ "OLDER_MAN\n" "LngText.text" msgid "older man" -msgstr "" +msgstr "老男人" #. 👵 (U+1F475), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6432,7 +6419,7 @@ "OLDER_WOMAN\n" "LngText.text" msgid "older woman" -msgstr "" +msgstr "老女人" #. 👶 (U+1F476), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6441,7 +6428,7 @@ "BABY\n" "LngText.text" msgid "baby" -msgstr "" +msgstr "小孩" #. 👷 (U+1F477), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6450,7 +6437,7 @@ "CONSTRUCTION_WORKER\n" "LngText.text" msgid "worker" -msgstr "" +msgstr "工人" #. 👸 (U+1F478), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6459,7 +6446,7 @@ "PRINCESS\n" "LngText.text" msgid "princess" -msgstr "" +msgstr "公主" #. 👹 (U+1F479), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6486,7 +6473,7 @@ "GHOST\n" "LngText.text" msgid "ghost" -msgstr "" +msgstr "鬼" #. 👼 (U+1F47C), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6495,7 +6482,7 @@ "BABY_ANGEL\n" "LngText.text" msgid "angel" -msgstr "" +msgstr "天使" #. 👽 (U+1F47D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6535,13 +6522,12 @@ #. 💁 (U+1F481), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "INFORMATION_DESK_PERSON\n" "LngText.text" msgid "information2" -msgstr "information" +msgstr "信息2" #. 💂 (U+1F482), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6959,13 +6945,12 @@ #. 💴 (U+1F4B4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BANKNOTE_WITH_YEN_SIGN\n" "LngText.text" msgid "yen2" -msgstr "日元" +msgstr "日元2" #. 💵 (U+1F4B5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -6978,23 +6963,21 @@ #. 💶 (U+1F4B6), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BANKNOTE_WITH_EURO_SIGN\n" "LngText.text" msgid "euro2" -msgstr "euro" +msgstr "欧元2" #. 💷 (U+1F4B7), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "BANKNOTE_WITH_POUND_SIGN\n" "LngText.text" msgid "pound2" -msgstr "磅" +msgstr "磅2" #. 💸 (U+1F4B8), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7358,13 +7341,12 @@ #. 📣 (U+1F4E3), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "CHEERING_MEGAPHONE\n" "LngText.text" msgid "mega" -msgstr "Omega" +msgstr "mega" #. 📤 (U+1F4E4), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -7620,13 +7602,12 @@ #. 🔉 (U+1F509), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "SPEAKER_WITH_ONE_SOUND_WAVE\n" "LngText.text" msgid "sound" -msgstr "磅" +msgstr "声音" #. 🔊 (U+1F50A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -8908,13 +8889,12 @@ #. 🚆 (U+1F686), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "TRAIN\n" "LngText.text" msgid "train" -msgstr "雨" +msgstr "火车" #. 🚇 (U+1F687), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -10401,53 +10381,48 @@ #. ᵝ (U+01D5D), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_BETA\n" "LngText.text" msgid "^beta" -msgstr "beta" +msgstr "^beta" #. ᵞ (U+01D5E), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_GREEK_GAMMA\n" "LngText.text" msgid "^gamma" -msgstr "gamma" +msgstr "^gamma" #. ᵟ (U+01D5F), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_DELTA\n" "LngText.text" msgid "^delta" -msgstr "delta" +msgstr "^delta" #. ᵋ (U+01D4B), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_OPEN_E\n" "LngText.text" msgid "^epsilon" -msgstr "epsilon" +msgstr "^epsilon" #. ᶿ (U+01DBF), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_THETA\n" "LngText.text" msgid "^theta" -msgstr "theta" +msgstr "^theta" #. ᶥ (U+01DA5), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -10461,23 +10436,21 @@ #. ᶲ (U+01DB2), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_PHI\n" "LngText.text" msgid "^Phi" -msgstr "Phi" +msgstr "^Phi" #. ᵠ (U+01D60), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "MODIFIER_LETTER_SMALL_GREEK_PHI\n" "LngText.text" msgid "^phi" -msgstr "phi" +msgstr "^phi" #. ᵡ (U+01D61), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf @@ -10491,50 +10464,45 @@ #. ᵦ (U+01D66), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SUBSCRIPT_SMALL_LETTER_BETA\n" "LngText.text" msgid "_beta" -msgstr "beta" +msgstr "_beta" #. ᵧ (U+01D67), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SUBSCRIPT_SMALL_LETTER_GAMMA\n" "LngText.text" msgid "_gamma" -msgstr "gamma" +msgstr "_gamma" #. ᵨ (U+01D68), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SUBSCRIPT_SMALL_LETTER_RHO\n" "LngText.text" msgid "_rho" -msgstr "rho" +msgstr "_rho" #. ᵩ (U+01D69), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SUBSCRIPT_SMALL_LETTER_PHI\n" "LngText.text" msgid "_phi" -msgstr "phi" +msgstr "_phi" #. ᵪ (U+01D6A), see http://wiki.documentfoundation.org/Emoji #: emoji.ulf -#, fuzzy msgctxt "" "emoji.ulf\n" "GREEK_SUBSCRIPT_SMALL_LETTER_CHI\n" "LngText.text" msgid "_chi" -msgstr "chi" +msgstr "_chi" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-05-11 22:57+0000\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" +"PO-Revision-Date: 2015-08-14 00:28+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431385041.000000\n" +"X-POOTLE-MTIME: 1439512098.000000\n" #: 01010000.xhp msgctxt "" @@ -11024,12 +11024,13 @@ msgstr "图形视图" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "显示图像映射，以便单击并编辑热点。" #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-09-01 17:06+0000\n" "Last-Translator: Christian Lohmaier \n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "显示打印页面的预览或关闭此预览。" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "使用页面预览栏上的图标以滚动查看文档的页面或打印文档。" #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "在页面预览状态下您不能编辑文档。" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "要退出页面预览，请单击关闭预览按钮。" #: 01120000.xhp msgctxt "" @@ -3685,13 +3687,14 @@ msgstr "字段阴影" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "在文档中显示或隐藏字段阴影，包括不间断空格、自定义连字符、索引和脚注。" #: 03080000.xhp msgctxt "" @@ -4171,13 +4174,14 @@ msgstr "区域;通过 DDE 插入区域DDE; 插入区域命令" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "区域" #: 04020100.xhp msgctxt "" @@ -4198,13 +4202,14 @@ msgstr "新区域" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "键入新区域的名称。在默认情况下，$[officename] 将自动为新区域指定名称“区域 X”，其中 X 是连续的编号。" #: 04020100.xhp msgctxt "" @@ -4225,13 +4230,14 @@ msgstr "链接" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "在当前区域中插入其他文档的内容或其他文档中的区域。" #: 04020100.xhp msgctxt "" @@ -4243,13 +4249,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "创建 DDE 链接。选择此复选框，然后输入要使用的 DDE 命令。只有选中链接复选框时，DDE 选项才可用。" #: 04020100.xhp msgctxt "" @@ -4270,22 +4277,24 @@ msgstr "例如，要以 DDE 链接的形式插入 $[officename] 文本文档 abc.sxw 中名为 \"Section1\" 的区域，请使用命令：\"soffice x:\\abc.sxw Section1\"。要插入名为“abc.xls”的 MS Excel 电子表格文件中的第一个单元格内容，请使用命令：\"excel x:\\[abc.xls]Sheet1 z1s1\"。也可以复制要作为 DDE 链接插入的元素，然后选择编辑 - 选择性粘贴。此时可以通过选择该内容，然后选择编辑 - 字段，来查看用于链接的 DDE 命令。" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "文件名 / DDE 命令" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "输入要插入文件的路径和文件名，或单击浏览按钮 (...) 查找文件位置。如果已选中 DDE 复选框，请输入要使用的 DDE 命令。 " #: 04020100.xhp msgctxt "" @@ -4414,13 +4423,14 @@ msgstr "隐藏" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "隐藏选定区域，并防止选定区域被打印。隐藏区域的组件在“导航”中以灰色显示。当鼠标指标停在“导航”中的隐藏组件上时，会显示帮助提示“已隐藏”。" #: 04020100.xhp msgctxt "" @@ -4441,13 +4451,14 @@ msgstr "带条件" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "输入的条件必须满足隐藏区域的要求。条件是一个逻辑表达式，例如 \"SALUTATION EQ Mr.\"。例如，如果使用邮件合并 格式信函功能定义名为“称呼”的数据库字段（该字段包含 \"Mr.\"、\"Ms.\"、\"Sir\" 或 \"Madam\"），然后您可以指定只有在称呼为 \"Mr.\" 时才打印该区域。" #: 04020100.xhp msgctxt "" @@ -16145,15 +16156,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "此选项卡在打印版式视图中不可用。" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -23577,13 +23579,14 @@ msgstr "要在文档中直接插入不间断（受保护的）连字符，请单击要进行断字的单词，然后按 Shift+Command+Ctrl + 减号 (-) 组合键。" #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "要隐藏自定义连字符，请选择%PRODUCTNAME - 首选项工具 - 选项 - %PRODUCTNAME Writer - 格式化辅助，然后取消选择自定义连字符复选框。" #: 06030000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po libreoffice-5.0.5~rc2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po --- libreoffice-5.0.2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/instsetoo_native/inc_openoffice/windows/msi_languages.po 2016-02-04 16:41:28.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:40+0200\n" -"PO-Revision-Date: 2015-09-07 02:53+0000\n" +"PO-Revision-Date: 2016-02-01 03:16+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441594392.000000\n" +"X-POOTLE-MTIME: 1454296607.000000\n" #: ActionTe.ulf msgctxt "" @@ -990,7 +990,7 @@ "OOO_CONTROL_5\n" "LngText.text" msgid "&Look in:" -msgstr "{&Tahoma8}搜索范围(&L)：" +msgstr "搜索范围 (&L)：" #: Control.ulf msgctxt "" @@ -998,7 +998,7 @@ "OOO_CONTROL_6\n" "LngText.text" msgid "Browse to the destination folder." -msgstr "{&Tahoma8}浏览目标文件夹。" +msgstr "浏览目标文件夹。" #: Control.ulf msgctxt "" @@ -1022,7 +1022,7 @@ "OOO_CONTROL_10\n" "LngText.text" msgid "OK" -msgstr "{&Tahoma8}确定" +msgstr "确定" #: Control.ulf msgctxt "" @@ -1030,7 +1030,7 @@ "OOO_CONTROL_12\n" "LngText.text" msgid "&Folder name:" -msgstr "{&Tahoma8}文件夹名称(&F)：" +msgstr "文件夹名称(&F)：" #: Control.ulf msgctxt "" @@ -1070,7 +1070,7 @@ "OOO_CONTROL_19\n" "LngText.text" msgid "Specify a network location for the server image of the product." -msgstr "{&Tahoma8}为产品的服务器映象指定网络位置。" +msgstr "为产品的服务器映象指定网络位置。" #: Control.ulf msgctxt "" @@ -1078,7 +1078,7 @@ "OOO_CONTROL_20\n" "LngText.text" msgid "Enter the network location or click Change to browse to a location. Click Install to create a server image of [ProductName] at the specified network location or click Cancel to exit the wizard." -msgstr "{&Tahoma8}输入网络位置或单击“更改”以浏览网络位置。 单击“安装”在指定的网络位置创建 [ProductName] 的服务器映象，或单击“取消”退出向导。" +msgstr "输入网络位置或单击“更改”以浏览网络位置。 单击“安装”在指定的网络位置创建 [ProductName] 的服务器映象，或单击“取消”退出向导。" #: Control.ulf msgctxt "" @@ -1094,7 +1094,7 @@ "OOO_CONTROL_22\n" "LngText.text" msgid "&Install" -msgstr "{&Tahoma8}安装(&I)" +msgstr "安装 (&I)" #: Control.ulf msgctxt "" @@ -1102,7 +1102,7 @@ "OOO_CONTROL_23\n" "LngText.text" msgid "&Network location:" -msgstr "{&Tahoma8}网络位置(&N)：" +msgstr "网络位置 (&N)：" #: Control.ulf msgctxt "" @@ -1142,7 +1142,7 @@ "OOO_CONTROL_28\n" "LngText.text" msgid "The Installation Wizard will create a server image of [ProductName] at a specified network location. To continue, click Next." -msgstr "{&Tahoma8}Installation Wizard 将在指定的网络位置创建 [ProductName] 的服务器映象。 要继续，请单击“下一步”。" +msgstr "Installation Wizard 将在指定的网络位置创建 [ProductName] 的服务器映象。 要继续，请单击“下一步”。" #: Control.ulf msgctxt "" @@ -1150,7 +1150,7 @@ "OOO_CONTROL_29\n" "LngText.text" msgid "&No" -msgstr "{&Tahoma8}否(&N)" +msgstr "否 (&N)" #: Control.ulf msgctxt "" @@ -1158,7 +1158,7 @@ "OOO_CONTROL_30\n" "LngText.text" msgid "Are you sure you want to cancel [ProductName] installation?" -msgstr "{&Tahoma8}要取消 [ProductName] 安装吗？" +msgstr "要取消 [ProductName] 安装吗？" #: Control.ulf msgctxt "" @@ -3982,7 +3982,7 @@ "OOO_RADIOBUTTON_4\n" "LngText.text" msgid "{&MSSansBold8}&Typical" -msgstr "通常(&T)" +msgstr "常规(&T)" #: RadioBut.ulf msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po libreoffice-5.0.5~rc2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po --- libreoffice-5.0.2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/officecfg/registry/data/org/openoffice/Office.po 2016-02-04 16:41:28.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-08-06 22:51+0200\n" -"PO-Revision-Date: 2015-08-07 04:37+0000\n" +"PO-Revision-Date: 2016-01-07 01:37+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438922258.000000\n" +"X-POOTLE-MTIME: 1452130633.000000\n" #: Addons.xcu msgctxt "" @@ -1058,7 +1058,7 @@ "STR_QUALITY\n" "value.text" msgid "~Quality in %" -msgstr "质量百分比(~Q)" +msgstr "品质 % (~Q)" #: PresentationMinimizer.xcu msgctxt "" @@ -1337,7 +1337,7 @@ "STR_OPTIMIZE_IMAGES\n" "value.text" msgid "Optimize %IMAGES graphics to %QUALITY% JPEG quality at %RESOLUTION DPI." -msgstr "以 %RESOLUTION DPI 优化 %IMAGES 图形JPEG质量为 %QUALITY%。 " +msgstr "将 %IMAGES 图形优化成品质为 %QUALITY% 且 DPI 为 %RESOLUTIONJPEG 的 JPEG。" #: PresentationMinimizer.xcu msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/sc/source/ui/src.po libreoffice-5.0.5~rc2/translations/source/zh-CN/sc/source/ui/src.po --- libreoffice-5.0.2/translations/source/zh-CN/sc/source/ui/src.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/sc/source/ui/src.po 2016-02-04 16:41:28.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-09-02 14:42+0200\n" -"PO-Revision-Date: 2015-09-07 02:25+0000\n" +"PO-Revision-Date: 2016-01-29 01:31+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1441592704.000000\n" +"X-POOTLE-MTIME: 1454031086.000000\n" #: condformatdlg.src msgctxt "" @@ -185,7 +185,7 @@ "bottom 10 percent\n" "stringlist.text" msgid "bottom 10 percent" -msgstr "末 10%" +msgstr "最后 10%" #: condformatdlg.src msgctxt "" @@ -5658,7 +5658,7 @@ "STR_TABLE_COUNT\n" "string.text" msgid "Sheet %1 of %2" -msgstr "工作表 %1，共%2张" +msgstr "工作表 %1 / %2" #: hdrcont.src msgctxt "" @@ -12863,7 +12863,7 @@ "1\n" "string.text" msgid "Rounds a number to a predefined accuracy." -msgstr "按指定位数向上(沿绝对值增大的方向)舍入数字。" +msgstr "将给定的数字四舍五入到指定的精度。" #: scfuncs.src msgctxt "" @@ -12908,7 +12908,7 @@ "1\n" "string.text" msgid "Rounds a number up to the predefined accuracy." -msgstr "按指定位数来舍入数字。" +msgstr "将给定的数字向上舍入到指定的精度。" #: scfuncs.src msgctxt "" @@ -12953,7 +12953,7 @@ "1\n" "string.text" msgid "Rounds a number down to a predefined accuracy." -msgstr "按指定位数向下(沿绝对值减小的方向)舍入数字。" +msgstr "将给定的数字向下舍入到指定的精度。" #: scfuncs.src msgctxt "" @@ -13376,7 +13376,7 @@ "1\n" "string.text" msgid "Rounds number towards zero to the nearest multiple of absolute value of significance." -msgstr "" +msgstr "将数字向下舍入到离它最近的基数绝对值的倍数。" #: scfuncs.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/zh-CN/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/zh-CN/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-08-07 04:16+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2016-02-01 03:17+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: none\n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438921014.000000\n" +"X-POOTLE-MTIME: 1454296642.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "最小值必须比最大值小。" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "自定义" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" @@ -1658,7 +1667,7 @@ "5\n" "stringlist.text" msgid "% of row" -msgstr "占数据行的百分比" +msgstr "行的百分" #: datafielddialog.ui msgctxt "" @@ -1667,7 +1676,7 @@ "6\n" "stringlist.text" msgid "% of column" -msgstr "占数据列的百分比" +msgstr "列的百分比" #: datafielddialog.ui msgctxt "" @@ -1676,7 +1685,7 @@ "7\n" "stringlist.text" msgid "% of total" -msgstr "占合计的百分比" +msgstr "合计的百分比" #: datafielddialog.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/scp2/source/activex.po libreoffice-5.0.5~rc2/translations/source/zh-CN/scp2/source/activex.po --- libreoffice-5.0.2/translations/source/zh-CN/scp2/source/activex.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/scp2/source/activex.po 2016-02-04 16:41:28.000000000 +0000 @@ -2,18 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2013-05-23 12:05+0200\n" -"PO-Revision-Date: 2011-04-06 04:44+0200\n" -"Last-Translator: Dean \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: 2015-10-21 03:19+0000\n" +"Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: LibreOffice\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" +"X-POOTLE-MTIME: 1445397556.000000\n" #: module_activex.ulf msgctxt "" @@ -21,7 +22,7 @@ "STR_NAME_MODULE_OPTIONAL_ACTIVEXCONTROL\n" "LngText.text" msgid "ActiveX Control" -msgstr "ActiveX 控制" +msgstr "ActiveX 控件" #: module_activex.ulf msgctxt "" @@ -29,4 +30,4 @@ "STR_DESC_MODULE_OPTIONAL_ACTIVEXCONTROL\n" "LngText.text" msgid "Component to enable Microsoft Internet Explorer to display %PRODUCTNAME documents." -msgstr "启用 Microsoft Internet Explorer 以显示 %PRODUCTNAME 文档的组件。" +msgstr "安装该组件可在 Microsoft Internet Explorer 中显示 %PRODUCTNAME 文档。" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zh-CN/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zh-CN/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-26 00:21+0000\n" -"Last-Translator: 琨珑 锁 \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 04:03+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1437870069.000000\n" +"X-POOTLE-MTIME: 1439611433.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "显示许可证(_S)" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/svtools/source/misc.po libreoffice-5.0.5~rc2/translations/source/zh-CN/svtools/source/misc.po --- libreoffice-5.0.2/translations/source/zh-CN/svtools/source/misc.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/svtools/source/misc.po 2016-02-04 16:41:28.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-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-07 04:42+0000\n" +"PO-Revision-Date: 2015-12-04 02:59+0000\n" "Last-Translator: 琨珑 锁 \n" "Language-Team: LANGUAGE \n" "Language: zh_CN\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438922545.000000\n" +"X-POOTLE-MTIME: 1449197967.000000\n" #: imagemgr.src msgctxt "" @@ -3777,7 +3777,7 @@ "LANGUAGE_USER_VENETIAN\n" "pairedlist.text" msgid "Venetian" -msgstr "威尼斯语 [Venetian]" +msgstr "Venetian [威尼斯语]" #: svtools.src msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-CN/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/zh-CN/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/zh-CN/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-CN/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-08-07 04:30+0000\n" -"Last-Translator: 琨珑 锁 \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 04:08+0000\n" +"Last-Translator: system user <>\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-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438921802.000000\n" +"X-POOTLE-MTIME: 1439611701.000000\n" #: stbctrls.src msgctxt "" @@ -159,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "调整缩放级别" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/zh-TW/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zh-TW/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zh-TW/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" -"PO-Revision-Date: 2015-08-05 13:47+0000\n" -"Last-Translator: Cheng-Chia Tseng \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 02:47+0000\n" +"Last-Translator: system user <>\n" "Language-Team: none\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1438782445.000000\n" +"X-POOTLE-MTIME: 1439606852.000000\n" #: aboutconfigdialog.ui msgctxt "" @@ -181,12 +181,13 @@ "可用於文書處理、試算表、簡報等。" #: aboutdialog.ui +#, fuzzy msgctxt "" "aboutdialog.ui\n" "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "著作權所有 © 2000 - 2015 LibreOffice 貢獻者。" #: aboutdialog.ui diff -Nru libreoffice-5.0.2/translations/source/zh-TW/helpcontent2/source/text/shared/01.po libreoffice-5.0.5~rc2/translations/source/zh-TW/helpcontent2/source/text/shared/01.po --- libreoffice-5.0.2/translations/source/zh-TW/helpcontent2/source/text/shared/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/helpcontent2/source/text/shared/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-08-06 22:51+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 00:35+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -11032,12 +11032,13 @@ msgstr "圖形檢視" #: 02220000.xhp +#, fuzzy msgctxt "" "02220000.xhp\n" "par_id3150382\n" "37\n" "help.text" -msgid "Displays the image map, so that you can click and edit the hotspots." +msgid "Displays the image map, so that you can click and edit the hotspots." msgstr "顯示影像映射，以便您可以按一下並編輯熱點。" #: 02220000.xhp diff -Nru libreoffice-5.0.2/translations/source/zh-TW/helpcontent2/source/text/swriter/01.po libreoffice-5.0.5~rc2/translations/source/zh-TW/helpcontent2/source/text/swriter/01.po --- libreoffice-5.0.2/translations/source/zh-TW/helpcontent2/source/text/swriter/01.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/helpcontent2/source/text/swriter/01.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:39+0200\n" +"POT-Creation-Date: 2016-01-18 17:25+0100\n" "PO-Revision-Date: 2015-08-14 01:36+0000\n" "Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" @@ -42,12 +42,13 @@ msgstr "顯示列印頁面的預覽或關閉預覽。" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id8697470\n" "help.text" msgid "Use the icons on the Print Preview Bar to scroll through the pages of the document or to print the document." -msgstr "" +msgstr "使用 [頁面預覽列] 上的圖示捲動文件的頁面或列印文件。" #: 01120000.xhp msgctxt "" @@ -67,12 +68,13 @@ msgstr "處於頁面預覽中時，您無法編輯文件。" #: 01120000.xhp +#, fuzzy msgctxt "" "01120000.xhp\n" "par_id5027008\n" "help.text" msgid "To exit the print preview, click the Close Preview button." -msgstr "" +msgstr "若要結束頁面預覽，請按一下 [關閉預覽] 按鈕。" #: 01120000.xhp msgctxt "" @@ -109,13 +111,14 @@ msgstr "開啟 [合併列印] 對話方塊，可幫助您列印和儲存表單信函。" #: 01150000.xhp +#, fuzzy msgctxt "" "01150000.xhp\n" "par_id3154102\n" "4\n" "help.text" msgid "During printing, the database information replaces the corresponding database fields (placeholders). For more information about inserting database fields refer to the Database tab page under Insert - Fields - More Fields." -msgstr "" +msgstr "列印時，資料庫資訊才會插入在「資料庫」欄位指令 (萬用字元) 的位置上。用來插入「資料庫」欄位指令的資訊可以在「插入」-「欄位指令」-「其他」下的「資料庫」選項標籤中取得。" #: 01150000.xhp msgctxt "" @@ -843,13 +846,14 @@ msgstr "上一個" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3148784\n" "29\n" "help.text" msgid "Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the previous item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "跳躍至文件中的上一個項目。若要指定要跳躍至的項目類型，請按一下 [瀏覽] 圖示，然後按一下項目類別 - 例如「圖形」。跳躍至文件中的上一個項目。若要指定要跳躍至的項目類型，請按一下 [瀏覽] 圖示，然後按一下項目類別 - 例如「圖形」。" #: 02110000.xhp msgctxt "" @@ -878,13 +882,14 @@ msgstr "下一個" #: 02110000.xhp +#, fuzzy msgctxt "" "02110000.xhp\n" "par_id3154028\n" "32\n" "help.text" msgid "Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\". Jumps to the next item in the document. To specify the type of item to jump to, click the Navigation icon, and then click an item category - for example, \"Images\"." -msgstr "" +msgstr "跳躍至文件中的下一個項目。若要指定要跳躍至的項目類型，請按一下 [瀏覽] 圖示，然後按一下項目類別 - 例如「圖形」。跳躍至文件中的下一個項目。若要指定要跳躍至的項目類型，請按一下 [瀏覽] 圖示，然後按一下項目類別 - 例如「圖形」。" #: 02110000.xhp msgctxt "" @@ -2917,12 +2922,13 @@ msgstr "跳躍至文件中前一個同類型的欄位。只有在文件包含多個同類型欄位時，此按鈕才可以使用。" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3155341\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02140000.xhp msgctxt "" @@ -2952,12 +2958,13 @@ msgstr "跳躍至文件中下一個同類型的欄位。只有在文件包含多個同類型欄位時，此按鈕才可以使用。" #: 02140000.xhp +#, fuzzy msgctxt "" "02140000.xhp\n" "par_id3145117\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02140000.xhp msgctxt "" @@ -3139,12 +3146,13 @@ msgstr "移至文件中的前一個註腳標號或尾註標號。" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3150023\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02150000.xhp msgctxt "" @@ -3174,12 +3182,13 @@ msgstr "移至文件中的下一個註腳標號或尾註標號。" #: 02150000.xhp +#, fuzzy msgctxt "" "02150000.xhp\n" "par_id3154029\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02150000.xhp msgctxt "" @@ -3379,12 +3388,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3147420\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02160000.xhp msgctxt "" @@ -3414,12 +3424,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3153298\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02160000.xhp msgctxt "" @@ -3484,12 +3495,13 @@ msgstr "" #: 02160000.xhp +#, fuzzy msgctxt "" "02160000.xhp\n" "par_id3150677\n" "help.text" msgid "Icon" -msgstr "" +msgstr "圖示" #: 02160000.xhp msgctxt "" @@ -3685,13 +3697,14 @@ msgstr "欄位背景顏色" #: 03080000.xhp +#, fuzzy msgctxt "" "03080000.xhp\n" "par_id3147513\n" "2\n" "help.text" msgid "Shows or hides field shadings in your document, including non-breaking spaces, soft hyphens, indexes, and footnotes." -msgstr "" +msgstr "顯示或隱入文件中的欄位背景顏色，包括不斷行的空格、自訂連字符、索引和註腳。" #: 03080000.xhp msgctxt "" @@ -4171,13 +4184,14 @@ msgstr "區域;以 DDE 插入區域DDE 指令;插入區域" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3157557\n" "37\n" "help.text" -msgid "Section" -msgstr "" +msgid "Section" +msgstr "區域" #: 04020100.xhp msgctxt "" @@ -4198,13 +4212,14 @@ msgstr "新區域" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145420\n" "7\n" "help.text" msgid "Type a name for the new section. By default, $[officename] automatically assigns the name \"Section X\" to new sections, where X is a consecutive number." -msgstr "" +msgstr "鍵入新區域的名稱。依預設，$[officename] 會自動為新區域指定名稱「區域 X」，其中 X 是一個連續的數字。" #: 04020100.xhp msgctxt "" @@ -4225,13 +4240,14 @@ msgstr "連結" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154472\n" "21\n" "help.text" msgid "Inserts the contents of another document or section from another document in the current section." -msgstr "" +msgstr "在目前區域中插入另一個文件的內容或區域。" #: 04020100.xhp msgctxt "" @@ -4243,13 +4259,14 @@ msgstr "DDE" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3151310\n" "27\n" "help.text" msgid "Creates a DDE link. Select this check box, and then enter the DDE command that you want to use. The DDE option is only available if the Link check box is selected." -msgstr "" +msgstr "建立 DDE 連結。選取此核取方塊，然後輸入要使用的[DDE]指令。只有在已選取[連結]核取方塊時，[DDE]選項才可用。" #: 04020100.xhp msgctxt "" @@ -4270,22 +4287,24 @@ msgstr "例如，若要在 $[officename] 文字文件 abc.sxw 中將名為 \"Section1\" 的區域作為 DDE 連結插入，請使用指令：\"soffice x:\\abc.sxw Section1\"。若要插入稱為「abc.xls」的 MS Excel 試算表檔案中第一個儲存格的內容，請使用命令：\"excel x:\\[abc.xls]Sheet1 z1s1\"。您也可以複製要作為 DDE 連結插入的元素，然後選擇[編輯] - [選擇性貼上]。然後您可以選取該內容並選擇 [編輯] - [欄位]，檢視連結的 DDE 指令。" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "hd_id3153640\n" "28\n" "help.text" msgid "File name / DDE command" -msgstr "" +msgstr "檔案名稱 / DDE 指令 " #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3145754\n" "29\n" "help.text" msgid "Enter the path and the filename for the file that you want to insert, or click the browse button (...) to locate the file.If the DDE check box is selected, enter the DDE command that you want to use." -msgstr "" +msgstr "輸入您想要插入的檔案的路徑與檔案名稱，或是按一下瀏覽按鈕 (...) 以找出檔案。如果已經選取 DDE 核取方塊，請輸入您想要使用的 DDE 指令。 " #: 04020100.xhp msgctxt "" @@ -4414,13 +4433,14 @@ msgstr "隱藏" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3148849\n" "13\n" "help.text" msgid "Hides and prevents the selected section from being printed. The components of a hidden sections appear gray in the Navigator. When you rest your mouse pointer over a hidden component in the Navigator, the Help tip \"hidden\" is displayed." -msgstr "" +msgstr "隱藏並且避免列印選取的區域。 在瀏覽中隱入的區域將呈現灰色。當您的滑鼠指標停在瀏覽中的一個隱入部份上時，螢幕上會顯示說明提示「隱入」。" #: 04020100.xhp msgctxt "" @@ -4441,13 +4461,14 @@ msgstr "帶有條件" #: 04020100.xhp +#, fuzzy msgctxt "" "04020100.xhp\n" "par_id3154343\n" "17\n" "help.text" msgid "Enter the condition that must be met to hide the section. A condition is a logical expression, such as \"SALUTATION EQ Mr.\". For example, if you use the mail merge form letter feature to define a database field called \"Salutation\" that contains \"Mr.\", \"Ms.\", or \"Sir or Madam\", you can then specify that a section will only be printed if the salutation is \"Mr.\"." -msgstr "" +msgstr "輸入隱藏區域所必須符合的條件。 條件是一個邏輯表示式，例如 \"SALUTATION EQ Mr.\"。例如，如果您使用合併列印 表單信函功能，定義一個稱為「稱呼」的資料庫欄位，其值為 \"Mr.\"、\"Ms.\"、\"Sir\" 或 \"Madam\"，您就可以指定僅當稱呼為 \"Mr.\" 時，才能列印區域。" #: 04020100.xhp msgctxt "" @@ -10181,13 +10202,14 @@ msgstr "若要顯示基於頁數的條件文字，請：" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150333\n" "136\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Functions tab." -msgstr "" +msgstr "選擇[插入] - [欄位指令] - [其他]，然後按一下[功能]標籤。" #: 04090200.xhp msgctxt "" @@ -10244,13 +10266,14 @@ msgstr "若要顯示基於使用者自訂變量的條件文字，請" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3155836\n" "138\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Variables tab." -msgstr "" +msgstr "選擇[插入] - [欄位指令] - [其他]，然後按一下[變量]標籤。" #: 04090200.xhp msgctxt "" @@ -10361,13 +10384,14 @@ msgstr "此範例的第一部份在文件的「名字」和「姓氏」欄位之間插入一個空格，第二部份依欄位的內容插入文字。此範例需要地址資料來源以 $[officename] 註冊。" #: 04090200.xhp +#, fuzzy msgctxt "" "04090200.xhp\n" "par_id3150523\n" "145\n" "help.text" msgid "Choose Insert - Fields - More Fields, and then click the Database tab." -msgstr "" +msgstr "選擇[插入] - [欄位指令] - [其他]，然後按一下[資料庫]標籤。" #: 04090200.xhp msgctxt "" @@ -13933,13 +13957,14 @@ msgstr "名稱" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3154099\n" "5\n" "help.text" msgid "Enter a name for the table." -msgstr "" +msgstr "輸入超連結的名稱。" #: 04150000.xhp msgctxt "" @@ -14023,13 +14048,14 @@ msgstr "標題" #: 04150000.xhp +#, fuzzy msgctxt "" "04150000.xhp\n" "par_id3155188\n" "43\n" "help.text" msgid "Includes a heading row in the table." -msgstr "" +msgstr "輸入超連結的名稱。" #: 04150000.xhp msgctxt "" @@ -16146,15 +16172,6 @@ #: 05040700.xhp msgctxt "" "05040700.xhp\n" -"par_id3149800\n" -"3\n" -"help.text" -msgid "This tab is not available in Print Layout view." -msgstr "此標籤在 [整頁模式] 檢視中無法使用。" - -#: 05040700.xhp -msgctxt "" -"05040700.xhp\n" "hd_id3153538\n" "4\n" "help.text" @@ -16609,22 +16626,24 @@ msgstr "" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3148774\n" "2\n" "help.text" msgid "Formats the size, position, and other properties of the selected image." -msgstr "" +msgstr "格式化所選圖形的大小、位置和其他屬性。" #: 05060000.xhp +#, fuzzy msgctxt "" "05060000.xhp\n" "par_id3147167\n" "5\n" "help.text" msgid "You can also change some of the properties of the selected image with shortcut keys." -msgstr "" +msgstr "您也可以使用捷徑鍵變更所選圖形的某些屬性。" #: 05060000.xhp #, fuzzy @@ -17054,13 +17073,14 @@ msgstr "反向目前偶數頁中的水平對齊設定。" #: 05060100.xhp +#, fuzzy msgctxt "" "05060100.xhp\n" "par_id3148446\n" "54\n" "help.text" msgid "You can also use the Image flip options to adjust the layout of objects on even and odd pages." -msgstr "" +msgstr "您也可以使用圖形 翻轉選項來調整偶數和奇數頁上物件的版面配置。" #: 05060100.xhp msgctxt "" @@ -18172,13 +18192,14 @@ msgstr "環繞" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152961\n" "2\n" "help.text" msgid "Specify the flip and the link options for the selected image." -msgstr "" +msgstr "指定用於所選圖形的翻轉和連結等選項。" #: 05060300.xhp msgctxt "" @@ -18199,13 +18220,14 @@ msgstr "垂直方向" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149485\n" "8\n" "help.text" msgid "Flips the selected image vertically." -msgstr "" +msgstr "垂直翻轉選取的圖形。" #: 05060300.xhp msgctxt "" @@ -18217,13 +18239,14 @@ msgstr "水平方向，向上" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3151261\n" "6\n" "help.text" msgid "Flips the selected image horizontally." -msgstr "" +msgstr "水平翻轉選取的圖形。" #: 05060300.xhp msgctxt "" @@ -18235,13 +18258,14 @@ msgstr "在所有頁面上" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3147212\n" "16\n" "help.text" msgid "Flips the selected image horizontally on all pages." -msgstr "" +msgstr "在所有頁上水平翻轉選取的圖形。" #: 05060300.xhp msgctxt "" @@ -18253,13 +18277,14 @@ msgstr "在左頁上" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3149037\n" "18\n" "help.text" msgid "Flips the selected image horizontally only on even pages." -msgstr "" +msgstr "僅在偶數頁上水平翻轉選取的圖形。" #: 05060300.xhp msgctxt "" @@ -18271,13 +18296,14 @@ msgstr "在右頁上" #: 05060300.xhp +#, fuzzy msgctxt "" "05060300.xhp\n" "par_id3152775\n" "20\n" "help.text" msgid "Flips the selected image horizontally only on odd pages." -msgstr "" +msgstr "僅在奇數頁上水平翻轉選取的圖形。" #: 05060300.xhp msgctxt "" @@ -20994,13 +21020,14 @@ msgstr "寬度" #: 05120100.xhp +#, fuzzy msgctxt "" "05120100.xhp\n" "par_id3149880\n" "7\n" "help.text" msgid "Enter the width that you want for the selected column(s)." -msgstr "" +msgstr "輸入要用於所選物件的寬度。" #: 05120200.xhp msgctxt "" @@ -22977,13 +23004,14 @@ msgstr "開啟對話方塊，於此處您可以接受或拒絕自動校正變更。也可檢視特定作者或在特定日期所做的變更。" #: 05150300.xhp +#, fuzzy msgctxt "" "05150300.xhp\n" "par_id3151184\n" "10\n" "help.text" msgid "Manage Changes, Filter tab" -msgstr "" +msgstr "接受或拒絕變更內容，[篩選] 標籤" #: 05170000.xhp msgctxt "" @@ -23581,13 +23609,14 @@ msgstr "若要直接在文件中插入不斷行的 (受保護) 連字符，請按一下要以連字符相連接的單字，然後按下 Shift+Command+Ctrl +減號 (-)。" #: 06030000.xhp +#, fuzzy msgctxt "" "06030000.xhp\n" "par_id3154573\n" "33\n" "help.text" msgid "To hide soft hyphens, choose %PRODUCTNAME - PreferencesTools - Options - %PRODUCTNAME Writer - Formatting Aids, and then clear the Custom hyphens check box." -msgstr "" +msgstr "若要隱藏自訂連字符，請選擇 [%PRODUCTNAME] - [喜好設定][工具] - [選項] - [%PRODUCTNAME Writer] - [格式化輔助]，然後清除 [自訂的連字符] 核取方塊。" #: 06030000.xhp msgctxt "" @@ -25869,13 +25898,14 @@ msgstr "間隔" #: 06180000.xhp +#, fuzzy msgctxt "" "06180000.xhp\n" "par_id3153719\n" "16\n" "help.text" msgid "Enter the amount of space that you want to leave between the line numbers and the text." -msgstr "" +msgstr "輸入您要在欄之間留出的間隔。" #: 06180000.xhp msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zh-TW/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/zh-TW/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/zh-TW/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-07-08 08:38+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:53+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: zh_TW\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1436344709.000000\n" +"X-POOTLE-MTIME: 1439610786.000000\n" #: advancedfilterdialog.ui msgctxt "" @@ -1543,6 +1543,16 @@ msgid "The minimum value must be less than the maximum value." msgstr "最短值必須小於最長值。" +#: databaroptions.ui +#, fuzzy +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "自訂" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/zh-TW/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zh-TW/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zh-TW/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-26 11:46+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 04:04+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: zh_TW\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1432640774.000000\n" +"X-POOTLE-MTIME: 1439611477.000000\n" #: alienwarndialog.ui msgctxt "" @@ -737,6 +737,7 @@ msgstr "顯示授權條款(_S)" #: licensedialog.ui +#, fuzzy msgctxt "" "licensedialog.ui\n" "label\n" @@ -749,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/zh-TW/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/zh-TW/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/zh-TW/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zh-TW/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -1,18 +1,20 @@ +#. extracted from svx/source/stbctrls msgid "" msgstr "" "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: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2015-05-26 22:42+0800\n" -"Last-Translator: Cheng-Chia Tseng \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 04:08+0000\n" +"Last-Translator: system user <>\n" +"Language-Team: \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.8\n" +"X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"Language-Team: \n" +"X-POOTLE-MTIME: 1439611714.000000\n" #: stbctrls.src msgctxt "" @@ -157,14 +159,6 @@ #: stbctrls.src msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "調整遠近等級" - -#: stbctrls.src -msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" "string.text" diff -Nru libreoffice-5.0.2/translations/source/zu/cui/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zu/cui/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zu/cui/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/cui/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:06+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 02:49+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -185,7 +185,7 @@ "copyright\n" "label\n" "string.text" -msgid "Copyright © 2000 - 2015 LibreOffice contributors." +msgid "Copyright © 2000–2016 LibreOffice contributors." msgstr "" #: aboutdialog.ui @@ -2156,13 +2156,14 @@ msgstr "" #: calloutpage.ui +#, fuzzy msgctxt "" "calloutpage.ui\n" "position\n" "5\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Ubude" #: calloutpage.ui #, fuzzy @@ -2437,13 +2438,14 @@ msgstr "" #: cellalignment.ui +#, fuzzy msgctxt "" "cellalignment.ui\n" "liststoreHorzAlign\n" "3\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Ubude" #: cellalignment.ui msgctxt "" @@ -9105,13 +9107,14 @@ msgstr "" #: numberingoptionspage.ui +#, fuzzy msgctxt "" "numberingoptionspage.ui\n" "numalign\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Ubude" #: numberingoptionspage.ui #, fuzzy @@ -9561,13 +9564,14 @@ msgstr "" #: numberingpositionpage.ui +#, fuzzy msgctxt "" "numberingpositionpage.ui\n" "liststore1\n" "2\n" "stringlist.text" msgid "Right" -msgstr "" +msgstr "Ubude" #: numberingpositionpage.ui msgctxt "" @@ -16448,13 +16452,14 @@ msgstr "" #: textanimtabpage.ui +#, fuzzy msgctxt "" "textanimtabpage.ui\n" "BTN_RIGHT-atkobject\n" "AtkObject::accessible-name\n" "string.text" msgid "Right" -msgstr "" +msgstr "Ubude" #: textanimtabpage.ui msgctxt "" diff -Nru libreoffice-5.0.2/translations/source/zu/formula/source/core/resource.po libreoffice-5.0.5~rc2/translations/source/zu/formula/source/core/resource.po --- libreoffice-5.0.2/translations/source/zu/formula/source/core/resource.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/formula/source/core/resource.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/zu/sc/uiconfig/scalc/ui.po libreoffice-5.0.5~rc2/translations/source/zu/sc/uiconfig/scalc/ui.po --- libreoffice-5.0.2/translations/source/zu/sc/uiconfig/scalc/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/sc/uiconfig/scalc/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" "PO-Revision-Date: 2015-08-15 03:48+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" @@ -1540,6 +1540,15 @@ msgid "The minimum value must be less than the maximum value." msgstr "" +#: databaroptions.ui +msgctxt "" +"databaroptions.ui\n" +"custom_color\n" +"label\n" +"string.text" +msgid "Custom" +msgstr "" + #: datafielddialog.ui msgctxt "" "datafielddialog.ui\n" diff -Nru libreoffice-5.0.2/translations/source/zu/sfx2/uiconfig/ui.po libreoffice-5.0.5~rc2/translations/source/zu/sfx2/uiconfig/ui.po --- libreoffice-5.0.2/translations/source/zu/sfx2/uiconfig/ui.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/sfx2/uiconfig/ui.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,8 +3,8 @@ msgstr "" "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: 2015-06-24 17:05+0200\n" -"PO-Revision-Date: 2015-05-14 08:12+0000\n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 03:58+0000\n" "Last-Translator: system user <>\n" "Language-Team: none\n" "Language: zu\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1431591143.000000\n" +"X-POOTLE-MTIME: 1439611112.000000\n" #: alienwarndialog.ui msgctxt "" @@ -750,7 +750,7 @@ "\n" "All trademarks and registered trademarks mentioned herein are the property of their respective owners.\n" "\n" -"Copyright © 2000, 2015 LibreOffice contributors. All rights reserved.\n" +"Copyright © 2000–2016 LibreOffice contributors. All rights reserved.\n" "\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 "" diff -Nru libreoffice-5.0.2/translations/source/zu/starmath/source.po libreoffice-5.0.5~rc2/translations/source/zu/starmath/source.po --- libreoffice-5.0.2/translations/source/zu/starmath/source.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/starmath/source.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-09-03 21:41-0500\n" +"POT-Creation-Date: 2015-10-24 15:06+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff -Nru libreoffice-5.0.2/translations/source/zu/svx/source/stbctrls.po libreoffice-5.0.5~rc2/translations/source/zu/svx/source/stbctrls.po --- libreoffice-5.0.2/translations/source/zu/svx/source/stbctrls.po 2015-09-17 13:33:11.000000000 +0000 +++ libreoffice-5.0.5~rc2/translations/source/zu/svx/source/stbctrls.po 2016-02-04 16:41:28.000000000 +0000 @@ -3,9 +3,9 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n" -"POT-Creation-Date: 2015-04-22 23:41+0200\n" -"PO-Revision-Date: 2013-08-27 12:12+0000\n" -"Last-Translator: Andras Timar \n" +"POT-Creation-Date: 2016-01-08 14:52+0100\n" +"PO-Revision-Date: 2015-08-15 04:05+0000\n" +"Last-Translator: system user <>\n" "Language-Team: LANGUAGE \n" "Language: zu\n" "MIME-Version: 1.0\n" @@ -14,7 +14,7 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.7\n" "X-Accelerator-Marker: ~\n" -"X-POOTLE-MTIME: 1377605553.000000\n" +"X-POOTLE-MTIME: 1439611528.000000\n" #: stbctrls.src msgctxt "" @@ -160,14 +160,6 @@ msgstr "" #: stbctrls.src -msgctxt "" -"stbctrls.src\n" -"RID_SVXSTR_ZOOM\n" -"string.text" -msgid "Adjust zoom level" -msgstr "" - -#: stbctrls.src msgctxt "" "stbctrls.src\n" "RID_SVXSTR_ZOOM_IN\n" diff -Nru libreoffice-5.0.2/ucb/Library_ucpimage.mk libreoffice-5.0.5~rc2/ucb/Library_ucpimage.mk --- libreoffice-5.0.2/ucb/Library_ucpimage.mk 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/ucb/Library_ucpimage.mk 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,33 @@ +# -*- 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_Library_Library,ucpimage)) + +$(eval $(call gb_Library_add_exception_objects,ucpimage, \ + ucb/source/ucp/image/ucpimage \ +)) + +$(eval $(call gb_Library_set_componentfile,ucpimage,ucb/source/ucp/image/ucpimage)) + +$(eval $(call gb_Library_use_externals,ucpimage, \ + boost_headers \ +)) + +$(eval $(call gb_Library_use_libraries,ucpimage, \ + cppu \ + cppuhelper \ + sal \ + ucbhelper \ + vcl \ + $(gb_UWINAPI) \ +)) + +$(eval $(call gb_Library_use_sdk_api,ucpimage)) + +# vim: set noet sw=4 ts=4: diff -Nru libreoffice-5.0.2/ucb/Module_ucb.mk libreoffice-5.0.5~rc2/ucb/Module_ucb.mk --- libreoffice-5.0.2/ucb/Module_ucb.mk 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/ucb/Module_ucb.mk 2016-02-04 16:41:28.000000000 +0000 @@ -20,6 +20,7 @@ Library_ucpfile1 \ $(if $(ENABLE_CURL),Library_ucpftp1) \ Library_ucphier1 \ + Library_ucpimage \ Library_ucppkg1 \ Library_ucptdoc1 \ )) diff -Nru libreoffice-5.0.2/ucb/source/ucp/image/ucpimage.component libreoffice-5.0.5~rc2/ucb/source/ucp/image/ucpimage.component --- libreoffice-5.0.2/ucb/source/ucp/image/ucpimage.component 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/ucb/source/ucp/image/ucpimage.component 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,17 @@ + + + + + + + + diff -Nru libreoffice-5.0.2/ucb/source/ucp/image/ucpimage.cxx libreoffice-5.0.5~rc2/ucb/source/ucp/image/ucpimage.cxx --- libreoffice-5.0.2/ucb/source/ucp/image/ucpimage.cxx 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/ucb/source/ucp/image/ucpimage.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,172 @@ +/* -*- 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 + +// A LO-private ("implementation detail") UCP used to access images from help +// content, with theme fallback and localization support as provided by VCL's +// ImplImageTree. +// +// The URL scheme is +// +// "vnd.libreoffice.image://"["?lang="] + +namespace { + +class Provider : + private osl::Mutex, + public cppu::WeakComponentImplHelper< + css::lang::XServiceInfo, css::ucb::XContentProvider> +{ +public: + explicit Provider( + css::uno::Reference const & context): + WeakComponentImplHelper(*static_cast(this)), context_(context) + {} + +private: + OUString SAL_CALL getImplementationName() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return OUString("com.sun.star.comp.ucb.ImageContentProvider"); } + + sal_Bool SAL_CALL supportsService(OUString const & ServiceName) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { return cppu::supportsService(this, ServiceName); } + + css::uno::Sequence SAL_CALL getSupportedServiceNames() + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + return css::uno::Sequence{ + "com.sun.star.ucb.ImageContentProvider"}; + } + + css::uno::Reference SAL_CALL queryContent( + css::uno::Reference const & Identifier) + throw ( + css::ucb::IllegalIdentifierException, css::uno::RuntimeException, + std::exception) + SAL_OVERRIDE + { + css::uno::Reference context; + { + osl::MutexGuard g(*this); + context = context_; + } + if (!context.is()) { + throw css::lang::DisposedException(); + } + auto url(Identifier->getContentIdentifier()); + auto uri(css::uri::UriReferenceFactory::create(context)->parse(url)); + if (!(uri.is() + && uri->getScheme().equalsIgnoreAsciiCase( + "vnd.libreoffice.image"))) + { + throw css::ucb::IllegalIdentifierException(url); + } + auto auth( + rtl::Uri::decode( + uri->getAuthority(), rtl_UriDecodeStrict, + RTL_TEXTENCODING_UTF8)); + if (auth.isEmpty()) { + throw css::ucb::IllegalIdentifierException(url); + } + auto path(uri->getPath()); + if (path.isEmpty()) { + throw css::ucb::IllegalIdentifierException(url); + } + OUStringBuffer buf; + assert(path[0] == '/'); + for (sal_Int32 i = 1;;) { + auto j = path.indexOf('/', i); + if (j == -1) { + j = path.getLength(); + } + auto seg( + rtl::Uri::decode( + path.copy(i, j - i), rtl_UriDecodeStrict, + RTL_TEXTENCODING_UTF8)); + if (seg.isEmpty()) { + throw css::ucb::IllegalIdentifierException(url); + } + if (i != 1) { + buf.append('/'); + } + buf.append(seg); + if (j == path.getLength()) { + break; + } + i = j + 1; + } + auto decPath(buf.makeStringAndClear()); + OUString lang; + if (uri->hasQuery()) { + if (!uri->getQuery().startsWith("lang=", &lang)) { + throw css::ucb::IllegalIdentifierException(url); + } + lang = rtl::Uri::decode( + lang, rtl_UriDecodeStrict, RTL_TEXTENCODING_UTF8); + if (lang.isEmpty()) { + throw css::ucb::IllegalIdentifierException(url); + } + } + OUString newUrl; + { + SolarMutexGuard g; + newUrl = ImplImageTree::get().getImageUrl(decPath, auth, lang); + } + ucbhelper::Content content; + return + ucbhelper::Content::create( + newUrl, css::uno::Reference(), + context, content) + ? content.get() : css::uno::Reference(); + } + + sal_Int32 SAL_CALL compareContentIds( + css::uno::Reference const & Id1, + css::uno::Reference const & Id2) + throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE + { + return Id1->getContentIdentifier().compareTo( + Id2->getContentIdentifier()); + } + + void SAL_CALL disposing() SAL_OVERRIDE { + context_.clear(); + } + + css::uno::Reference context_; +}; + +} + +extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface * SAL_CALL +com_sun_star_comp_ucb_ImageContentProvider_get_implementation( + css::uno::XComponentContext * context, + css::uno::Sequence const &) +{ + return cppu::acquire(new Provider(context)); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/unoil/BUCK libreoffice-5.0.5~rc2/unoil/BUCK --- libreoffice-5.0.2/unoil/BUCK 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/unoil/BUCK 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,21 @@ +genrule( + name = 'unoil-src', + cmd = ' && '.join([ + 'cd $TMP', + 'echo "FAKE SOURCE ARCHIVE" > README', + 'zip -qr $OUT *', + ]), + out = 'unoil-src.jar', + visibility = ['PUBLIC'], +) + +genrule( + name = 'unoil-javadoc', + cmd = ' && '.join([ + 'cd $TMP', + 'echo "FAKE JAVADOC ARCHIVE" > README', + 'zip -qr $OUT *', + ]), + out = 'unoil-javadoc.jar', + visibility = ['PUBLIC'], +) diff -Nru libreoffice-5.0.2/unoil/pom.unoil.xml libreoffice-5.0.5~rc2/unoil/pom.unoil.xml --- libreoffice-5.0.2/unoil/pom.unoil.xml 1970-01-01 00:00:00.000000000 +0000 +++ libreoffice-5.0.5~rc2/unoil/pom.unoil.xml 2016-02-04 16:41:28.000000000 +0000 @@ -0,0 +1,44 @@ + + 4.0.0 + org.libreoffice + unoil + @version@ + jar + LibreOffice - Maps IDL into java classes definitions + Maps IDL into java classes definitions + https://www.libreoffice.org + + + + Mozilla Public License, Version 2.0 + https://www.mozilla.org/en-US/MPL/2.0 + repo + + + + + http://cgit.freedesktop.org/libreoffice/core + https://gerrit.libreoffice.org/#/admin/projects/core + + + + + The Document Foundation + + + + + + LibreOffice Development Mailing List + libreoffice@lists.freedesktop.org + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/mailman/listinfo/libreoffice + http://lists.freedesktop.org/archives/libreoffice + + + + + https://bugs.documentfoundation.org + LibreOffice Issue Tracker + + diff -Nru libreoffice-5.0.2/vcl/generic/glyphs/gcach_layout.cxx libreoffice-5.0.5~rc2/vcl/generic/glyphs/gcach_layout.cxx --- libreoffice-5.0.2/vcl/generic/glyphs/gcach_layout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/generic/glyphs/gcach_layout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -402,6 +402,7 @@ // allocate temporary arrays, note: round to even int nGlyphCapacity = (3 * (rArgs.mnEndCharPos - rArgs.mnMinCharPos) | 15) + 1; + int32_t nVirtAdv = int32_t(aFtFace->size->metrics.height*rFont.GetStretch())>>6; rLayout.Reserve(nGlyphCapacity); @@ -460,8 +461,10 @@ int nEndRunPos = it->mnEnd; int nRunLen = nEndRunPos - nMinRunPos; maHbScript = it->maScript; + // hb_language_from_string() accept ISO639-3 language tag except for Chinese. + LanguageTag &rTag = rArgs.maLanguageTag; + OString sLanguage = OUStringToOString( MsLangId::isChinese(rTag.getLanguageType()) ? rTag.getBcp47():rTag.getLanguage() , RTL_TEXTENCODING_UTF8 ); - OString sLanguage = OUStringToOString(rArgs.maLanguageTag.getLanguage(), RTL_TEXTENCODING_UTF8); static hb_unicode_funcs_t* pHbUnicodeFuncs = getUnicodeFuncs(); @@ -563,6 +566,8 @@ int32_t nYOffset = pHbPositions[i].y_offset >> 6; int32_t nXAdvance = pHbPositions[i].x_advance >> 6; int32_t nYAdvance = pHbPositions[i].y_advance >> 6; + if ( nGlyphIndex & GF_ROTMASK ) + nXAdvance = nVirtAdv; Point aNewPos = Point(aCurrPos.X() + nXOffset, -(aCurrPos.Y() + nYOffset)); const GlyphItem aGI(nCharPos, nGlyphIndex, aNewPos, nGlyphFlags, nXAdvance, nXOffset, nYOffset); diff -Nru libreoffice-5.0.2/vcl/generic/print/prtsetup.cxx libreoffice-5.0.5~rc2/vcl/generic/print/prtsetup.cxx --- libreoffice-5.0.2/vcl/generic/print/prtsetup.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/generic/print/prtsetup.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -371,12 +371,19 @@ for( int i = 0; i < m_pParent->m_aJobData.m_pParser->getKeys(); i++ ) { const PPDKey* pKey = m_pParent->m_aJobData.m_pParser->getKey( i ); + + // skip options already shown somewhere else + // also skip options from the "InstallableOptions" PPD group + // Options in that group define hardware features that are not + // job-specific and should better be handled in the system-wide + // printer configuration. Keyword is defined in PPD specification + // (version 4.3), section 5.4. if( pKey->isUIKey() && pKey->getKey() != "PageSize" && pKey->getKey() != "InputSlot" && pKey->getKey() != "PageRegion" && - pKey->getKey() != "Duplex" - ) + pKey->getKey() != "Duplex" && + pKey->getGroup() != "InstallableOptions") { OUString aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) ); sal_uInt16 nPos = m_pPPDKeyBox->InsertEntry( aEntry ); diff -Nru libreoffice-5.0.2/vcl/headless/svpgdi.cxx libreoffice-5.0.5~rc2/vcl/headless/svpgdi.cxx --- libreoffice-5.0.2/vcl/headless/svpgdi.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/headless/svpgdi.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -134,6 +135,50 @@ cairo_clip(cr); } } +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0) +namespace +{ + cairo_rectangle_int_t getFillDamage(cairo_t* cr) + { + cairo_rectangle_int_t extents; + double x1, y1, x2, y2; + + cairo_clip_extents(cr, &x1, &y1, &x2, &y2); + extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; + cairo_region_t *region = cairo_region_create_rectangle(&extents); + + cairo_fill_extents(cr, &x1, &y1, &x2, &y2); + extents.x = x1, extents.y = y1, extents.width = x2-x1, extents.height = y2-y1; + cairo_region_intersect_rectangle(region, &extents); + + cairo_region_get_extents(region, &extents); + cairo_region_destroy(region); + + return extents; + } + + cairo_rectangle_int_t getStrokeDamage(cairo_t* cr) + { + cairo_rectangle_int_t extents; + double x1, y1, x2, y2; + + cairo_clip_extents(cr, &x1, &y1, &x2, &y2); + extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; +#if CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 10) + cairo_region_t *region = cairo_region_create_rectangle(&extents); + + cairo_stroke_extents(cr, &x1, &y1, &x2, &y2); + extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; + cairo_region_intersect_rectangle(region, &extents); + + cairo_region_get_extents(region, &extents); + cairo_region_destroy(region); +#endif + + return extents; + } +} +#endif #endif @@ -144,7 +189,10 @@ #if ENABLE_CAIRO_CANVAS #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0) if (m_bUseLineColor || !m_bUseFillColor) - return bRet; + { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawAlphaRect case"); + return false; + } cairo_t* cr = createCairoContext(m_aDevice); if (!cr) @@ -165,24 +213,10 @@ fTransparency); cairo_rectangle(cr, nX, nY, nWidth, nHeight); - cairo_rectangle_int_t extents; basebmp::IBitmapDeviceDamageTrackerSharedPtr xDamageTracker(m_aDevice->getDamageTracker()); if (xDamageTracker) - { - double x1, y1, x2, y2; - - cairo_clip_extents(cr, &x1, &y1, &x2, &y2); - extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; - cairo_region_t *region = cairo_region_create_rectangle(&extents); - - cairo_fill_extents(cr, &x1, &y1, &x2, &y2); - extents.x = x1, extents.y = x2, extents.width = x2-x1, extents.height = y2-y1; - cairo_region_intersect_rectangle(region, &extents); - - cairo_region_get_extents(region, &extents); - cairo_region_destroy(region); - } + extents = getFillDamage(cr); cairo_fill(cr); @@ -611,21 +645,194 @@ dbgOut( m_aDevice ); } +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0) +static void AddPolygonToPath(cairo_t* cr, const basegfx::B2DPolygon& rPolygon, bool bClosePath) +{ + // short circuit if there is nothing to do + const int nPointCount = rPolygon.count(); + if( nPointCount <= 0 ) + { + return; + } + + const bool bHasCurves = rPolygon.areControlPointsUsed(); + for( int nPointIdx = 0, nPrevIdx = 0;; nPrevIdx = nPointIdx++ ) + { + int nClosedIdx = nPointIdx; + if( nPointIdx >= nPointCount ) + { + // prepare to close last curve segment if needed + if( bClosePath && (nPointIdx == nPointCount) ) + { + nClosedIdx = 0; + } + else + { + break; + } + } + + basegfx::B2DPoint aPoint = rPolygon.getB2DPoint( nClosedIdx ); + + if( !nPointIdx ) + { + // first point => just move there + cairo_move_to(cr, aPoint.getX(), aPoint.getY()); + continue; + } + + bool bPendingCurve = false; + if( bHasCurves ) + { + bPendingCurve = rPolygon.isNextControlPointUsed( nPrevIdx ); + bPendingCurve |= rPolygon.isPrevControlPointUsed( nClosedIdx ); + } + + if( !bPendingCurve ) // line segment + { + cairo_line_to(cr, aPoint.getX(), aPoint.getY()); + } + else // cubic bezier segment + { + basegfx::B2DPoint aCP1 = rPolygon.getNextControlPoint( nPrevIdx ); + basegfx::B2DPoint aCP2 = rPolygon.getPrevControlPoint( nClosedIdx ); + cairo_curve_to(cr, aCP1.getX(), aCP1.getY(), aCP2.getX(), aCP2.getY(), + aPoint.getX(), aPoint.getY()); + } + } + + if( bClosePath ) + { + cairo_close_path(cr); + } +} +#endif + bool SvpSalGraphics::drawPolyLine( - const ::basegfx::B2DPolygon&, - double /*fTransparency*/, - const ::basegfx::B2DVector& /*rLineWidths*/, - basegfx::B2DLineJoin /*eJoin*/, - com::sun::star::drawing::LineCap /*eLineCap*/) + const ::basegfx::B2DPolygon& rPolyLine, + double fTransparency, + const ::basegfx::B2DVector& rLineWidths, + basegfx::B2DLineJoin eLineJoin, + css::drawing::LineCap eLineCap) { - // TODO: implement and advertise OutDevSupport_B2DDraw support - return false; + bool bRet = false; + (void)rPolyLine; (void)fTransparency; (void)rLineWidths; (void)eLineJoin; (void)eLineCap; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0) + // short circuit if there is nothing to do + const int nPointCount = rPolyLine.count(); + if (nPointCount <= 0) + { + return true; + } + + // reject requests that cannot be handled yet + if (rLineWidths.getX() != rLineWidths.getY()) + { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyLine case"); + return false; + } + + // #i101491# Cairo does not support B2DLineJoin::NONE; return false to use + // the fallback (own geometry preparation) + // #i104886# linejoin-mode and thus the above only applies to "fat" lines + if (basegfx::B2DLINEJOIN_NONE == eLineJoin && rLineWidths.getX() > 1.3) + { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyLine case"); + return false; + } + + cairo_t* cr = createCairoContext(m_aDevice); + if (!cr) + return bRet; + + if (!m_aDevice->isTopDown()) + { + cairo_scale(cr, 1, -1.0); + cairo_translate(cr, 0.0, -m_aDevice->getSize().getY()); + } + + clipRegion(cr); + + // setup line attributes + cairo_line_join_t eCairoLineJoin = CAIRO_LINE_JOIN_MITER; + switch (eLineJoin) + { + case basegfx::B2DLINEJOIN_NONE: + eCairoLineJoin = /*TODO?*/CAIRO_LINE_JOIN_MITER; + break; + case basegfx::B2DLINEJOIN_MIDDLE: + eCairoLineJoin = /*TODO?*/CAIRO_LINE_JOIN_MITER; + break; + case basegfx::B2DLINEJOIN_BEVEL: + eCairoLineJoin = CAIRO_LINE_JOIN_BEVEL; + break; + case basegfx::B2DLINEJOIN_MITER: + eCairoLineJoin = CAIRO_LINE_JOIN_MITER; + break; + case basegfx::B2DLINEJOIN_ROUND: + eCairoLineJoin = CAIRO_LINE_JOIN_ROUND; + break; + } + + // setup cap attribute + cairo_line_cap_t eCairoLineCap(CAIRO_LINE_CAP_BUTT); + + switch (eLineCap) + { + default: // css::drawing::LineCap_BUTT: + { + eCairoLineCap = CAIRO_LINE_CAP_BUTT; + break; + } + case css::drawing::LineCap_ROUND: + { + eCairoLineCap = CAIRO_LINE_CAP_ROUND; + break; + } + case css::drawing::LineCap_SQUARE: + { + eCairoLineCap = CAIRO_LINE_CAP_SQUARE; + break; + } + } + + AddPolygonToPath(cr, rPolyLine, rPolyLine.isClosed()); + + cairo_rectangle_int_t extents; + basebmp::IBitmapDeviceDamageTrackerSharedPtr xDamageTracker(m_aDevice->getDamageTracker()); + + cairo_set_source_rgba(cr, m_aLineColor.getRed()/255.0, + m_aLineColor.getGreen()/255.0, + m_aLineColor.getBlue()/255.0, + 1.0-fTransparency); + + cairo_set_line_join(cr, eCairoLineJoin); + cairo_set_line_cap(cr, eCairoLineCap); + cairo_set_line_width(cr, rLineWidths.getX()); + + if (xDamageTracker) + extents = getStrokeDamage(cr); + + cairo_stroke(cr); + + cairo_surface_flush(cairo_get_target(cr)); + cairo_destroy(cr); // unref + + if (xDamageTracker) + { + xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y, extents.x + extents.width, + extents.y + extents.height)); + } + bRet = true; +#endif + return bRet; } bool SvpSalGraphics::drawPolyLineBezier( sal_uInt32, const SalPoint*, const sal_uInt8* ) { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyLineBezier case"); return false; } @@ -633,6 +840,7 @@ const SalPoint*, const sal_uInt8* ) { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolygonBezier case"); return false; } @@ -641,13 +849,59 @@ const SalPoint* const*, const sal_uInt8* const* ) { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyPolygonBezier case"); return false; } -bool SvpSalGraphics::drawPolyPolygon( const basegfx::B2DPolyPolygon&, double /*fTransparency*/ ) +bool SvpSalGraphics::drawPolyPolygon(const basegfx::B2DPolyPolygon& rPolyPoly, double fTransparency) { - // TODO: maybe BaseBmp can draw B2DPolyPolygons directly - return false; + bool bRet = false; + (void)rPolyPoly; (void)fTransparency; +#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 10, 0) + if (m_bUseLineColor || !m_bUseFillColor) + { + SAL_WARN("vcl.gdi", "unsupported SvpSalGraphics::drawPolyPolygon case"); + return false; + } + + cairo_t* cr = createCairoContext(m_aDevice); + if (!cr) + return false; + + if (!m_aDevice->isTopDown()) + { + cairo_scale(cr, 1, -1.0); + cairo_translate(cr, 0.0, -m_aDevice->getSize().getY()); + } + + clipRegion(cr); + + cairo_set_source_rgba(cr, m_aFillColor.getRed()/255.0, + m_aFillColor.getGreen()/255.0, + m_aFillColor.getBlue()/255.0, + 1.0-fTransparency); + + for (const basegfx::B2DPolygon* pPoly = rPolyPoly.begin(); pPoly != rPolyPoly.end(); ++pPoly) + AddPolygonToPath(cr, *pPoly, true); + + cairo_rectangle_int_t extents; + basebmp::IBitmapDeviceDamageTrackerSharedPtr xDamageTracker(m_aDevice->getDamageTracker()); + if (xDamageTracker) + extents = getFillDamage(cr); + + cairo_fill(cr); + + cairo_surface_flush(cairo_get_target(cr)); + cairo_destroy(cr); // unref + + if (xDamageTracker) + { + xDamageTracker->damaged(basegfx::B2IBox(extents.x, extents.y, extents.x + extents.width, + extents.y + extents.height)); + } + bRet = true; +#endif + return bRet; } void SvpSalGraphics::copyArea( long nDestX, @@ -883,9 +1137,19 @@ bool SvpSalGraphics::supportsOperation(OutDevSupportType eType) const { #if ENABLE_CAIRO_CANVAS - return m_aDrawMode != basebmp::DrawMode_XOR && - OutDevSupport_TransparentRect == eType && - isCairoCompatible(m_aDevice); + if (m_aDrawMode == basebmp::DrawMode_XOR) + return false; + if (!isCairoCompatible(m_aDevice)) + return false; + switch (eType) + { + case OutDevSupport_TransparentRect: + case OutDevSupport_B2DDraw: + return true; + case OutDevSupport_B2DClip: //what's this one ? + return false; + } + return false; #else (void)eType; return false; diff -Nru libreoffice-5.0.2/vcl/inc/generic/glyphcache.hxx libreoffice-5.0.5~rc2/vcl/inc/generic/glyphcache.hxx --- libreoffice-5.0.2/vcl/inc/generic/glyphcache.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/generic/glyphcache.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -185,6 +185,7 @@ const unsigned char* GetTable( const char* pName, sal_uLong* pLength ); int GetEmUnits() const { return maFaceFT->units_per_EM;} const FT_Size_Metrics& GetMetricsFT() const { return maSizeFT->metrics; } + double GetStretch() { return mfStretch; } const FontCharMapPtr GetFontCharMap() const; bool GetFontCapabilities(vcl::FontCapabilities &) const; diff -Nru libreoffice-5.0.2/vcl/inc/image.h libreoffice-5.0.5~rc2/vcl/inc/image.h --- libreoffice-5.0.2/vcl/inc/image.h 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/image.h 2016-02-04 16:41:28.000000000 +0000 @@ -40,6 +40,8 @@ private: BitmapEx maBmpEx; + BitmapChecksum maBitmapChecksum; + BitmapEx maDisabledBmpEx; BitmapEx* mpDisplayBmp; Size maSize; diff -Nru libreoffice-5.0.2/vcl/inc/impfont.hxx libreoffice-5.0.5~rc2/vcl/inc/impfont.hxx --- libreoffice-5.0.2/vcl/inc/impfont.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/impfont.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -103,7 +103,7 @@ sal_uInt16 mnMiscFlags; // Misc Flags sal_uInt32 mnRefCount; // Reference Counter - enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 }; + enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16, FULLSTOP_CENTERED_FLAG=32 }; public: ImplFontMetric(); @@ -116,6 +116,7 @@ long GetExtLeading() const { return mnExtLeading; } long GetLineHeight() const { return mnLineHeight; } long GetSlant() const { return mnSlant; } + bool IsFullstopCentered() const { return ((mnMiscFlags & FULLSTOP_CENTERED_FLAG ) != 0); } bool IsDeviceFont() const { return ((mnMiscFlags & DEVICE_FLAG) != 0); } bool IsScalable() const { return ((mnMiscFlags & SCALABLE_FLAG) != 0); } diff -Nru libreoffice-5.0.2/vcl/inc/impimagetree.hxx libreoffice-5.0.5~rc2/vcl/inc/impimagetree.hxx --- libreoffice-5.0.2/vcl/inc/impimagetree.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/impimagetree.hxx 1970-01-01 00:00:00.000000000 +0000 @@ -1,117 +0,0 @@ -/* -*- 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/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_VCL_INC_IMPIMAGETREE_HXX -#define INCLUDED_VCL_INC_IMPIMAGETREE_HXX - -#include "sal/config.h" - -#include -#include -#include - -#include "com/sun/star/uno/Reference.hxx" -#include "rtl/ustring.hxx" -#include "salhelper/singletonref.hxx" - -namespace com { namespace sun { namespace star { namespace container { - class XNameAccess; -} } } } -class BitmapEx; - -class ImplImageTree { -public: - ImplImageTree(); - - ~ImplImageTree(); - - bool loadImage( - OUString const & name, OUString const & style, - BitmapEx & bitmap, bool localized = false, bool loadMissing = false ); - - bool loadDefaultImage( - OUString const & style, - BitmapEx& bitmap); - - /** a crude form of life cycle control (called from DeInitVCL; otherwise, - * if the ImplImageTree singleton were destroyed during exit that would - * be too late for the destructors of the bitmaps in maIconCache)*/ - void shutDown(); - - css::uno::Reference< css::container::XNameAccess > getNameAccess(); - -private: - ImplImageTree(const ImplImageTree&) SAL_DELETED_FUNCTION; - ImplImageTree& operator=(const ImplImageTree&) SAL_DELETED_FUNCTION; - - typedef std::unordered_map, OUStringHash> IconCache; - typedef std::unordered_map IconLinkHash; - - struct IconSet { - OUString maURL; - css::uno::Reference maNameAccess; - IconCache maIconCache; - IconLinkHash maLinkHash; - - IconSet() {} - IconSet(const OUString &aURL) : maURL(aURL) {} - }; - - /// Map between the theme name(s) and the content. - typedef std::unordered_map StyleIconSet; - - /// Remember all the (used) icon styles and individual icons in them. - StyleIconSet maIconSet; - - /// Styly used for the current operations; switches switch several times during fallback search. - OUString maCurrentStyle; - - bool doLoadImage( - OUString const & name, OUString const & style, - BitmapEx & bitmap, bool localized); - - bool checkPathAccess(); - - void setStyle(OUString const & style ); - - void createStyle(); - - bool iconCacheLookup( OUString const & name, bool localized, BitmapEx & bitmap ); - - bool findImage(std::vector< OUString > const & paths, BitmapEx & bitmap ); - - void loadImageLinks(); - - void parseLinkFile(std::shared_ptr stream); - - /// Return name of a real .png according to links.txt. - OUString const & getRealImageName(OUString const & name); - - /** Rerurn name of the fallback style for the provided one. - - Must not be cyclic :-) The last theme in the chain returns an empty string. - */ - static OUString fallbackStyle(const OUString &style); -}; - -typedef salhelper::SingletonRef< ImplImageTree > ImplImageTreeSingletonRef; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/vcl/inc/opengl/salbmp.hxx libreoffice-5.0.5~rc2/vcl/inc/opengl/salbmp.hxx --- libreoffice-5.0.2/vcl/inc/opengl/salbmp.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/opengl/salbmp.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -109,8 +109,6 @@ bool ImplScaleConvolution( const double& rScaleX, const double& rScaleY, const Kernel& aKernel ); bool ImplScaleArea( double rScaleX, double rScaleY ); - bool getFormatAndType(GLenum& nFormat, GLenum& nType); - public: bool ImplScale( const double& rScaleX, const double& rScaleY, BmpScaleFlag nScaleFlag ); diff -Nru libreoffice-5.0.2/vcl/inc/outfont.hxx libreoffice-5.0.5~rc2/vcl/inc/outfont.hxx --- libreoffice-5.0.2/vcl/inc/outfont.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/outfont.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -187,6 +187,7 @@ bool mbDevice; // Flag for Device Fonts bool mbScalableFont; bool mbKernableFont; + bool mbFullstopCentered; // font metrics that are usually derived from the measurements long mnUnderlineSize; // Lineheight of Underline diff -Nru libreoffice-5.0.2/vcl/inc/unx/gtk/gtkframe.hxx libreoffice-5.0.5~rc2/vcl/inc/unx/gtk/gtkframe.hxx --- libreoffice-5.0.2/vcl/inc/unx/gtk/gtkframe.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/inc/unx/gtk/gtkframe.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -239,6 +239,7 @@ #if GTK_CHECK_VERSION(3,0,0) static gboolean signalDraw( GtkWidget*, cairo_t *cr, gpointer ); static void signalFlagsChanged( GtkWidget*, GtkStateFlags, gpointer ); + static void sizeAllocated(GtkWidget*, GdkRectangle *pAllocation, gpointer frame); #if GTK_CHECK_VERSION(3,14,0) static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame); static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame); diff -Nru libreoffice-5.0.2/vcl/opengl/FixedTextureAtlas.cxx libreoffice-5.0.5~rc2/vcl/opengl/FixedTextureAtlas.cxx --- libreoffice-5.0.2/vcl/opengl/FixedTextureAtlas.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/opengl/FixedTextureAtlas.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -36,15 +36,18 @@ { ImplOpenGLTexture* pTexture = nullptr; - for (size_t i = 0; i < mpTextures.size(); i++) + auto funFreeSlot = [] (std::unique_ptr& mpTexture) { - if (mpTextures[i]->mnFreeSlots > 0) - { - pTexture = mpTextures[i].get(); - } - } + return mpTexture->mnFreeSlots > 0; + }; + + auto aIterator = std::find_if(mpTextures.begin(), mpTextures.end(), funFreeSlot); - if (!pTexture) + if (aIterator != mpTextures.end()) + { + pTexture = (*aIterator).get(); + } + else { CreateNewTexture(); pTexture = mpTextures.back().get(); diff -Nru libreoffice-5.0.2/vcl/opengl/framebuffer.cxx libreoffice-5.0.5~rc2/vcl/opengl/framebuffer.cxx --- libreoffice-5.0.2/vcl/opengl/framebuffer.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/opengl/framebuffer.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -68,8 +68,11 @@ mnAttachedTexture = rTexture.Id(); mnWidth = rTexture.GetWidth(); mnHeight = rTexture.GetHeight(); - glFramebufferTexture2D( GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, - mnAttachedTexture, 0 ); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, mnAttachedTexture, 0); + if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE) + { + SAL_WARN("vcl.opengl", "Framebuffer incomplete"); + } CHECK_GL_ERROR(); } diff -Nru libreoffice-5.0.2/vcl/opengl/salbmp.cxx libreoffice-5.0.5~rc2/vcl/opengl/salbmp.cxx --- libreoffice-5.0.2/vcl/opengl/salbmp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/opengl/salbmp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -37,6 +37,44 @@ namespace { +inline bool determineTextureFormat(sal_uInt16 nBits, GLenum& nFormat, GLenum& nType) +{ + switch(nBits) + { + case 8: + nFormat = GL_LUMINANCE; + nType = GL_UNSIGNED_BYTE; + return true; + case 16: +#ifdef WNT + nFormat = GL_BGR; +#else + nFormat = GL_RGB; +#endif + nType = GL_UNSIGNED_SHORT_5_6_5; + return true; + case 24: +#ifdef WNT + nFormat = GL_BGR; +#else + nFormat = GL_RGB; +#endif + nType = GL_UNSIGNED_BYTE; + return true; + case 32: +#ifdef WNT + nFormat = GL_BGRA; +#else + nFormat = GL_RGBA; +#endif + nType = GL_UNSIGNED_BYTE; + return true; + default: + break; + } + return false; +} + static bool isValidBitCount( sal_uInt16 nBitCount ) { return (nBitCount == 1) || (nBitCount == 4) || (nBitCount == 8) || (nBitCount == 16) || (nBitCount == 24) || (nBitCount == 32); @@ -396,18 +434,7 @@ // no conversion needed for truecolor pData = maUserBuffer.get(); - switch( mnBits ) - { - case 16: nFormat = GL_RGB; - nType = GL_UNSIGNED_SHORT_5_6_5; - break; - case 24: nFormat = GL_RGB; - nType = GL_UNSIGNED_BYTE; - break; - case 32: nFormat = GL_RGBA; - nType = GL_UNSIGNED_BYTE; - break; - } + determineTextureFormat(mnBits, nFormat, nType); } else if( mnBits == 8 && maPalette.IsGreyPalette() ) { @@ -421,8 +448,8 @@ // convert to 32 bits RGBA using palette pData = new sal_uInt8[mnBufHeight * mnBufWidth * 4]; bAllocated = true; - nFormat = GL_RGBA; - nType = GL_UNSIGNED_BYTE; + + determineTextureFormat(32, nFormat, nType); ImplPixelFormat* pSrcFormat = ImplPixelFormat::GetFormat( mnBits, maPalette ); sal_uInt8* pSrcData = maUserBuffer.get(); @@ -469,31 +496,18 @@ { sal_uInt8* pData = maUserBuffer.get(); + SAL_INFO( "vcl.opengl", "::ReadTexture " << mnWidth << "x" << mnHeight ); + GLenum nFormat = GL_RGBA; + GLenum nType = GL_UNSIGNED_BYTE; + if( pData == NULL ) return false; if (mnBits == 8 || mnBits == 16 || mnBits == 24 || mnBits == 32) { - GLenum nFormat = GL_RGBA; - GLenum nType = GL_UNSIGNED_BYTE; - - switch( mnBits ) - { - case 8: nFormat = GL_LUMINANCE; - nType = GL_UNSIGNED_BYTE; - break; - case 16: nFormat = GL_RGB; - nType = GL_UNSIGNED_SHORT_5_6_5; - break; - case 24: nFormat = GL_RGB; - nType = GL_UNSIGNED_BYTE; - break; - case 32: nFormat = GL_RGBA; - nType = GL_UNSIGNED_BYTE; - break; - } + determineTextureFormat(mnBits, nFormat, nType); makeCurrent(); maTexture.Read(nFormat, nType, pData); @@ -506,32 +520,39 @@ std::vector aBuffer(mnWidth * mnHeight * 3); makeCurrent(); sal_uInt8* pBuffer = aBuffer.data(); - maTexture.Read(GL_RGB, GL_UNSIGNED_BYTE, pBuffer); + determineTextureFormat(24, nFormat, nType); + maTexture.Read(nFormat, nType, pBuffer); int nShift = 7; size_t nIndex = 0; sal_uInt8* pCurrent = pBuffer; - for (size_t i = 0; i < aBuffer.size(); i += 3) + for (int y = 0; y < mnHeight; ++y) { - sal_uInt8 nR = *pCurrent++; - sal_uInt8 nG = *pCurrent++; - sal_uInt8 nB = *pCurrent++; - - if (nR > 0 && nG > 0 && nB > 0) - { - pData[nIndex] |= (1 << nShift); - } - nShift--; - if (nShift < 0) + for (int x = 0; x < mnWidth; ++x) { - nShift = 7; - nIndex++; - pData[nIndex] = 0; + if (nShift < 0) + { + nShift = 7; + nIndex++; + pData[nIndex] = 0; + } + + sal_uInt8 nR = *pCurrent++; + sal_uInt8 nG = *pCurrent++; + sal_uInt8 nB = *pCurrent++; + + if (nR > 0 && nG > 0 && nB > 0) + { + pData[nIndex] |= (1 << nShift); + } + nShift--; } + nShift = 7; + nIndex++; + pData[nIndex] = 0; } - mnBufWidth = mnWidth; mnBufHeight = mnHeight; return true; @@ -713,12 +734,30 @@ case 1: pBuffer->mnFormat = BMP_FORMAT_1BIT_MSB_PAL; break; case 4: pBuffer->mnFormat = BMP_FORMAT_4BIT_MSN_PAL; break; case 8: pBuffer->mnFormat = BMP_FORMAT_8BIT_PAL; break; - case 16: pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK; - pBuffer->maColorMask = ColorMask( 0xf800, 0x07e0, 0x001f ); + case 16: +#ifdef WNT + pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK; + pBuffer->maColorMask = ColorMask(0x7c00, 0x03e0, 0x001f); +#else + pBuffer->mnFormat = BMP_FORMAT_16BIT_TC_MSB_MASK; + pBuffer->maColorMask = ColorMask(0xf800, 0x07e0, 0x001f); +#endif + break; + case 24: +#ifdef WNT + pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_BGR; +#else + pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_RGB; +#endif break; - case 24: pBuffer->mnFormat = BMP_FORMAT_24BIT_TC_RGB; break; - case 32: pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_RGBA; - pBuffer->maColorMask = ColorMask( 0xff000000, 0x00ff0000, 0x0000ff00 ); + case 32: +#ifdef WNT + pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_BGRA; + pBuffer->maColorMask = ColorMask(0x00ff0000, 0x0000ff00, 0x000000ff); +#else + pBuffer->mnFormat = BMP_FORMAT_32BIT_TC_RGBA; + pBuffer->maColorMask = ColorMask(0xff000000, 0x00ff0000, 0x0000ff00); +#endif break; } diff -Nru libreoffice-5.0.2/vcl/opengl/scale.cxx libreoffice-5.0.5~rc2/vcl/opengl/scale.cxx --- libreoffice-5.0.2/vcl/opengl/scale.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/opengl/scale.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -44,31 +44,6 @@ void GetSize( Size& rSize ) const SAL_OVERRIDE; }; -bool OpenGLSalBitmap::getFormatAndType(GLenum& nFormat, GLenum& nType) -{ - switch(mnBits) - { - case 8: - nFormat = GL_LUMINANCE; - nType = GL_UNSIGNED_BYTE; - break; - case 16: - nFormat = GL_RGB; - nType = GL_UNSIGNED_SHORT_5_6_5; - break; - case 24: - nFormat = GL_RGB; - nType = GL_UNSIGNED_BYTE; - break; - case 32: - default: - nFormat = GL_RGBA; - nType = GL_UNSIGNED_BYTE; - break; - } - return true; -} - bool OpenGLSalBitmap::ImplScaleFilter( const double& rScaleX, const double& rScaleY, @@ -85,11 +60,7 @@ if( !pProgram ) return false; - GLenum nFormat; - GLenum nType; - getFormatAndType(nFormat, nType); - - OpenGLTexture aNewTex = OpenGLTexture(nNewWidth, nNewHeight, nFormat, nType, nullptr); + OpenGLTexture aNewTex(nNewWidth, nNewHeight); pFramebuffer = mpContext->AcquireFramebuffer( aNewTex ); pProgram->SetTexture( "sampler", maTexture ); @@ -168,14 +139,10 @@ if( pProgram == 0 ) return false; - GLenum nFormat; - GLenum nType; - getFormatAndType(nFormat, nType); - // horizontal scaling in scratch texture if( mnWidth != nNewWidth ) { - OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, mnHeight, nFormat, nType, nullptr); + OpenGLTexture aScratchTex(nNewWidth, nNewHeight); pFramebuffer = mpContext->AcquireFramebuffer( aScratchTex ); @@ -198,7 +165,7 @@ // vertical scaling in final texture if( mnHeight != nNewHeight ) { - OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, nNewHeight, nFormat, nType, nullptr); + OpenGLTexture aScratchTex(nNewWidth, nNewHeight); pFramebuffer = mpContext->AcquireFramebuffer( aScratchTex ); @@ -259,11 +226,7 @@ if( pProgram == 0 ) return false; - GLenum nFormat; - GLenum nType; - getFormatAndType(nFormat, nType); - - OpenGLTexture aScratchTex = OpenGLTexture(nNewWidth, nNewHeight, nFormat, nType, nullptr); + OpenGLTexture aScratchTex(nNewWidth, nNewHeight); OpenGLFramebuffer* pFramebuffer = mpContext->AcquireFramebuffer( aScratchTex ); diff -Nru libreoffice-5.0.2/vcl/opengl/win/WinDeviceInfo.cxx libreoffice-5.0.5~rc2/vcl/opengl/win/WinDeviceInfo.cxx --- libreoffice-5.0.2/vcl/opengl/win/WinDeviceInfo.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/opengl/win/WinDeviceInfo.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -727,6 +727,14 @@ return true; } + /* Anything that's exotic eg. VMWare / VirtualBox GL drivers + we're not interested in for now. */ + if (maAdapterVendorID != GetDeviceVendor(wgl::VendorAMD) && + maAdapterVendorID != GetDeviceVendor(wgl::VendorATI) && + maAdapterVendorID != GetDeviceVendor(wgl::VendorIntel) && + maAdapterVendorID != GetDeviceVendor(wgl::VendorNVIDIA)) + return true; + return FindBlocklistedDeviceInList(); } diff -Nru libreoffice-5.0.2/vcl/osx/vclnsapp.mm libreoffice-5.0.5~rc2/vcl/osx/vclnsapp.mm --- libreoffice-5.0.2/vcl/osx/vclnsapp.mm 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/osx/vclnsapp.mm 2016-02-04 16:41:28.000000000 +0000 @@ -23,6 +23,7 @@ #include "sal/main.h" #include +#include #include "vcl/window.hxx" #include "vcl/svapp.hxx" #include "vcl/cmdevt.hxx" @@ -34,8 +35,6 @@ #include "osx/salframeview.h" #include "quartz/utils.h" -#include "impimagetree.hxx" - #include "premac.h" #include #import "Carbon/Carbon.h" @@ -409,7 +408,7 @@ { ApplicationEvent aEv(ApplicationEvent::TYPE_PRIVATE_DOSHUTDOWN); GetpApp()->AppEvent( aEv ); - ImplImageTreeSingletonRef()->shutDown(); + ImplImageTree::get().shutDown(); // DeInitVCL should be called in ImplSVMain - unless someon _exits first which // can occur in Desktop::doShutdown for example } Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/vcl/qa/afl-eventtesting/eventtesting.impress.crash-3 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/vcl/qa/afl-eventtesting/eventtesting.impress.crash-3 differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/vcl/qa/afl-eventtesting/eventtesting.impress.crash-5 differ diff -Nru libreoffice-5.0.2/vcl/qa/cppunit/app/test_IconThemeInfo.cxx libreoffice-5.0.5~rc2/vcl/qa/cppunit/app/test_IconThemeInfo.cxx --- libreoffice-5.0.2/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/qa/cppunit/app/test_IconThemeInfo.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -36,12 +36,6 @@ ThemeIdIsDetectedFromFileNameWithUnderscore(); void - DisplayNameForHicontrastIsHighContrast(); - - void - DisplayNameForTango_testingIsTangoTesting(); - - void ExceptionIsThrownWhenIdCannotBeDetermined1(); void @@ -120,24 +114,6 @@ CPPUNIT_ASSERT_EQUAL_MESSAGE("Exception was thrown", true, thrown); } -void -IconThemeInfoTest::DisplayNameForHicontrastIsHighContrast() -{ - OUString id("hicontrast"); - OUString expected("High Contrast"); - OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id); - CPPUNIT_ASSERT_EQUAL(expected, displayName); -} - -void -IconThemeInfoTest::DisplayNameForTango_testingIsTangoTesting() -{ - OUString id("tango_testing"); - OUString expected("Tango Testing"); - OUString displayName = vcl::IconThemeInfo::ThemeIdToDisplayName(id); - CPPUNIT_ASSERT_EQUAL(expected, displayName); -} - // Put the test suite in the registry CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest); Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/vcl/qa/cppunit/graphicfilter/data/jpg/fail/crash-1.jpg differ Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/vcl/qa/cppunit/graphicfilter/data/wmf/fail/bitcount-1.wmf differ diff -Nru libreoffice-5.0.2/vcl/qa/cppunit/lifecycle.cxx libreoffice-5.0.5~rc2/vcl/qa/cppunit/lifecycle.cxx --- libreoffice-5.0.2/vcl/qa/cppunit/lifecycle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/qa/cppunit/lifecycle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -220,7 +220,7 @@ LeakTestObject *pNew = new LeakTestObject(); pNew->mxRef = VclPtr< LeakTestClass< vcl_type > >::Create( pNew->mbDeleted, std::forward(arg)...); - pNew->mpRef = reinterpret_cast(static_cast(pNew->mxRef)); + pNew->mpRef = static_cast(static_cast(pNew->mxRef)); return pNew; } VclPtr getRef() { return mxRef; } @@ -233,7 +233,7 @@ if (!mbDeleted) { OUStringBuffer aMsg = "Type '"; - vcl::Window *pWin = reinterpret_cast(mpRef); + vcl::Window *pWin = static_cast(mpRef); aMsg.appendAscii(typeid(*pWin).name()); aMsg.append("' not freed after dispose"); CPPUNIT_FAIL(OUStringToOString(aMsg.makeStringAndClear(), diff -Nru libreoffice-5.0.2/vcl/source/app/settings.cxx libreoffice-5.0.5~rc2/vcl/source/app/settings.cxx --- libreoffice-5.0.2/vcl/source/app/settings.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/app/settings.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -53,7 +54,6 @@ using namespace ::com::sun::star; #include "svdata.hxx" -#include "impimagetree.hxx" struct ImplMouseData { diff -Nru libreoffice-5.0.2/vcl/source/app/svmain.cxx libreoffice-5.0.5~rc2/vcl/source/app/svmain.cxx --- libreoffice-5.0.2/vcl/source/app/svmain.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/app/svmain.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -35,6 +35,7 @@ #include "vcl/cvtgrf.hxx" #include "vcl/scheduler.hxx" #include "vcl/image.hxx" +#include "vcl/implimagetree.hxx" #include "vcl/settings.hxx" #include "vcl/unowrap.hxx" #include "vcl/configsettings.hxx" @@ -68,7 +69,6 @@ #include "salsys.hxx" #include "saltimer.hxx" #include "salimestatus.hxx" -#include "impimagetree.hxx" #include "xconnection.hxx" #include "vcl/opengl/OpenGLContext.hxx" @@ -368,7 +368,7 @@ DBG_ASSERT( nBadTopWindows==0, aBuf.getStr() ); #endif - ImplImageTreeSingletonRef()->shutDown(); + ImplImageTree::get().shutDown(); osl_removeSignalHandler( pExceptionHandler); pExceptionHandler = NULL; diff -Nru libreoffice-5.0.2/vcl/source/control/edit.cxx libreoffice-5.0.5~rc2/vcl/source/control/edit.cxx --- libreoffice-5.0.2/vcl/source/control/edit.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/control/edit.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -495,6 +495,8 @@ if (!IsReallyVisible()) return; + ApplySettings(rRenderContext); + OUString aText = ImplGetText(); sal_Int32 nLen = aText.getLength(); @@ -1802,6 +1804,8 @@ void Edit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { + ApplySettings(*pDev); + Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); vcl::Font aFont = GetDrawPixelFont( pDev ); diff -Nru libreoffice-5.0.2/vcl/source/control/field2.cxx libreoffice-5.0.5~rc2/vcl/source/control/field2.cxx --- libreoffice-5.0.2/vcl/source/control/field2.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/control/field2.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -819,6 +819,12 @@ Reformat(); } +void PatternField::dispose() +{ + PatternFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool PatternField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -865,6 +871,12 @@ Reformat(); } +void PatternBox::dispose() +{ + PatternFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool PatternBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -1729,6 +1741,12 @@ ResetLastDate(); } +void DateField::dispose() +{ + DateFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool DateField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() && @@ -1828,6 +1846,12 @@ Reformat(); } +void DateBox::dispose() +{ + DateFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool DateBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() && @@ -2515,6 +2539,12 @@ Reformat(); } +void TimeField::dispose() +{ + TimeFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool TimeField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -2652,6 +2682,12 @@ Reformat(); } +void TimeBox::dispose() +{ + TimeFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool TimeBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) diff -Nru libreoffice-5.0.2/vcl/source/control/field.cxx libreoffice-5.0.5~rc2/vcl/source/control/field.cxx --- libreoffice-5.0.2/vcl/source/control/field.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/control/field.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -812,6 +812,12 @@ Show(); } +void NumericField::dispose() +{ + NumericFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool NumericField::set_property(const OString &rKey, const OString &rValue) { if (rKey == "digits") @@ -961,6 +967,12 @@ Show(); } +void NumericBox::dispose() +{ + NumericFormatter::SetField( NULL ); + ComboBox::dispose(); +} + Size NumericBox::CalcMinimumSize() const { Size aRet(calcMinimumSize(*this, *this)); @@ -1636,6 +1648,12 @@ Show(); } +void MetricField::dispose() +{ + MetricFormatter::SetField( NULL ); + SpinField::dispose(); +} + Size MetricField::CalcMinimumSize() const { return calcMinimumSize(*this, *this); @@ -1800,6 +1818,12 @@ Reformat(); } +void MetricBox::dispose() +{ + MetricFormatter::SetField(NULL); + ComboBox::dispose(); +} + Size MetricBox::CalcMinimumSize() const { Size aRet(calcMinimumSize(*this, *this)); @@ -2040,6 +2064,12 @@ Reformat(); } +void CurrencyField::dispose() +{ + CurrencyFormatter::SetField( NULL ); + SpinField::dispose(); +} + bool CurrencyField::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) @@ -2118,6 +2148,12 @@ Reformat(); } +void CurrencyBox::dispose() +{ + CurrencyFormatter::SetField( NULL ); + ComboBox::dispose(); +} + bool CurrencyBox::PreNotify( NotifyEvent& rNEvt ) { if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() ) diff -Nru libreoffice-5.0.2/vcl/source/control/fixed.cxx libreoffice-5.0.5~rc2/vcl/source/control/fixed.cxx --- libreoffice-5.0.2/vcl/source/control/fixed.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/control/fixed.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -23,12 +23,12 @@ #include "vcl/dialog.hxx" #include "vcl/event.hxx" #include "vcl/fixed.hxx" +#include "vcl/implimagetree.hxx" #include "vcl/svapp.hxx" #include "vcl/settings.hxx" #include #include "controldata.hxx" -#include "impimagetree.hxx" #include "window.h" #define FIXEDLINE_TEXT_BORDER 4 @@ -1035,12 +1035,12 @@ Image FixedImage::loadThemeImage(const OString &rFileName) { - static ImplImageTreeSingletonRef aImageTree; OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); const OUString sFileName(OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); BitmapEx aBitmap; - bool bSuccess = aImageTree->loadImage(sFileName, sIconTheme, aBitmap, true); + bool bSuccess = ImplImageTree::get().loadImage( + sFileName, sIconTheme, aBitmap, true); SAL_WARN_IF(!bSuccess, "vcl.layout", "Unable to load " << sFileName << " from theme " << sIconTheme); return Image(aBitmap); diff -Nru libreoffice-5.0.2/vcl/source/control/lstbox.cxx libreoffice-5.0.5~rc2/vcl/source/control/lstbox.cxx --- libreoffice-5.0.2/vcl/source/control/lstbox.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/control/lstbox.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -982,6 +982,8 @@ void ListBox::Clear() { + if (!mpImplLB) + return; mpImplLB->Clear(); if( IsDropDownBox() ) { @@ -1037,13 +1039,15 @@ Image ListBox::GetEntryImage( sal_Int32 nPos ) const { - if ( mpImplLB->GetEntryList()->HasEntryImage( nPos ) ) + if ( mpImplLB && mpImplLB->GetEntryList()->HasEntryImage( nPos ) ) return mpImplLB->GetEntryList()->GetEntryImage( nPos ); return Image(); } sal_Int32 ListBox::GetEntryPos( const OUString& rStr ) const { + if (!mpImplLB) + return LISTBOX_ENTRY_NOTFOUND; sal_Int32 nPos = mpImplLB->GetEntryList()->FindEntry( rStr ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount(); @@ -1052,6 +1056,8 @@ sal_Int32 ListBox::GetEntryPos( const void* pData ) const { + if (!mpImplLB) + return LISTBOX_ENTRY_NOTFOUND; sal_Int32 nPos = mpImplLB->GetEntryList()->FindEntry( pData ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) nPos = nPos - mpImplLB->GetEntryList()->GetMRUCount(); @@ -1060,11 +1066,15 @@ OUString ListBox::GetEntry( sal_Int32 nPos ) const { + if (!mpImplLB) + return OUString(); return mpImplLB->GetEntryList()->GetEntryText( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); } sal_Int32 ListBox::GetEntryCount() const { + if (!mpImplLB) + return 0; return mpImplLB->GetEntryList()->GetEntryCount() - mpImplLB->GetEntryList()->GetMRUCount(); } @@ -1075,11 +1085,16 @@ sal_Int32 ListBox::GetSelectEntryCount() const { + if (!mpImplLB) + return 0; return mpImplLB->GetEntryList()->GetSelectEntryCount(); } sal_Int32 ListBox::GetSelectEntryPos( sal_Int32 nIndex ) const { + if (!mpImplLB || !mpImplLB->GetEntryList()) + return LISTBOX_ENTRY_NOTFOUND; + sal_Int32 nPos = mpImplLB->GetEntryList()->GetSelectEntryPos( nIndex ); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { @@ -1107,6 +1122,9 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect ) { + if (!mpImplLB) + return; + if ( 0 <= nPos && nPos < mpImplLB->GetEntryList()->GetEntryCount() ) { sal_Int32 oldSelectCount = GetSelectEntryCount(), newSelectCount = 0, nCurrentPos = mpImplLB->GetCurrentPos(); diff -Nru libreoffice-5.0.2/vcl/source/edit/vclmedit.cxx libreoffice-5.0.5~rc2/vcl/source/edit/vclmedit.cxx --- libreoffice-5.0.2/vcl/source/edit/vclmedit.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/edit/vclmedit.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1362,11 +1362,17 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) { - ImplInitSettings( true, true, true ); + ImplInitSettings(true, true, true); Point aPos = pDev->LogicToPixel( rPos ); Size aSize = pDev->LogicToPixel( rSize ); - vcl::Font aFont = pImpVclMEdit->GetTextWindow()->GetDrawPixelFont( pDev ); + + vcl::Font aFont = pImpVclMEdit->GetTextWindow()->GetPointFont(*this); + Size aFontSize = aFont.GetSize(); + MapMode aPtMapMode(MAP_POINT); + aFontSize = pDev->LogicToPixel(aFontSize, aPtMapMode); + aFont.SetSize(aFontSize); + aFont.SetTransparent( true ); OutDevType eOutDevType = pDev->GetOutDevType(); diff -Nru libreoffice-5.0.2/vcl/source/filter/jpeg/jpegc.cxx libreoffice-5.0.5~rc2/vcl/source/filter/jpeg/jpegc.cxx --- libreoffice-5.0.2/vcl/source/filter/jpeg/jpegc.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/filter/jpeg/jpegc.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -103,7 +103,13 @@ else if ( cinfo.jpeg_color_space == JCS_YCCK ) cinfo.out_color_space = JCS_CMYK; - OSL_ASSERT(cinfo.out_color_space == JCS_CMYK || cinfo.out_color_space == JCS_GRAYSCALE || cinfo.out_color_space == JCS_RGB); + if (cinfo.out_color_space != JCS_CMYK && + cinfo.out_color_space != JCS_GRAYSCALE && + cinfo.out_color_space != JCS_RGB) + { + SAL_WARN("vcl.filter", "jpg with unknown out color space, forcing to rgb"); + cinfo.out_color_space = JCS_RGB; + } /* change scale for preview import */ long nPreviewWidth = previewSize.Width(); diff -Nru libreoffice-5.0.2/vcl/source/filter/jpeg/JpegWriter.cxx libreoffice-5.0.5~rc2/vcl/source/filter/jpeg/JpegWriter.cxx --- libreoffice-5.0.2/vcl/source/filter/jpeg/JpegWriter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/filter/jpeg/JpegWriter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -200,32 +200,29 @@ } mpReadAccess = aGraphicBmp.AcquireReadAccess(); + if( mpReadAccess ) + { + if ( !mbGreys ) // bitmap was not explicitly converted into greyscale, + { // check if source is greyscale only + bool bIsGrey = true; - if ( !mbGreys ) // bitmap was not explicitly converted into greyscale, - { // check if source is greyscale only - - bool bIsGrey = true; - - long nWidth = mpReadAccess->Width(); - for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ ) - { - BitmapColor aColor; - for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ ) + long nWidth = mpReadAccess->Width(); + for ( long nY = 0; bIsGrey && ( nY < mpReadAccess->Height() ); nY++ ) { - aColor = mpReadAccess->HasPalette() ? mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) ) - : mpReadAccess->GetPixel( nY, nX ); - bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( aColor.GetRed() == aColor.GetBlue() ); + BitmapColor aColor; + for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ ) + { + aColor = mpReadAccess->HasPalette() ? mpReadAccess->GetPaletteColor( mpReadAccess->GetPixelIndex( nY, nX ) ) + : mpReadAccess->GetPixel( nY, nX ); + bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( aColor.GetRed() == aColor.GetBlue() ); + } } + if ( bIsGrey ) + mbGreys = true; } - if ( bIsGrey ) - mbGreys = true; - } - - if( mpExpWasGrey ) - *mpExpWasGrey = mbGreys; + if( mpExpWasGrey ) + *mpExpWasGrey = mbGreys; - if( mpReadAccess ) - { mbNative = ( mpReadAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB ); if( !mbNative ) diff -Nru libreoffice-5.0.2/vcl/source/filter/wmf/winmtf.cxx libreoffice-5.0.5~rc2/vcl/source/filter/wmf/winmtf.cxx --- libreoffice-5.0.2/vcl/source/filter/wmf/winmtf.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/filter/wmf/winmtf.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -408,8 +408,18 @@ } else { - fWidth = rSz.Width(); - fHeight = rSz.Height(); + //take the scale, but not the rotation + basegfx::B2DHomMatrix aMatrix(maXForm.eM11, maXForm.eM12, 0, + maXForm.eM21, maXForm.eM22, 0); + basegfx::B2DTuple aScale, aTranslate; + double fRotate, fShearX; + if (!aMatrix.decompose(aScale, aTranslate, fRotate, fShearX)) + { + aScale.setX(1.0); + aScale.setY(1.0); + } + fWidth = rSz.Width() * aScale.getX(); + fHeight = rSz.Height() * aScale.getY(); } if ( mnGfxMode == GM_COMPATIBLE ) @@ -934,12 +944,11 @@ if ( nRasterOp != mnRop ) { mnRop = nRasterOp; - static WinMtfFillStyle aNopFillStyle; static WinMtfLineStyle aNopLineStyle; if ( mbNopMode && ( nRasterOp != R2_NOP ) ) { // changing modes from R2_NOP so set pen and brush - maFillStyle = aNopFillStyle; + maFillStyle = m_NopFillStyle; maLineStyle = aNopLineStyle; mbNopMode = false; } @@ -958,7 +967,7 @@ meRasterOp = ROP_OVERPAINT; if( !mbNopMode ) { - aNopFillStyle = maFillStyle; + m_NopFillStyle = maFillStyle; aNopLineStyle = maLineStyle; maFillStyle = WinMtfFillStyle( Color( COL_TRANSPARENT ), true ); maLineStyle = WinMtfLineStyle( Color( COL_TRANSPARENT ), true ); diff -Nru libreoffice-5.0.2/vcl/source/filter/wmf/winmtf.hxx libreoffice-5.0.5~rc2/vcl/source/filter/wmf/winmtf.hxx --- libreoffice-5.0.2/vcl/source/filter/wmf/winmtf.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/filter/wmf/winmtf.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -545,6 +545,7 @@ WinMtfLineStyle maLineStyle; WinMtfFillStyle maLatestFillStyle; WinMtfFillStyle maFillStyle; + WinMtfFillStyle m_NopFillStyle; vcl::Font maLatestFont; vcl::Font maFont; sal_uInt32 mnLatestTextAlign; diff -Nru libreoffice-5.0.2/vcl/source/gdi/bitmapex.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/bitmapex.cxx --- libreoffice-5.0.2/vcl/source/gdi/bitmapex.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/bitmapex.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -36,7 +37,6 @@ #include #include -#include #include // BitmapEx::Create @@ -107,11 +107,9 @@ void BitmapEx::loadFromIconTheme( const OUString& rIconName ) { - static ImplImageTreeSingletonRef aImageTree; - OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - if( !aImageTree->loadImage( rIconName, aIconTheme, *this, true ) ) + if( !ImplImageTree::get().loadImage( rIconName, aIconTheme, *this, true ) ) { #ifdef DBG_UTIL OStringBuffer aErrorStr( diff -Nru libreoffice-5.0.2/vcl/source/gdi/dibtools.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/dibtools.cxx --- libreoffice-5.0.2/vcl/source/gdi/dibtools.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/dibtools.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -267,7 +267,19 @@ rHeader.nSizeImage = 0; } - return( ( rHeader.nPlanes == 1 ) && ( rIStm.GetError() == 0UL ) ); + + if (rHeader.nPlanes != 1) + return false; + + if (rHeader.nBitCount != 0 && rHeader.nBitCount != 1 && + rHeader.nBitCount != 4 && rHeader.nBitCount != 8 && + rHeader.nBitCount != 16 && rHeader.nBitCount != 24 && + rHeader.nBitCount != 32) + { + return false; + } + + return rIStm.good(); } bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, bool bQuad ) diff -Nru libreoffice-5.0.2/vcl/source/gdi/image.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/image.cxx --- libreoffice-5.0.2/vcl/source/gdi/image.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/image.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #if OSL_DEBUG_LEVEL > 0 @@ -372,8 +372,6 @@ void ImageAryData::Load(const OUString &rPrefix) { - static ImplImageTreeSingletonRef aImageTree; - OUString aIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); BitmapEx aBmpEx; @@ -383,7 +381,7 @@ #if OSL_DEBUG_LEVEL > 0 bool bSuccess = #endif - aImageTree->loadImage( aFileName, aIconTheme, maBitmapEx, true ); + ImplImageTree::get().loadImage(aFileName, aIconTheme, maBitmapEx, true); #if OSL_DEBUG_LEVEL > 0 if ( !bSuccess ) { diff -Nru libreoffice-5.0.2/vcl/source/gdi/imagerepository.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/imagerepository.cxx --- libreoffice-5.0.2/vcl/source/gdi/imagerepository.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/imagerepository.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -19,9 +19,9 @@ #include #include +#include #include #include -#include "impimagetree.hxx" namespace vcl { @@ -29,15 +29,13 @@ { OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - ImplImageTreeSingletonRef aImplImageTree; - return aImplImageTree->loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent, loadMissing ); + return ImplImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, _bSearchLanguageDependent, loadMissing ); } bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage) { OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - ImplImageTreeSingletonRef aImplImageTree; - return aImplImageTree->loadDefaultImage( sIconTheme,_out_rImage); + return ImplImageTree::get().loadDefaultImage( sIconTheme,_out_rImage); } } // namespace vcl diff -Nru libreoffice-5.0.2/vcl/source/gdi/impimage.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/impimage.cxx --- libreoffice-5.0.2/vcl/source/gdi/impimage.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/impimage.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -29,6 +29,10 @@ #include #include +#if defined WNT +#include +#endif + #define IMPSYSIMAGEITEM_MASK ( 0x01 ) #define IMPSYSIMAGEITEM_ALPHA ( 0x02 ) @@ -182,7 +186,12 @@ if( nStyle & DrawImageFlags::Disable ) { - ImplUpdateDisabledBmpEx( nPos); + BitmapChecksum aChecksum = maBmpEx.GetChecksum(); + if (maBitmapChecksum != aChecksum) + { + maBitmapChecksum = aChecksum; + ImplUpdateDisabledBmpEx(nPos); + } pOutDev->DrawBitmapEx( rPos, aOutSize, aSrcPos, maSize, maDisabledBmpEx ); } else @@ -331,7 +340,7 @@ if( !mpDisplayBmp && !maBmpEx.IsEmpty() ) { #if defined WNT - if( !maBmpEx.IsAlpha() ) + if( !maBmpEx.IsAlpha() && !OpenGLHelper::isVCLOpenGLEnabled()) { // FIXME: this looks like rather an obsolete code-path to me. const Bitmap aBmp( maBmpEx.GetBitmap().CreateDisplayBitmap( pOutDev ) ); diff -Nru libreoffice-5.0.2/vcl/source/gdi/impimagetree.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/impimagetree.cxx --- libreoffice-5.0.2/vcl/source/gdi/impimagetree.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/impimagetree.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -34,15 +34,16 @@ #include "osl/file.hxx" #include "osl/diagnose.h" #include "rtl/bootstrap.hxx" +#include "rtl/uri.hxx" #include "tools/stream.hxx" #include "tools/urlobj.hxx" #include "vcl/bitmapex.hxx" #include +#include #include "vcl/pngread.hxx" #include "vcl/settings.hxx" #include "vcl/svapp.hxx" -#include "impimagetree.hxx" #include using namespace css; @@ -91,6 +92,11 @@ } +ImplImageTree & ImplImageTree::get() { + static ImplImageTree instance; + return instance; +} + ImplImageTree::ImplImageTree() { } @@ -99,6 +105,65 @@ { } +OUString ImplImageTree::getImageUrl( + OUString const & name, OUString const & style, OUString const & lang) +{ + OUString aStyle(style); + while (!aStyle.isEmpty()) + { + try { + setStyle(aStyle); + + std::vector< OUString > paths; + paths.push_back(getRealImageName(name)); + + if (!lang.isEmpty()) + { + sal_Int32 pos = name.lastIndexOf('/'); + if (pos != -1) + { + std::vector aFallbacks( + LanguageTag(lang).getFallbackStrings(true)); + for (std::vector< OUString >::reverse_iterator it( aFallbacks.rbegin()); + it != aFallbacks.rend(); ++it) + { + paths.push_back( getRealImageName( createPath(name, pos, *it) ) ); + } + } + } + + try { + if (checkPathAccess()) { + const uno::Reference &rNameAccess = maIconSet[maCurrentStyle].maNameAccess; + + for (std::vector::const_reverse_iterator j(paths.rbegin()); j != paths.rend(); ++j) + { + if (rNameAccess->hasByName(*j)) + { + return "vnd.sun.star.zip://" + + rtl::Uri::encode( + maIconSet[maCurrentStyle].maURL + ".zip", + rtl_UriCharClassRegName, + rtl_UriEncodeIgnoreEscapes, + RTL_TEXTENCODING_UTF8) + + "/" + *j; + // assuming *j contains no problematic chars + } + } + } + } catch (css::uno::RuntimeException &) { + throw; + } catch (const css::uno::Exception & e) { + SAL_INFO("vcl", "exception " << e.Message); + } + } + catch (css::uno::RuntimeException &) {} + + aStyle = fallbackStyle(aStyle); + } + return OUString(); +} + OUString ImplImageTree::fallbackStyle(const OUString &style) { if (style == "galaxy") @@ -354,9 +419,7 @@ /// Recursively dump all names ... css::uno::Sequence ImageTree_getAllImageNames() { - static ImplImageTreeSingletonRef aImageTree; - - css::uno::Reference xRef(aImageTree->getNameAccess()); + css::uno::Reference xRef(ImplImageTree::get().getNameAccess()); return xRef->getElementNames(); } diff -Nru libreoffice-5.0.2/vcl/source/gdi/metric.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/metric.cxx --- libreoffice-5.0.2/vcl/source/gdi/metric.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/metric.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -151,6 +151,11 @@ return mpImplMetric->GetSlant(); } +bool FontMetric::IsFullstopCentered() const +{ + return mpImplMetric->IsFullstopCentered(); +} + FontMetric& FontMetric::operator =( const FontMetric& rMetric ) { vcl::FontInfo::operator=( rMetric ); diff -Nru libreoffice-5.0.2/vcl/source/gdi/pdfwriter_impl.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/pdfwriter_impl.cxx --- libreoffice-5.0.2/vcl/source/gdi/pdfwriter_impl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/pdfwriter_impl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -11426,7 +11426,8 @@ beginCompression(); if( ! bTrueColor || pAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB ) { - const int nScanLineBytes = 1 + ( pAccess->GetBitCount() * ( pAccess->Width() - 1 ) / 8U ); + //With PDF bitmaps, each row is padded to a BYTE boundary (multiple of 8 bits). + const int nScanLineBytes = ((pAccess->GetBitCount() * pAccess->Width()) + 7U) / 8U; for( int i = 0; i < pAccess->Height(); i++ ) { diff -Nru libreoffice-5.0.2/vcl/source/gdi/sallayout.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/sallayout.cxx --- libreoffice-5.0.2/vcl/source/gdi/sallayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/sallayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -200,7 +200,7 @@ are GF_NONE also, but already handled in the outer if condition */ if((nChar >= 0x3008 && nChar <= 0x301C && nChar != 0x3012) - || (nChar == 0xFF3B || nChar == 0xFF3D) + || (nChar == 0xFF3B || nChar == 0xFF3D || nChar==0xFF08 || nChar==0xFF09) || (nChar >= 0xFF5B && nChar <= 0xFF9F) // halfwidth forms || (nChar == 0xFFE3) ) return GF_NONE; // not rotated @@ -1720,8 +1720,9 @@ maFallbackRuns[n].ResetPos(); // get the next codepoint index that needs fallback int nActiveCharPos = nCharPos[0]; + int nActiveCharIndex = nActiveCharPos - mnMinCharPos; // get the end index of the active run - int nLastRunEndChar = (vRtl[nActiveCharPos - mnMinCharPos])? + int nLastRunEndChar = (nActiveCharIndex >= 0 && vRtl[nActiveCharIndex]) ? rArgs.mnEndCharPos : rArgs.mnMinCharPos - 1; int nRunVisibleEndChar = nCharPos[0]; // merge the fallback levels @@ -1870,7 +1871,8 @@ if( !bLTR ) nOldRunAdv = -nOldRunAdv; #endif - if (vRtl[nActiveCharPos - mnMinCharPos]) + nActiveCharIndex = nActiveCharPos - mnMinCharPos; + if (nActiveCharIndex >= 0 && vRtl[nActiveCharIndex]) { if (nRunVisibleEndChar > mnMinCharPos && nRunVisibleEndChar <= mnEndCharPos) nRunAdvance -= aMultiArgs.mpDXArray[nRunVisibleEndChar - 1 - mnMinCharPos]; @@ -1977,9 +1979,12 @@ fUnitMul /= rLayout.GetUnitsPerPixel(); for( int i = 0; i < nCharCount; ++i ) { - DeviceCoordinate w = pCharWidths[ i + nCharCount ]; - w = (DeviceCoordinate)(w * fUnitMul + 0.5); - pCharWidths[ i ] += w; + if( pCharWidths[ i ] == 0 ) + { + DeviceCoordinate w = pCharWidths[ i + nCharCount ]; + w = (DeviceCoordinate)(w * fUnitMul + 0.5); + pCharWidths[ i ] = w; + } } } diff -Nru libreoffice-5.0.2/vcl/source/gdi/virdev.cxx libreoffice-5.0.5~rc2/vcl/source/gdi/virdev.cxx --- libreoffice-5.0.2/vcl/source/gdi/virdev.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/gdi/virdev.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -129,6 +129,8 @@ { SAL_INFO( "vcl.virdev", "ImplInitVirDev(" << nDX << "," << nDY << "," << nBitCount << ")" ); + bool bErase = nDX > 0 && nDY > 0; + if ( nDX < 1 ) nDX = 1; @@ -191,7 +193,7 @@ SetBackground( Wallpaper( Color( COL_WHITE ) ) ); // #i59283# don't erase user-provided surface - if( !pData ) + if( !pData && bErase) Erase(); // register VirDev in the list @@ -212,7 +214,7 @@ "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount, not " << nBitCount ); SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" ); - ImplInitVirDev( Application::GetDefaultDevice(), 1, 1, nBitCount ); + ImplInitVirDev( Application::GetDefaultDevice(), 0, 0, nBitCount ); } VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount ) @@ -223,7 +225,7 @@ "VirtualDevice::VirtualDevice(): Only 0, 1 or 8 allowed for BitCount, not " << nBitCount ); SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << " )" ); - ImplInitVirDev( &rCompDev, 1, 1, nBitCount ); + ImplInitVirDev( &rCompDev, 0, 0, nBitCount ); } VirtualDevice::VirtualDevice( const OutputDevice& rCompDev, sal_uInt16 nBitCount, sal_uInt16 nAlphaBitCount ) @@ -235,7 +237,7 @@ SAL_INFO( "vcl.gdi", "VirtualDevice::VirtualDevice( " << nBitCount << ", " << nAlphaBitCount << " )" ); - ImplInitVirDev( &rCompDev, 1, 1, nBitCount ); + ImplInitVirDev( &rCompDev, 0, 0, nBitCount ); // Enable alpha channel mnAlphaDepth = sal::static_int_cast(nAlphaBitCount); diff -Nru libreoffice-5.0.2/vcl/source/opengl/OpenGLContext.cxx libreoffice-5.0.5~rc2/vcl/source/opengl/OpenGLContext.cxx --- libreoffice-5.0.2/vcl/source/opengl/OpenGLContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/opengl/OpenGLContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -960,14 +960,22 @@ } if (!InitGLEW()) + { + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hTempRC); return false; + } HGLRC hSharedCtx = 0; if (!g_vShareList.empty()) hSharedCtx = g_vShareList.front(); if (!wglCreateContextAttribsARB) + { + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hTempRC); return false; + } // now setup the shared context; this needs a temporary context already // set up in order to work @@ -983,6 +991,8 @@ { ImplWriteLastError(GetLastError(), "wglCreateContextAttribsARB in OpenGLContext::ImplInit"); SAL_WARN("vcl.opengl", "wglCreateContextAttribsARB failed"); + wglMakeCurrent(NULL, NULL); + wglDeleteContext(hTempRC); return false; } diff -Nru libreoffice-5.0.2/vcl/source/opengl/OpenGLHelper.cxx libreoffice-5.0.5~rc2/vcl/source/opengl/OpenGLHelper.cxx --- libreoffice-5.0.2/vcl/source/opengl/OpenGLHelper.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/opengl/OpenGLHelper.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -11,6 +11,7 @@ #include #include +#include #include #include #include @@ -66,6 +67,7 @@ { OUString aFileURL = getShaderFolder() + rFilename +".glsl"; osl::File aFile(aFileURL); + SAL_INFO("vcl.opengl", "Reading " << aFileURL); if(aFile.open(osl_File_OpenFlag_Read) == osl::FileBase::E_None) { sal_uInt64 nSize = 0; @@ -85,6 +87,20 @@ return OString(); } +OString& getShaderSource(const OUString& rFilename) +{ + static std::unordered_map aMap; + static osl::Mutex aMutex; + osl::MutexGuard aGuard(aMutex); + + if (aMap.find(rFilename) == aMap.end()) + { + aMap[rFilename] = loadShader(rFilename); + } + + return aMap[rFilename]; +} + } namespace { @@ -189,8 +205,8 @@ const OString& rPreamble ) { // read shaders source - OString aVertexShaderSource = loadShader( rVertexShaderName ); - OString aFragmentShaderSource = loadShader( rFragmentShaderName ); + OString aVertexShaderSource = getShaderSource( rVertexShaderName ); + OString aFragmentShaderSource = getShaderSource( rFragmentShaderName ); // get info about the graphic device #if defined( SAL_UNX ) && !defined( MACOSX ) && !defined( IOS )&& !defined( ANDROID ) @@ -374,8 +390,8 @@ GLint ProgramID = glCreateProgram(); // read shaders from file - OString aVertexShaderSource = loadShader(rVertexShaderName); - OString aFragmentShaderSource = loadShader(rFragmentShaderName); + OString aVertexShaderSource = getShaderSource(rVertexShaderName); + OString aFragmentShaderSource = getShaderSource(rFragmentShaderName); GLint bBinaryResult = GL_FALSE; diff -Nru libreoffice-5.0.2/vcl/source/outdev/bitmap.cxx libreoffice-5.0.5~rc2/vcl/source/outdev/bitmap.cxx --- libreoffice-5.0.2/vcl/source/outdev/bitmap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/outdev/bitmap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -807,11 +807,13 @@ const long nMapY = mpMapY[nY]; const long nMapFY = mpMapYOffset[nY]; - pLine0 = pSource->GetScanline(nMapY); - pLine1 = pSource->GetScanline(nMapY + 1); + pLine0 = pSource->GetScanline(nMapY); + // tdf#95481 guard nMapY + 1 to be within bounds + pLine1 = (nMapY + 1 < pSource->Height()) ? pSource->GetScanline(nMapY + 1) : pLine0; pLineAlpha0 = pSourceAlpha->GetScanline(nMapY); - pLineAlpha1 = pSourceAlpha->GetScanline(nMapY + 1); + // tdf#95481 guard nMapY + 1 to be within bounds + pLineAlpha1 = (nMapY + 1 < pSourceAlpha->Height()) ? pSourceAlpha->GetScanline(nMapY + 1) : pLineAlpha0; pDestScanline = pDestination->GetScanline(nY); diff -Nru libreoffice-5.0.2/vcl/source/outdev/font.cxx libreoffice-5.0.5~rc2/vcl/source/outdev/font.cxx --- libreoffice-5.0.2/vcl/source/outdev/font.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/outdev/font.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -215,6 +215,8 @@ aMetric.mpImplMetric->mnMiscFlags |= ImplFontMetric::DEVICE_FLAG; if( pMetric->mbScalableFont ) aMetric.mpImplMetric->mnMiscFlags |= ImplFontMetric::SCALABLE_FLAG; + if ( pMetric->mbFullstopCentered) + aMetric.mpImplMetric->mnMiscFlags |= ImplFontMetric::FULLSTOP_CENTERED_FLAG; aMetric.mpImplMetric->mnAscent = ImplDevicePixelToLogicHeight( pMetric->mnAscent+mnEmphasisAscent ); aMetric.mpImplMetric->mnDescent = ImplDevicePixelToLogicHeight( pMetric->mnDescent+mnEmphasisDescent ); aMetric.mpImplMetric->mnIntLeading = ImplDevicePixelToLogicHeight( pMetric->mnIntLeading+mnEmphasisAscent ); @@ -1258,7 +1260,6 @@ ImplFontEntry* ImplFontCache::GetFontEntry( PhysicalFontCollection* pFontList, FontSelectPattern& aFontSelData ) { - const FontSelectPattern aFontSelDataOrig(aFontSelData); // check if a directly matching logical font instance is already cached, // the most recently used font usually has a hit rate of >50% ImplFontEntry *pEntry = NULL; @@ -1345,9 +1346,8 @@ } #endif - // Add the new entry to the cache with the original FontSelectPattern, - // so that we can find it next time as a direct cache hit. - maFontInstanceList[ aFontSelDataOrig ] = pEntry; + // add the new entry to the cache + maFontInstanceList[ aFontSelData ] = pEntry; } mpFirstEntry = pEntry; @@ -1733,6 +1733,7 @@ , mnMinKashida( 0 ) , meFamilyType(FAMILY_DONTKNOW) , mbScalableFont(false) + , mbFullstopCentered(false) , mnUnderlineSize( 0 ) , mnUnderlineOffset( 0 ) , mnBUnderlineSize( 0 ) @@ -1777,6 +1778,7 @@ } } + void ImplFontMetricData::ImplInitTextLineSize( const OutputDevice* pDev ) { long nDescent = mnDescent; @@ -1859,6 +1861,21 @@ mnDStrikeoutSize = n2LineHeight; mnDStrikeoutOffset1 = nStrikeoutOffset - n2LineDY2 - n2LineHeight; mnDStrikeoutOffset2 = mnDStrikeoutOffset1 + n2LineDY + n2LineHeight; + + const vcl::Font& rFont ( pDev->GetFont() ); + bool bCentered = true; + if (MsLangId::isCJK(rFont.GetLanguage())) + { + const OUString sFullstop( sal_Unicode( 0x3001 ) ); // Fullwidth fullstop + Rectangle aRect; + pDev->GetTextBoundRect( aRect, sFullstop ); + const sal_uInt16 nH = rFont.GetSize().Height(); + const sal_uInt16 nB = aRect.Left(); + // Use 18.75% as a threshold to define a centered fullwidth fullstop. + // In general, nB/nH < 5% for most Japanese fonts. + bCentered = (nB > (((nH >> 1)+nH)>>3)) ? true : false; + } + mbFullstopCentered = bCentered ; } void ImplFontMetricData::ImplInitAboveTextLineSize() diff -Nru libreoffice-5.0.2/vcl/source/outdev/text.cxx libreoffice-5.0.5~rc2/vcl/source/outdev/text.cxx --- libreoffice-5.0.2/vcl/source/outdev/text.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/outdev/text.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1007,7 +1007,7 @@ } if( nIndex >= rStr.getLength() ) - return 0; + return 0; // TODO: this looks like a buggy caller? if( nLen < 0 || nIndex + nLen >= rStr.getLength() ) { @@ -1017,7 +1017,19 @@ SalLayout *const pSalLayout = ImplLayout(rStr, nIndex, nLen, Point(0,0), 0, nullptr, SalLayoutFlags::NONE, pLayoutCache); if( !pSalLayout ) + { + // The caller expects this to init the elements of pDXAry. + // Adapting all the callers to check that GetTextArray succeeded seems + // too much work. + // Init here to 0 only in the (rare) error case, so that any missing + // element init in the happy case will still be found by tools, + // and hope that is sufficient. + if (pDXAry) + { + memset(pDXAry, 0, nLen * sizeof(*pDXAry)); + } return 0; + } #if VCL_FLOAT_DEVICE_PIXEL DeviceCoordinate* pDXPixelArray = NULL; if(pDXAry) diff -Nru libreoffice-5.0.2/vcl/source/outdev/transparent.cxx libreoffice-5.0.5~rc2/vcl/source/outdev/transparent.cxx --- libreoffice-5.0.2/vcl/source/outdev/transparent.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/outdev/transparent.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -751,7 +751,7 @@ const AlphaMask aAlpha(xVDev->GetBitmap(aPoint, xVDev->GetOutputSizePixel())); - xVDev.reset(); + xVDev.disposeAndClear(); // draw masked content to target and restore MapMode DrawBitmapEx(aDstRect.TopLeft(), BitmapEx(aPaint, aAlpha)); @@ -799,7 +799,7 @@ aAlpha = xVDev->GetBitmap( Point(), xVDev->GetOutputSizePixel() ); - xVDev.reset(); + xVDev.disposeAndClear(); EnableMapMode( false ); DrawBitmapEx( aDstRect.TopLeft(), BitmapEx( aPaint, aAlpha ) ); diff -Nru libreoffice-5.0.2/vcl/source/window/dialog.cxx libreoffice-5.0.5~rc2/vcl/source/window/dialog.cxx --- libreoffice-5.0.2/vcl/source/window/dialog.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/window/dialog.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -816,6 +816,7 @@ ImplAdjustNWFSizes(); Show(); + ToTop(); pSVData->maAppData.mnModalMode++; return true; diff -Nru libreoffice-5.0.2/vcl/source/window/menufloatingwindow.cxx libreoffice-5.0.5~rc2/vcl/source/window/menufloatingwindow.cxx --- libreoffice-5.0.2/vcl/source/window/menufloatingwindow.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/window/menufloatingwindow.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -190,7 +190,7 @@ long nY = GetInitialItemY(); long nMouseY = rMEvt.GetPosPixel().Y(); Size aOutSz = GetOutputSizePixel(); - if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() + nY ) ) ) + if ( ( nMouseY >= nY ) && ( nMouseY < ( aOutSz.Height() - nY ) ) ) { bool bHighlighted = false; size_t nCount = pMenu->pItemList->size(); diff -Nru libreoffice-5.0.2/vcl/source/window/syswin.cxx libreoffice-5.0.5~rc2/vcl/source/window/syswin.cxx --- libreoffice-5.0.2/vcl/source/window/syswin.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/window/syswin.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1004,11 +1004,13 @@ void SystemWindow::queue_resize(StateChangedType /*eReason*/) { - if (hasPendingLayout() || isCalculatingInitialLayoutSize()) - return; if (!isLayoutEnabled()) return; + if (isCalculatingInitialLayoutSize()) + return; InvalidateSizeCache(); + if (hasPendingLayout()) + return; maLayoutIdle.Start(); } diff -Nru libreoffice-5.0.2/vcl/source/window/window2.cxx libreoffice-5.0.5~rc2/vcl/source/window/window2.cxx --- libreoffice-5.0.2/vcl/source/window/window2.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/source/window/window2.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -654,7 +654,7 @@ vcl::Font Window::GetDrawPixelFont(OutputDevice* pDev) const { - vcl::Font aFont = GetPointFont(*const_cast(this)); + vcl::Font aFont = GetPointFont(*pDev); Size aFontSize = aFont.GetSize(); MapMode aPtMapMode(MAP_POINT); aFontSize = pDev->LogicToPixel( aFontSize, aPtMapMode ); diff -Nru libreoffice-5.0.2/vcl/unx/generic/app/saldisp.cxx libreoffice-5.0.5~rc2/vcl/unx/generic/app/saldisp.cxx --- libreoffice-5.0.2/vcl/unx/generic/app/saldisp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/generic/app/saldisp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -741,11 +741,16 @@ if( aRet.isEmpty() ) { const char *pString = XKeysymToString( nKeySym ); - int n = strlen( pString ); - if( n > 2 && pString[n-2] == '_' ) - aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); + if (pString) + { + int n = strlen( pString ); + if( n > 2 && pString[n-2] == '_' ) + aRet = OUString( pString, n-2, RTL_TEXTENCODING_ISO_8859_1 ); + else + aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); + } else - aRet = OUString( pString, n, RTL_TEXTENCODING_ISO_8859_1 ); + aRet = "???"; } } } diff -Nru libreoffice-5.0.2/vcl/unx/generic/gdi/cairotextrender.cxx libreoffice-5.0.5~rc2/vcl/unx/generic/gdi/cairotextrender.cxx --- libreoffice-5.0.2/vcl/unx/generic/gdi/cairotextrender.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/generic/gdi/cairotextrender.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -248,7 +248,7 @@ { int nGlyphRotation = *aI; - std::vector::const_iterator aNext = std::find_if(aI+1, aEnd, hasRotation); + std::vector::const_iterator aNext = nGlyphRotation?(aI+1):std::find_if(aI+1, aEnd, hasRotation); size_t nStartIndex = std::distance(aStart, aI); size_t nLen = std::distance(aI, aNext); diff -Nru libreoffice-5.0.2/vcl/unx/generic/printer/ppdparser.cxx libreoffice-5.0.5~rc2/vcl/unx/generic/printer/ppdparser.cxx --- libreoffice-5.0.2/vcl/unx/generic/printer/ppdparser.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/generic/printer/ppdparser.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -875,8 +875,22 @@ void PPDParser::parse( ::std::list< OString >& rLines ) { + // Name for PPD group into which all options are put for which the PPD + // does not explicitly define a group. + // This is similar to how CUPS handles it, + // s. Sweet, Michael R. (2001): Common UNIX Printing System, p. 251: + // "Each option in turn is associated with a group stored in the + // ppd_group_t structure. Groups can be specified in the PPD file; if an + // option is not associated with a group, it is put in a "General" or + // "Extra" group depending on the option. + static const OString aDefaultPPDGroupName("General"); + std::list< OString >::iterator line = rLines.begin(); PPDParser::hash_type::const_iterator keyit; + + // name of the PPD group that is currently being processed + OString aCurrentGroup = aDefaultPPDGroupName; + while( line != rLines.end() ) { OString aCurrentLine( *line ); @@ -898,10 +912,26 @@ { continue; } + + if (aKey == "CloseGroup") + { + aCurrentGroup = aDefaultPPDGroupName; + continue; + } + if (aKey == "OpenGroup") + { + OString aGroupName = aCurrentLine; + sal_Int32 nPosition = aGroupName.indexOf('/'); + if (nPosition != -1) + { + aGroupName = aGroupName.copy(0, nPosition); + } + + aCurrentGroup = GetCommandLineToken(1, aGroupName); + continue; + } if ((aKey == "CloseUI") || (aKey == "JCLCloseUI") || - (aKey == "OpenGroup") || - (aKey == "CloseGroup") || (aKey == "End") || (aKey == "JCLEnd") || (aKey == "OpenSubGroup") || @@ -912,7 +942,7 @@ if ((aKey == "OpenUI") || (aKey == "JCLOpenUI")) { - parseOpenUI( aCurrentLine ); + parseOpenUI( aCurrentLine, aCurrentGroup); continue; } else if (aKey == "OrderDependency") @@ -1160,7 +1190,7 @@ } } -void PPDParser::parseOpenUI(const OString& rLine) +void PPDParser::parseOpenUI(const OString& rLine, const OString& rPPDGroup) { OUString aTranslation; OString aKey = rLine; @@ -1199,6 +1229,8 @@ pKey->m_eUIType = PPDKey::PickMany; else pKey->m_eUIType = PPDKey::PickOne; + + pKey->m_aGroup = OStringToOUString(rPPDGroup, RTL_TEXTENCODING_MS_1252); } void PPDParser::parseOrderDependency(const OString& rLine) diff -Nru libreoffice-5.0.2/vcl/unx/gtk/app/gtkdata.cxx libreoffice-5.0.5~rc2/vcl/unx/gtk/app/gtkdata.cxx --- libreoffice-5.0.2/vcl/unx/gtk/app/gtkdata.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/gtk/app/gtkdata.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -709,6 +709,7 @@ exit(0); } +#if !GTK_CHECK_VERSION(3,0,0) /* * if a -display switch was used, we need * to set the environment accoringly since @@ -719,6 +720,7 @@ const gchar *name = gdk_display_get_name( pGdkDisp ); OUString envValue(name, strlen(name), aEnc); osl_setEnvironment(envVar.pData, envValue.pData); +#endif GtkSalDisplay *pDisplay = new GtkSalDisplay( pGdkDisp ); SetDisplay( pDisplay ); diff -Nru libreoffice-5.0.2/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx libreoffice-5.0.5~rc2/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx --- libreoffice-5.0.2/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -425,7 +425,11 @@ gtk_container_get_children( GTK_CONTAINER( pActionArea ) ); for( GList *p = pChildren; p; p = p->next ) - gtk_widget_destroy( GTK_WIDGET( p->data ) ); + { + GtkWidget *pWidget = GTK_WIDGET( p->data ); + if ( GTK_IS_BUTTON( pWidget ) ) + gtk_widget_destroy( pWidget ); + } g_list_free( pChildren ); } diff -Nru libreoffice-5.0.2/vcl/unx/gtk/window/gtksalframe.cxx libreoffice-5.0.5~rc2/vcl/unx/gtk/window/gtksalframe.cxx --- libreoffice-5.0.2/vcl/unx/gtk/window/gtksalframe.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/gtk/window/gtksalframe.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -947,10 +947,12 @@ { gint nOrigwidth, nOrigheight; gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); +#if !GTK_CHECK_VERSION(3,0,0) if (nWidth > nOrigwidth || nHeight > nOrigheight) { m_bPaintsBlocked = true; } +#endif gtk_widget_set_size_request(m_pWindow, nWidth, nHeight ); } @@ -958,10 +960,12 @@ { gint nOrigwidth, nOrigheight; gtk_window_get_size(GTK_WINDOW(m_pWindow), &nOrigwidth, &nOrigheight); +#if !GTK_CHECK_VERSION(3,0,0) if (nWidth > nOrigwidth || nHeight > nOrigheight) { m_bPaintsBlocked = true; } +#endif gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); } @@ -1040,6 +1044,7 @@ g_signal_connect( G_OBJECT(m_pWindow), "button-release-event", G_CALLBACK(signalButton), this ); #if GTK_CHECK_VERSION(3,0,0) g_signal_connect( G_OBJECT(m_pWindow), "draw", G_CALLBACK(signalDraw), this ); + g_signal_connect( G_OBJECT(m_pWindow), "size-allocate", G_CALLBACK(sizeAllocated), this ); // g_signal_connect( G_OBJECT(m_pWindow), "state-flags-changed", G_CALLBACK(signalFlagsChanged), this ); #if GTK_CHECK_VERSION(3,14,0) GtkGesture *pSwipe = gtk_gesture_swipe_new(m_pWindow); @@ -3042,8 +3047,19 @@ #if !GTK_CHECK_VERSION(3,0,0) return GetGtkSalData()->GetGtkDisplay()->GetIndicatorState(); #else - g_warning ("missing get indicator state"); - return KeyIndicatorState::NONE; + KeyIndicatorState nState = KeyIndicatorState::NONE; + + GdkKeymap *pKeyMap = gdk_keymap_get_for_display(getGdkDisplay()); + + if (gdk_keymap_get_caps_lock_state(pKeyMap)) + nState |= KeyIndicatorState::CAPSLOCK; + if (gdk_keymap_get_num_lock_state(pKeyMap)) + nState |= KeyIndicatorState::NUMLOCK; +#if GTK_CHECK_VERSION(3,18,0) + if (gdk_keymap_get_scroll_lock_state(pKeyMap)) + nState |= KeyIndicatorState::SCROLLLOCK; +#endif + return nState; #endif } @@ -3658,7 +3674,6 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) { GtkSalFrame* pThis = static_cast(frame); - pThis->m_bPaintsBlocked = false; cairo_save(cr); @@ -3675,7 +3690,87 @@ cairo_surface_flush(cairo_get_target(cr)); - return FALSE; + return false; +} + +void GtkSalFrame::sizeAllocated(GtkWidget*, GdkRectangle *pAllocation, gpointer frame) +{ + GtkSalFrame* pThis = static_cast(frame); + + bool bSized = false; + + if( pThis->m_bFullscreen || (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE ) + { + if( pAllocation->width != (int)pThis->maGeometry.nWidth || pAllocation->height != (int)pThis->maGeometry.nHeight ) + { + bSized = true; + pThis->maGeometry.nWidth = pAllocation->width; + pThis->maGeometry.nHeight = pAllocation->height; + } + } + + if( bSized ) + { + pThis->AllocateFrame(); + pThis->CallCallback( SALEVENT_RESIZE, nullptr ); + pThis->TriggerPaintEvent(); + } +} + +gboolean GtkSalFrame::signalConfigure(GtkWidget*, GdkEventConfigure* pEvent, gpointer frame) +{ + GtkSalFrame* pThis = static_cast(frame); + pThis->m_bPaintsBlocked = false; + + bool bMoved = false; + int x = pEvent->x, y = pEvent->y; + + /* HACK: during sizing/moving a toolbar pThis->maGeometry is actually + * already exact; even worse: due to the asynchronicity of configure + * events the borderwindow which would evaluate this event + * would size/move based on wrong data if we would actually evaluate + * this event. So let's swallow it. + */ + if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && + GtkSalFrame::getDisplay()->GetCaptureFrame() == pThis ) + return false; + + /* #i31785# claims we cannot trust the x,y members of the event; + * they are e.g. not set correctly on maximize/demaximize; + * yet the gdkdisplay-x11.c code handling configure_events has + * done this XTranslateCoordinates work since the day ~zero. + */ + if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY ) + { + bMoved = true; + pThis->maGeometry.nX = x; + pThis->maGeometry.nY = y; + } + + // update decoration hints + if( ! (pThis->m_nStyle & SAL_FRAME_STYLE_PLUG) ) + { + GdkRectangle aRect; + gdk_window_get_frame_extents( widget_get_window(GTK_WIDGET(pThis->m_pWindow)), &aRect ); + pThis->maGeometry.nTopDecoration = y - aRect.y; + pThis->maGeometry.nBottomDecoration = aRect.y + aRect.height - y - pEvent->height; + pThis->maGeometry.nLeftDecoration = x - aRect.x; + pThis->maGeometry.nRightDecoration = aRect.x + aRect.width - x - pEvent->width; + } + else + { + pThis->maGeometry.nTopDecoration = + pThis->maGeometry.nBottomDecoration = + pThis->maGeometry.nLeftDecoration = + pThis->maGeometry.nRightDecoration = 0; + } + + pThis->updateScreenNumber(); + + if (bMoved) + pThis->CallCallback(SALEVENT_MOVE, nullptr); + + return false; } #else gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) @@ -3690,6 +3785,87 @@ return false; } +gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) +{ + GtkSalFrame* pThis = static_cast(frame); + pThis->m_bPaintsBlocked = false; + + bool bMoved = false, bSized = false; + int x = pEvent->x, y = pEvent->y; + + /* HACK: during sizing/moving a toolbar pThis->maGeometry is actually + * already exact; even worse: due to the asynchronicity of configure + * events the borderwindow which would evaluate this event + * would size/move based on wrong data if we would actually evaluate + * this event. So let's swallow it. + */ + if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && + GtkSalFrame::getDisplay()->GetCaptureFrame() == pThis ) + return false; + + /* #i31785# claims we cannot trust the x,y members of the event; + * they are e.g. not set correctly on maximize/demaximize; + * yet the gdkdisplay-x11.c code handling configure_events has + * done this XTranslateCoordinates work since the day ~zero. + */ + if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY ) + { + bMoved = true; + pThis->maGeometry.nX = x; + pThis->maGeometry.nY = y; + } + /* #i86302# + * for non sizeable windows we set the min and max hint for the window manager to + * achieve correct sizing. However this is asynchronous and e.g. on Compiz + * it sometimes happens that the window gets resized to another size (some default) + * if we update the size here, subsequent setMinMaxSize will use this wrong size + * - which is not good since the window manager will now size the window back to this + * wrong size at some point. + */ + if( pThis->m_bFullscreen || (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE ) + { + if( pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight ) + { + bSized = true; + pThis->maGeometry.nWidth = pEvent->width; + pThis->maGeometry.nHeight = pEvent->height; + } + } + + // update decoration hints + if( ! (pThis->m_nStyle & SAL_FRAME_STYLE_PLUG) ) + { + GdkRectangle aRect; + gdk_window_get_frame_extents( widget_get_window(GTK_WIDGET(pThis->m_pWindow)), &aRect ); + pThis->maGeometry.nTopDecoration = y - aRect.y; + pThis->maGeometry.nBottomDecoration = aRect.y + aRect.height - y - pEvent->height; + pThis->maGeometry.nLeftDecoration = x - aRect.x; + pThis->maGeometry.nRightDecoration = aRect.x + aRect.width - x - pEvent->width; + } + else + { + pThis->maGeometry.nTopDecoration = + pThis->maGeometry.nBottomDecoration = + pThis->maGeometry.nLeftDecoration = + pThis->maGeometry.nRightDecoration = 0; + } + + pThis->updateScreenNumber(); + if( bSized ) + pThis->AllocateFrame(); + + if( bMoved && bSized ) + pThis->CallCallback( SALEVENT_MOVERESIZE, nullptr ); + else if( bMoved ) + pThis->CallCallback( SALEVENT_MOVE, nullptr ); + else if( bSized ) + pThis->CallCallback( SALEVENT_RESIZE, nullptr ); + + if (bSized) + pThis->TriggerPaintEvent(); + return false; +} + #endif // GTK_CHECK_VERSION(3,0,0) void GtkSalFrame::TriggerPaintEvent() @@ -3831,93 +4007,6 @@ return false; } -gboolean GtkSalFrame::signalConfigure( GtkWidget*, GdkEventConfigure* pEvent, gpointer frame ) -{ - GtkSalFrame* pThis = static_cast(frame); - pThis->m_bPaintsBlocked = false; - - bool bMoved = false, bSized = false; - int x = pEvent->x, y = pEvent->y; - - /* HACK: during sizing/moving a toolbar pThis->maGeometry is actually - * already exact; even worse: due to the asynchronicity of configure - * events the borderwindow which would evaluate this event - * would size/move based on wrong data if we would actually evaluate - * this event. So let's swallow it. - */ - if( (pThis->m_nStyle & SAL_FRAME_STYLE_OWNERDRAWDECORATION) && - GtkSalFrame::getDisplay()->GetCaptureFrame() == pThis ) - return false; - - /* #i31785# claims we cannot trust the x,y members of the event; - * they are e.g. not set correctly on maximize/demaximize; - * yet the gdkdisplay-x11.c code handling configure_events has - * done this XTranslateCoordinates work since the day ~zero. - */ - if( x != pThis->maGeometry.nX || y != pThis->maGeometry.nY ) - { - bMoved = true; - pThis->maGeometry.nX = x; - pThis->maGeometry.nY = y; - } - /* #i86302# - * for non sizeable windows we set the min and max hint for the window manager to - * achieve correct sizing. However this is asynchronous and e.g. on Compiz - * it sometimes happens that the window gets resized to another size (some default) - * if we update the size here, subsequent setMinMaxSize will use this wrong size - * - which is not good since the window manager will now size the window back to this - * wrong size at some point. - */ - /* fprintf (stderr, "configure %d %d %d (%d) %d, %d diff? %d\n", - (int)pThis->m_bFullscreen, (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)), SAL_FRAME_STYLE_SIZEABLE, - !!( pThis->m_bFullscreen || (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE ), - pEvent->width, pEvent->height, - !!(pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight) - ); */ - if( pThis->m_bFullscreen || (pThis->m_nStyle & (SAL_FRAME_STYLE_SIZEABLE | SAL_FRAME_STYLE_PLUG)) == SAL_FRAME_STYLE_SIZEABLE ) - { - if( pEvent->width != (int)pThis->maGeometry.nWidth || pEvent->height != (int)pThis->maGeometry.nHeight ) - { - bSized = true; - pThis->maGeometry.nWidth = pEvent->width; - pThis->maGeometry.nHeight = pEvent->height; - } - } - - // update decoration hints - if( ! (pThis->m_nStyle & SAL_FRAME_STYLE_PLUG) ) - { - GdkRectangle aRect; - gdk_window_get_frame_extents( widget_get_window(GTK_WIDGET(pThis->m_pWindow)), &aRect ); - pThis->maGeometry.nTopDecoration = y - aRect.y; - pThis->maGeometry.nBottomDecoration = aRect.y + aRect.height - y - pEvent->height; - pThis->maGeometry.nLeftDecoration = x - aRect.x; - pThis->maGeometry.nRightDecoration = aRect.x + aRect.width - x - pEvent->width; - } - else - { - pThis->maGeometry.nTopDecoration = - pThis->maGeometry.nBottomDecoration = - pThis->maGeometry.nLeftDecoration = - pThis->maGeometry.nRightDecoration = 0; - } - - pThis->updateScreenNumber(); - if( bSized ) - pThis->AllocateFrame(); - - if( bMoved && bSized ) - pThis->CallCallback( SALEVENT_MOVERESIZE, NULL ); - else if( bMoved ) - pThis->CallCallback( SALEVENT_MOVE, NULL ); - else if( bSized ) - pThis->CallCallback( SALEVENT_RESIZE, NULL ); - - if (bSized) - pThis->TriggerPaintEvent(); - return false; -} - gboolean GtkSalFrame::signalKey( GtkWidget*, GdkEventKey* pEvent, gpointer frame ) { GtkSalFrame* pThis = static_cast(frame); @@ -4689,9 +4778,12 @@ if (nDeletePos < nPosition) { if (nDeleteEnd <= nPosition) - xText->setCaretPosition( nPosition-(nDeleteEnd-nDeletePos) ); + nPosition = nPosition - (nDeleteEnd - nDeletePos); else - xText->setCaretPosition( nDeletePos ); + nPosition = nDeletePos; + + if (xText->getCharacterCount() >= nPosition) + xText->setCaretPosition( nPosition ); } return true; } diff -Nru libreoffice-5.0.2/vcl/unx/gtk3/app/gtk3gtkinst.cxx libreoffice-5.0.5~rc2/vcl/unx/gtk3/app/gtk3gtkinst.cxx --- libreoffice-5.0.2/vcl/unx/gtk3/app/gtk3gtkinst.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/unx/gtk3/app/gtk3gtkinst.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -372,8 +372,11 @@ Reference< css::datatransfer::XTransferable > VclGtkClipboard::getContents() throw( RuntimeException, std::exception ) { - if (!m_aContents.is()) + if (G_OBJECT(m_pOwner) != gtk_clipboard_get_owner(gtk_clipboard_get(m_nSelection)) && + !m_aContents.is()) { + //tdf#93887 This is the system clipboard/selection. We fetch it when we are not + //the owner of the clipboard and have not already fetched it. m_aContents = new GtkTransferable(m_nSelection); } return m_aContents; @@ -382,6 +385,8 @@ void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, GtkSelectionData *selection_data, guint info) { + if (!m_aContents.is()) + return; GdkAtom type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType, RTL_TEXTENCODING_UTF8).getStr(), diff -Nru libreoffice-5.0.2/vcl/win/source/gdi/salgdi2.cxx libreoffice-5.0.5~rc2/vcl/win/source/gdi/salgdi2.cxx --- libreoffice-5.0.2/vcl/win/source/gdi/salgdi2.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/win/source/gdi/salgdi2.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -34,6 +34,8 @@ #include "vcl/bmpacc.hxx" #include "outdata.hxx" #include "salgdiimpl.hxx" +#include "opengl/win/gdiimpl.hxx" + bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const { @@ -69,23 +71,87 @@ nSrcWidth, nSrcHeight, nFlags ); } +namespace +{ + +void convertToWinSalBitmap(SalBitmap& rSalBitmap, WinSalBitmap& rWinSalBitmap) +{ + BitmapBuffer* pRead = rSalBitmap.AcquireBuffer(BITMAP_READ_ACCESS); + + rWinSalBitmap.Create(rSalBitmap.GetSize(), rSalBitmap.GetBitCount(), BitmapPalette()); + BitmapBuffer* pWrite = rWinSalBitmap.AcquireBuffer(BITMAP_WRITE_ACCESS); + + sal_uInt8* pSource(pRead->mpBits); + sal_uInt8* pDestination(pWrite->mpBits); + + for (long y = 0; y < pRead->mnHeight; y++) + { + memcpy(pDestination, pSource, pRead->mnScanlineSize); + pSource += pRead->mnScanlineSize; + pDestination += pWrite->mnScanlineSize; + } + rWinSalBitmap.ReleaseBuffer(pWrite, BITMAP_WRITE_ACCESS); + + rSalBitmap.ReleaseBuffer(pRead, BITMAP_READ_ACCESS); +} + +} // end anonymous namespace + void WinSalGraphics::drawBitmap(const SalTwoRect& rPosAry, const SalBitmap& rSalBitmap) { - mpImpl->drawBitmap( rPosAry, rSalBitmap ); + if (dynamic_cast(mpImpl.get()) == nullptr && + dynamic_cast(&rSalBitmap) == nullptr) + { + std::unique_ptr pWinSalBitmap(new WinSalBitmap()); + SalBitmap& rConstBitmap = const_cast(rSalBitmap); + convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get()); + mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get()); + } + else + { + mpImpl->drawBitmap(rPosAry, rSalBitmap); + } } void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, SalColor nTransparentColor ) { - mpImpl->drawBitmap( rPosAry, rSSalBitmap, nTransparentColor ); + if (dynamic_cast(mpImpl.get()) == nullptr && + dynamic_cast(&rSSalBitmap) == nullptr) + { + std::unique_ptr pWinSalBitmap(new WinSalBitmap()); + SalBitmap& rConstBitmap = const_cast(rSSalBitmap); + convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get()); + mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get(), nTransparentColor); + } + else + { + mpImpl->drawBitmap(rPosAry, rSSalBitmap, nTransparentColor); + } } void WinSalGraphics::drawBitmap( const SalTwoRect& rPosAry, const SalBitmap& rSSalBitmap, const SalBitmap& rSTransparentBitmap ) { - mpImpl->drawBitmap( rPosAry, rSSalBitmap, rSTransparentBitmap ); + if (dynamic_cast(mpImpl.get()) == nullptr && + dynamic_cast(&rSSalBitmap) == nullptr) + { + std::unique_ptr pWinSalBitmap(new WinSalBitmap()); + SalBitmap& rConstBitmap = const_cast(rSSalBitmap); + convertToWinSalBitmap(rConstBitmap, *pWinSalBitmap.get()); + + std::unique_ptr pWinTransparentSalBitmap(new WinSalBitmap()); + SalBitmap& rConstTransparentBitmap = const_cast(rSTransparentBitmap); + convertToWinSalBitmap(rConstTransparentBitmap, *pWinTransparentSalBitmap.get()); + + mpImpl->drawBitmap(rPosAry, *pWinSalBitmap.get(), *pWinTransparentSalBitmap.get()); + } + else + { + mpImpl->drawBitmap(rPosAry, rSSalBitmap, rSTransparentBitmap); + } } bool WinSalGraphics::drawAlphaRect( long nX, long nY, long nWidth, diff -Nru libreoffice-5.0.2/vcl/win/source/gdi/winlayout.cxx libreoffice-5.0.5~rc2/vcl/win/source/gdi/winlayout.cxx --- libreoffice-5.0.2/vcl/win/source/gdi/winlayout.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/win/source/gdi/winlayout.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -371,7 +371,8 @@ aChunk.mbVertical = false; } - if (aChunk.mbVertical && aLogfont.lfEscapement != 2700) + // Don't even try to handle non-horizontal text + if (aChunk.mbVertical || aLogfont.lfEscapement != 0) return false; OpenGLCompatibleDC aDC(rGraphics, 0, 0, nBitmapWidth, nBitmapHeight); @@ -699,6 +700,8 @@ bool UniscribeLayout::LayoutText( ImplLayoutArgs& rArgs ) { + msTheString = OUString(rArgs.mpStr, rArgs.mnLength); + // for a base layout only the context glyphs have to be dropped // => when the whole string is involved there is no extra context typedef std::vector TIntVector; @@ -1400,6 +1403,9 @@ } // update return values + if( (mnLayoutFlags & SalLayoutFlags::Vertical) && + nCharPos != -1 ) + aGlyphId |= GetVerticalFlags( msTheString[nCharPos] ); *(pGlyphs++) = aGlyphId; if( pGlyphAdvances ) *(pGlyphAdvances++) = nGlyphWidth; @@ -1905,7 +1911,7 @@ for(; (i < rVisualItem.mnEndCharPos) && (i < mnEndCharPos); ++i ) { int j = mpLogClusters[ i ] + rVisualItem.mnMinGlyphPos; - int nCurrIdx = i * 2; + int nCurrIdx = (i - mnMinCharPos) * 2; if( !rVisualItem.IsRTL() ) { // normal positions for LTR case @@ -2501,7 +2507,7 @@ const ImplWinFontData& rFontFace = *mpWinFontData[ nFallbackLevel ]; ImplWinFontEntry& rFontInstance = *mpWinFontEntry[ nFallbackLevel ]; - bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled(); + bool bUseOpenGL = OpenGLHelper::isVCLOpenGLEnabled() && !mbPrinter; if (!bUspInited) InitUSP(); diff -Nru libreoffice-5.0.2/vcl/win/source/gdi/winlayout.hxx libreoffice-5.0.5~rc2/vcl/win/source/gdi/winlayout.hxx --- libreoffice-5.0.2/vcl/win/source/gdi/winlayout.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/win/source/gdi/winlayout.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -110,6 +110,7 @@ // string specific info // everything is in logical order + OUString msTheString; // Sadly we need it in GetNextGlyphs(), to be able to call GetVerticalFlags() int mnCharCapacity; WORD* mpLogClusters; // map from absolute_char_pos to relative_glyph_pos int* mpCharWidths; // map from absolute_char_pos to char_width diff -Nru libreoffice-5.0.2/vcl/win/source/window/salframe.cxx libreoffice-5.0.5~rc2/vcl/win/source/window/salframe.cxx --- libreoffice-5.0.2/vcl/win/source/window/salframe.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/win/source/window/salframe.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -3407,8 +3407,10 @@ nModCode |= KEY_SHIFT; if ( GetKeyState( VK_CONTROL ) & 0x8000 ) nModCode |= KEY_MOD1; - if ( GetKeyState( VK_MENU ) & 0x8000 ) + if ( GetKeyState( VK_LMENU ) & 0x8000 ) nModCode |= KEY_MOD2; + if ( GetKeyState( VK_RMENU ) & 0x8000 ) // this is the ALTGR-Key in this case + nModCode &= ~KEY_MOD1; // remove the Control flag if ( (nMsg == WM_CHAR) || (nMsg == WM_SYSCHAR) ) { @@ -3615,13 +3617,6 @@ aKeyEvt.mnCode |= nModCode; aKeyEvt.mnRepeat = nRepeat; - if( (nModCode & (KEY_MOD1|KEY_MOD2)) == (KEY_MOD1|KEY_MOD2) && - aKeyEvt.mnCharCode ) - { - // this is actually AltGr and should not be handled as Alt - aKeyEvt.mnCode &= ~(KEY_MOD1|KEY_MOD2); - } - bIgnoreCharMsg = bCharPeek ? TRUE : FALSE; long nRet = pFrame->CallCallback( nEvent, &aKeyEvt ); // independent part only reacts on keyup but Windows does not send diff -Nru libreoffice-5.0.2/vcl/workben/vcldemo.cxx libreoffice-5.0.5~rc2/vcl/workben/vcldemo.cxx --- libreoffice-5.0.2/vcl/workben/vcldemo.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/vcl/workben/vcldemo.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -649,7 +649,7 @@ // be done with a shader / gradient static void SimulateBorderStretch(OutputDevice &rDev, const Rectangle& r) { - static BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png"); + BitmapEx aPageShadowMask("sw/res/page-shadow-mask.png"); BitmapEx aRight(aPageShadowMask); sal_Int32 nSlice = (aPageShadowMask.GetSizePixel().Width() - 3) / 4; diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.py 2016-02-04 16:41:28.000000000 +0000 @@ -284,11 +284,11 @@ self.btnUp = self.insertButton("btnUp", AgendaWizardDialogConst.BTNUP_ACTION_PERFORMED, self.PROPS_BUTTON, (14, AgendaWizardDialogConst.BTNUP_HID, - self.resources.resButtonUp, 202, 136, 5, 582, 50), self) + self.resources.resButtonUp, 180, 136, 5, 582, 60), self) self.btnDown = self.insertButton("btnDown", AgendaWizardDialogConst.BTNDOWN_ACTION_PERFORMED, self.PROPS_BUTTON, (14, AgendaWizardDialogConst.BTNDOWN_HID, - self.resources.resButtonDown, 254, 136, 5, 583, 50), self) + self.resources.resButtonDown, 244, 136, 5, 583, 60), self) def buildStep6(self): self.insertLabel("lblTitle6", self.PROPS_LABEL_B, diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/common/UCB.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/common/UCB.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/common/UCB.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/common/UCB.py 2016-02-04 16:41:28.000000000 +0000 @@ -64,7 +64,7 @@ def copy1(self, sourceDir, targetDir, verifier): files = self.listFiles(sourceDir, verifier) for i in range(len(files)): - self.copy3(sourceDir, files[i], targetDir) + self.copy2(sourceDir, files[i], targetDir, "") def copy2(self, sourceDir, filename, targetDir, targetName): if (not self.fa.exists(targetDir, True)): diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/db/SQLQueryComposer.java libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/db/SQLQueryComposer.java --- libreoffice-5.0.2/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/db/SQLQueryComposer.java 2016-02-04 16:41:28.000000000 +0000 @@ -77,7 +77,7 @@ int iAggregate = CurDBMetaData.getAggregateIndex(CurDBMetaData.FieldColumns[i].getDisplayFieldName()); if (iAggregate > -1) { - sSelectClause += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")"; + sSelectClause += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")"; if (_baddAliasFieldNames) { sSelectClause += getAliasFieldNameClause(CurDBMetaData.AggregateFieldNames[iAggregate][0]); @@ -85,7 +85,7 @@ } else { - sSelectClause += getComposedAliasFieldName(CurDBMetaData.FieldColumns[i].getDisplayFieldName()); + sSelectClause += getComposedAliasDisplayName(CurDBMetaData.FieldColumns[i].getDisplayFieldName()); if (_baddAliasFieldNames) { sSelectClause += getAliasFieldNameClause(CurDBMetaData.FieldColumns[i].getDisplayFieldName()); @@ -182,7 +182,7 @@ { sOrder += ", "; } - sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasFieldName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")"; + sOrder += CurDBMetaData.AggregateFieldNames[iAggregate][1] + "(" + getComposedAliasDisplayName(CurDBMetaData.AggregateFieldNames[iAggregate][0]) + ")"; sOrder += " " + CurDBMetaData.getSortFieldNames()[i][1]; m_queryComposer.setOrder(sOrder); } @@ -311,12 +311,30 @@ } } - private String getComposedAliasFieldName(String _fieldname) + private String getComposedAliasDisplayName(String _fieldname) { FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByDisplayName(_fieldname); final String curCommandName = CurFieldColumn.getCommandName(); final String curFieldName = CurFieldColumn.getFieldName(); CommandName curComposedCommandName = getComposedCommandByDisplayName(curCommandName); + if (curComposedCommandName == null) + { + //return _fieldname; + if ( curCommandName.length() > 0 ) + return quoteName(curCommandName) + "." + quoteName(curFieldName); + else + return quoteName(curFieldName); + } + String curAliasName = curComposedCommandName.getAliasName(); + return quoteName(curAliasName) + "." + quoteName(curFieldName); + } + + private String getComposedAliasFieldName(String _fieldname) + { + FieldColumn CurFieldColumn = CurDBMetaData.getFieldColumnByFieldName(_fieldname); + final String curCommandName = CurFieldColumn.getCommandName(); + final String curFieldName = CurFieldColumn.getFieldName(); + CommandName curComposedCommandName = getComposedCommandByDisplayName(curCommandName); if (curComposedCommandName == null) { //return _fieldname; diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/ui/FilterComponent.java libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/ui/FilterComponent.java --- libreoffice-5.0.2/wizards/com/sun/star/wizards/ui/FilterComponent.java 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/ui/FilterComponent.java 2016-02-04 16:41:28.000000000 +0000 @@ -119,7 +119,7 @@ String sControlNameSuffix = sIncSuffix + "_" + getIndexNumber(sControlName); XListBox xCurFieldListBox = UnoRuntime.queryInterface(XListBox.class, CurUnoDialog.xDlgContainer.getControl(sControlName)); String CurDisplayFieldName = xCurFieldListBox.getSelectedItem(); - FieldColumn CurFieldColumn = new FieldColumn(oQueryMetaData, CurDisplayFieldName); + FieldColumn CurFieldColumn = oQueryMetaData.getFieldColumnByDisplayName(CurDisplayFieldName); String sControlNameTextValue = "txtValue" + sControlNameSuffix; XControl xValueControl = CurUnoDialog.xDlgContainer.getControl(sControlNameTextValue); @@ -303,7 +303,7 @@ String FieldName; if (_CurDBMetaData != null) { - FieldColumn CurDBFieldColumn = _CurDBMetaData.getFieldColumnByDisplayName(_filtercondition.Name); + FieldColumn CurDBFieldColumn = _CurDBMetaData.getFieldColumnByFieldName(_filtercondition.Name); FieldName = CurDBFieldColumn.getFieldTitle(); } else diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/web/FTPDialog.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/FTPDialog.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/web/FTPDialog.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/FTPDialog.py 2016-02-04 16:41:28.000000000 +0000 @@ -19,7 +19,7 @@ from .WWHID import * from .FTPDialogResources import FTPDialogResources -from ..ui.UnoDialog2 import UnoDialog2 +from ..ui.WizardDialog import WizardDialog from ..ui.UIConsts import UIConsts from ..ui.event.DataAware import DataAware from ..ui.event.UnoDataAware import UnoDataAware @@ -36,11 +36,6 @@ from com.sun.star.ucb import OpenCommandArgument2 from com.sun.star.ucb.OpenMode import FOLDERS -#PushButtonType_OK_value = uno.getConstantByName( "com.sun.star.awt.PushButtonType.OK" ) -#PushButtonType_CANCEL_value = uno.getConstantByName( "com.sun.star.awt.PushButtonType.CANCEL" ) -#PushButtonType_HELP_value = uno.getConstantByName( "com.sun.star.awt.PushButtonType.HELP" ) - - # This is the FTP Dialog.
# The Dialog enables the user: # (*) entering FTP server and user information. @@ -55,7 +50,10 @@ # I use here the DataAware concept to automatically update # the members ip, username, and password (via the methods setXXX(...)) # for details see the ui.events.DataAware classes.
-class FTPDialog(UnoDialog2, UIConsts): +class FTPDialog(WizardDialog): + RES_OK = 1 + RES_CANCEL = 2 + RES_HELP = 3 # A Constant used for the setLabel(int) method to change the # status-display. "unknown" is the status when the user first @@ -97,7 +95,7 @@ # @throws Exception def __init__(self, xmsf, p, oWizardResource): - super(FTPDialog, self).__init__(xmsf) + super(FTPDialog, self).__init__(xmsf, HID_FTP) self.publish = p templateDir = p.root.soTemplateDir @@ -113,8 +111,8 @@ self.ucb = UCB(xmsf) # set dialog properties... - self.setDialogProperties( True, 160, HelpIds.getHelpIdString(HID_FTP), - True, "FTPDialog", 167, 82, self.resources.resFTPDialog_title, 222) + self.setDialogProperties(True, 210, True, 104, 52, 1, 1, + self.resources.resFTPDialog_title, 310) # add controls to dialog self.build() @@ -162,7 +160,7 @@ (0, 14, 68, 80, False, False, 14)) self.lblStatus = self.insertLabel("lblStatus", PROPNAMES_LABEL, - (8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9, 99)) + (8, self.resources.resFTPDisconnected, "lblStatus", 86, 82, 9, 130)) self.ln3 = self.insertFixedLine("ln3", PROPNAMES_LABEL, (8, self.resources.resln3_value, "ln3", 6, 100, 10, 210)) @@ -174,13 +172,13 @@ (14, HelpIds.getHelpIdString(HID_FTP_BTN_PATH), self.resources.resbtnDir_value, "btnDir", 199, 112, 12, 16), self) self.btnOK = self.insertButton("btnOK", None, PROPNAMES_BUTTON2, - (14, HelpIds.getHelpIdString(HID_FTP_OK), self.resources.resbtnOK_value, "btnOK", 165, 142, PushButtonType_OK_value, 13, 50), self) + (14, HelpIds.getHelpIdString(HID_FTP_OK), self.resources.resbtnOK_value, "btnOK", 165, 142, self.RES_OK, 13, 50), self) self.btnCancel = self.insertButton("btnCancel", None, PROPNAMES_BUTTON2, - (14, HelpIds.getHelpIdString(HID_FTP_CANCEL), self.resources.resbtnCancel_value, "btnCancel", 113, 142, PushButtonType_CANCEL_value, 14, 50), self) + (14, HelpIds.getHelpIdString(HID_FTP_CANCEL), self.resources.resbtnCancel_value, "btnCancel", 113, 142, self.RES_CANCEL, 14, 50), self) self.btnHelp = self.insertButton("btnHelp", None, PROPNAMES_BUTTON2, - (14, "", self.resources.resbtnHelp_value, "btnHelp", 57, 142, PushButtonType_HELP_value, 15, 50), self) + (14, "", self.resources.resbtnHelp_value, "btnHelp", 57, 142, self.RES_HELP, 15, 50), self) # Make hostname, username and password text fields data aware. @@ -251,7 +249,7 @@ # according to the status of the hostname, username, password text fields. # If one of these fields is empty, the button is disabled. def enableTestButton(self): - self.setEnabled(self.btnTestConnection, not self.isEmpty(self.host) or self.isEmpty(self.username) or self.isEmpty(self.password)) + self.setEnabled(self.btnTestConnection, not (self.isEmpty(self.host) or self.isEmpty(self.username) or self.isEmpty(self.password))) # @param s # @return True if the string is None or "". diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/web/FTPDialogResources.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/FTPDialogResources.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/web/FTPDialogResources.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/FTPDialogResources.py 2016-02-04 16:41:28.000000000 +0000 @@ -21,8 +21,6 @@ RID_COMMON_START = 500 def __init__(self, oWizardResource): - super(FTPDialogResources, self).__init__(xmsf, self.MODULE_NAME) - self.resFTPDialog_title = oWizardResource.getResText( self.RID_FTPDIALOG_START + 0) self.reslblUsername_value = oWizardResource.getResText( diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WebWizardDialog.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WebWizardDialog.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WebWizardDialog.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WebWizardDialog.py 2016-02-04 16:41:28.000000000 +0000 @@ -525,7 +525,7 @@ PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID6_DATE_SITE_CREATED), - "dateSiteCreated", 179, 124, 6, tabIndex + 1, 49), self) + "dateSiteCreated", 179, 124, 6, tabIndex + 1, 60), self) self.insertLabel("lblSiteUpdated", WebWizardDialog.PROPNAMES_LBL, (8, self.resources.reslblSiteUpdated_value, "lblSiteUpdated", 103, 144, 6, tabIndex + 1, 80)) @@ -540,7 +540,7 @@ PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH), (True, 12, HelpIds.getHelpIdString(HID6_DATE_SITE_UPDATED), - "dateSiteUpdate", 179, 142, 6, tabIndex + 1, 49), self) + "dateSiteUpdate", 179, 142, 6, tabIndex + 1, 60), self) def buildStep7(self, disableFTP, exclamationURL): tabIndex = 700 diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WWD_Events.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WWD_Events.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WWD_Events.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WWD_Events.py 2016-02-04 16:41:28.000000000 +0000 @@ -434,7 +434,7 @@ def setFTPPublish(self): if self.showFTPDialog(self.getPublisher(FTP_PUBLISHER)): self.getPublisher(FTP_PUBLISHER).cp_Publish = True - self.updatePublishUI(2) + self.updatePublishUI(4) ''' show the ftp dialog @@ -459,7 +459,7 @@ zipFile = sd.callStoreDialog( self.settings.cp_DefaultSession.cp_OutDirectory, self.resources.resDefaultArchiveFilename) - self.setPublishUrl(ZIP_PUBLISHER, zipFile, 4) + self.setPublishUrl(ZIP_PUBLISHER, zipFile, 2) self.getPublisher(ZIP_PUBLISHER).overwriteApproved = True ''' diff -Nru libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WWD_Startup.py libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WWD_Startup.py --- libreoffice-5.0.2/wizards/com/sun/star/wizards/web/WWD_Startup.py 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/wizards/com/sun/star/wizards/web/WWD_Startup.py 2016-02-04 16:41:28.000000000 +0000 @@ -494,8 +494,8 @@ self.mountList(session.cp_GeneralInfo, self.genAware) task.advance(True) self.mountDataAware(session.cp_Publishing.getElement(LOCAL_PUBLISHER), 0) - self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 1) - self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 2) + self.mountDataAware(session.cp_Publishing.getElement(ZIP_PUBLISHER), 1) + self.mountDataAware(session.cp_Publishing.getElement(FTP_PUBLISHER), 2) task.advance(True) self.sessionNameDA.setDataObject(session, True) self.chkSaveSettings.Model.State = 1 @@ -513,7 +513,7 @@ Objects on the same Vector need different DataObjectBinding, I use this method... @param data the CGPublish object - @param i the number of the object (0 = local, 1 = ftp, 2 = zip) + @param i the number of the object (0 = local, 1 = zip, 2 = ftp) ''' def mountDataAware(self, data, i): diff -Nru libreoffice-5.0.2/writerfilter/source/dmapper/DomainMapper.cxx libreoffice-5.0.5~rc2/writerfilter/source/dmapper/DomainMapper.cxx --- libreoffice-5.0.2/writerfilter/source/dmapper/DomainMapper.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/dmapper/DomainMapper.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -451,7 +451,7 @@ sal_Int32 nFirstLineIndent = m_pImpl->getCurrentNumberingProperty("FirstLineIndent"); if (nFirstLineIndent != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); m_pImpl->GetTopContext()->Insert( PROP_PARA_LEFT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); @@ -467,9 +467,9 @@ sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); if (nFirstLineIndent != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_FIRST_LINE_INDENT, uno::makeAny(nFirstLineIndent), /*bOverwrite=*/false); if (nParaLeftMargin != 0) - m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin)); + m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); m_pImpl->GetTopContext()->Insert( PROP_PARA_RIGHT_MARGIN, uno::makeAny( ConversionHelper::convertTwipToMM100(nIntValue ) )); @@ -482,6 +482,11 @@ sal_Int32 nValue = ConversionHelper::convertTwipToMM100( nIntValue ); m_pImpl->GetTopContext()->Insert( PROP_PARA_FIRST_LINE_INDENT, uno::makeAny( - nValue )); + + // See above, need to inherit left margin from list style when first is set. + sal_Int32 nParaLeftMargin = m_pImpl->getCurrentNumberingProperty("IndentAt"); + if (nParaLeftMargin != 0) + m_pImpl->GetTopContext()->Insert(PROP_PARA_LEFT_MARGIN, uno::makeAny(nParaLeftMargin), /*bOverwrite=*/false); } break; case NS_ooxml::LN_CT_Ind_firstLine: @@ -1371,12 +1376,12 @@ if (nIntValue != 0) { rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::RL_TB )); - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT )); + rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_RIGHT ), /*bOverwrite=*/false); } else { rContext->Insert(PROP_WRITING_MODE, uno::makeAny( text::WritingMode2::LR_TB )); - rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT )); + rContext->Insert(PROP_PARA_ADJUST, uno::makeAny( style::ParagraphAdjust_LEFT ), /*bOverwrite=*/false); } } @@ -1620,7 +1625,7 @@ case NS_ooxml::LN_EG_RPrBase_effect: // The file-format has many character animations. We have only // one, so we use it always. Suboptimal solution though. - if (nIntValue) + if (nIntValue != NS_ooxml::LN_Value_ST_TextEffect_none) rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( true )); else rContext->Insert(PROP_CHAR_FLASH, uno::makeAny( false )); @@ -2034,6 +2039,13 @@ rContext->Insert(PROP_PARA_RIGHT_MARGIN, uno::makeAny(nParaRightMargin)); } + + // Indent properties from the paragraph style have priority + // over the ones from the numbering styles in Word, not in + // Writer. + boost::optional oProperty; + if (pStyleSheetProperties && (oProperty = pStyleSheetProperties->getProperty(PROP_PARA_FIRST_LINE_INDENT))) + rContext->Insert(PROP_PARA_FIRST_LINE_INDENT, oProperty->second); } if( pStyleSheetProperties && pStyleSheetProperties->GetListLevel() >= 0 ) diff -Nru libreoffice-5.0.2/writerfilter/source/dmapper/GraphicImport.cxx libreoffice-5.0.5~rc2/writerfilter/source/dmapper/GraphicImport.cxx --- libreoffice-5.0.2/writerfilter/source/dmapper/GraphicImport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/dmapper/GraphicImport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -823,8 +823,12 @@ // If we are here, this is a drawingML shape. For those, only dmapper (and not oox) knows the anchoring infos (just like for Writer pictures). // But they aren't Writer pictures, either (which are already handled above). uno::Reference< beans::XPropertySet > xShapeProps(m_xShape, uno::UNO_QUERY_THROW); - // This needs to be AT_PARAGRAPH and not AT_CHARACTER, otherwise shape will move when the user inserts a new paragraph. - xShapeProps->setPropertyValue("AnchorType", uno::makeAny(text::TextContentAnchorType_AT_PARAGRAPH)); + + // This needs to be AT_PARAGRAPH by default and not AT_CHARACTER, otherwise shape will move when the user inserts a new paragraph. + text::TextContentAnchorType eAnchorType = text::TextContentAnchorType_AT_PARAGRAPH; + if (m_pImpl->nVertRelation == text::RelOrientation::TEXT_LINE) + eAnchorType = text::TextContentAnchorType_AT_CHARACTER; + xShapeProps->setPropertyValue("AnchorType", uno::makeAny(eAnchorType)); //only the position orientation is handled in applyPosition() m_pImpl->applyPosition(xShapeProps); diff -Nru libreoffice-5.0.2/writerfilter/source/dmapper/NumberingManager.cxx libreoffice-5.0.5~rc2/writerfilter/source/dmapper/NumberingManager.cxx --- libreoffice-5.0.2/writerfilter/source/dmapper/NumberingManager.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/dmapper/NumberingManager.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -632,7 +632,18 @@ if (aMap.find("NumberingType") != aMap.end()) { sal_Int16 nNumberFormat = aMap["NumberingType"].get(); - if (nNumberFormat == style::NumberingType::NUMBER_NONE) + + // No need for a zero width space without a real LabelFollowedBy. + bool bLabelFollowedBy = true; + auto it = std::find_if(aLvlProps.begin(), aLvlProps.end(), [](const beans::PropertyValue& rValue) { return rValue.Name == "LabelFollowedBy"; }); + if (it != aLvlProps.end()) + { + sal_Int16 nValue; + if (it->Value >>= nValue) + bLabelFollowedBy = nValue != SvxNumberFormat::NOTHING; + } + + if (bLabelFollowedBy && nNumberFormat == style::NumberingType::NUMBER_NONE) rSuffix = OUString(static_cast(0x200B)); } } diff -Nru libreoffice-5.0.2/writerfilter/source/dmapper/PropertyMap.cxx libreoffice-5.0.5~rc2/writerfilter/source/dmapper/PropertyMap.cxx --- libreoffice-5.0.2/writerfilter/source/dmapper/PropertyMap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/dmapper/PropertyMap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -700,18 +700,18 @@ PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier(); sal_Int32 nDist = nDistance; - if( nOffsetFrom == 1 ) + if( nOffsetFrom == 1 ) // From page { const OUString sMarginName = rPropNameSupplier.GetName( eMarginId ); uno::Any aMargin = xStyle->getPropertyValue( sMarginName ); sal_Int32 nMargin = 0; aMargin >>= nMargin; - // Change the margins with the ( border distance - line width ) - xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance - nLineWidth ) ); + // Change the margins with the border distance + xStyle->setPropertyValue( sMarginName, uno::makeAny( nDistance ) ); - // Set the distance to ( Margin - distance ) - nDist = nMargin - nDistance; + // Set the distance to ( Margin - distance - nLineWidth ) + nDist = nMargin - nDistance - nLineWidth; } const OUString sBorderDistanceName = rPropNameSupplier.GetName( eDistId ); if (xStyle.is()) diff -Nru libreoffice-5.0.2/writerfilter/source/dmapper/StyleSheetTable.cxx libreoffice-5.0.5~rc2/writerfilter/source/dmapper/StyleSheetTable.cxx --- libreoffice-5.0.2/writerfilter/source/dmapper/StyleSheetTable.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/dmapper/StyleSheetTable.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1359,7 +1359,6 @@ "TOC 7", "Contents 7", "TOC 8", "Contents 8", "TOC 9", "Contents 9", - "TOC Heading", "Contents Heading", "TOCHeading", "Contents Heading", "toc 1", "Contents 1", "toc 2", "Contents 2", diff -Nru libreoffice-5.0.2/writerfilter/source/filter/WriterFilter.cxx libreoffice-5.0.5~rc2/writerfilter/source/filter/WriterFilter.cxx --- libreoffice-5.0.2/writerfilter/source/filter/WriterFilter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/filter/WriterFilter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -171,8 +171,9 @@ return sal_False; writerfilter::dmapper::SourceDocumentType eType = writerfilter::dmapper::SourceDocumentType::OOXML; + uno::Reference xInsertTextRange = aMediaDesc.getUnpackedValueOrDefault("TextInsertModeRange", uno::Reference()); writerfilter::Stream::Pointer_t pStream( - writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, uno::Reference(), aMediaDesc)); + writerfilter::dmapper::DomainMapperFactory::createMapper(m_xContext, xInputStream, m_xDstDoc, bRepairStorage, eType, xInsertTextRange, aMediaDesc)); //create the tokenizer and domain mapper writerfilter::ooxml::OOXMLStream::Pointer_t pDocStream = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage); uno::Reference xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference()); diff -Nru libreoffice-5.0.2/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx libreoffice-5.0.5~rc2/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx --- libreoffice-5.0.2/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -286,6 +286,8 @@ OOXMLDocumentImpl * pDocument = new OOXMLDocumentImpl(pStream, uno::Reference(), mbSkipImages); pDocument->setXNoteId(nId); pDocument->setXNoteType(rType); + pDocument->setModel(getModel()); + pDocument->setDrawPage(getDrawPage()); return writerfilter::Reference::Pointer_t(pDocument); } diff -Nru libreoffice-5.0.2/writerfilter/source/rtftok/rtfdocumentimpl.cxx libreoffice-5.0.5~rc2/writerfilter/source/rtftok/rtfdocumentimpl.cxx --- libreoffice-5.0.2/writerfilter/source/rtftok/rtfdocumentimpl.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerfilter/source/rtftok/rtfdocumentimpl.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -2138,6 +2138,15 @@ { parBreak(); // Not in table? Reset max width. + if (m_nCellxMax) + { + // Was in table, but not anymore -> tblEnd. + RTFSprms aAttributes; + RTFSprms aSprms; + aSprms.set(NS_ooxml::LN_tblEnd, std::make_shared(1)); + writerfilter::Reference::Pointer_t pProperties = std::make_shared(aAttributes, aSprms); + Mapper().props(pProperties); + } m_nCellxMax = 0; } else if (m_aStates.top().eDestination != Destination::SHAPETEXT) @@ -4236,6 +4245,15 @@ m_aStates.top().aTableCellAttributes = m_aDefaultState.aTableCellAttributes; // We assume text after a row definition always belongs to the table, to handle text before the real INTBL token dispatchFlag(RTF_INTBL); + if (!m_nCellxMax) + { + // Wasn't in table, but now is -> tblStart. + RTFSprms aAttributes; + RTFSprms aSprms; + aSprms.set(NS_ooxml::LN_tblStart, std::make_shared(1)); + writerfilter::Reference::Pointer_t pProperties = std::make_shared(aAttributes, aSprms); + Mapper().props(pProperties); + } m_nCellxMax = std::max(m_nCellxMax, nParam); } break; @@ -5407,9 +5425,12 @@ OSL_ASSERT(pShape.get()); if (pShape.get()) pShape->getAny() >>= xShape; - Mapper().startShape(xShape); - Mapper().props(pProperties); - Mapper().endShape(); + if (xShape.is()) + { + Mapper().startShape(xShape); + Mapper().props(pProperties); + Mapper().endShape(); + } m_aObjectAttributes.clear(); m_aOLEAttributes.clear(); m_bObject = false; Binary files /tmp/tmpcpkGb9/z0XhEXxOsR/libreoffice-5.0.2/writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip and /tmp/tmpcpkGb9/TbTmceHami/libreoffice-5.0.5~rc2/writerperfect/qa/unit/data/impress/libetonyek/fail/v6.zip differ diff -Nru libreoffice-5.0.2/writerperfect/source/writer/WordPerfectImportFilter.cxx libreoffice-5.0.5~rc2/writerperfect/source/writer/WordPerfectImportFilter.cxx --- libreoffice-5.0.2/writerperfect/source/writer/WordPerfectImportFilter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/writerperfect/source/writer/WordPerfectImportFilter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -84,6 +84,9 @@ if (!libwpg::WPGraphics::parse(input.getDataStream(), &aSVGGenerator, fileFormat)) return false; + if (svgOutput.empty()) + return false; + assert(1 == svgOutput.size()); output.clear(); diff -Nru libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/databases.cxx libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/databases.cxx --- libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/databases.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/databases.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -121,7 +121,6 @@ Databases::Databases( bool showBasic, const OUString& instPath, - const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const OUString& productName, const OUString& productVersion, const OUString& styleSheet, @@ -138,9 +137,7 @@ prodVersion( "%PRODUCTVERSION" ), vendName( "%VENDORNAME" ), vendVersion( "%VENDORVERSION" ), - vendShort( "%VENDORSHORT" ), - m_aImagesZipPaths( imagesZipPaths ), - m_aSymbolsStyleName( "" ) + vendShort( "%VENDORSHORT" ) { m_xSMgr = Reference< XMultiComponentFactory >( m_xContext->getServiceManager(), UNO_QUERY ); @@ -208,106 +205,33 @@ } } -static bool impl_getZipFile( - Sequence< OUString > & rImagesZipPaths, - const OUString & rZipName, - OUString & rFileName ) +OString Databases::getImageTheme() { - OUString aWorkingDir; - osl_getProcessWorkingDir( &aWorkingDir.pData ); - const OUString *pPathArray = rImagesZipPaths.getArray(); - for ( int i = 0; i < rImagesZipPaths.getLength(); ++i ) - { - OUString aFileName = pPathArray[ i ]; - if ( !aFileName.isEmpty() ) - { - if ( !aFileName.endsWith("/") ) - { - aFileName += "/"; - } - aFileName += rZipName; - // the icons are not read when the URL is a symlink - osl::File::getAbsoluteFileURL( aWorkingDir, aFileName, rFileName ); - - // test existence - osl::DirectoryItem aDirItem; - if ( osl::DirectoryItem::get( rFileName, aDirItem ) == osl::FileBase::E_None ) - return true; - } - } - return false; -} - -OString Databases::getImagesZipFileURL() -{ - OUString aSymbolsStyleName; - try - { - uno::Reference< lang::XMultiServiceFactory > xConfigProvider = - configuration::theDefaultProvider::get(m_xContext); + uno::Reference< lang::XMultiServiceFactory > xConfigProvider = + configuration::theDefaultProvider::get(m_xContext); - // set root path - uno::Sequence < uno::Any > lParams(1); - beans::PropertyValue aParam ; - aParam.Name = "nodepath"; - aParam.Value <<= OUString("org.openoffice.Office.Common"); - lParams[0] = uno::makeAny(aParam); - - // open it - uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( - OUString("com.sun.star.configuration.ConfigurationAccess"), - lParams) ); - - bool bChanged = false; - uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); - uno::Any aResult = xAccess->getByHierarchicalName(OUString("Misc/SymbolStyle")); - if ( (aResult >>= aSymbolsStyleName) && m_aSymbolsStyleName != aSymbolsStyleName ) - { - m_aSymbolsStyleName = aSymbolsStyleName; - bChanged = true; - } + // set root path + uno::Sequence < uno::Any > lParams(1); + beans::PropertyValue aParam ; + aParam.Name = "nodepath"; + aParam.Value <<= OUString("org.openoffice.Office.Common"); + lParams[0] = uno::makeAny(aParam); + + // open it + uno::Reference< uno::XInterface > xCFG( xConfigProvider->createInstanceWithArguments( + OUString("com.sun.star.configuration.ConfigurationAccess"), + lParams) ); - if ( m_aImagesZipFileURL.isEmpty() || bChanged ) - { - OUString aImageZip; - bool bFound = false; + uno::Reference< container::XHierarchicalNameAccess > xAccess(xCFG, uno::UNO_QUERY_THROW); + uno::Any aResult = xAccess->getByHierarchicalName(OUString("Misc/SymbolStyle")); + OUString aSymbolsStyleName; + aResult >>= aSymbolsStyleName; - if ( !aSymbolsStyleName.isEmpty() ) - { - if ( aSymbolsStyleName == "auto" ) - { - // with the layered images*.zip, tango is the most - // complete theme, so show that one - // FIXME instead of using a general vnd.sun.star.zip:// - // for imgrepos, we should have some vnd.sun.star.image:// - // so that we don't have to re-open the stream for every - // image in the help - aSymbolsStyleName = "tango"; - } - OUString aZipName = "images_" + aSymbolsStyleName + ".zip"; - - bFound = impl_getZipFile( m_aImagesZipPaths, aZipName, aImageZip ); - } - - if ( ! bFound ) - bFound = impl_getZipFile( m_aImagesZipPaths, OUString( "images.zip" ), aImageZip ); - - if ( ! bFound ) - aImageZip.clear(); - - m_aImagesZipFileURL = OUStringToOString( - rtl::Uri::encode( - aImageZip, - rtl_UriCharClassPchar, - rtl_UriEncodeIgnoreEscapes, - RTL_TEXTENCODING_UTF8 ), RTL_TEXTENCODING_UTF8 ); - } - } - catch ( NoSuchElementException const & ) + if ( aSymbolsStyleName.isEmpty() || aSymbolsStyleName == "auto" ) { + aSymbolsStyleName = "tango"; } - - return m_aImagesZipFileURL; + return aSymbolsStyleName.toUtf8(); } void Databases::replaceName( OUString& oustring ) const diff -Nru libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/databases.hxx libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/databases.hxx --- libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/databases.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/databases.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -148,7 +148,6 @@ Databases( bool showBasic, const OUString& instPath, - const com::sun::star::uno::Sequence< OUString >& imagesZipPaths, const OUString& productName, const OUString& productVersion, const OUString& styleSheet, @@ -156,7 +155,7 @@ ~Databases(); - OString getImagesZipFileURL(); + OString getImageTheme(); OUString getInstallPathAsURL(); @@ -273,9 +272,6 @@ prodName,prodVersion,vendName,vendVersion,vendShort; OUString m_aInstallDirectory; // Installation directory - com::sun::star::uno::Sequence< OUString > m_aImagesZipPaths; - OString m_aImagesZipFileURL; - OUString m_aSymbolsStyleName; std::vector< OUString > m_avModules; diff -Nru libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/provider.cxx libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/provider.cxx --- libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/provider.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/provider.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -35,7 +35,6 @@ #include #include #include -#include #include "databases.hxx" #include "provider.hxx" @@ -325,21 +324,10 @@ OUString productversion( setupversion + " " + setupextension ); - uno::Sequence< OUString > aImagesZipPaths( 2 ); xHierAccess = getHierAccess( sProvider, "org.openoffice.Office.Common" ); - - OUString aPath( getKey( xHierAccess, "Path/Current/UserConfig" ) ); - subst( aPath ); - aImagesZipPaths[ 0 ] = aPath; - - aPath = "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config"; - rtl::Bootstrap::expandMacros(aPath); - aImagesZipPaths[ 1 ] = aPath; - bool showBasic = getBooleanKey(xHierAccess,"Help/ShowBasic"); m_pDatabases = new Databases( showBasic, instPath, - aImagesZipPaths, utl::ConfigManager::getProductName(), productversion, stylesheet, diff -Nru libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/urlparameter.cxx libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/urlparameter.cxx --- libreoffice-5.0.2/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -890,8 +890,8 @@ pDatabases->getProductVersion().getLength(), RTL_TEXTENCODING_UTF8 ) + OString('\''); - parString[last++] = "imgrepos"; - parString[last++] = OString('\'') + pDatabases->getImagesZipFileURL() + OString('\''); + parString[last++] = "imgtheme"; + parString[last++] = OString('\'') + pDatabases->getImageTheme() + OString('\''); parString[last++] = "hp"; parString[last++] = OString('\'') + urlParam->getByName( "HelpPrefix" ) + OString('\''); diff -Nru libreoffice-5.0.2/xmlhelp/util/compact.xsl libreoffice-5.0.5~rc2/xmlhelp/util/compact.xsl --- libreoffice-5.0.2/xmlhelp/util/compact.xsl 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/util/compact.xsl 2016-02-04 16:41:28.000000000 +0000 @@ -24,6 +24,11 @@ + + + + + diff -Nru libreoffice-5.0.2/xmlhelp/util/main_transform.xsl libreoffice-5.0.5~rc2/xmlhelp/util/main_transform.xsl --- libreoffice-5.0.2/xmlhelp/util/main_transform.xsl 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlhelp/util/main_transform.xsl 2016-02-04 16:41:28.000000000 +0000 @@ -99,7 +99,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -801,19 +801,6 @@ - - - - - - - - - - - - - @@ -821,11 +808,11 @@ - - + + - + @@ -930,36 +917,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru libreoffice-5.0.2/xmloff/inc/XMLBackgroundImageContext.hxx libreoffice-5.0.5~rc2/xmloff/inc/XMLBackgroundImageContext.hxx --- libreoffice-5.0.2/xmloff/inc/XMLBackgroundImageContext.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/inc/XMLBackgroundImageContext.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -30,6 +30,7 @@ class XMLBackgroundImageContext : public XMLElementPropertyContext { XMLPropertyState aPosProp; + sal_Int32 m_nBitmapModeIdx; XMLPropertyState aFilterProp; XMLPropertyState aTransparencyProp; @@ -58,6 +59,7 @@ sal_Int32 nPosIdx, sal_Int32 nFilterIdx, sal_Int32 nTransparencyIdx, + sal_Int32 nBitmapModeIdx, ::std::vector< XMLPropertyState > &rProps ); virtual ~XMLBackgroundImageContext(); diff -Nru libreoffice-5.0.2/xmloff/source/core/xmlimp.cxx libreoffice-5.0.5~rc2/xmloff/source/core/xmlimp.cxx --- libreoffice-5.0.2/xmloff/source/core/xmlimp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/core/xmlimp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -190,24 +190,31 @@ { mnGeneratorVersion = SvXMLImport::LO_3x; } - else + else if ('4' == loVersion[0]) { - SAL_INFO_IF('4' != loVersion[0], "xmloff.core", "unknown LO version: " << loVersion); - if ('4' == loVersion[0] && loVersion.getLength() > 1 + if (loVersion.getLength() > 1 && (loVersion[1] == '0' || loVersion[1] == '1')) { mnGeneratorVersion = SvXMLImport::LO_41x; // 4.0/4.1 } - else if ('4' == loVersion[0] - && loVersion.getLength() > 1 && loVersion[1] == '2') + else if (loVersion.getLength() > 1 && '2' == loVersion[1]) { mnGeneratorVersion = SvXMLImport::LO_42x; // 4.2 } - else + else if (loVersion.getLength() > 1 && '3' == loVersion[1]) + { + mnGeneratorVersion = SvXMLImport::LO_43x; // 4.3 + } + else if (loVersion.getLength() > 1 && '4' == loVersion[1]) { - mnGeneratorVersion = SvXMLImport::LO_4x; + mnGeneratorVersion = SvXMLImport::LO_44x; // 4.4 } } + else + { + SAL_INFO_IF('5' != loVersion[0], "xmloff.core", "unknown LO version: " << loVersion); + mnGeneratorVersion = SvXMLImport::LO_5x; + } return; // ignore buildIds } } @@ -540,6 +547,8 @@ // #i9518# All the stuff that accesses the document has to be done here, not in the dtor, // because the SvXMLImport dtor might not be called until after the document has been closed. + GetTextImport()->MapCrossRefHeadingFieldsHorribly(); + if (mpImpl->mpRDFaHelper.get()) { const uno::Reference xRS(mxModel, diff -Nru libreoffice-5.0.2/xmloff/source/draw/shapeexport.cxx libreoffice-5.0.5~rc2/xmloff/source/draw/shapeexport.cxx --- libreoffice-5.0.2/xmloff/source/draw/shapeexport.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/draw/shapeexport.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -662,7 +662,7 @@ if ( ( GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITER && GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERWEB && GetExport().GetModelType() != SvtModuleOptions::EFactory::WRITERGLOBAL ) || - !( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) || + ( GetExport().getExportFlags() & SvXMLExportFlags::OASIS ) || aShapeInfo.meShapeType == XmlShapeTypeDrawGroupShape || ( aShapeInfo.meShapeType == XmlShapeTypeDrawCustomShape && aShapeInfo.xCustomShapeReplacement.is() ) ) diff -Nru libreoffice-5.0.2/xmloff/source/style/GradientStyle.cxx libreoffice-5.0.5~rc2/xmloff/source/style/GradientStyle.cxx --- libreoffice-5.0.2/xmloff/source/style/GradientStyle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/GradientStyle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -178,9 +178,9 @@ break; case XML_TOK_GRADIENT_ANGLE: { - sal_Int32 nValue; - ::sax::Converter::convertNumber( nValue, rStrValue, 0, 3600 ); - aGradient.Angle = sal_Int16( nValue ); + bool const bSuccess = + ::sax::Converter::convertAngle(aGradient.Angle, rStrValue); + SAL_INFO_IF(!bSuccess, "xmloff.style", "failed to import draw:angle"); } break; case XML_TOK_GRADIENT_BORDER: @@ -288,7 +288,7 @@ // Angle if( aGradient.Style != awt::GradientStyle_RADIAL ) { - ::sax::Converter::convertNumber(aOut, sal_Int32(aGradient.Angle)); + ::sax::Converter::convertAngle(aOut, aGradient.Angle); aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue ); } diff -Nru libreoffice-5.0.2/xmloff/source/style/PageMasterExportPropMapper.cxx libreoffice-5.0.5~rc2/xmloff/source/style/PageMasterExportPropMapper.cxx --- libreoffice-5.0.2/xmloff/source/style/PageMasterExportPropMapper.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/PageMasterExportPropMapper.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -243,9 +242,10 @@ case CTF_PM_HEADERGRAPHICURL: case CTF_PM_FOOTERGRAPHICURL: { - DBG_ASSERT( pProperties && (nIdx >= 2), "property vector missing" ); - sal_Int32 nPos; - sal_Int32 nFilter; + assert(pProperties); + assert(nIdx >= 2 && "horrible array ordering borked again"); + sal_Int32 nPos(-1); + sal_Int32 nFilter(-1); switch( nContextId ) { case CTF_PM_GRAPHICURL: @@ -261,24 +261,22 @@ nFilter = CTF_PM_FOOTERGRAPHICFILTER; break; default: - nPos = 0; // TODO What values should this be? - nFilter = 0; + assert(false); } const Any* pPos = NULL; const Any* pFilter = NULL; - if( pProperties && (nIdx >= 2) ) + sal_uInt32 nIndex(nIdx - 1); + const XMLPropertyState& rFilter = (*pProperties)[nIndex]; + if (getPropertySetMapper()->GetEntryContextId(rFilter.mnIndex) == nFilter) { - const XMLPropertyState& rPos = (*pProperties)[nIdx - 2]; - DBG_ASSERT( getPropertySetMapper()->GetEntryContextId( rPos.mnIndex ) == nPos, - "invalid property map: pos expected" ); - if( getPropertySetMapper()->GetEntryContextId( rPos.mnIndex ) == nPos ) - pPos = &rPos.maValue; - - const XMLPropertyState& rFilter = (*pProperties)[nIdx - 1]; - DBG_ASSERT( getPropertySetMapper()->GetEntryContextId( rFilter.mnIndex ) == nFilter, - "invalid property map: filter expected" ); - if( getPropertySetMapper()->GetEntryContextId( rFilter.mnIndex ) == nFilter ) - pFilter = &rFilter.maValue; + pFilter = &rFilter.maValue; + --nIndex; + } + const XMLPropertyState& rPos = (*pProperties)[nIndex]; + if (getPropertySetMapper()->GetEntryContextId(rPos.mnIndex) == nPos) + { + pPos = &rPos.maValue; + --nIndex; } sal_uInt32 nPropIndex = rProperty.mnIndex; pThis->aBackgroundImageExport.exportXML( rProperty.maValue, pPos, pFilter, NULL, diff -Nru libreoffice-5.0.2/xmloff/source/style/PageMasterStyleMap.cxx libreoffice-5.0.5~rc2/xmloff/source/style/PageMasterStyleMap.cxx --- libreoffice-5.0.2/xmloff/source/style/PageMasterStyleMap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/PageMasterStyleMap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -140,7 +140,7 @@ PLMAP( "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_WIDTH, XML_SW_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 ), PLMAP( "FillBitmapSizeY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SW_TYPE_FILLBITMAPSIZE|MID_FLAG_MULTI_PROPERTY, 0 ), PLMAP( "FillBitmapLogicalSize", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_HEIGHT, XML_SW_TYPE_LOGICAL_SIZE|MID_FLAG_MULTI_PROPERTY, 0 ), - PLMAP( "FillBitmapMode", XML_NAMESPACE_STYLE, XML_REPEAT, XML_SW_TYPE_BITMAP_MODE|MID_FLAG_MULTI_PROPERTY, 0 ), + PLMAP( "FillBitmapMode", XML_NAMESPACE_STYLE, XML_REPEAT, XML_SW_TYPE_BITMAP_MODE|MID_FLAG_MULTI_PROPERTY, CTF_PM_FILLBITMAPMODE ), PLMAP( "FillBitmapPositionOffsetX", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_X, XML_TYPE_PERCENT, 0 ), PLMAP( "FillBitmapPositionOffsetY", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT_Y, XML_TYPE_PERCENT, 0 ), PLMAP( "FillBitmapRectanglePoint", XML_NAMESPACE_DRAW, XML_FILL_IMAGE_REF_POINT, XML_SW_TYPE_BITMAP_REFPOINT, 0 ), diff -Nru libreoffice-5.0.2/xmloff/source/style/PagePropertySetContext.cxx libreoffice-5.0.5~rc2/xmloff/source/style/PagePropertySetContext.cxx --- libreoffice-5.0.2/xmloff/source/style/PagePropertySetContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/PagePropertySetContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -96,6 +96,7 @@ rProp.mnIndex-2, rProp.mnIndex-1, -1, + mxMapper->getPropertySetMapper()->FindEntryIndex(CTF_PM_FILLBITMAPMODE), rProperties ); break; diff -Nru libreoffice-5.0.2/xmloff/source/style/styleexp.cxx libreoffice-5.0.5~rc2/xmloff/source/style/styleexp.cxx --- libreoffice-5.0.2/xmloff/source/style/styleexp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/styleexp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -419,6 +419,10 @@ // not export them here and remain silent. continue; } + catch(css::container::NoSuchElementException&) + { + continue; + } assert(xStyle.is()); if (!bUsed || xStyle->isInUse()) diff -Nru libreoffice-5.0.2/xmloff/source/style/TransGradientStyle.cxx libreoffice-5.0.5~rc2/xmloff/source/style/TransGradientStyle.cxx --- libreoffice-5.0.2/xmloff/source/style/TransGradientStyle.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/TransGradientStyle.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -178,9 +178,9 @@ break; case XML_TOK_GRADIENT_ANGLE: { - sal_Int32 nValue; - ::sax::Converter::convertNumber( nValue, rStrValue, 0, 3600 ); - aGradient.Angle = sal_Int16( nValue ); + bool const bSuccess = + ::sax::Converter::convertAngle(aGradient.Angle, rStrValue); + SAL_INFO_IF(!bSuccess, "xmloff.style", "failed to import draw:angle"); } break; case XML_TOK_GRADIENT_BORDER: @@ -285,8 +285,7 @@ // Angle if( aGradient.Style != awt::GradientStyle_RADIAL ) { - ::sax::Converter::convertNumber( - aOut, sal_Int32(aGradient.Angle)); + ::sax::Converter::convertAngle(aOut, aGradient.Angle); aStrValue = aOut.makeStringAndClear(); rExport.AddAttribute( XML_NAMESPACE_DRAW, XML_GRADIENT_ANGLE, aStrValue ); } diff -Nru libreoffice-5.0.2/xmloff/source/style/XMLBackgroundImageContext.cxx libreoffice-5.0.5~rc2/xmloff/source/style/XMLBackgroundImageContext.cxx --- libreoffice-5.0.2/xmloff/source/style/XMLBackgroundImageContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/XMLBackgroundImageContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -19,6 +19,7 @@ #include +#include #include @@ -332,9 +333,11 @@ sal_Int32 nPosIdx, sal_Int32 nFilterIdx, sal_Int32 nTransparencyIdx, + sal_Int32 nBitmapModeIdx, ::std::vector< XMLPropertyState > &rProps ) : XMLElementPropertyContext( rImport, nPrfx, rLName, rProp, rProps ), aPosProp( nPosIdx ), + m_nBitmapModeIdx(nBitmapModeIdx), aFilterProp( nFilterIdx ), aTransparencyProp( nTransparencyIdx ), nTransparency( 0 ) @@ -399,7 +402,40 @@ XMLElementPropertyContext::EndElement(); if( -1 != aPosProp.mnIndex ) - rProperties.push_back( aPosProp ); + { + // See if a FillBitmapMode property is already set, in that case + // BackGraphicLocation will be ignored. + bool bFound = false; + if (m_nBitmapModeIdx != -1) + { + for (XMLPropertyState& rProperty : rProperties) + { + if (rProperty.mnIndex == m_nBitmapModeIdx) + { + bFound = true; + + // Found, so map the old property to the new one. + switch (ePos) + { + case GraphicLocation_TILED: + rProperty.maValue <<= drawing::BitmapMode_REPEAT; + break; + case GraphicLocation_AREA: + rProperty.maValue <<= drawing::BitmapMode_STRETCH; + break; + case GraphicLocation_MIDDLE_MIDDLE: + rProperty.maValue <<= drawing::BitmapMode_NO_REPEAT; + break; + default: + break; + } + break; + } + } + } + if (!bFound) + rProperties.push_back( aPosProp ); + } if( -1 != aFilterProp.mnIndex ) rProperties.push_back( aFilterProp ); if( -1 != aTransparencyProp.mnIndex ) diff -Nru libreoffice-5.0.2/xmloff/source/style/xmlnumfe.cxx libreoffice-5.0.5~rc2/xmloff/source/style/xmlnumfe.cxx --- libreoffice-5.0.2/xmloff/source/style/xmlnumfe.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/xmlnumfe.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1206,7 +1206,10 @@ if ( bExpFound && pElemStr ) nExpDigits += pElemStr->getLength(); else if ( !bDecDashes && pElemStr && (*pElemStr)[0] == '-' ) + { bDecDashes = true; + nMinDecimals = 0; + } else if ( !bInInteger && pElemStr ) { for ( sal_Int32 i = pElemStr->getLength()-1; i >= 0 && (*pElemStr)[i] == '#'; i-- ) diff -Nru libreoffice-5.0.2/xmloff/source/style/xmlnumfi.cxx libreoffice-5.0.5~rc2/xmloff/source/style/xmlnumfi.cxx --- libreoffice-5.0.2/xmloff/source/style/xmlnumfi.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/style/xmlnumfi.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -1021,7 +1021,7 @@ } if ( aNumInfo.nMinDecimalDigits == -1) { - if ( bVarDecimals ) + if ( bVarDecimals || aNumInfo.bDecReplace ) aNumInfo.nMinDecimalDigits = 0; else aNumInfo.nMinDecimalDigits = aNumInfo.nDecimals; diff -Nru libreoffice-5.0.2/xmloff/source/text/txtexppr.cxx libreoffice-5.0.5~rc2/xmloff/source/text/txtexppr.cxx --- libreoffice-5.0.2/xmloff/source/text/txtexppr.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/txtexppr.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -669,6 +669,7 @@ // character background and highlight XMLPropertyState* pCharBackground = NULL; + XMLPropertyState* pCharBackgroundTransparency = NULL; XMLPropertyState* pCharHighlight = NULL; bool bNeedsAnchor = false; @@ -831,6 +832,7 @@ break; case CTF_CHAR_BACKGROUND: pCharBackground = propertyState; break; + case CTF_CHAR_BACKGROUND_TRANSPARENCY: pCharBackgroundTransparency = propertyState; break; case CTF_CHAR_HIGHLIGHT: pCharHighlight = propertyState; break; } } @@ -1137,12 +1139,20 @@ // When both background attributes are available export the visible one if( pCharHighlight && pCharBackground ) { + assert(pCharBackgroundTransparency); // always together sal_uInt32 nColor = COL_TRANSPARENT; pCharHighlight->maValue >>= nColor; if( nColor == COL_TRANSPARENT ) + { + // actually this would not be exported as transparent anyway + // and we'd need another property CharHighlightTransparent for that pCharHighlight->mnIndex = -1; + } else + { pCharBackground->mnIndex = -1; + pCharBackgroundTransparency->mnIndex = -1; + } } SvXMLExportPropertyMapper::ContextFilter(bEnableFoFontFamily, rProperties, rPropSet); diff -Nru libreoffice-5.0.2/xmloff/source/text/txtimp.cxx libreoffice-5.0.5~rc2/xmloff/source/text/txtimp.cxx --- libreoffice-5.0.2/xmloff/source/text/txtimp.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/txtimp.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -25,7 +25,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -576,6 +578,8 @@ OUString m_sCellParaStyleDefault; + std::unique_ptr> m_pCrossRefHeadingBookmarkMap; + Impl( uno::Reference const& rModel, SvXMLImport & rImport, bool const bInsertMode, bool const bStylesOnlyMode, @@ -2801,4 +2805,60 @@ return m_xImpl->m_sCellParaStyleDefault; } +void XMLTextImportHelper::AddCrossRefHeadingMapping(OUString const& rFrom, OUString const& rTo) +{ + if (!m_xImpl->m_pCrossRefHeadingBookmarkMap) + { + m_xImpl->m_pCrossRefHeadingBookmarkMap.reset(new std::map); + } + m_xImpl->m_pCrossRefHeadingBookmarkMap->insert(std::make_pair(rFrom, rTo)); +} + +// tdf#94804: hack to map cross reference fiels that reference duplicate marks +// note that we can't really check meta:generator for this since the file might +// be round-tripped by different versions preserving duplicates => always map +void XMLTextImportHelper::MapCrossRefHeadingFieldsHorribly() +{ + if (!m_xImpl->m_pCrossRefHeadingBookmarkMap) + { + return; + } + + uno::Reference const xFieldsSupplier( + m_xImpl->m_rSvXMLImport.GetModel(), uno::UNO_QUERY); + if (!xFieldsSupplier.is()) + { + return; + } + uno::Reference const xFieldsEA( + xFieldsSupplier->getTextFields()); + uno::Reference const xFields( + xFieldsEA->createEnumeration()); + while (xFields->hasMoreElements()) + { + uno::Reference const xFieldInfo( + xFields->nextElement(), uno::UNO_QUERY); + if (!xFieldInfo->supportsService("com.sun.star.text.textfield.GetReference")) + { + continue; + } + uno::Reference const xField( + xFieldInfo, uno::UNO_QUERY); + sal_uInt16 nType(0); + xField->getPropertyValue("ReferenceFieldSource") >>= nType; + if (text::ReferenceFieldSource::BOOKMARK != nType) + { + continue; + } + OUString name; + xField->getPropertyValue("SourceName") >>= name; + auto const iter(m_xImpl->m_pCrossRefHeadingBookmarkMap->find(name)); + if (iter == m_xImpl->m_pCrossRefHeadingBookmarkMap->end()) + { + continue; + } + xField->setPropertyValue("SourceName", uno::makeAny(iter->second)); + } +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -Nru libreoffice-5.0.2/xmloff/source/text/txtparai.cxx libreoffice-5.0.5~rc2/xmloff/source/text/txtparai.cxx --- libreoffice-5.0.2/xmloff/source/text/txtparai.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/txtparai.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -53,7 +53,6 @@ #include "txtlists.hxx" #include -class XMLHints_Impl : public boost::ptr_vector {}; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -66,6 +65,29 @@ TYPEINIT1( XMLCharContext, SvXMLImportContext ); +class XMLHints_Impl +{ +private: + boost::ptr_vector m_Hints; + uno::Reference m_xCrossRefHeadingBookmark; + +public: + void push_back(XMLHint_Impl * pHint) + { + m_Hints.push_back(pHint); + } + + boost::ptr_vector & GetHints() + { + return m_Hints; + } + + uno::Reference & GetCrossRefHeadingBookmark() + { + return m_xCrossRefHeadingBookmark; + } +}; + XMLCharContext::XMLCharContext( SvXMLImport& rImport, sal_uInt16 nPrfx, @@ -252,10 +274,10 @@ if (XMLStartReferenceContext_Impl::FindName(GetImport(), xAttrList, sName)) { // search for reference start - sal_uInt16 nCount = rHints.size(); + sal_uInt16 nCount = rHints.GetHints().size(); for(sal_uInt16 nPos = 0; nPos < nCount; nPos++) { - XMLHint_Impl *pHint = &rHints[nPos]; + XMLHint_Impl *pHint = &rHints.GetHints()[nPos]; if ( pHint->IsReference() && sName.equals( static_cast(pHint)->GetRefName()) ) { @@ -1120,10 +1142,10 @@ if (!sID.isEmpty()) { // if we have an ID, find the hint and set the end position - sal_uInt16 nCount = rHints.size(); + sal_uInt16 nCount = rHints.GetHints().size(); for(sal_uInt16 nPos = 0; nPos < nCount; nPos++) { - XMLHint_Impl *pHint = &rHints[nPos]; + XMLHint_Impl *pHint = &rHints.GetHints()[nPos]; if ( pHint->IsIndexMark() && sID.equals( static_cast(pHint)->GetID()) ) @@ -1655,6 +1677,7 @@ case XML_TOK_TEXT_BOOKMARK_END: pContext = new XMLTextMarkImportContext( rImport, *rImport.GetTextImport().get(), + rHints.GetCrossRefHeadingBookmark(), nPrefix, rLocalName ); break; @@ -1663,6 +1686,7 @@ case XML_TOK_TEXT_FIELDMARK_END: pContext = new XMLTextMarkImportContext( rImport, *rImport.GetTextImport().get(), + rHints.GetCrossRefHeadingBookmark(), nPrefix, rLocalName ); break; @@ -2072,11 +2096,11 @@ } } - if( pHints && !pHints->empty() ) + if (pHints && !pHints->GetHints().empty()) { - for( sal_uInt16 i=0; isize(); i++ ) + for( sal_uInt16 i=0; i < pHints->GetHints().size(); i++ ) { - XMLHint_Impl *pHint = &(*pHints)[i]; + XMLHint_Impl *pHint = &pHints->GetHints()[i]; xAttrCursor->gotoRange( pHint->GetStart(), sal_False ); xAttrCursor->gotoRange( pHint->GetEnd(), sal_True ); switch( pHint->GetType() ) diff -Nru libreoffice-5.0.2/xmloff/source/text/txtprmap.cxx libreoffice-5.0.5~rc2/xmloff/source/text/txtprmap.cxx --- libreoffice-5.0.2/xmloff/source/text/txtprmap.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/txtprmap.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -192,7 +192,7 @@ // TODO: not used? // RES_CHRATR_BACKGROUND MT_E( "CharBackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ), - MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, CTF_CHAR_BACKGROUND_TRANSPARENCY), MT_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ), // RES_CHRATR_CJK_FONT MT_ED( "CharFontNameAsian", STYLE, FONT_NAME_ASIAN, XML_TYPE_STRING|MID_FLAG_SPECIAL_ITEM_IMPORT, CTF_FONTNAME_CJK ), @@ -535,7 +535,7 @@ // TODO: not used? // RES_CHRATR_BACKGROUND MT_E( "CharBackColor", FO, BACKGROUND_COLOR, XML_TYPE_COLORTRANSPARENT|MID_FLAG_MULTI_PROPERTY, CTF_CHAR_BACKGROUND ), - MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, 0 ), + MT_E( "CharBackTransparent", FO, BACKGROUND_COLOR, XML_TYPE_ISTRANSPARENT|MID_FLAG_MERGE_ATTRIBUTE, CTF_CHAR_BACKGROUND_TRANSPARENCY), { "CharShadingValue", sizeof("CharShadingValue")-1, XML_NAMESPACE_LO_EXT, XML_CHAR_SHADING_VALUE, XML_TYPE_NUMBER|XML_TYPE_PROP_TEXT, 0, SvtSaveOptions::ODFVER_012_EXT_COMPAT, false }, MT_E( "CharBackColor", FO, TEXT_BACKGROUND_COLOR, XML_TYPE_COLOR|MID_FLAG_SPECIAL_ITEM_EXPORT, CTF_OLDTEXTBACKGROUND ), // RES_CHRATR_CJK_FONT diff -Nru libreoffice-5.0.2/xmloff/source/text/XMLTextFrameContext.cxx libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextFrameContext.cxx --- libreoffice-5.0.2/xmloff/source/text/XMLTextFrameContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextFrameContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -593,6 +593,7 @@ (!sName.isEmpty() && sOrigName != sName) ) { OUString sOldName( sName ); + sal_Int32 i = 0; while( xTextImportHelper->HasFrameByName( sName ) ) { @@ -601,8 +602,15 @@ } xNamed->setName( sName ); if( sName != sOldName ) - xTextImportHelper->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_FRAME, + { + bool bSuccess = xTextImportHelper->GetRenameMap().Add( XML_TEXT_RENAME_TYPE_FRAME, sOldName, sName ); + if (!bSuccess && GetImport().getGeneratorVersion() == SvXMLImport::LO_44x) + { + bCreateFailed = true; + return; + } + } } } diff -Nru libreoffice-5.0.2/xmloff/source/text/XMLTextMarkImportContext.cxx libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextMarkImportContext.cxx --- libreoffice-5.0.2/xmloff/source/text/XMLTextMarkImportContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextMarkImportContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -100,10 +100,12 @@ XMLTextMarkImportContext::XMLTextMarkImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, + uno::Reference & io_rxCrossRefHeadingBookmark, sal_uInt16 nPrefix, const OUString& rLocalName ) : SvXMLImportContext(rImport, nPrefix, rLocalName) , m_rHelper(rHlp) + , m_rxCrossRefHeadingBookmark(io_rxCrossRefHeadingBookmark) , m_bHaveAbout(false) { } @@ -203,9 +205,23 @@ OUString()); break; - case TypeFieldmark: case TypeBookmark: { + // tdf#94804: detect duplicate heading cross reference bookmarks + if (m_sBookmarkName.startsWith("__RefHeading__")) + { + if (m_rxCrossRefHeadingBookmark.is()) + { + uno::Reference const xNamed( + m_rxCrossRefHeadingBookmark, uno::UNO_QUERY); + m_rHelper.AddCrossRefHeadingMapping( + m_sBookmarkName, xNamed->getName()); + break; // don't insert + } + } + } // fall through + case TypeFieldmark: + { const char *formFieldmarkName=lcl_getFormFieldmarkName(m_sFieldName); bool bImportAsField=((lcl_MarkType)nTmp==TypeFieldmark && formFieldmarkName!=NULL); //@TODO handle abbreviation cases.. // export point bookmark @@ -226,6 +242,12 @@ } m_rHelper.popFieldCtx(); } + if (TypeBookmark == nTmp + && m_sBookmarkName.startsWith("__RefHeading__")) + { + assert(xContent.is()); + m_rxCrossRefHeadingBookmark = xContent; + } } break; @@ -250,8 +272,22 @@ } break; - case TypeFieldmarkEnd: case TypeBookmarkEnd: + { + // tdf#94804: detect duplicate heading cross reference bookmarks + if (m_sBookmarkName.startsWith("__RefHeading__")) + { + if (m_rxCrossRefHeadingBookmark.is()) + { + uno::Reference const xNamed( + m_rxCrossRefHeadingBookmark, uno::UNO_QUERY); + m_rHelper.AddCrossRefHeadingMapping( + m_sBookmarkName, xNamed->getName()); + break; // don't insert + } + } + } // fall through + case TypeFieldmarkEnd: { // get old range, and construct Reference xStartRange; @@ -334,6 +370,12 @@ } m_rHelper.popFieldCtx(); } + if (TypeBookmarkEnd == nTmp + && m_sBookmarkName.startsWith("__RefHeading__")) + { + assert(xContent.is()); + m_rxCrossRefHeadingBookmark = xContent; + } } // else: beginning/end in different XText -> ignore! } diff -Nru libreoffice-5.0.2/xmloff/source/text/XMLTextMarkImportContext.hxx libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextMarkImportContext.hxx --- libreoffice-5.0.2/xmloff/source/text/XMLTextMarkImportContext.hxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextMarkImportContext.hxx 2016-02-04 16:41:28.000000000 +0000 @@ -61,8 +61,11 @@ */ class XMLTextMarkImportContext : public SvXMLImportContext { - +private: XMLTextImportHelper & m_rHelper; + + css::uno::Reference & m_rxCrossRefHeadingBookmark; + OUString m_sBookmarkName; OUString m_sFieldName; OUString m_sXmlId; @@ -80,6 +83,7 @@ XMLTextMarkImportContext( SvXMLImport& rImport, XMLTextImportHelper& rHlp, + css::uno::Reference & io_rxCrossRefHeadingBookmark, sal_uInt16 nPrfx, const OUString& rLocalName ); diff -Nru libreoffice-5.0.2/xmloff/source/text/XMLTextPropertySetContext.cxx libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextPropertySetContext.cxx --- libreoffice-5.0.2/xmloff/source/text/XMLTextPropertySetContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextPropertySetContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -114,6 +114,7 @@ rProp.mnIndex-2, rProp.mnIndex-1, nTranspIndex, + -1, rProperties ); } break; diff -Nru libreoffice-5.0.2/xmloff/source/text/XMLTextShapeStyleContext.cxx libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextShapeStyleContext.cxx --- libreoffice-5.0.2/xmloff/source/text/XMLTextShapeStyleContext.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmloff/source/text/XMLTextShapeStyleContext.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -111,6 +111,7 @@ rProp.mnIndex-2, rProp.mnIndex-1, rProp.mnIndex-3, + -1, rProperties ); break; } diff -Nru libreoffice-5.0.2/xmlsecurity/source/xmlsec/saxhelper.cxx libreoffice-5.0.5~rc2/xmlsecurity/source/xmlsec/saxhelper.cxx --- libreoffice-5.0.2/xmlsecurity/source/xmlsec/saxhelper.cxx 2015-09-17 13:33:12.000000000 +0000 +++ libreoffice-5.0.5~rc2/xmlsecurity/source/xmlsec/saxhelper.cxx 2016-02-04 16:41:28.000000000 +0000 @@ -137,7 +137,7 @@ { xmlSAXVersion(m_pParserCtxt->sax, 1); - if( m_pParserCtxt->inputTab[0] != NULL ) + if (m_pParserCtxt->inputTab != nullptr) { m_pParserCtxt->inputTab[0] = NULL ; }