summaryrefslogtreecommitdiff
path: root/sc/source/filter/excel/excdoc.cxx
blob: 891919fdc7e7959194241dd7e80684684113b11f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
/* -*- 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 .
 */

#include <scitems.hxx>

#include <svx/svdobj.hxx>
#include <svx/svditer.hxx>
#include <svx/svdpage.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/ulspitem.hxx>
#include <svl/intitem.hxx>
#include <svl/zformat.hxx>
#include <sot/storage.hxx>
#include <sfx2/objsh.hxx>
#include <rtl/ustring.hxx>

#include <formulacell.hxx>
#include <dociter.hxx>
#include <document.hxx>
#include <dbdata.hxx>
#include <global.hxx>
#include <progress.hxx>
#include <conditio.hxx>
#include <dpobject.hxx>
#include <attrib.hxx>
#include <scextopt.hxx>
#include <stlsheet.hxx>
#include <stlpool.hxx>
#include <olinetab.hxx>
#include <unonames.hxx>
#include <convuno.hxx>
#include <patattr.hxx>
#include <docoptio.hxx>
#include <tabprotection.hxx>
#include <postit.hxx>

#include <excdoc.hxx>
#include <namebuff.hxx>
#include <xeextlst.hxx>
#include <biffhelper.hxx>

#include <xcl97rec.hxx>
#include <xcl97esc.hxx>
#include <xetable.hxx>
#include <xelink.hxx>
#include <xename.hxx>
#include <xepage.hxx>
#include <xeview.hxx>
#include <xecontent.hxx>
#include <xeescher.hxx>
#include <xepivot.hxx>
#include <XclExpChangeTrack.hxx>
#include <xepivotxml.hxx>
#include <xedbdata.hxx>

#include <math.h>

#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <oox/token/tokens.hxx>
#include <oox/token/namespaces.hxx>
#include <memory>

using namespace oox;

static OUString lcl_GetVbaTabName( SCTAB n )
{
    OUString aRet = "__VBA__"  + OUString::number( static_cast<sal_uInt16>(n) );
    return aRet;
}

static void lcl_AddBookviews( XclExpRecordList<>& aRecList, const ExcTable& self )
{
    aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_bookViews ) );
    aRecList.AppendNewRecord( new XclExpWindow1( self.GetRoot() ) );
    aRecList.AppendNewRecord( new XclExpXmlEndElementRecord( XML_bookViews ) );
}

static void lcl_AddCalcPr( XclExpRecordList<>& aRecList, const ExcTable& self )
{
    ScDocument& rDoc = self.GetDoc();

    aRecList.AppendNewRecord( new XclExpXmlStartSingleElementRecord( XML_calcPr ) );
    // OOXTODO: calcCompleted, calcId, calcMode, calcOnSave,
    //          concurrentCalc, concurrentManualCount,
    //          forceFullCalc, fullCalcOnLoad, fullPrecision
    aRecList.AppendNewRecord( new XclCalccount( rDoc ) );
    aRecList.AppendNewRecord( new XclRefmode( rDoc ) );
    aRecList.AppendNewRecord( new XclIteration( rDoc ) );
    aRecList.AppendNewRecord( new XclDelta( rDoc ) );
    aRecList.AppendNewRecord( new XclExpBoolRecord(oox::xls::BIFF_ID_SAVERECALC, true) );
    aRecList.AppendNewRecord( new XclExpXmlEndSingleElementRecord() );  // XML_calcPr
}

static void lcl_AddWorkbookProtection( XclExpRecordList<>& aRecList, const ExcTable& self )
{
    aRecList.AppendNewRecord( new XclExpXmlStartSingleElementRecord( XML_workbookProtection ) );

    const ScDocProtection* pProtect = self.GetDoc().GetDocProtection();
    if (pProtect && pProtect->isProtected())
    {
        aRecList.AppendNewRecord( new XclExpWindowProtection(pProtect->isOptionEnabled(ScDocProtection::WINDOWS)) );
        aRecList.AppendNewRecord( new XclExpProtection(pProtect->isOptionEnabled(ScDocProtection::STRUCTURE)) );
        aRecList.AppendNewRecord( new XclExpPassHash(pProtect->getPasswordHash(PASSHASH_XL)) );
    }

    aRecList.AppendNewRecord( new XclExpXmlEndSingleElementRecord() );   // XML_workbookProtection
}

static void lcl_AddScenariosAndFilters( XclExpRecordList<>& aRecList, const XclExpRoot& rRoot, SCTAB nScTab )
{
    // Scenarios
    aRecList.AppendNewRecord( new ExcEScenarioManager( rRoot, nScTab ) );
    // filter
    aRecList.AppendRecord( rRoot.GetFilterManager().CreateRecord( nScTab ) );
}

ExcTable::ExcTable( const XclExpRoot& rRoot ) :
    XclExpRoot( rRoot ),
    mnScTab( SCTAB_GLOBAL ),
    nExcTab( EXC_NOTAB ),
    mxNoteList( new XclExpNoteList )
{
}

ExcTable::ExcTable( const XclExpRoot& rRoot, SCTAB nScTab ) :
    XclExpRoot( rRoot ),
    mnScTab( nScTab ),
    nExcTab( rRoot.GetTabInfo().GetXclTab( nScTab ) ),
    mxNoteList( new XclExpNoteList )
{
}

ExcTable::~ExcTable()
{
}

void ExcTable::Add( XclExpRecordBase* pRec )
{
    OSL_ENSURE( pRec, "-ExcTable::Add(): pRec is NULL!" );
    aRecList.AppendNewRecord( pRec );
}

void ExcTable::FillAsHeaderBinary( ExcBoundsheetList& rBoundsheetList )
{
    InitializeGlobals();

    RootData& rR = GetOldRoot();
    ScDocument& rDoc = GetDoc();
    XclExpTabInfo& rTabInfo = GetTabInfo();

    if ( GetBiff() <= EXC_BIFF5 )
        Add( new ExcBofW );
    else
        Add( new ExcBofW8 );

    sal_uInt16  nExcTabCount    = rTabInfo.GetXclTabCount();
    sal_uInt16  nCodenames      = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() );

    SfxObjectShell* pShell = GetDocShell();
    sal_uInt16 nWriteProtHash = pShell ? pShell->GetModifyPasswordHash() : 0;
    bool bRecommendReadOnly = pShell && pShell->IsLoadReadonly();

    if( (nWriteProtHash > 0) || bRecommendReadOnly )
        Add( new XclExpEmptyRecord( EXC_ID_WRITEPROT ) );

    // TODO: correct codepage for BIFF5?
    sal_uInt16 nCodePage = XclTools::GetXclCodePage( (GetBiff() <= EXC_BIFF5) ? RTL_TEXTENCODING_MS_1252 : RTL_TEXTENCODING_UNICODE );

    if( GetBiff() <= EXC_BIFF5 )
    {
        Add( new XclExpEmptyRecord( EXC_ID_INTERFACEHDR ) );
        Add( new XclExpUInt16Record( EXC_ID_MMS, 0 ) );
        Add( new XclExpEmptyRecord( EXC_ID_TOOLBARHDR ) );
        Add( new XclExpEmptyRecord( EXC_ID_TOOLBAREND ) );
        Add( new XclExpEmptyRecord( EXC_ID_INTERFACEEND ) );
        Add( new ExcDummy_00 );
    }
    else
    {
        if( IsDocumentEncrypted() )
            Add( new XclExpFileEncryption( GetRoot() ) );
        Add( new XclExpInterfaceHdr( nCodePage ) );
        Add( new XclExpUInt16Record( EXC_ID_MMS, 0 ) );
        Add( new XclExpInterfaceEnd );
        Add( new XclExpWriteAccess );
    }

    Add( new XclExpFileSharing( GetRoot(), nWriteProtHash, bRecommendReadOnly ) );
    Add( new XclExpUInt16Record( EXC_ID_CODEPAGE, nCodePage ) );

    if( GetBiff() == EXC_BIFF8 )
    {
        Add( new XclExpBoolRecord( EXC_ID_DSF, false ) );
        Add( new XclExpEmptyRecord( EXC_ID_XL9FILE ) );
        rR.pTabId = new XclExpChTrTabId( std::max( nExcTabCount, nCodenames ) );
        Add( rR.pTabId );
        if( HasVbaStorage() )
        {
            Add( new XclObproj );
            const OUString& rCodeName = GetExtDocOptions().GetDocSettings().maGlobCodeName;
            if( !rCodeName.isEmpty() )
                Add( new XclCodename( rCodeName ) );
        }
    }

    Add( new XclExpUInt16Record( EXC_ID_FNGROUPCOUNT, 14 ) );

    if ( GetBiff() <= EXC_BIFF5 )
    {
        // global link table: EXTERNCOUNT, EXTERNSHEET, NAME
        aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
        aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );
    }

    // document protection options
    lcl_AddWorkbookProtection( aRecList, *this );

    if( GetBiff() == EXC_BIFF8 )
    {
        Add( new XclExpProt4Rev );
        Add( new XclExpProt4RevPass );
    }

    lcl_AddBookviews( aRecList, *this );

    Add( new XclExpXmlStartSingleElementRecord( XML_workbookPr ) );
    if ( GetBiff() == EXC_BIFF8 && GetOutput() != EXC_OUTPUT_BINARY )
    {
        Add( new XclExpBoolRecord(0x0040, false, XML_backupFile ) );    // BACKUP
        Add( new XclExpBoolRecord(0x008D, false, XML_showObjects ) );   // HIDEOBJ
    }

    if ( GetBiff() == EXC_BIFF8 )
    {
        Add( new XclExpBoolRecord(0x0040, false) ); // BACKUP
        Add( new XclExpBoolRecord(0x008D, false) ); // HIDEOBJ
    }

    if( GetBiff() <= EXC_BIFF5 )
    {
        Add( new ExcDummy_040 );
        Add( new Exc1904( rDoc ) );
        Add( new ExcDummy_041 );
    }
    else
    {
        // BIFF8
        Add( new Exc1904( rDoc ) );
        Add( new XclExpBoolRecord( 0x000E, !rDoc.GetDocOptions().IsCalcAsShown() ) );
        Add( new XclExpBoolRecord(0x01B7, false) ); // REFRESHALL
        Add( new XclExpBoolRecord(0x00DA, false) ); // BOOKBOOL
    }

    // Formatting: FONT, FORMAT, XF, STYLE, PALETTE
    aRecList.AppendRecord( CreateRecord( EXC_ID_FONTLIST ) );
    aRecList.AppendRecord( CreateRecord( EXC_ID_FORMATLIST ) );
    aRecList.AppendRecord( CreateRecord( EXC_ID_XFLIST ) );
    aRecList.AppendRecord( CreateRecord( EXC_ID_PALETTE ) );

    SCTAB   nC;
    SCTAB  nScTabCount     = rTabInfo.GetScTabCount();
    if( GetBiff() <= EXC_BIFF5 )
    {
        // Bundlesheet
        for( nC = 0 ; nC < nScTabCount ; nC++ )
            if( rTabInfo.IsExportTab( nC ) )
            {
                ExcBoundsheetList::RecordRefType xBoundsheet( new ExcBundlesheet( rR, nC ) );
                aRecList.AppendRecord( xBoundsheet );
                rBoundsheetList.AppendRecord( xBoundsheet );
            }
    }
    else
    {
        // Pivot Cache
        GetPivotTableManager().CreatePivotTables();
        aRecList.AppendRecord( GetPivotTableManager().CreatePivotCachesRecord() );

        // Change tracking
        if( rDoc.GetChangeTrack() )
        {
            rR.pUserBViewList = new XclExpUserBViewList( *rDoc.GetChangeTrack() );
            Add( rR.pUserBViewList );
        }

        // Natural Language Formulas Flag
        aRecList.AppendNewRecord( new XclExpBoolRecord( EXC_ID_USESELFS, GetDoc().GetDocOptions().IsLookUpColRowNames() ) );

        // Bundlesheet
        for( nC = 0 ; nC < nScTabCount ; nC++ )
            if( rTabInfo.IsExportTab( nC ) )
            {
                ExcBoundsheetList::RecordRefType xBoundsheet( new ExcBundlesheet8( rR, nC ) );
                aRecList.AppendRecord( xBoundsheet );
                rBoundsheetList.AppendRecord( xBoundsheet );
            }

        OUString aTmpString;
        for( SCTAB nAdd = 0; nC < static_cast<SCTAB>(nCodenames) ; nC++, nAdd++ )
        {
            aTmpString = lcl_GetVbaTabName( nAdd );
            ExcBoundsheetList::RecordRefType xBoundsheet( new ExcBundlesheet8( aTmpString ) );
            aRecList.AppendRecord( xBoundsheet );
            rBoundsheetList.AppendRecord( xBoundsheet );
        }

        // COUNTRY - in BIFF8 in workbook globals
        Add( new XclExpCountry( GetRoot() ) );

        // link table: SUPBOOK, XCT, CRN, EXTERNNAME, EXTERNSHEET, NAME
        aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
        aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );

        Add( new XclExpRecalcId );

        // MSODRAWINGGROUP per-document data
        aRecList.AppendRecord( GetObjectManager().CreateDrawingGroup() );
        // Shared string table: SST, EXTSST
        aRecList.AppendRecord( CreateRecord( EXC_ID_SST ) );

        Add( new XclExpBookExt );
    }

    Add( new ExcEof );
}

void ExcTable::FillAsHeaderXml( ExcBoundsheetList& rBoundsheetList )
{
    InitializeGlobals();

    RootData& rR = GetOldRoot();
    ScDocument& rDoc = GetDoc();
    XclExpTabInfo& rTabInfo = GetTabInfo();

    sal_uInt16  nExcTabCount    = rTabInfo.GetXclTabCount();
    sal_uInt16  nCodenames      = static_cast< sal_uInt16 >( GetExtDocOptions().GetCodeNameCount() );

    rR.pTabId = new XclExpChTrTabId( std::max( nExcTabCount, nCodenames ) );
    Add( rR.pTabId );

    Add( new XclExpXmlStartSingleElementRecord( XML_workbookPr ) );
    Add( new XclExpBoolRecord(0x0040, false, XML_backupFile ) );    // BACKUP
    Add( new XclExpBoolRecord(0x008D, false, XML_showObjects ) );   // HIDEOBJ

    Add( new Exc1904( rDoc ) );
    // OOXTODO: The following /workbook/workbookPr attributes are mapped
    //          to various BIFF records that are not currently supported:
    //
    //          XML_allowRefreshQuery:          QSISTAG 802h: fEnableRefresh
    //          XML_autoCompressPictures:       COMPRESSPICTURES 89Bh: fAutoCompressPictures
    //          XML_checkCompatibility:         COMPAT12 88Ch: fNoCompatChk
    //          XML_codeName:                   "Calc"
    //          XML_defaultThemeVersion:        ???
    //          XML_filterPrivacy:              BOOKEXT 863h: fFilterPrivacy
    //          XML_hidePivotFieldList:         BOOKBOOL DAh: fHidePivotTableFList
    //          XML_promptedSolutions:          BOOKEXT 863h: fBuggedUserAboutSolution
    //          XML_publishItems:               NAMEPUBLISH 893h: fPublished
    //          XML_saveExternalLinkValues:     BOOKBOOL DAh: fNoSavSupp
    //          XML_showBorderUnselectedTables: BOOKBOOL DAh: fHideBorderUnsels
    //          XML_showInkAnnotation:          BOOKEXT 863h: fShowInkAnnotation
    //          XML_showPivotChart:             PIVOTCHARTBITS 859h: fGXHide??
    //          XML_updateLinks:                BOOKBOOL DAh: grbitUpdateLinks
    Add( new XclExpXmlEndSingleElementRecord() );   // XML_workbookPr

    // Formatting: FONT, FORMAT, XF, STYLE, PALETTE
    aRecList.AppendNewRecord( new XclExpXmlStyleSheet( *this ) );

    // Change tracking
    if( rDoc.GetChangeTrack() )
    {
        rR.pUserBViewList = new XclExpUserBViewList( *rDoc.GetChangeTrack() );
        Add( rR.pUserBViewList );
    }

    lcl_AddWorkbookProtection( aRecList, *this );
    lcl_AddBookviews( aRecList, *this );

    // Bundlesheet
    SCTAB nC;
    SCTAB nScTabCount = rTabInfo.GetScTabCount();
    aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_sheets ) );
    for( nC = 0 ; nC < nScTabCount ; nC++ )
        if( rTabInfo.IsExportTab( nC ) )
        {
            ExcBoundsheetList::RecordRefType xBoundsheet( new ExcBundlesheet8( rR, nC ) );
            aRecList.AppendRecord( xBoundsheet );
            rBoundsheetList.AppendRecord( xBoundsheet );
        }
    aRecList.AppendNewRecord( new XclExpXmlEndElementRecord( XML_sheets ) );

    OUString aTmpString;
    for( SCTAB nAdd = 0; nC < static_cast<SCTAB>(nCodenames) ; nC++, nAdd++ )
    {
        aTmpString = lcl_GetVbaTabName( nAdd );
        ExcBoundsheetList::RecordRefType xBoundsheet( new ExcBundlesheet8( aTmpString ) );
        aRecList.AppendRecord( xBoundsheet );
        rBoundsheetList.AppendRecord( xBoundsheet );
    }

    // link table: SUPBOOK, XCT, CRN, EXTERNNAME, EXTERNSHEET, NAME
    aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );
    aRecList.AppendRecord( CreateRecord( EXC_ID_NAME ) );

    lcl_AddCalcPr( aRecList, *this );

    // MSODRAWINGGROUP per-document data
    aRecList.AppendRecord( GetObjectManager().CreateDrawingGroup() );
    // Shared string table: SST, EXTSST
    aRecList.AppendRecord( CreateRecord( EXC_ID_SST ) );
}

void ExcTable::FillAsTableBinary( SCTAB nCodeNameIdx )
{
    InitializeTable( mnScTab );

    RootData& rR = GetOldRoot();
    XclBiff eBiff = GetBiff();
    ScDocument& rDoc = GetDoc();

    OSL_ENSURE( (mnScTab >= 0) && (mnScTab <= MAXTAB), "-ExcTable::Table(): mnScTab - no ordinary table!" );
    OSL_ENSURE( nExcTab <= static_cast<sal_uInt16>(MAXTAB), "-ExcTable::Table(): nExcTab - no ordinary table!" );

    // create a new OBJ list for this sheet (may be used by notes, autofilter, data validation)
    if( eBiff == EXC_BIFF8 )
        GetObjectManager().StartSheet();

    // cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
    mxCellTable.reset( new XclExpCellTable( GetRoot() ) );

    //export cell notes
    std::vector<sc::NoteEntry> aNotes;
    rDoc.GetAllNoteEntries(aNotes);
    for (std::vector<sc::NoteEntry>::const_iterator it = aNotes.begin(), itEnd = aNotes.end(); it != itEnd; ++it)
    {
        if (it->maPos.Tab() != mnScTab)
            continue;

        mxNoteList->AppendNewRecord(new XclExpNote(GetRoot(), it->maPos, it->mpNote, OUString()));
    }

    // WSBOOL needs data from page settings, create it here, add it later
    std::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
    bool bFitToPages = xPageSett->GetPageData().mbFitToPages;

    if( eBiff <= EXC_BIFF5 )
    {
        Add( new ExcBof );
        Add( new ExcDummy_02a );
    }
    else
    {
        Add( new ExcBof8 );
        lcl_AddCalcPr( aRecList, *this );
    }

    // GUTS (count & size of outline icons)
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_GUTS ) );
    // DEFROWHEIGHT, created by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID2_DEFROWHEIGHT ) );

    // COUNTRY - in BIFF5/7 in every worksheet
    if( eBiff <= EXC_BIFF5 )
        Add( new XclExpCountry( GetRoot() ) );

    Add( new XclExpWsbool( bFitToPages ) );

    // page settings (SETUP and various other records)
    aRecList.AppendRecord( xPageSett );

    const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab);
    if (pTabProtect && pTabProtect->isProtected())
    {
        Add( new XclExpProtection(true) );
        Add( new XclExpBoolRecord(oox::xls::BIFF_ID_SCENPROTECT, pTabProtect->isOptionEnabled(ScTableProtection::SCENARIOS)) );
        if (pTabProtect->isOptionEnabled(ScTableProtection::OBJECTS))
            Add( new XclExpBoolRecord(oox::xls::BIFF_ID_OBJECTPROTECT, true ));
        Add( new XclExpPassHash(pTabProtect->getPasswordHash(PASSHASH_XL)) );
    }

    // local link table: EXTERNCOUNT, EXTERNSHEET
    if( eBiff <= EXC_BIFF5 )
        aRecList.AppendRecord( CreateRecord( EXC_ID_EXTERNSHEET ) );

    if ( eBiff == EXC_BIFF8 )
        lcl_AddScenariosAndFilters( aRecList, GetRoot(), mnScTab );

    // cell table: DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
    aRecList.AppendRecord( mxCellTable );

    // MERGEDCELLS record, generated by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_MERGEDCELLS ) );
    // label ranges
    if( eBiff == EXC_BIFF8 )
        Add( new XclExpLabelranges( GetRoot() ) );
    // data validation (DVAL and list of DV records), generated by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_DVAL ) );

    if( eBiff == EXC_BIFF8 )
    {
        // all MSODRAWING and OBJ stuff of this sheet goes here
        aRecList.AppendRecord( GetObjectManager().ProcessDrawing( GetSdrPage( mnScTab ) ) );
        // pivot tables
        aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord( mnScTab ) );
    }

    // list of NOTE records, generated by the cell table
    aRecList.AppendRecord( mxNoteList );

    // sheet view settings: WINDOW2, SCL, PANE, SELECTION
    aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );

    if( eBiff == EXC_BIFF8 )
    {
        // sheet protection options
        Add( new XclExpSheetProtectOptions( GetRoot(), mnScTab ) );

        // enhanced protections if there are
        if (pTabProtect)
        {
            const ::std::vector<ScEnhancedProtection>& rProts( pTabProtect->getEnhancedProtection());
            for (::std::vector<ScEnhancedProtection>::const_iterator it( rProts.begin()), itEnd( rProts.end());
                    it != itEnd; ++it)
            {
                Add( new XclExpSheetEnhancedProtection( GetRoot(), *it));
            }
        }

        // web queries
        Add( new XclExpWebQueryBuffer( GetRoot() ) );

        // conditional formats
        Add( new XclExpCondFormatBuffer( GetRoot(), XclExtLstRef() ) );

        if( HasVbaStorage() )
            if( nCodeNameIdx < GetExtDocOptions().GetCodeNameCount() )
                Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx ) ) );
    }

    // list of HLINK records, generated by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_HLINK ) );

    // change tracking
    if( rR.pUserBViewList )
    {
        XclExpUserBViewList::const_iterator iter;
        for ( iter = rR.pUserBViewList->cbegin(); iter != rR.pUserBViewList->cend(); ++iter)
        {
            Add( new XclExpUsersViewBegin( (*iter).GetGUID(), nExcTab ) );
            Add( new XclExpUsersViewEnd );
        }
    }

    // EOF
    Add( new ExcEof );
}

void ExcTable::FillAsTableXml()
{
    InitializeTable( mnScTab );

    ScDocument& rDoc = GetDoc();

    OSL_ENSURE( (mnScTab >= 0) && (mnScTab <= MAXTAB), "-ExcTable::Table(): mnScTab - no ordinary table!" );
    OSL_ENSURE( nExcTab <= static_cast<sal_uInt16>(MAXTAB), "-ExcTable::Table(): nExcTab - no ordinary table!" );

    // create a new OBJ list for this sheet (may be used by notes, autofilter, data validation)
    GetObjectManager().StartSheet();

    // cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
    mxCellTable.reset( new XclExpCellTable( GetRoot() ) );

    //export cell notes
    std::vector<sc::NoteEntry> aNotes;
    rDoc.GetAllNoteEntries(aNotes);
    for (std::vector<sc::NoteEntry>::const_iterator it = aNotes.begin(), itEnd = aNotes.end(); it != itEnd; ++it)
    {
        if (it->maPos.Tab() != mnScTab)
            continue;

        mxNoteList->AppendNewRecord(new XclExpNote(GetRoot(), it->maPos, it->mpNote, OUString()));
    }

    // WSBOOL needs data from page settings, create it here, add it later
    std::shared_ptr< XclExpPageSettings > xPageSett( new XclExpPageSettings( GetRoot() ) );
    XclExtLstRef xExtLst( new XclExtLst( GetRoot() ) );
    bool bFitToPages = xPageSett->GetPageData().mbFitToPages;

    Color aTabColor = GetRoot().GetDoc().GetTabBgColor(mnScTab);
    Add(new XclExpXmlSheetPr(bFitToPages, mnScTab, aTabColor, &GetFilterManager()));

    // GUTS (count & size of outline icons)
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_GUTS ) );
    // DEFROWHEIGHT, created by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID2_DEFROWHEIGHT ) );

    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID3_DIMENSIONS ) );

    // sheet view settings: WINDOW2, SCL, PANE, SELECTION
    aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );

    // cell table: DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
    aRecList.AppendRecord( mxCellTable );

    // list of NOTE records, generated by the cell table
    // not in the worksheet file
    if( mxNoteList != nullptr && !mxNoteList->IsEmpty() )
        aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );

    const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab);
    if (pTabProtect && pTabProtect->isProtected())
        Add( new XclExpSheetProtection(true, mnScTab) );

    lcl_AddScenariosAndFilters( aRecList, GetRoot(), mnScTab );

    // MERGEDCELLS record, generated by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_MERGEDCELLS ) );

    // conditional formats
    Add( new XclExpCondFormatBuffer( GetRoot(), xExtLst ) );

    // data validation (DVAL and list of DV records), generated by the cell table
    aRecList.AppendRecord( mxCellTable->CreateRecord( EXC_ID_DVAL ) );

    // list of HLINK records, generated by the cell table
    XclExpRecordRef xHyperlinks = mxCellTable->CreateRecord( EXC_ID_HLINK );
    XclExpHyperlinkList* pHyperlinkList = dynamic_cast<XclExpHyperlinkList*>(xHyperlinks.get());
    if( pHyperlinkList != nullptr && !pHyperlinkList->IsEmpty() )
    {
        aRecList.AppendNewRecord( new XclExpXmlStartElementRecord( XML_hyperlinks ) );
        aRecList.AppendRecord( xHyperlinks );
        aRecList.AppendNewRecord( new XclExpXmlEndElementRecord( XML_hyperlinks ) );
    }

    aRecList.AppendRecord( xPageSett );

    // all MSODRAWING and OBJ stuff of this sheet goes here
    aRecList.AppendRecord( GetObjectManager().ProcessDrawing( GetSdrPage( mnScTab ) ) );

    XclExpImgData* pImgData = xPageSett->getGraphicExport();
    if (pImgData)
        aRecList.AppendRecord(std::shared_ptr<XclExpRecordBase>(pImgData));

    // <tableParts> after <drawing> and before <extLst>
    aRecList.AppendRecord( GetTablesManager().GetTablesBySheet( mnScTab));

    aRecList.AppendRecord( xExtLst );
}

void ExcTable::FillAsEmptyTable( SCTAB nCodeNameIdx )
{
    InitializeTable( mnScTab );

    if( HasVbaStorage() && (nCodeNameIdx < GetExtDocOptions().GetCodeNameCount()) )
    {
        if( GetBiff() <= EXC_BIFF5 )
        {
            Add( new ExcBof );
        }
        else
        {
            Add( new ExcBof8 );
            Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx ) ) );
        }
        // sheet view settings: WINDOW2, SCL, PANE, SELECTION
        aRecList.AppendNewRecord( new XclExpTabViewSettings( GetRoot(), mnScTab ) );
        Add( new ExcEof );
    }
}

void ExcTable::Write( XclExpStream& rStrm )
{
    SetCurrScTab( mnScTab );
    if( mxCellTable.get() )
        mxCellTable->Finalize();
    aRecList.Save( rStrm );
}

void ExcTable::WriteXml( XclExpXmlStream& rStrm )
{
    if (!GetTabInfo().IsExportTab(mnScTab))
    {
        // header export.
        SetCurrScTab(mnScTab);
        if (mxCellTable)
            mxCellTable->Finalize();
        aRecList.SaveXml(rStrm);

        return;
    }

    // worksheet export
    OUString sSheetName = XclXmlUtils::GetStreamName( "xl/", "worksheets/sheet", mnScTab+1 );

    sax_fastparser::FSHelperPtr pWorksheet = rStrm.GetStreamForPath( sSheetName );

    rStrm.PushStream( pWorksheet );

    pWorksheet->startElement( XML_worksheet,
            XML_xmlns, XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(xls))).getStr(),
            FSNS( XML_xmlns, XML_r ), XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(officeRel))).getStr(),
            FSEND );

    SetCurrScTab( mnScTab );
    if (mxCellTable)
        mxCellTable->Finalize();
    aRecList.SaveXml( rStrm );

    XclExpXmlPivotTables* pPT = GetXmlPivotTableManager().GetTablesBySheet(mnScTab);
    if (pPT)
        pPT->SaveXml(rStrm);

    rStrm.GetCurrentStream()->endElement( XML_worksheet );
    rStrm.PopStream();
}

ExcDocument::ExcDocument( const XclExpRoot& rRoot ) :
    XclExpRoot( rRoot ),
    aHeader( rRoot )
{
}

ExcDocument::~ExcDocument()
{
    maTableList.RemoveAllRecords();    // for the following assertion!
}

void ExcDocument::ReadDoc()
{
    InitializeConvert();

    if (GetOutput() == EXC_OUTPUT_BINARY)
        aHeader.FillAsHeaderBinary(maBoundsheetList);
    else
    {
        aHeader.FillAsHeaderXml(maBoundsheetList);
        GetXmlPivotTableManager().Initialize();
        GetTablesManager().Initialize();    // Move outside conditions if we wanted to support BIFF.
    }

    SCTAB nScTab = 0, nScTabCount = GetTabInfo().GetScTabCount();
    SCTAB nCodeNameIdx = 0, nCodeNameCount = GetExtDocOptions().GetCodeNameCount();

    for( ; nScTab < nScTabCount; ++nScTab )
    {
        if( GetTabInfo().IsExportTab( nScTab ) )
        {
            ExcTableList::RecordRefType xTab( new ExcTable( GetRoot(), nScTab ) );
            maTableList.AppendRecord( xTab );
            if (GetOutput() == EXC_OUTPUT_BINARY)
                xTab->FillAsTableBinary(nCodeNameIdx);
            else
                xTab->FillAsTableXml();

            ++nCodeNameIdx;
        }
    }
    for( ; nCodeNameIdx < nCodeNameCount; ++nScTab, ++nCodeNameIdx )
    {
        ExcTableList::RecordRefType xTab( new ExcTable( GetRoot(), nScTab ) );
        maTableList.AppendRecord( xTab );
        xTab->FillAsEmptyTable( nCodeNameIdx );
    }

    if ( GetBiff() == EXC_BIFF8 )
    {
        // complete temporary Escher stream
        GetObjectManager().EndDocument();

        // change tracking
        if ( GetDoc().GetChangeTrack() )
            m_xExpChangeTrack.reset(new XclExpChangeTrack( GetRoot() ));
    }
}

void ExcDocument::Write( SvStream& rSvStrm )
{
    if( !maTableList.IsEmpty() )
    {
        InitializeSave();

        XclExpStream aXclStrm( rSvStrm, GetRoot() );

        aHeader.Write( aXclStrm );

        OSL_ENSURE( maTableList.GetSize() == maBoundsheetList.GetSize(),
            "ExcDocument::Write - different number of sheets and BOUNDSHEET records" );

        for( size_t nTab = 0, nTabCount = maTableList.GetSize(); nTab < nTabCount; ++nTab )
        {
            // set current stream position in BOUNDSHEET record
            ExcBoundsheetRef xBoundsheet = maBoundsheetList.GetRecord( nTab );
            if( xBoundsheet.get() )
                xBoundsheet->SetStreamPos( aXclStrm.GetSvStreamPos() );
            // write the table
            maTableList.GetRecord( nTab )->Write( aXclStrm );
        }

        // write the table stream positions into the BOUNDSHEET records
        for( size_t nBSheet = 0, nBSheetCount = maBoundsheetList.GetSize(); nBSheet < nBSheetCount; ++nBSheet )
            maBoundsheetList.GetRecord( nBSheet )->UpdateStreamPos( aXclStrm );
    }
    if( m_xExpChangeTrack )
        m_xExpChangeTrack->Write();
}

void ExcDocument::WriteXml( XclExpXmlStream& rStrm )
{
    SfxObjectShell* pDocShell = GetDocShell();

    using namespace ::com::sun::star;
    uno::Reference<document::XDocumentPropertiesSupplier> xDPS( pDocShell->GetModel(), uno::UNO_QUERY_THROW );
    uno::Reference<document::XDocumentProperties> xDocProps = xDPS->getDocumentProperties();

    rStrm.exportDocumentProperties(xDocProps, pDocShell->IsSecurityOptOpenReadOnly());
    rStrm.exportCustomFragments();

    sax_fastparser::FSHelperPtr& rWorkbook = rStrm.GetCurrentStream();
    rWorkbook->startElement( XML_workbook,
            XML_xmlns, XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(xls))).getStr(),
            FSNS(XML_xmlns, XML_r), XclXmlUtils::ToOString(rStrm.getNamespaceURL(OOX_NS(officeRel))).getStr(),
            FSEND );
    rWorkbook->singleElement( XML_fileVersion,
            XML_appName, "Calc",
            // OOXTODO: XML_codeName
            // OOXTODO: XML_lastEdited
            // OOXTODO: XML_lowestEdited
            // OOXTODO: XML_rupBuild
            FSEND );

    if( !maTableList.IsEmpty() )
    {
        InitializeSave();

        aHeader.WriteXml( rStrm );

        for( size_t nTab = 0, nTabCount = maTableList.GetSize(); nTab < nTabCount; ++nTab )
        {
            // write the table
            maTableList.GetRecord( nTab )->WriteXml( rStrm );
        }
    }

    if( m_xExpChangeTrack )
        m_xExpChangeTrack->WriteXml( rStrm );

    XclExpXmlPivotCaches& rCaches = GetXmlPivotTableManager().GetCaches();
    if (rCaches.HasCaches())
        rCaches.SaveXml(rStrm);

    const ScCalcConfig& rCalcConfig = GetDoc().GetCalcConfig();
    formula::FormulaGrammar::AddressConvention eConv = rCalcConfig.meStringRefAddressSyntax;

    // don't save "unspecified" string ref syntax ... query formula grammar
    // and save that instead
    if( eConv == formula::FormulaGrammar::CONV_UNSPECIFIED)
    {
        eConv = GetDoc().GetAddressConvention();
    }

    // write if it has been read|imported or explicitly changed
    // or if ref syntax isn't what would be native for our file format
    // i.e. ExcelA1 in this case
    if ( rCalcConfig.mbHasStringRefSyntax ||
         (eConv != formula::FormulaGrammar::CONV_XL_A1) )
    {
        XclExtLstRef xExtLst( new XclExtLst( GetRoot()  ) );
        xExtLst->AddRecord( XclExpExtRef( new XclExpExtCalcPr( GetRoot(), eConv ))  );
        xExtLst->SaveXml(rStrm);
    }

    rWorkbook->endElement( XML_workbook );
    rWorkbook.reset();
}

/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
div>
msgctxt "RID_SVXSTR_DELFAILED"
msgid "The selected object could not be deleted."
msgstr "Выбранный объект не может быть удалён."
#. T7T8x
-#: cui/inc/strings.hrc:238
+#: cui/inc/strings.hrc:237
msgctxt "RID_SVXSTR_DELFAILED_TITLE"
msgid "Error Deleting Object"
msgstr "Ошибка при удалении объекта"
#. SCgXy
-#: cui/inc/strings.hrc:239
+#: cui/inc/strings.hrc:238
msgctxt "RID_SVXSTR_CREATEFAILED"
msgid "The object could not be created."
msgstr "Объект не может быть создан."
#. TmiCU
-#: cui/inc/strings.hrc:240
+#: cui/inc/strings.hrc:239
msgctxt "RID_SVXSTR_CREATEFAILEDDUP"
msgid " Object with the same name already exists."
msgstr " Объект с таким именем уже существует."
#. ffc5M
-#: cui/inc/strings.hrc:241
+#: cui/inc/strings.hrc:240
msgctxt "RID_SVXSTR_CREATEFAILED_TITLE"
msgid "Error Creating Object"
msgstr "Ошибка при создании объекта"
#. hpB8B
-#: cui/inc/strings.hrc:242
+#: cui/inc/strings.hrc:241
msgctxt "RID_SVXSTR_RENAMEFAILED"
msgid "The object could not be renamed."
msgstr "Объект не может быть переименован."
#. eevjm
-#: cui/inc/strings.hrc:243
+#: cui/inc/strings.hrc:242
msgctxt "RID_SVXSTR_RENAMEFAILED_TITLE"
msgid "Error Renaming Object"
msgstr "Ошибка при переименовании объекта"
#. fTHFY
-#: cui/inc/strings.hrc:244
+#: cui/inc/strings.hrc:243
msgctxt "RID_SVXSTR_ERROR_TITLE"
msgid "%PRODUCTNAME Error"
msgstr "Ошибка %PRODUCTNAME"
#. e6BgS
-#: cui/inc/strings.hrc:245
+#: cui/inc/strings.hrc:244
#, c-format
msgctxt "RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED"
msgid "The scripting language %LANGUAGENAME is not supported."
msgstr "Язык сценариев %LANGUAGENAME не поддерживается."
#. EUek9
-#: cui/inc/strings.hrc:246
+#: cui/inc/strings.hrc:245
#, c-format
msgctxt "RID_SVXSTR_ERROR_RUNNING"
msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME."
msgstr "Ошибка при выполнении сценария %LANGUAGENAME %SCRIPTNAME."
#. KVQAh
-#: cui/inc/strings.hrc:247
+#: cui/inc/strings.hrc:246
#, c-format
msgctxt "RID_SVXSTR_EXCEPTION_RUNNING"
msgid "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME."
msgstr "Исключение при выполнении сценария %LANGUAGENAME %SCRIPTNAME."
#. 5bFCQ
-#: cui/inc/strings.hrc:248
+#: cui/inc/strings.hrc:247
msgctxt "RID_SVXSTR_ERROR_AT_LINE"
msgid "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."
msgstr "Ошибка при выполнении сценария %LANGUAGENAME %SCRIPTNAME в строке: %LINENUMBER."
#. KTptU
-#: cui/inc/strings.hrc:249
+#: cui/inc/strings.hrc:248
msgctxt "RID_SVXSTR_EXCEPTION_AT_LINE"
msgid "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME at line: %LINENUMBER."
msgstr "Исключение при выполнении сценария %LANGUAGENAME %SCRIPTNAME в строке: %LINENUMBER."
#. BZDbp
-#: cui/inc/strings.hrc:250
+#: cui/inc/strings.hrc:249
#, c-format
msgctxt "RID_SVXSTR_FRAMEWORK_ERROR_RUNNING"
msgid "A Scripting Framework error occurred while running the %LANGUAGENAME script %SCRIPTNAME."
msgstr "Ошибка сценария при выполнении сценария %LANGUAGENAME %SCRIPTNAME."
#. AAghx
-#: cui/inc/strings.hrc:251
+#: cui/inc/strings.hrc:250
msgctxt "RID_SVXSTR_ERROR_TYPE_LABEL"
msgid "Type:"
msgstr "Тип:"
#. GAsca
-#: cui/inc/strings.hrc:252
+#: cui/inc/strings.hrc:251
msgctxt "RID_SVXSTR_ERROR_MESSAGE_LABEL"
msgid "Message:"
msgstr "Сообщение:"
#. ZcxRY
-#: cui/inc/strings.hrc:254
+#: cui/inc/strings.hrc:253
msgctxt "RID_SVXSTR_CHG_MATH"
msgid "MathType to %PRODUCTNAME Math or reverse"
msgstr "MathType в %PRODUCTNAME Math или обратно"
#. Ttggs
-#: cui/inc/strings.hrc:255
+#: cui/inc/strings.hrc:254
msgctxt "RID_SVXSTR_CHG_WRITER"
msgid "WinWord to %PRODUCTNAME Writer or reverse"
msgstr "WinWord в %PRODUCTNAME Writer или обратно"
#. ZJRKY
-#: cui/inc/strings.hrc:256
+#: cui/inc/strings.hrc:255
msgctxt "RID_SVXSTR_CHG_CALC"
msgid "Excel to %PRODUCTNAME Calc or reverse"
msgstr "Excel в %PRODUCTNAME Calc или обратно"
#. VmuND
-#: cui/inc/strings.hrc:257
+#: cui/inc/strings.hrc:256
msgctxt "RID_SVXSTR_CHG_IMPRESS"
msgid "PowerPoint to %PRODUCTNAME Impress or reverse"
msgstr "PowerPoint в %PRODUCTNAME Impress или обратно"
#. sE8as
-#: cui/inc/strings.hrc:258
+#: cui/inc/strings.hrc:257
msgctxt "RID_SVXSTR_CHG_SMARTART"
msgid "SmartArt to %PRODUCTNAME shapes or reverse"
msgstr "Объекты SmartArt в фигуры %PRODUCTNAME или обратно"
#. AEgXY
-#: cui/inc/strings.hrc:259
+#: cui/inc/strings.hrc:258
msgctxt "RID_SVXSTR_CHG_VISIO"
msgid "Visio to %PRODUCTNAME Draw or reverse"
msgstr "Visio в %PRODUCTNAME Draw или обратно"
#. Zarkq
-#: cui/inc/strings.hrc:260
+#: cui/inc/strings.hrc:259
msgctxt "RID_SVXSTR_CHG_PDF"
msgid "PDF to %PRODUCTNAME Draw or reverse"
msgstr "PDF в %PRODUCTNAME Draw или обратно"
#. dDtDU
-#: cui/inc/strings.hrc:262
+#: cui/inc/strings.hrc:261
msgctxt "RID_SVXSTR_OPT_DOUBLE_DICTS"
msgid ""
"The specified name already exists.\n"
@@ -1406,7 +1400,7 @@ msgstr ""
"Введите новое имя."
#. kzhkA
-#: cui/inc/strings.hrc:263
+#: cui/inc/strings.hrc:262
msgctxt "RID_SVXSTR_OPT_INVALID_DICT_NAME"
msgid ""
"The specified name is invalid.\n"
@@ -1428,133 +1422,133 @@ msgstr ""
#. For example, adding "Grammar By" word "fund" to the new user
#. word "crowdfund", the spell checker will recognize "crowdfund"
#. with suffixes of "fund": "crowdfunding", "crowdfund's" etc.
-#: cui/inc/strings.hrc:278
+#: cui/inc/strings.hrc:277
msgctxt "RID_SVXSTR_OPT_GRAMMAR_BY"
msgid "~Grammar By"
msgstr "Грамматически как"
#. LPb5d
-#: cui/inc/strings.hrc:279
+#: cui/inc/strings.hrc:278
msgctxt "STR_MODIFY"
msgid "~Replace"
msgstr "Заменить"
#. anivV
-#: cui/inc/strings.hrc:280
+#: cui/inc/strings.hrc:279
msgctxt "RID_SVXSTR_CONFIRM_SET_LANGUAGE"
msgid "Do you want to change the '%1' dictionary language?"
msgstr "Изменить язык словаря «%1»?"
#. XEFrB
-#: cui/inc/strings.hrc:282
+#: cui/inc/strings.hrc:281
msgctxt "RID_SVXSTR_COLOR_CONFIG_DELETE"
msgid "Do you really want to delete the color scheme?"
msgstr "Вы действительно хотите удалить цветовую схему?"
#. ybdED
-#: cui/inc/strings.hrc:283
+#: cui/inc/strings.hrc:282
msgctxt "RID_SVXSTR_COLOR_CONFIG_DELETE_TITLE"
msgid "Color Scheme Deletion"
msgstr "Удаление цветовой схемы"
#. DoNBE
-#: cui/inc/strings.hrc:284
+#: cui/inc/strings.hrc:283
msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE1"
msgid "Save scheme"
msgstr "Сохранить схему"
#. tFrki
-#: cui/inc/strings.hrc:285
+#: cui/inc/strings.hrc:284
msgctxt "RID_SVXSTR_COLOR_CONFIG_SAVE2"
msgid "Name of color scheme"
msgstr "Имя цветовой схемы"
#. BAGbe
-#: cui/inc/strings.hrc:287
+#: cui/inc/strings.hrc:286
msgctxt "RID_SVXSTR_SPELL"
msgid "Spelling"
msgstr "Проверка орфографии"
#. uBohu
-#: cui/inc/strings.hrc:288
+#: cui/inc/strings.hrc:287
msgctxt "RID_SVXSTR_HYPH"
msgid "Hyphenation"
msgstr "Расстановка переносов"
#. XGkt6
-#: cui/inc/strings.hrc:289
+#: cui/inc/strings.hrc:288
msgctxt "RID_SVXSTR_THES"
msgid "Thesaurus"
msgstr "Тезаурус"
#. EFrDA
-#: cui/inc/strings.hrc:290
+#: cui/inc/strings.hrc:289
msgctxt "RID_SVXSTR_GRAMMAR"
msgid "Grammar"
msgstr "Грамматика"
#. zbEv9
-#: cui/inc/strings.hrc:291
+#: cui/inc/strings.hrc:290
msgctxt "RID_SVXSTR_CAPITAL_WORDS"
msgid "Check uppercase words"
msgstr "Проверять слова, написанные прописными буквами"
#. BbDNe
-#: cui/inc/strings.hrc:292
+#: cui/inc/strings.hrc:291
msgctxt "RID_SVXSTR_WORDS_WITH_DIGITS"
msgid "Check words with numbers "
msgstr "Проверять слова с цифрами "
#. bPDyB
-#: cui/inc/strings.hrc:293
+#: cui/inc/strings.hrc:292
msgctxt "RID_SVXSTR_SPELL_SPECIAL"
msgid "Check special regions"
msgstr "Проверять специальные области"
#. XjifG
-#: cui/inc/strings.hrc:294
+#: cui/inc/strings.hrc:293
msgctxt "RID_SVXSTR_SPELL_AUTO"
msgid "Check spelling as you type"
msgstr "Автоматически проверять орфографию"
#. J3ENq
-#: cui/inc/strings.hrc:295
+#: cui/inc/strings.hrc:294
msgctxt "RID_SVXSTR_GRAMMAR_AUTO"
msgid "Check grammar as you type"
msgstr "Автоматически проверять грамматику"
#. f6v3L
-#: cui/inc/strings.hrc:296
+#: cui/inc/strings.hrc:295
msgctxt "RID_SVXSTR_NUM_MIN_WORDLEN"
msgid "Minimal number of characters for hyphenation: "
msgstr "Минимальная длина слова для переноса: "
#. BCrEf
-#: cui/inc/strings.hrc:297
+#: cui/inc/strings.hrc:296
msgctxt "RID_SVXSTR_NUM_PRE_BREAK"
msgid "Characters before line break: "
msgstr "Символы перед переносом строки: "
#. Kgioh
-#: cui/inc/strings.hrc:298
+#: cui/inc/strings.hrc:297
msgctxt "RID_SVXSTR_NUM_POST_BREAK"
msgid "Characters after line break: "
msgstr "Символы после переноса строки: "
#. AewrH
-#: cui/inc/strings.hrc:299
+#: cui/inc/strings.hrc:298
msgctxt "RID_SVXSTR_HYPH_AUTO"
msgid "Hyphenate without inquiry"
msgstr "Автоматическая расстановка переносов"
#. qCKn9
-#: cui/inc/strings.hrc:300
+#: cui/inc/strings.hrc:299
msgctxt "RID_SVXSTR_HYPH_SPECIAL"
msgid "Hyphenate special regions"
msgstr "Перенос в специальных областях"
#. weKUF
-#: cui/inc/strings.hrc:302
+#: cui/inc/strings.hrc:301
msgctxt "RID_SVXSTR_JRE_NOT_RECOGNIZED"
msgid ""
"The folder you selected does not contain a Java runtime environment.\n"
@@ -1564,7 +1558,7 @@ msgstr ""
"Укажите другой каталог."
#. jFLdB
-#: cui/inc/strings.hrc:303
+#: cui/inc/strings.hrc:302
msgctxt "RID_SVXSTR_JRE_FAILED_VERSION"
msgid ""
"The Java runtime environment you selected is not the required version.\n"
@@ -1574,13 +1568,13 @@ msgstr ""
"Выберите другую папку."
#. 79uiz
-#: cui/inc/strings.hrc:304
+#: cui/inc/strings.hrc:303
msgctxt "RID_SVXSTR_JAVA_START_PARAM"
msgid "Edit Parameter"
msgstr "Изменить параметр"
#. fsbAN
-#: cui/inc/strings.hrc:306
+#: cui/inc/strings.hrc:305
msgctxt "RID_SVXSTR_OPT_PROXYPORTS"
msgid ""
"Invalid value!\n"
@@ -1592,37 +1586,37 @@ msgstr ""
"Максимальное значение номера порта - 65535."
#. UCFD6
-#: cui/inc/strings.hrc:308
+#: cui/inc/strings.hrc:307
msgctxt "RID_SVXSTR_DESC_GRADIENT"
msgid "Please enter a name for the gradient:"
msgstr "Введите имя градиента:"
#. UDvKR
-#: cui/inc/strings.hrc:309
+#: cui/inc/strings.hrc:308
msgctxt "RID_SVXSTR_DESC_NEW_BITMAP"
msgid "Please enter a name for the bitmap:"
msgstr "Введите имя растра:"
#. QXqJD
-#: cui/inc/strings.hrc:310
+#: cui/inc/strings.hrc:309
msgctxt "RID_SVXSTR_DESC_EXT_BITMAP"
msgid "Please enter a name for the external bitmap:"
msgstr "Введите имя внешнего растрового изображения:"
#. SrS6X
-#: cui/inc/strings.hrc:311
+#: cui/inc/strings.hrc:310
msgctxt "RID_SVXSTR_DESC_NEW_PATTERN"
msgid "Please enter a name for the pattern:"
msgstr "Введите имя узора:"
#. yD7AW
-#: cui/inc/strings.hrc:312
+#: cui/inc/strings.hrc:311
msgctxt "RID_SVXSTR_DESC_LINESTYLE"
msgid "Please enter a name for the line style:"
msgstr "Введите имя стиля линии:"
#. FQDrh
-#: cui/inc/strings.hrc:313
+#: cui/inc/strings.hrc:312
msgctxt "RID_SVXSTR_ASK_CHANGE_LINESTYLE"
msgid ""
"The line style was modified without saving. \n"
@@ -1632,450 +1626,420 @@ msgstr ""
"Измените выбранный или добавьте новый стиль линии."
#. Z5Dkg
-#: cui/inc/strings.hrc:314
+#: cui/inc/strings.hrc:313
msgctxt "RID_SVXSTR_DESC_HATCH"
msgid "Please enter a name for the hatching:"
msgstr "Введите имя новой штриховки:"
#. rvyBi
-#: cui/inc/strings.hrc:315
+#: cui/inc/strings.hrc:314
msgctxt "RID_SVXSTR_CHANGE"
msgid "Modify"
msgstr "Изменить"
#. ZDhBm
-#: cui/inc/strings.hrc:316
+#: cui/inc/strings.hrc:315
msgctxt "RID_SVXSTR_ADD"
msgid "Add"
msgstr "Добавить"
#. QgAFH
-#: cui/inc/strings.hrc:317
+#: cui/inc/strings.hrc:316
msgctxt "RID_SVXSTR_DESC_COLOR"
msgid "Please enter a name for the new color:"
msgstr "Введите имя нового цвета:"
#. GKnJR
-#: cui/inc/strings.hrc:318
+#: cui/inc/strings.hrc:317
msgctxt "RID_SVXSTR_TABLE"
msgid "Table"
msgstr "Таблица"
#. J6FBw
-#: cui/inc/strings.hrc:319
+#: cui/inc/strings.hrc:318
msgctxt "RID_SVXSTR_DESC_LINEEND"
msgid "Please enter a name for the new arrowhead:"
msgstr "Введите имя новой размерной стрелки:"
#. xD9BU
-#: cui/inc/strings.hrc:320
+#: cui/inc/strings.hrc:319
msgctxt "RID_SVXSTR_CHARNAME_NOSTYLE"
msgid "No %1"
msgstr "Не %1"
#. GVkFG
-#: cui/inc/strings.hrc:321
+#: cui/inc/strings.hrc:320
msgctxt "RID_SVXSTR_CHARNAME_FAMILY"
msgid "Family:"
msgstr "Семейство:"
#. 6uDkp
-#: cui/inc/strings.hrc:322
+#: cui/inc/strings.hrc:321
msgctxt "RID_SVXSTR_CHARNAME_FONT"
msgid "Font:"
msgstr "Гарнитура:"
#. KFXAV
-#: cui/inc/strings.hrc:323
+#: cui/inc/strings.hrc:322
msgctxt "RID_SVXSTR_CHARNAME_STYLE"
msgid "Style:"
msgstr "Стиль:"
#. gDu75
-#: cui/inc/strings.hrc:324
+#: cui/inc/strings.hrc:323
msgctxt "RID_SVXSTR_CHARNAME_TYPEFACE"
msgid "Typeface:"
msgstr "Начертание:"
-#. Zr8Xa
-#: cui/inc/strings.hrc:325
-msgctxt "RID_SVXSTR_CHARNAME_HIGHLIGHTING"
-msgid "Highlight Color"
-msgstr "Цвет подсветки"
-
#. BcWHA
-#: cui/inc/strings.hrc:326
+#: cui/inc/strings.hrc:324
msgctxt "RID_SVXSTR_USE_REPLACE"
msgid "Use replacement table"
msgstr "Использовать таблицу замен"
#. L8BEE
-#: cui/inc/strings.hrc:327
+#: cui/inc/strings.hrc:325
msgctxt "RID_SVXSTR_CPTL_STT_WORD"
msgid "Correct TWo INitial CApitals"
msgstr "Исправлять ДВе ПРописные буквы в начале слова"
#. p5h3s
-#: cui/inc/strings.hrc:328
+#: cui/inc/strings.hrc:326
msgctxt "RID_SVXSTR_CPTL_STT_SENT"
msgid "Capitalize first letter of every sentence"
msgstr "Начинать каждое предложение с прописной буквы"
#. prrWd
-#: cui/inc/strings.hrc:329
+#: cui/inc/strings.hrc:327
msgctxt "RID_SVXSTR_BOLD_UNDER"
msgid "Automatic *bold*, /italic/, -strikeout- and _underline_"
msgstr "Применять *жирный*, /курсив/, -зачёркивание- и _подчёркивание_"
#. a89xT
-#: cui/inc/strings.hrc:330
+#: cui/inc/strings.hrc:328
msgctxt "RID_SVXSTR_NO_DBL_SPACES"
msgid "Ignore double spaces"
msgstr "Пропускать двойные пробелы"
#. qEA6h
-#: cui/inc/strings.hrc:331
+#: cui/inc/strings.hrc:329
msgctxt "RID_SVXSTR_DETECT_URL"
msgid "URL Recognition"
msgstr "Распознавать URL-адреса"
#. JfySE
-#: cui/inc/strings.hrc:332
+#: cui/inc/strings.hrc:330
msgctxt "RID_SVXSTR_DASH"
msgid "Replace dashes"
msgstr "Заменять дефисы на тире"
#. u2BuA
-#: cui/inc/strings.hrc:333
+#: cui/inc/strings.hrc:331
msgctxt "RID_SVXSTR_CORRECT_ACCIDENTAL_CAPS_LOCK"
msgid "Correct accidental use of cAPS LOCK key"
msgstr "Исправлять случайное нажатие cAPS LOCK"
#. GZqG9
-#: cui/inc/strings.hrc:334
+#: cui/inc/strings.hrc:332
msgctxt "RID_SVXSTR_NON_BREAK_SPACE"
msgid "Add non-breaking space before specific punctuation marks in French text"
msgstr "Добавлять неразрывный пробел перед некоторыми знаками пунктуации на французском языке"
#. NDmW9
-#: cui/inc/strings.hrc:335
+#: cui/inc/strings.hrc:333
msgctxt "RID_SVXSTR_ORDINAL"
msgid "Format ordinal numbers suffixes (1st -> 1^st)"
msgstr "Оформлять суффиксы порядковых числительных (1st -> 1^st)"
#. Rc6Zg
-#: cui/inc/strings.hrc:336
+#: cui/inc/strings.hrc:334
msgctxt "RID_SVXSTR_DEL_EMPTY_PARA"
msgid "Remove blank paragraphs"
msgstr "Удалять пустые абзацы"
#. F6HCc
-#: cui/inc/strings.hrc:337
+#: cui/inc/strings.hrc:335
msgctxt "RID_SVXSTR_USER_STYLE"
msgid "Replace Custom Styles"
msgstr "Заменять стили пользователя"
#. itDJG
-#: cui/inc/strings.hrc:338
+#: cui/inc/strings.hrc:336
msgctxt "RID_SVXSTR_BULLET"
msgid "Replace bullets with: %1"
msgstr "Заменять маркеры списка на: %1"
#. BvroE
#. To translators: %1 will be replaced with a percentage, e.g. "10%"
-#: cui/inc/strings.hrc:340
+#: cui/inc/strings.hrc:338
msgctxt "RID_SVXSTR_RIGHT_MARGIN"
msgid "Combine single line paragraphs if length greater than %1"
msgstr "Объединять однострочные абзацы, если длина превышает %1"
#. M9kNQ
-#: cui/inc/strings.hrc:341
+#: cui/inc/strings.hrc:339
msgctxt "RID_SVXSTR_NUM"
msgid "Bulleted and numbered lists. Bullet symbol: %1"
msgstr "Списки. Символ маркера: %1"
#. BJVGT
-#: cui/inc/strings.hrc:342
+#: cui/inc/strings.hrc:340
msgctxt "RID_SVXSTR_BORDER"
msgid "Apply border"
msgstr "Применять обрамление"
#. bXpcq
-#: cui/inc/strings.hrc:343
+#: cui/inc/strings.hrc:341
msgctxt "RID_SVXSTR_CREATE_TABLE"
msgid "Create table"
msgstr "Создать таблицу"
#. RvEBo
-#: cui/inc/strings.hrc:344
+#: cui/inc/strings.hrc:342
msgctxt "RID_SVXSTR_REPLACE_TEMPLATES"
msgid "Apply Styles"
msgstr "Применять стили"
#. 6MGUe
-#: cui/inc/strings.hrc:345
+#: cui/inc/strings.hrc:343
msgctxt "RID_SVXSTR_DEL_SPACES_AT_STT_END"
msgid "Delete spaces and tabs at beginning and end of paragraph"
msgstr "Удалять пробелы и знаки табуляции в начале и конце абзаца"
#. R9Kke
-#: cui/inc/strings.hrc:346
+#: cui/inc/strings.hrc:344
msgctxt "RID_SVXSTR_DEL_SPACES_BETWEEN_LINES"
msgid "Delete spaces and tabs at end and start of line"
msgstr "Удалять пробелы и табуляции в конце и начале строки"
#. GFpkR
-#: cui/inc/strings.hrc:347
+#: cui/inc/strings.hrc:345
msgctxt "RID_SVXSTR_CONNECTOR"
msgid "Connector"
msgstr "Соединительная линия"
#. XDp8d
-#: cui/inc/strings.hrc:348
+#: cui/inc/strings.hrc:346
msgctxt "RID_SVXSTR_DIMENSION_LINE"
msgid "Dimension line"
msgstr "Размерная линия"
#. Mxt3D
-#: cui/inc/strings.hrc:349
+#: cui/inc/strings.hrc:347
msgctxt "RID_SVXSTR_STARTQUOTE"
msgid "Start Quote"
msgstr "Открывающие кавычки"
#. o8nY6
-#: cui/inc/strings.hrc:350
+#: cui/inc/strings.hrc:348
msgctxt "RID_SVXSTR_ENDQUOTE"
msgid "End Quote"
msgstr "Закрывающие кавычки"
-#. Q2QAg
-#: cui/inc/strings.hrc:352
-msgctxt "RID_SVXSTR_SELECTEDPERSONA"
-msgid "Selected Theme: "
-msgstr "Выбранная тема: "
-
-#. mvAvC
-#: cui/inc/strings.hrc:353
-msgctxt "RID_SVXSTR_SEARCHING"
-msgid "Searching, please wait..."
-msgstr "Подождите, идёт поиск..."
-
-#. DYi9o
-#: cui/inc/strings.hrc:354
-msgctxt "RID_SVXSTR_SEARCHERROR"
-msgid "Cannot open %1, please try again later."
-msgstr "Невозможно открыть %1, попробуйте позже."
-
-#. WJiET
-#: cui/inc/strings.hrc:355
-msgctxt "RID_SVXSTR_NORESULTS"
-msgid "No results found."
-msgstr "Ничего не найдено."
-
-#. ty3FS
-#: cui/inc/strings.hrc:356
-msgctxt "RID_SVXSTR_APPLYPERSONA"
-msgid "Applying Theme..."
-msgstr "Применение темы..."
-
-#. CR5F3
-#: cui/inc/strings.hrc:357
-msgctxt "RID_SVXSTR_INVALIDPERSONAURL"
-msgid "Please enter a valid theme address or a search term."
-msgstr "Введите корректный адрес темы или её название для поиска."
-
#. zvqUJ
-#: cui/inc/strings.hrc:359
+#: cui/inc/strings.hrc:350
msgctxt "RID_SVXSTR_TABLE_PRESET_NONE"
msgid "Set No Borders"
msgstr "Убрать обрамление"
#. ABKEK
-#: cui/inc/strings.hrc:360
+#: cui/inc/strings.hrc:351
msgctxt "RID_SVXSTR_TABLE_PRESET_ONLYOUTER"
msgid "Set Outer Border Only"
msgstr "Установить только внешнюю рамку"
#. ygU8P
-#: cui/inc/strings.hrc:361
+#: cui/inc/strings.hrc:352
msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERHORI"
msgid "Set Outer Border and Horizontal Lines"
msgstr "Установить внешнюю рамку и горизонтальные линии"
#. q5KJ8
-#: cui/inc/strings.hrc:362
+#: cui/inc/strings.hrc:353
msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERALL"
msgid "Set Outer Border and All Inner Lines"
msgstr "Установить внешнюю рамку и линии внутри"
#. H5s9X
-#: cui/inc/strings.hrc:363
+#: cui/inc/strings.hrc:354
msgctxt "RID_SVXSTR_TABLE_PRESET_OUTERINNER"
msgid "Set Outer Border Without Changing Inner Lines"
msgstr "Установить внешнюю рамку, не затрагивая внутренние линии"
#. T5crG
-#: cui/inc/strings.hrc:364
+#: cui/inc/strings.hrc:355
msgctxt "RID_SVXSTR_PARA_PRESET_DIAGONAL"
msgid "Set Diagonal Lines Only"
msgstr "Установить только диагональные линии"
#. S6AAA
-#: cui/inc/strings.hrc:365
+#: cui/inc/strings.hrc:356
msgctxt "RID_SVXSTR_PARA_PRESET_ALL"
msgid "Set All Four Borders"
msgstr "Обрамление со всех сторон"
#. tknFJ
-#: cui/inc/strings.hrc:366
+#: cui/inc/strings.hrc:357
msgctxt "RID_SVXSTR_PARA_PRESET_LEFTRIGHT"
msgid "Set Left and Right Borders Only"
msgstr "Обрамление слева и справа"
#. hSmnW
-#: cui/inc/strings.hrc:367
+#: cui/inc/strings.hrc:358
msgctxt "RID_SVXSTR_PARA_PRESET_TOPBOTTOM"
msgid "Set Top and Bottom Borders Only"
msgstr "Обрамление сверху и снизу"
#. Dy2UG
-#: cui/inc/strings.hrc:368
+#: cui/inc/strings.hrc:359
msgctxt "RID_SVXSTR_PARA_PRESET_ONLYLEFT"
msgid "Set Left Border Only"
msgstr "Обрамление только слева"
#. nCjXG
-#: cui/inc/strings.hrc:369
+#: cui/inc/strings.hrc:360
msgctxt "RID_SVXSTR_HOR_PRESET_ONLYHOR"
msgid "Set Top and Bottom Borders, and All Inner Lines"
msgstr "Верхнее и нижнее обрамление, а также все внутренние линии"
#. 46Fq7
-#: cui/inc/strings.hrc:370
+#: cui/inc/strings.hrc:361
msgctxt "RID_SVXSTR_VER_PRESET_ONLYVER"
msgid "Set Left and Right Borders, and All Inner Lines"
msgstr "Левое и правое обрамление, а также все внутренние линии"
#. cZX7G
-#: cui/inc/strings.hrc:371
+#: cui/inc/strings.hrc:362
msgctxt "RID_SVXSTR_SHADOW_STYLE_NONE"
msgid "No Shadow"
msgstr "Без тени"
#. bzAHG
-#: cui/inc/strings.hrc:372
+#: cui/inc/strings.hrc:363
msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT"
msgid "Cast Shadow to Bottom Right"
msgstr "Тень отбрасывается направо вниз"
#. FjBGC
-#: cui/inc/strings.hrc:373
+#: cui/inc/strings.hrc:364
msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPRIGHT"
msgid "Cast Shadow to Top Right"
msgstr "Тень отбрасывается направо вверх"
#. 5BkoC
-#: cui/inc/strings.hrc:374
+#: cui/inc/strings.hrc:365
msgctxt "RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT"
msgid "Cast Shadow to Bottom Left"
msgstr "Тень отбрасывается налево вниз"
#. GYB8M
-#: cui/inc/strings.hrc:375
+#: cui/inc/strings.hrc:366
msgctxt "RID_SVXSTR_SHADOW_STYLE_TOPLEFT"
msgid "Cast Shadow to Top Left"
msgstr "Тень отбрасывается налево вверх"
#. xTvak
-#: cui/inc/strings.hrc:376
+#: cui/inc/strings.hrc:367
msgctxt "RID_SVXSTR_SIGNATURELINE_SIGNED_BY"
msgid "Signed by: %1"
msgstr "Подписано: %1"
#. Uc7wm
-#: cui/inc/strings.hrc:378
+#: cui/inc/strings.hrc:369
msgctxt "RID_SVXSTR_FILTER_ALL"
msgid "All files"
msgstr "Все файлы"
#. 8bnrf
-#: cui/inc/strings.hrc:380
+#: cui/inc/strings.hrc:371
msgctxt "RID_SVXSTR_REGISTERED_DATABASES"
msgid "Registered Databases"
msgstr "Зарегистрированные базы данных"
#. xySty
-#: cui/inc/strings.hrc:382
+#: cui/inc/strings.hrc:373
msgctxt "RID_SVXSTR_CANNOTCONVERTURL_ERR"
msgid "The URL <%1> cannot be converted to a filesystem path."
msgstr "URL <%1> невозможно преобразовать в путь файловой системы."
#. XtUDA
-#: cui/inc/strings.hrc:384
+#: cui/inc/strings.hrc:375
msgctxt "aboutdialog|copyright"
msgid "Copyright © 2000–2020 LibreOffice contributors."
msgstr "Copyright © 2000-2020 участники сообщества LibreOffice."
#. GesDU
-#: cui/inc/strings.hrc:385
+#: cui/inc/strings.hrc:376
msgctxt "aboutdialog|link"
msgid "https://www.libreoffice.org/about-us/credits/"
msgstr "https://www.libreoffice.org/about-us/credits/"
#. WCnhx
-#: cui/inc/strings.hrc:386
+#: cui/inc/strings.hrc:377
msgctxt "aboutdialog|vendor"
msgid "This release was supplied by %OOOVENDOR."
msgstr "Этот продукт предоставлен %OOOVENDOR."
#. Lz9nx
-#: cui/inc/strings.hrc:387
+#: cui/inc/strings.hrc:378
msgctxt "aboutdialog|libreoffice"
msgid "LibreOffice was based on OpenOffice.org."
msgstr "LibreOffice основан на OpenOffice.org."
#. 9aeNR
-#: cui/inc/strings.hrc:388
+#: cui/inc/strings.hrc:379
msgctxt "aboutdialog|derived"
msgid "%PRODUCTNAME is derived from LibreOffice which was based on OpenOffice.org"
msgstr "%PRODUCTNAME происходит от LibreOffice, основанного на OpenOffice.org"
#. q5Myk
-#: cui/inc/strings.hrc:389
+#: cui/inc/strings.hrc:380
msgctxt "aboutdialog|uilocale"
msgid "UI: $LOCALE"
-msgstr ""
+msgstr "ИП: $LOCALE"
#. 3vXzF
-#: cui/inc/strings.hrc:391
+#: cui/inc/strings.hrc:382
msgctxt "optpathspage|editpaths"
msgid "Edit Paths: %1"
msgstr "Изменить пути: %1"
#. 8ZaCL
-#: cui/inc/strings.hrc:393
+#: cui/inc/strings.hrc:384
msgctxt "RID_SVXSTR_COMMANDLABEL"
msgid "Label"
msgstr "Метка"
#. GceL6
-#: cui/inc/strings.hrc:394
+#: cui/inc/strings.hrc:385
msgctxt "RID_SVXSTR_COMMANDLABEL"
msgid "Command"
msgstr "Команда"
#. dRqYc
-#: cui/inc/strings.hrc:395
+#: cui/inc/strings.hrc:386
msgctxt "RID_SVXSTR_COMMANDLABEL"
msgid "Tooltip"
msgstr "Всплывающая подсказка"
#. ddAuB
-#: cui/inc/strings.hrc:397
+#: cui/inc/strings.hrc:388
msgctxt "RID_SVXSTR_QRCODEDATALONG"
msgid "Text exceeds the maximum bits for Error Correction, Enter shorter text"
msgstr ""
+#. AD8QJ
+#: cui/inc/strings.hrc:389
+msgctxt "RID_SVXSTR_DELETEUSERCOLOR1"
+msgid "You can only delete user-defined colors"
+msgstr ""
+
+#. 4LWGV
+#: cui/inc/strings.hrc:390
+msgctxt "RID_SVXSTR_DELETEUSERCOLOR2"
+msgid "Please select the color to delete"
+msgstr ""
+
#. m8rYd
#: cui/inc/tipoftheday.hrc:48
msgctxt "RID_CUI_TIPOFTHEDAY"
@@ -2143,7 +2107,7 @@ msgstr "Оптимизируйте макет таблицы при помощи
#: cui/inc/tipoftheday.hrc:58
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Find all expressions in brackets per Edit ▸ Find and Replace ▸ Find ▸ \\([^)]+\\) (check “Regular expressions”)"
-msgstr ""
+msgstr "Найти все выражения в квадратных скобках поможет Правка ▸ Найти и заменить ▸ Найти ▸ \\([^)]+\\) (установите флажок «Регулярные выражения»)."
#. DUvk6
#: cui/inc/tipoftheday.hrc:59
@@ -2375,7 +2339,7 @@ msgstr "%PRODUCTNAME имеет отличные расширения для у
#: cui/inc/tipoftheday.hrc:96
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Want to count words for just one particular paragraph style? Use Edit ▸ Find and Replace, click Paragraph Styles, select the style in Find, and click Find All. Read the result in the status bar."
-msgstr ""
+msgstr "Хотите посчитать количество слов только для одного конкретного стиля абзаца? Используйте Правка ▸ Найти и заменить, отметьте опцию «Стили абзаца», выберите стиль и нажмите кнопку «Найти все», в строке состояния отобразится искомое количество слов."
#. VBCF7
#: cui/inc/tipoftheday.hrc:97
@@ -2462,7 +2426,7 @@ msgstr "Измените основные шрифты для предопред
#: cui/inc/tipoftheday.hrc:110
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Want to find words containing more than 10 characters? Edit ▸ Find and Replace ▸ Search ▸ [a-z]{10,} ▸ Other Options ▸ check Regular expressions."
-msgstr ""
+msgstr "Хотите найти слова, более чем из 10 символов? Правка ▸ Найти и заменить, в поле «Найти» введите [a-zа-я]{10,}. Убедитесь, что опция «Регулярные выражения» включена."
#. 7dDjc
#: cui/inc/tipoftheday.hrc:111
@@ -2789,7 +2753,7 @@ msgstr "Получите документацию по %PRODUCTNAME и бесп
#: cui/inc/tipoftheday.hrc:164
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Want to remove all <> at once and keep the text inside? Edit ▸ Find and Replace: Search = [<>], Replace = blank and check “Regular expressions” under Other options."
-msgstr ""
+msgstr "Хотите удалить все знаки <> сразу и при этом сохранить текст внутри? Диалог «Правка ▸ Найти и заменить». В поле «Найти» напишите [<|>], поле «Заменить» оставьте пустым и отметьте флажком опцию «Регулярные выражения»."
#. e3dfT
#. local help missing
@@ -3029,7 +2993,7 @@ msgstr "Не теряйтесь в больших документах. Испо
#: cui/inc/tipoftheday.hrc:202
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Edit ▸ Find and Replace lets you insert special characters directly: right click in input fields or press Shift+%MOD1+S."
-msgstr ""
+msgstr "Диалог «Правка ▸ Найти и Заменить» даст вам вставить специальный символ непосредственно в поле: щёлкните по полю правой кнопкой мыши или нажмите сочетание клавиш Shift+%MOD1+S."
#. vNBR3
#: cui/inc/tipoftheday.hrc:203
@@ -3293,7 +3257,7 @@ msgstr "Снимите флажок «Демонстрация ▸ Параме
#: cui/inc/tipoftheday.hrc:245
msgctxt "RID_CUI_TIPOFTHEDAY"
msgid "Want to find the words in bold in a Writer document? Edit ▸ Find and Replace ▸ Other options ▸ Attributes ▸ Font weight."
-msgstr ""
+msgstr "Хотите найти в документе Writer слова, выделенные жирным? «Правка ▸ Найти и заменить ▸ Другие параметры ▸ Атрибуты ▸ Полужирный»."
#. ppAeT
#. local help missing
@@ -4105,46 +4069,46 @@ msgstr "О %PRODUCTNAME"
#: cui/uiconfig/ui/aboutdialog.ui:29
msgctxt "aboutdialog|copy"
msgid "Copy _Version Info"
-msgstr ""
+msgstr "Копировать информацию о версии"
#. rdEwV
#: cui/uiconfig/ui/aboutdialog.ui:117
msgctxt "aboutdialog|lbVersion"
msgid "Version:"
-msgstr ""
+msgstr "Версия:"
#. W6gkc
#: cui/uiconfig/ui/aboutdialog.ui:131
msgctxt "aboutdialog|lbBuild"
msgid "Build:"
-msgstr ""
+msgstr "Сборка:"
#. J78bj
#: cui/uiconfig/ui/aboutdialog.ui:144
msgctxt "aboutdialog|lbEnvironment"
msgid "Environment:"
-msgstr ""
+msgstr "Окружение:"
#. c2sEB
#: cui/uiconfig/ui/aboutdialog.ui:197
msgctxt "aboutdialog|lbExtra"
msgid "Misc:"
-msgstr ""
+msgstr "Разное:"
#. FwVyQ
#: cui/uiconfig/ui/aboutdialog.ui:226
msgctxt "aboutdialog|lbLocale"
msgid "Locale:"
-msgstr ""
+msgstr "Локаль:"
#. SFbP2
#: cui/uiconfig/ui/aboutdialog.ui:251
msgctxt "aboutdialog|lbUI"
msgid "User Interface:"
-msgstr ""
+msgstr "Интерфейс:"
#. KFo3i
-#: cui/uiconfig/ui/aboutdialog.ui:287
+#: cui/uiconfig/ui/aboutdialog.ui:286
msgctxt "aboutdialog|description"
msgid "%PRODUCTNAME is a modern, easy-to-use, open source productivity suite for word processing, spreadsheets, presentations and more."
msgstr "%PRODUCTNAME - это современное, с открытым кодом, простое в использовании средство обработки текстов, электронных таблиц, презентаций и т.п."
@@ -4159,13 +4123,13 @@ msgstr ""
#: cui/uiconfig/ui/aboutdialog.ui:342
msgctxt "aboutdialog|website"
msgid "Website"
-msgstr ""
+msgstr "Сайт"
#. zSmJb
#: cui/uiconfig/ui/aboutdialog.ui:358
msgctxt "aboutdialog|description"
msgid "Release Notes"
-msgstr ""
+msgstr "Примечания к выпуску"
#. MP3WF
#: cui/uiconfig/ui/accelconfigpage.ui:132
@@ -5698,97 +5662,97 @@ msgid "Certificate Path"
msgstr "Путь сертификата"
#. YcKtn
-#: cui/uiconfig/ui/charnamepage.ui:359
+#: cui/uiconfig/ui/charnamepage.ui:360
msgctxt "charnamepage|westsizeft-nocjk"
msgid "Size:"
msgstr "Кегль:"
#. WQxtG
-#: cui/uiconfig/ui/charnamepage.ui:385
+#: cui/uiconfig/ui/charnamepage.ui:386
msgctxt "charnamepage|westlangft-nocjk"
msgid "Language:"
msgstr "Язык:"
#. NgZJ9
-#: cui/uiconfig/ui/charnamepage.ui:434
+#: cui/uiconfig/ui/charnamepage.ui:435
msgctxt "charnamepage|west_features_button-nocjk"
msgid "Features..."
msgstr "Возможности..."
#. nKfjE
-#: cui/uiconfig/ui/charnamepage.ui:513
+#: cui/uiconfig/ui/charnamepage.ui:514
msgctxt "charnamepage|westsizeft-cjk"
msgid "Size:"
msgstr "Кегль:"
#. jJc8T
-#: cui/uiconfig/ui/charnamepage.ui:527
+#: cui/uiconfig/ui/charnamepage.ui:528
msgctxt "charnamepage|westlangft-cjk"
msgid "Language:"
msgstr "Язык:"
#. qpSnT
-#: cui/uiconfig/ui/charnamepage.ui:634
+#: cui/uiconfig/ui/charnamepage.ui:635
msgctxt "charnamepage|west_features_button-cjk"
msgid "Features..."
msgstr "Возможности..."
#. LYK4e
-#: cui/uiconfig/ui/charnamepage.ui:660
+#: cui/uiconfig/ui/charnamepage.ui:661
msgctxt "charnamepage|label4"
msgid "Western Text Font"
msgstr "Шрифт западного текста"
#. q4WZB
-#: cui/uiconfig/ui/charnamepage.ui:725
+#: cui/uiconfig/ui/charnamepage.ui:726
msgctxt "charnamepage|eastsizeft"
msgid "Size:"
msgstr "Кегль:"
#. 6MVEP
-#: cui/uiconfig/ui/charnamepage.ui:739
+#: cui/uiconfig/ui/charnamepage.ui:740
msgctxt "charnamepage|eastlangft"
msgid "Language:"
msgstr "Язык:"
#. 5uQYn
-#: cui/uiconfig/ui/charnamepage.ui:844
+#: cui/uiconfig/ui/charnamepage.ui:845
msgctxt "charnamepage|east_features_button"
msgid "Features..."
msgstr "Возможности..."
#. vAo4E
-#: cui/uiconfig/ui/charnamepage.ui:870
+#: cui/uiconfig/ui/charnamepage.ui:871
msgctxt "charnamepage|label5"
msgid "Asian Text Font"
msgstr "Шрифт восточноазиатского текста"
#. FSm5y
-#: cui/uiconfig/ui/charnamepage.ui:935
+#: cui/uiconfig/ui/charnamepage.ui:936
msgctxt "charnamepage|ctlsizeft"
msgid "Size:"
msgstr "Кегль:"
#. j6bmf
-#: cui/uiconfig/ui/charnamepage.ui:949
+#: cui/uiconfig/ui/charnamepage.ui:950
msgctxt "charnamepage|ctllangft"
msgid "Language:"
msgstr "Язык:"
#. Nobqa
-#: cui/uiconfig/ui/charnamepage.ui:1055
+#: cui/uiconfig/ui/charnamepage.ui:1056
msgctxt "charnamepage|ctl_features_button"
msgid "Features..."
msgstr "Возможности..."
#. C8hPj
-#: cui/uiconfig/ui/charnamepage.ui:1081
+#: cui/uiconfig/ui/charnamepage.ui:1082
msgctxt "charnamepage|label6"
msgid "CTL Font"
msgstr "Шрифт для сложных систем письменности (ССП)"
#. RyyME
-#: cui/uiconfig/ui/charnamepage.ui:1119
+#: cui/uiconfig/ui/charnamepage.ui:1120
msgctxt "charnamepage|preview-atkobject"
msgid "Preview"
msgstr "Просмотр"
@@ -7060,343 +7024,337 @@ msgid "Options"
msgstr "Параметры"
#. j6j4Y
-#: cui/uiconfig/ui/effectspage.ui:40
+#: cui/uiconfig/ui/effectspage.ui:45
msgctxt "effectspage|preview-atkobject"
msgid "Preview"
msgstr "Просмотр"
#. wAeT3
-#: cui/uiconfig/ui/effectspage.ui:78
+#: cui/uiconfig/ui/effectspage.ui:83
msgctxt "effectspage|effectsft"
msgid "Case:"
msgstr "Регистр:"
#. ce9M4
-#: cui/uiconfig/ui/effectspage.ui:92
+#: cui/uiconfig/ui/effectspage.ui:97
msgctxt "effectspage|reliefft"
msgid "Relief:"
msgstr "Рельеф:"
#. HSdYT
-#: cui/uiconfig/ui/effectspage.ui:107
+#: cui/uiconfig/ui/effectspage.ui:112
msgctxt "effectspage|liststore1"
msgid "(Without)"
msgstr "(нет)"
#. xGDgW
-#: cui/uiconfig/ui/effectspage.ui:108
+#: cui/uiconfig/ui/effectspage.ui:113
msgctxt "effectspage|liststore1"
msgid "UPPERCASE"
msgstr "ПРОПИСНЫЕ"
#. kimAz
-#: cui/uiconfig/ui/effectspage.ui:109
+#: cui/uiconfig/ui/effectspage.ui:114
msgctxt "effectspage|liststore1"
msgid "lowercase"
msgstr "строчные"
#. CqAwB
-#: cui/uiconfig/ui/effectspage.ui:110
+#: cui/uiconfig/ui/effectspage.ui:115
msgctxt "effectspage|liststore1"
msgid "Capitalize Every Word"
msgstr "Каждое Слово С Прописной"
#. uuZUC
-#: cui/uiconfig/ui/effectspage.ui:111
+#: cui/uiconfig/ui/effectspage.ui:116
msgctxt "effectspage|liststore1"
msgid "Small capitals"
msgstr "Капитель"
#. GJExJ
-#: cui/uiconfig/ui/effectspage.ui:124
+#: cui/uiconfig/ui/effectspage.ui:129
msgctxt "effectspage|liststore2"
msgid "(Without)"
msgstr "(нет)"
#. 2zc6A
-#: cui/uiconfig/ui/effectspage.ui:125
+#: cui/uiconfig/ui/effectspage.ui:130
msgctxt "effectspage|liststore2"
msgid "Embossed"
msgstr "Приподнятый"
#. Vq3YD
-#: cui/uiconfig/ui/effectspage.ui:126
+#: cui/uiconfig/ui/effectspage.ui:131
msgctxt "effectspage|liststore2"
msgid "Engraved"
msgstr "Утопленный"
#. G8SPK
-#: cui/uiconfig/ui/effectspage.ui:139
+#: cui/uiconfig/ui/effectspage.ui:144
msgctxt "effectspage|liststore3"
msgid "(Without)"
msgstr "(нет)"
#. V3aSU
-#: cui/uiconfig/ui/effectspage.ui:140
+#: cui/uiconfig/ui/effectspage.ui:145
msgctxt "effectspage|liststore3"
msgid "Dot"
msgstr "Точка"
#. sek6h
-#: cui/uiconfig/ui/effectspage.ui:141
+#: cui/uiconfig/ui/effectspage.ui:146
msgctxt "effectspage|liststore3"
msgid "Circle"
msgstr "Круг"
#. rbdan
-#: cui/uiconfig/ui/effectspage.ui:142
+#: cui/uiconfig/ui/effectspage.ui:147
msgctxt "effectspage|liststore3"
msgid "Disc"
msgstr "Диск"
#. CCKAv
-#: cui/uiconfig/ui/effectspage.ui:143
+#: cui/uiconfig/ui/effectspage.ui:148
msgctxt "effectspage|liststore3"
msgid "Accent"
msgstr "Акцент"
#. Z6WHC
-#: cui/uiconfig/ui/effectspage.ui:156
+#: cui/uiconfig/ui/effectspage.ui:161
msgctxt "effectspage|liststore4"
msgid "Above text"
msgstr "Над текстом"
#. 4dQqG
-#: cui/uiconfig/ui/effectspage.ui:157
+#: cui/uiconfig/ui/effectspage.ui:162
msgctxt "effectspage|liststore4"
msgid "Below text"
msgstr "Под текстом"
#. D848F
-#: cui/uiconfig/ui/effectspage.ui:169
+#: cui/uiconfig/ui/effectspage.ui:174
msgctxt "effectspage|positionft"
msgid "Position:"
msgstr "Положение:"
#. QBQPF
-#: cui/uiconfig/ui/effectspage.ui:183
+#: cui/uiconfig/ui/effectspage.ui:188
msgctxt "effectspage|emphasisft"
msgid "Emphasis mark:"
msgstr "Метка выделения:"
#. 5pMfK
-#: cui/uiconfig/ui/effectspage.ui:195
+#: cui/uiconfig/ui/effectspage.ui:200
msgctxt "effectspage|outlinecb"
msgid "Outline"
msgstr "Контур"
#. umH7r
-#: cui/uiconfig/ui/effectspage.ui:211
+#: cui/uiconfig/ui/effectspage.ui:216
msgctxt "effectspage|shadowcb"
msgid "Shadow"
msgstr "Тень"
-#. 3NAaA
-#: cui/uiconfig/ui/effectspage.ui:227
-msgctxt "effectspage|blinkingcb"
-msgid "Blinking"
-msgstr "Мигание"
-
#. KraW7
-#: cui/uiconfig/ui/effectspage.ui:243
+#: cui/uiconfig/ui/effectspage.ui:232
msgctxt "effectspage|hiddencb"
msgid "Hidden"
msgstr "Скрытый"
#. GZX6U
-#: cui/uiconfig/ui/effectspage.ui:277
+#: cui/uiconfig/ui/effectspage.ui:269
msgctxt "effectspage|effectsft2"
msgid "Effects"
msgstr "Эффекты"
#. BD3Ka
-#: cui/uiconfig/ui/effectspage.ui:314
+#: cui/uiconfig/ui/effectspage.ui:306
msgctxt "effectspage|label46"
msgid "Overlining:"
msgstr "Надчёркивание:"
#. WtjES
-#: cui/uiconfig/ui/effectspage.ui:328
+#: cui/uiconfig/ui/effectspage.ui:320
msgctxt "effectspage|label47"
msgid "Strikethrough:"
msgstr "Зачёркивание:"
#. tCP45
-#: cui/uiconfig/ui/effectspage.ui:342
+#: cui/uiconfig/ui/effectspage.ui:334
msgctxt "effectspage|label48"
msgid "Underlining:"
msgstr "Подчёркивание:"
#. EGta9
-#: cui/uiconfig/ui/effectspage.ui:357 cui/uiconfig/ui/effectspage.ui:386
+#: cui/uiconfig/ui/effectspage.ui:349 cui/uiconfig/ui/effectspage.ui:378
msgctxt "effectspage|liststore6"
msgid "(Without)"
msgstr "(нет)"
#. wvpKK
-#: cui/uiconfig/ui/effectspage.ui:358 cui/uiconfig/ui/effectspage.ui:387
+#: cui/uiconfig/ui/effectspage.ui:350 cui/uiconfig/ui/effectspage.ui:379
msgctxt "effectspage|liststore6"
msgid "Single"
msgstr "Одинарный"
#. dCubb
-#: cui/uiconfig/ui/effectspage.ui:359 cui/uiconfig/ui/effectspage.ui:388
+#: cui/uiconfig/ui/effectspage.ui:351 cui/uiconfig/ui/effectspage.ui:380
msgctxt "effectspage|liststore6"
msgid "Double"
msgstr "Двойной"
#. JFKfG
-#: cui/uiconfig/ui/effectspage.ui:360 cui/uiconfig/ui/effectspage.ui:389
+#: cui/uiconfig/ui/effectspage.ui:352 cui/uiconfig/ui/effectspage.ui:381
msgctxt "effectspage|liststore6"
msgid "Bold"
msgstr "Жирный"
#. m7Jwh
-#: cui/uiconfig/ui/effectspage.ui:361 cui/uiconfig/ui/effectspage.ui:390
+#: cui/uiconfig/ui/effectspage.ui:353 cui/uiconfig/ui/effectspage.ui:382
msgctxt "effectspage|liststore6"
msgid "Dotted"
msgstr "Пунктир"
#. iC5t6
-#: cui/uiconfig/ui/effectspage.ui:362 cui/uiconfig/ui/effectspage.ui:391
+#: cui/uiconfig/ui/effectspage.ui:354 cui/uiconfig/ui/effectspage.ui:383
msgctxt "effectspage|liststore6"
msgid "Dotted (Bold)"
msgstr "Пунктир (жирный)"
#. uGcdw
-#: cui/uiconfig/ui/effectspage.ui:363 cui/uiconfig/ui/effectspage.ui:392
+#: cui/uiconfig/ui/effectspage.ui:355 cui/uiconfig/ui/effectspage.ui:384
msgctxt "effectspage|liststore6"
msgid "Dash"
msgstr "Штрих"
#. BLRCY
-#: cui/uiconfig/ui/effectspage.ui:364 cui/uiconfig/ui/effectspage.ui:393
+#: cui/uiconfig/ui/effectspage.ui:356 cui/uiconfig/ui/effectspage.ui:385
msgctxt "effectspage|liststore6"
msgid "Dash (Bold)"
msgstr "Штрих (жирный)"
#. FCcKo
-#: cui/uiconfig/ui/effectspage.ui:365 cui/uiconfig/ui/effectspage.ui:394
+#: cui/uiconfig/ui/effectspage.ui:357 cui/uiconfig/ui/effectspage.ui:386
msgctxt "effectspage|liststore6"
msgid "Long Dash"
msgstr "Длинный штрих"
#. 7UBEL
-#: cui/uiconfig/ui/effectspage.ui:366 cui/uiconfig/ui/effectspage.ui:395
+#: cui/uiconfig/ui/effectspage.ui:358 cui/uiconfig/ui/effectspage.ui:387
msgctxt "effectspage|liststore6"
msgid "Long Dash (Bold)"
msgstr "Длинный штрих (жирный)"
#. a58XD
-#: cui/uiconfig/ui/effectspage.ui:367 cui/uiconfig/ui/effectspage.ui:396
+#: cui/uiconfig/ui/effectspage.ui:359 cui/uiconfig/ui/effectspage.ui:388
msgctxt "effectspage|liststore6"
msgid "Dot Dash"
msgstr "Штрихпунктир"
#. MhBD8
-#: cui/uiconfig/ui/effectspage.ui:368 cui/uiconfig/ui/effectspage.ui:397
+#: cui/uiconfig/ui/effectspage.ui:360 cui/uiconfig/ui/effectspage.ui:389
msgctxt "effectspage|liststore6"
msgid "Dot Dash (Bold)"
msgstr "Штрихпунктир (жирный)"
#. AcyEi
-#: cui/uiconfig/ui/effectspage.ui:369 cui/uiconfig/ui/effectspage.ui:398
+#: cui/uiconfig/ui/effectspage.ui:361 cui/uiconfig/ui/effectspage.ui:390
msgctxt "effectspage|liststore6"
msgid "Dot Dot Dash"
msgstr "Штрихпунктир с 2 точками"
#. BRq6u
-#: cui/uiconfig/ui/effectspage.ui:370 cui/uiconfig/ui/effectspage.ui:399
+#: cui/uiconfig/ui/effectspage.ui:362 cui/uiconfig/ui/effectspage.ui:391
msgctxt "effectspage|liststore6"
msgid "Dot Dot Dash (Bold)"
msgstr "Штрихпунктир с 2 точками (жирный)"
#. kEEBv
-#: cui/uiconfig/ui/effectspage.ui:371 cui/uiconfig/ui/effectspage.ui:400
+#: cui/uiconfig/ui/effectspage.ui:363 cui/uiconfig/ui/effectspage.ui:392
msgctxt "effectspage|liststore6"
msgid "Wave"
msgstr "Волна"
#. XDicz
-#: cui/uiconfig/ui/effectspage.ui:372 cui/uiconfig/ui/effectspage.ui:401
+#: cui/uiconfig/ui/effectspage.ui:364 cui/uiconfig/ui/effectspage.ui:393
msgctxt "effectspage|liststore6"
msgid "Wave (Bold)"
msgstr "Волна (жирная)"
#. ZxdxD
-#: cui/uiconfig/ui/effectspage.ui:373 cui/uiconfig/ui/effectspage.ui:402
+#: cui/uiconfig/ui/effectspage.ui:365 cui/uiconfig/ui/effectspage.ui:394
msgctxt "effectspage|liststore6"
msgid "Double Wave"
msgstr "Двойная волна"
#. FgNij
-#: cui/uiconfig/ui/effectspage.ui:415
+#: cui/uiconfig/ui/effectspage.ui:407
msgctxt "effectspage|liststore5"
msgid "(Without)"
msgstr "(нет)"
#. Q4YtH
-#: cui/uiconfig/ui/effectspage.ui:416
+#: cui/uiconfig/ui/effectspage.ui:408
msgctxt "effectspage|liststore5"
msgid "Single"
msgstr "Одинарный"
#. 9ndBZ
-#: cui/uiconfig/ui/effectspage.ui:417
+#: cui/uiconfig/ui/effectspage.ui:409
msgctxt "effectspage|liststore5"
msgid "Double"
msgstr "Двойной"
#. p5Q9A
-#: cui/uiconfig/ui/effectspage.ui:418
+#: cui/uiconfig/ui/effectspage.ui:410
msgctxt "effectspage|liststore5"
msgid "Bold"
msgstr "Жирный"
#. bcZBk
-#: cui/uiconfig/ui/effectspage.ui:419
+#: cui/uiconfig/ui/effectspage.ui:411
msgctxt "effectspage|liststore5"
msgid "With /"
msgstr "Символом: /"
#. GJKbv
-#: cui/uiconfig/ui/effectspage.ui:420
+#: cui/uiconfig/ui/effectspage.ui:412
msgctxt "effectspage|liststore5"
msgid "With X"
msgstr "Символом: X"
#. VYaEr
-#: cui/uiconfig/ui/effectspage.ui:462
+#: cui/uiconfig/ui/effectspage.ui:454
msgctxt "effectspage|individualwordscb"
msgid "Individual words"
msgstr "Только слова"
#. oFKJN
-#: cui/uiconfig/ui/effectspage.ui:512
+#: cui/uiconfig/ui/effectspage.ui:504
msgctxt "effectspage|textdecoration"
msgid "Text Decoration"
msgstr "Украшение текста"
#. omW2n
-#: cui/uiconfig/ui/effectspage.ui:548
+#: cui/uiconfig/ui/effectspage.ui:540
msgctxt "effectspage|fontcolorft"
msgid "Font color:"
msgstr "Цвет шрифта:"
#. aAbzm
-#: cui/uiconfig/ui/effectspage.ui:577
+#: cui/uiconfig/ui/effectspage.ui:569
msgctxt "effectspage|a11ywarning"
msgid "Accessibility option \"Use automatic font color for screen display\" is active. Font color attributes are not currently used to display text."
msgstr "Параметр «Автоматически подбирать цвет текста» активен. Заданные цвета не используются."
#. AZF8Q
-#: cui/uiconfig/ui/effectspage.ui:591
+#: cui/uiconfig/ui/effectspage.ui:583
msgctxt "effectspage|fonttransparencyft"
msgid "_Transparency:"
msgstr "Прозрачность:"
#. vELSr
-#: cui/uiconfig/ui/effectspage.ui:624
+#: cui/uiconfig/ui/effectspage.ui:616
msgctxt "effectspage|fontcolorft3"
msgid "Font Color"
msgstr "Цвет шрифта"
@@ -10395,97 +10353,85 @@ msgid "Options for High Contrast Appearance"
msgstr "Параметры контрастного режима"
#. kishx
-#: cui/uiconfig/ui/optadvancedpage.ui:57
+#: cui/uiconfig/ui/optadvancedpage.ui:55
msgctxt "optadvancedpage|javaenabled"
msgid "_Use a Java runtime environment"
msgstr "Использовать виртуальную машину Java"
#. DFVFw
-#: cui/uiconfig/ui/optadvancedpage.ui:91
+#: cui/uiconfig/ui/optadvancedpage.ui:89
msgctxt "optadvancedpage|label2"
msgid "_Java runtime environments (JRE) already installed:"
msgstr "Установленные виртуальные машины Java:"
#. mBYfC
-#: cui/uiconfig/ui/optadvancedpage.ui:116
+#: cui/uiconfig/ui/optadvancedpage.ui:114
msgctxt "optadvancedpage|add"
msgid "_Add..."
msgstr "До_бавить..."
#. YtgBL
-#: cui/uiconfig/ui/optadvancedpage.ui:130
+#: cui/uiconfig/ui/optadvancedpage.ui:128
msgctxt "optadvancedpage|parameters"
msgid "_Parameters..."
msgstr "Параметры..."
#. dhf5G
-#: cui/uiconfig/ui/optadvancedpage.ui:144
+#: cui/uiconfig/ui/optadvancedpage.ui:142
msgctxt "optadvancedpage|classpath"
msgid "_Class Path..."
msgstr "Путь класса..."
#. MxHGu
-#: cui/uiconfig/ui/optadvancedpage.ui:209
+#: cui/uiconfig/ui/optadvancedpage.ui:207
msgctxt "optadvancedpage|vendor"
msgid "Vendor"
msgstr "Производитель"
#. e6xHG
-#: cui/uiconfig/ui/optadvancedpage.ui:222
+#: cui/uiconfig/ui/optadvancedpage.ui:220
msgctxt "optadvancedpage|version"
msgid "Version"
msgstr "Версия"
-#. w4K9y
-#: cui/uiconfig/ui/optadvancedpage.ui:235
-msgctxt "optadvancedpage|features"
-msgid "Features"
-msgstr "Возможности"
-
#. erNBk
-#: cui/uiconfig/ui/optadvancedpage.ui:269
+#: cui/uiconfig/ui/optadvancedpage.ui:254
msgctxt "optadvancedpage|javapath"
msgid "Location: "
msgstr "Расположение: "
-#. eBrhe
-#: cui/uiconfig/ui/optadvancedpage.ui:286
-msgctxt "optadvancedpage|a11y"
-msgid "with accessibility support"
-msgstr "с поддержкой специальных возможностей"
-
#. GkBzK
-#: cui/uiconfig/ui/optadvancedpage.ui:297
+#: cui/uiconfig/ui/optadvancedpage.ui:271
msgctxt "optadvancedpage|selectruntime"
msgid "Select a Java Runtime Environment"
msgstr "Выбрать Java Runtime Environment"
#. 7QUQp
-#: cui/uiconfig/ui/optadvancedpage.ui:327
+#: cui/uiconfig/ui/optadvancedpage.ui:301
msgctxt "optadvancedpage|label1"
msgid "Java Options"
msgstr "Параметры Java"
#. rEtsc
-#: cui/uiconfig/ui/optadvancedpage.ui:362
+#: cui/uiconfig/ui/optadvancedpage.ui:336
msgctxt "optadvancedpage|experimental"
msgid "Enable experimental features (may be unstable)"
msgstr "Включить экспериментальные возможности (нестабильны)"
#. rMVcA
-#: cui/uiconfig/ui/optadvancedpage.ui:377
+#: cui/uiconfig/ui/optadvancedpage.ui:351
msgctxt "optadvancedpage|macrorecording"
msgid "Enable macro recording (may be limited)"
msgstr "Включить запись макросов (ограничено)"
#. NgRXw
-#: cui/uiconfig/ui/optadvancedpage.ui:392
+#: cui/uiconfig/ui/optadvancedpage.ui:366
msgctxt "optadvancedpage|expertconfig"
msgid "Open Expert Configuration"
msgstr "Открыть экспертные настройки"
#. ZLtrh
-#: cui/uiconfig/ui/optadvancedpage.ui:412
+#: cui/uiconfig/ui/optadvancedpage.ui:386
msgctxt "optadvancedpage|label12"
msgid "Optional Features"
msgstr "Дополнительные возможности"
@@ -11874,12 +11820,12 @@ msgctxt "optsavepage|warnalienformat"
msgid "Warn when not saving in ODF or default format"
msgstr "Предупреждать при сохранении в формате, отличном от ODF или по умолчанию"
-#. YjRps
+#. 5ANvD
#. EN-US, the term 'extended' must not be translated.
#: cui/uiconfig/ui/optsavepage.ui:291
msgctxt "optsavepage|odfwarning_label"
-msgid "Not using ODF 1.2 Extended may cause information to be lost."
-msgstr "Неиспользование «ODF 1.2 Расширенный» может привести к потере информации."
+msgid "Not using ODF 1.3 Extended may cause information to be lost."
+msgstr ""
#. 6Tfns
#: cui/uiconfig/ui/optsavepage.ui:321
@@ -11899,74 +11845,86 @@ msgctxt "optsavepage|odfversion"
msgid "1.2 Extended (compatibility mode)"
msgstr "1.2 расширенный (совместимый)"
-#. CjUEz
+#. G826f
#: cui/uiconfig/ui/optsavepage.ui:324
msgctxt "optsavepage|odfversion"
-msgid "1.2 Extended (recommended)"
-msgstr "1.2 расширенный (рекомендованный)"
+msgid "1.2 Extended"
+msgstr ""
+
+#. vLmeZ
+#: cui/uiconfig/ui/optsavepage.ui:325
+msgctxt "optsavepage|odfversion"
+msgid "1.3"
+msgstr ""
+
+#. e6EP2
+#: cui/uiconfig/ui/optsavepage.ui:326
+msgctxt "optsavepage|odfversion"
+msgid "1.3 Extended (recommended)"
+msgstr ""
#. cxPqV
-#: cui/uiconfig/ui/optsavepage.ui:336
+#: cui/uiconfig/ui/optsavepage.ui:338
msgctxt "optsavepage|label5"
msgid "ODF format version:"
msgstr "Версия формата ODF:"
#. bF5dA
-#: cui/uiconfig/ui/optsavepage.ui:350
+#: cui/uiconfig/ui/optsavepage.ui:352
msgctxt "optsavepage|saveas_label"
msgid "Always sa_ve as:"
msgstr "Всегда сохран_ять как:"
#. p3xHz
-#: cui/uiconfig/ui/optsavepage.ui:365
+#: cui/uiconfig/ui/optsavepage.ui:367
msgctxt "optsavepage|doctype"
msgid "Text document"
msgstr "Текстовый документ"
#. F2tP4
-#: cui/uiconfig/ui/optsavepage.ui:366
+#: cui/uiconfig/ui/optsavepage.ui:368
msgctxt "optsavepage|doctype"
msgid "HTML document"
msgstr "Документ HTML"
#. hA5Di
-#: cui/uiconfig/ui/optsavepage.ui:367
+#: cui/uiconfig/ui/optsavepage.ui:369
msgctxt "optsavepage|doctype"
msgid "Master document"
msgstr "Составной документ"
#. Dfgxy
-#: cui/uiconfig/ui/optsavepage.ui:368
+#: cui/uiconfig/ui/optsavepage.ui:370
msgctxt "optsavepage|doctype"
msgid "Spreadsheet"
msgstr "Электронная таблица"
#. EEvDc
-#: cui/uiconfig/ui/optsavepage.ui:369
+#: cui/uiconfig/ui/optsavepage.ui:371
msgctxt "optsavepage|doctype"
msgid "Presentation"
msgstr "Презентация"
#. XgyzS
-#: cui/uiconfig/ui/optsavepage.ui:370
+#: cui/uiconfig/ui/optsavepage.ui:372
msgctxt "optsavepage|doctype"
msgid "Drawing"
msgstr "Рисунок"
#. 4DDpx
-#: cui/uiconfig/ui/optsavepage.ui:371
+#: cui/uiconfig/ui/optsavepage.ui:373
msgctxt "optsavepage|doctype"
msgid "Formula"
msgstr "Формула"
#. 29FUf
-#: cui/uiconfig/ui/optsavepage.ui:393
+#: cui/uiconfig/ui/optsavepage.ui:395
msgctxt "optsavepage|label6"
msgid "D_ocument type:"
msgstr "Тип _документа:"
#. CgCxr
-#: cui/uiconfig/ui/optsavepage.ui:411
+#: cui/uiconfig/ui/optsavepage.ui:413
msgctxt "optsavepage|label3"
msgid "Default File Format and ODF Settings"
msgstr "Формат файла по умолчанию и настройки ODF"
diff --git a/source/ru/dbaccess/messages.po b/source/ru/dbaccess/messages.po
index f1293599caa..6590c87570f 100644
--- a/source/ru/dbaccess/messages.po
+++ b/source/ru/dbaccess/messages.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-02-27 14:31+0100\n"
+"POT-Creation-Date: 2020-05-25 19:59+0200\n"
"PO-Revision-Date: 2019-12-24 17:05+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/dbaccessmessages/ru/>\n"
@@ -35,55 +35,55 @@ msgid "The SQL statement"
msgstr "Инструкция SQL"
#. FAMGa
-#: dbaccess/inc/strings.hrc:25
+#: dbaccess/inc/strings.hrc:24
msgctxt "RID_STR_CONNECTION_INVALID"
msgid "No connection could be established."
msgstr "Не удалось установить соединение."
#. y8rYj
-#: dbaccess/inc/strings.hrc:26
+#: dbaccess/inc/strings.hrc:25
msgctxt "RID_STR_TABLE_IS_FILTERED"
msgid "The table $name$ already exists. It is not visible because it has been filtered out."
msgstr "Таблица $name$ уже существует. Она не видна, так как находится за пределами фильтра."
#. ZfmVR
-#: dbaccess/inc/strings.hrc:27
+#: dbaccess/inc/strings.hrc:26
msgctxt "RID_STR_COULDNOTCONNECT_UNSPECIFIED"
msgid "The connection to the external data source could not be established. An unknown error occurred. The driver is probably defective."
msgstr "Невозможно подключиться к внешнему источнику данных. Неизвестная ошибка. Возможны неполадки с драйвером."
#. XdFHe
-#: dbaccess/inc/strings.hrc:28
+#: dbaccess/inc/strings.hrc:27
msgctxt "RID_STR_COULDNOTCONNECT_NODRIVER"
msgid "The connection to the external data source could not be established. No SDBC driver was found for the URL '$name$'."
msgstr "Невозможно подключиться к внешнему источнику данных. Не найден драйвер SDBC для URL '$name$'."
#. HFLkw
-#: dbaccess/inc/strings.hrc:29
+#: dbaccess/inc/strings.hrc:28
msgctxt "RID_STR_COULDNOTLOAD_MANAGER"
msgid "The connection to the external data source could not be established. The SDBC driver manager could not be loaded."
msgstr "Невозможно подключиться к внешнему источнику данных. Диспетчер драйвера SDBC не загружается."
#. PzEVD
-#: dbaccess/inc/strings.hrc:30
+#: dbaccess/inc/strings.hrc:29
msgctxt "RID_STR_FORM"
msgid "Form"
msgstr "Форма"
#. nkamB
-#: dbaccess/inc/strings.hrc:31
+#: dbaccess/inc/strings.hrc:30
msgctxt "RID_STR_REPORT"
msgid "Report"
msgstr "Отчёт"
#. bYjEz
-#: dbaccess/inc/strings.hrc:32
+#: dbaccess/inc/strings.hrc:31
msgctxt "RID_STR_DATASOURCE_NOT_STORED"
msgid "The data source was not saved. Please use the interface XStorable to save the data source."
msgstr "Источник данных не сохранён. Пожалуйста, используйте интерфейс XStorable для сохранения источника данных."
#. BuEPn
-#: dbaccess/inc/strings.hrc:33
+#: dbaccess/inc/strings.hrc:32
msgctxt "RID_STR_ONLY_QUERY"
msgid ""
"The given command is not a SELECT statement.\n"
@@ -93,164 +93,164 @@ msgstr ""
"Допустимы только запросы на выборку данных."
#. 4CSx9
-#: dbaccess/inc/strings.hrc:34
+#: dbaccess/inc/strings.hrc:33
msgctxt "RID_STR_NO_VALUE_CHANGED"
msgid "No values were modified."
msgstr "Ни одно значение не изменено."
#. TFFGN
-#: dbaccess/inc/strings.hrc:35
+#: dbaccess/inc/strings.hrc:34
msgctxt "RID_STR_NO_XROWUPDATE"
msgid "Values could not be inserted. The XRowUpdate interface is not supported by ResultSet."
msgstr "Невозможно вставить значения. ResultSet не поддерживает интерфейс XRowUpdate."
#. PQPVY
-#: dbaccess/inc/strings.hrc:36
+#: dbaccess/inc/strings.hrc:35
msgctxt "RID_STR_NO_XRESULTSETUPDATE"
msgid "Values could not be inserted. The XResultSetUpdate interface is not supported by ResultSet."
msgstr "Невозможно вставить значения. ResultSet не поддерживает интерфейс XRowSetUpdate."
#. EAkm5
-#: dbaccess/inc/strings.hrc:37
+#: dbaccess/inc/strings.hrc:36
msgctxt "RID_STR_NO_UPDATE_MISSING_CONDITION"
msgid "Values could not be modified, due to a missing condition statement."
msgstr "Невозможно изменить значения из-за отсутствия условного выражения."
#. 7Jns7
-#: dbaccess/inc/strings.hrc:38
+#: dbaccess/inc/strings.hrc:37
msgctxt "RID_STR_NO_COLUMN_ADD"
msgid "The adding of columns is not supported."
msgstr "Добавление полей не поддерживается."
#. BGMPE
-#: dbaccess/inc/strings.hrc:39
+#: dbaccess/inc/strings.hrc:38
msgctxt "RID_STR_NO_COLUMN_DROP"
msgid "The dropping of columns is not supported."
msgstr "Удаление полей не поддерживается."
#. e2SUr
-#: dbaccess/inc/strings.hrc:40
+#: dbaccess/inc/strings.hrc:39
msgctxt "RID_STR_NO_CONDITION_FOR_PK"
msgid "The WHERE condition could not be created for the primary key."
msgstr "Невозможно создать условие WHERE для первичного ключа."
#. NPDCA
-#: dbaccess/inc/strings.hrc:41
+#: dbaccess/inc/strings.hrc:40
msgctxt "RID_STR_COLUMN_UNKNOWN_PROP"
msgid "The column does not support the property '%value'."
msgstr "Поле не поддерживает свойство «%value»."
#. MDPRn
-#: dbaccess/inc/strings.hrc:42
+#: dbaccess/inc/strings.hrc:41
msgctxt "RID_STR_COLUMN_NOT_SEARCHABLE"
msgid "The column is not searchable!"
msgstr "Невозможно осуществить поиск по этому полю!"
#. s9iVh
-#: dbaccess/inc/strings.hrc:43
+#: dbaccess/inc/strings.hrc:42
msgctxt "RID_STR_NOT_SEQUENCE_INT8"
msgid "The value of the columns is not of the type Sequence<sal_Int8>."
msgstr "Значения полей не соответствуют типу Sequence<sal_Int8>."
#. Mrizz
-#: dbaccess/inc/strings.hrc:44
+#: dbaccess/inc/strings.hrc:43
msgctxt "RID_STR_COLUMN_NOT_VALID"
msgid "The column is not valid."
msgstr "Поле некорректно."
#. CyL8V
-#: dbaccess/inc/strings.hrc:45
+#: dbaccess/inc/strings.hrc:44
#, c-format
msgctxt "RID_STR_COLUMN_MUST_VISIBLE"
msgid "The column '%name' must be visible as a column."
msgstr "Поле «%name» должно отображаться как столбец."
#. kZnJD
-#: dbaccess/inc/strings.hrc:46
+#: dbaccess/inc/strings.hrc:45
msgctxt "RID_STR_NO_XQUERIESSUPPLIER"
msgid "The interface XQueriesSupplier is not available."
msgstr "Интерфейс XQueriesSupplier не доступен."
#. fBeqP
-#: dbaccess/inc/strings.hrc:47
+#: dbaccess/inc/strings.hrc:46
msgctxt "RID_STR_NO_ABS_ZERO"
msgid "An 'absolute(0)' call is not allowed."
msgstr "Вызов «absolute(0)» запрещён."
#. GXMTQ
-#: dbaccess/inc/strings.hrc:48
+#: dbaccess/inc/strings.hrc:47
msgctxt "RID_STR_NO_RELATIVE"
msgid "Relative positioning is not allowed in this state."
msgstr "Относительная адресация в этом состоянии недоступна."
#. LgS5s
-#: dbaccess/inc/strings.hrc:49
+#: dbaccess/inc/strings.hrc:48
msgctxt "RID_STR_NO_REFRESH_AFTERLAST"
msgid "A row cannot be refreshed when the ResultSet is positioned after the last row."
msgstr "Строка не может быть обновлена, когда ResultSet расположен за последним столбцом."
#. TqUZX
-#: dbaccess/inc/strings.hrc:50
+#: dbaccess/inc/strings.hrc:49
msgctxt "RID_STR_NO_MOVETOINSERTROW_CALLED"
msgid "A new row cannot be inserted when the ResultSet is not first moved to the insert row."
msgstr "Нельзя вставить новую строку, пока курсор ResulSet не перемещён в зону вставки."
#. aGfUX
-#: dbaccess/inc/strings.hrc:51
+#: dbaccess/inc/strings.hrc:50
msgctxt "RID_STR_NO_UPDATEROW"
msgid "A row cannot be modified in this state"
msgstr "Запись не может быть изменена в этом состоянии"
#. uaxsC
-#: dbaccess/inc/strings.hrc:52
+#: dbaccess/inc/strings.hrc:51
msgctxt "RID_STR_NO_DELETEROW"
msgid "A row cannot be deleted in this state."
msgstr "Запись не может быть удалена в этом состоянии."
#. 6aAaN
-#: dbaccess/inc/strings.hrc:53
+#: dbaccess/inc/strings.hrc:52
msgctxt "RID_STR_NO_TABLE_RENAME"
msgid "The driver does not support table renaming."
msgstr "Драйвер не поддерживает переименование таблиц."
#. Q8ADk
-#: dbaccess/inc/strings.hrc:54
+#: dbaccess/inc/strings.hrc:53
msgctxt "RID_STR_COLUMN_ALTER_BY_NAME"
msgid "The driver does not support the modification of column descriptions by changing the name."
msgstr "Драйвер не поддерживает изменение описаний полей путём смены их имени."
#. tZWaL
-#: dbaccess/inc/strings.hrc:55
+#: dbaccess/inc/strings.hrc:54
msgctxt "RID_STR_COLUMN_ALTER_BY_INDEX"
msgid "The driver does not support the modification of column descriptions by changing the index."
msgstr "Драйвер не поддерживает изменение описания полей через изменение их индексов."
#. Z5gGE
-#: dbaccess/inc/strings.hrc:56
+#: dbaccess/inc/strings.hrc:55
msgctxt "RID_STR_FILE_DOES_NOT_EXIST"
msgid "The file \"$file$\" does not exist."
msgstr "Файл «$file$» не существует."
#. XMAYD
-#: dbaccess/inc/strings.hrc:57
+#: dbaccess/inc/strings.hrc:56
msgctxt "RID_STR_TABLE_DOES_NOT_EXIST"
msgid "There exists no table named \"$table$\"."
msgstr "Таблица «$table$» не существует."
#. XcJvN
-#: dbaccess/inc/strings.hrc:58
+#: dbaccess/inc/strings.hrc:57
msgctxt "RID_STR_QUERY_DOES_NOT_EXIST"
msgid "There exists no query named \"$table$\"."
msgstr "Запрос «$table$» не существует."
#. anFDx
-#: dbaccess/inc/strings.hrc:59
+#: dbaccess/inc/strings.hrc:58
msgctxt "RID_STR_CONFLICTING_NAMES"
msgid "There are tables in the database whose names conflict with the names of existing queries. To make full use of all queries and tables, make sure they have distinct names."
msgstr "Имена некоторых таблиц в данной базе данных конфликтуют с именами существующих запросов. Чтобы полноценно использовать все таблицы и запросы, убедитесь, что их имена не дублируются."
#. e2YrR
-#: dbaccess/inc/strings.hrc:60
+#: dbaccess/inc/strings.hrc:59
msgctxt "RID_STR_COMMAND_LEADING_TO_ERROR"
msgid ""
"The SQL command leading to this error is:\n"
@@ -262,49 +262,49 @@ msgstr ""
"$command$"
#. s3B76
-#: dbaccess/inc/strings.hrc:61
+#: dbaccess/inc/strings.hrc:60
msgctxt "RID_STR_STATEMENT_WITHOUT_RESULT_SET"
msgid "The SQL command does not describe a result set."
msgstr "Команда SQL не описывает результирующее множество."
#. o8AAh
-#: dbaccess/inc/strings.hrc:62
+#: dbaccess/inc/strings.hrc:61
msgctxt "RID_STR_NAME_MUST_NOT_BE_EMPTY"
msgid "The name must not be empty."
msgstr "Имя не может быть пустым."
#. EDBgs
-#: dbaccess/inc/strings.hrc:63
+#: dbaccess/inc/strings.hrc:62
msgctxt "RID_STR_NO_NULL_OBJECTS_IN_CONTAINER"
msgid "The container cannot contain NULL objects."
msgstr "Контейнер не может содержать NULL-объекты."
#. BADJn
-#: dbaccess/inc/strings.hrc:64
+#: dbaccess/inc/strings.hrc:63
msgctxt "RID_STR_NAME_ALREADY_USED"
msgid "There already is an object with the given name."
msgstr "Объект с таким именем уже существует."
#. VdEjV
-#: dbaccess/inc/strings.hrc:65
+#: dbaccess/inc/strings.hrc:64
msgctxt "RID_STR_OBJECT_CONTAINER_MISMATCH"
msgid "This object cannot be part of this container."
msgstr "Этот объект не может быть частью данного контейнера."
#. DFQvz
-#: dbaccess/inc/strings.hrc:66
+#: dbaccess/inc/strings.hrc:65
msgctxt "RID_STR_OBJECT_ALREADY_CONTAINED"
msgid "The object already is, with a different name, part of the container."
msgstr "Этот объект под другим именем уже является частью данного контейнера."
#. CjNwC
-#: dbaccess/inc/strings.hrc:67
+#: dbaccess/inc/strings.hrc:66
msgctxt "RID_STR_NAME_NOT_FOUND"
msgid "Unable to find the document '$name$'."
msgstr "Не найден документ «$name$»."
#. LM7dF
-#: dbaccess/inc/strings.hrc:68
+#: dbaccess/inc/strings.hrc:67
msgctxt "RID_STR_ERROR_WHILE_SAVING"
msgid ""
"Could not save the document to $location$:\n"
@@ -314,7 +314,7 @@ msgstr ""
"$message$"
#. tHzew
-#: dbaccess/inc/strings.hrc:69
+#: dbaccess/inc/strings.hrc:68
msgctxt "RID_NO_SUCH_DATA_SOURCE"
msgid ""
"Error accessing data source '$name$':\n"
@@ -324,532 +324,380 @@ msgstr ""
"$error$"
#. ALTav
-#: dbaccess/inc/strings.hrc:70
+#: dbaccess/inc/strings.hrc:69
msgctxt "RID_STR_NO_SUB_FOLDER"
msgid "There exists no folder named \"$folder$\"."
msgstr "Папка с именем «$folder$» не существует."
#. Fhh7V
-#: dbaccess/inc/strings.hrc:71
+#: dbaccess/inc/strings.hrc:70
msgctxt "RID_STR_NO_DELETE_BEFORE_AFTER"
msgid "Cannot delete the before-first or after-last row."
msgstr "Нельзя удалить запись, не входящую в диапазон."
#. nqVfA
-#: dbaccess/inc/strings.hrc:72
+#: dbaccess/inc/strings.hrc:71
msgctxt "RID_STR_NO_DELETE_INSERT_ROW"
msgid "Cannot delete the insert-row."
msgstr "Невозможно удалить вставляемую запись."
#. 9BUGj
-#: dbaccess/inc/strings.hrc:73
+#: dbaccess/inc/strings.hrc:72
msgctxt "RID_STR_RESULT_IS_READONLY"
msgid "Result set is read only."
msgstr "Результирующий набор предназначен только для чтения."
#. 47GAs
-#: dbaccess/inc/strings.hrc:74
+#: dbaccess/inc/strings.hrc:73
msgctxt "RID_STR_NO_DELETE_PRIVILEGE"
msgid "DELETE privilege not available."
msgstr "Нет прав на операцию DELETE."
#. SsHD3
-#: dbaccess/inc/strings.hrc:75
+#: dbaccess/inc/strings.hrc:74
msgctxt "RID_STR_ROW_ALREADY_DELETED"
msgid "Current row is already deleted."
msgstr "Текущая запись уже удалена."
#. DkbQp
-#: dbaccess/inc/strings.hrc:76
+#: dbaccess/inc/strings.hrc:75
msgctxt "RID_STR_UPDATE_FAILED"
msgid "Current row could not be updated."
msgstr "Текущая запись не может быть обновлена."
#. ccyRu
-#: dbaccess/inc/strings.hrc:77
+#: dbaccess/inc/strings.hrc:76
msgctxt "RID_STR_NO_INSERT_PRIVILEGE"
msgid "INSERT privilege not available."
msgstr "Нет прав на операцию INSERT."
#. RyCJt
-#: dbaccess/inc/strings.hrc:78
+#: dbaccess/inc/strings.hrc:77
msgctxt "RID_STR_INTERNAL_ERROR"
msgid "Internal error: no statement object provided by the database driver."
msgstr "Внутренняя ошибка: нет описания объекта, предоставленного драйвером базы данных."
#. SMWJi
-#: dbaccess/inc/strings.hrc:79
+#: dbaccess/inc/strings.hrc:78
msgctxt "RID_STR_EXPRESSION1"
msgid "Expression1"
msgstr "Выражение1"
#. 32Lgg
-#: dbaccess/inc/strings.hrc:80
+#: dbaccess/inc/strings.hrc:79
msgctxt "RID_STR_NO_SQL_COMMAND"
msgid "No SQL command was provided."
msgstr "Не указана команда SQL."
#. bvez7
-#: dbaccess/inc/strings.hrc:81
+#: dbaccess/inc/strings.hrc:80
msgctxt "RID_STR_INVALID_INDEX"
msgid "Invalid column index."
msgstr "Некорректный индекс поля."
#. uAGCJ
-#: dbaccess/inc/strings.hrc:82
+#: dbaccess/inc/strings.hrc:81
msgctxt "RID_STR_INVALID_CURSOR_STATE"
msgid "Invalid cursor state."
msgstr "Некоректное состояние курсора."
#. Dqrzw
-#: dbaccess/inc/strings.hrc:83
+#: dbaccess/inc/strings.hrc:82
msgctxt "RID_STR_CURSOR_BEFORE_OR_AFTER"
msgid "The cursor points to before the first or after the last row."
msgstr "Курсор указывает на запись за пределами диапазона."
#. z9fkj
-#: dbaccess/inc/strings.hrc:84
+#: dbaccess/inc/strings.hrc:83
msgctxt "RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER"
msgid "The rows before the first and after the last row don't have a bookmark."
msgstr "Нет закладок на записи за пределами диапазона."
#. uYeyd
-#: dbaccess/inc/strings.hrc:85
+#: dbaccess/inc/strings.hrc:84
msgctxt "RID_STR_NO_BOOKMARK_DELETED"
msgid "The current row is deleted, and thus doesn't have a bookmark."
msgstr "Невозможно добавить закладку на удалённую запись."
#. 935sJ
-#: dbaccess/inc/strings.hrc:86
+#: dbaccess/inc/strings.hrc:85
msgctxt "RID_STR_CONNECTION_REQUEST"
msgid "A connection for the following URL was requested \"$name$\"."
msgstr "Было запрошено соединение со следующим URL «$name$»."
#. UgP8s
-#: dbaccess/inc/strings.hrc:87
+#: dbaccess/inc/strings.hrc:86
msgctxt "RID_STR_MISSING_EXTENSION"
msgid "The extension is not installed."
msgstr "Расширение не установлено."
#. CvFBA
-#: dbaccess/inc/strings.hrc:89
+#: dbaccess/inc/strings.hrc:88
msgctxt "STR_QUERY_AND_TABLE_DISTINCT_NAMES"
msgid "You cannot give a table and a query the same name. Please use a name which is not yet used by a query or table."
msgstr "Нельзя использовать одинаковые имена для таблиц и запросов. Используйте уникальные имена."
#. bT6Um
-#: dbaccess/inc/strings.hrc:90
+#: dbaccess/inc/strings.hrc:89
msgctxt "STR_BASENAME_TABLE"
msgid "Table"
msgstr "Таблица"
#. Qw69D
-#: dbaccess/inc/strings.hrc:91
+#: dbaccess/inc/strings.hrc:90
msgctxt "STR_BASENAME_QUERY"
msgid "Query"
msgstr "Запрос"
#. 7vX2A
-#: dbaccess/inc/strings.hrc:92
+#: dbaccess/inc/strings.hrc:91
msgctxt "STR_CONN_WITHOUT_QUERIES_OR_TABLES"
msgid "The given connection is no valid query and/or tables supplier."
msgstr "Данное подсоединение не предоставляет таблиц и/или запросов."
#. 7J5ZA
-#: dbaccess/inc/strings.hrc:93
+#: dbaccess/inc/strings.hrc:92
msgctxt "STR_NO_TABLE_OBJECT"
msgid "The given object is no table object."
msgstr "Указанный объект не является объектом таблица."
#. WboPA
-#: dbaccess/inc/strings.hrc:94
+#: dbaccess/inc/strings.hrc:93
msgctxt "STR_INVALID_COMPOSITION_TYPE"
msgid "Invalid composition type - need a value from com.sun.star.sdb.tools.CompositionType."
msgstr "Неправильный тип компоновки - необходимо значение com.sun.star.sdb.tools.CompositionType."
#. 2aCE8
-#: dbaccess/inc/strings.hrc:95
+#: dbaccess/inc/strings.hrc:94
msgctxt "STR_INVALID_COMMAND_TYPE"
msgid "Invalid command type - only TABLE and QUERY from com.sun.star.sdb.CommandType are allowed."
msgstr "Неправильный тип команды - разрешены только TABLE и QUERY из com.sun.star.sdb.CommandType."
-#. pZTG2
-#: dbaccess/inc/strings.hrc:97
-msgctxt "STR_STATE_CLOSE_SUB_DOCS"
-msgid "Prepare"
-msgstr "Подготовка"
-
-#. pFNR3
-#: dbaccess/inc/strings.hrc:98
-msgctxt "STR_STATE_BACKUP_DBDOC"
-msgid "Backup Document"
-msgstr "Резервное копирование документа"
-
-#. LDfr3
-#: dbaccess/inc/strings.hrc:99
-msgctxt "STR_STATE_MIGRATE"
-msgid "Migrate"
-msgstr "Перенос"
-
-#. tEttZ
-#: dbaccess/inc/strings.hrc:100
-msgctxt "STR_STATE_SUMMARY"
-msgid "Summary"
-msgstr "Сводка"
-
-#. aGU2B
-#. To translators: This refers to a form document inside a database document.
-#: dbaccess/inc/strings.hrc:102
-msgctxt "STR_FORM"
-msgid "Form '$name$'"
-msgstr "Форма «$name$»"
-
-#. DBmvF
-#. To translators: This refers to a report document inside a database document.
-#: dbaccess/inc/strings.hrc:104
-msgctxt "STR_REPORT"
-msgid "Report '$name$'"
-msgstr "Отчёт «$name$»"
-
-#. CoMty
-#: dbaccess/inc/strings.hrc:105
-msgctxt "STR_OVERALL_PROGRESS"
-msgid "document $current$ of $overall$"
-msgstr "документ $current$ из $overall$"
-
-#. Ttf95
-#: dbaccess/inc/strings.hrc:106
-msgctxt "STR_DATABASE_DOCUMENT"
-msgid "Database Document"
-msgstr "Документ базы данных"
-
-#. 87ADQ
-#: dbaccess/inc/strings.hrc:107
-msgctxt "STR_SAVED_COPY_TO"
-msgid "saved copy to $location$"
-msgstr "копия сохранена в $location$"
-
-#. BrPwb
-#: dbaccess/inc/strings.hrc:108
-msgctxt "STR_MOVED_LIBRARY"
-msgid "migrated $type$ library '$old$' to '$new$'"
-msgstr "библиотека $type$ «$old$» перенесена в «$new$»"
-
-#. C7CAR
-#: dbaccess/inc/strings.hrc:109
-msgctxt "STR_LIBRARY_TYPE_AND_NAME"
-msgid "$type$ library '$library$'"
-msgstr "$type$ библиотека «$library$»"
-
-#. E4RNh
-#: dbaccess/inc/strings.hrc:110
-msgctxt "STR_MIGRATING_LIBS"
-msgid "migrating libraries ..."
-msgstr "переносим библиотеки ..."
-
-#. h6umj
-#: dbaccess/inc/strings.hrc:111
-msgctxt "STR_OOO_BASIC"
-msgid "Basic"
-msgstr "Basic"
-
-#. pTV6D
-#: dbaccess/inc/strings.hrc:112
-msgctxt "STR_JAVA_SCRIPT"
-msgid "JavaScript"
-msgstr "JavaScript"
-
-#. X2qBp
-#: dbaccess/inc/strings.hrc:113
-msgctxt "STR_BEAN_SHELL"
-msgid "BeanShell"
-msgstr "BeanShell"
-
-#. FDBSE
-#: dbaccess/inc/strings.hrc:114
-msgctxt "STR_JAVA"
-msgid "Java"
-msgstr "Java"
-
-#. F4yo3
-#: dbaccess/inc/strings.hrc:115
-msgctxt "STR_PYTHON"
-msgid "Python"
-msgstr "Python"
-
-#. BwGMo
-#: dbaccess/inc/strings.hrc:116
-msgctxt "STR_DIALOG"
-msgid "dialog"
-msgstr "диалог"
-
-#. VXkqp
-#: dbaccess/inc/strings.hrc:117
-msgctxt "STR_ERRORS"
-msgid "Error(s)"
-msgstr "Ошибки"
-
-#. BVTZE
-#: dbaccess/inc/strings.hrc:118
-msgctxt "STR_WARNINGS"
-msgid "Warnings"
-msgstr "Предупреждения"
-
-#. wArT8
-#: dbaccess/inc/strings.hrc:119
-msgctxt "STR_EXCEPTION"
-msgid "caught exception:"
-msgstr "перехвачено исключение:"
-
-#. 3fagJ
-#: dbaccess/inc/strings.hrc:120
-msgctxt "STR_INVALID_BACKUP_LOCATION"
-msgid "You need to choose a backup location other than the document location itself."
-msgstr "Местонахождение резервной копии должно отличаться от места расположения документа."
-
-#. Zj8Ti
-#: dbaccess/inc/strings.hrc:121
-msgctxt "STR_INVALID_NUMBER_ARGS"
-msgid "Invalid number of initialization arguments. Expected 1."
-msgstr "Неправильное количество аргументов. Ожидается 1."
-
-#. N6oEB
-#: dbaccess/inc/strings.hrc:122
-msgctxt "STR_NO_DATABASE"
-msgid "No database document found in the initialization arguments."
-msgstr "Среди аргументов нет документа базы данных."
-
-#. SvACu
-#: dbaccess/inc/strings.hrc:123
-msgctxt "STR_NOT_READONLY"
-msgid "Not applicable to read-only documents."
-msgstr "Неприменимо к документу, доступному только для чтения."
-
#. j84AZ
-#: dbaccess/inc/strings.hrc:125
+#: dbaccess/inc/strings.hrc:96
msgctxt "STR_QUERY_UNDO_TABWINSHOW"
msgid "Add Table Window"
msgstr "Добавить окно таблицы"
#. DUDsr
-#: dbaccess/inc/strings.hrc:126
+#: dbaccess/inc/strings.hrc:97
msgctxt "STR_QUERY_UNDO_MOVETABWIN"
msgid "Move table window"
msgstr "Переместить окно таблицы"
#. BzDGJ
-#: dbaccess/inc/strings.hrc:127
+#: dbaccess/inc/strings.hrc:98
msgctxt "STR_QUERY_UNDO_INSERTCONNECTION"
msgid "Insert Join"
msgstr "Вставить связь"
#. isNxK
-#: dbaccess/inc/strings.hrc:128
+#: dbaccess/inc/strings.hrc:99
msgctxt "STR_QUERY_UNDO_REMOVECONNECTION"
msgid "Delete Join"
msgstr "Удалить связь"
#. 9Uu5p
-#: dbaccess/inc/strings.hrc:129
+#: dbaccess/inc/strings.hrc:100
msgctxt "STR_QUERY_UNDO_SIZETABWIN"
msgid "Resize table window"
msgstr "Изменить размер окна таблицы"
#. 3qaWu
-#: dbaccess/inc/strings.hrc:130
+#: dbaccess/inc/strings.hrc:101
msgctxt "STR_QUERY_UNDO_TABFIELDDELETE"
msgid "Delete Column"
msgstr "Удалить столбец"
#. srRyA
-#: dbaccess/inc/strings.hrc:131
+#: dbaccess/inc/strings.hrc:102
msgctxt "STR_QUERY_UNDO_TABFIELDMOVED"
msgid "Move column"
msgstr "Переместить столбец"
#. BdYiZ
-#: dbaccess/inc/strings.hrc:132
+#: dbaccess/inc/strings.hrc:103
msgctxt "STR_QUERY_UNDO_TABFIELDCREATE"
msgid "Add Column"
msgstr "Добавить столбец"
#. r5myi
-#: dbaccess/inc/strings.hrc:133
+#: dbaccess/inc/strings.hrc:104
msgctxt "RID_STR_FIELD_DOESNT_EXIST"
msgid "Invalid expression, field name '$name$' does not exist."
msgstr "Неправильное выражение. Поле «$name$» не существует"
#. WiCaf
-#: dbaccess/inc/strings.hrc:134
+#: dbaccess/inc/strings.hrc:105
msgctxt "STR_QUERY_UNDO_TABWINDELETE"
msgid "Delete Table Window"
msgstr "Удалить окно таблицы"
#. 4677G
-#: dbaccess/inc/strings.hrc:135
+#: dbaccess/inc/strings.hrc:106
msgctxt "STR_QUERY_UNDO_MODIFY_CELL"
msgid "Edit Column Description"
msgstr "Изменить описание столбца"
#. 79APm
-#: dbaccess/inc/strings.hrc:136
+#: dbaccess/inc/strings.hrc:107
msgctxt "STR_QUERY_UNDO_SIZE_COLUMN"
msgid "Adjust column width"
msgstr "Изменить ширину столбца"
#. BGEE7
-#: dbaccess/inc/strings.hrc:137
+#: dbaccess/inc/strings.hrc:108
msgctxt "STR_QUERY_SORTTEXT"
msgid "(not sorted);ascending;descending"
msgstr "(без сортировки);по возрастанию;по убыванию"
#. NEDpJ
-#: dbaccess/inc/strings.hrc:138
+#: dbaccess/inc/strings.hrc:109
msgctxt "STR_QUERY_FUNCTIONS"
msgid "(no function);Group"
msgstr "(без функции);Average;Count;Maximum;Minimum;Sum;Group"
#. rLdqC
-#: dbaccess/inc/strings.hrc:139
+#: dbaccess/inc/strings.hrc:110
msgctxt "STR_QUERY_NOTABLE"
msgid "(no table)"
msgstr "(без таблицы)"
#. PZ5mq
-#: dbaccess/inc/strings.hrc:140
+#: dbaccess/inc/strings.hrc:111
msgctxt "STR_QRY_ORDERBY_UNRELATED"
msgid "The database only supports sorting for visible fields."
msgstr "База данных поддерживает сортировку только видимых полей."
#. 9w7Ce
-#: dbaccess/inc/strings.hrc:141
+#: dbaccess/inc/strings.hrc:112
msgctxt "STR_QUERY_HANDLETEXT"
msgid "Field;Alias;Table;Sort;Visible;Function;Criterion;Or;Or"
msgstr "Поле;Псевдоним;Таблица;Сортировка;Видимый;Функция;Критерий;Или;Или"
#. qPqvZ
-#: dbaccess/inc/strings.hrc:142
+#: dbaccess/inc/strings.hrc:113
msgctxt "STR_QUERY_LIMIT_ALL"
msgid "All"
msgstr "Все"
#. Zz34h
-#: dbaccess/inc/strings.hrc:143
+#: dbaccess/inc/strings.hrc:114
msgctxt "STR_QRY_TOO_MANY_COLUMNS"
msgid "There are too many columns."
msgstr "Слишком много колонок."
#. hY4NU
-#: dbaccess/inc/strings.hrc:144
+#: dbaccess/inc/strings.hrc:115
msgctxt "STR_QRY_CRITERIA_ON_ASTERISK"
msgid "A condition cannot be applied to field [*]"
msgstr "Невозможно применить данные условия к полю [*]"
#. ygnPh
-#: dbaccess/inc/strings.hrc:145
+#: dbaccess/inc/strings.hrc:116
msgctxt "STR_QRY_TOO_LONG_STATEMENT"
msgid "The SQL statement created is too long."
msgstr "Созданное выражение SQL является слишком длинным."
#. EumQ9
-#: dbaccess/inc/strings.hrc:146
+#: dbaccess/inc/strings.hrc:117
msgctxt "STR_QRY_TOOCOMPLEX"
msgid "Query is too complex"
msgstr "Слишком сложный запрос"
#. Ht5Xf
-#: dbaccess/inc/strings.hrc:147
+#: dbaccess/inc/strings.hrc:118
msgctxt "STR_QRY_NOSELECT"
msgid "Nothing has been selected."
msgstr "Ничего не выделено."
#. oUXZD
-#: dbaccess/inc/strings.hrc:148
+#: dbaccess/inc/strings.hrc:119
msgctxt "STR_QRY_SYNTAX"
msgid "SQL syntax error"
msgstr "Ошибка в синтаксисе SQL"
#. D5qmZ
-#: dbaccess/inc/strings.hrc:149
+#: dbaccess/inc/strings.hrc:120
msgctxt "STR_QRY_ORDERBY_ON_ASTERISK"
msgid "[*] cannot be used as a sort criterion."
msgstr "Невозможно использовать [*] в качестве критерия."
#. E4YC3
-#: dbaccess/inc/strings.hrc:150
+#: dbaccess/inc/strings.hrc:121
msgctxt "STR_QRY_TOO_MANY_TABLES"
msgid "There are too many tables."
msgstr "Слишком много таблиц."
#. fnEYE
-#: dbaccess/inc/strings.hrc:151
+#: dbaccess/inc/strings.hrc:122
msgctxt "STR_QRY_NATIVE"
msgid "The statement will not be applied when querying in the SQL dialect of the database."
msgstr "При запросе в диалекте SQL базы данных инструкция применена не будет."
#. iEVz7
-#: dbaccess/inc/strings.hrc:152
+#: dbaccess/inc/strings.hrc:123
msgctxt "STR_QRY_ILLEGAL_JOIN"
msgid "Join could not be processed"
msgstr "Осуществить связь не удаётся"
#. 3EkzD
-#: dbaccess/inc/strings.hrc:153
+#: dbaccess/inc/strings.hrc:124
msgctxt "STR_SVT_SQL_SYNTAX_ERROR"
msgid "Syntax error in SQL statement"
msgstr "Синтаксическая ошибка в выражении SQL"
#. 4umu8
-#: dbaccess/inc/strings.hrc:154
+#: dbaccess/inc/strings.hrc:125
msgctxt "STR_QUERYDESIGN_NO_VIEW_SUPPORT"
msgid "This database does not support table views."
msgstr "База данных не поддерживает представлений в виде таблиц."
#. wsWmH
-#: dbaccess/inc/strings.hrc:155
+#: dbaccess/inc/strings.hrc:126
msgctxt "STR_NO_ALTER_VIEW_SUPPORT"
msgid "This database does not support altering of existing table views."
msgstr "Данная база данных не поддерживает изменение структуры существующих представлений таблиц."
#. DersC
-#: dbaccess/inc/strings.hrc:156
+#: dbaccess/inc/strings.hrc:127
msgctxt "STR_QUERYDESIGN_NO_VIEW_ASK"
msgid "Do you want to create a query instead?"
msgstr "Создать запрос вместо этого?"
#. LWaN7
-#: dbaccess/inc/strings.hrc:157
+#: dbaccess/inc/strings.hrc:128
msgctxt "STR_DATASOURCE_DELETED"
msgid "The corresponding data source has been deleted. Therefore, data relevant to that data source cannot be saved."
msgstr "Соответствующие источники данных удалены. Невозможно сохранить относящиеся к ним данные."
#. r9TeF
-#: dbaccess/inc/strings.hrc:158
+#: dbaccess/inc/strings.hrc:129
msgctxt "STR_QRY_COLUMN_NOT_FOUND"
msgid "The column '$name$' is unknown."
msgstr "Столбец «$name$» не найден."
#. FzLYr
-#: dbaccess/inc/strings.hrc:159
+#: dbaccess/inc/strings.hrc:130
msgctxt "STR_QRY_JOIN_COLUMN_COMPARE"
msgid "Columns can only be compared using '='."
msgstr "Столбцы могут быть сравнены только при помощи «=»."
#. Pzh6C
-#: dbaccess/inc/strings.hrc:160
+#: dbaccess/inc/strings.hrc:131
msgctxt "STR_QRY_LIKE_LEFT_NO_COLUMN"
msgid "You must use a column name before 'LIKE'."
msgstr "Перед «LIKE» обязательно должно быть использовано имя столбца."
#. bwj8B
-#: dbaccess/inc/strings.hrc:161
+#: dbaccess/inc/strings.hrc:132
msgctxt "STR_QRY_CHECK_CASESENSITIVE"
msgid "The column could not be found. Please note that the database is case-sensitive."
msgstr "Столбец не найден. Возможно данная база данных различает названия в прописных и строчных буквах."
#. 8fSWD
#. To translators: for $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource will be inserted.
-#: dbaccess/inc/strings.hrc:163
+#: dbaccess/inc/strings.hrc:134
msgctxt "STR_QUERY_SAVEMODIFIED"
msgid ""
"$object$ has been changed.\n"
@@ -860,278 +708,278 @@ msgstr ""
#. rLMEX
#. To translators: for $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
-#: dbaccess/inc/strings.hrc:165
+#: dbaccess/inc/strings.hrc:136
msgctxt "STR_ERROR_PARSING_STATEMENT"
msgid "$object$ is based on an SQL command which could not be parsed."
msgstr "Объект $object$ содержит инструкции SQL, которые невозможно распознать."
#. 6cpa3
#. To translators: for $object$, one of the values of the RSC_QUERY_OBJECT_TYPE resource (except \"SQL command\", which doesn't make sense here) will be inserted.
-#: dbaccess/inc/strings.hrc:167
+#: dbaccess/inc/strings.hrc:138
msgctxt "STR_INFO_OPENING_IN_SQL_VIEW"
msgid "$object$ will be opened in SQL view."
msgstr "Объект $object$ будет открыт в режиме SQL."
#. pH2Jv
-#: dbaccess/inc/strings.hrc:168
+#: dbaccess/inc/strings.hrc:139
msgctxt "STR_STATEMENT_WITHOUT_RESULT_SET"
msgid "The query does not create a result set, and thus cannot be part of another query."
msgstr "Запрос не возвращает данных, поэтому не может быть использован как часть другого запроса."
#. HErUD
-#: dbaccess/inc/strings.hrc:170
+#: dbaccess/inc/strings.hrc:141
msgctxt "RID_STR_COLUMN_FORMAT"
msgid "Column ~Format..."
msgstr "Формат столбца..."
#. pSid2
-#: dbaccess/inc/strings.hrc:171
+#: dbaccess/inc/strings.hrc:142
msgctxt "RID_STR_COLUMN_WIDTH"
msgid "Column ~Width..."
msgstr "Ширина столбца..."
#. mczq6
-#: dbaccess/inc/strings.hrc:172
+#: dbaccess/inc/strings.hrc:143
msgctxt "RID_STR_TABLE_FORMAT"
msgid "Table Format..."
msgstr "Формат таблицы..."
#. Giaeq
-#: dbaccess/inc/strings.hrc:173
+#: dbaccess/inc/strings.hrc:144
msgctxt "RID_STR_ROW_HEIGHT"
msgid "Row Height..."
msgstr "Высота строки..."
#. F8EEk
-#: dbaccess/inc/strings.hrc:174
+#: dbaccess/inc/strings.hrc:145
msgctxt "RID_STR_COPY"
msgid "~Copy"
msgstr "Копировать"
#. hAGj6
-#: dbaccess/inc/strings.hrc:175
+#: dbaccess/inc/strings.hrc:146
msgctxt "RID_STR_UNDO_MODIFY_RECORD"
msgid "Undo: Data Input"
msgstr "Отменить: ввод данных"
#. NeA2w
-#: dbaccess/inc/strings.hrc:176
+#: dbaccess/inc/strings.hrc:147
msgctxt "RID_STR_SAVE_CURRENT_RECORD"
msgid "Save current record"
msgstr "Сохранить текущую запись"
#. tV569
-#: dbaccess/inc/strings.hrc:177
+#: dbaccess/inc/strings.hrc:148
msgctxt "STR_QRY_TITLE"
msgid "Query #"
msgstr "Запрос #"
#. FBqHA
-#: dbaccess/inc/strings.hrc:178
+#: dbaccess/inc/strings.hrc:149
msgctxt "STR_TBL_TITLE"
msgid "Table #"
msgstr "Таблица #"
#. cCYzs
-#: dbaccess/inc/strings.hrc:179
+#: dbaccess/inc/strings.hrc:150
msgctxt "STR_VIEW_TITLE"
msgid "View #"
msgstr "Представление #"
#. 8yp2G
-#: dbaccess/inc/strings.hrc:180
+#: dbaccess/inc/strings.hrc:151
msgctxt "STR_NAME_ALREADY_EXISTS"
msgid "The name \"#\" already exists."
msgstr "Имя «#» уже существует."
#. EmTa7
-#: dbaccess/inc/strings.hrc:181
+#: dbaccess/inc/strings.hrc:152
msgctxt "STR_NO_COLUMNNAME_MATCHING"
msgid "No matching column names were found."
msgstr "Не найдено соответствующих имён столбцов."
#. 4EFDH
-#: dbaccess/inc/strings.hrc:182
+#: dbaccess/inc/strings.hrc:153
msgctxt "STR_ERROR_OCCURRED_WHILE_COPYING"
msgid "An error occurred. Do you want to continue copying?"
msgstr "Ошибка. Продолжить копирование?"
#. xnbDP
-#: dbaccess/inc/strings.hrc:183
+#: dbaccess/inc/strings.hrc:154
msgctxt "STR_DATASOURCE_GRIDCONTROL_NAME"
msgid "Data source table view"
msgstr "Просмотр таблицы источника данных."
#. r58gb
-#: dbaccess/inc/strings.hrc:184
+#: dbaccess/inc/strings.hrc:155
msgctxt "STR_DATASOURCE_GRIDCONTROL_DESC"
msgid "Shows the selected table or query."
msgstr "Показать выделенные таблицы или запросы."
#. a8LWj
-#: dbaccess/inc/strings.hrc:186
+#: dbaccess/inc/strings.hrc:157
msgctxt "STR_QUERY_UNDO_MODIFYSQLEDIT"
msgid "Modify SQL statement(s)"
msgstr "Изменить инструкции SQL"
#. U3N6g
-#: dbaccess/inc/strings.hrc:188
+#: dbaccess/inc/strings.hrc:159
msgctxt "RID_STR_NEW_FORM"
msgid "Create Form in Design View..."
msgstr "Создать форму в режиме дизайна..."
#. vLzx4
-#: dbaccess/inc/strings.hrc:189
+#: dbaccess/inc/strings.hrc:160
msgctxt "RID_STR_NEW_FORM_AUTO"
msgid "Use Wizard to Create Form..."
msgstr "Использовать мастер для создания формы..."
#. ZRnDp
-#: dbaccess/inc/strings.hrc:190
+#: dbaccess/inc/strings.hrc:161
msgctxt "RID_STR_NEW_REPORT_AUTO"
msgid "Use Wizard to Create Report..."
msgstr "Использовать мастер для создания отчёта..."
#. aSmAa
-#: dbaccess/inc/strings.hrc:191
+#: dbaccess/inc/strings.hrc:162
msgctxt "RID_STR_NEW_REPORT"
msgid "Create Report in Design View..."
msgstr "Создать отчёт в режиме дизайна..."
#. mGsho
-#: dbaccess/inc/strings.hrc:192
+#: dbaccess/inc/strings.hrc:163
msgctxt "RID_STR_NEW_QUERY"
msgid "Create Query in Design View..."
msgstr "Создать запрос в режиме дизайна..."
#. sfADq
-#: dbaccess/inc/strings.hrc:193
+#: dbaccess/inc/strings.hrc:164
msgctxt "RID_STR_NEW_QUERY_SQL"
msgid "Create Query in SQL View..."
msgstr "Создать запрос в режиме SQL..."
#. 57XvA
-#: dbaccess/inc/strings.hrc:194
+#: dbaccess/inc/strings.hrc:165
msgctxt "RID_STR_NEW_QUERY_AUTO"
msgid "Use Wizard to Create Query..."
msgstr "Использовать мастер для создания запроса..."
#. wzNZ2
-#: dbaccess/inc/strings.hrc:195
+#: dbaccess/inc/strings.hrc:166
msgctxt "RID_STR_NEW_TABLE"
msgid "Create Table in Design View..."
msgstr "Создать таблицу в режиме дизайна..."
#. SZdVd
-#: dbaccess/inc/strings.hrc:196
+#: dbaccess/inc/strings.hrc:167
msgctxt "RID_STR_NEW_TABLE_AUTO"
msgid "Use Wizard to Create Table..."
msgstr "Использовать мастер для создания таблицы..."
#. Xdxfp
-#: dbaccess/inc/strings.hrc:197
+#: dbaccess/inc/strings.hrc:168
msgctxt "RID_STR_NEW_VIEW"
msgid "Create View..."
msgstr "Создать представление..."
#. uinhG
-#: dbaccess/inc/strings.hrc:198
+#: dbaccess/inc/strings.hrc:169
msgctxt "RID_STR_FORMS_CONTAINER"
msgid "Forms"
msgstr "Формы"
#. EhPGD
-#: dbaccess/inc/strings.hrc:199
+#: dbaccess/inc/strings.hrc:170
msgctxt "RID_STR_REPORTS_CONTAINER"
msgid "Reports"
msgstr "Отчёты"
#. DFmZD
-#: dbaccess/inc/strings.hrc:200
+#: dbaccess/inc/strings.hrc:171
msgctxt "RID_STR_REPORTS_HELP_TEXT_WIZARD"
msgid "The wizard will guide you through the steps necessary to create a report."
msgstr "Мастер проведёт вас через шаги, необходимые для создания отчёта."
#. e4rD6
-#: dbaccess/inc/strings.hrc:201
+#: dbaccess/inc/strings.hrc:172
msgctxt "RID_STR_FORMS_HELP_TEXT"
msgid "Create a form by specifying the record source, controls, and control properties."
msgstr "Создать форму, указав источник данных, элементы управления и их свойства."
#. WMRFD
-#: dbaccess/inc/strings.hrc:202
+#: dbaccess/inc/strings.hrc:173
msgctxt "RID_STR_REPORT_HELP_TEXT"
msgid "Create a report by specifying the record source, controls, and control properties."
msgstr "Создать отчёт, указав источник данных, элементы управления и их свойства."
#. mJ9jD
-#: dbaccess/inc/strings.hrc:203
+#: dbaccess/inc/strings.hrc:174
msgctxt "RID_STR_FORMS_HELP_TEXT_WIZARD"
msgid "The wizard will guide you through the steps necessary to create a form."
msgstr "Мастер проведёт вас через шаги, необходимые для создания формы."
#. c6NPF
-#: dbaccess/inc/strings.hrc:204
+#: dbaccess/inc/strings.hrc:175
msgctxt "RID_STR_QUERIES_HELP_TEXT"
msgid "Create a query by specifying the filters, input tables, field names, and properties for sorting or grouping."
msgstr "Создать запрос, задав фильтры, исходные таблицы, имена полей и параметры сортировки и группировки."
#. Gk7RQ
-#: dbaccess/inc/strings.hrc:205
+#: dbaccess/inc/strings.hrc:176
msgctxt "RID_STR_QUERIES_HELP_TEXT_SQL"
msgid "Create a query by entering an SQL statement directly."
msgstr "Создать запрос, введя инструкции SQL напрямую."
#. EUCKU
-#: dbaccess/inc/strings.hrc:206
+#: dbaccess/inc/strings.hrc:177
msgctxt "RID_STR_QUERIES_HELP_TEXT_WIZARD"
msgid "The wizard will guide you through the steps necessary to create a query."
msgstr "Этот мастер поможет вам создать запрос."
#. hFmde
-#: dbaccess/inc/strings.hrc:207
+#: dbaccess/inc/strings.hrc:178
msgctxt "RID_STR_TABLES_HELP_TEXT_DESIGN"
msgid "Create a table by specifying the field names and properties, as well as the data types."
msgstr "Создать таблицу, задав имена полей и их свойства, а также типы данных."
#. ctDmY
-#: dbaccess/inc/strings.hrc:208
+#: dbaccess/inc/strings.hrc:179
msgctxt "RID_STR_TABLES_HELP_TEXT_WIZARD"
msgid "Choose from a selection of business and personal table samples, which you customize to create a table."
msgstr "Коллекция шаблонов таблиц, которые можно настроить под свои нужды."
#. GmBmQ
-#: dbaccess/inc/strings.hrc:209
+#: dbaccess/inc/strings.hrc:180
msgctxt "RID_STR_VIEWS_HELP_TEXT_DESIGN"
msgid "Create a view by specifying the tables and field names you would like to have visible."
msgstr "Создать представление, выбрав таблицы и названия полей, которые должны быть видны."
#. 5ADJN
-#: dbaccess/inc/strings.hrc:210
+#: dbaccess/inc/strings.hrc:181
msgctxt "STR_DATABASE"
msgid "Database"
msgstr "База данных"
#. D2GFx
-#: dbaccess/inc/strings.hrc:211
+#: dbaccess/inc/strings.hrc:182
msgctxt "STR_TASKS"
msgid "Tasks"
msgstr "Задачи"
#. t46y2
-#: dbaccess/inc/strings.hrc:212
+#: dbaccess/inc/strings.hrc:183
msgctxt "STR_DESCRIPTION"
msgid "Description"
msgstr "Описание"
#. i4BHJ
-#: dbaccess/inc/strings.hrc:213
+#: dbaccess/inc/strings.hrc:184
msgctxt "STR_PREVIEW"
msgid "Preview"
msgstr "Предварительный просмотр"
#. MpYZa
-#: dbaccess/inc/strings.hrc:214
+#: dbaccess/inc/strings.hrc:185
msgctxt "STR_QUERY_CLOSEDOCUMENTS"
msgid ""
"The connection type has been altered.\n"
@@ -1145,31 +993,31 @@ msgstr ""
"Хотите закрыть все документы сейчас?"
#. 5Ujux
-#: dbaccess/inc/strings.hrc:217
+#: dbaccess/inc/strings.hrc:188
msgctxt "STR_FRM_LABEL"
msgid "F~orm name"
msgstr "Имя ~формы"
#. zA6vD
-#: dbaccess/inc/strings.hrc:218
+#: dbaccess/inc/strings.hrc:189
msgctxt "STR_RPT_LABEL"
msgid "~Report name"
msgstr "Имя ~отчёта"
#. 8RUit
-#: dbaccess/inc/strings.hrc:219
+#: dbaccess/inc/strings.hrc:190
msgctxt "STR_FOLDER_LABEL"
msgid "F~older name"
msgstr "Имя п~апки"
#. Twota
-#: dbaccess/inc/strings.hrc:220
+#: dbaccess/inc/strings.hrc:191
msgctxt "STR_SUB_DOCS_WITH_SCRIPTS"
msgid "The document contains forms or reports with embedded macros."
msgstr "Документ содержит формы/отчёты с внедрёнными макросами."
#. v33uG
-#: dbaccess/inc/strings.hrc:221
+#: dbaccess/inc/strings.hrc:192
msgctxt "STR_SUB_DOCS_WITH_SCRIPTS_DETAIL"
msgid ""
"Macros should be embedded into the database document itself.\n"
@@ -1185,260 +1033,260 @@ msgstr ""
"Следует отметить, что до выполнения этого переноса внедрить макросы или сценарии в документ базы данных будет невозможно. "
#. SBEJP
-#: dbaccess/inc/strings.hrc:226
+#: dbaccess/inc/strings.hrc:197
msgctxt "RID_STR_EMBEDDED_DATABASE"
msgid "Embedded database"
msgstr "Встроенная база данных"
#. 9GfaL
-#: dbaccess/inc/strings.hrc:227
+#: dbaccess/inc/strings.hrc:198
msgctxt "RID_STR_NO_DIFF_CAT"
msgid "You cannot select different categories."
msgstr "Вы не можете выбрать другие категории."
#. HMRSN
-#: dbaccess/inc/strings.hrc:228
+#: dbaccess/inc/strings.hrc:199
msgctxt "RID_STR_UNSUPPORTED_OBJECT_TYPE"
msgid "Unsupported object type found ($type$)."
msgstr "Найден неподдерживаемый тип файла: ($type$)."
#. YgB34
-#: dbaccess/inc/strings.hrc:229
+#: dbaccess/inc/strings.hrc:200
msgctxt "STR_PAGETITLE_GENERAL"
msgid "Advanced Properties"
msgstr "Дополнительные свойства"
#. wFDHD
-#: dbaccess/inc/strings.hrc:230
+#: dbaccess/inc/strings.hrc:201
msgctxt "STR_PAGETITLE_ADVANCED"
msgid "Additional Settings"
msgstr "Дополнительные настройки"
#. HYDjE
-#: dbaccess/inc/strings.hrc:231
+#: dbaccess/inc/strings.hrc:202
msgctxt "STR_PAGETITLE_CONNECTION"
msgid "Connection settings"
msgstr "Настройки подключения"
#. KLRak
-#: dbaccess/inc/strings.hrc:232
+#: dbaccess/inc/strings.hrc:203
msgctxt "STR_TBL_LABEL"
msgid "~Table Name"
msgstr "Имя таблицы"
#. WPmUe
-#: dbaccess/inc/strings.hrc:233
+#: dbaccess/inc/strings.hrc:204
msgctxt "STR_QRY_LABEL"
msgid "~Query name"
msgstr "Имя запроса"
#. cGPht
-#: dbaccess/inc/strings.hrc:234
+#: dbaccess/inc/strings.hrc:205
msgctxt "STR_TITLE_RENAME"
msgid "Rename to"
msgstr "Переименовать в"
#. GQDBD
-#: dbaccess/inc/strings.hrc:235
+#: dbaccess/inc/strings.hrc:206
msgctxt "STR_TITLE_PASTE_AS"
msgid "Insert as"
msgstr "Вставить как"
#. yGyEU
-#: dbaccess/inc/strings.hrc:237
+#: dbaccess/inc/strings.hrc:208
msgctxt "STR_QUERY_BRW_DELETE_ROWS"
msgid "Do you want to delete the selected data?"
msgstr "Удалить выбранные данные?"
#. AMTEz
-#: dbaccess/inc/strings.hrc:238
+#: dbaccess/inc/strings.hrc:209
msgctxt "SBA_BROWSER_SETTING_ORDER"
msgid "Error setting the sort criteria"
msgstr "Ошибка установки условий сортировки"
#. kXqdF
-#: dbaccess/inc/strings.hrc:239
+#: dbaccess/inc/strings.hrc:210
msgctxt "SBA_BROWSER_SETTING_FILTER"
msgid "Error setting the filter criteria"
msgstr "Ошибка установки условий фильтра"
#. tXz3U
-#: dbaccess/inc/strings.hrc:240
+#: dbaccess/inc/strings.hrc:211
msgctxt "RID_STR_CONNECTION_LOST"
msgid "Connection lost"
msgstr "Соединение потеряно"
#. 5ELXe
-#: dbaccess/inc/strings.hrc:241
+#: dbaccess/inc/strings.hrc:212
msgctxt "RID_STR_QUERIES_CONTAINER"
msgid "Queries"
msgstr "Запросы"
#. wdm7E
-#: dbaccess/inc/strings.hrc:242
+#: dbaccess/inc/strings.hrc:213
msgctxt "RID_STR_TABLES_CONTAINER"
msgid "Tables"
msgstr "Таблицы"
#. BTcMU
-#: dbaccess/inc/strings.hrc:243
+#: dbaccess/inc/strings.hrc:214
msgctxt "STR_TITLE_CONFIRM_DELETION"
msgid "Confirm Deletion"
msgstr "Подтвердить удаление"
#. pbjZT
-#: dbaccess/inc/strings.hrc:244
+#: dbaccess/inc/strings.hrc:215
msgctxt "STR_QUERY_DELETE_TABLE"
msgid "Do you want to delete the table '%1'?"
msgstr "Удалить таблицу «%1»?"
#. CLELW
-#: dbaccess/inc/strings.hrc:245
+#: dbaccess/inc/strings.hrc:216
msgctxt "STR_QUERY_CONNECTION_LOST"
msgid "The connection to the database has been lost. Do you want to reconnect?"
msgstr "Соединение с базой данных потеряно. Восстановить?"
#. NRXrT
-#: dbaccess/inc/strings.hrc:246
+#: dbaccess/inc/strings.hrc:217
msgctxt "STR_OPENTABLES_WARNINGS"
msgid "Warnings encountered"
msgstr "Предупреждения"
#. EXau9
-#: dbaccess/inc/strings.hrc:247
+#: dbaccess/inc/strings.hrc:218
msgctxt "STR_OPENTABLES_WARNINGS_DETAILS"
msgid "While retrieving the tables, warnings were reported by the database connection."
msgstr "Во время получения таблиц из соединения базы данных выдавались предупреждения."
#. HtRDf
-#: dbaccess/inc/strings.hrc:248
+#: dbaccess/inc/strings.hrc:219
msgctxt "STR_CONNECTING_DATASOURCE"
msgid "Connecting to \"$name$\" ..."
msgstr "Соединение с «$name$» ..."
#. QNCRB
-#: dbaccess/inc/strings.hrc:249
+#: dbaccess/inc/strings.hrc:220
msgctxt "STR_LOADING_QUERY"
msgid "Loading query $name$ ..."
msgstr "Загрузка запроса $name$ ..."
#. QfTUB
-#: dbaccess/inc/strings.hrc:250
+#: dbaccess/inc/strings.hrc:221
msgctxt "STR_LOADING_TABLE"
msgid "Loading table $name$ ..."
msgstr "Загрузка таблицы $name$ ..."
#. FECQm
-#: dbaccess/inc/strings.hrc:251
+#: dbaccess/inc/strings.hrc:222
msgctxt "STR_NO_TABLE_FORMAT_INSIDE"
msgid "No table format could be found."
msgstr "Невозможно найти формат таблицы."
#. 6isKD
-#: dbaccess/inc/strings.hrc:252
+#: dbaccess/inc/strings.hrc:223
msgctxt "STR_COULDNOTCONNECT_DATASOURCE"
msgid "The connection to the data source \"$name$\" could not be established."
msgstr "Невозможно установить соединение с источником данных «$name$»."
#. CmzsA
-#: dbaccess/inc/strings.hrc:254
+#: dbaccess/inc/strings.hrc:225
msgctxt "STR_TABLEDESIGN_DBFIELDTYPES"
msgid "Unknown;Text;Number;Date/Time;Date;Time;Yes/No;Currency;Memo;Counter;Image;Text (fix);Decimal;Binary (fix);Binary;BigInt;Double;Float;Real;Integer;Small Integer;Tiny Integer;SQL Null;Object;Distinct;Structure;Field;BLOB;CLOB;REF;OTHER;Bit (fix)"
msgstr "Неизвестно;Текст;Число;Дата/Время;Дата;Время;Логическое;Валюта;Памятка;Счётчик;Картинка;Текст (фикс.);Десятичное;Двоичное (фикс.);Двоичное;Длинное целое;С двойной точностью;С плавающей точкой;Вещественное;Целое;Короткое целое;Байт;SQL NULL;Объект;Distinct;Структура;Поле;BLOB;CLOB;REF;ПРОЧЕЕ;Бит (фикс.)"
#. hhXGF
-#: dbaccess/inc/strings.hrc:255
+#: dbaccess/inc/strings.hrc:226
msgctxt "STR_TABLEDESIGN_UNDO_PRIMKEY"
msgid "Insert/remove primary key"
msgstr "Вставить/удалить первичный ключ"
#. 26uKH
-#: dbaccess/inc/strings.hrc:256
+#: dbaccess/inc/strings.hrc:227
msgctxt "STR_VALUE_YES"
msgid "Yes"
msgstr "Да"
#. vqVF5
-#: dbaccess/inc/strings.hrc:257
+#: dbaccess/inc/strings.hrc:228
msgctxt "STR_VALUE_NO"
msgid "No"
msgstr "Нет"
#. TDokm
#. Note: should somehow fit to the word "value" in other languages as well: value - none...
-#: dbaccess/inc/strings.hrc:259
+#: dbaccess/inc/strings.hrc:230
msgctxt "STR_VALUE_NONE"
msgid "<none>"
msgstr "<нет>"
#. 66g23
-#: dbaccess/inc/strings.hrc:260
+#: dbaccess/inc/strings.hrc:231
msgctxt "STR_TAB_FIELD_COLUMN_NAME"
msgid "Field Name"
msgstr "Имя поля"
#. F6UGZ
-#: dbaccess/inc/strings.hrc:261
+#: dbaccess/inc/strings.hrc:232
msgctxt "STR_TAB_FIELD_COLUMN_DATATYPE"
msgid "Field Type"
msgstr "Тип поля"
#. LFBuq
-#: dbaccess/inc/strings.hrc:262
+#: dbaccess/inc/strings.hrc:233
msgctxt "STR_TAB_HELP_TEXT"
msgid "Description"
msgstr "Описание"
#. BYE5G
-#: dbaccess/inc/strings.hrc:263
+#: dbaccess/inc/strings.hrc:234
msgctxt "STR_COLUMN_DESCRIPTION"
msgid "Column Description"
msgstr "Описание столбца"
#. Aney5
-#: dbaccess/inc/strings.hrc:264
+#: dbaccess/inc/strings.hrc:235
msgctxt "STR_TAB_PROPERTIES"
msgid "Field Properties"
msgstr "Свойства поля"
#. kjdpF
-#: dbaccess/inc/strings.hrc:265
+#: dbaccess/inc/strings.hrc:236
msgctxt "STR_TABED_UNDO_CELLMODIFIED"
msgid "Modify cell"
msgstr "Изменить ячейку"
#. aPzA3
-#: dbaccess/inc/strings.hrc:266
+#: dbaccess/inc/strings.hrc:237
msgctxt "STR_TABED_UNDO_ROWDELETED"
msgid "Delete row"
msgstr "Удалить строку"
#. DFnqv
-#: dbaccess/inc/strings.hrc:267
+#: dbaccess/inc/strings.hrc:238
msgctxt "STR_TABED_UNDO_TYPE_CHANGED"
msgid "Modify field type"
msgstr "Изменить тип поля"
#. XLRpC
-#: dbaccess/inc/strings.hrc:268
+#: dbaccess/inc/strings.hrc:239
msgctxt "STR_TABED_UNDO_ROWINSERTED"
msgid "Insert row"
msgstr "Вставить строку"
#. LgbwQ
-#: dbaccess/inc/strings.hrc:269
+#: dbaccess/inc/strings.hrc:240
msgctxt "STR_TABED_UNDO_NEWROWINSERTED"
msgid "Insert new row"
msgstr "Вставить новую строку"
#. gi8TU
-#: dbaccess/inc/strings.hrc:270
+#: dbaccess/inc/strings.hrc:241
msgctxt "STR_DEFAULT_VALUE"
msgid "~Default value"
msgstr "Значение по умолчанию"
#. 3AyBV
-#: dbaccess/inc/strings.hrc:271
+#: dbaccess/inc/strings.hrc:242
msgctxt "STR_HELP_BOOL_DEFAULT"
msgid ""
"Select a value that is to appear in all new records as default.\n"
@@ -1448,7 +1296,7 @@ msgstr ""
"Выберите пустую строку, если поле не будет содержать такого значения."
#. AbZU4
-#: dbaccess/inc/strings.hrc:272
+#: dbaccess/inc/strings.hrc:243
msgctxt "STR_HELP_DEFAULT_VALUE"
msgid ""
"Enter a default value for this field.\n"
@@ -1459,26 +1307,20 @@ msgstr ""
"\n"
"При вводе данных в таблицу это значение будет использоваться в каждой новой записи. Значение по умолчанию должно соответствовать формату ячеек, указываемому ниже."
-#. Pay8s
-#: dbaccess/inc/strings.hrc:273
-msgctxt "STR_HELP_FIELD_REQUIRED"
-msgid "Activate this option if this field cannot contain NULL values, i.e. the user must always enter data."
-msgstr "Выберите «Да», если значение этого поля не должно быть равно NULL (это означает, что в поле обязательно должны быть введены данные)."
-
#. hwwVA
-#: dbaccess/inc/strings.hrc:274
+#: dbaccess/inc/strings.hrc:244
msgctxt "STR_HELP_TEXT_LENGTH"
msgid "Enter the maximum text length permitted."
msgstr "Введите максимальную разрешённую длину текста."
#. yPnZq
-#: dbaccess/inc/strings.hrc:275
+#: dbaccess/inc/strings.hrc:245
msgctxt "STR_HELP_NUMERIC_TYPE"
msgid "Enter the number format."
msgstr "Задайте формат числа."
#. 2yCJu
-#: dbaccess/inc/strings.hrc:276
+#: dbaccess/inc/strings.hrc:246
msgctxt "STR_HELP_LENGTH"
msgid ""
"Determine the length data can have in this field.\n"
@@ -1492,25 +1334,25 @@ msgstr ""
"Если заданное значение будет длиннее максимально допустимого для этой базы данных, то оно будет автоматически скорректировано."
#. BY4V7
-#: dbaccess/inc/strings.hrc:277
+#: dbaccess/inc/strings.hrc:247
msgctxt "STR_HELP_SCALE"
msgid "Specify the number of decimal places permitted in this field."
msgstr "Задайте число знаков, стоящих после запятой."
#. QBHjm
-#: dbaccess/inc/strings.hrc:278
+#: dbaccess/inc/strings.hrc:248
msgctxt "STR_HELP_FORMAT_CODE"
msgid "This is where you see how the data would be displayed in the current format (use the button on the right to modify the format)."
msgstr "Здесь можно увидеть, как отображаются данные сообразно выбранному формату (с помощью расположенной справа кнопки можно изменить формат)."
#. eV4sD
-#: dbaccess/inc/strings.hrc:279
+#: dbaccess/inc/strings.hrc:249
msgctxt "STR_HELP_FORMAT_BUTTON"
msgid "This is where you determine the output format of the data."
msgstr "Здесь можно определить формат вывода данных."
#. Y5q39
-#: dbaccess/inc/strings.hrc:280
+#: dbaccess/inc/strings.hrc:250
msgctxt "STR_HELP_AUTOINCREMENT"
msgid ""
"Choose if this field should contain AutoIncrement values.\n"
@@ -1522,49 +1364,49 @@ msgstr ""
"В этом случае вы не сможете непосредственно вводить в него данные, поскольку для каждой новой записи этому полю будет автоматически присвоено уникальное значение (которое получается, благодаря увеличению на единицу значения из предыдущей записи)."
#. 5uQpF
-#: dbaccess/inc/strings.hrc:281
+#: dbaccess/inc/strings.hrc:251
msgctxt "STR_TABLEDESIGN_DUPLICATE_NAME"
msgid "The table cannot be saved because column name \"$column$\" was assigned twice."
msgstr "Невозможно сохранить таблицу, так как имя столбца «$column$» присвоено дважды."
#. vayRE
-#: dbaccess/inc/strings.hrc:282
+#: dbaccess/inc/strings.hrc:252
msgctxt "STR_TBL_COLUMN_IS_KEYCOLUMN"
msgid "The column \"$column$\" belongs to the primary key. If the column is deleted, the primary key will also be deleted. Do you really want to continue?"
msgstr "Столбец «$column$» относится к первичному ключу. Удалив его, вы удалите и первичный ключ. Вы действительно хотите удалить этот столбец?"
#. fo93e
-#: dbaccess/inc/strings.hrc:283
+#: dbaccess/inc/strings.hrc:253
msgctxt "STR_TBL_COLUMN_IS_KEYCOLUMN_TITLE"
msgid "Primary Key Affected"
msgstr "Относится к первичному ключу"
#. wcLcG
-#: dbaccess/inc/strings.hrc:284
+#: dbaccess/inc/strings.hrc:254
msgctxt "STR_COLUMN_NAME"
msgid "Column"
msgstr "Столбец"
#. ES566
-#: dbaccess/inc/strings.hrc:285
+#: dbaccess/inc/strings.hrc:255
msgctxt "STR_QRY_CONTINUE"
msgid "Continue anyway?"
msgstr "Продолжить, несмотря на это?"
#. iXbw5
-#: dbaccess/inc/strings.hrc:286
+#: dbaccess/inc/strings.hrc:256
msgctxt "STR_TABLEDESIGN_CONNECTION_MISSING"
msgid "The table could not be saved due to problems connecting to the database."
msgstr "Невозможно сохранить таблицу, пока не восстановлена связь с базой данных."
#. kuExF
-#: dbaccess/inc/strings.hrc:287
+#: dbaccess/inc/strings.hrc:257
msgctxt "STR_TABLEDESIGN_DATASOURCE_DELETED"
msgid "The table filter could not be adjusted because the data source has been deleted."
msgstr "Невозможно применить фильтр, так как источник данных удалён."
#. Lt4Yc
-#: dbaccess/inc/strings.hrc:288
+#: dbaccess/inc/strings.hrc:258
msgctxt "STR_QUERY_SAVE_TABLE_EDIT_INDEXES"
msgid ""
"Before you can edit the indexes of a table, you have to save it.\n"
@@ -1574,13 +1416,13 @@ msgstr ""
"Сохранить изменения?"
#. HFLQk
-#: dbaccess/inc/strings.hrc:289
+#: dbaccess/inc/strings.hrc:259
msgctxt "STR_TABLEDESIGN_NO_PRIM_KEY_HEAD"
msgid "No primary key"
msgstr "Первичный ключ не указан"
#. ir5Du
-#: dbaccess/inc/strings.hrc:290
+#: dbaccess/inc/strings.hrc:260
msgctxt "STR_TABLEDESIGN_NO_PRIM_KEY"
msgid ""
"A unique index or primary key is required for data record identification in this database.\n"
@@ -1594,25 +1436,25 @@ msgstr ""
"Создать первичный ключ?"
#. R7KDG
-#: dbaccess/inc/strings.hrc:291
+#: dbaccess/inc/strings.hrc:261
msgctxt "STR_TABLEDESIGN_ALTER_ERROR"
msgid "The column \"$column$\" could not be changed. Should the column instead be deleted and the new format appended?"
msgstr "Невозможно изменить столбец «$column$». Его можно удалить и применить новый формат. Продолжить?"
#. U3f4j
-#: dbaccess/inc/strings.hrc:292
+#: dbaccess/inc/strings.hrc:262
msgctxt "STR_TABLEDESIGN_SAVE_ERROR"
msgid "Error while saving the table design"
msgstr "Ошибка при попытке сохранения дизайна таблицы"
#. 9BsSL
-#: dbaccess/inc/strings.hrc:293
+#: dbaccess/inc/strings.hrc:263
msgctxt "STR_TABLEDESIGN_COULD_NOT_DROP_COL"
msgid "The column $column$ could not be deleted."
msgstr "Столбец $column$ не может быть удалён."
#. Etkrj
-#: dbaccess/inc/strings.hrc:294
+#: dbaccess/inc/strings.hrc:264
msgctxt "STR_HELP_AUTOINCREMENT_VALUE"
msgid ""
"Enter an SQL statement for the auto-increment field.\n"
@@ -1624,7 +1466,7 @@ msgstr ""
"Эта инструкция будет непосредственно передана в базу данных в момент создания таблицы."
#. fAEud
-#: dbaccess/inc/strings.hrc:295
+#: dbaccess/inc/strings.hrc:265
msgctxt "STR_NO_TYPE_INFO_AVAILABLE"
msgid ""
"No type information could be retrieved from the database.\n"
@@ -1634,37 +1476,37 @@ msgstr ""
"Режим проектирования таблиц не доступен для этого источника."
#. 2s2rr
-#: dbaccess/inc/strings.hrc:296
+#: dbaccess/inc/strings.hrc:266
msgctxt "STR_CHANGE_COLUMN_NAME"
msgid "change field name"
msgstr "изменить имя поля"
#. PC3QD
-#: dbaccess/inc/strings.hrc:297
+#: dbaccess/inc/strings.hrc:267
msgctxt "STR_CHANGE_COLUMN_TYPE"
msgid "change field type"
msgstr "изменить тип поля"
#. Z2B9o
-#: dbaccess/inc/strings.hrc:298
+#: dbaccess/inc/strings.hrc:268
msgctxt "STR_CHANGE_COLUMN_DESCRIPTION"
msgid "change field description"
msgstr "изменить описание поля"
#. aDrTE
-#: dbaccess/inc/strings.hrc:299
+#: dbaccess/inc/strings.hrc:269
msgctxt "STR_CHANGE_COLUMN_ATTRIBUTE"
msgid "change field attribute"
msgstr "изменить атрибут поля"
#. 3srwC
-#: dbaccess/inc/strings.hrc:301
+#: dbaccess/inc/strings.hrc:271
msgctxt "STR_ENTER_CONNECTION_PASSWORD"
msgid "A password is needed to connect to the data source \"$name$\"."
msgstr "Необходимо ввести пароль для соединения с источником данных «$name$»."
#. tYDxc
-#: dbaccess/inc/strings.hrc:302
+#: dbaccess/inc/strings.hrc:272
msgctxt "STR_ASK_FOR_DIRECTORY_CREATION"
msgid ""
"The directory\n"
@@ -1680,49 +1522,49 @@ msgstr ""
"не существует. Создать его?"
#. 3PFxY
-#: dbaccess/inc/strings.hrc:303
+#: dbaccess/inc/strings.hrc:273
msgctxt "STR_COULD_NOT_CREATE_DIRECTORY"
msgid "The directory $name$ could not be created."
msgstr "Невозможно создать каталог $name$."
#. V9kGF
-#: dbaccess/inc/strings.hrc:304
+#: dbaccess/inc/strings.hrc:274
msgctxt "STR_ALREADYEXISTOVERWRITE"
msgid "The file already exists. Overwrite?"
msgstr "Этот файл уже существует. Переписать его?"
#. i47ye
-#: dbaccess/inc/strings.hrc:305
+#: dbaccess/inc/strings.hrc:275
msgctxt "STR_NEW_FOLDER"
msgid "Folder"
msgstr "Папка"
#. U2bRK
-#: dbaccess/inc/strings.hrc:307
+#: dbaccess/inc/strings.hrc:277
msgctxt "STR_DATABASE_TYPE_CHANGE"
msgid "Database properties"
msgstr "Настройки базы данных"
#. etNzz
-#: dbaccess/inc/strings.hrc:308
+#: dbaccess/inc/strings.hrc:278
msgctxt "STR_PARENTTITLE_GENERAL"
msgid "Data Source Properties: #"
msgstr "Свойства источника данных: #"
#. z9Ecp
-#: dbaccess/inc/strings.hrc:309
+#: dbaccess/inc/strings.hrc:279
msgctxt "STR_ERR_USE_CONNECT_TO"
msgid "Please choose 'Connect to an existing database' to connect to an existing database instead."
msgstr "Выберите «Подключение к базе данных» для подключения к существующей базе данных."
#. PfAC6
-#: dbaccess/inc/strings.hrc:310
+#: dbaccess/inc/strings.hrc:280
msgctxt "STR_COULD_NOT_LOAD_ODBC_LIB"
msgid "Could not load the program library #lib# or it is corrupted. The ODBC data source selection is not available."
msgstr "Невозможно загрузить библиотеку программы #lib# (возможно она повреждена). Недоступен выбор источника данных ODBC."
#. d3vbZ
-#: dbaccess/inc/strings.hrc:311
+#: dbaccess/inc/strings.hrc:281
msgctxt "STR_UNSUPPORTED_DATASOURCE_TYPE"
msgid ""
"This kind of data source is not supported on this platform.\n"
@@ -1732,152 +1574,152 @@ msgstr ""
"Вы можете изменить настройки, но, вероятно, соединиться с этой базой данных будет невозможно."
#. 2f7Ga
-#: dbaccess/inc/strings.hrc:312
+#: dbaccess/inc/strings.hrc:282
msgctxt "STR_AUTOTEXT_FIELD_SEP_NONE"
msgid "{None}"
msgstr "{Нет}"
#. iR7CJ
#. To translators: EM Dec 2002: 'Space' refers t o what you get when you hit the space bar on your keyboard.
-#: dbaccess/inc/strings.hrc:314
+#: dbaccess/inc/strings.hrc:284
msgctxt "STR_AUTOFIELDSEPARATORLIST"
msgid ";\t59\t,\t44\t:\t58\t{Tab}\t9\t{Space}\t32"
msgstr ";\t59\t,\t44\t:\t58\t{Таб}\t9\t{Пробел}\t32"
#. DFGo9
-#: dbaccess/inc/strings.hrc:315
+#: dbaccess/inc/strings.hrc:285
msgctxt "STR_AUTODELIMITER_MISSING"
msgid "#1 must be set."
msgstr "#1 должен быть задан."
#. ZDRBf
-#: dbaccess/inc/strings.hrc:316
+#: dbaccess/inc/strings.hrc:286
msgctxt "STR_AUTODELIMITER_MUST_DIFFER"
msgid "#1 and #2 must be different."
msgstr "#1 и #2 должны быть заданы."
#. 9oCZr
-#: dbaccess/inc/strings.hrc:317
+#: dbaccess/inc/strings.hrc:287
msgctxt "STR_AUTONO_WILDCARDS"
msgid "Wildcards such as ?,* are not allowed in #1."
msgstr "Подстановочные знаки, такие как ?,*, не разрешены в #1."
#. BdzcB
-#: dbaccess/inc/strings.hrc:319
+#: dbaccess/inc/strings.hrc:289
msgctxt "STR_CONNECTION_TEST"
msgid "Connection Test"
msgstr "Тестирование соединения"
#. oAAKs
-#: dbaccess/inc/strings.hrc:320
+#: dbaccess/inc/strings.hrc:290
msgctxt "STR_CONNECTION_SUCCESS"
msgid "The connection was established successfully."
msgstr "Соединение установлено успешно."
#. 5V7Ay
-#: dbaccess/inc/strings.hrc:321
+#: dbaccess/inc/strings.hrc:291
msgctxt "STR_CONNECTION_NO_SUCCESS"
msgid "The connection could not be established."
msgstr "Соединение не установлено."
#. wvNFP
-#: dbaccess/inc/strings.hrc:322
+#: dbaccess/inc/strings.hrc:292
msgctxt "STR_JDBCDRIVER_SUCCESS"
msgid "The JDBC driver was loaded successfully."
msgstr "JDBC драйвер успешно загружен."
#. RdMCN
-#: dbaccess/inc/strings.hrc:323
+#: dbaccess/inc/strings.hrc:293
msgctxt "STR_JDBCDRIVER_NO_SUCCESS"
msgid "The JDBC driver could not be loaded."
msgstr "JDBC драйвер не загружен."
#. dyCvN
-#: dbaccess/inc/strings.hrc:324
+#: dbaccess/inc/strings.hrc:294
msgctxt "STR_MSACCESS_FILTERNAME"
msgid "MS Access file"
msgstr "Файл MS Access"
#. rDsuu
-#: dbaccess/inc/strings.hrc:325
+#: dbaccess/inc/strings.hrc:295
msgctxt "STR_MSACCESS_2007_FILTERNAME"
msgid "MS Access 2007 file"
msgstr "Файл MS Access 2007"
#. jFwxU
-#: dbaccess/inc/strings.hrc:326
+#: dbaccess/inc/strings.hrc:296
msgctxt "STR_FIREBIRD_FILTERNAME"
msgid "Firebird Database"
msgstr "База данных Firebird"
#. 8Uiv2
-#: dbaccess/inc/strings.hrc:328
+#: dbaccess/inc/strings.hrc:298
msgctxt "STR_RSC_CHARSETS"
msgid "System"
msgstr "Системный"
#. pnwDB
-#: dbaccess/inc/strings.hrc:329
+#: dbaccess/inc/strings.hrc:299
msgctxt "STR_ERROR_DURING_CREATION"
msgid "Error during creation"
msgstr "Ошибка создания"
#. hnyJF
-#: dbaccess/inc/strings.hrc:330
+#: dbaccess/inc/strings.hrc:300
msgctxt "STR_UNEXPECTED_ERROR"
msgid "An error occurred. The operation could not be performed."
msgstr "Возникла ошибка. Невозможно выполнить данную операцию."
#. kXCG9
-#: dbaccess/inc/strings.hrc:331
+#: dbaccess/inc/strings.hrc:301
msgctxt "STR_COULDNOTOPEN_LINKEDDOC"
msgid "The document \"$file$\" could not be opened."
msgstr "Документ «$file$» не может быть открыт."
#. bFHHW
-#: dbaccess/inc/strings.hrc:332
+#: dbaccess/inc/strings.hrc:302
msgctxt "STR_MISSING_TABLES_XDROP"
msgid "The table cannot be deleted because the database connection does not support this."
msgstr "Невозможно удалить таблицу, операция не поддерживается текущим подключением к базе данных."
#. ZNB5D
-#: dbaccess/inc/strings.hrc:333
+#: dbaccess/inc/strings.hrc:303
msgctxt "STR_BUTTON_TEXT_ALL"
msgid "~All"
msgstr "Все"
#. C8eBG
-#: dbaccess/inc/strings.hrc:334
+#: dbaccess/inc/strings.hrc:304
msgctxt "STR_UNDO_COLON"
msgid "Undo:"
msgstr "Отменить:"
#. aje2A
-#: dbaccess/inc/strings.hrc:335
+#: dbaccess/inc/strings.hrc:305
msgctxt "STR_REDO_COLON"
msgid "Redo:"
msgstr "Восстановить"
#. ixMkj
-#: dbaccess/inc/strings.hrc:336
+#: dbaccess/inc/strings.hrc:306
msgctxt "STR_UNKNOWN_TYPE_FOUND"
msgid "No corresponding column type could be found for column '#1'."
msgstr "Не найден соответствующий тип столбца для столбца «#1»."
#. qVax3
-#: dbaccess/inc/strings.hrc:337
+#: dbaccess/inc/strings.hrc:307
msgctxt "STR_FILE_DOES_NOT_EXIST"
msgid "The file \"$file$\" does not exist."
msgstr "Файл «$file$» не существует."
#. 737k3
-#: dbaccess/inc/strings.hrc:338
+#: dbaccess/inc/strings.hrc:308
msgctxt "STR_WARNINGS_DURING_CONNECT"
msgid "Warnings were encountered while connecting to the data source. Press \"$buttontext$\" to view them."
msgstr "При попытке соединения с источником данных получены предупреждения. Нажмите на «$buttontext$» для их просмотра."
#. cGJja
-#: dbaccess/inc/strings.hrc:339
+#: dbaccess/inc/strings.hrc:309
msgctxt "STR_NAMED_OBJECT_ALREADY_EXISTS"
msgid ""
"The name '$#$' already exists.\n"
@@ -1888,200 +1730,200 @@ msgstr ""
#. xTNjt
#. #i96130# use hard coded name
-#: dbaccess/inc/strings.hrc:341
+#: dbaccess/inc/strings.hrc:311
msgctxt "RID_STR_EXTENSION_NOT_PRESENT"
msgid "The report, \"$file$\", requires the Report Builder feature."
msgstr "Отчёт \"$file$\" требует наличия Report Builder."
#. oC8Px
-#: dbaccess/inc/strings.hrc:343
+#: dbaccess/inc/strings.hrc:313
msgctxt "STR_COULDNOTCREATE_DRIVERMANAGER"
msgid "Cannot connect to the SDBC driver manager (#servicename#)."
msgstr "Невозможно соединиться с менеджером драйвера SDBC (#servicename#)."
#. aym6r
-#: dbaccess/inc/strings.hrc:344
+#: dbaccess/inc/strings.hrc:314
msgctxt "STR_NOREGISTEREDDRIVER"
msgid "A driver is not registered for the URL #connurl#."
msgstr "Драйвер не зарегистрирован для URL #connurl#."
#. oafZG
-#: dbaccess/inc/strings.hrc:345
+#: dbaccess/inc/strings.hrc:315
msgctxt "STR_NOTABLEINFO"
msgid "Successfully connected, but information about database tables is not available."
msgstr "Соединение установлено, но информация о таблицах в базе данных недоступна."
#. uBW6C
-#: dbaccess/inc/strings.hrc:346
+#: dbaccess/inc/strings.hrc:316
msgctxt "STR_ALL_TABLES"
msgid "All tables"
msgstr "Все таблицы"
#. nhz6M
-#: dbaccess/inc/strings.hrc:347
+#: dbaccess/inc/strings.hrc:317
msgctxt "STR_ALL_VIEWS"
msgid "All views"
msgstr "Все представления таблиц"
#. APBCw
-#: dbaccess/inc/strings.hrc:348
+#: dbaccess/inc/strings.hrc:318
msgctxt "STR_ALL_TABLES_AND_VIEWS"
msgid "All tables and views"
msgstr "Все таблицы и их представления"
#. 4SGBJ
-#: dbaccess/inc/strings.hrc:350
+#: dbaccess/inc/strings.hrc:320
msgctxt "STR_TABLE_PRIV_NAME"
msgid "Table name"
msgstr "Имя таблицы"
#. Nw93R
-#: dbaccess/inc/strings.hrc:351
+#: dbaccess/inc/strings.hrc:321
msgctxt "STR_TABLE_PRIV_INSERT"
msgid "Insert data"
msgstr "Добавление"
#. nLFJd
-#: dbaccess/inc/strings.hrc:352
+#: dbaccess/inc/strings.hrc:322
msgctxt "STR_TABLE_PRIV_DELETE"
msgid "Delete data"
msgstr "Удаление"
#. eGEDE
-#: dbaccess/inc/strings.hrc:353
+#: dbaccess/inc/strings.hrc:323
msgctxt "STR_TABLE_PRIV_UPDATE"
msgid "Modify data"
msgstr "Редактирование"
#. e2bxV
-#: dbaccess/inc/strings.hrc:354
+#: dbaccess/inc/strings.hrc:324
msgctxt "STR_TABLE_PRIV_ALTER"
msgid "Alter structure"
msgstr "Изменить структуру"
#. zejFA
-#: dbaccess/inc/strings.hrc:355
+#: dbaccess/inc/strings.hrc:325
msgctxt "STR_TABLE_PRIV_SELECT"
msgid "Read data"
msgstr "Чтение"
#. UsMj8
-#: dbaccess/inc/strings.hrc:356
+#: dbaccess/inc/strings.hrc:326
msgctxt "STR_TABLE_PRIV_REFERENCE"
msgid "Modify references"
msgstr "Изменить ссылки"
#. SEGp9
-#: dbaccess/inc/strings.hrc:357
+#: dbaccess/inc/strings.hrc:327
msgctxt "STR_TABLE_PRIV_DROP"
msgid "Drop structure"
msgstr "Удалить структуру"
#. BCCiv
-#: dbaccess/inc/strings.hrc:359
+#: dbaccess/inc/strings.hrc:329
msgctxt "STR_DBASE_PATH_OR_FILE"
msgid "Path to the dBASE files"
msgstr "Путь к файлам dBASE"
#. hnBFY
-#: dbaccess/inc/strings.hrc:360
+#: dbaccess/inc/strings.hrc:330
msgctxt "STR_FLAT_PATH_OR_FILE"
msgid "Path to the text files"
msgstr "Путь к текстовым файлам"
#. DRFyX
-#: dbaccess/inc/strings.hrc:361
+#: dbaccess/inc/strings.hrc:331
msgctxt "STR_CALC_PATH_OR_FILE"
msgid "Path to the spreadsheet document"
msgstr "Путь к электронным таблицам"
#. qxbA7
-#: dbaccess/inc/strings.hrc:362
+#: dbaccess/inc/strings.hrc:332
msgctxt "STR_NAME_OF_ODBC_DATASOURCE"
msgid "Name of the ODBC data source on your system"
msgstr "Имя ODBC источника данных в вашей системе"
#. mGJE9
-#: dbaccess/inc/strings.hrc:363
+#: dbaccess/inc/strings.hrc:333
msgctxt "STR_WRITER_PATH_OR_FILE"
msgid "Path to the Writer document"
msgstr "Путь к документу Writer"
#. zQxCp
-#: dbaccess/inc/strings.hrc:364
+#: dbaccess/inc/strings.hrc:334
msgctxt "STR_MYSQL_DATABASE_NAME"
msgid "Name of the MySQL database"
msgstr "Имя базы данных MySQL"
#. uhRMQ
-#: dbaccess/inc/strings.hrc:365
+#: dbaccess/inc/strings.hrc:335
msgctxt "STR_ORACLE_DATABASE_NAME"
msgid "Name of the Oracle database"
msgstr "Имя базы данных Oracle"
#. nmoae
-#: dbaccess/inc/strings.hrc:366
+#: dbaccess/inc/strings.hrc:336
msgctxt "STR_MSACCESS_MDB_FILE"
msgid "Microsoft Access database file"
msgstr "Файл базы данных Access"
#. 34zwh
-#: dbaccess/inc/strings.hrc:367
+#: dbaccess/inc/strings.hrc:337
#, c-format
msgctxt "STR_NO_ADDITIONAL_SETTINGS"
msgid "No more settings are necessary. To verify that the connection is working, click the '%test' button."
msgstr "Больше никаких настроек не требуется. Для проверки соединения нажмите кнопку «%test»."
#. GAVfb
-#: dbaccess/inc/strings.hrc:368
+#: dbaccess/inc/strings.hrc:338
msgctxt "STR_COMMONURL"
msgid "Datasource URL (e.g. host=$host:$port dbname=$database)"
msgstr "URL источника данных (т.е. host=$host:$port dbname=$database)"
#. rKH3t
-#: dbaccess/inc/strings.hrc:369
+#: dbaccess/inc/strings.hrc:339
msgctxt "STR_HOSTNAME"
msgid "~Host name"
msgstr "Имя ~компьютера"
#. Gdbjz
-#: dbaccess/inc/strings.hrc:370
+#: dbaccess/inc/strings.hrc:340
msgctxt "STR_MOZILLA_PROFILE_NAME"
msgid "~Mozilla profile name"
msgstr "Профиль ~Mozilla"
#. A6YJb
-#: dbaccess/inc/strings.hrc:371
+#: dbaccess/inc/strings.hrc:341
msgctxt "STR_THUNDERBIRD_PROFILE_NAME"
msgid "~Thunderbird profile name"
msgstr "Профиль ~Thunderbird"
#. HnmRA
-#: dbaccess/inc/strings.hrc:372
+#: dbaccess/inc/strings.hrc:342
msgctxt "STR_ADD_TABLES"
msgid "Add Tables"
msgstr "Добавить таблицы"
#. eHahH
-#: dbaccess/inc/strings.hrc:373
+#: dbaccess/inc/strings.hrc:343
msgctxt "STR_ADD_TABLE_OR_QUERY"
msgid "Add Table or Query"
msgstr "Добавить таблицу или запрос"
#. 5dqK5
-#: dbaccess/inc/strings.hrc:375
+#: dbaccess/inc/strings.hrc:345
msgctxt "STR_WIZ_COLUMN_SELECT_TITEL"
msgid "Apply columns"
msgstr "Выбор полей"
#. nZ7x6
-#: dbaccess/inc/strings.hrc:376
+#: dbaccess/inc/strings.hrc:346
msgctxt "STR_WIZ_TYPE_SELECT_TITEL"
msgid "Type formatting"
msgstr "Типы полей"
#. C5Zs4
-#: dbaccess/inc/strings.hrc:377
+#: dbaccess/inc/strings.hrc:347
msgctxt "STR_WIZ_NAME_ALREADY_DEFINED"
msgid ""
"Enter a unique name for the new primary key data field.\n"
@@ -2091,163 +1933,163 @@ msgstr ""
"Следующее имя уже используется:"
#. MuQ2C
-#: dbaccess/inc/strings.hrc:378
+#: dbaccess/inc/strings.hrc:348
msgctxt "STR_WIZ_NAME_MATCHING_TITEL"
msgid "Assign columns"
msgstr "Соответствие полей"
#. 5vCFA
-#: dbaccess/inc/strings.hrc:379
+#: dbaccess/inc/strings.hrc:349
msgctxt "STR_WIZ_PB_PREV"
msgid "< ~Back"
msgstr "< ~Назад"
#. aWFVD
-#: dbaccess/inc/strings.hrc:380
+#: dbaccess/inc/strings.hrc:350
msgctxt "STR_WIZ_PB_NEXT"
msgid "~Next>"
msgstr "~Далее >"
#. aKHUX
-#: dbaccess/inc/strings.hrc:381
+#: dbaccess/inc/strings.hrc:351
msgctxt "STR_WIZ_PB_OK"
msgid "C~reate"
msgstr "~Готово"
#. 3XyRu
-#: dbaccess/inc/strings.hrc:382
+#: dbaccess/inc/strings.hrc:352
msgctxt "STR_WIZ_TABLE_COPY"
msgid "Copy table"
msgstr "Копирование"
#. uNGvx
-#: dbaccess/inc/strings.hrc:383
+#: dbaccess/inc/strings.hrc:353
msgctxt "STR_COPYTABLE_TITLE_COPY"
msgid "Copy table"
msgstr "Копирование"
#. xCPkD
-#: dbaccess/inc/strings.hrc:384
+#: dbaccess/inc/strings.hrc:354
msgctxt "STR_INVALID_TABLE_NAME"
msgid "This table name is not valid in the current database."
msgstr "Неправильное имя таблицы в текущей базе данных"
#. m35Lx
-#: dbaccess/inc/strings.hrc:385
+#: dbaccess/inc/strings.hrc:355
msgctxt "STR_SUGGEST_APPEND_TABLE_DATA"
msgid "Choose the option 'Append data' on the first page to append data to an existing table."
msgstr "Выберите «Добавить данные» на первой странице для добавления данных в существующую таблицу."
#. XbmVN
-#: dbaccess/inc/strings.hrc:386
+#: dbaccess/inc/strings.hrc:356
msgctxt "STR_INVALID_TABLE_NAME_LENGTH"
msgid "Please change the table name. It is too long."
msgstr "Пожалуйста, измените имя таблицы. Оно слишком длинное."
#. 55EA7
-#: dbaccess/inc/strings.hrc:388
+#: dbaccess/inc/strings.hrc:358
msgctxt "STR_DBWIZARDTITLE"
msgid "Database Wizard"
msgstr "Мастер баз данных"
#. p4Yy4
-#: dbaccess/inc/strings.hrc:389
+#: dbaccess/inc/strings.hrc:359
msgctxt "STR_PAGETITLE_INTROPAGE"
msgid "Select database"
msgstr "Выбор базы данных"
#. GTpDz
-#: dbaccess/inc/strings.hrc:390
+#: dbaccess/inc/strings.hrc:360
msgctxt "STR_PAGETITLE_DBASE"
msgid "Set up dBASE connection"
msgstr "Настройка подключения к dBASE"
#. VBaQN
-#: dbaccess/inc/strings.hrc:391
+#: dbaccess/inc/strings.hrc:361
msgctxt "STR_PAGETITLE_TEXT"
msgid "Set up a connection to text files"
msgstr "Настройка подключения к текстовым файлам"
#. TiBeQ
-#: dbaccess/inc/strings.hrc:392
+#: dbaccess/inc/strings.hrc:362
msgctxt "STR_PAGETITLE_MSACCESS"
msgid "Set up Microsoft Access connection"
msgstr "Настройка подключения к Microsoft Access"
#. XaDDh
-#: dbaccess/inc/strings.hrc:393
+#: dbaccess/inc/strings.hrc:363
msgctxt "STR_PAGETITLE_LDAP"
msgid "Set up LDAP connection"
msgstr "Настройка подключения к LDAP"
#. WZtzU
-#: dbaccess/inc/strings.hrc:394
+#: dbaccess/inc/strings.hrc:364
msgctxt "STR_PAGETITLE_ADO"
msgid "Set up ADO connection"
msgstr "Настройка подключения к ADO"
#. n3HgX
-#: dbaccess/inc/strings.hrc:395
+#: dbaccess/inc/strings.hrc:365
msgctxt "STR_PAGETITLE_JDBC"
msgid "Set up JDBC connection"
msgstr "Настройка подключения к JDBC"
#. qiZT5
-#: dbaccess/inc/strings.hrc:396
+#: dbaccess/inc/strings.hrc:366
msgctxt "STR_PAGETITLE_ORACLE"
msgid "Set up Oracle database connection"
msgstr "Настройка подключения к Oracle"
#. KbAqW
-#: dbaccess/inc/strings.hrc:397
+#: dbaccess/inc/strings.hrc:367
msgctxt "STR_PAGETITLE_MYSQL"
msgid "Set up MySQL connection"
msgstr "Настройка подключения к MySQL"
#. uJuNs
-#: dbaccess/inc/strings.hrc:398
+#: dbaccess/inc/strings.hrc:368
msgctxt "STR_PAGETITLE_ODBC"
msgid "Set up ODBC connection"
msgstr "Настройка подключения к ODBC"
#. ecB4x
-#: dbaccess/inc/strings.hrc:399
+#: dbaccess/inc/strings.hrc:369
msgctxt "STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET"
msgid "Set up Writer Document or Spreadsheet connection"
msgstr "Настройка подключения к документу Writer или Calc"
#. wUEMA
-#: dbaccess/inc/strings.hrc:400
+#: dbaccess/inc/strings.hrc:370
msgctxt "STR_PAGETITLE_AUTHENTIFICATION"
msgid "Set up user authentication"
msgstr "Настройка аутентификации пользователей"
#. YgsyA
-#: dbaccess/inc/strings.hrc:401
+#: dbaccess/inc/strings.hrc:371
msgctxt "STR_PAGETITLE_MYSQL_NATIVE"
msgid "Set up MySQL server data"
msgstr "Настройка сервера MySQL"
#. 6Fy7C
-#: dbaccess/inc/strings.hrc:402
+#: dbaccess/inc/strings.hrc:372
msgctxt "STR_PAGETITLE_FINAL"
msgid "Save and proceed"
msgstr "Сохранить и выполнить"
#. LhDjK
-#: dbaccess/inc/strings.hrc:403
+#: dbaccess/inc/strings.hrc:373
msgctxt "STR_DATABASEDEFAULTNAME"
msgid "New Database"
msgstr "Новая база данных"
#. DoGLb
-#: dbaccess/inc/strings.hrc:404
+#: dbaccess/inc/strings.hrc:374
msgctxt "STR_MYSQLJDBC_HEADERTEXT"
msgid "Set up connection to a MySQL database using JDBC"
msgstr "Настройка подключения к базе данных MySQL через JDBC"
#. B5kEC
-#: dbaccess/inc/strings.hrc:405
+#: dbaccess/inc/strings.hrc:375
msgctxt "STR_MYSQLJDBC_HELPTEXT"
msgid ""
"Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\n"
@@ -2257,67 +2099,67 @@ msgstr ""
"Свяжитесь с системным администратором, если не уверены в правильности настроек."
#. uGTyY
-#: dbaccess/inc/strings.hrc:406
+#: dbaccess/inc/strings.hrc:376
msgctxt "STR_MYSQL_DRIVERCLASSTEXT"
msgid "MySQL JDBC d~river class:"
msgstr "Класс д~райвера MySQL JDBC:"
#. cBiSe
-#: dbaccess/inc/strings.hrc:407
+#: dbaccess/inc/strings.hrc:377
msgctxt "STR_MYSQL_DEFAULT"
msgid "Default: 3306"
msgstr "Порт по умолчанию: 3306"
#. zDx7G
-#: dbaccess/inc/strings.hrc:408
+#: dbaccess/inc/strings.hrc:378
msgctxt "STR_DBASE_HEADERTEXT"
msgid "Set up a connection to dBASE files"
msgstr "Настройка подключения к файлам dBASE"
#. MXTEF
-#: dbaccess/inc/strings.hrc:409
+#: dbaccess/inc/strings.hrc:379
msgctxt "STR_DBASE_HELPTEXT"
msgid "Select the folder where the dBASE files are stored."
msgstr "Выберите папку, где хранятся файлы dBASE."
#. Ke4xP
-#: dbaccess/inc/strings.hrc:410
+#: dbaccess/inc/strings.hrc:380
msgctxt "STR_TEXT_HEADERTEXT"
msgid "Set up a connection to text files"
msgstr "Настройка подключения к текстовым файлам"
#. uJFWa
-#: dbaccess/inc/strings.hrc:411
+#: dbaccess/inc/strings.hrc:381
msgctxt "STR_TEXT_HELPTEXT"
msgid "Select the folder where the CSV (Comma Separated Values) text files are stored. %PRODUCTNAME Base will open these files in read-only mode."
msgstr "Выберите папку, где хранятся текстовые файлы CSV (значения, разделённые запятой). %PRODUCTNAME Base откроет эти файлы в режиме чтения."
#. chkNh
-#: dbaccess/inc/strings.hrc:412
+#: dbaccess/inc/strings.hrc:382
msgctxt "STR_TEXT_PATH_OR_FILE"
msgid "Path to text files"
msgstr "Путь к текстовым файлам"
#. VXUEj
-#: dbaccess/inc/strings.hrc:413
+#: dbaccess/inc/strings.hrc:383
msgctxt "STR_MSACCESS_HEADERTEXT"
msgid "Set up a connection to a Microsoft Access database"
msgstr "Настройка подключения к базе Microsoft Access"
#. rTF65
-#: dbaccess/inc/strings.hrc:414
+#: dbaccess/inc/strings.hrc:384
msgctxt "STR_MSACCESS_HELPTEXT"
msgid "Please select the Microsoft Access file you want to access."
msgstr "Выберите файл Microsoft Access, к которому вы хотите получить доступ."
#. DYcM8
-#: dbaccess/inc/strings.hrc:415
+#: dbaccess/inc/strings.hrc:385
msgctxt "STR_ADO_HEADERTEXT"
msgid "Set up a connection to an ADO database"
msgstr "Настройка подключения к базе ADO"
#. WzZiB
-#: dbaccess/inc/strings.hrc:416
+#: dbaccess/inc/strings.hrc:386
msgctxt "STR_ADO_HELPTEXT"
msgid ""
"Please enter the URL of the ADO data source you want to connect to.\n"
@@ -2329,13 +2171,13 @@ msgstr ""
"Свяжитесь с системным администратором, если не уверены в правильности настроек."
#. PRyfo
-#: dbaccess/inc/strings.hrc:417
+#: dbaccess/inc/strings.hrc:387
msgctxt "STR_ODBC_HEADERTEXT"
msgid "Set up a connection to an ODBC database"
msgstr "Настройка подключения к базе ODBC"
#. CBVtz
-#: dbaccess/inc/strings.hrc:418
+#: dbaccess/inc/strings.hrc:388
msgctxt "STR_ODBC_HELPTEXT"
msgid ""
"Enter the name of the ODBC database you want to connect to.\n"
@@ -2347,13 +2189,13 @@ msgstr ""
"Свяжитесь с системным администратором если не уверены в правильности следующих настроек."
#. dmi7n
-#: dbaccess/inc/strings.hrc:419
+#: dbaccess/inc/strings.hrc:389
msgctxt "STR_JDBC_HEADERTEXT"
msgid "Set up a connection to a JDBC database"
msgstr "Настройка подключения к базе JDBC"
#. dYGeU
-#: dbaccess/inc/strings.hrc:420
+#: dbaccess/inc/strings.hrc:390
msgctxt "STR_JDBC_HELPTEXT"
msgid ""
"Please enter the required information to connect to a JDBC database.\n"
@@ -2363,25 +2205,25 @@ msgstr ""
"Свяжитесь с системным администратором, если не уверены в правильности настроек."
#. DWgup
-#: dbaccess/inc/strings.hrc:421
+#: dbaccess/inc/strings.hrc:391
msgctxt "STR_ORACLE_HEADERTEXT"
msgid "Set up a connection to an Oracle database"
msgstr "Настройка подключения к базе Oracle"
#. Z57ca
-#: dbaccess/inc/strings.hrc:422
+#: dbaccess/inc/strings.hrc:392
msgctxt "STR_ORACLE_DEFAULT"
msgid "Default: 1521"
msgstr "Порт по умолчанию: 1521"
#. dnAP9
-#: dbaccess/inc/strings.hrc:423
+#: dbaccess/inc/strings.hrc:393
msgctxt "STR_ORACLE_DRIVERCLASSTEXT"
msgid "Oracle JDBC ~driver class"
msgstr "Класс ~драйвера Oracle JDBC"
#. aD8dK
-#: dbaccess/inc/strings.hrc:424
+#: dbaccess/inc/strings.hrc:394
msgctxt "STR_ORACLE_HELPTEXT"
msgid ""
"Please enter the required information to connect to an Oracle database. Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\n"
@@ -2391,13 +2233,13 @@ msgstr ""
"Свяжитесь с системным администратором, если не уверены в правильности настроек."
#. Vqjfj
-#: dbaccess/inc/strings.hrc:425
+#: dbaccess/inc/strings.hrc:395
msgctxt "STR_SPREADSHEET_HEADERTEXT"
msgid "Set up a connection to spreadsheets"
msgstr "Настройка подключения к электронным таблицам"
#. FnpBr
-#: dbaccess/inc/strings.hrc:426
+#: dbaccess/inc/strings.hrc:396
msgctxt "STR_SPREADSHEET_HELPTEXT"
msgid ""
"Click 'Browse...' to select a %PRODUCTNAME spreadsheet or Microsoft Excel workbook.\n"
@@ -2407,277 +2249,277 @@ msgstr ""
"%PRODUCTNAME откроет этот файл в режиме только для чтения."
#. fxmJG
-#: dbaccess/inc/strings.hrc:427
+#: dbaccess/inc/strings.hrc:397
msgctxt "STR_SPREADSHEETPATH"
msgid "~Location and file name"
msgstr "~Расположение и имя файла"
#. og5kg
-#: dbaccess/inc/strings.hrc:429
+#: dbaccess/inc/strings.hrc:399
msgctxt "STR_COMMAND_EXECUTED_SUCCESSFULLY"
msgid "Command successfully executed."
msgstr "Команда выполнена успешно."
#. BhFXv
-#: dbaccess/inc/strings.hrc:430
+#: dbaccess/inc/strings.hrc:400
msgctxt "STR_DIRECTSQL_CONNECTIONLOST"
msgid "The connection to the database has been lost. This dialog will be closed."
msgstr "Соединение с базой данных потеряно. Диалог будет закрыт."
#. WTysM
-#: dbaccess/inc/strings.hrc:432
+#: dbaccess/inc/strings.hrc:402
msgctxt "STR_TAB_INDEX_SORTORDER"
msgid "Sort order"
msgstr "Порядок сортировки"
#. 67TCR
-#: dbaccess/inc/strings.hrc:433
+#: dbaccess/inc/strings.hrc:403
msgctxt "STR_TAB_INDEX_FIELD"
msgid "Index field"
msgstr "Поле индекса"
#. rCZbG
-#: dbaccess/inc/strings.hrc:434
+#: dbaccess/inc/strings.hrc:404
msgctxt "STR_ORDER_ASCENDING"
msgid "Ascending"
msgstr "По возрастанию"
#. zUeEN
-#: dbaccess/inc/strings.hrc:435
+#: dbaccess/inc/strings.hrc:405
msgctxt "STR_ORDER_DESCENDING"
msgid "Descending"
msgstr "По убыванию"
#. DpB67
-#: dbaccess/inc/strings.hrc:436
+#: dbaccess/inc/strings.hrc:406
msgctxt "STR_CONFIRM_DROP_INDEX"
msgid "Do you really want to delete the index '$name$'?"
msgstr "Вы действительно хотите удалить индекс «$name$»?"
#. 3sTLe
-#: dbaccess/inc/strings.hrc:437
+#: dbaccess/inc/strings.hrc:407
msgctxt "STR_LOGICAL_INDEX_NAME"
msgid "index"
msgstr "индекс"
#. HFaXn
-#: dbaccess/inc/strings.hrc:438
+#: dbaccess/inc/strings.hrc:408
msgctxt "STR_NEED_INDEX_FIELDS"
msgid "The index must contain at least one field."
msgstr "Индекс должен содержать хотя бы одно поле."
#. LRDDD
-#: dbaccess/inc/strings.hrc:439
+#: dbaccess/inc/strings.hrc:409
msgctxt "STR_INDEX_NAME_ALREADY_USED"
msgid "There is already another index named \"$name$\"."
msgstr "Индекс с именем «$name$» уже существует."
#. 9C3mx
-#: dbaccess/inc/strings.hrc:440
+#: dbaccess/inc/strings.hrc:410
msgctxt "STR_INDEXDESIGN_DOUBLE_COLUMN_NAME"
msgid "In an index definition, no table column may occur more than once. However, you have entered column \"$name$\" twice."
msgstr "В определении индекса столбец таблицы не может использоваться более одного раза. Вы же указали столбец «$name$» дважды."
#. XANpc
-#: dbaccess/inc/strings.hrc:442
+#: dbaccess/inc/strings.hrc:412
msgctxt "STR_COULD_NOT_CONVERT_PARAM"
msgid "The entry could not be converted to a valid value for the \"$name$\" parameter"
msgstr "Невозможно преобразовать запись в допустимое для параметра «$name$» значение"
#. FCnE3
-#: dbaccess/inc/strings.hrc:444
+#: dbaccess/inc/strings.hrc:414
msgctxt "STR_EXCEPTION_STATUS"
msgid "SQL Status"
msgstr "Состояние SQL"
#. ha64T
-#: dbaccess/inc/strings.hrc:445
+#: dbaccess/inc/strings.hrc:415
msgctxt "STR_EXCEPTION_ERRORCODE"
msgid "Error code"
msgstr "Код ошибки"
#. 9A2cX
-#: dbaccess/inc/strings.hrc:446
+#: dbaccess/inc/strings.hrc:416
msgctxt "STR_EXPLAN_STRINGCONVERSION_ERROR"
msgid "A frequent reason for this error is an inappropriate character set setting for the language of your database. Check the setting by choosing Edit - Database - Properties."
msgstr "Наиболее частая причина этой ошибки - неподдерживаемая кодировка для языка вашей базы данных. Проверьте настройки в Правка - База данных - Свойства."
#. itnjJ
-#: dbaccess/inc/strings.hrc:447
+#: dbaccess/inc/strings.hrc:417
msgctxt "STR_EXCEPTION_ERROR"
msgid "Error"
msgstr "Ошибка"
#. Q4A2Y
-#: dbaccess/inc/strings.hrc:448
+#: dbaccess/inc/strings.hrc:418
msgctxt "STR_EXCEPTION_WARNING"
msgid "Warning"
msgstr "Предупреждение"
#. LSBpE
-#: dbaccess/inc/strings.hrc:449
+#: dbaccess/inc/strings.hrc:419
msgctxt "STR_EXCEPTION_INFO"
msgid "Information"
msgstr "Информация"
#. DKRwR
-#: dbaccess/inc/strings.hrc:450
+#: dbaccess/inc/strings.hrc:420
msgctxt "STR_EXCEPTION_DETAILS"
msgid "Details"
msgstr "Детали"
#. Avmtu
-#: dbaccess/inc/strings.hrc:452
+#: dbaccess/inc/strings.hrc:422
msgctxt "STR_QUERY_USERADMIN_DELETE_USER"
msgid "Do you really want to delete the user?"
msgstr "Вы действительно хотите удалить этого пользователя?"
#. yeKZF
-#: dbaccess/inc/strings.hrc:453
+#: dbaccess/inc/strings.hrc:423
msgctxt "STR_USERADMIN_NOT_AVAILABLE"
msgid "The database does not support user administration."
msgstr "База данных не поддерживает администрирование пользователей."
#. 4CVtX
-#: dbaccess/inc/strings.hrc:454
+#: dbaccess/inc/strings.hrc:424
msgctxt "STR_ERROR_PASSWORDS_NOT_IDENTICAL"
msgid "The passwords do not match. Please enter the password again."
msgstr "Пароли не совпадают. Повторите ввод пароля."
#. iu64w
-#: dbaccess/inc/strings.hrc:456
+#: dbaccess/inc/strings.hrc:426
msgctxt "STR_JOIN_TYPE_HINT"
msgid "Please note that some databases may not support this join type."
msgstr "Помните, что некоторые базы данных могут не поддерживать этот тип соединения."
#. Khmn9
-#: dbaccess/inc/strings.hrc:457
+#: dbaccess/inc/strings.hrc:427
msgctxt "STR_QUERY_INNER_JOIN"
msgid "Includes only records for which the contents of the related fields of both tables are identical."
msgstr "Содержит только записи, в которых содержимое связанных полей обеих таблиц одинаково."
#. JUyyK
-#: dbaccess/inc/strings.hrc:458
+#: dbaccess/inc/strings.hrc:428
msgctxt "STR_QUERY_LEFTRIGHT_JOIN"
msgid "Contains ALL records from table '%1' but only records from table '%2' where the values in the related fields are matching."
msgstr "Содержит ВСЕ записи из «%1», а также только те записи из «%2», в которых содержимое связанных полей обеих таблиц является одинаковым."
#. EdhCU
-#: dbaccess/inc/strings.hrc:459
+#: dbaccess/inc/strings.hrc:429
msgctxt "STR_QUERY_FULL_JOIN"
msgid "Contains ALL records from '%1' and from '%2'."
msgstr "Содержит ВСЕ записи из «%1» и из «%2»."
#. c9PsZ
-#: dbaccess/inc/strings.hrc:460
+#: dbaccess/inc/strings.hrc:430
msgctxt "STR_QUERY_CROSS_JOIN"
msgid "Contains the Cartesian product of ALL records from '%1' and from '%2'."
msgstr "Содержит картезианское произведение ВСЕХ записей из «%1» и «%2»."
#. KyLuN
-#: dbaccess/inc/strings.hrc:462
+#: dbaccess/inc/strings.hrc:432
msgctxt "STR_CTW_NO_VIEWS_SUPPORT"
msgid "The destination database does not support views."
msgstr "Целевая база данных не поддерживает представлений."
#. RaJQd
-#: dbaccess/inc/strings.hrc:463
+#: dbaccess/inc/strings.hrc:433
msgctxt "STR_CTW_NO_PRIMARY_KEY_SUPPORT"
msgid "The destination database does not support primary keys."
msgstr "Целевая база данных не поддерживает первичных ключей."
#. JBBmY
-#: dbaccess/inc/strings.hrc:464
+#: dbaccess/inc/strings.hrc:434
msgctxt "STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR"
msgid "no data access descriptor found, or no data access descriptor able to provide all necessary information"
msgstr "не найден дескриптор доступа к базе данных или ни один из дескрипторов не может представить всю необходимую информацию"
#. Z4JFe
-#: dbaccess/inc/strings.hrc:465
+#: dbaccess/inc/strings.hrc:435
msgctxt "STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT"
msgid "Only tables and queries are supported at the moment."
msgstr "В настоящее время поддерживаются только таблицы и запросы."
#. KvUFb
-#: dbaccess/inc/strings.hrc:466
+#: dbaccess/inc/strings.hrc:436
msgctxt "STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS"
msgid "The copy source's result set must support bookmarks."
msgstr "Результирующий набор должен поддерживать закладки."
#. XVb6E
-#: dbaccess/inc/strings.hrc:467
+#: dbaccess/inc/strings.hrc:437
msgctxt "STR_CTW_UNSUPPORTED_COLUMN_TYPE"
msgid "Unsupported source column type ($type$) at column position $pos$."
msgstr "Не поддерживаемый тип исходного столбца ($type$) в позиции $pos$."
#. 7pnvE
-#: dbaccess/inc/strings.hrc:468
+#: dbaccess/inc/strings.hrc:438
msgctxt "STR_CTW_ILLEGAL_PARAMETER_COUNT"
msgid "Illegal number of initialization parameters."
msgstr "Недопустимое количество параметров инициализации."
#. z3h9J
-#: dbaccess/inc/strings.hrc:469
+#: dbaccess/inc/strings.hrc:439
msgctxt "STR_CTW_ERROR_DURING_INITIALIZATION"
msgid "An error occurred during initialization."
msgstr "Ошибка при инициализации."
#. Qpda7
-#: dbaccess/inc/strings.hrc:470
+#: dbaccess/inc/strings.hrc:440
msgctxt "STR_CTW_ERROR_UNSUPPORTED_SETTING"
msgid "Unsupported setting in the copy source descriptor: $name$."
msgstr "Неподдерживаемая настройка в копии дескриптора источника: $name$."
#. BsP8j
-#: dbaccess/inc/strings.hrc:471
+#: dbaccess/inc/strings.hrc:441
msgctxt "STR_CTW_ERROR_NO_QUERY"
msgid "To copy a query, your connection must be able to provide queries."
msgstr "Чтобы копировать запрос, соединение должно быть готово передавать запросы."
#. QYh2y
-#: dbaccess/inc/strings.hrc:472
+#: dbaccess/inc/strings.hrc:442
msgctxt "STR_CTW_ERROR_INVALID_INTERACTIONHANDLER"
msgid "The given interaction handler is invalid."
msgstr "Некорректное взаимодействие обработчика."
#. ixrDD
-#: dbaccess/inc/strings.hrc:474
+#: dbaccess/inc/strings.hrc:444
msgctxt "STR_QUERY_REL_EDIT_RELATION"
msgid "This relation already exists. Do you want to edit it or create a new one?"
msgstr "Данная связь уже существует. Редактировать или создать новую?"
#. nFRsS
-#: dbaccess/inc/strings.hrc:475
+#: dbaccess/inc/strings.hrc:445
msgctxt "STR_QUERY_REL_EDIT"
msgid "Edit..."
msgstr "Правка..."
#. yRkFG
-#: dbaccess/inc/strings.hrc:476
+#: dbaccess/inc/strings.hrc:446
msgctxt "STR_QUERY_REL_CREATE"
msgid "Create..."
msgstr "Создать..."
#. VWBJF
-#: dbaccess/inc/strings.hrc:477
+#: dbaccess/inc/strings.hrc:447
msgctxt "STR_RELATIONDESIGN"
msgid " - %PRODUCTNAME Base: Relation design"
msgstr " - %PRODUCTNAME Base: конструктор связей"
#. ZCd5X
-#: dbaccess/inc/strings.hrc:478
+#: dbaccess/inc/strings.hrc:448
msgctxt "STR_RELATIONDESIGN_NOT_AVAILABLE"
msgid "The database does not support relations."
msgstr "Эта база данных не поддерживает связи."
#. CG2Pd
-#: dbaccess/inc/strings.hrc:479
+#: dbaccess/inc/strings.hrc:449
msgctxt "STR_QUERY_REL_DELETE_WINDOW"
msgid "When you delete this table all corresponding relations will be deleted as well. Continue?"
msgstr "Удаление этой таблицы повлечёт за собой удаление всех относящихся к ней связей. Продолжить?"
#. Wzf9T
-#: dbaccess/inc/strings.hrc:480
+#: dbaccess/inc/strings.hrc:450
msgctxt "STR_QUERY_REL_COULD_NOT_CREATE"
msgid ""
"The database could not create the relation. Maybe foreign keys for this kind of table aren't supported.\n"
diff --git a/source/ru/desktop/messages.po b/source/ru/desktop/messages.po
index 554d10a55f7..d37d7a13d30 100644
--- a/source/ru/desktop/messages.po
+++ b/source/ru/desktop/messages.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-01-17 16:45+0100\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-12-24 17:03+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/desktopmessages/ru/>\n"
@@ -447,8 +447,14 @@ msgctxt "RID_DEPLOYMENT_DEPENDENCIES_LO_MIN"
msgid "Extension requires at least %PRODUCTNAME version %VERSION"
msgstr "Расширение требует %PRODUCTNAME версии не ниже %VERSION"
+#. P4pgb
+#: desktop/inc/strings.hrc:117
+msgctxt "RID_DEPLOYMENT_DEPENDENCIES_LO_MAX"
+msgid "Extension does not support %PRODUCTNAME versions greater than %VERSION"
+msgstr ""
+
#. dNBtG
-#: desktop/inc/strings.hrc:118
+#: desktop/inc/strings.hrc:119
msgctxt "RID_STR_WARNING_VERSION_LESS"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -462,7 +468,7 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. TmQCx
-#: desktop/inc/strings.hrc:122
+#: desktop/inc/strings.hrc:123
msgctxt "RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -476,7 +482,7 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. AMTBi
-#: desktop/inc/strings.hrc:126
+#: desktop/inc/strings.hrc:127
msgctxt "RID_STR_WARNING_VERSION_EQUAL"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -490,7 +496,7 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. 5TDnT
-#: desktop/inc/strings.hrc:130
+#: desktop/inc/strings.hrc:131
msgctxt "RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -504,7 +510,7 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. 9wcAB
-#: desktop/inc/strings.hrc:134
+#: desktop/inc/strings.hrc:135
msgctxt "RID_STR_WARNING_VERSION_GREATER"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -518,7 +524,7 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. 2WQJk
-#: desktop/inc/strings.hrc:138
+#: desktop/inc/strings.hrc:139
msgctxt "RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES"
msgid ""
"You are about to install version $NEW of the extension '$NAME'.\n"
@@ -532,145 +538,145 @@ msgstr ""
"Нажмите «Отмена» для отмены установки."
#. J2X2b
-#: desktop/inc/strings.hrc:143
+#: desktop/inc/strings.hrc:144
msgctxt "RID_DLG_UPDATE_NONE"
msgid "No new updates are available."
msgstr "Обновлений нет."
#. y7gVg
-#: desktop/inc/strings.hrc:144
+#: desktop/inc/strings.hrc:145
msgctxt "RID_DLG_UPDATE_NOINSTALLABLE"
msgid "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'."
msgstr "Нет доступных для установки обновлений. Для просмотра всех обновлений установите флажок «Показать все обновления»."
#. rq2Co
-#: desktop/inc/strings.hrc:145
+#: desktop/inc/strings.hrc:146
msgctxt "RID_DLG_UPDATE_FAILURE"
msgid "An error occurred:"
msgstr "Произошла ошибка:"
#. 77Hco
-#: desktop/inc/strings.hrc:146
+#: desktop/inc/strings.hrc:147
msgctxt "RID_DLG_UPDATE_UNKNOWNERROR"
msgid "Unknown error."
msgstr "Неизвестная ошибка."
#. 7xdom
-#: desktop/inc/strings.hrc:147
+#: desktop/inc/strings.hrc:148
msgctxt "RID_DLG_UPDATE_NODESCRIPTION"
msgid "No more details are available for this update."
msgstr "Отсутствуют подробности для этого обновления."
#. NECjC
-#: desktop/inc/strings.hrc:148
+#: desktop/inc/strings.hrc:149
msgctxt "RID_DLG_UPDATE_NOINSTALL"
msgid "The extension cannot be updated because:"
msgstr "Причина, по которой невозможно установить расширение:"
#. BstEF
-#: desktop/inc/strings.hrc:149
+#: desktop/inc/strings.hrc:150
msgctxt "RID_DLG_UPDATE_NODEPENDENCY"
msgid "Required %PRODUCTNAME version doesn't match:"
msgstr "Требуемая версия %PRODUCTNAME не соответствует:"
#. fz5C3
-#: desktop/inc/strings.hrc:150
+#: desktop/inc/strings.hrc:151
msgctxt "RID_DLG_UPDATE_NODEPENDENCY_CUR_VER"
msgid "You have %PRODUCTNAME %VERSION"
msgstr "Установлен %PRODUCTNAME %VERSION"
#. ofeoD
-#: desktop/inc/strings.hrc:151
+#: desktop/inc/strings.hrc:152
msgctxt "RID_DLG_UPDATE_BROWSERBASED"
msgid "browser based update"
msgstr "обновление при помощи браузера"
#. 4NJkE
-#: desktop/inc/strings.hrc:152
+#: desktop/inc/strings.hrc:153
msgctxt "RID_DLG_UPDATE_VERSION"
msgid "Version"
msgstr "Версия"
#. JRSnS
-#: desktop/inc/strings.hrc:153
+#: desktop/inc/strings.hrc:154
msgctxt "RID_DLG_UPDATE_IGNORED_UPDATE"
msgid "This update will be ignored.\n"
msgstr "Это обновление будет пропущено.\n"
#. Ea8Mi
-#: desktop/inc/strings.hrc:155
+#: desktop/inc/strings.hrc:156
msgctxt "STR_BOOTSTRAP_ERR_CANNOT_START"
msgid "The application cannot be started. "
msgstr "Невозможно запустить приложение. "
#. STFHr
-#: desktop/inc/strings.hrc:156
+#: desktop/inc/strings.hrc:157
msgctxt "STR_BOOTSTRAP_ERR_DIR_MISSING"
msgid "The configuration directory \"$1\" could not be found."
msgstr "Невозможно найти каталог конфигурации «$1»."
#. bGWux
-#: desktop/inc/strings.hrc:157
+#: desktop/inc/strings.hrc:158
msgctxt "STR_BOOTSTRAP_ERR_PATH_INVALID"
msgid "The installation path is invalid."
msgstr "Неверный путь установки."
#. kdZLA
-#: desktop/inc/strings.hrc:158
+#: desktop/inc/strings.hrc:159
msgctxt "STR_BOOTSTRAP_ERR_INTERNAL"
msgid "An internal error occurred."
msgstr "Внутренняя ошибка."
#. yGBza
-#: desktop/inc/strings.hrc:159
+#: desktop/inc/strings.hrc:160
msgctxt "STR_BOOTSTRAP_ERR_FILE_CORRUPT"
msgid "The configuration file \"$1\" is corrupt."
msgstr "Файл конфигурации «$1» повреждён."
#. CP9Qk
-#: desktop/inc/strings.hrc:160
+#: desktop/inc/strings.hrc:161
msgctxt "STR_BOOTSTRAP_ERR_FILE_MISSING"
msgid "The configuration file \"$1\" was not found."
msgstr "Файл конфигурации «$1» не найден."
#. maapb
-#: desktop/inc/strings.hrc:161
+#: desktop/inc/strings.hrc:162
msgctxt "STR_BOOTSTRAP_ERR_NO_SUPPORT"
msgid "The configuration file \"$1\" does not support the current version."
msgstr "Файл конфигурации «$1» не поддерживает текущую версию."
#. q2F59
-#: desktop/inc/strings.hrc:162
+#: desktop/inc/strings.hrc:163
msgctxt "STR_BOOTSTRAP_ERR_LANGUAGE_MISSING"
msgid "The user interface language cannot be determined."
msgstr "Язык пользовательского интерфейса не может быть определён."
#. UTKHa
-#: desktop/inc/strings.hrc:163
+#: desktop/inc/strings.hrc:164
msgctxt "STR_BOOTSTRAP_ERR_USERINSTALL_FAILED"
msgid "User installation could not be completed. "
msgstr "Пользовательская установка не может быть завершена. "
#. dgxZP
-#: desktop/inc/strings.hrc:164
+#: desktop/inc/strings.hrc:165
msgctxt "STR_BOOTSTRAP_ERR_NO_CFG_SERVICE"
msgid "The configuration service is not available."
msgstr "Службы конфигурации недоступны."
#. wbj4W
-#: desktop/inc/strings.hrc:165
+#: desktop/inc/strings.hrc:166
msgctxt "STR_ASK_START_SETUP_MANUALLY"
msgid "Start the setup application to repair the installation from the CD or the folder containing the installation packages."
msgstr "Запустите программу установки, чтобы продолжить установку с диска или из папки, содержащей пакет программ установки."
#. d3or5
-#: desktop/inc/strings.hrc:166
+#: desktop/inc/strings.hrc:167
msgctxt "STR_CONFIG_ERR_ACCESS_GENERAL"
msgid "A general error occurred while accessing your central configuration. "
msgstr "A general access error occurred while accessing your central configuration. "
#. TXCKM
-#: desktop/inc/strings.hrc:167
+#: desktop/inc/strings.hrc:168
msgctxt "STR_BOOTSTRAP_ERR_CFG_DATAACCESS"
msgid ""
"%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n"
@@ -682,19 +688,19 @@ msgstr ""
"Пожалуйста, обратитесь к системному администратору."
#. bouaV
-#: desktop/inc/strings.hrc:168
+#: desktop/inc/strings.hrc:169
msgctxt "STR_INTERNAL_ERRMSG"
msgid "The following internal error has occurred: "
msgstr "Возникла следующая внутренняя ошибка: "
#. zBSDM
-#: desktop/inc/strings.hrc:169
+#: desktop/inc/strings.hrc:170
msgctxt "STR_LO_MUST_BE_RESTARTED"
msgid "%PRODUCTNAME must unfortunately be manually restarted once after installation or update."
msgstr "К сожалению, после установки или обновления нужно вручную перезагрузить %PRODUCTNAME."
#. NBTfi
-#: desktop/inc/strings.hrc:170
+#: desktop/inc/strings.hrc:171
msgctxt "STR_QUERY_USERDATALOCKED"
msgid ""
"Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\n"
@@ -708,25 +714,25 @@ msgstr ""
"Продолжить работу?"
#. EB6Yf
-#: desktop/inc/strings.hrc:171
+#: desktop/inc/strings.hrc:172
msgctxt "STR_TITLE_USERDATALOCKED"
msgid "%PRODUCTNAME %PRODUCTVERSION"
msgstr "%PRODUCTNAME %PRODUCTVERSION"
#. GiCJZ
-#: desktop/inc/strings.hrc:172
+#: desktop/inc/strings.hrc:173
msgctxt "STR_ERR_PRINTDISABLED"
msgid "Printing is disabled. No documents can be printed."
msgstr "Печать отключена. Печать документов невозможна."
#. VxBTE
-#: desktop/inc/strings.hrc:173
+#: desktop/inc/strings.hrc:174
msgctxt "STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE"
msgid "The path manager is not available.\n"
msgstr "Диспетчер путей недоступен.\n"
#. Cy4Wz
-#: desktop/inc/strings.hrc:174
+#: desktop/inc/strings.hrc:175
msgctxt "STR_BOOTSTRAP_ERR_NOTENOUGHDISKSPACE"
msgid ""
"%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n"
@@ -736,7 +742,7 @@ msgstr ""
"\n"
#. 2o5XG
-#: desktop/inc/strings.hrc:175
+#: desktop/inc/strings.hrc:176
msgctxt "STR_BOOTSTRAP_ERR_NOACCESSRIGHTS"
msgid ""
"%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n"
@@ -746,61 +752,61 @@ msgstr ""
"\n"
#. uigQN
-#: desktop/inc/strings.hrc:177
+#: desktop/inc/strings.hrc:178
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_1"
msgid "Extension Software License Agreement of $NAME:"
msgstr "Лицензионное соглашение расширения $NAME:"
#. DEkAo
-#: desktop/inc/strings.hrc:178
+#: desktop/inc/strings.hrc:179
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_2"
msgid "Read the complete License Agreement displayed above. Accept the License Agreement by typing \"yes\" on the console then press the Return key. Type \"no\" to decline and to abort the extension setup."
msgstr "Прочтите лицензионное соглашение выше. Введите «yes» для принятия лицензионного соглашения и нажмите Enter. Ведите «no» для отказа и выхода из установки расширения."
#. wANiC
-#: desktop/inc/strings.hrc:182
+#: desktop/inc/strings.hrc:183
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_3"
msgid "[Enter \"yes\" or \"no\"]:"
msgstr "[Введите «yes» или «no»]:"
#. wEFn2
-#: desktop/inc/strings.hrc:183
+#: desktop/inc/strings.hrc:184
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_4"
msgid "Your input was not correct. Please enter \"yes\" or \"no\":"
msgstr "Ввод некорректен. Введите «yes» или «no»:"
#. A9CdG
-#: desktop/inc/strings.hrc:184
+#: desktop/inc/strings.hrc:185
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_YES"
msgid "YES"
msgstr "YES"
#. HLETc
-#: desktop/inc/strings.hrc:185
+#: desktop/inc/strings.hrc:186
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_Y"
msgid "Y"
msgstr "Y"
#. SQ6jd
-#: desktop/inc/strings.hrc:186
+#: desktop/inc/strings.hrc:187
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_NO"
msgid "NO"
msgstr "NO"
#. 6LgGA
-#: desktop/inc/strings.hrc:187
+#: desktop/inc/strings.hrc:188
msgctxt "RID_STR_UNOPKG_ACCEPT_LIC_N"
msgid "N"
msgstr "N"
#. aCY73
-#: desktop/inc/strings.hrc:188
+#: desktop/inc/strings.hrc:189
msgctxt "RID_STR_CONCURRENTINSTANCE"
msgid "unopkg cannot be started. The lock file indicates it is already running. If this does not apply, delete the lock file at:"
msgstr "unopkg не может быть запущен. Возможно, запущена другая копия unopkg. Если это не так, удалите файл блокировки:"
#. MLhHo
-#: desktop/inc/strings.hrc:190
+#: desktop/inc/strings.hrc:191
msgctxt "RID_STR_UNOPKG_ERROR"
msgid "ERROR: "
msgstr "ERROR: "
diff --git a/source/ru/extensions/messages.po b/source/ru/extensions/messages.po
index 40cd64eb71a..10177b7f396 100644
--- a/source/ru/extensions/messages.po
+++ b/source/ru/extensions/messages.po
@@ -3,7 +3,7 @@ msgid ""
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: 2019-12-24 18:00+0100\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-12-24 17:05+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/extensionsmessages/ru/>\n"
@@ -3494,6 +3494,18 @@ msgctxt "choosedatasourcedialog|label1"
msgid "Entry"
msgstr "Элемент"
+#. EkLEJ
+#: extensions/uiconfig/sbibliography/ui/combobox.ui:16
+msgctxt "combobox|TBC_FT_SOURCE"
+msgid "Table"
+msgstr ""
+
+#. HWJFh
+#: extensions/uiconfig/sbibliography/ui/editbox.ui:14
+msgctxt "editbox|TBC_FT_QUERY"
+msgid "Search Key"
+msgstr ""
+
#. CPjNs
#: extensions/uiconfig/sbibliography/ui/generalpage.ui:34
msgctxt "generalpage|shortname"
@@ -3884,44 +3896,32 @@ msgctxt "querydialog|ask"
msgid "Do not show this question again."
msgstr "Больше не показывать этот вопрос."
-#. 3GFkT
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:14
-msgctxt "toolbar|TBC_FT_SOURCE"
-msgid "Table"
-msgstr "Таблица"
-
#. YFwPR
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:39
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:26
msgctxt "toolbar|TBC_BT_CHANGESOURCE"
msgid "Data Source"
msgstr "Источник данных"
-#. bgZyU
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:62
-msgctxt "toolbar|TBC_FT_QUERY"
-msgid "Search Key"
-msgstr "Фильтр"
-
#. EeiLg
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:97
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:71
msgctxt "toolbar|TBC_BT_AUTOFILTER"
msgid "AutoFilter"
msgstr "Быстрый фильтр"
#. Xbpge
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:110
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:84
msgctxt "toolbar|TBC_BT_FILTERCRIT"
msgid "Standard Filter"
msgstr "Стандартный фильтр"
#. 9qFEc
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:123
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:97
msgctxt "toolbar|TBC_BT_REMOVEFILTER"
msgid "Reset Filter"
msgstr "Удалить фильтр"
#. C3Tuk
-#: extensions/uiconfig/sbibliography/ui/toolbar.ui:136
+#: extensions/uiconfig/sbibliography/ui/toolbar.ui:110
msgctxt "toolbar|TBC_BT_COL_ASSIGN"
msgid "Column Arrangement"
msgstr "Расположение столбцов"
diff --git a/source/ru/filter/source/config/fragments/filters.po b/source/ru/filter/source/config/fragments/filters.po
index 618bfd0523d..3d6c464b346 100644
--- a/source/ru/filter/source/config/fragments/filters.po
+++ b/source/ru/filter/source/config/fragments/filters.po
@@ -4,7 +4,7 @@ msgstr ""
"Project-Id-Version: filters\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2020-04-27 15:54+0200\n"
-"PO-Revision-Date: 2019-12-24 17:03+0000\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/filtersourceconfigfragmentsfilters/ru/>\n"
"Language: ru\n"
@@ -13,7 +13,7 @@ msgstr ""
"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-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 3.10.3\n"
"X-POOTLE-MTIME: 1562754696.000000\n"
#. FR4Ff
@@ -794,7 +794,7 @@ msgctxt ""
"UIName\n"
"value.text"
msgid "Office Open XML Text (Transitional)"
-msgstr ""
+msgstr "Office Open XML Text (Переходный)"
#. Ymern
#: OOXML_Text_Template.xcu
@@ -804,7 +804,7 @@ msgctxt ""
"UIName\n"
"value.text"
msgid "Office Open XML Text Template (Transitional)"
-msgstr ""
+msgstr "Шаблон текстового документа Office Open XML (Переходный)"
#. B4Xqe
#: PBM___Portable_Bitmap.xcu
diff --git a/source/ru/framework/messages.po b/source/ru/framework/messages.po
index 573ed1f334e..8bb6922b412 100644
--- a/source/ru/framework/messages.po
+++ b/source/ru/framework/messages.po
@@ -4,16 +4,16 @@ 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: 2020-02-27 14:31+0100\n"
-"PO-Revision-Date: 2017-10-05 23:26+0000\n"
-"Last-Translator: Anonymous Pootle User\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
+"Last-Translator: bormant <bormant@mail.ru>\n"
+"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/frameworkmessages/ru/>\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"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 3.10.3\n"
"X-POOTLE-MTIME: 1507245985.000000\n"
#. 5dTDC
@@ -50,7 +50,7 @@ msgstr "Настройка панели инструментов..."
#: framework/inc/strings.hrc:30
msgctxt "STR_TOOLBAR_UNDOCK_TOOLBAR"
msgid "U~ndock Toolbar"
-msgstr ""
+msgstr "Открепить панель инструментов"
#. 7GcGg
#: framework/inc/strings.hrc:31
diff --git a/source/ru/helpcontent2/source/auxiliary.po b/source/ru/helpcontent2/source/auxiliary.po
index 6f5a9d5fa7e..a05ab33a488 100644
--- a/source/ru/helpcontent2/source/auxiliary.po
+++ b/source/ru/helpcontent2/source/auxiliary.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: auxiliary\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-03-31 10:34+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2020-01-24 14:44+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_help-master/auxiliary/ru/>\n"
@@ -313,6 +313,24 @@ msgctxt ""
msgid "General Information"
msgstr "Общие сведения"
+#. Q5EUA
+#: sdatabase.tree
+msgctxt ""
+"sdatabase.tree\n"
+"09\n"
+"help_section.text"
+msgid "Database Functionality (Base)"
+msgstr ""
+
+#. tLWiE
+#: sdatabase.tree
+msgctxt ""
+"sdatabase.tree\n"
+"0901\n"
+"node.text"
+msgid "General Information"
+msgstr ""
+
#. xU49Q
#: sdraw.tree
msgctxt ""
@@ -664,24 +682,6 @@ msgctxt ""
msgid "Guides"
msgstr "Инструкции"
-#. haknq
-#: shared.tree
-msgctxt ""
-"shared.tree\n"
-"09\n"
-"help_section.text"
-msgid "Database Functionality (Base)"
-msgstr "Функциональность баз данных (Base)"
-
-#. aHvBN
-#: shared.tree
-msgctxt ""
-"shared.tree\n"
-"0901\n"
-"node.text"
-msgid "General Information"
-msgstr "Общие сведения"
-
#. BjDNf
#: simpress.tree
msgctxt ""
diff --git a/source/ru/helpcontent2/source/text/sbasic/shared.po b/source/ru/helpcontent2/source/text/sbasic/shared.po
index c617ecef36c..7c68e7cd6f6 100644
--- a/source/ru/helpcontent2/source/text/sbasic/shared.po
+++ b/source/ru/helpcontent2/source/text/sbasic/shared.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-05-05 14:59+0200\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
"PO-Revision-Date: 2019-08-02 20:44+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5128,14 +5128,14 @@ msgctxt ""
msgid "Pass Count"
msgstr "Пропусков"
-#. AzGxm
+#. hZEbs
#: 01050300.xhp
msgctxt ""
"01050300.xhp\n"
"par_id3161831\n"
"help.text"
-msgid "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass-nospin\">Specify the number of loops to perform before the breakpoint takes effect.</ahelp>"
-msgstr "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass-nospin\">Укажите число циклов, которые будут выполнены, прежде чем точка останова будет иметь место.</ahelp>"
+msgid "<ahelp hid=\"modules/BasicIDE/ui/managebreakpoints/pass\">Specify the number of loops to perform before the breakpoint takes effect.</ahelp>"
+msgstr ""
#. gr8LF
#: 01050300.xhp
@@ -8188,68 +8188,59 @@ msgctxt ""
msgid "Outputs the specified strings or numeric expressions to a dialog or to a file."
msgstr "Вывод указанных строк или числовых выражений в диалоговое окно или файл."
-#. QSTQ3
+#. AhB82
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
-"hd_id3145785\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "Синтаксис"
+msgid "<image src=\"media/helpimg/sbasic/Print_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">Print syntax</alt></image>"
+msgstr ""
-#. oBHh5
+#. A6QEE
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3153188\n"
"help.text"
-msgid "Print [#FileName,] Expression1[{;|,} [Spc(Number As Integer);] [Tab(pos As Integer);] [Expression2[...]]"
-msgstr "Print [#Имя_файла,] Выражение1[{;|,} [Spc(Число As Integer);] [Tab(Позиция As Integer);] [Выражение2[...]]"
-
-#. V7hQL
-#: 03010103.xhp
-msgctxt ""
-"03010103.xhp\n"
-"hd_id3147348\n"
-"help.text"
-msgid "Parameter:"
-msgstr "Параметр:"
+msgid "Print [#filenum,] expression1[{;|,} [Spc(number As Integer);] [Tab(pos As Integer);] [expression2[...]]"
+msgstr ""
-#. J5XzU
+#. NWBqr
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id2508621\n"
"help.text"
-msgid "<emph>FileName:</emph> Any numeric expression that contains the file number that was set by the Open statement for the respective file."
-msgstr "<emph>Имя_файла:</emph> любое числовое выражение, содержащее номер файла, который был задан выражением Open для соответствующего файла."
+msgid "<emph>filenum:</emph> Any numeric expression that contains the file number that was set by the <literal>Open</literal> statement for the respective file."
+msgstr ""
-#. gnDQ8
+#. Zoa2X
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3163712\n"
"help.text"
-msgid "<emph>Expression</emph>: Any numeric or string expression to be printed. Multiple expressions can be separated by a semicolon. If separated by a comma, the expressions are indented to the next tab stop. The tab stops cannot be adjusted."
-msgstr "<emph>Выражение</emph>. Любое числовое или строковое выражение, которое должно быть выведено. Несколько выражений могут отделяться точкой с запятой. Если они отделены запятой, то выводятся с отступом до следующей позиции табуляции. Позиции табуляции не регулируются."
+msgid "<emph>expression</emph>: Any numeric or string expression to be printed. Multiple expressions can be separated by a semicolon. If separated by a comma, the expressions are indented to the next tab stop. The tab stops cannot be adjusted."
+msgstr ""
-#. oAkpr
+#. HB3kc
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3153092\n"
"help.text"
-msgid "<emph>Number</emph>: Number of spaces to be inserted by the <emph>Spc</emph> function."
-msgstr "<emph>Число</emph>: число пробелов, которые должны вставляться функцией <emph>Spc</emph>."
+msgid "<emph>number</emph>: Number of spaces to be inserted by the <emph>Spc</emph> function."
+msgstr ""
-#. qPngH
+#. QDwLF
#: 03010103.xhp
msgctxt ""
"03010103.xhp\n"
"par_id3145364\n"
"help.text"
-msgid "<emph>Pos</emph>: Spaces are inserted until the specified position."
-msgstr "<emph>Позиция</emph>. Пробелы вставляются до указанной позиции."
+msgid "<emph>pos</emph>: Spaces are inserted until the specified position."
+msgstr ""
#. GiAKc
#: 03010103.xhp
@@ -8287,15 +8278,6 @@ msgctxt ""
msgid "You can insert the <emph>Tab</emph> function, enclosed by semicolons, between arguments to indent the output to a specific position, or you can use the <emph>Spc</emph> function to insert a specified number of spaces."
msgstr ""
-#. AoqEt
-#: 03010103.xhp
-msgctxt ""
-"03010103.xhp\n"
-"hd_id3146912\n"
-"help.text"
-msgid "Example:"
-msgstr "Пример:"
-
#. knWZh
#: 03010200.xhp
msgctxt ""
@@ -22255,14 +22237,14 @@ msgctxt ""
msgid "Select...Case Statement"
msgstr ""
-#. qov74
+#. PgL5b
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"bm_id3149416\n"
"help.text"
-msgid "<bookmark_value>Select...Case statement</bookmark_value> <bookmark_value>Case statement</bookmark_value>"
-msgstr "<bookmark_value>инструкция Select...Case</bookmark_value><bookmark_value>инструкция Case</bookmark_value>"
+msgid "<bookmark_value>Select Case statement</bookmark_value> <bookmark_value>Case keyword; in Select Case statement</bookmark_value>"
+msgstr ""
#. CBpPz
#: 03090102.xhp
@@ -22282,14 +22264,14 @@ msgctxt ""
msgid "Defines one or more statement blocks depending on the value of an expression."
msgstr "Определяет один или несколько участков кода программы, которые выполняются в зависимости от значения выражения."
-#. M9zYG
+#. CFYkp
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
-"hd_id3147265\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "Синтаксис"
+msgid "<image src=\"media/helpimg/sbasic/Select-Case_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">Select Case syntax</alt></image>"
+msgstr ""
#. jsSZ5
#: 03090102.xhp
@@ -22300,41 +22282,23 @@ msgctxt ""
msgid "Select Case condition Case expression Statement Block [Case expression2 Statement Block][Case Else] Statement Block End Select"
msgstr "Select Case Условие Case Выражение Участок_кода [Case Выражение2 Участок_кода][Case Else] Участок_кода End Select"
-#. C5Bsm
-#: 03090102.xhp
-msgctxt ""
-"03090102.xhp\n"
-"hd_id3150767\n"
-"help.text"
-msgid "Parameters:"
-msgstr "Параметры:"
-
-#. 7XCQ2
+#. yuqsv
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"par_id3156281\n"
"help.text"
-msgid "<emph>Condition:</emph> Any expression that controls if the statement block that follows the respective Case clause is executed."
-msgstr "<emph>Условие</emph>. Любое выражение, которое определяет, выполняется ли участок кода, соответствующий определенному предложению Case."
+msgid "<emph>condition:</emph> Any expression that controls if the statement block that follows the respective Case clause is executed."
+msgstr ""
-#. BJPwk
+#. DoPTj
#: 03090102.xhp
msgctxt ""
"03090102.xhp\n"
"par_id3150448\n"
"help.text"
-msgid "<emph>Expression:</emph> Any expression that is compatible with the Condition type expression. The statement block that follows the Case clause is executed if <emph>Condition</emph> matches <emph>Expression</emph>."
-msgstr "<emph>Выражение</emph>. Любое выражение, которое можно сравнивать с типом выражения \"Условие\". Участок программы, следующий за предложением Case, выполняется, если параметр <emph>Условие</emph> соответствует параметру <emph>Выражение</emph>."
-
-#. CPxCt
-#: 03090102.xhp
-msgctxt ""
-"03090102.xhp\n"
-"hd_id3153768\n"
-"help.text"
-msgid "Example:"
-msgstr "Пример:"
+msgid "<emph>expression:</emph> Any expression that is compatible with the condition type expression. The statement block that follows the <literal>Case</literal> clause is executed if <emph>condition</emph> matches <emph>expression</emph>."
+msgstr ""
#. oCrpX
#: 03090102.xhp
@@ -23389,158 +23353,86 @@ msgctxt ""
msgid "GoSub...Return Statement"
msgstr ""
-#. xE9Hb
+#. EhtAB
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"bm_id3147242\n"
"help.text"
-msgid "<bookmark_value>GoSub...Return statement</bookmark_value>"
-msgstr "<bookmark_value>инструкция GoSub...Return</bookmark_value>"
+msgid "<bookmark_value>GoSub...Return statement</bookmark_value> <bookmark_value>label; in GoSub...Return statement</bookmark_value>"
+msgstr ""
-#. B36CH
+#. gVEdC
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"hd_id3147242\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090301.xhp\" name=\"GoSub...Return Statement\">GoSub...Return Statement</link>"
+msgid "<variable id=\"GoSubh1\"><link href=\"text/sbasic/shared/03090301.xhp\" name=\"GoSub...Return Statement\">GoSub...Return Statement</link></variable>"
msgstr ""
-#. AFPmM
+#. HSYep
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"par_id3145316\n"
"help.text"
-msgid "Calls a subroutine that is indicated by a label from a subroutine or a function. The statements following the label are executed until the next Return statement. Afterwards, the program continues with the statement that follows the <emph>GoSub </emph>statement."
-msgstr "Вызывает подпрограмму, указанную меткой, из подпрограммы или функции. Инструкция, которая идёт за меткой, выполняется до следующей инструкции Return. Затем программа продолжает работу с инструкции, следующей за инструкцией <emph>GoSub</emph>."
-
-#. tRYir
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3145609\n"
-"help.text"
-msgid "Syntax:"
-msgstr "Синтаксис"
+msgid "Calls a subroutine that is indicated by a label inside a <literal>Sub</literal> or a <literal>Function</literal>. The statements following the label are executed until the next <literal>Return</literal> statement. Afterwards, the program continues with the statement that follows the <literal>GoSub</literal> statement."
+msgstr ""
-#. zqBBG
+#. g6Wgg
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
"par_id3145069\n"
"help.text"
-msgid "see Parameters"
-msgstr "см. параметры"
-
-#. aPEyy
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3147265\n"
-"help.text"
-msgid "Parameters:"
-msgstr "Параметры:"
-
-#. dVLGt
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3148664\n"
-"help.text"
-msgid "Sub/Function"
-msgstr "Sub/Function"
-
-#. bcX4L
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3150400\n"
-"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
-
-#. z8D4B
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3154140\n"
-"help.text"
-msgid "Label"
-msgstr "Надпись"
-
-#. uxiuj
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3150869\n"
-"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
-
-#. Nn3Bw
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3154909\n"
-"help.text"
-msgid "GoSub Label"
-msgstr "GoSub Метка"
-
-#. LSt3B
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"par_id3153969\n"
-"help.text"
-msgid "Exit Sub/Function"
-msgstr "Exit Sub/Function"
+msgid "GoSub label[:]"
+msgstr ""
-#. 62Fsi
+#. krBDs
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3154685\n"
+"par_id471588670859073\n"
"help.text"
-msgid "Label:"
-msgstr "Метка:"
+msgid "<emph>label: </emph>A line identifier indicating where to continue execution. The scope of a label in that of the routine it belongs to."
+msgstr ""
-#. cEndJ
+#. sqKLC
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3145786\n"
+"par_id3147318\n"
"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
+msgid "The <literal>GoSub</literal> statement calls a local subroutine indicated by a label from within a subroutine or a function. The name of the label must end with a colon (\":\")."
+msgstr ""
-#. Gd3RE
+#. CfgLj
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3159252\n"
+"bas_id411588670455217\n"
"help.text"
-msgid "Return"
-msgstr "Return"
+msgid "' statements"
+msgstr ""
-#. FyBNB
+#. hGEZe
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3154321\n"
+"bas_id421588670457589\n"
"help.text"
-msgid "End Sub/Function"
-msgstr "End Sub/Function"
+msgid "' statements"
+msgstr ""
-#. LnwiR
+#. a8NbA
#: 03090301.xhp
msgctxt ""
"03090301.xhp\n"
-"par_id3147318\n"
+"bas_id171588670458263\n"
"help.text"
-msgid "The <emph>GoSub</emph> statement calls a local subroutine indicated by a label from within a subroutine or a function. The name of the label must end with a colon (\":\")."
-msgstr "Инструкция <emph>GoSub</emph> вызывает локальную подпрограмму, указанную меткой, из процедуры или функции. Имя метки должно заканчиваться двоеточием (\":\")."
+msgid "' statements"
+msgstr ""
#. X2mAh
#: 03090301.xhp
@@ -23560,15 +23452,6 @@ msgctxt ""
msgid "The following example demonstrates the use of <emph>GoSub</emph> and <emph>Return</emph>. By executing a program section twice, the program calculates the square root of two numbers that are entered by the user."
msgstr "В следующем примере демонстрируется использование инструкций <emph>GoSub</emph> и <emph>Return</emph>. Выполняя участок программы дважды, программа вычисляет квадратный корень двух чисел, введенных пользователем."
-#. VbwNL
-#: 03090301.xhp
-msgctxt ""
-"03090301.xhp\n"
-"hd_id3156284\n"
-"help.text"
-msgid "Example:"
-msgstr "Пример:"
-
#. JXEq5
#: 03090301.xhp
msgctxt ""
@@ -23614,32 +23497,32 @@ msgctxt ""
msgid "GoTo Statement"
msgstr ""
-#. CyC3S
+#. MJeVf
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"bm_id3159413\n"
"help.text"
-msgid "<bookmark_value>GoTo statement</bookmark_value>"
-msgstr "<bookmark_value>инструкция GoTo</bookmark_value>"
+msgid "<bookmark_value>GoTo statement</bookmark_value> <bookmark_value>label; in GoTo statement</bookmark_value>"
+msgstr ""
-#. Tb5VW
+#. 6PsQf
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"hd_id3159413\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090302.xhp\" name=\"GoTo Statement\">GoTo Statement</link>"
+msgid "<variable id=\"GoToh1\"><link href=\"text/sbasic/shared/03090302.xhp\" name=\"GoTo Statement\">GoTo Statement</link></variable>"
msgstr ""
-#. fEknP
+#. zmo8E
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
"par_id3153379\n"
"help.text"
-msgid "Continues program execution within a Sub or Function at the procedure line indicated by a label."
-msgstr "Продолжает выполнение программы в процедуре или функции в строке процедуры, указанной меткой."
+msgid "Continues program execution within a <literal>Sub</literal> or <literal>Function</literal> at the procedure line indicated by a label."
+msgstr ""
#. MFgEA
#: 03090302.xhp
@@ -23650,15 +23533,6 @@ msgctxt ""
msgid "Syntax:"
msgstr "Синтаксис"
-#. yjD8B
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3154367\n"
-"help.text"
-msgid "see Parameters"
-msgstr "см. параметры"
-
#. ziCip
#: 03090302.xhp
msgctxt ""
@@ -23668,104 +23542,68 @@ msgctxt ""
msgid "Parameters:"
msgstr "Параметры:"
-#. qGGVZ
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3156424\n"
-"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
-
-#. cM4t6
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3154685\n"
-"help.text"
-msgid "Label1"
-msgstr "Метка1"
-
-#. B4ZCj
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3145786\n"
-"help.text"
-msgid "<emph>Label2:</emph>"
-msgstr "<emph>Метка2:</emph>"
-
-#. tw7DH
-#: 03090302.xhp
-msgctxt ""
-"03090302.xhp\n"
-"par_id3161832\n"
-"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
-
-#. AF478
+#. KaSma
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3150010\n"
+"par_id471588670859073\n"
"help.text"
-msgid "<emph>Label1:</emph>"
-msgstr "<emph>Метка1:</emph>"
+msgid "<emph>label: </emph>A line identifier indicating where to continue execution. The scope of a label in that of the routine it belongs to."
+msgstr ""
-#. coe3B
+#. YxYq5
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3152462\n"
+"par_id3152596\n"
"help.text"
-msgid "statement block"
-msgstr "Участок_программы"
+msgid "Use the <literal>GoTo</literal> statement to instruct $[officename] Basic to continue program execution at another place within the procedure. The position must be indicated by a label. To set a label, assign a name, and then and end it with a colon (\":\")."
+msgstr ""
-#. p22vt
+#. 8o2aP
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3149664\n"
+"par_id3155416\n"
"help.text"
-msgid "GoTo Label2"
-msgstr "GoTo Метка2"
+msgid "You cannot use the <literal>GoTo</literal> statement to jump out of a <literal>Sub</literal> or <literal>Function</literal>."
+msgstr ""
-#. yEZwo
+#. s9tCK
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3152596\n"
+"hd_id3154731\n"
"help.text"
-msgid "Use the GoTo statement to instruct $[officename] Basic to continue program execution at another place within the procedure. The position must be indicated by a label. To set a label, assign a name, and then and end it with a colon (\":\")."
-msgstr "Используйте инструкцию GoTo, чтобы указать $[officename] Basic продолжать выполнение программы с другого места данной процедуры. Эта позиция должна быть обозначена меткой. Чтобы установить метку, присвойте имя и затем завершите его двоеточием (\":\")."
+msgid "Example:"
+msgstr "Пример:"
-#. 4SnXz
+#. YN5FT
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id3155416\n"
+"par_id3156424\n"
"help.text"
-msgid "You cannot use the GoTo statement to jump out of a Sub or Function."
-msgstr "Инструкцию GoTo нельзя использовать для выхода из процедуры или функции."
+msgid "' statement block"
+msgstr ""
-#. s9tCK
+#. 4DWfG
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"hd_id3154731\n"
+"par_id3161832\n"
"help.text"
-msgid "Example:"
-msgstr "Пример:"
+msgid "' statement block"
+msgstr ""
-#. WAgYp
+#. FMGBa
#: 03090302.xhp
msgctxt ""
"03090302.xhp\n"
-"par_id6967035\n"
+"par_id3152462\n"
"help.text"
-msgid "see Parameters"
-msgstr "см. параметры"
+msgid "' statement block"
+msgstr ""
#. GLei6
#: 03090303.xhp
@@ -23776,22 +23614,22 @@ msgctxt ""
msgid "On...GoSub Statement; On...GoTo Statement"
msgstr ""
-#. baypv
+#. RSWDG
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"bm_id3153897\n"
"help.text"
-msgid "<bookmark_value>On...GoSub statement</bookmark_value> <bookmark_value>On...GoTo statement</bookmark_value>"
-msgstr "<bookmark_value>инструкция On...GoSub</bookmark_value><bookmark_value>инструкция On...GoTo</bookmark_value>"
+msgid "<bookmark_value>On...GoSub statement</bookmark_value> <bookmark_value>On...GoTo statement</bookmark_value> <bookmark_value>label; in On...GoSub statement</bookmark_value> <bookmark_value>label; in On...GoTo statement</bookmark_value>"
+msgstr ""
-#. xAEB4
+#. 2xMSm
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"hd_id3153897\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03090303.xhp\" name=\"On...GoSub Statement; On...GoTo Statement\">On...GoSub Statement; On...GoTo Statement</link>"
+msgid "<variable id=\"OnGoSubGoToh1\"><link href=\"text/sbasic/shared/03090303.xhp\" name=\"On...GoSub Statement; On...GoTo Statement\">On...GoSub Statement; On...GoTo Statement</link></variable>"
msgstr ""
#. 9AaZW
@@ -23803,59 +23641,50 @@ msgctxt ""
msgid "Branches to one of several specified lines in the program code, depending on the value of a numeric expression."
msgstr "Выбирает один из вариантов выполнения программы в зависимости от значения числового выражения."
-#. wz57Y
+#. 7yAyG
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
-"hd_id3148798\n"
+"par_id841588605629842\n"
"help.text"
-msgid "Syntax:"
-msgstr "Синтаксис"
+msgid "<image src=\"media/helpimg/sbasic/On-GoSub-GoTo_statement.svg\" id=\"img_id931588605629842\"><alt id=\"alt_id931588605629842\">On GoSub/GoTo syntax</alt></image>"
+msgstr ""
-#. Hv9fU
+#. 7DeW7
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3154366\n"
"help.text"
-msgid "On N GoSub Label1[, Label2[, Label3[,...]]]"
-msgstr "On Числ_выражение GoSub Метка1[, Метка2[, Метка3[,...]]]"
+msgid "On expression GoSub Label1[, Label2[, Label3[,...]]]"
+msgstr ""
-#. iXto8
+#. osLES
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3150769\n"
"help.text"
-msgid "On NumExpression GoTo Label1[, Label2[, Label3[,...]]]"
-msgstr "On Числ_выражение GoTo Метка1[, Метка2[, Метка3[,...]]]"
-
-#. anrdF
-#: 03090303.xhp
-msgctxt ""
-"03090303.xhp\n"
-"hd_id3156215\n"
-"help.text"
-msgid "Parameters:"
-msgstr "Параметры:"
+msgid "On expression GoTo Label1[, Label2[, Label3[,...]]]"
+msgstr ""
-#. jB6gB
+#. eLCEK
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3148673\n"
"help.text"
-msgid "<emph>NumExpression:</emph> Any numeric expression between 0 and 255 that determines which of the lines the program branches to. If NumExpression is 0, the statement is not executed. If NumExpression is greater than 0, the program jumps to the label that has a position number that corresponds to the expression (1 = First label; 2 = Second label)"
-msgstr "<emph>Числ_выражение</emph>. Числовое выражение от 0 до 255, которое определяет, по какой ветви будет выполняться программа. Если Числ_выражение равно 0, инструкция выполняться не будет. Если Числ_выражение больше 0, программа переходит к метке с номером позиции, соответствующим этому выражению (1 = Первая_метка; 2 = Вторая_метка)"
+msgid "<emph>expression:</emph> Any numeric expression between 0 and 255 that determines which of the lines the program branches to. If <emph>expression</emph> is 0, the statement is not executed. If <emph>expression</emph> is greater than 0, the program jumps to the label that has a position number that corresponds to the expression (1 = First label; 2 = Second label)"
+msgstr ""
-#. CWV9P
+#. K4CfD
#: 03090303.xhp
msgctxt ""
"03090303.xhp\n"
"par_id3153194\n"
"help.text"
-msgid "<emph>Label:</emph> Target line according to<emph> GoTo </emph>or <emph>GoSub</emph> structure."
-msgstr "<emph>Метка</emph>. Контрольная строка, соответствующая структуре<emph> GoTo </emph>или <emph>GoSub</emph>."
+msgid "<emph>label:</emph> Target line according to<emph> GoTo </emph>or <emph>GoSub</emph> structure."
+msgstr ""
#. eqUXk
#: 03090303.xhp
@@ -23866,15 +23695,6 @@ msgctxt ""
msgid "The <emph>GoTo</emph> or <emph>GoSub </emph>conventions are valid."
msgstr "Соглашения <emph>GoTo</emph> или <emph>GoSub</emph> являются действующими."
-#. 9SqBY
-#: 03090303.xhp
-msgctxt ""
-"03090303.xhp\n"
-"hd_id3148645\n"
-"help.text"
-msgid "Example:"
-msgstr "Пример:"
-
#. PtTux
#: 03090303.xhp
msgctxt ""
@@ -30697,31 +30517,31 @@ msgctxt ""
msgid "' Copy of structs as value -> new instance"
msgstr ""
-#. XZuoy
+#. hQzux
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"tit\n"
"help.text"
-msgid "Erase Function"
+msgid "Erase Statement"
msgstr ""
-#. dKRw9
+#. UwzDN
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"bm_id624713\n"
"help.text"
-msgid "<bookmark_value>Erase function</bookmark_value>"
-msgstr "<bookmark_value>функция Erase</bookmark_value>"
+msgid "<bookmark_value>Erase statement</bookmark_value>"
+msgstr ""
-#. bSr9M
+#. W6k5N
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"par_idN10548\n"
"help.text"
-msgid "<link href=\"text/sbasic/shared/03104700.xhp\">Erase Function</link>"
+msgid "<link href=\"text/sbasic/shared/03104700.xhp\">Erase Statement</link>"
msgstr ""
#. xqtMK
@@ -30733,41 +30553,77 @@ msgctxt ""
msgid "Erases the contents of array elements of fixed size arrays, and releases the memory used by arrays of variable size."
msgstr "Уничтожает содержимое элементов массива в массивах с фиксированным размером и освобождает память, используемую массивами с переменным размером."
-#. QGwRF
+#. 3sXFq
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN1055D\n"
+"par_id831588865616326\n"
"help.text"
-msgid "Syntax:"
-msgstr "Синтаксис"
+msgid "<image src=\"media/helpimg/sbasic/Erase_statement.svg\" id=\"img_id651588865616326\"><alt id=\"alt_id281588865616326\">Erase syntax</alt></image>"
+msgstr ""
-#. h8WrH
+#. CCyg8
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
"par_idN105E6\n"
"help.text"
-msgid "Erase Arraylist"
-msgstr "Erase Список_массивов"
+msgid "Erase array1 [, array2 [,...]]"
+msgstr ""
-#. zfSit
+#. 8J4Ab
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN105E9\n"
+"par_idN105ED\n"
"help.text"
-msgid "Parameters:"
-msgstr "Параметры:"
+msgid "<emph>array list</emph> - A comma delimited list of arrays to be erased."
+msgstr ""
-#. r46GH
+#. FiDAp
#: 03104700.xhp
msgctxt ""
"03104700.xhp\n"
-"par_idN105ED\n"
+"bas_id821588866562452\n"
+"help.text"
+msgid "Erase a, c(Ubound(c)) ' b and c(0) are unchanged"
+msgstr ""
+
+#. tYVCK
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"bas_id701588866563382\n"
"help.text"
-msgid "<emph>Arraylist</emph> - The list of arrays to be erased."
-msgstr "<emph>Список_массивов</emph>. Список массивов, которые будут удалены."
+msgid "Erase b, c(0) ' everything gets cleared"
+msgstr ""
+
+#. LvkX5
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id161588865796615\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03102100.xhp\" name=\"Dim statement\">Dim</link> or <link href=\"text/sbasic/shared/03102101.xhp\" name=\"ReDim statement\">ReDim</link> statements"
+msgstr ""
+
+#. h7XZF
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id281588865818334\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03104200.xhp\" name=\"Array function\">Array</link> or <link href=\"text/sbasic/shared/03104300.xhp\" name=\"DimArray function\">DimArray</link> functions"
+msgstr ""
+
+#. FA4C9
+#: 03104700.xhp
+msgctxt ""
+"03104700.xhp\n"
+"par_id761588867124078\n"
+"help.text"
+msgid "<link href=\"text/sbasic/shared/03102900.xhp\" name=\"lower bound function\">Lbound</link> and <link href=\"text/sbasic/shared/03103000.xhp\" name=\"upper bound function\">Ubound</link> functions"
+msgstr ""
#. y97EV
#: 03110000.xhp
@@ -38806,13 +38662,13 @@ msgctxt ""
msgid "<emph>numdecimalplaces</emph>: Optional. Specifies how many places to the right of the decimal are included in the rounding. Default is 0."
msgstr ""
-#. TpV6F
+#. g7CVV
#: 03170000.xhp
msgctxt ""
"03170000.xhp\n"
"par_id061420170153186193\n"
"help.text"
-msgid "<link href=\"text/scalc/01/04060106.xhp#bm_id3158121\">Calc ROUND function</link>"
+msgid "<link href=\"text/scalc/01/04060106.xhp#Section21\">Calc ROUND function</link>"
msgstr ""
#. 3ECTM
@@ -40741,13 +40597,13 @@ msgctxt ""
msgid "When using <link href=\"text/sbasic/shared/vbasupport.xhp\" name=\"Option VBASupport\">Option VBASupport 1</link>, <literal>Optional</literal> arguments with no default value (<emph>= expression</emph>) are initialized according to their data type, except if <literal>Variant</literal>."
msgstr ""
-#. KG4tC
+#. fDUEu
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013456\n"
"help.text"
-msgid "<variable id=\"arrayh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"array syntax fragment\"/></variable>array fragment"
+msgid "<variable id=\"arrayh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"array syntax fragment\">array fragment</link></variable>"
msgstr ""
#. YD32W
@@ -40795,13 +40651,13 @@ msgctxt ""
msgid "Multiple dimensions for an array are denoted using comma (<emph>,</emph>) sign."
msgstr ""
-#. bGJWo
+#. DeXti
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013458\n"
"help.text"
-msgid "<variable id=\"typenameh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"data types fragment\"/></variable>typename fragment"
+msgid "<variable id=\"typenameh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"data types fragment\">typename fragment</link></variable>"
msgstr ""
#. AqfYj
@@ -40813,13 +40669,13 @@ msgctxt ""
msgid "<image src=\"media/helpimg/sbasic/typename_fragment.svg\" id=\"img_id4157296484514\"><alt id=\"alt_id15152796484515\">primitive data types fragment</alt></image>"
msgstr ""
-#. CiDZr
+#. dM8Yg
#: fragments.xhp
msgctxt ""
"fragments.xhp\n"
"hd_id231587046013459\n"
"help.text"
-msgid "<variable id=\"charh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"type declaration characters fragment\"/></variable>char fragment"
+msgid "<variable id=\"charh4\"><link href=\"text/sbasic/shared/fragments.xhp\" name=\"type declaration characters fragment\">char fragment</link></variable>"
msgstr ""
#. JFwPg
diff --git a/source/ru/helpcontent2/source/text/scalc/01.po b/source/ru/helpcontent2/source/text/scalc/01.po
index e9182e79e5e..6ad47999f9f 100644
--- a/source/ru/helpcontent2/source/text/scalc/01.po
+++ b/source/ru/helpcontent2/source/text/scalc/01.po
@@ -3,8 +3,8 @@ msgid ""
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: 2020-05-05 14:59+0200\n"
-"PO-Revision-Date: 2020-03-11 18:16+0000\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
+"PO-Revision-Date: 2020-05-20 11:28+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_help-master/textscalc01/ru/>\n"
"Language: ru\n"
@@ -599,7 +599,7 @@ msgctxt ""
"par_id3153415\n"
"help.text"
msgid "The <emph>Headers/Footers</emph> dialog contains the tabs for defining headers and footers. There will be separate tabs for the left and right page headers and footers if the <emph>Same content left/right</emph> option was not marked in the <link href=\"text/scalc/01/05070000.xhp\" name=\"Page Style\"><emph>Page Style</emph></link> dialog."
-msgstr ""
+msgstr "Диалог <emph>Колонтитулы</emph> содержит вкладки для настройки верхних и нижних колонтитулов. Будут представлены отдельные вкладки для левой и правой страницы с колонтитулами, если опция <emph>Одинаковое содержимое слева/справа</emph> не была выбрана в диалоге <link href=\"text/scalc/01/05070000.xhp\" name=\"Page Style\"><emph>Стиль страницы</emph></link>."
#. CTq6U
#: 02120100.xhp
@@ -1247,7 +1247,7 @@ msgctxt ""
"par_id3150769\n"
"help.text"
msgid "To select multiple sheets, click each sheet tab while pressing <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> or <keycode>Shift</keycode>."
-msgstr ""
+msgstr "Чтобы выбрать несколько листов, щёлкайте каждую вкладку листа, удерживая нажатой клавишу <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> или <keycode>Shift</keycode>."
#. FYuCU
#: 02140500.xhp
@@ -1283,7 +1283,7 @@ msgctxt ""
"par_id3153726\n"
"help.text"
msgid "Press <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> and click the tab of the sheet where you want to insert the contents."
-msgstr ""
+msgstr "Нажмите клавишу <switchinline select=\"sys\"><caseinline select=\"MAC\"><keycode>Command</keycode></caseinline><defaultinline><keycode>Ctrl</keycode></defaultinline></switchinline> и щёлкните вкладку листа, куда нужно вставить содержимое."
#. medyk
#: 02140500.xhp
@@ -1292,7 +1292,7 @@ msgctxt ""
"par_id3147436\n"
"help.text"
msgid "Select the command <menuitem>Sheet - Fill Cells - Sheets</menuitem>. In the dialog which appears, the check box <emph>Numbers</emph> must be selected (or <emph>Paste All</emph>) if you want to combine operations with the values. You can also choose the desired operation here."
-msgstr ""
+msgstr "Выберите пункт меню <menuitem>Лист - Заполнить - Листы</menuitem>. В открывшемся диалоге должна быть отмечена опция <emph>Числа</emph> (или <emph>Вставить все</emph>), если вы хотите комбинировать операции со значениями. Здесь также можно выбрать желаемую операцию."
#. yNrLG
#: 02140500.xhp
@@ -1310,7 +1310,7 @@ msgctxt ""
"par_id3156283\n"
"help.text"
msgid "This dialog is similar to the <link href=\"text/shared/01/02070000.xhp\" name=\"Paste Special\"><emph>Paste Special</emph></link> dialog, where you can find additional tips."
-msgstr ""
+msgstr "Этот диалог похож на диалог <link href=\"text/shared/01/02070000.xhp\" name=\"Paste Special\"><emph>Вставить как...</emph></link>, где можно найти дополнительные советы."
#. B6GAM
#: 02140600.xhp
@@ -1337,7 +1337,7 @@ msgctxt ""
"par_id3148797\n"
"help.text"
msgid "<variable id=\"reihenfuellentext\"><ahelp hid=\".uno:FillSeries\">Automatically generate series with the options in this dialog. Determine direction, increment, time unit and series type.</ahelp></variable>"
-msgstr ""
+msgstr "<variable id=\"reihenfuellentext\"><ahelp hid=\".uno:FillSeries\">Автоматически генерирует ряды, используя опции в этом диалоге. Определите направление, приращение, единицу времени и тип ряда.</ahelp></variable>"
#. WnPsX
#: 02140600.xhp
@@ -1463,7 +1463,7 @@ msgctxt ""
"par_id3149257\n"
"help.text"
msgid "Defines the series type. Choose between <emph>Linear</emph>, <emph>Growth</emph>, <emph>Date</emph> and <emph>AutoFill</emph>."
-msgstr ""
+msgstr "Задаёт тип рядов. Выберите между <emph>Линейный</emph>, <emph>Геометрический</emph>, <emph>Дата</emph> и <emph>Автозаполнение</emph>."
#. yfoVv
#: 02140600.xhp
@@ -5830,14 +5830,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_AMORDEGRC\">Calculates the amount of depreciation for a settlement period as degressive amortization.</ahelp> Unlike AMORLINC, a depreciation coefficient that is independent of the depreciable life is used here."
msgstr "<ahelp hid=\"HID_AAI_FUNC_AMORDEGRC\">Служит для расчета величины дегрессивной амортизации за платежный период.</ahelp> В отличие от AMORLINC для этой функции используется коэффициент амортизации, не зависящий от периода амортизации."
-#. i8TkC
+#. DEtMa
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147427\n"
"help.text"
-msgid "AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)"
-msgstr "AMORDEGRC(Стоимость; Дата; Первый период; Ликвидационная стоимость; Период; Процент; Базис)"
+msgid "AMORDEGRC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])"
+msgstr ""
#. bA2pT
#: 04060103.xhp
@@ -5920,14 +5920,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_AMORLINC\">Calculates the amount of depreciation for a settlement period as linear amortization. If the capital asset is purchased during the settlement period, the proportional amount of depreciation is considered.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_AMORLINC\">Служит для расчета величины линейной амортизации за платежный период. Если имущество приобретено в течение платежного периода, используется пропорционально распределенная амортизация.</ahelp>"
-#. 3n4Kb
+#. jD9JZ
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147363\n"
"help.text"
-msgid "AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate; Basis)"
-msgstr "AMORLINC(Стоимость; Дата; Первый период; Ликвидационная стоимость; Период; Процент; Базис)"
+msgid "AMORLINC(Cost; DatePurchased; FirstPeriod; Salvage; Period; Rate[; Basis])"
+msgstr ""
#. PsFjE
#: 04060103.xhp
@@ -6019,14 +6019,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_ACCRINT\">Calculates the accrued interest of a security in the case of periodic payments.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_ACCRINT\">Служит для расчета накопленного дохода для ценных бумаг в случае периодических платежей.</ahelp>"
-#. oHnfa
+#. yGdCf
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3159092\n"
"help.text"
-msgid "ACCRINT(Issue; FirstInterest; Settlement; Rate; Par; Frequency; Basis)"
-msgstr "ACCRINT(Выпуск; Первый процент; Соглашение; Ставка; Номинал; Частота; Базис)"
+msgid "ACCRINT(Issue; FirstInterest; Settlement; Rate; [Par]; Frequency[; Basis])"
+msgstr ""
#. PKp6i
#: 04060103.xhp
@@ -6127,14 +6127,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_ACCRINTM\">Calculates the accrued interest of a security in the case of one-off payment at the settlement date.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_ACCRINTM\">Служит для расчета накопленного дохода для ценных бумаг в случае разового платежа на дату соглашения.</ahelp>"
-#. uRZWP
+#. zFkiX
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3147074\n"
"help.text"
-msgid "ACCRINTM(Issue; Settlement; Rate; Par; Basis)"
-msgstr "ACCRINTM(Выпуск; Соглашение; Процент; Номинал; Базис)"
+msgid "ACCRINTM(Issue; Settlement; Rate[; Par][; Basis])"
+msgstr ""
#. pTobQ
#: 04060103.xhp
@@ -6334,14 +6334,14 @@ msgctxt ""
msgid "Enter these values either as numbers, expressions or references. If, for example, interest is paid annually at 8%, but you want to use month as your period, enter 8%/12 under <emph>Rate</emph> and <item type=\"productname\">%PRODUCTNAME</item> Calc with automatically calculate the correct factor."
msgstr "Введите значения в виде чисел, выражений или ссылок. Например, если ежегодный процент составляет 8%, но в качестве периода требуется указать месяц, введите 8%/12 в поле <emph>Процент</emph> и <item type=\"productname\">%PRODUCTNAME</item> Calc автоматически рассчитает правильное значение."
-#. BVQTK
+#. uiDaD
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3150395\n"
"help.text"
-msgid "PV(Rate; NPer; Pmt; FV; Type)"
-msgstr "PV(Процент; КПЕР; ПЛТ; БС; Тип)"
+msgid "PV(Rate; NPer; Pmt[; FV][; Type])"
+msgstr ""
#. JrCA6
#: 04060103.xhp
@@ -7360,14 +7360,14 @@ msgctxt ""
msgid "Use this form of depreciation if you require a higher initial depreciation value as opposed to linear depreciation. The depreciation value gets less with each period and is usually used for assets whose value loss is higher shortly after purchase (for example, vehicles, computers). Please note that the book value will never reach zero under this calculation type."
msgstr "Такой метод снижения стоимости можно применять, если начальное значение обесценивания должно быть выше, чем при линейной амортизации. Значение амортизации уменьшается с каждым периодом и обычно используется для активов, для которых оно повышается после приобретения (например, для автомобилей или компьютеров). Обратите внимание, что балансовая стоимость никогда не достигает нуля при таком методе расчета."
-#. GnhjW
+#. EV3DT
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3166452\n"
"help.text"
-msgid "DDB(Cost; Salvage; Life; Period; Factor)"
-msgstr "DDB(Стоимость; Ликвидационная стоимость; Время эксплуатации; Период; Коэффициент)"
+msgid "DDB(Cost; Salvage; Life; Period[; Factor])"
+msgstr ""
#. VKnDB
#: 04060103.xhp
@@ -7468,14 +7468,14 @@ msgctxt ""
msgid "This form of depreciation is used if you want to get a higher depreciation value at the beginning of the depreciation (as opposed to linear depreciation). The depreciation value is reduced with every depreciation period by the depreciation already deducted from the initial cost."
msgstr "Такой метод снижения стоимости можно использовать, если значение в начале амортизации должно быть выше, чем при линейной амортизации. Значение амортизации уменьшается с каждым периодом на величину, которая уже вычтена из начальной стоимости."
-#. zaXLw
+#. EDXF8
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3153349\n"
"help.text"
-msgid "DB(Cost; Salvage; Life; Period; Month)"
-msgstr "DB(Стоимость; Ликвидационная стоимость; Время эксплуатации; Период; Месяц)"
+msgid "DB(Cost; Salvage; Life; Period[; Month])"
+msgstr ""
#. caSta
#: 04060103.xhp
@@ -7585,14 +7585,14 @@ msgctxt ""
msgid "If the payments take place at irregular intervals, use the <link href=\"text/scalc/01/04060118.xhp#xirr\" name=\"XIRR\">XIRR</link> function."
msgstr ""
-#. CCfhc
+#. zWTAW
#: 04060103.xhp
msgctxt ""
"04060103.xhp\n"
"par_id3155427\n"
"help.text"
-msgid "IRR(Values; Guess)"
-msgstr "IRR(Значения; Предположение)"
+msgid "IRR(Values[; Guess])"
+msgstr ""
#. o9R77
#: 04060103.xhp
@@ -9448,14 +9448,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_ZELLE\">Returns information on address, formatting or contents of a cell.</ahelp>"
msgstr "<ahelp hid=\"HID_FUNC_ZELLE\">Возвращает информацию об адресе, форматировании или содержимом ячейки.</ahelp>"
-#. P9UHc
+#. RWBPC
#: 04060104.xhp
msgctxt ""
"04060104.xhp\n"
"par_id3147355\n"
"help.text"
-msgid "CELL(\"InfoType\"; Reference)"
-msgstr "CELL(\"Тип информации\"; Ссылка)"
+msgid "CELL(\"InfoType\"[; Reference])"
+msgstr ""
#. wjBKt
#: 04060104.xhp
@@ -10195,14 +10195,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_WENN\">Specifies a logical test to be performed.</ahelp>"
msgstr "<ahelp hid=\"HID_FUNC_WENN\">Задаёт логическую проверку, которую требуется выполнить.</ahelp>"
-#. QQdtE
+#. qT9mo
#: 04060105.xhp
msgctxt ""
"04060105.xhp\n"
"par_id3154558\n"
"help.text"
-msgid "IF(Test; ThenValue; OtherwiseValue)"
-msgstr "IF(Тест; тогда_значение; иначе_значение)"
+msgid "IF(Test[; ThenValue][; OtherwiseValue])"
+msgstr ""
#. JnjcT
#: 04060105.xhp
@@ -63061,14 +63061,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_FUNC_WOCHENTAG\">Returns the day of the week for the given date value.</ahelp> The day is returned as an integer between 1 (Sunday) and 7 (Saturday) if no type or type=1 is specified. For other types, see the table below."
msgstr ""
-#. Q6BXr
+#. EDmeN
#: func_weekday.xhp
msgctxt ""
"func_weekday.xhp\n"
"par_id3149033\n"
"help.text"
-msgid "WEEKDAY(Number; Type)"
-msgstr "WEEKDAY(число; тип)"
+msgid "WEEKDAY(Number[; Type])"
+msgstr ""
#. mcF52
#: func_weekday.xhp
@@ -63808,13 +63808,13 @@ msgctxt ""
msgid "<ahelp hid=\".\">Returns the date calculated from a start date with a specific number of work days, before or after the start date. The calculation can include week-ends and holidays as non-working days.</ahelp>"
msgstr ""
-#. RRr3i
+#. ZFLiY
#: func_workday.intl.xhp
msgctxt ""
"func_workday.intl.xhp\n"
"par_id241020160008306838\n"
"help.text"
-msgid "WORKDAY.INTL(StartDate; Days; Weekend; Holidays)"
+msgid "WORKDAY.INTL(StartDate; Days[; Weekend][; Holidays])"
msgstr ""
#. gJg5G
@@ -63979,14 +63979,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_WORKDAY\"> The result is a date number that can be formatted as a date. You then see the date of a day that is a certain number of <emph>workdays</emph> away from the <emph>start date</emph>.</ahelp>"
msgstr "<ahelp hid=\"HID_AAI_FUNC_WORKDAY\"> Результатом является значение даты, которое может быть отформатировано как дата. Таким образом, получается дата дня, который входит в заданное число <emph>рабочих дней</emph>, начиная с <emph>начальной даты</emph>.</ahelp>"
-#. gSoD4
+#. fo6sg
#: func_workday.xhp
msgctxt ""
"func_workday.xhp\n"
"par_id3154844\n"
"help.text"
-msgid "WORKDAY(StartDate; Days; Holidays)"
-msgstr "WORKDAY(Начальная дата; Дни; Праздники)"
+msgid "WORKDAY(StartDate; Days[; Holidays])"
+msgstr ""
#. 35EG5
#: func_workday.xhp
@@ -64168,14 +64168,14 @@ msgctxt ""
msgid "<ahelp hid=\"HID_AAI_FUNC_YEARFRAC\">The result is the number of the years (including fractional part) between <emph>StartDate</emph> and <emph>EndDate</emph>.</ahelp>"
msgstr ""
-#. C3aRF
+#. AASCJ
#: func_yearfrac.xhp
msgctxt ""
"func_yearfrac.xhp\n"
"par_id3155823\n"
"help.text"
-msgid "YEARFRAC(StartDate; EndDate; Basis)"
-msgstr "YEARFRAC(Начальная дата; Конечная дата; Базис)"
+msgid "YEARFRAC(StartDate; EndDate[; Basis])"
+msgstr ""
#. JAA8u
#: func_yearfrac.xhp
@@ -64339,14 +64339,14 @@ msgctxt ""
msgid "Solver"
msgstr "Решатель"
-#. i2Coz
+#. pDGKS
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"bm_id7654652\n"
"help.text"
-msgid "<bookmark_value>goal seeking;solver</bookmark_value> <bookmark_value>what if operations;solver</bookmark_value> <bookmark_value>back-solving</bookmark_value> <bookmark_value>solver</bookmark_value>"
-msgstr "<bookmark_value>подбор параметра;решатель</bookmark_value><bookmark_value>операции \"что если\";решатель</bookmark_value><bookmark_value>решения обратных задач</bookmark_value><bookmark_value>решатель</bookmark_value>"
+msgid "<bookmark_value>goal seeking;solver</bookmark_value> <bookmark_value>what if operations;solver</bookmark_value> <bookmark_value>back-solving</bookmark_value> <bookmark_value>solver</bookmark_value> <bookmark_value>mathematical programming;solver for Calc</bookmark_value> <bookmark_value>mathematical optimization;solver for Calc</bookmark_value> <bookmark_value>operations research;solver for Calc</bookmark_value>"
+msgstr ""
#. cBvDd
#: solver.xhp
@@ -64357,131 +64357,230 @@ msgctxt ""
msgid "<variable id=\"solver\"><link href=\"text/scalc/01/solver.xhp\">Solver</link></variable>"
msgstr "<variable id=\"solver\"><link href=\"text/scalc/01/solver.xhp\">Решатель</link></variable>"
-#. VvLwc
+#. JGk9s
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9210486\n"
"help.text"
-msgid "<ahelp hid=\".\">Opens the Solver dialog. A solver allows you to solve equations with multiple unknown variables by goal-seeking methods.</ahelp>"
-msgstr "<ahelp hid=\".\">Открывает диалоговое окно \"Решатель\". Решатель позволяет решать уравнения с несколькими неизвестными с помощью методов решения обратных задач.</ahelp>"
+msgid "<ahelp hid=\".\">Opens the Solver dialog. A solver allows you to solve mathematical problems with multiple unknown variables and a set of constraints on the variables by goal-seeking methods.</ahelp>"
+msgstr ""
+
+#. wszcE
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id21589912365601\n"
+"help.text"
+msgid "Solver settings"
+msgstr ""
+
+#. 36mEY
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id501589912905479\n"
+"help.text"
+msgid "The dialog settings are retained until you close the current document."
+msgstr ""
+
+#. GgVk7
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id121589913023217\n"
+"help.text"
+msgid "Target Cell"
+msgstr ""
-#. ivjGw
+#. EsgHG
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id8538773\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter or click the cell reference of the target cell. This field takes the address of the cell whose value is to be optimized.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите или щёлкните ссылку на целевую ячейку. В это поле вводится адрес ячейки, значение которой должно быть оптимизировано.</ahelp>"
+msgid "<ahelp hid=\".\">Enter or click the cell reference of the target cell. This field takes the address of the cell whose value is to be optimized.</ahelp>"
+msgstr ""
+
+#. 9j2m7
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id441589913036601\n"
+"help.text"
+msgid "Optimize results to"
+msgstr ""
-#. pcopF
+#. U8Ttv
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7564012\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation for a maximum value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Попробуйте решить уравнение для максимального значения целевой ячейки.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Maximum:</emph> Try to solve the equation for a maximum value of the target cell.</ahelp>"
+msgstr ""
-#. MBtDo
+#. N5C2U
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id1186254\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation for a minimum value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Попытка решить уравнение для минимального значения целевой ячейки.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Minimum:</emph> Try to solve the equation for a minimum value of the target cell.</ahelp>"
+msgstr ""
-#. 7KTjo
+#. JAo82
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7432477\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Try to solve the equation to approach a given value of the target cell.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Попробуйте решить уравнение для приближения к данному значению целевой ячейки.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Value of:</emph> Try to solve the equation to approach a given value of the target cell.</ahelp>"
+msgstr ""
-#. xAB7a
+#. 5BC94
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id7141026\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter the value or a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите значение или ссылку на ячейку.</ahelp>"
+msgid "<ahelp hid=\".\">Enter the value or a cell reference in the text field.</ahelp>"
+msgstr ""
-#. AkKFT
+#. KMA6B
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id761589914010085\n"
+"help.text"
+msgid "By Changing Cells"
+msgstr ""
+
+#. VvrzV
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id8531449\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter the cell range that can be changed.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите диапазон ячеек, который может быть изменён.</ahelp>"
+msgid "<ahelp hid=\".\">Enter the cell range that can be changed.</ahelp> These are the variables of the equations."
+msgstr ""
+
+#. if7S9
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id671589914927836\n"
+"help.text"
+msgid "Limiting Conditions"
+msgstr ""
+
+#. QQCWC
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id421589915278885\n"
+"help.text"
+msgid "Add the set of constraints for the mathematical problem. Each constraint is represented by a cell reference (a variable), an operator, and a value."
+msgstr ""
-#. o7jUm
+#. YApta
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9183935\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите ссылку на ячейку.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Cell reference:</emph> Enter a cell reference of the variable.</ahelp>"
+msgstr ""
+
+#. eyxy9
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id1939451\n"
+"help.text"
+msgid "<ahelp hid=\".\">Click the Shrink button to shrink or restore the dialog. You can click or select cells in the sheet. You can enter a cell reference manually in the input box.</ahelp>"
+msgstr ""
-#. 7s5ZD
+#. CWWbZ
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id946684\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Select an operator from the list.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Выберите знак операции из списка.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Operator:</emph> Select an operator from the list.</ahelp> Use Binary operator to restrict your variable to 0 or 1. Use the Integer operator to restrict your variable to take only integer values (no decimal part)."
+msgstr ""
-#. Gj2Eo
+#. CtpNG
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id9607226\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter a value or a cell reference.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите значение или ссылку на ячейку.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Value:</emph> Enter a value or a cell reference.</ahelp> This field is ignored when the operator is Binary or Integer."
+msgstr ""
-#. 2iEku
+#. GzohM
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id1939451\n"
+"par_id9038972\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to shrink or restore the dialog. You can click or select cells in the sheet. You can enter a cell reference manually in the input box.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Щёлкните для сворачивания или восстановления диалогового окна. Можно щёлкнуть или выбрать ячейки на листах. Можно ввести ссылку на ячейку вручную в поле ввода.</ahelp>"
+msgid "<ahelp hid=\".\"><emph>Remove button:</emph> Click to remove the row from the list. Any rows from below this row move up.</ahelp>"
+msgstr ""
-#. FvWnk
+#. H3FEH
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id9038972\n"
+"par_id511589916338595\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to remove the row from the list. Any rows from below this row move up.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Щёлкните для удаления строки из списка. Все строки ниже этой строки переместятся вверх.</ahelp>"
+msgid "You can set multiple conditions for a variable. For example, a variable in cell A1 that must be an integer less than 10. In that case, set two limiting conditions for A1."
+msgstr ""
+
+#. B4DtG
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id441589917031236\n"
+"help.text"
+msgid "Options"
+msgstr ""
-#. GqxKL
+#. AheHK
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id2423780\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Opens the Options dialog.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Открытие диалогового окна \"Параметры\".</ahelp>"
+msgid "<ahelp hid=\".\">Opens the <link href=\"text/scalc/01/solver_options.xhp#solveroptionsh1\" name=\"solveroptions\">Solver Options</link> dialog.</ahelp>"
+msgstr ""
-#. ssqdF
+#. jDGPG
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id221589917833431\n"
+"help.text"
+msgid "The <emph>Solver Options</emph> dialog let you select the different solver algorithms for either linear and non-linear problems and set their solving parameters."
+msgstr ""
+
+#. 8YGDA
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"hd_id771589917064147\n"
+"help.text"
+msgid "Solve"
+msgstr ""
+
+#. jFwTt
#: solver.xhp
msgctxt ""
"solver.xhp\n"
"par_id2569658\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Click to solve the equation with the current settings. The dialog settings are retained until you close the current document.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Щёлкните для решения уравнения с текущими параметрами. Параметры диалогового окна сохраняются до закрытия текущего документа.</ahelp>"
+msgid "<ahelp hid=\".\">Click to solve the problem with the current settings. The dialog settings are retained until you close the current document.</ahelp>"
+msgstr ""
#. VFnjv
#: solver.xhp
@@ -64519,122 +64618,770 @@ msgctxt ""
msgid "You can define a series of limiting conditions that set constraints for some cells. For example, you can set the constraint that one of the variables or cells must not be bigger than another variable, or not bigger than a given value. You can also define the constraint that one or more variables must be integers (values without decimals), or binary values (where only 0 and 1 are allowed)."
msgstr "Можно определить ряд условий, устанавливающих ограничения для некоторых ячеек. Например, можно установить следующее ограничение: одна из переменных или ячеек не должна быть больше другой переменной или определенного значения. Также можно ввести следующее ограничение: одна или более переменные должны быть целыми числами (значения без знаков после запятой) или двоичными числами (разрешены только значения 1 и 0)."
-#. bZZnv
+#. irGoh
#: solver.xhp
msgctxt ""
"solver.xhp\n"
-"par_id5323953\n"
+"hd_id0603200910430882\n"
"help.text"
-msgid "The default solver engine supports only linear equations."
-msgstr "По умолчанию механизм решателя поддерживает только линейные уравнения."
+msgid "Using Non-Linear solvers"
+msgstr ""
-#. dAcyJ
+#. UTzzV
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430845\n"
+"help.text"
+msgid "Regardless whether you use DEPS or SCO, you start by going to <menuitem>Tools - Solver</menuitem> and set the Cell to be optimized, the direction to go (minimization, maximization) and the cells to be modified to reach the goal. Then you go to the Options and specify the solver to be used and if necessary adjust the according <link href=\"text/scalc/01/solver_options.xhp\">parameters</link>."
+msgstr ""
+
+#. gJGz2
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430821\n"
+"help.text"
+msgid "There is also a list of constraints you can use to restrict the possible range of solutions or to penalize certain conditions. However, in case of the evolutionary solvers DEPS and SCO, these constraints are also used to specify bounds on the variables of the problem. Due to the random nature of the algorithms, it is <emph>highly recommended</emph> to do so and give upper (and in case \"Assume Non-Negative Variables\" is turned off also lower) bounds for all variables. They don't have to be near the actual solution (which is probably unknown) but should give a rough indication of the expected size (0 ≤ var ≤ 1 or maybe -1000000 ≤ var ≤ 1000000)."
+msgstr ""
+
+#. GFZqJ
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id0603200910430873\n"
+"help.text"
+msgid "Bounds are specified by selecting one or more variables (as range) on the left side and entering a numerical value (not a cell or a formula) on the right side. That way you can also choose one or more variables to be <emph>Integer</emph> or <emph>Binary</emph> only."
+msgstr ""
+
+#. ZUeCC
+#: solver.xhp
+msgctxt ""
+"solver.xhp\n"
+"par_id271589981559367\n"
+"help.text"
+msgid "<link href=\"https://wiki.documentfoundation.org/\" name=\"wikipage\">Wiki page on solvers and theirs algorithms</link>"
+msgstr ""
+
+#. akxrP
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"tit\n"
"help.text"
-msgid "Options"
-msgstr "Параметры"
+msgid "Solver Options"
+msgstr ""
-#. 2p755
+#. UBnZK
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"bm_id291590166034871\n"
+"help.text"
+msgid "<bookmark_value>solver for Calc;options</bookmark_value>"
+msgstr ""
+
+#. vZkr3
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"hd_id2794274\n"
"help.text"
-msgid "Options"
-msgstr "Параметры"
+msgid "<variable id=\"solveroptionsh1\"><link href=\"text/scalc/01/solver_options.xhp\" name=\"Solver Options\">Solver Options</link></variable>"
+msgstr ""
-#. 4v4nE
+#. LHgS8
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id6776940\n"
+"par_id3163853\n"
"help.text"
-msgid "The Options dialog for the <link href=\"text/scalc/01/solver.xhp\">Solver</link> is used to set some options."
-msgstr "Диалоговое окно \"Параметры\" для <link href=\"text/scalc/01/solver.xhp\">решателя</link> используется для определения нескольких параметров."
+msgid "Use the Options dialog to configure the solver engine."
+msgstr ""
-#. 8D7tG
+#. mFtPo
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"par_id9999694\n"
+"help.text"
+msgid "Click OK to accept the changes and to go back to the <link href=\"text/scalc/01/solver.xhp\">Solver</link> dialog."
+msgstr "Нажмите кнопку \"OK\" для принятия изменений и возврата к диалоговому окну <link href=\"text/scalc/01/solver.xhp\">Решатель</link>."
+
+#. gE7WZ
+#: solver_options.xhp
+msgctxt ""
+"solver_options.xhp\n"
+"hd_id581589922716672\n"
+"help.text"
+msgid "Solver engine"
+msgstr ""
+
+#. A7MrG
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
"par_id393993\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Select a solver engine. The listbox is disabled if only one solver engine is installed. Solver engines can be installed as extensions.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Выберите механизм решателя. Если установлен только один механизм решателя, список недоступен. Механизмы решателя могут быть установлены как расширения.</ahelp>"
+msgid "<ahelp hid=\".\">Select a solver engine. The listbox is disabled if only one solver engine is installed.</ahelp>"
+msgstr ""
-#. JuBPY
+#. NMHJR
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id5871761\n"
+"par_id221589959855748\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Configure the current solver.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Настройка текущего решателя.</ahelp>"
+msgid "You can install more solver engines as extensions, if available. Open <menuitem>Tools - Extension Manager</menuitem> and browse to the Extensions web site to search for extensions."
+msgstr ""
-#. 9ATtL
+#. QtDyE
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id6531266\n"
+"hd_id711589922750833\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">If the current entry in the Settings listbox allows you to edit a value, you can click the Edit button. A dialog opens where you can change the value.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Если текущий элемент в списке \"Параметры\" допускает правку значения, то будет доступна кнопка \"Изменить\". При её нажатии открывается диалоговое окно, в котором можно изменить значение.</ahelp>"
+msgid "Settings"
+msgstr ""
-#. yRRMt
+#. ncgjf
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3912778\n"
+"par_id130619\n"
"help.text"
-msgid "<ahelp hid=\".\" visibility=\"hidden\">Enter or change the value.</ahelp>"
-msgstr "<ahelp hid=\".\" visibility=\"hidden\">Введите или измените значение.</ahelp>"
+msgid "Configure the current solver. In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click <emph>Edit</emph> to open a dialog where you can change the value."
+msgstr ""
-#. FdSQu
+#. DPYew
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3163853\n"
+"hd_id481589922813764\n"
"help.text"
-msgid "Use the Options dialog to configure the current solver engine."
-msgstr "Используйте диалоговое окно \"Параметры\" для настройки текущего механизма решателя."
+msgid "Edit"
+msgstr ""
-#. edT9Q
+#. XZbDB
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id121158\n"
+"par_id6531266\n"
"help.text"
-msgid "You can install more solver engines as extensions, if available. Open Tools - Extension Manager and browse to the Extensions web site to search for extensions."
-msgstr "Дополнительные механизмы решателя (при их наличии) можно установить в качестве расширений. Откройте меню \"Сервис - Управление расширениями\" и выберите \"Веб-сайт с расширениями\" для поиска расширений."
+msgid "<ahelp hid=\".\">If the current entry in the Settings listbox allows you to edit a value, you can click the Edit button. A dialog opens where you can change the value.</ahelp>"
+msgstr ""
-#. YGbpY
+#. JzS8w
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id3806878\n"
+"hd_id331589923158248\n"
"help.text"
-msgid "Select the solver engine to use and to configure from the listbox. The listbox is disabled if only one solver engine is installed."
+msgid "Edit settings spin box"
msgstr ""
-#. kk9QD
+#. B4WMx
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id130619\n"
+"par_id3912778\n"
"help.text"
-msgid "In the Settings box, check all settings that you want to use for the current goal seeking operation. If the current option offers different values, the Edit button is enabled. Click Edit to open a dialog where you can change the value."
-msgstr "В поле \"Параметры\" проверьте все установки для текущей операции решения обратной задачи. Если текущий параметр может принимать различные значения, то активируется кнопка \"Правка\". Щёлкните \"Правка\" для открытия диалогового окна, в котором можно изменить значение."
+msgid "<ahelp hid=\".\">Enter or change the value of the selected setting.</ahelp>"
+msgstr ""
-#. mFtPo
+#. cYCVf
#: solver_options.xhp
msgctxt ""
"solver_options.xhp\n"
-"par_id9999694\n"
+"par_id271589981559367\n"
"help.text"
-msgid "Click OK to accept the changes and to go back to the <link href=\"text/scalc/01/solver.xhp\">Solver</link> dialog."
-msgstr "Нажмите кнопку \"OK\" для принятия изменений и возврата к диалоговому окну <link href=\"text/scalc/01/solver.xhp\">Решатель</link>."
+msgid "<link href=\"https://wiki.documentfoundation.org/NLPSolver\" name=\"wikipage\">Wiki page on non-linear solvers and theirs algorithms</link>"
+msgstr ""
+
+#. A843R
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"tit\n"
+"help.text"
+msgid "Options"
+msgstr ""
+
+#. U9kTW
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"bm_id0503200917110375_scalc\n"
+"help.text"
+msgid "<bookmark_value>Solver for Nonlinear Problems;Options</bookmark_value> <bookmark_value>solver for Calc; DEPS evolutionary algorithm</bookmark_value> <bookmark_value>solver for Calc; SCO evolutionary algorithm</bookmark_value> <bookmark_value>solver for Calc; linear solver</bookmark_value> <bookmark_value>solver for Calc; CoinMP linear solver</bookmark_value> <bookmark_value>solver for Calc; swarm non-linear solver</bookmark_value>"
+msgstr ""
+
+#. atkqE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"hd_id0503200917103593\n"
+"help.text"
+msgid "<variable id=\"SolverAlgorithmsOptionsh1\"><link href=\"text/scalc/01/solver_options_algo.xhp#SolverAlgorithmsOptionsh1\" name=\"Solver Algorithms Options\">Solver Algorithms Options</link></variable>"
+msgstr ""
+
+#. RjM8p
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id651589925044267\n"
+"help.text"
+msgid "<variable id=\"DEPSEvolutionaryalgorithmh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#DEPSEvolutionaryalgorithmh2\" name=\"DEPS Evolutionary algorithm\">DEPS Evolutionary Algorithm</link></variable>"
+msgstr ""
+
+#. xBZfN
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id931590164412542\n"
+"help.text"
+msgid "DEPS consists of two independent algorithms: Differential Evolution and Particle Swarm Optimization. Both are especially suited for numerical problems, such as nonlinear optimization, and are complementary to each other in that they even out their others shortcomings."
+msgstr ""
+
+#. EFbzc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394232\n"
+"help.text"
+msgid "Agent Switch Rate"
+msgstr ""
+
+#. E3ZoK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394248\n"
+"help.text"
+msgid "Specifies the probability for an individual to choose the Differential Evolution strategy."
+msgstr ""
+
+#. DbnUB
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394277\n"
+"help.text"
+msgid "DE: Crossover Probability"
+msgstr ""
+
+#. phaC2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394280\n"
+"help.text"
+msgid "Defines the probability of the individual being combined with the globally best point. If crossover is not used, the point is assembled from the own memory of the individual."
+msgstr ""
+
+#. G4GC9
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0643200910394216\n"
+"help.text"
+msgid "DE: Scaling Factor"
+msgstr ""
+
+#. qKt78
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id360320091039424\n"
+"help.text"
+msgid "During crossover, the scaling factor decides about the “speed” of movement."
+msgstr ""
+
+#. HPPHg
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0507200917103771\n"
+"help.text"
+msgid "Learning Cycles"
+msgstr ""
+
+#. ED86j
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503210917103720\n"
+"help.text"
+msgid "Defines the number of iterations, the algorithm should take. In each iteration, all individuals make a guess on the best solution and share their knowledge."
+msgstr ""
+
+#. M5Ka8
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id3603200910394222\n"
+"help.text"
+msgid "PS: Cognitive Constant"
+msgstr ""
+
+#. bVENc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id3603200915394212\n"
+"help.text"
+msgid "Sets the importance of the own memory (in particular the best reached point so far)."
+msgstr ""
+
+#. ujBHP
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060324091037421\n"
+"help.text"
+msgid "PS: Constriction Coefficient"
+msgstr ""
+
+#. Z86BZ
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0608200910394225\n"
+"help.text"
+msgid "Defines the speed at which the particles/individuals move towards each other."
+msgstr ""
+
+#. nFnAu
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060320091039425\n"
+"help.text"
+msgid "PS: Mutation Probability"
+msgstr ""
+
+#. fGiKi
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394272\n"
+"help.text"
+msgid "Defines the probability, that instead of moving a component of the particle towards the best point, it randomly chooses a new value from the valid range for that variable."
+msgstr ""
+
+#. nn4Ms
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394292\n"
+"help.text"
+msgid "PS: Social Constant"
+msgstr ""
+
+#. nAD2Z
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910394284\n"
+"help.text"
+msgid "Sets the importance of the global best point between all particles/individuals."
+msgstr ""
+
+#. GAGDE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200217103891\n"
+"help.text"
+msgid "<variable id=\"enhstatusheader\">Show Enhanced Solver Status</variable>"
+msgstr ""
+
+#. na8Ee
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0523200917103832\n"
+"help.text"
+msgid "<variable id=\"enhstatusdesc\">If <emph>enabled</emph>, an additional dialog is shown during the solving process which gives information about the current progress, the level of stagnation, the currently best known solution as well as the possibility, to stop or resume the solver.</variable>"
+msgstr ""
+
+#. 3LaZ7
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200417103780\n"
+"help.text"
+msgid "<variable id=\"swarmheader\">Size of Swarm</variable>"
+msgstr ""
+
+#. UhBid
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503100917103723\n"
+"help.text"
+msgid "<variable id=\"swarmdesc\">Defines the number of individuals to participate in the learning process. Each individual finds its own solutions and contributes to the overall knowledge.</variable>"
+msgstr ""
+
+#. r62GH
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0504200917103794\n"
+"help.text"
+msgid "<variable id=\"stagnationheader\">Stagnation Limit</variable>"
+msgstr ""
+
+#. LDNEL
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id050320091710377\n"
+"help.text"
+msgid "<variable id=\"stagnationdesc\">If this number of individuals found solutions within a close range, the iteration is stopped and the best of these values is chosen as optimal.</variable>"
+msgstr ""
+
+#. vGYwe
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103762\n"
+"help.text"
+msgid "<variable id=\"stagtolheader\">Stagnation Tolerance</variable>"
+msgstr ""
+
+#. wqeXY
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103834\n"
+"help.text"
+msgid "<variable id=\"stagtoldesc\">Defines in what range solutions are considered “similar”.</variable>"
+msgstr ""
+
+#. jKuiG
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103740\n"
+"help.text"
+msgid "<variable id=\"acrheader\">Use ACR Comparator</variable>"
+msgstr ""
+
+#. D8e8D
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103766\n"
+"help.text"
+msgid "If <emph>disabled</emph> (default), the BCH Comparator is used. It compares two individuals by first looking at their constraint violations and only if those are equal, it measures their current solution."
+msgstr ""
+
+#. 7LWoa
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103744\n"
+"help.text"
+msgid "If <emph>enabled</emph>, the ACR Comparator is used. It compares two individuals dependent on the current iteration and measures their goodness with knowledge about the libraries worst known solutions (in regard to their constraint violations)."
+msgstr ""
+
+#. GZ7C2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103792\n"
+"help.text"
+msgid "Use Random Starting Point"
+msgstr ""
+
+#. EdJoF
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103790\n"
+"help.text"
+msgid "If <emph>enabled</emph>, the library is simply filled up with randomly chosen points."
+msgstr ""
+
+#. oCPc4
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103765\n"
+"help.text"
+msgid "If <emph>disabled</emph>, the currently present values (as given by the user) are inserted in the library as reference point."
+msgstr ""
+
+#. ctLqK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103732\n"
+"help.text"
+msgid "<variable id=\"variableguessheader\">Variable Bounds Guessing</variable>"
+msgstr ""
+
+#. rc95a
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id050320091710378\n"
+"help.text"
+msgid "<variable id=\"variableguessdesc\">If enabled (default), the algorithm tries to find variable bounds by looking at the starting values.</variable>"
+msgstr ""
+
+#. JctSA
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103794\n"
+"help.text"
+msgid "<variable id=\"variablethresheader\">Variable Bounds Threshold</variable>"
+msgstr ""
+
+#. NNyfL
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103710\n"
+"help.text"
+msgid "<variable id=\"variablethresdesc\">When guessing variable bounds, this threshold specifies, how the initial values are shifted to build the bounds. For an example how these values are calculated, please refer to the Manual in the Wiki.</variable>"
+msgstr ""
+
+#. UDXDh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id391589925078747\n"
+"help.text"
+msgid "<variable id=\"SCOEvolutionaryAlgorithmh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#SCOEvolutionaryAlgorithmh2\" name=\"SCO Evolutionary Algorithm\">SCO Evolutionary Algorithm</link></variable>"
+msgstr ""
+
+#. tqkJh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id681590165847694\n"
+"help.text"
+msgid "Social Cognitive Optimization takes into account the human behavior of learning and sharing information. Each individual has access to a common library with knowledge shared between all individuals."
+msgstr ""
+
+#. wovoy
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103771\n"
+"help.text"
+msgid "Learning Cycles"
+msgstr ""
+
+#. wgKE5
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0503200917103720\n"
+"help.text"
+msgid "Defines the number of iterations, the algorithm should take. In each iteration, all individuals make a guess on the best solution and share their knowledge."
+msgstr ""
+
+#. wrasx
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id0603200910401382\n"
+"help.text"
+msgid "Size of Library"
+msgstr ""
+
+#. 4PmLg
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id060320091040136\n"
+"help.text"
+msgid "Defines the amount of information to store in the public library. Each individual stores knowledge there and asks for information."
+msgstr ""
+
+#. EPiZn
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id741589980722689\n"
+"help.text"
+msgid "<embedvar href=\"text/scalc/01/solver_options_algo.xhp#variablethresheader\"/>"
+msgstr ""
+
+#. Ltucz
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id901589980722691\n"
+"help.text"
+msgid "<embedvar href=\"text/scalc/01/solver_options_algo.xhp#variablethresdesc\"/>"
+msgstr ""
+
+#. 46h4u
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id671589925148891\n"
+"help.text"
+msgid "<variable id=\"LinearSolverh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#LinearSolverh2\" name=\"%PRODUCTNAME Linear Solver\">%PRODUCTNAME Linear Solver and CoinMP Linear solver</link></variable>"
+msgstr ""
+
+#. PNEaC
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id731589925837981\n"
+"help.text"
+msgid "<variable id=\"settingshead\">Setting</variable>"
+msgstr ""
+
+#. DhVRA
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id611589925837982\n"
+"help.text"
+msgid "<variable id=\"descriptionhead\">Description</variable>"
+msgstr ""
+
+#. MqHfE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id511589925837984\n"
+"help.text"
+msgid "<variable id=\"integerhead\">Assume variables as integers</variable>"
+msgstr ""
+
+#. Javmc
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id11589925837985\n"
+"help.text"
+msgid "<variable id=\"integerdesc\">Mark to force variables to be integers only.</variable>"
+msgstr ""
+
+#. yie3u
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id221589961756407\n"
+"help.text"
+msgid "<variable id=\"noneghead\">Assume variables as non negative</variable>"
+msgstr ""
+
+#. ij2he
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id861589961756408\n"
+"help.text"
+msgid "<variable id=\"nonegdesc\">Mark to force variables to be positive only.</variable>"
+msgstr ""
+
+#. uEDEh
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id971589961907787\n"
+"help.text"
+msgid "Epsilon level"
+msgstr ""
+
+#. JSVtE
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id421589961907788\n"
+"help.text"
+msgid "Epsilon level. Valid values are in range 0 (very tight) to 3 (very loose). Epsilon is the tolerance for rounding values to zero."
+msgstr ""
+
+#. rtCLo
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id71589961998523\n"
+"help.text"
+msgid "Limit branch-and-bound depth"
+msgstr ""
+
+#. yeTw2
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id331589961998525\n"
+"help.text"
+msgid "Specifies the maximum branch-and-bound depth. A positive value means that the depth is absolute. A negative value means a relative branch-and-bound depth limit."
+msgstr ""
+
+#. pnUYs
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id91589962070327\n"
+"help.text"
+msgid "<variable id=\"timelimithead\">Solver time limit</variable>"
+msgstr ""
+
+#. PPtR8
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id331589962070329\n"
+"help.text"
+msgid "<variable id=\"timelimitdesc\">Sets the maximum time for the algorithm to converge to a solution.</variable>"
+msgstr ""
+
+#. 9WDm6
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id711589925192067\n"
+"help.text"
+msgid "<variable id=\"SwarmNonLinearSolverh2\"><link href=\"text/scalc/01/solver_options_algo.xhp#SwarmNonLinearSolverh2\" name=\"%PRODUCTNAME Swarm Non-Linear Solver (Experimental)\">%PRODUCTNAME Swarm Non-Linear Solver (Experimental)</link></variable>"
+msgstr ""
+
+#. TFadK
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id971589963431459\n"
+"help.text"
+msgid "Swarm algorithm"
+msgstr ""
+
+#. cgpYF
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id71589963431460\n"
+"help.text"
+msgid "Set the swarm algorithm. 0 for differential evolution and 1 for particle swarm optimization. Default is 0."
+msgstr ""
+
+#. ugAZb
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id271589981559367\n"
+"help.text"
+msgid "<link href=\"https://wiki.documentfoundation.org/NLPSolver\" name=\"wikipage\">Wiki page on non-linear solvers and theirs algorithms</link>"
+msgstr ""
+
+#. D2nCR
+#: solver_options_algo.xhp
+msgctxt ""
+"solver_options_algo.xhp\n"
+"par_id211590163660314\n"
+"help.text"
+msgid "<link href=\"http://lpsolve.sourceforge.net/\">lp_solve reference guide in sourceforge.net</link>"
+msgstr ""
#. Q6isn
#: stat_data.xhp
diff --git a/source/ru/helpcontent2/source/text/sdatabase.po b/source/ru/helpcontent2/source/text/sdatabase.po
new file mode 100644
index 00000000000..bcb78a91063
--- /dev/null
+++ b/source/ru/helpcontent2/source/text/sdatabase.po
@@ -0,0 +1,140 @@
+#. extracted from helpcontent2/source/text/sdatabase
+msgid ""
+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: 2020-05-19 12:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Accelerator-Marker: ~\n"
+"X-Generator: LibreOffice\n"
+
+#. cLmBi
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"tit\n"
+"help.text"
+msgid "%PRODUCTNAME Database"
+msgstr ""
+
+#. yxuCC
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"bm_id8622089\n"
+"help.text"
+msgid "<bookmark_value>databases;main page (Base)</bookmark_value><bookmark_value>$[officename] Base data sources</bookmark_value><bookmark_value>data sources;$[officename] Base</bookmark_value>"
+msgstr ""
+
+#. yR4MP
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN10579\n"
+"help.text"
+msgid "<variable id=\"base\"><link href=\"text/sdatabase/main.xhp\">Using Databases in %PRODUCTNAME Base</link></variable>"
+msgstr ""
+
+#. FvcWc
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107BD\n"
+"help.text"
+msgid "In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle."
+msgstr ""
+
+#. RRoXE
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id5864131\n"
+"help.text"
+msgid "The following database types are read-only types in %PRODUCTNAME Base. From within %PRODUCTNAME Base it is not possible to change the database structure or to edit, insert, and delete database records for these database types:"
+msgstr ""
+
+#. uAqcW
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id8865016\n"
+"help.text"
+msgid "Spreadsheet files"
+msgstr ""
+
+#. U7fFX
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id3786736\n"
+"help.text"
+msgid "Text files"
+msgstr ""
+
+#. WPAC3
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id6747337\n"
+"help.text"
+msgid "Address book data"
+msgstr ""
+
+#. TchjD
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107C0\n"
+"help.text"
+msgid "Using a Database in %PRODUCTNAME"
+msgstr ""
+
+#. cBbKE
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN10838\n"
+"help.text"
+msgid "To create a new database file, choose <emph>File - New - Database</emph>."
+msgstr ""
+
+#. h4EpR
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN1083B\n"
+"help.text"
+msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
+msgstr ""
+
+#. 2jPWg
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN107E7\n"
+"help.text"
+msgid "The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file."
+msgstr ""
+
+#. 4DEr3
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_idN1084A\n"
+"help.text"
+msgid "To open a database file, choose <emph>File - Open</emph>. In the <emph>File type</emph> list box, select to view only \"Database documents\". Select a database document and click <emph>Open</emph>."
+msgstr ""
+
+#. QFEDB
+#: main.xhp
+msgctxt ""
+"main.xhp\n"
+"par_id6474806\n"
+"help.text"
+msgid "<link href=\"https://wiki.documentfoundation.org/Database\" name=\"wiki.documentfoundation.org Database\">Wiki page about Base</link>"
+msgstr ""
diff --git a/source/ru/helpcontent2/source/text/shared/00.po b/source/ru/helpcontent2/source/text/shared/00.po
index 680e60fa831..603a50fd557 100644
--- a/source/ru/helpcontent2/source/text/shared/00.po
+++ b/source/ru/helpcontent2/source/text/shared/00.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 00\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-04-27 15:54+0200\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
"PO-Revision-Date: 2020-02-01 14:35+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_help-master/textshared00/ru/>\n"
@@ -3877,6 +3877,24 @@ msgctxt ""
msgid "*.odm"
msgstr "*.odm"
+#. vxBEx
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_idN10779\n"
+"help.text"
+msgid "ODF Master Document Template"
+msgstr ""
+
+#. h9xwQ
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_idN1077E\n"
+"help.text"
+msgid "*.otm"
+msgstr ""
+
#. nkBGU
#: 00000021.xhp
msgctxt ""
@@ -4219,23 +4237,41 @@ msgctxt ""
msgid "OpenOffice.org 3, StarOffice 9, Oracle Open Office"
msgstr "OpenOffice.org 3, StarOffice 9, Oracle Open Office"
-#. vD7AT
+#. yDRTc
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id1001200912381153\n"
+"par_id1001200912381154\n"
"help.text"
-msgid "ODF 1.2 (Extended)"
-msgstr "ODF 1.2 (расширенный)"
+msgid "ODF 1.2 Extended (compatibility mode)"
+msgstr ""
-#. UjbNC
+#. 8yWdz
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id100120091238112\n"
+"par_id100120091238113\n"
"help.text"
msgid "-"
-msgstr "-"
+msgstr ""
+
+#. JvqYD
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381175\n"
+"help.text"
+msgid "LibreOffice 3.5"
+msgstr ""
+
+#. Absnz
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381153\n"
+"help.text"
+msgid "ODF 1.2 Extended"
+msgstr ""
#. 3rCcz
#: 00000021.xhp
@@ -4246,23 +4282,59 @@ msgctxt ""
msgid "OpenOffice.org 3.2 or StarOffice 9.2"
msgstr "OpenOffice.org 3.2 или StarOffice 9.2"
-#. mrGRB
+#. GGUsk
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_id0514200811525591\n"
+"par_id1001200912381155\n"
"help.text"
-msgid "In current versions, you can select to save your documents using ODF 1.2 (default) or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version."
+msgid "ODF 1.3"
msgstr ""
-#. y6aBs
+#. 9DZNb
#: 00000021.xhp
msgctxt ""
"00000021.xhp\n"
-"par_idN107E9\n"
+"par_id100120091238114\n"
+"help.text"
+msgid "TBD"
+msgstr ""
+
+#. TtGnn
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381176\n"
+"help.text"
+msgid "LibreOffice 7.0"
+msgstr ""
+
+#. ks8eU
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381156\n"
"help.text"
-msgid "If you want to exchange documents with users that still use OpenOffice.org 1 or StarOffice 7, save the document using the respectively named filter in the <emph>File type</emph> listbox."
-msgstr "Если необходимо обеспечить обмен документами с пользователями, которые используют приложения OpenOffice.org 1 или StarOffice 7, сохраните документ с помощью фильтра с соответствующим именем, выбрав его в поле со списком <emph>Тип файла</emph>."
+msgid "ODF 1.3 Extended"
+msgstr ""
+
+#. ZH6EB
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id1001200912381177\n"
+"help.text"
+msgid "LibreOffice 7.0"
+msgstr ""
+
+#. HGRdD
+#: 00000021.xhp
+msgctxt ""
+"00000021.xhp\n"
+"par_id0514200811525591\n"
+"help.text"
+msgid "In current versions, you can select to save your documents using ODF 1.2 or ODF 1.0/1.1 (for backward compatibility). Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - Load/Save - General</menuitem> and select the ODF format version."
+msgstr ""
#. wCawc
#: 00000021.xhp
@@ -8539,13 +8611,13 @@ msgctxt ""
msgid "<variable id=\"allg\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - General</emph>.</variable>"
msgstr ""
-#. QpVmF
+#. 7eLKJ
#: 00000406.xhp
msgctxt ""
"00000406.xhp\n"
"par_id3159153\n"
"help.text"
-msgid "<variable id=\"ansicht\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><emph>%PRODUCTNAME - Preferences</emph></caseinline><defaultinline><emph>Tools - Options</emph></defaultinline></switchinline><emph> - $[officename] - View</emph>.</variable>"
+msgid "<variable id=\"view\">Choose <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - $[officename] - View</menuitem>.</variable>"
msgstr ""
#. LLvWB
diff --git a/source/ru/helpcontent2/source/text/shared/01.po b/source/ru/helpcontent2/source/text/shared/01.po
index a2974b9fa80..c19289215ce 100644
--- a/source/ru/helpcontent2/source/text/shared/01.po
+++ b/source/ru/helpcontent2/source/text/shared/01.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-29 22:17+0200\n"
+"POT-Creation-Date: 2020-05-20 13:08+0200\n"
"PO-Revision-Date: 2020-03-13 11:33+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_help-master/textshared01/ru/>\n"
@@ -3742,167 +3742,185 @@ msgctxt ""
msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of tables in the file.</caseinline><caseinline select=\"CALC\">Number of sheets in the file.</caseinline></switchinline> This statistic <emph>does not</emph> include tables that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects."
msgstr ""
-#. EZWri
+#. gCAE7
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153311\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Cells:</caseinline></switchinline>"
+msgid "Cells:"
msgstr ""
-#. seVAH
+#. sLNFC
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3156114\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Number of cells with content in the file.</caseinline></switchinline>"
+msgid "Number of cells with content in the file."
msgstr ""
-#. TXysK
+#. sxqAk
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id641526904710590\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Formula groups:</caseinline></switchinline>"
+msgid "Formula groups:"
msgstr ""
-#. WAFAR
+#. QDcds
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id541526903668055\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"CALC\">Number of contiguous ranges in a column with same formula.</caseinline></switchinline>"
+msgid "Number of contiguous ranges in a column with same formula."
msgstr ""
-#. H3i2a
+#. LU85G
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3147210\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Images:</caseinline></switchinline>"
+msgid "Images:"
msgstr ""
-#. ryGt3
+#. a4k3j
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3166411\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of images in the file. This statistic <emph>does not</emph> include images that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects.</caseinline></switchinline>"
+msgid "Number of images in the file. This statistic <emph>does not</emph> include images that were inserted as <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects."
msgstr ""
-#. KbxEs
+#. UBabs
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3147618\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">OLE Objects:</caseinline></switchinline>"
+msgid "OLE Objects:"
msgstr ""
-#. BkmWR
+#. BuF3C
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149820\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects in the file, <emph>including</emph> tables and graphics that were inserted as OLE objects.</caseinline></switchinline>"
+msgid "Number of <link href=\"text/shared/00/00000005.xhp#ole\" name=\"OLE\"><emph>OLE</emph></link> objects in the file, <emph>including</emph> tables and graphics that were inserted as OLE objects."
msgstr ""
-#. coPjE
+#. qw77q
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153665\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Paragraphs:</caseinline></switchinline>"
+msgid "Paragraphs:"
msgstr ""
-#. 9cqSQ
+#. sDTWH
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3156156\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of paragraphs, including blank paragraphs, in the file.</caseinline></switchinline>"
+msgid "Number of paragraphs, including blank paragraphs, in the file."
msgstr ""
-#. KDEhm
+#. cJoGM
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3155261\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Words:</caseinline></switchinline>"
+msgid "Words:"
msgstr ""
-#. e7HhL
+#. NWZHb
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3147402\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of words, including words consisting of a single character, in the file.</caseinline></switchinline>"
+msgid "Number of words, including words consisting of a single character, in the file."
msgstr ""
-#. oG7TM
+#. F9a22
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3150466\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Characters:</caseinline></switchinline>"
+msgid "Characters:"
msgstr ""
-#. rLEmf
+#. J57aD
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149294\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of characters, including spaces, in the file. Non-printable characters are not included.</caseinline></switchinline>"
+msgid "Number of characters, including spaces, in the file. Non-printable characters are not included."
msgstr ""
-#. LUXFC
+#. EvT7H
+#: 01100400.xhp
+msgctxt ""
+"01100400.xhp\n"
+"hd_id541589188608624\n"
+"help.text"
+msgid "Characters excluding spaces:"
+msgstr ""
+
+#. C6y8S
+#: 01100400.xhp
+msgctxt ""
+"01100400.xhp\n"
+"par_id341589188750182\n"
+"help.text"
+msgid "Number of characters, excluding spaces, in the file. Non-printable characters are not included."
+msgstr ""
+
+#. FeKAd
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3148947\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Lines:</caseinline></switchinline>"
+msgid "Lines:"
msgstr ""
-#. 79fie
+#. cronY
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3149650\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Number of lines in the file.</caseinline></switchinline>"
+msgid "Number of lines in the file."
msgstr ""
-#. hcEnb
+#. dbQ2X
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"hd_id3153525\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\">Update</caseinline></switchinline>"
+msgid "Update"
msgstr ""
-#. JzybH
+#. xECP4
#: 01100400.xhp
msgctxt ""
"01100400.xhp\n"
"par_id3148981\n"
"help.text"
-msgid "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">Updates the statistics.</ahelp></caseinline></switchinline>"
-msgstr "<switchinline select=\"appl\"><caseinline select=\"WRITER\"><ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">Обновление статистики.</ahelp></caseinline></switchinline>"
+msgid "<ahelp hid=\"modules/swriter/ui/statisticsinfopage/update\">Updates the statistics.</ahelp>"
+msgstr ""
#. HpTwh
#: 01100600.xhp
@@ -7837,13 +7855,13 @@ msgctxt ""
msgid "A line break that was inserted with the <keycode>Shift+Enter</keycode> key combination when in the <widget>Find</widget> text box."
msgstr ""
-#. oALhj
+#. r4Xir
#: 02100001.xhp
msgctxt ""
"02100001.xhp\n"
"par_id731559575258580\n"
"help.text"
-msgid "A paragraph break that can be entered with the <keycode>Enter</keycode> or <keycode>Return</keycode> key when in the <widget>Replace</widget> text box."
+msgid "A paragraph break that can be entered with the <keycode>Enter</keycode> or <keycode>Return</keycode> key when in the <widget>Replace</widget> text box in Writer. Has no special meaning in Calc, and is treated literally there."
msgstr ""
#. u7KxS
@@ -15613,13 +15631,13 @@ msgctxt ""
msgid "Language"
msgstr "Язык"
-#. tGmXJ
+#. wCJKH
#: 05020300.xhp
msgctxt ""
"05020300.xhp\n"
"par_id3154138\n"
"help.text"
-msgid "<ahelp hid=\"cui/ui/numberingformatpage/languagelb\">Specifies the language setting for the selected <switchinline select=\"appl\"><caseinline select=\"CALC\">cells</caseinline><defaultinline>field</defaultinline></switchinline>. <switchinline select=\"appl\"><caseinline select=\"WRITER\">With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language.</caseinline></switchinline> Select any language to fix the settings for the selected <switchinline select=\"appl\"><caseinline select=\"CALC\">cells</caseinline><defaultinline> fields</defaultinline></switchinline>.</ahelp>"
+msgid "<ahelp hid=\"cui/ui/numberingformatpage/languagelb\"> <switchinline select=\"appl\"> <caseinline select=\"WRITER\"> Select any language to fix the settings for the selected fields. With the language set to <emph>Automatic</emph>, $[officename] automatically applies the number formats associated with the system default language. Select any language to fix the settings for the selected fields. </caseinline> <caseinline select=\"CALC\"> Specifies the language setting for the selected cells. Select any language to fix the settings for the selected cells. </caseinline> <defaultinline>Specifies the language setting for the selected field. Select any language to fix the settings for the selected fields.</defaultinline> </switchinline> </ahelp>"
msgstr ""
#. K29ZG
@@ -19753,15 +19771,6 @@ msgctxt ""
msgid "File opens in a named frame in the current HTML document."
msgstr "Файл открывается в указанном фрейме в текущем документе HTML."
-#. wf4vi
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3148739\n"
-"help.text"
-msgid "_self"
-msgstr "_self"
-
#. E9CvG
#: 05020400.xhp
msgctxt ""
@@ -19771,15 +19780,6 @@ msgctxt ""
msgid "File opens in the current frame."
msgstr "Файл открывается в текущем фрейме."
-#. PdCyG
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3151210\n"
-"help.text"
-msgid "_blank"
-msgstr "_blank"
-
#. Kv599
#: 05020400.xhp
msgctxt ""
@@ -19789,15 +19789,6 @@ msgctxt ""
msgid "File opens in a new page."
msgstr "Файл открывается на новой странице."
-#. GhVRg
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3148451\n"
-"help.text"
-msgid "_parent"
-msgstr "_parent"
-
#. 9oC24
#: 05020400.xhp
msgctxt ""
@@ -19807,15 +19798,6 @@ msgctxt ""
msgid "File opens in the parent frame of the current frame. If there is no parent frame, the current frame is used."
msgstr "Файл открывается в родительском фрейме текущей страницы. Если родительского фрейма нет, используется текущий фрейм."
-#. FP7B6
-#: 05020400.xhp
-msgctxt ""
-"05020400.xhp\n"
-"par_id3154153\n"
-"help.text"
-msgid "_top"
-msgstr "_top"
-
#. rkF4o
#: 05020400.xhp
msgctxt ""
@@ -22687,15 +22669,6 @@ msgctxt ""
msgid "<ahelp hid=\"cui/ui/pageformatpage/PageFormatPage\">Allows you to define page layouts for single and multiple-page documents, as well as a numbering and paper formats.</ahelp>"
msgstr "<ahelp hid=\"cui/ui/pageformatpage/PageFormatPage\">Возможность определить разметку страниц для одно- и многостраничных документов, а также нумерацию и форматы бумаги.</ahelp>"
-#. Upj6A
-#: 05040200.xhp
-msgctxt ""
-"05040200.xhp\n"
-"par_id090120160133439102\n"
-"help.text"
-msgid "<image id=\"img_id090120160131201466\" src=\"media/screenshots/cui/ui/pageformatpage/PageFormatPage.png\" width=\"8.6457in\" height=\"5.9063in\"><alt id=\"alt_id090120160131201466\">Page format tab page</alt></image>"
-msgstr ""
-
#. EEgg6
#: 05040200.xhp
msgctxt ""
@@ -44872,13 +44845,13 @@ msgctxt ""
msgid "<link href=\"text/shared/01/notebook_bar.xhp\">Using the notebook bar</link>"
msgstr ""
-#. Hme8z
+#. LkNPu
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161732262244\n"
"help.text"
-msgid "<ahelp hid=\".\">The notebook bar is a new form of displaying commands icons for a quicker usage</ahelp>"
+msgid "<ahelp hid=\".\">The notebook bar is a new form of displaying commands icons for a quicker usage.</ahelp>"
msgstr ""
#. roAUi
@@ -44908,22 +44881,22 @@ msgctxt ""
msgid "With the notebook bar, frequently used commands are grouped in an arrangement that will make it quicker to access, avoiding lengthy menu navigation and toolbars command icon lookup."
msgstr ""
-#. Qmurg
+#. GjBq3
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744067918\n"
"help.text"
-msgid "The notebook bar is available in Writer, Calc and Impress. The user interface has now several available layouts. To change the layout, choose <item type=\"menuitem\">View - User Interface</item> and from the submenu select the layout which you want."
+msgid "The notebook bar is available in Writer, Calc, Draw and Impress. The user interface has now several available layouts. To change the layout, choose <menuitem>View - User Interface</menuitem> and from the submenu select the layout which you want."
msgstr ""
-#. 9gGf4
+#. eBXFy
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744066306\n"
"help.text"
-msgid "Choose menu <item type=\"menuitem\">View - User Interface</item>"
+msgid "Choose menu <menuitem>View - User Interface</menuitem>"
msgstr ""
#. SJiku
@@ -45052,13 +45025,13 @@ msgctxt ""
msgid "The Tabbed and Groupedbar modes are also available as compact variants."
msgstr ""
-#. iQUHs
+#. 5BGEh
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744076273\n"
"help.text"
-msgid "The notebook bar icon size is adjustable in <switchinline select=\"sys\"><caseinline select=\"MAC\"><item type=\"menuitem\">%PRODUCTNAME - Preferences</item></caseinline><defaultinline><item type=\"menuitem\">Tools - Options</item></defaultinline></switchinline><item type=\"menuitem\"> - %PRODUCTNAME - View - Notebookbar icon size</item> listbox."
+msgid "The notebook bar icon size is adjustable in <switchinline select=\"sys\"><caseinline select=\"MAC\"><menuitem>%PRODUCTNAME - Preferences</menuitem></caseinline><defaultinline><menuitem>Tools - Options</menuitem></defaultinline></switchinline><menuitem> - %PRODUCTNAME - View - Notebookbar icon size</menuitem> listbox."
msgstr ""
#. ooEpD
@@ -45070,13 +45043,13 @@ msgctxt ""
msgid "The notebook bar cannot be customized."
msgstr ""
-#. AhU4A
+#. cKECd
#: notebook_bar.xhp
msgctxt ""
"notebook_bar.xhp\n"
"par_id190920161744078275\n"
"help.text"
-msgid "The current implementation (%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc and Impress modules. A change in the notebook bar in one module will affect the notebook bar of the other modules."
+msgid "The current implementation (%PRODUCTNAME %PRODUCTVERSION) of the notebook bar is common to Writer, Calc, Draw and Impress modules. A change in the notebook bar in one module will affect the notebook bar of the other modules."
msgstr ""
#. zznYu
@@ -45088,6 +45061,15 @@ msgctxt ""
msgid "<link href=\"text/shared/guide/floating_toolbar.xhp\">Toolbars</link>"
msgstr ""
+#. tZPkf
+#: notebook_bar.xhp
+msgctxt ""
+"notebook_bar.xhp\n"
+"par_id921589901261168\n"
+"help.text"
+msgid "<link href=\"text/shared/optionen/01010800.xhp\" name=\"view\">View</link> options"
+msgstr ""
+
#. kgVKD
#: online_update.xhp
msgctxt ""
diff --git a/source/ru/helpcontent2/source/text/shared/06.po b/source/ru/helpcontent2/source/text/shared/06.po
index 11f909cbf34..b60fc59cf98 100644
--- a/source/ru/helpcontent2/source/text/shared/06.po
+++ b/source/ru/helpcontent2/source/text/shared/06.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-01-17 16:45+0100\n"
+"POT-Creation-Date: 2020-05-11 14:25+0200\n"
"PO-Revision-Date: 2020-03-04 14:16+0000\n"
"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_help-master/textshared06/ru/>\n"
@@ -13,7 +13,7 @@ msgstr ""
"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-Accelerator-Marker: ~\n"
-"X-Generator: Weblate 3.10.3\n"
+"X-Generator: LibreOffice\n"
"X-POOTLE-MTIME: 1535981032.000000\n"
#. EUcrc
@@ -259,6 +259,15 @@ msgctxt ""
msgid "<image id=\"img_id521237\" src=\"media/screenshots/cui/ui/colorpage/ColorPage.png\"><alt id=\"alt_id378144\">Color page dialog</alt></image>"
msgstr ""
+#. mpmiK
+#: shared_cui_screenshots.xhp
+msgctxt ""
+"shared_cui_screenshots.xhp\n"
+"par_id531589156232176\n"
+"help.text"
+msgid "<image id=\"img_id090120160131201466\" src=\"media/screenshots/cui/ui/pageformatpage/PageFormatPage.png\"><alt id=\"alt_id090120160131201466\">Page format tab page</alt></image>"
+msgstr ""
+
#. agtWk
#: simpress_screenshots.xhp
msgctxt ""
diff --git a/source/ru/helpcontent2/source/text/shared/explorer/database.po b/source/ru/helpcontent2/source/text/shared/explorer/database.po
index ecaba1f566b..8d4c530add0 100644
--- a/source/ru/helpcontent2/source/text/shared/explorer/database.po
+++ b/source/ru/helpcontent2/source/text/shared/explorer/database.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-08-08 18:14+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -6568,14 +6568,14 @@ msgctxt ""
msgid "<ahelp hid=\".\">The database file window organizes the tables, views, queries, and reports of a database in %PRODUCTNAME.</ahelp>"
msgstr "<ahelp hid=\".\">В окне файла базы данных содержатся упорядоченные таблицы, представления, запросы, ссылки и отчеты базы данных в %PRODUCTNAME.</ahelp>"
-#. Lx3G5
+#. 3KEBA
#: dabadoc.xhp
msgctxt ""
"dabadoc.xhp\n"
"par_idN105B7\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">Работа с базами данных в %PRODUCTNAME</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. ptEgp
#: dabaprop.xhp
@@ -8674,22 +8674,22 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Мастер баз данных</link>"
-#. QCKtt
+#. Y4EFA
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"tit\n"
"help.text"
-msgid "MySQL Connection"
-msgstr "Подключение к MySQL"
+msgid "MariaDB and MySQL Connection"
+msgstr ""
-#. B5kKY
+#. bVNAZ
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"bm_id861587404584956\n"
"help.text"
-msgid "<bookmark_value>MariaDB settings (base)</bookmark_value><bookmark_value>MySQL settings (base)</bookmark_value>"
+msgid "<bookmark_value>MariaDB settings (Base)</bookmark_value><bookmark_value>MySQL settings (Base)</bookmark_value>"
msgstr ""
#. f4CzF
@@ -8746,13 +8746,13 @@ msgctxt ""
msgid "Server URL"
msgstr ""
-#. Dw4Qu
+#. SshYk
#: dabawiz02mysql.xhp
msgctxt ""
"dabawiz02mysql.xhp\n"
"par_id521587405341138\n"
"help.text"
-msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MYSQL database. You can also replace hostname with the IP address of the server."
+msgid "Enter the URL for the database server. This is the name of the machine that runs the MariaDB or MySQL database. You can also replace hostname with the IP address of the server."
msgstr ""
#. MZQiq
@@ -9601,132 +9601,6 @@ msgctxt ""
msgid "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link>"
msgstr "<link href=\"text/shared/explorer/database/dabawiz00.xhp\">Мастер баз данных</link>"
-#. cLmBi
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"tit\n"
-"help.text"
-msgid "%PRODUCTNAME Database"
-msgstr "База данных %PRODUCTNAME"
-
-#. yxuCC
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"bm_id8622089\n"
-"help.text"
-msgid "<bookmark_value>databases;main page (Base)</bookmark_value><bookmark_value>$[officename] Base data sources</bookmark_value><bookmark_value>data sources;$[officename] Base</bookmark_value>"
-msgstr "<bookmark_value>базы данных; главная страница (Base)</bookmark_value><bookmark_value>источники данных $[officename] Base</bookmark_value><bookmark_value>источники данных;$[officename] Base</bookmark_value>"
-
-#. aS7aL
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN10579\n"
-"help.text"
-msgid "<variable id=\"base\"><link href=\"text/shared/explorer/database/main.xhp\">Using Databases in %PRODUCTNAME Base</link></variable>"
-msgstr "<variable id=\"base\"><link href=\"text/shared/explorer/database/main.xhp\">Использование баз данных %PRODUCTNAME Base</link></variable>"
-
-#. FvcWc
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107BD\n"
-"help.text"
-msgid "In %PRODUCTNAME Base, you can access data that is stored in a wide variety of database file formats. %PRODUCTNAME Base natively supports some flat file database formats, such as the dBASE format. You can also use %PRODUCTNAME Base to connect to external relational databases, such as databases from MySQL or Oracle."
-msgstr "В %PRODUCTNAME Base можно обращаться к данным, хранящимся в различных форматах файлов баз данных. %PRODUCTNAME Base поддерживает в естественном режиме некоторые обычные файловые форматы баз данных, например, dBASE. Кроме того, можно использовать %PRODUCTNAME Base для подключения к внешним реляционным базам данных, например, к базам данных MySQL или Oracle."
-
-#. RRoXE
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id5864131\n"
-"help.text"
-msgid "The following database types are read-only types in %PRODUCTNAME Base. From within %PRODUCTNAME Base it is not possible to change the database structure or to edit, insert, and delete database records for these database types:"
-msgstr "Следующие типы базы данных доступны в %PRODUCTNAME Base только для чтения. В %PRODUCTNAME Base невозможно изменить структуру базы данных или редактировать, вставлять и удалять записи для следующих типов базы данных:"
-
-#. uAqcW
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id8865016\n"
-"help.text"
-msgid "Spreadsheet files"
-msgstr "Файлы электронной таблицы"
-
-#. U7fFX
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id3786736\n"
-"help.text"
-msgid "Text files"
-msgstr "Текстовые файлы"
-
-#. WPAC3
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id6747337\n"
-"help.text"
-msgid "Address book data"
-msgstr "Данные адресной книги"
-
-#. TchjD
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107C0\n"
-"help.text"
-msgid "Using a Database in %PRODUCTNAME"
-msgstr "Использование базы данных в %PRODUCTNAME"
-
-#. cBbKE
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN10838\n"
-"help.text"
-msgid "To create a new database file, choose <emph>File - New - Database</emph>."
-msgstr "Чтобы создать новый файл базы данных, выберите команду меню <emph>Файл - Создать - База данных</emph>."
-
-#. h4EpR
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN1083B\n"
-"help.text"
-msgid "The <link href=\"text/shared/explorer/database/dabawiz00.xhp\">Database Wizard</link> helps you to create a database file and to register a new database within %PRODUCTNAME."
-msgstr "С помощью <link href=\"text/shared/explorer/database/dabawiz00.xhp\">мастера баз данных</link> можно создать файл базы данных и зарегистрировать новую базу данных в %PRODUCTNAME."
-
-#. 2jPWg
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN107E7\n"
-"help.text"
-msgid "The database file contains queries, reports, and forms for the database as well as a link to the database where the records are stored. Formatting information is also stored in the database file."
-msgstr "Файл базы данных содержит запросы, отчеты и формы для базы данных, а также ссылки на базу данных, в которой хранятся записи. Сведения о форматировании тоже хранятся в файле базы данных."
-
-#. 4DEr3
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_idN1084A\n"
-"help.text"
-msgid "To open a database file, choose <emph>File - Open</emph>. In the <emph>File type</emph> list box, select to view only \"Database documents\". Select a database document and click <emph>Open</emph>."
-msgstr "Для открытия файла базы данных выберите команду меню <emph>Файл - Открыть</emph>. Из списка <emph>Тип файла</emph> выберите для просмотра только \"документы базы данных\". Выберите документ базы данных и нажмите кнопку <emph>Открыть</emph>."
-
-#. QFEDB
-#: main.xhp
-msgctxt ""
-"main.xhp\n"
-"par_id6474806\n"
-"help.text"
-msgid "<link href=\"https://wiki.documentfoundation.org/Database\" name=\"wiki.documentfoundation.org Database\">Wiki page about Base</link>"
-msgstr ""
-
#. rw2xT
#: menubar.xhp
msgctxt ""
diff --git a/source/ru/helpcontent2/source/text/shared/guide.po b/source/ru/helpcontent2/source/text/shared/guide.po
index 076e856479d..e8d3c943f1a 100644
--- a/source/ru/helpcontent2/source/text/shared/guide.po
+++ b/source/ru/helpcontent2/source/text/shared/guide.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2019-08-08 18:14+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -5344,42 +5344,6 @@ msgctxt ""
msgid "MOV - QuickTime File Format"
msgstr ""
-#. VSUDs
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter54\n"
-"help.text"
-msgid "Macromedia Flash (SWF)"
-msgstr ""
-
-#. ojK6F
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter55\n"
-"help.text"
-msgid "None"
-msgstr ""
-
-#. SqSpc
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter57\n"
-"help.text"
-msgid "Macromedia Flash (SWF)"
-msgstr ""
-
-#. 3D8p5
-#: convertfilters.xhp
-msgctxt ""
-"convertfilters.xhp\n"
-"par_graphicfilter58\n"
-"help.text"
-msgid "None"
-msgstr ""
-
#. oAAov
#: convertfilters.xhp
msgctxt ""
@@ -8251,14 +8215,14 @@ msgctxt ""
msgid "<variable id=\"database_main\"><link href=\"text/shared/guide/database_main.xhp\" name=\"Data Source Overview\">Database Overview</link></variable>"
msgstr "<variable id=\"database_main\"><link href=\"text/shared/guide/database_main.xhp\" name=\"Обзор базы данных\">Обзор базы данных</link></variable>"
-#. oygdp
+#. ouC3J
#: database_main.xhp
msgctxt ""
"database_main.xhp\n"
"par_idN105F1\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">Работа с базами данных в %PRODUCTNAME</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. VPAta
#: database_main.xhp
@@ -16801,14 +16765,14 @@ msgctxt ""
msgid "Data Sources"
msgstr "Источники данных"
-#. XGAwL
+#. dFGaf
#: main.xhp
msgctxt ""
"main.xhp\n"
"par_idN10826\n"
"help.text"
-msgid "<link href=\"text/shared/explorer/database/main.xhp\">Working with databases in %PRODUCTNAME</link>"
-msgstr "<link href=\"text/shared/explorer/database/main.xhp\">Работа с базами данных в %PRODUCTNAME</link>"
+msgid "<link href=\"text/sdatabase/main.xhp\">Working with databases in %PRODUCTNAME</link>"
+msgstr ""
#. CGeKT
#: main.xhp
@@ -23308,13 +23272,13 @@ msgctxt ""
msgid "<emph>Math Formula</emph> opens %PRODUCTNAME <link href=\"text/smath/main0000.xhp\">Math</link>"
msgstr ""
-#. PHUPr
+#. nq6EF
#: startcenter.xhp
msgctxt ""
"startcenter.xhp\n"
"par_id0820200803105089\n"
"help.text"
-msgid "<emph>Base Database</emph> opens %PRODUCTNAME <link href=\"text/shared/explorer/database/main.xhp\">Base</link>"
+msgid "<emph>Base Database</emph> opens %PRODUCTNAME <link href=\"text/sdatabase/main.xhp\">Base</link>"
msgstr ""
#. MvEcH
diff --git a/source/ru/helpcontent2/source/text/shared/optionen.po b/source/ru/helpcontent2/source/text/shared/optionen.po
index 8ccf0bf082b..3f4e77ad9c4 100644
--- a/source/ru/helpcontent2/source/text/shared/optionen.po
+++ b/source/ru/helpcontent2/source/text/shared/optionen.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-27 11:43+0200\n"
"PO-Revision-Date: 2019-08-08 18:15+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1078,58 +1078,67 @@ msgctxt ""
msgid "ODF format version"
msgstr "Версия формата ODF"
-#. pEQ68
+#. sDCvq
+#: 01010200.xhp
+msgctxt ""
+"01010200.xhp\n"
+"par_id6944182\n"
+"help.text"
+msgid "LibreOffice 7.0 supports the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument</emph></link> format (ODF) version 1.3. The prior versions of LibreOffice support the file format ODF 1.2. Prior file formats cannot store all new features of the new software."
+msgstr ""
+
+#. BZc73
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id6944181\n"
"help.text"
-msgid "OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument></emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software."
+msgid "OpenOffice.org 3 and StarOffice 9 introduced new features which have to be saved using the <link href=\"https://en.wikipedia.org/wiki/OpenDocument\" name=\"English Wikipedia: OpenDocument\"><emph>OpenDocument</emph></link> format (ODF) version 1.2. The prior versions of OpenOffice.org 2 and StarOffice 8 support the file formats ODF 1.0/1.1. Those prior file formats cannot store all new features of the new software."
msgstr ""
-#. pto2V
+#. BoRgh
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id886257\n"
"help.text"
-msgid "Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1 and 1.2."
-msgstr "В текущих версиях %PRODUCTNAME возможно открытие документов в форматах ODF 1.0/1.1 и 1.2."
+msgid "Current %PRODUCTNAME versions can open documents in ODF formats 1.0/1.1, 1.2, and 1.3."
+msgstr ""
-#. BHABK
+#. PL8e4
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id8892483\n"
"help.text"
-msgid "When you save a document, you can select whether to save the document in the format ODF 1.2, ODF 1.2 (Extended), or in the prior format ODF 1.0/1.1."
-msgstr "При сохранении документа можно выбрать сохранение в формате ODF 1.2, ODF 1.2 (расширенном) или в предыдущем формате ODF 1.0/1.1."
+msgid "When you save a document, you can select whether to save the document in the format ODF 1.3, ODF 1.3 Extended, ODF 1.2, ODF 1.2 Extended, ODF 1.2 Extended (compatibility mode), or in the prior format ODF 1.0/1.1."
+msgstr ""
-#. NAxKq
+#. hadyp
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id0915200911205367\n"
"help.text"
-msgid "Currently, the ODF 1.2 (Extended) format enables files of Draw and Impress to contain comments. Those comments can be inserted by <item type=\"menuitem\">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version."
-msgstr "Используемый в настоящее время формат ODF 1.2 (расширенный) позволяет добавлять в файлы Draw и Impress комментарии. Для вставки комментариев в такие файлы в последней версии программного обеспечения выберите <item type=\"menuitem\">Вставить – Комментарий</item>. В случае загрузки файлов, сохраненных в более поздних версиях, в программное обеспечение более ранних версий комментарии будут утеряны."
+msgid "Currently, the ODF 1.2 (Extended) or newer formats enable files of Draw and Impress to contain comments. Those comments can be inserted by <item type=\"menuitem\">Insert - Comment</item> in the latest software version. The comments get lost when loading files into prior software versions that were saved by the latest software version."
+msgstr ""
-#. YHA83
+#. aLBQC
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id7198400\n"
"help.text"
-msgid "<ahelp hid=\".\">Some companies or organizations may require ODF documents in the ODF 1.0/1.1 format. You can select that format to save in the listbox. This older format cannot store all new features, so the new format ODF 1.2 (Extended) is recommended where possible.</ahelp>"
-msgstr "<ahelp hid=\".\">В некоторых компаниях или организациях могут требоваться документы ODF в формате ODF 1.0/1.1. Сохранение в этом формате можно выбрать в поле списка. Сохранение всех новые функций в более раннем формате невозможно, таким образом, во всех возможных случаях рекомендуется использовать новый формат ODF 1.2 (расширенный).</ahelp>"
+msgid "<ahelp hid=\".\">Some companies or organizations may require ODF documents in the ODF 1.0/1.1, or ODF 1.2 format. You can select these format to save in the listbox. These older formats cannot store all new features, so the new format ODF 1.3 (Extended) is recommended where possible.</ahelp>"
+msgstr ""
-#. 56Bit
+#. 9iBAX
#: 01010200.xhp
msgctxt ""
"01010200.xhp\n"
"par_id7198401\n"
"help.text"
-msgid "The ODF 1.2 Extended (compat) mode is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful, if you need to interchange ODF documents with users, who use pre-ODF1.2 or ODF1.2-only legacy applications."
+msgid "The ODF 1.2 Extended (compatibility mode) is a more backward-compatible ODF 1.2 extended mode. It uses features that are deprecated in ODF 1.2 and/or it is 'bug-compatible' to older OpenOffice.org versions. It may be useful if you need to interchange ODF documents with users who use pre-ODF 1.2 or ODF 1.2-only legacy applications."
msgstr ""
#. iP4AE
diff --git a/source/ru/helpcontent2/source/text/simpress/01.po b/source/ru/helpcontent2/source/text/simpress/01.po
index e94260b0754..b52b3acec0d 100644
--- a/source/ru/helpcontent2/source/text/simpress/01.po
+++ b/source/ru/helpcontent2/source/text/simpress/01.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-03-31 10:35+0200\n"
+"POT-Creation-Date: 2020-05-07 12:48+0200\n"
"PO-Revision-Date: 2019-08-08 18:15+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,14 +25,14 @@ msgctxt ""
msgid "Export"
msgstr "Экспорт"
-#. tBBeZ
+#. ToRjB
#: 01170000.xhp
msgctxt ""
"01170000.xhp\n"
"bm_id3153728\n"
"help.text"
-msgid "<bookmark_value>Macromedia Flash export</bookmark_value><bookmark_value>exporting;to Macromedia Flash format</bookmark_value>"
-msgstr "<bookmark_value>Экспорт Macromedia Flash</bookmark_value><bookmark_value>экспорт;в формат Macromedia Flash</bookmark_value>"
+msgid "<bookmark_value>Presentation HTML export</bookmark_value> <bookmark_value>Drawing HTML export</bookmark_value><bookmark_value>exporting;to HTML format</bookmark_value>"
+msgstr ""
#. y8AoW
#: 01170000.xhp
@@ -70,15 +70,6 @@ msgctxt ""
msgid "<link href=\"text/shared/autopi/01110000.xhp\" name=\"HTML Document\">HTML Document</link>, <link href=\"text/shared/00/00000200.xhp\" name=\"Image Options\">JPEG, SVM/WMF/PICT/MET, BMP, GIF, EPS, PNG, PBM, PPM, PGM</link>."
msgstr ""
-#. LDX5K
-#: 01170000.xhp
-msgctxt ""
-"01170000.xhp\n"
-"par_id3145584\n"
-"help.text"
-msgid "If you select \"Macromedia Flash (SWF)\" as file format, the current Impress or Draw document will be exported to the Macromedia Flash format."
-msgstr "Если в качестве формата файла выбран \"Macromedia Flash (SWF)\", текущий документ Impress или Draw будет экспортироваться в формат Macromedia Flash."
-
#. oyYNp
#: 01170000.xhp
msgctxt ""
diff --git a/source/ru/helpcontent2/source/text/simpress/guide.po b/source/ru/helpcontent2/source/text/simpress/guide.po
index 005d259abc0..211719b85df 100644
--- a/source/ru/helpcontent2/source/text/simpress/guide.po
+++ b/source/ru/helpcontent2/source/text/simpress/guide.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: guide\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
"PO-Revision-Date: 2018-09-03 13:23+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: Russian <l10n@ru.libreoffice.org>\n"
@@ -340,14 +340,14 @@ msgctxt ""
msgid "To create an animated GIF:"
msgstr "Чтобы создать анимированное GIF-изображение:"
-#. REeik
+#. 3C5Z8
#: animated_gif_create.xhp
msgctxt ""
"animated_gif_create.xhp\n"
"par_id3148703\n"
"help.text"
-msgid "Select an object or group of objects that you want to include in your animation and choose<emph> Insert - Animated Image</emph>."
-msgstr "Выберите объект или группу объектов, которые требуется включить в анимацию, и выберите <emph>Вставка - Анимированное изображение</emph>."
+msgid "Select an object or group of objects that you want to include in your animation and choose<emph> Insert - Media - Animated Image</emph>."
+msgstr ""
#. EaBa6
#: animated_gif_create.xhp
diff --git a/source/ru/helpcontent2/source/text/swriter.po b/source/ru/helpcontent2/source/text/swriter.po
index bbea043d953..2a4e2e23a4d 100644
--- a/source/ru/helpcontent2/source/text/swriter.po
+++ b/source/ru/helpcontent2/source/text/swriter.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-05-05 14:59+0200\n"
+"POT-Creation-Date: 2020-05-11 14:25+0200\n"
"PO-Revision-Date: 2018-10-21 20:33+0000\n"
"Last-Translator: Anonymous Pootle User\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -898,13 +898,13 @@ msgctxt ""
msgid "Show Whitespace"
msgstr ""
-#. eFkCV
+#. WJ3Vz
#: main0103.xhp
msgctxt ""
"main0103.xhp\n"
"par_id102720150854012820\n"
"help.text"
-msgid "Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream."
+msgid "Displays the document with the top and bottom margins, header and footer and a gap between pages. Uncheck to collapse all the elements above and display document in a contiguous page stream. Hiding whitespace is only possible in Single-page view."
msgstr ""
#. eBSCq
diff --git a/source/ru/helpcontent2/source/text/swriter/01.po b/source/ru/helpcontent2/source/text/swriter/01.po
index 6d682caf81a..2bf3cbc2a76 100644
--- a/source/ru/helpcontent2/source/text/swriter/01.po
+++ b/source/ru/helpcontent2/source/text/swriter/01.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-27 15:55+0200\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
"PO-Revision-Date: 2019-08-08 09:18+0000\n"
"Last-Translator: serval2412 <serval2412@yahoo.fr>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20275,14 +20275,14 @@ msgctxt ""
msgid "Remaining space"
msgstr "Свободное пространство"
-#. 8BeLm
+#. xJdfF
#: 05090200.xhp
msgctxt ""
"05090200.xhp\n"
"par_id3154571\n"
"help.text"
-msgid "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space-nospin\">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp>"
-msgstr "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space-nospin\">Отображает количество места, доступного для изменения ширины столбцов. Чтобы задать ширину таблицы, откройте вкладку <emph>Таблица</emph>.</ahelp>"
+msgid "<ahelp hid=\"modules/swriter/ui/tablecolumnpage/space\">Displays the amount of space that is available for adjusting the width of the columns. To set the width of the table, click the <emph>Table </emph>tab.</ahelp>"
+msgstr ""
#. AmKDF
#: 05090200.xhp
diff --git a/source/ru/instsetoo_native/inc_openoffice/windows/msi_languages.po b/source/ru/instsetoo_native/inc_openoffice/windows/msi_languages.po
index 416b4637397..624ae253b98 100644
--- a/source/ru/instsetoo_native/inc_openoffice/windows/msi_languages.po
+++ b/source/ru/instsetoo_native/inc_openoffice/windows/msi_languages.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: msi_languages\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2020-03-31 10:35+0200\n"
-"PO-Revision-Date: 2020-02-08 09:14+0000\n"
-"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
+"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/instsetoo_nativeinc_openofficewindowsmsi_languages/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
"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-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 3.10.3\n"
"X-POOTLE-MTIME: 1562755095.000000\n"
#. tBfTE
@@ -3119,7 +3119,7 @@ msgctxt ""
"OOO_CONTROL_323\n"
"LngText.text"
msgid "The following applications are using files that need to be updated by this setup. You can let Installation Wizard close them and attempt to restart them, or reboot the system later to complete the setup."
-msgstr ""
+msgstr "Файлы, подлежащие обновлению, заняты следующими приложениями. Можно позволить Мастеру установки закрыть и попытаться перезапустить их или позже перезагрузить машину для завершения установки."
#. qDAnG
#: Control.ulf
@@ -4613,7 +4613,7 @@ msgctxt ""
"OOO_RADIOBUTTON_11\n"
"LngText.text"
msgid "&Do not close applications. A reboot will be required to complete the setup."
-msgstr ""
+msgstr "&Не закрывать приложения. Потребуется перезагрузка для завершения установки."
#. 94ZFb
#: UIText.ulf
diff --git a/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po b/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po
index 7fdbe30c118..6e1fc8f7a8d 100644
--- a/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po
+++ b/source/ru/officecfg/registry/data/org/openoffice/Office/UI.po
@@ -3,8 +3,8 @@ msgid ""
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: 2020-05-05 14:59+0200\n"
-"PO-Revision-Date: 2020-04-14 08:15+0000\n"
+"POT-Creation-Date: 2020-05-19 12:41+0200\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/officecfgregistrydataorgopenofficeofficeui/ru/>\n"
"Language: ru\n"
@@ -4534,7 +4534,7 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Use Text Import Dialog"
-msgstr ""
+msgstr "Диалог импорта текста"
#. yombs
#: CalcCommands.xcu
@@ -4544,7 +4544,7 @@ msgctxt ""
"TooltipLabel\n"
"value.text"
msgid "Use text import dialog"
-msgstr ""
+msgstr "Диалог импорта текста"
#. uoxAP
#: CalcCommands.xcu
@@ -15104,7 +15104,17 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Through Black"
-msgstr "Через чёрное"
+msgstr "Через чёрный"
+
+#. TKERq
+#: Effects.xcu
+msgctxt ""
+"Effects.xcu\n"
+"..Effects.UserInterface.TransitionVariants.through-white\n"
+"Label\n"
+"value.text"
+msgid "Through White"
+msgstr "Через белый"
#. mFSnT
#: Effects.xcu
@@ -18254,7 +18264,7 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Edit Macros..."
-msgstr ""
+msgstr "Редактировать макросы..."
#. Ws9jQ
#: GenericCommands.xcu
@@ -23826,7 +23836,7 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Find and Rep~lace..."
-msgstr ""
+msgstr "Найти и заменить..."
#. B4Dm5
#: GenericCommands.xcu
@@ -25886,7 +25896,7 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Insert N~arrow No-break Space"
-msgstr ""
+msgstr "Вставить узкий неразрывный пробел"
#. txaEk
#: GenericCommands.xcu
@@ -27998,6 +28008,16 @@ msgctxt ""
msgid "Properties"
msgstr "Свойства"
+#. G2ktQ
+#: Sidebar.xcu
+msgctxt ""
+"Sidebar.xcu\n"
+"..Sidebar.Content.DeckList.InspectorDeck\n"
+"Title\n"
+"value.text"
+msgid "Styles Inspector"
+msgstr ""
+
#. GEHrf
#: Sidebar.xcu
msgctxt ""
@@ -28138,6 +28158,16 @@ msgctxt ""
msgid "Character"
msgstr "Символы"
+#. D7iA6
+#: Sidebar.xcu
+msgctxt ""
+"Sidebar.xcu\n"
+"..Sidebar.Content.PanelList.InspectorTextPanel\n"
+"Title\n"
+"value.text"
+msgid "Character Styles"
+msgstr ""
+
#. aCGNS
#: Sidebar.xcu
msgctxt ""
@@ -28208,6 +28238,16 @@ msgctxt ""
msgid "Glow"
msgstr ""
+#. HhQ3u
+#: Sidebar.xcu
+msgctxt ""
+"Sidebar.xcu\n"
+"..Sidebar.Content.PanelList.SoftEdgePropertyPanel\n"
+"Title\n"
+"value.text"
+msgid "Soft Edge"
+msgstr ""
+
#. GBNW2
#: Sidebar.xcu
msgctxt ""
@@ -33436,7 +33476,7 @@ msgctxt ""
"Label\n"
"value.text"
msgid "Show Whitespac~e"
-msgstr ""
+msgstr "Показать пустое место"
#. RHnwE
#: WriterCommands.xcu
diff --git a/source/ru/sc/messages.po b/source/ru/sc/messages.po
index da1e5e23f38..698c191baab 100644
--- a/source/ru/sc/messages.po
+++ b/source/ru/sc/messages.po
@@ -3,7 +3,7 @@ msgid ""
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: 2020-04-29 22:17+0200\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
"PO-Revision-Date: 2020-02-23 19:15+0000\n"
"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/scmessages/ru/>\n"
@@ -22778,216 +22778,216 @@ msgid "~File"
msgstr "~Файл"
#. EBQTu
-#: sc/uiconfig/scalc/ui/notebookbar.ui:3539
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3541
msgctxt "CalcNotebookbar|bordertype|tooltip_text"
msgid "Specify the borders of the selected cells."
msgstr "Задайте обрамление выбранных ячеек."
#. f8rkJ
-#: sc/uiconfig/scalc/ui/notebookbar.ui:3820
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3822
msgctxt "CalcNotebookbar|increaseindent1|tooltip_text"
msgid "Increase Indent"
msgstr "Увеличить отступ"
#. TBHRy
-#: sc/uiconfig/scalc/ui/notebookbar.ui:3834
+#: sc/uiconfig/scalc/ui/notebookbar.ui:3836
msgctxt "CalcNotebookbar|decreaseindent1|tooltip_text"
msgid "Decrease Indent"
msgstr "Уменьшить отступ"
#. 6GvMB
-#: sc/uiconfig/scalc/ui/notebookbar.ui:4808
+#: sc/uiconfig/scalc/ui/notebookbar.ui:4810
msgctxt "CalcNotebookbar|HomeMenuButton"
msgid "_Home"
msgstr "_Главное"
-#. yghFn
-#: sc/uiconfig/scalc/ui/notebookbar.ui:4917
-msgctxt "CalcNotebookbar|CalcLabel"
+#. 5kZRD
+#: sc/uiconfig/scalc/ui/notebookbar.ui:4919
+msgctxt "CalcNotebookbar|HomeLabel"
msgid "~Home"
-msgstr "~Главное"
+msgstr ""
#. bBEGh
-#: sc/uiconfig/scalc/ui/notebookbar.ui:5476
+#: sc/uiconfig/scalc/ui/notebookbar.ui:5478
msgctxt "CalcNotebookbar|FieldMenuButton"
msgid "Fiel_d"
msgstr "Поле"
#. VCk9a
-#: sc/uiconfig/scalc/ui/notebookbar.ui:5997
+#: sc/uiconfig/scalc/ui/notebookbar.ui:5999
msgctxt "CalcNotebookbar|InsertMenuButton"
msgid "_Insert"
msgstr "Вставка"
#. HnjBi
-#: sc/uiconfig/scalc/ui/notebookbar.ui:6105
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6107
msgctxt "CalcNotebookbar|InsertLabel"
msgid "~Insert"
msgstr "Вставка"
#. xmARL
-#: sc/uiconfig/scalc/ui/notebookbar.ui:6516
-#: sc/uiconfig/scalc/ui/notebookbar.ui:6542
-#: sc/uiconfig/scalc/ui/notebookbar.ui:6980
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6518
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6544
+#: sc/uiconfig/scalc/ui/notebookbar.ui:6982
msgctxt "CalcNotebookbar|objectalign|tooltip_text"
msgid "Object Align"
msgstr "Выравнивание объекта"
-#. 4FwmH
-#: sc/uiconfig/scalc/ui/notebookbar.ui:7205
-msgctxt "CalcNotebookbar|reviewb"
+#. vruXQ
+#: sc/uiconfig/scalc/ui/notebookbar.ui:7207
+msgctxt "CalcNotebookbar|LayoutMenuButton"
msgid "_Layout"
-msgstr "Разметка"
+msgstr ""
#. eWinY
-#: sc/uiconfig/scalc/ui/notebookbar.ui:7290
+#: sc/uiconfig/scalc/ui/notebookbar.ui:7292
msgctxt "CalcNotebookbar|PageLayoutLabel"
msgid "~Layout"
msgstr "Разметка"
-#. MHnRF
-#: sc/uiconfig/scalc/ui/notebookbar.ui:8396
-msgctxt "CalcNotebookbar|Statistics"
+#. pnWd5
+#: sc/uiconfig/scalc/ui/notebookbar.ui:8398
+msgctxt "CalcNotebookbar|StatisticsMenuButton"
msgid "_Statistics"
-msgstr "Статистика"
+msgstr ""
#. BiHBE
-#: sc/uiconfig/scalc/ui/notebookbar.ui:8447
+#: sc/uiconfig/scalc/ui/notebookbar.ui:8449
msgctxt "CalcNotebookbar|DataMenuButton"
msgid "_Data"
msgstr "Да_нные"
#. xzx9j
-#: sc/uiconfig/scalc/ui/notebookbar.ui:8556
+#: sc/uiconfig/scalc/ui/notebookbar.ui:8558
msgctxt "CalcNotebookbar|DataLabel"
msgid "~Data"
msgstr "Да~нные"
#. CBEHA
-#: sc/uiconfig/scalc/ui/notebookbar.ui:9378
+#: sc/uiconfig/scalc/ui/notebookbar.ui:9380
msgctxt "CalcNotebookbar|ReviewMenuButton"
msgid "_Review"
msgstr "_Проверка"
#. 7FXbr
-#: sc/uiconfig/scalc/ui/notebookbar.ui:9464
+#: sc/uiconfig/scalc/ui/notebookbar.ui:9466
msgctxt "CalcNotebookbar|ReviewLabel"
msgid "~Review"
msgstr "~Проверка"
#. NT37F
-#: sc/uiconfig/scalc/ui/notebookbar.ui:10370
+#: sc/uiconfig/scalc/ui/notebookbar.ui:10372
msgctxt "CalcNotebookbar|ViewMenuButton"
msgid "_View"
msgstr "_Вид"
#. rPdAq
-#: sc/uiconfig/scalc/ui/notebookbar.ui:10456
+#: sc/uiconfig/scalc/ui/notebookbar.ui:10458
msgctxt "CalcNotebookbar|ViewLabel"
msgid "~View"
msgstr "~Вид"
-#. zaUCM
-#: sc/uiconfig/scalc/ui/notebookbar.ui:11510
-msgctxt "CalcNotebookbar|GraphicMenuButton"
+#. SAv6Z
+#: sc/uiconfig/scalc/ui/notebookbar.ui:11512
+msgctxt "CalcNotebookbar|ImageMenuButton"
msgid "Ima_ge"
-msgstr "Изображение"
+msgstr ""
#. rwprK
-#: sc/uiconfig/scalc/ui/notebookbar.ui:11635
+#: sc/uiconfig/scalc/ui/notebookbar.ui:11637
msgctxt "CalcNotebookbar|ImageLabel"
msgid "Ima~ge"
msgstr "Изображение"
#. EjbzV
-#: sc/uiconfig/scalc/ui/notebookbar.ui:12854
+#: sc/uiconfig/scalc/ui/notebookbar.ui:12856
msgctxt "CalcNotebookbar|DrawMenuButton"
msgid "_Draw"
msgstr "Рисунок"
#. iagRv
-#: sc/uiconfig/scalc/ui/notebookbar.ui:12964
+#: sc/uiconfig/scalc/ui/notebookbar.ui:12966
msgctxt "CalcNotebookbar|DrawLabel"
msgid "~Draw"
msgstr "Рисунок"
#. EgeGL
-#: sc/uiconfig/scalc/ui/notebookbar.ui:13436
+#: sc/uiconfig/scalc/ui/notebookbar.ui:13438
msgctxt "CalcNotebookbar|ConvertMenuButton"
msgid "Convert"
msgstr "Преобразовать"
-#. PdjTP
-#: sc/uiconfig/scalc/ui/notebookbar.ui:13736
-msgctxt "CalcNotebookbar|frame:Menu Draw"
+#. PRmbH
+#: sc/uiconfig/scalc/ui/notebookbar.ui:13738
+msgctxt "CalcNotebookbar|ObjectMenuButton"
msgid "_Object"
-msgstr "_Объект"
+msgstr ""
#. xTKVv
-#: sc/uiconfig/scalc/ui/notebookbar.ui:13846
+#: sc/uiconfig/scalc/ui/notebookbar.ui:13848
msgctxt "CalcNotebookbar|FrameLabel"
msgid "~Object"
msgstr "Объект"
#. cHyKz
-#: sc/uiconfig/scalc/ui/notebookbar.ui:14421
+#: sc/uiconfig/scalc/ui/notebookbar.ui:14423
msgctxt "CalcNotebookbar|MediaMenuButton"
msgid "_Media"
msgstr "Медиа"
#. CJ2qx
-#: sc/uiconfig/scalc/ui/notebookbar.ui:14529
+#: sc/uiconfig/scalc/ui/notebookbar.ui:14531
msgctxt "CalcNotebookbar|MediaLabel"
msgid "~Media"
msgstr "Медиа"
#. eQK6A
-#: sc/uiconfig/scalc/ui/notebookbar.ui:14930
+#: sc/uiconfig/scalc/ui/notebookbar.ui:14932
msgctxt "CalcNotebookbar|PrintMenuButton"
msgid "_Print"
msgstr "Печать"
#. sCGyG
-#: sc/uiconfig/scalc/ui/notebookbar.ui:15014
+#: sc/uiconfig/scalc/ui/notebookbar.ui:15016
msgctxt "CalcNotebookbar|PrintLabel"
msgid "~Print"
msgstr "Печать"
#. 5JVAt
-#: sc/uiconfig/scalc/ui/notebookbar.ui:15849
+#: sc/uiconfig/scalc/ui/notebookbar.ui:15851
msgctxt "CalcNotebookbar|FormMenuButton"
msgid "Fo_rm"
msgstr "Форма"
#. CCEAK
-#: sc/uiconfig/scalc/ui/notebookbar.ui:15934
+#: sc/uiconfig/scalc/ui/notebookbar.ui:15936
msgctxt "CalcNotebookbar|FormLabel"
msgid "Fo~rm"
msgstr "Форма"
-#. mrTYB
-#: sc/uiconfig/scalc/ui/notebookbar.ui:15991
-msgctxt "WriterNotebookbar|FormMenuButton"
+#. DHeyE
+#: sc/uiconfig/scalc/ui/notebookbar.ui:15993
+msgctxt "CalcNotebookbar|ExtensionMenuButton"
msgid "E_xtension"
-msgstr "_Расширение"
+msgstr ""
-#. Gtj2Y
-#: sc/uiconfig/scalc/ui/notebookbar.ui:16076
-msgctxt "WriterNotebookbar|ExtensionLabel"
+#. 4ZDL7
+#: sc/uiconfig/scalc/ui/notebookbar.ui:16078
+msgctxt "CalcNotebookbar|ExtensionLabel"
msgid "E~xtension"
-msgstr "~Расширение"
+msgstr ""
#. 3Ec6T
-#: sc/uiconfig/scalc/ui/notebookbar.ui:17304
+#: sc/uiconfig/scalc/ui/notebookbar.ui:17306
msgctxt "CalcNotebookbar|ToolsMenuButton"
msgid "_Tools"
msgstr "Сервис"
-#. fWgEx
-#: sc/uiconfig/scalc/ui/notebookbar.ui:17389
-msgctxt "CalcNotebookbar|DevLabel"
+#. 8HTEk
+#: sc/uiconfig/scalc/ui/notebookbar.ui:17391
+msgctxt "CalcNotebookbar|ToolsLabel"
msgid "~Tools"
-msgstr "Сервис"
+msgstr ""
#. AJr3Y
#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:3039
@@ -23002,373 +23002,373 @@ msgid "~File"
msgstr "~Файл"
#. UWfVg
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:3567
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6247
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:3569
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6249
msgctxt "notebookbar_compact|bordertype|tooltip_text"
msgid "Specify the borders of the selected cells."
msgstr "Задайте обрамление выбранных ячеек."
#. JDRKC
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:4644
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:4646
msgctxt "notebookbar_compact|HomeMenuButton"
msgid "_Menu"
msgstr "Меню"
#. Svdz9
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:4696
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:4698
msgctxt "notebookbar_compact|CalcLabel"
msgid "~Home"
msgstr "~Главная"
#. ecBqZ
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5203
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5205
msgctxt "notebookbar_compact|FieldMenuButton"
msgid "Fiel_d"
msgstr "Поле"
#. zveKA
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5721
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5723
msgctxt "notebookbar_compact|InsertMenuButton"
msgid "_Insert"
msgstr "Вставка"
#. CDXv3
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5776
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:5778
msgctxt "notebookbar_compact|InsertLabel"
msgid "~Insert"
msgstr "~Вставка"
#. EvytN
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6410
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6412
msgctxt "notebookbar_compact|PageMenuButton"
msgid "_Layout"
msgstr "_Макет"
#. TbQMa
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6462
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:6464
msgctxt "notebookbar_compact|LayoutLabel"
msgid "~Layout"
msgstr "~Разметка"
#. QqjZP
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7321
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7323
msgctxt "notebookbar_compact|Statistics"
msgid "_Statistics"
msgstr "Статистика"
#. GFZNz
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7387
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7389
msgctxt "notebookbar_compact|DataMenuButton"
msgid "_Data"
msgstr "Да_нные"
#. TCt7E
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7438
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:7440
msgctxt "notebookbar_compact|DataLabel"
msgid "~Data"
msgstr "~Данные"
#. jYD7j
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8136
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8138
msgctxt "notebookbar_compact|ReviewMenuButton"
msgid "_Review"
msgstr "_Проверка"
#. Lbj5B
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8188
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8190
msgctxt "notebookbar_compact|ReviewLabel"
msgid "~Review"
msgstr "~Рецензирование"
#. 35kA2
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8870
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8872
msgctxt "notebookbar_compact|ViewMenuButton"
msgid "_View"
msgstr "_Вид"
#. ZGh8C
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8922
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:8924
msgctxt "notebookbar_compact|ViewLabel"
msgid "~View"
msgstr "~Вид"
#. dV94w
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:10312
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:10314
msgctxt "notebookbar_compact|GraphicMenuButton"
msgid "Im_age"
msgstr "~Изображение"
#. ekWoX
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:10364
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:10366
msgctxt "notebookbar_compact|ImageLabel"
msgid "Ima~ge"
msgstr "~Изображение"
#. 8eQN8
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:11777
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:11779
msgctxt "notebookbar_compact|DrawMenuButton"
msgid "D_raw"
msgstr "Рисунок"
#. FBf68
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:11829
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:11831
msgctxt "notebookbar_compact|ShapeLabel"
msgid "~Draw"
msgstr "~Рисование"
#. DoVwy
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:12807
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:12809
msgctxt "notebookbar_compact|ObjectMenuButton"
msgid "Object"
msgstr "Объект"
#. JXKiY
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:12859
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:12861
msgctxt "notebookbar_compact|FrameLabel"
msgid "~Object"
msgstr "~Объект"
#. q8wnS
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:13579
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:13581
msgctxt "notebookbar_compact|MediaButton"
msgid "_Media"
msgstr "_Медиа"
#. 7HDt3
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:13632
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:13634
msgctxt "notebookbar_compact|MediaLabel"
msgid "~Media"
msgstr "~Медиа"
#. vSDok
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:14206
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:14208
msgctxt "notebookbar_compact|PrintPreviewButton"
msgid "Print"
msgstr "Печать"
#. goiqQ
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:14258
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:14260
msgctxt "notebookbar_compact|FormLabel"
msgid "~Print"
msgstr "~Печать"
#. EBGs5
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15613
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15615
msgctxt "notebookbar_compact|FormButton"
msgid "Fo_rm"
msgstr "_Форма"
#. EKA8X
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15665
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15667
msgctxt "notebookbar_compact|FormLabel"
msgid "Fo~rm"
msgstr "~Форма"
#. 8SvE5
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15745
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15747
msgctxt "notebookbar_compact|ExtensionMenuButton"
msgid "E_xtension"
msgstr "_Расширение"
#. WH5NR
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15803
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:15805
msgctxt "notebookbar_compact|ExtensionLabel"
msgid "E~xtension"
msgstr "~Расширение"
#. 8fhwb
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:16836
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:16838
msgctxt "notebookbar_compact|ToolsMenuButton"
msgid "_Tools"
msgstr "Сервис"
#. kpc43
-#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:16888
+#: sc/uiconfig/scalc/ui/notebookbar_compact.ui:16890
msgctxt "notebookbar_compact|DevLabel"
msgid "~Tools"
msgstr "~Сервис"
#. LL2dj
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3287
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3300
msgctxt "notebookbar_groupedbar_compact|fileb"
msgid "_File"
msgstr "_Файл"
#. MR7ZB
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3398
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3411
msgctxt "notebookbar_groupedbar_compact|editb"
msgid "_Edit"
msgstr "_Правка"
#. AXNcR
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3517
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5105
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3530
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5118
msgctxt "notebookbar_groupedbar_compact|paragraphstyleb"
msgid "St_yles"
msgstr "Стили"
#. scY66
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3671
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3684
msgctxt "notebookbar_groupedbar_compact|formatb"
msgid "F_ont"
msgstr "Шрифт"
#. LFB3L
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3906
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:3919
msgctxt "notebookbar_groupedbar_compact|paragraphb"
msgid "_Paragraph"
msgstr "Абзац"
#. UnsAB
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4320
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4333
msgctxt "notebookbar_groupedbar_compact|numberb"
msgid "_Number"
msgstr "Число"
#. hBvBa
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4434
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4447
msgctxt "notebookbar_groupedbar_compact|datab"
msgid "_Data"
msgstr "Да_нные"
#. CMGpS
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4548
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4561
msgctxt "notebookbar_groupedbar_compact|insertb"
msgid "_Insert"
msgstr "_Вставка"
#. 5wZbP
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4662
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4675
msgctxt "notebookbar_groupedbar_compact|reviewb"
msgid "_Review"
msgstr "_Проверка"
#. Uyv2y
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4776
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4789
msgctxt "notebookbar_groupedbar_compact|viewb"
msgid "_View"
msgstr "_Вид"
#. bgPuY
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4888
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:11428
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4901
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:11441
msgctxt "notebookbar_groupedbar_compact|FormButton"
msgid "Fo_rm"
msgstr "Форма"
#. 5fAr4
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4981
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:4994
msgctxt "notebookbar_groupedbar_compact|ExtensionMenuButton"
msgid "E_xtension"
msgstr "_Расширение"
#. T2jYU
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5259
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5272
msgctxt "notebookbar_groupedbar_compact|FormatButton"
msgid "F_ont"
msgstr "Шрифт"
#. jZETF
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5492
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5505
msgctxt "notebookbar_groupedbar_compact|paragraphS"
msgid "_Paragraph"
msgstr "Абзац"
#. 5Wp5j
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5750
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5763
msgctxt "notebookbar_groupedbar_compact|viewS"
msgid "_View"
msgstr "_Вид"
#. DC7Hv
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5888
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:5901
msgctxt "notebookbar_groupedbar_compact|editdrawb"
msgid "D_raw"
msgstr "Рисунок"
#. ncAKi
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6326
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7912
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8983
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9604
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10438
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6339
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7925
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8996
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9617
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10451
msgctxt "notebookbar_groupedbar_compact|ArrangeButton"
msgid "_Arrange"
msgstr "Расположение"
#. 8pLR3
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6610
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6623
msgctxt "notebookbar_groupedbar_compact|draw"
msgid "_Shape"
msgstr "Фигура"
#. NM63T
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6866
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10695
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6879
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10708
msgctxt "notebookbar_groupedbar_compact|viewDrawb"
msgid "Grou_p"
msgstr "Группа"
#. cbMTW
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:6992
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7005
msgctxt "notebookbar_groupedbar_compact|3Db"
msgid "3_D"
msgstr "Объём"
#. BTzDn
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7227
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7240
msgctxt "notebookbar_groupedbar_compact|GridButton"
msgid "_Fontwork"
msgstr "_Текстовые эффекты"
#. PLqyG
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7341
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8417
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9240
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9862
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10810
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7354
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8430
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9253
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9875
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10823
msgctxt "notebookbar_groupedbar_compact|GridButton"
msgid "_Grid"
msgstr "Сетка"
#. K6izG
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7474
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:7487
msgctxt "notebookbar_groupedbar_compact|ImageButton"
msgid "Im_age"
msgstr "~Изображение"
#. SEFWn
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8146
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8159
msgctxt "notebookbar_groupedbar_compact|ColorButton"
msgid "Fi_lter"
msgstr "_Фильтр"
#. 5a4zV
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8545
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:8558
msgctxt "notebookbar_groupedbar_compact|graphicB"
msgid "_Object"
msgstr "Объект"
#. Ghwp6
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9369
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:9382
msgctxt "notebookbar_groupedbar_compact|graphicB"
msgid "_Media"
msgstr "Медиа"
#. nyHDP
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10000
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:10013
msgctxt "notebookbar_groupedbar_compact|editdrawb"
msgid "_Edit"
msgstr "Правка"
#. PhCFL
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:11295
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:11308
msgctxt "notebookbar_groupedbar_compact|PrintMenuButton"
msgid "_Print"
msgstr "Печать"
#. RC7F3
-#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:12212
+#: sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui:12225
msgctxt "notebookbar_groupedbar_compact|MenuButton"
msgid "_Menu"
msgstr "Меню"
@@ -24358,7 +24358,7 @@ msgid "_Enable very large spreadsheets (16m rows, 16384 cols)"
msgstr "Разрешить большие таблицы (16 млн строк, 16384 столбцов)"
#. xW5dC
-#: sc/uiconfig/scalc/ui/optdefaultpage.ui:110
+#: sc/uiconfig/scalc/ui/optdefaultpage.ui:111
msgctxt "optdefaultpage|label1"
msgid "New Spreadsheet"
msgstr "Новая электронная таблица"
diff --git a/source/ru/scp2/source/ooo.po b/source/ru/scp2/source/ooo.po
index 5ec00c9b5e1..84f92d6c1a4 100644
--- a/source/ru/scp2/source/ooo.po
+++ b/source/ru/scp2/source/ooo.po
@@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: ooo\n"
"Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
"POT-Creation-Date: 2020-03-06 11:46+0100\n"
-"PO-Revision-Date: 2019-12-24 17:05+0000\n"
-"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
+"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/scp2sourceooo/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -13,7 +13,7 @@ msgstr ""
"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-Accelerator-Marker: ~\n"
-"X-Generator: LibreOffice\n"
+"X-Generator: Weblate 3.10.3\n"
"X-Project-Style: openoffice\n"
"X-POOTLE-MTIME: 1562678055.000000\n"
@@ -2130,7 +2130,7 @@ msgctxt ""
"STR_NAME_MODULE_LANGPACK_FUR\n"
"LngText.text"
msgid "Friulian"
-msgstr ""
+msgstr "Фриульский"
#. hj9iY
#: module_langpack.ulf
@@ -2139,7 +2139,7 @@ msgctxt ""
"STR_DESC_MODULE_LANGPACK_FUR\n"
"LngText.text"
msgid "Installs the Friulian user interface"
-msgstr ""
+msgstr "Установить фриульский интерфейс пользователя"
#. FWTCS
#: module_langpack.ulf
diff --git a/source/ru/sd/messages.po b/source/ru/sd/messages.po
index 9dda3676ae8..27ea0cb145c 100644
--- a/source/ru/sd/messages.po
+++ b/source/ru/sd/messages.po
@@ -3,9 +3,9 @@ msgid ""
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: 2020-05-05 14:59+0200\n"
-"PO-Revision-Date: 2020-03-03 13:15+0000\n"
-"Last-Translator: kompilainenn <79045_79045@mail.ru>\n"
+"POT-Creation-Date: 2020-05-25 20:00+0200\n"
+"PO-Revision-Date: 2020-05-13 20:16+0000\n"
+"Last-Translator: bormant <bormant@mail.ru>\n"
"Language-Team: Russian <https://weblate.documentfoundation.org/projects/libo_ui-master/sdmessages/ru/>\n"
"Language: ru\n"
"MIME-Version: 1.0\n"
@@ -2070,7 +2070,7 @@ msgstr "Дважды нажмите, чтобы добавить текст"
#: sd/inc/strings.hrc:312
msgctxt "STR_PRESOBJ_TEXT_MOBILE"
msgid "Tap to edit text"
-msgstr ""
+msgstr "Нажмите, чтобы редактировать текст"
#. bRhRR
#: sd/inc/strings.hrc:313
@@ -2404,692 +2404,596 @@ msgctxt "SID_SD_A11Y_D_DRAWVIEW_N"
msgid "Drawing View"
msgstr "Режим рисования"
-#. Fi6GE
-#: sd/inc/strings.hrc:376
-msgctxt "SID_SD_A11Y_D_DRAWVIEW_D"
-msgid "This is where you create and edit drawings."
-msgstr "Здесь вы создаёте и редактируете рисунки."
-
#. GfnmX
-#: sd/inc/strings.hrc:377
+#: sd/inc/strings.hrc:376
msgctxt "SID_SD_A11Y_I_DRAWVIEW_N"
msgid "Drawing View"
msgstr "Режим рисования"
-#. SWtFN
-#: sd/inc/strings.hrc:378
-msgctxt "SID_SD_A11Y_I_DRAWVIEW_D"
-msgid "This is where you create and edit slides."
-msgstr "Здесь вы создаёте и редактируете слайды."
-
#. YCVqM
-#: sd/inc/strings.hrc:379
+#: sd/inc/strings.hrc:377
msgctxt "SID_SD_A11Y_I_OUTLINEVIEW_N"
msgid "Outline View"
msgstr "Режим структуры"
-#. feLwF
-#: sd/inc/strings.hrc:380
-msgctxt "SID_SD_A11Y_I_OUTLINEVIEW_D"
-msgid "This is where you enter or edit text in list form."
-msgstr "Здесь вы вводите и редактируете тексты списков."
-
#. k2hXi
-#: sd/inc/strings.hrc:381
+#: sd/inc/strings.hrc:378
msgctxt "SID_SD_A11Y_I_SLIDEVIEW_N"
msgid "Slides View"
msgstr "Режим слайдов"
#. A22hR
-#: sd/inc/strings.hrc:382
+#: sd/inc/strings.hrc:379
msgctxt "SID_SD_A11Y_I_SLIDEVIEW_D"
msgid "This is where you sort slides."
msgstr "Здесь вы упорядочиваете слайды."
#. vyX8L
-#: sd/inc/strings.hrc:383
+#: sd/inc/strings.hrc:380
msgctxt "SID_SD_A11Y_I_NOTESVIEW_N"
msgid "Notes View"
msgstr "Режим примечаний"
-#. Syiwi
-#: sd/inc/strings.hrc:384
-msgctxt "SID_SD_A11Y_I_NOTESVIEW_D"
-msgid "This is where you enter and view notes."
-msgstr "Здесь вы вводите и просматриваете заметки."
-
#. qr5ov
-#: sd/inc/strings.hrc:385
+#: sd/inc/strings.hrc:381
msgctxt "SID_SD_A11Y_I_HANDOUTVIEW_N"
msgid "Handout View"
msgstr "Режим тезисов"
-#. 9EyMA
-#: sd/inc/strings.hrc:386
-msgctxt "SID_SD_A11Y_I_HANDOUTVIEW_D"
-msgid "This is where you decide on the layout for handouts."
-msgstr "Здесь вы готовите макеты тезисов."
-
#. Ycpb4
-#: sd/inc/strings.hrc:387
+#: sd/inc/strings.hrc:382
msgctxt "SID_SD_A11Y_P_TITLE_N"
msgid "PresentationTitle"
msgstr "Заглавие презентации"
#. 4WCzf
-#: sd/inc/strings.hrc:388
+#: sd/inc/strings.hrc:383
msgctxt "SID_SD_A11Y_P_OUTLINER_N"
msgid "PresentationOutliner"
msgstr "Структура презентации"
#. cBoMF
-#: sd/inc/strings.hrc:389
+#: sd/inc/strings.hrc:384
msgctxt "SID_SD_A11Y_P_SUBTITLE_N"
msgid "PresentationSubtitle"
msgstr "Подзаголовок презентации"
#. 8KV99
-#: sd/inc/strings.hrc:390
+#: sd/inc/strings.hrc:385
msgctxt "SID_SD_A11Y_P_PAGE_N"
msgid "PresentationPage"
msgstr "Страница презентации"
#. R6kyg
-#: sd/inc/strings.hrc:391
+#: sd/inc/strings.hrc:386
msgctxt "SID_SD_A11Y_P_NOTES_N"
msgid "PresentationNotes"
msgstr "Примечания презентации"
#. X8c9Z
-#: sd/inc/strings.hrc:392
+#: sd/inc/strings.hrc:387
msgctxt "SID_SD_A11Y_P_HANDOUT_N"
msgid "Handout"
msgstr "Тезисы"
#. FeAdu
-#: sd/inc/strings.hrc:393
+#: sd/inc/strings.hrc:388
msgctxt "SID_SD_A11Y_P_UNKNOWN_N"
msgid "UnknownAccessiblePresentationShape"
msgstr "Неизвестная форма презентации"
-#. ogNjh
-#: sd/inc/strings.hrc:394
-msgctxt "SID_SD_A11Y_P_TITLE_D"
-msgid "PresentationTitleShape"
-msgstr "Форма заглавия презентации"
-
-#. bFvTq
-#: sd/inc/strings.hrc:395
-msgctxt "SID_SD_A11Y_P_OUTLINER_D"
-msgid "PresentationOutlinerShape"
-msgstr "Форма структуры презентации"
-
-#. wAE9M
-#: sd/inc/strings.hrc:396
-msgctxt "SID_SD_A11Y_P_SUBTITLE_D"
-msgid "PresentationSubtitleShape"
-msgstr "Форма подзаголовка презентации"
-
-#. RYA3y
-#: sd/inc/strings.hrc:397
-msgctxt "SID_SD_A11Y_P_PAGE_D"
-msgid "PresentationPageShape"
-msgstr "Форма страницы презентации"
-
-#. VVZyE
-#: sd/inc/strings.hrc:398
-msgctxt "SID_SD_A11Y_P_NOTES_D"
-msgid "PresentationNotesShape"
-msgstr "Форма примечаний презентации"
-
-#. Pqhhf
-#: sd/inc/strings.hrc:399
-msgctxt "SID_SD_A11Y_P_HANDOUT_D"
-msgid "PresentationHandoutShape"
-msgstr "Форма тезисов презентации"
-
-#. KzpQq
-#: sd/inc/strings.hrc:400
-msgctxt "SID_SD_A11Y_P_UNKNOWN_D"
-msgid "Unknown accessible presentation shape"
-msgstr "Неизвестная форма презентации"
-
#. sA8of
-#: sd/inc/strings.hrc:401
+#: sd/inc/strings.hrc:389
msgctxt "SID_SD_A11Y_P_FOOTER_N"
msgid "PresentationFooter"
msgstr "Нижний колонтитул презентации"
#. 4YzQz
-#: sd/inc/strings.hrc:402
+#: sd/inc/strings.hrc:390
msgctxt "SID_SD_A11Y_P_FOOTER_D"
msgid "PresentationFooterShape"
msgstr "Форма нижнего колонтитула презентации"
#. KAC6Z
-#: sd/inc/strings.hrc:403
+#: sd/inc/strings.hrc:391
msgctxt "SID_SD_A11Y_P_HEADER_N"
msgid "PresentationHeader"
msgstr "Верхний колонтитул презентации"
-#. zpVS7
-#: sd/inc/strings.hrc:404
-msgctxt "SID_SD_A11Y_P_HEADER_D"
-msgid "PresentationHeaderShape"
-msgstr "Форма верхнего колонтитула презентации"
-
#. EfHeH
-#: sd/inc/strings.hrc:405
+#: sd/inc/strings.hrc:392
msgctxt "SID_SD_A11Y_P_DATE_N"
msgid "PresentationDateAndTime"
msgstr "Дата и время презентации"
-#. 7Dbde
-#: sd/inc/strings.hrc:406
-msgctxt "SID_SD_A11Y_P_DATE_D"
-msgid "PresentationDateAndTimeShape"
-msgstr "Форма даты и времени презентации"
-
#. WosPZ
-#: sd/inc/strings.hrc:407
+#: sd/inc/strings.hrc:393
msgctxt "SID_SD_A11Y_P_NUMBER_N"
msgid "PresentationPageNumber"
msgstr "Номер страницы презентации"
-#. q7Hqe
-#: sd/inc/strings.hrc:408
-msgctxt "SID_SD_A11Y_P_NUMBER_D"
-msgid "PresentationPageNumberShape"
-msgstr "Форма номера страницы презентации"
-
#. kCGsH
-#: sd/inc/strings.hrc:409
+#: sd/inc/strings.hrc:394
msgctxt "SID_SD_A11Y_D_PRESENTATION"
msgid "%PRODUCTNAME Presentation"
msgstr "Презентация %PRODUCTNAME"
#. ubJop
-#: sd/inc/strings.hrc:410
+#: sd/inc/strings.hrc:395
msgctxt "SID_SD_A11Y_P_TITLE_N_STYLE"
msgid "Title"
msgstr "Заглавие"
#. Va4KF
-#: sd/inc/strings.hrc:411
+#: sd/inc/strings.hrc:396
msgctxt "SID_SD_A11Y_P_OUTLINER_N_STYLE"
msgid "Outliner"
msgstr "Структура"
#. 6FKRE
-#: sd/inc/strings.hrc:412
+#: sd/inc/strings.hrc:397
msgctxt "SID_SD_A11Y_P_SUBTITLE_N_STYLE"
msgid "Subtitle"
msgstr "Подзаголовок"
#. eSBEi
-#: sd/inc/strings.hrc:413
+#: sd/inc/strings.hrc:398
msgctxt "SID_SD_A11Y_P_PAGE_N_STYLE"
msgid "Page"
msgstr "Страница"
#. WEaeZ
-#: sd/inc/strings.hrc:414
+#: sd/inc/strings.hrc:399
msgctxt "SID_SD_A11Y_P_NOTES_N_STYLE"
msgid "Notes"
msgstr "Примечания"
#. buhox
-#: sd/inc/strings.hrc:415
+#: sd/inc/strings.hrc:400
msgctxt "SID_SD_A11Y_P_HANDOUT_N_STYLE"
msgid "Handout"
msgstr "Режим тезисов"
#. 4xBQg
-#: sd/inc/strings.hrc:416
+#: sd/inc/strings.hrc:401
msgctxt "SID_SD_A11Y_P_UNKNOWN_N_STYLE"
msgid "Unknown Accessible Presentation Shape"
msgstr "Неизвестная форма презентации"
#. CGegB
-#: sd/inc/strings.hrc:417
+#: sd/inc/strings.hrc:402
msgctxt "SID_SD_A11Y_P_FOOTER_N_STYLE"
msgid "Footer"
msgstr "Нижний колонтитул"
#. SrrR4
-#: sd/inc/strings.hrc:418
+#: sd/inc/strings.hrc:403
msgctxt "SID_SD_A11Y_P_HEADER_N_STYLE"
msgid "Header"
msgstr "Верхний колонтитул"
#. CCwKy
-#: sd/inc/strings.hrc:419
+#: sd/inc/strings.hrc:404
msgctxt "SID_SD_A11Y_P_DATE_N_STYLE"
msgid "Date"
msgstr "Дата"
#. EFmn4
-#: sd/inc/strings.hrc:420
+#: sd/inc/strings.hrc:405
msgctxt "SID_SD_A11Y_P_NUMBER_N_STYLE"
msgid "Number"
msgstr "Число"
#. wFpMQ
-#: sd/inc/strings.hrc:421
+#: sd/inc/strings.hrc:406
msgctxt "SID_SD_A11Y_D_PRESENTATION_READONLY"
msgid "(read-only)"
msgstr "(только чтение)"
#. EV4W5
-#: sd/inc/strings.hrc:423
+#: sd/inc/strings.hrc:408
msgctxt "STR_CUSTOMANIMATION_REPEAT_NONE"
msgid "none"
msgstr "нет"
#. 9izAz
-#: sd/inc/strings.hrc:424
+#: sd/inc/strings.hrc:409
msgctxt "STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK"
msgid "Until next click"
msgstr "До следующего щелчка"
#. oEQ7B
-#: sd/inc/strings.hrc:425
+#: sd/inc/strings.hrc:410
msgctxt "STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE"
msgid "Until end of slide"
msgstr "До конца слайда"
#. Lf9gB
-#: sd/inc/strings.hrc:426
+#: sd/inc/strings.hrc:411
msgctxt "STR_CUSTOMANIMATION_DIRECTION_PROPERTY"
msgid "Direction:"
msgstr "Направление:"
#. xxDXG
-#: sd/inc/strings.hrc:427
+#: sd/inc/strings.hrc:412
msgctxt "STR_CUSTOMANIMATION_ZOOM_PROPERTY"
msgid "Zoom:"
msgstr "Масштаб:"
#. SvBeK
-#: sd/inc/strings.hrc:428
+#: sd/inc/strings.hrc:413
msgctxt "STR_CUSTOMANIMATION_SPOKES_PROPERTY"
msgid "Spokes:"
msgstr "Спицы:"
#. eJ4qZ
-#: sd/inc/strings.hrc:429
+#: sd/inc/strings.hrc:414
msgctxt "STR_CUSTOMANIMATION_FIRST_COLOR_PROPERTY"
msgid "First color:"
msgstr "Первый цвет"
#. CSbCE
-#: sd/inc/strings.hrc:430
+#: sd/inc/strings.hrc:415
msgctxt "STR_CUSTOMANIMATION_SECOND_COLOR_PROPERTY"
msgid "Second color:"
msgstr "Второй цвет"
#. cZUiD
-#: sd/inc/strings.hrc:431
+#: sd/inc/strings.hrc:416
msgctxt "STR_CUSTOMANIMATION_FILL_COLOR_PROPERTY"
msgid "Fill color:"
msgstr "Цвет заливки"
#. U5ZDL
-#: sd/inc/strings.hrc:432
+#: sd/inc/strings.hrc:417
msgctxt "STR_CUSTOMANIMATION_STYLE_PROPERTY"
msgid "Style:"
msgstr "Стиль:"
#. vKLER
-#: sd/inc/strings.hrc:433
+#: sd/inc/strings.hrc:418
msgctxt "STR_CUSTOMANIMATION_FONT_PROPERTY"
msgid "Font:"
msgstr "Гарнитура:"
#. Fdsks
-#: sd/inc/strings.hrc:434
+#: sd/inc/strings.hrc:419
msgctxt "STR_CUSTOMANIMATION_FONT_COLOR_PROPERTY"
msgid "Font color:"
msgstr "Цвет шрифта:"
#. nT7dm
-#: sd/inc/strings.hrc:435
+#: sd/inc/strings.hrc:420
msgctxt "STR_CUSTOMANIMATION_FONT_SIZE_STYLE_PROPERTY"
msgid "Style:"
msgstr "Стиль:"
#. q24Fe
-#: sd/inc/strings.hrc:436
+#: sd/inc/strings.hrc:421
msgctxt "STR_CUSTOMANIMATION_FONT_STYLE_PROPERTY"
msgid "Typeface:"
msgstr "Начертание:"
#. nAqeR
-#: sd/inc/strings.hrc:437
+#: sd/inc/strings.hrc:422
msgctxt "STR_CUSTOMANIMATION_LINE_COLOR_PROPERTY"
msgid "Line color:"
msgstr "Цвет линии:"
#. w7G4Q
-#: sd/inc/strings.hrc:438
+#: sd/inc/strings.hrc:423
msgctxt "STR_CUSTOMANIMATION_SIZE_PROPERTY"
msgid "Font size:"
msgstr "Кегль:"
#. R3GgU
-#: sd/inc/strings.hrc:439
+#: sd/inc/strings.hrc:424
msgctxt "STR_CUSTOMANIMATION_SCALE_PROPERTY"
msgid "Size:"
msgstr "Размер:"
#. YEwoz
-#: sd/inc/strings.hrc:440
+#: sd/inc/strings.hrc:425
msgctxt "STR_CUSTOMANIMATION_AMOUNT_PROPERTY"
msgid "Amount:"
msgstr "Количество:"
#. wiQPZ
-#: sd/inc/strings.hrc:441
+#: sd/inc/strings.hrc:426
msgctxt "STR_CUSTOMANIMATION_COLOR_PROPERTY"
msgid "Color:"
msgstr "Цвет:"
#. f5u6C
-#: sd/inc/strings.hrc:442
+#: sd/inc/strings.hrc:427
msgctxt "STR_CUSTOMANIMATION_NO_SOUND"
msgid "(No sound)"
msgstr "(Без звука)"
#. N7jGX
-#: sd/inc/strings.hrc:443
+#: sd/inc/strings.hrc:428
msgctxt "STR_CUSTOMANIMATION_STOP_PREVIOUS_SOUND"
msgid "(Stop previous sound)"
msgstr "(Остановить предыдущий звук)"
#. vasqr
-#: sd/inc/strings.hrc:444
+#: sd/inc/strings.hrc:429
msgctxt "STR_CUSTOMANIMATION_BROWSE_SOUND"
msgid "Other sound..."
msgstr "Другой звук..."
#. CjvLY
-#: sd/inc/strings.hrc:445
+#: sd/inc/strings.hrc:430
msgctxt "STR_CUSTOMANIMATION_SAMPLE"
msgid "Sample"
msgstr "Пример"
#. CdYt2
-#: sd/inc/strings.hrc:446
+#: sd/inc/strings.hrc:431
msgctxt "STR_CUSTOMANIMATION_TRIGGER"
msgid "Trigger"
msgstr "Запуск"
#. Evkrq
-#: sd/inc/strings.hrc:447
+#: sd/inc/strings.hrc:432
msgctxt "STR_CUSTOMANIMATION_USERPATH"
msgid "User paths"
msgstr "Пользовательские пути"
#. EcciE
-#: sd/inc/strings.hrc:448
+#: sd/inc/strings.hrc:433
msgctxt "STR_CUSTOMANIMATION_ENTRANCE"
msgid "Entrance: %1"
msgstr "Вступление: %1"
#. Zydrz
-#: sd/inc/strings.hrc:449
+#: sd/inc/strings.hrc:434
msgctxt "STR_CUSTOMANIMATION_EMPHASIS"
msgid "Emphasis: %1"
msgstr "Акцент: %1"
#. kW2DL
-#: sd/inc/strings.hrc:450
+#: sd/inc/strings.hrc:435
msgctxt "STR_CUSTOMANIMATION_EXIT"
msgid "Exit: %1"
msgstr "Завершение: %1"
#. iKFbF
-#: sd/inc/strings.hrc:451
+#: sd/inc/strings.hrc:436
msgctxt "STR_CUSTOMANIMATION_MOTION_PATHS"
msgid "Motion Paths: %1"
msgstr "Траектории: %1"
#. kg9Yv
-#: sd/inc/strings.hrc:452
+#: sd/inc/strings.hrc:437
msgctxt "STR_CUSTOMANIMATION_MISC"
msgid "Misc: %1"
msgstr "Разное: %1"
#. Ep4QY
-#: sd/inc/strings.hrc:453
+#: sd/inc/strings.hrc:438
msgctxt "STR_SLIDETRANSITION_NONE"
msgid "None"
msgstr "Нет"
#. KAsTD
-#: sd/inc/strings.hrc:455
+#: sd/inc/strings.hrc:440
msgctxt "STR_ANNOTATION_TODAY"
msgid "Today,"
msgstr "Сегодня,"
#. DEYnN
-#: sd/inc/strings.hrc:456
+#: sd/inc/strings.hrc:441
msgctxt "STR_ANNOTATION_YESTERDAY"
msgid "Yesterday,"
msgstr "Вчера,"
#. bh3FZ
-#: sd/inc/strings.hrc:457
+#: sd/inc/strings.hrc:442
msgctxt "STR_ANNOTATION_NOAUTHOR"
msgid "(no author)"
msgstr "(нет автора)"
#. AvNV8
-#: sd/inc/strings.hrc:458
+#: sd/inc/strings.hrc:443
msgctxt "STR_ANNOTATION_WRAP_FORWARD"
msgid "%PRODUCTNAME Impress reached the end of the presentation. Do you want to continue at the beginning?"
msgstr "%PRODUCTNAME Impress осуществил поиск по направлению к концу листа. Продолжить поиск с начала листа?"
#. P5gKe
-#: sd/inc/strings.hrc:459
+#: sd/inc/strings.hrc:444
msgctxt "STR_ANNOTATION_WRAP_BACKWARD"
msgid "%PRODUCTNAME Impress reached the beginning of the presentation. Do you want to continue at the end?"
msgstr "%PRODUCTNAME Impress осуществил поиск по направлению к началу листа. Продолжить поиск к концу листа?"
#. KGmdL
-#: sd/inc/strings.hrc:460
+#: sd/inc/strings.hrc:445
msgctxt "STR_ANNOTATION_WRAP_FORWARD_DRAW"
msgid "%PRODUCTNAME Draw reached the end of the document. Do you want to continue at the beginning?"
msgstr "%PRODUCTNAME Draw осуществил поиск по направлению к концу листа. Продолжить поиск с начала листа?"
#. oEn6r
-#: sd/inc/strings.hrc:461
+#: sd/inc/strings.hrc:446
msgctxt "STR_ANNOTATION_WRAP_BACKWARD_DRAW"
msgid "%PRODUCTNAME Draw reached the beginning of the document. Do you want to continue at the end?"
msgstr "%PRODUCTNAME Draw осуществил поиск по направлению к началу листа. Продолжить поиск к концу листа?"
#. eP7Vm
-#: sd/inc/strings.hrc:462
+#: sd/inc/strings.hrc:447
msgctxt "STR_ANNOTATION_UNDO_INSERT"
msgid "Insert Comment"
msgstr "Вставить комментарий"
#. s4c9W
-#: sd/inc/strings.hrc:463
+#: sd/inc/strings.hrc:448
msgctxt "STR_ANNOTATION_UNDO_DELETE"
msgid "Delete Comment(s)"
msgstr "Удалить комментарий"
#. bxiPE
-#: sd/inc/strings.hrc:464
+#: sd/inc/strings.hrc:449
msgctxt "STR_ANNOTATION_UNDO_MOVE"
msgid "Move Comment"
msgstr "Переместить комментарий"
#. hQbpd
-#: sd/inc/strings.hrc:465
+#: sd/inc/strings.hrc:450
msgctxt "STR_ANNOTATION_UNDO_EDIT"
msgid "Edit Comment"
msgstr "Изменить комментарий"
#. g6k7E
-#: sd/inc/strings.hrc:466
+#: sd/inc/strings.hrc:451
msgctxt "STR_ANNOTATION_REPLY"
msgid "Reply to %1"
msgstr "Ответить на %1"
#. NMTpu
-#: sd/inc/strings.hrc:468
+#: sd/inc/strings.hrc:453
msgctxt "RID_DRAW_MEDIA_TOOLBOX"
msgid "Media Playback"
msgstr "Мультимедиа"
#. Q76cw
-#: sd/inc/strings.hrc:469
+#: sd/inc/strings.hrc:454
msgctxt "RID_DRAW_TABLE_TOOLBOX"
msgid "Table"
msgstr "Таблица"
#. xCRmu
-#: sd/inc/strings.hrc:471
+#: sd/inc/strings.hrc:456
msgctxt "STR_IMPRESS_PRINT_UI_GROUP_NAME"
msgid "%PRODUCTNAME %s"
msgstr "%PRODUCTNAME %s"
#. 6KbnP
-#: sd/inc/strings.hrc:472
+#: sd/inc/strings.hrc:457
msgctxt "STR_IMPRESS_PRINT_UI_CONTENT"
msgid "Document"
msgstr "Документ"
#. uBxPs
-#: sd/inc/strings.hrc:473
+#: sd/inc/strings.hrc:458
msgctxt "STR_IMPRESS_PRINT_UI_SLIDESPERPAGE"
msgid "Slides per page:"
msgstr "Слайдов на страницу:"
#. EPBUK
-#: sd/inc/strings.hrc:474
+#: sd/inc/strings.hrc:459
msgctxt "STR_IMPRESS_PRINT_UI_ORDER"
msgid "Order:"
msgstr "Порядок:"
#. BFEFJ
-#: sd/inc/strings.hrc:475
+#: sd/inc/strings.hrc:460
msgctxt "STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT"
msgid "~Contents"
msgstr "Содержимое"
#. AdWKp
-#: sd/inc/strings.hrc:476
+#: sd/inc/strings.hrc:461
msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_NAME"
msgid "~Slide name"
msgstr "Имя слайда"
#. GkLky
-#: sd/inc/strings.hrc:477
+#: sd/inc/strings.hrc:462
msgctxt "STR_DRAW_PRINT_UI_IS_PRINT_NAME"
msgid "P~age name"
msgstr "Имя страницы"
#. EFkVE
-#: sd/inc/strings.hrc:478
+#: sd/inc/strings.hrc:463
msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_DATE"
msgid "~Date and time"
msgstr "Дата и время"
#. ZcDFL
-#: sd/inc/strings.hrc:479
+#: sd/inc/strings.hrc:464
msgctxt "STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN"
msgid "Hidden pages"
msgstr "Скрытые страницы"
#. CSUbC
-#: sd/inc/strings.hrc:480
+#: sd/inc/strings.hrc:465
msgctxt "STR_IMPRESS_PRINT_UI_QUALITY"
msgid "Color"
msgstr "Цвет"
#. WmYKp
-#: sd/inc/strings.hrc:481
+#: sd/inc/strings.hrc:466
msgctxt "STR_IMPRESS_PRINT_UI_PAGE_OPTIONS"
msgid "~Size"
msgstr "Размер"
#. qDGVE
-#: sd/inc/strings.hrc:482
+#: sd/inc/strings.hrc:467
msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE"
msgid "Brochure"
msgstr "Брошюра"
#. K7m8L
-#: sd/inc/strings.hrc:483
+#: sd/inc/strings.hrc:468
msgctxt "STR_IMPRESS_PRINT_UI_PAGE_SIDES"
msgid "Page sides"
msgstr "Стороны страниц"
#. 8AzJi
-#: sd/inc/strings.hrc:484
+#: sd/inc/strings.hrc:469
msgctxt "STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE"
msgid "Include"
msgstr "Включая"
#. AEeCf
-#: sd/inc/strings.hrc:485
+#: sd/inc/strings.hrc:470
msgctxt "STR_IMPRESS_PRINT_UI_PAPER_TRAY"
msgid "~Use only paper tray from printer preferences"
msgstr "Подача бумаги согласно настройкам принтера"
#. jBxbU
-#: sd/inc/strings.hrc:486
+#: sd/inc/strings.hrc:471
msgctxt "STR_IMPRESS_PRINT_UI_PAGE_RANGE"
msgid "Pages:"
msgstr "Страницы:"
#. a3tSp
-#: sd/inc/strings.hrc:487
+#: sd/inc/strings.hrc:472
msgctxt "STR_IMPRESS_PRINT_UI_SLIDE_RANGE"
msgid "Slides:"
msgstr "Слайды:"
#. pPiWM
-#: sd/inc/strings.hrc:489
+#: sd/inc/strings.hrc:474
msgctxt "STR_SAR_WRAP_FORWARD"
msgid "%PRODUCTNAME Impress has searched to the end of the presentation. Do you want to continue at the beginning?"
msgstr "%PRODUCTNAME Impress осуществил поиск по направлению к концу листа. Продолжить поиск с начала листа?"
#. buKAC
-#: sd/inc/strings.hrc:490
+#: sd/inc/strings.hrc:475
msgctxt "STR_SAR_WRAP_BACKWARD"
msgid "%PRODUCTNAME Impress has searched to the beginning of the presentation. Do you want to continue at the end?"
msgstr "%PRODUCTNAME Impress осуществил поиск по направлению к началу листа. Продолжить поиск к концу листа?"
#. iiE2i
-#: sd/inc/strings.hrc:491
+#: sd/inc/strings.hrc:476
msgctxt "STR_SAR_WRAP_FORWARD_DRAW"
msgid "%PRODUCTNAME Draw has searched to the end of the document. Do you want to continue at the beginning?"
msgstr "%PRODUCTNAME Draw осуществил поиск по направлению к концу листа. Продолжить поиск с начала листа?"
#. RAhiP
-#: sd/inc/strings.hrc:492
+#: sd/inc/strings.hrc:477
msgctxt "STR_SAR_WRAP_BACKWARD_DRAW"
msgid "%PRODUCTNAME Draw has searched to the beginning of the document. Do you want to continue at the end?"
msgstr "%PRODUCTNAME Draw осуществил поиск по направлению к началу листа. Продолжить поиск к концу листа?"
-#. T5Pap
-#: sd/inc/strings.hrc:494
-msgctxt "STR_SD_NONE"
-msgid "- None -"
-msgstr "- Нет -"
-
#. 6GhtE
-#: sd/inc/strings.hrc:496
+#: sd/inc/strings.hrc:479
msgctxt "STR_ANIMATION_DIALOG_TITLE"
msgid "Animation"
msgstr "Анимация"
#. X9CWA
-#: sd/inc/strings.hrc:498
+#: sd/inc/strings.hrc:481
msgctxt "RID_SVXSTR_EDIT_GRAPHIC"
msgid "Link"
msgstr "Связь"
@@ -4081,184 +3985,184 @@ msgid "Menubar"
msgstr "Главное меню"
#. gf8PA
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:2414
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:2427
msgctxt "draw_notebookbar_groupedbar_compact|MenubarView"
msgid "Menubar"
msgstr "Главное меню"
#. ELBq3
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3030
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3043
msgctxt "draw_notebookbar_groupedbar_compact|fileb"
msgid "_File"
msgstr "_Файл"
#. DRGus
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3141
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3154
msgctxt "draw_notebookbar_groupedbar_compact|editb"
msgid "_Edit"
msgstr "Правка"
#. vbFke
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3271
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6767
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13062
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3284
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6780
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13075
msgctxt "draw_notebookbar_groupedbar_compact|insertText"
msgid "_Insert"
msgstr "Вставка"
#. 4p9DA
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3432
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12661
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3445
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12674
msgctxt "draw_notebookbar_groupedbar_compact|draw"
msgid "D_raw"
msgstr "Рисунок"
#. DsE2d
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3875
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7632
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9551
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10674
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11353
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12244
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13198
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:3888
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7645
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9564
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10687
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11366
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12257
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13211
msgctxt "draw_notebookbar_groupedbar_compact|insertText"
msgid "_Snap"
msgstr "Направляющие"
#. Pxoj8
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4015
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5282
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13338
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4028
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5295
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13351
msgctxt "draw_notebookbar_groupedbar_compact|viewT"
msgid "_View"
msgstr "_Вид"
#. Dsr5A
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4129
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13452
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4142
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13465
msgctxt "draw_notebookbar_groupedbar_compact|reviewb"
msgid "_Review"
msgstr "_Проверка"
#. cjxQa
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4241
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13588
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4254
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:13601
msgctxt "draw_notebookbar_groupedbar_compact|FormButton"
msgid "Fo_rm"
msgstr "Форма"
#. eAioD
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4334
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4347
msgctxt "draw_notebookbar_groupedbar_compact|ExtensionMenuButton"
msgid "E_xtension"
msgstr "_Расширение"
#. c3M8j
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4496
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5451
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4509
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5464
msgctxt "draw_notebookbar_groupedbar_compact|formatt"
msgid "F_ont"
msgstr "Шрифт"
#. pUqDJ
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4733
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5688
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:4746
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5701
msgctxt "draw_notebookbar_groupedbar_compact|paragrapht"
msgid "_Paragraph"
msgstr "Абзац"
#. MRg9E
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5955
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:5968
msgctxt "draw_notebookbar_groupedbar_compact|rowscolumnst"
msgid "_Table"
msgstr "Таблица"
#. QzCG4
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6642
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6655
msgctxt "draw_notebookbar_groupedbar_compact|calculatet"
msgid "_Calc"
msgstr "Вычисления"
#. 5GKtj
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6916
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11528
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:6929
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11541
msgctxt "draw_notebookbar_groupedbar_compact|editdrawb"
msgid "D_raw"
msgstr "Рисунок"
#. dc5qG
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7354
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9273
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10396
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11074
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11966
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7367
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9286
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10409
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11087
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:11979
msgctxt "draw_notebookbar_groupedbar_compact|ArrangeButton"
msgid "_Arrange"
msgstr "Расположение"
#. ApB4j
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7822
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:7835
msgctxt "draw_notebookbar_groupedbar_compact|draw"
msgid "_Shape"
msgstr "Фигура"
#. R5YZh
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8099
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12384
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8112
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12397
msgctxt "draw_notebookbar_groupedbar_compact|viewDrawb"
msgid "Grou_p"
msgstr "Группа"
#. TCPHC
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8344
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8357
msgctxt "draw_notebookbar_groupedbar_compact|3Db"
msgid "3_D"
msgstr "Объём"
#. hgFay
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8578
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8591
msgctxt "draw_notebookbar_groupedbar_compact|GridButton"
msgid "_Fontwork"
msgstr "_Текстовые эффекты"
#. Q6ELJ
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8692
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8705
msgctxt "draw_notebookbar_groupedbar_compact|GridButton"
msgid "_Grid"
msgstr "Сетка"
#. fQJRZ
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8832
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:8845
msgctxt "draw_notebookbar_groupedbar_compact|graphicB"
msgid "_Image"
msgstr "Изображение"
#. xudwE
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9669
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9682
msgctxt "draw_notebookbar_groupedbar_compact|GridB"
msgid "Fi_lter"
msgstr "_Фильтр"
#. 8qSXf
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9958
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:9971
msgctxt "draw_notebookbar_groupedbar_compact|graphicB"
msgid "_Object"
msgstr "Объект"
#. QdUM9
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10839
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:10852
msgctxt "draw_notebookbar_groupedbar_compact|graphicB"
msgid "_Media"
msgstr "Медиа"
#. kwxYr
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12522
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:12535
msgctxt "draw_notebookbar_groupedbar_compact|oleB"
msgid "_Master"
msgstr "Мастер"
#. bBpXr
-#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:14350
+#: sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui:14363
msgctxt "draw_notebookbar_groupedbar_compact|menub"
msgid "_Menu"
msgstr "Меню"
@@ -4715,7 +4619,7 @@ msgstr "Анимация текста"
#: sd/uiconfig/simpress/ui/customanimationspanel.ui:158
msgctxt "customanimationspanel|STR_CUSTOMANIMATION_LIST_HELPTEXT"
msgid "First select the slide element and then click 'Add...' to add an animation effect."
-msgstr ""
+msgstr "Сперва выделите элемент слайда, затем щёлкните «Добавить...» для добавления эффекта анимации."
#. nRqGR
#: sd/uiconfig/simpress/ui/customanimationspanel.ui:190
@@ -6274,190 +6178,190 @@ msgid "Menubar"
msgstr "Главное меню"
#. aEHCg
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:2461
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:2474
msgctxt "impress_notebookbar_groupedbar_compact|MenubarView"
msgid "Menubar"
msgstr "Главное меню"
#. LL2dj
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3076
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3089
msgctxt "notebookbar_groupedbar_compact|fileb"
msgid "_File"
msgstr "_Файл"
#. MR7ZB
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3187
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3200
msgctxt "notebookbar_groupedbar_compact|editb"
msgid "_Edit"
msgstr "_Правка"
#. 26rGJ
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3317
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4536
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3330
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4549
msgctxt "notebookbar_groupedbar_compact|reviewb"
msgid "S_lide"
msgstr "Слайд"
#. WZ5Fe
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3479
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12737
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3492
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12750
msgctxt "notebookbar_groupedbar_compact|draw"
msgid "D_raw"
msgstr "Рисунок"
#. GYqWX
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3922
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7688
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9605
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10728
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11407
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12298
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13263
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:3935
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7701
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9618
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10741
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11420
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12311
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13276
msgctxt "notebookbar_groupedbar_compact|insertText"
msgid "_Snap"
msgstr "Направляющие"
#. LFnQL
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4062
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6823
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13127
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4075
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6836
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13140
msgctxt "notebookbar_groupedbar_compact|insertText"
msgid "_Insert"
msgstr "Вставка"
#. BxXfn
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4187
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5367
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13414
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4200
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5380
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13427
msgctxt "notebookbar_groupedbar_compact|viewT"
msgid "_View"
msgstr "_Вид"
#. 5wZbP
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4301
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13528
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4314
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13541
msgctxt "notebookbar_groupedbar_compact|reviewb"
msgid "_Review"
msgstr "_Проверка"
#. 5fAr4
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4400
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4413
msgctxt "notebookbar_groupedbar_compact|ExtensionMenuButton"
msgid "E_xtension"
msgstr "_Расширение"
#. fED72
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4691
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5535
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4704
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5548
msgctxt "notebookbar_groupedbar_compact|formatt"
msgid "F_ont"
msgstr "Шрифт"
#. YgxCs
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4926
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5746
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:4939
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:5759
msgctxt "notebookbar_groupedbar_compact|paragrapht"
msgid "_Paragraph"
msgstr "Абзац"
#. Tgwxy
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6024
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6037
msgctxt "notebookbar_groupedbar_compact|rowscolumnst"
msgid "_Table"
msgstr "Таблица"
#. PRamE
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6698
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6711
msgctxt "notebookbar_groupedbar_compact|calculatet"
msgid "_Calc"
msgstr "Вычисления"
#. DC7Hv
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6972
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11582
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:6985
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11595
msgctxt "notebookbar_groupedbar_compact|editdrawb"
msgid "D_raw"
msgstr "Рисунок"
#. ncAKi
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7410
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9327
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10450
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11128
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12020
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7423
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9340
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10463
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:11141
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12033
msgctxt "notebookbar_groupedbar_compact|ArrangeButton"
msgid "_Arrange"
msgstr "Расположение"
#. 8pLR3
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7878
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:7891
msgctxt "notebookbar_groupedbar_compact|draw"
msgid "_Shape"
msgstr "Фигура"
#. NM63T
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8153
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12438
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8166
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12451
msgctxt "notebookbar_groupedbar_compact|viewDrawb"
msgid "Grou_p"
msgstr "Группа"
#. cbMTW
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8398
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8411
msgctxt "notebookbar_groupedbar_compact|3Db"
msgid "3_D"
msgstr "Объём"
#. BTzDn
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8632
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8645
msgctxt "notebookbar_groupedbar_compact|GridButton"
msgid "_Fontwork"
msgstr "_Текстовые эффекты"
#. PLqyG
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8746
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8759
msgctxt "notebookbar_groupedbar_compact|GridButton"
msgid "_Grid"
msgstr "Сетка"
#. XL8kc
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8886
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:8899
msgctxt "notebookbar_groupedbar_compact|graphicB"
msgid "_Image"
msgstr "Изображение"
#. snvvw
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9723
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:9736
msgctxt "notebookbar_groupedbar_compact|GridB"
msgid "Fi_lter"
msgstr "_Фильтр"
#. 5a4zV
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10012
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10025
msgctxt "notebookbar_groupedbar_compact|graphicB"
msgid "_Object"
msgstr "Объект"
#. Ghwp6
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10893
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:10906
msgctxt "notebookbar_groupedbar_compact|graphicB"
msgid "_Media"
msgstr "Медиа"
#. w6MPS
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12576
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:12589
msgctxt "notebookbar_groupedbar_compact|oleB"
msgid "_Master"
msgstr "Мастер"
#. MGQxe
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13666
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:13679
msgctxt "impress_notebookbar_groupedbar_compact|FormButton"
msgid "Fo_rm"
msgstr "Форма"
#. xBYsC
-#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:14428
+#: sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui:14441
msgctxt "notebookbar_groupedbar_compact|menub"
msgid "_Menu"
msgstr "Меню"
@@ -7026,7 +6930,7 @@ msgstr "Объекты всегда перемещаемы"
#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:291
msgctxt "optimpressgeneralpage|distortcb"
msgid "Do not distort objects in curve"
-msgstr ""
+msgstr "Не превращать объект в кривую"
#. TDrpy
#: sd/uiconfig/simpress/ui/optimpressgeneralpage.ui:307
@@ -8250,7 +8154,7 @@ msgstr "Воспроизвести"
#: sd/uiconfig/simpress/ui/slidetransitionspanel.ui:375
msgctxt "slidetransitionspanel|play|tooltip_text"
msgid "Preview Effect"
-msgstr ""
+msgstr "Просмотр эффекта"
#. T99jN
#: sd/uiconfig/simpress/ui/tabledesignpanel.ui:23
diff --git a/source/ru/sfx2/messages.po b/source/ru/sfx2/messages.po
index 5b714393fa5..2f042775c56 100644
--- a/source/ru/sfx2/messages.po
+++ b/source/ru/sfx2/messages.po