40
40
msgid "Diff Settings"
41
41
msgstr "Настройки различий"
43
#: komparepart/kompare_part.cpp:171
43
#: komparepart/kompare_part.cpp:176
45
45
msgstr "Сохранить &все"
47
#: komparepart/kompare_part.cpp:173
48
msgid "Save .&diff..."
47
#: komparepart/kompare_part.cpp:178
49
#| msgid "Save .&diff..."
49
51
msgstr "Сохранить различия в файл .&diff..."
51
#: komparepart/kompare_part.cpp:175
53
#: komparepart/kompare_part.cpp:180
52
54
msgid "Swap Source with Destination"
53
55
msgstr "Поменять местами источник и назначение"
55
#: komparepart/kompare_part.cpp:177
57
#: komparepart/kompare_part.cpp:182
56
58
msgid "Show Statistics"
57
59
msgstr "Показать статистику"
59
#: komparepart/kompare_part.cpp:180
61
#: komparepart/kompare_part.cpp:185
60
62
msgid "Refresh Diff"
63
#: komparepart/kompare_part.cpp:285 komparepart/kompare_part.cpp:296
65
#: komparepart/kompare_part.cpp:294 komparepart/kompare_part.cpp:305
65
67
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
66
68
msgstr "<qt>Невозможно загрузить ссылку <b>%1</b>.</qt>"
68
#: komparepart/kompare_part.cpp:334
70
#: komparepart/kompare_part.cpp:343
70
72
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
71
73
msgstr "<qt>Невозможно открыть <b>%1</b>.</qt>"
73
#: komparepart/kompare_part.cpp:519
75
#: komparepart/kompare_part.cpp:528
74
76
msgid "Diff Options"
75
77
msgstr "Параметры Diff"
77
#: komparepart/kompare_part.cpp:537
79
#: komparepart/kompare_part.cpp:546
78
80
msgid "*.diff *.dif *.patch|Patch Files"
79
81
msgstr "*.diff *.dif *.patch|Файлы различий (*.diff *.dif *.patch)"
81
#: komparepart/kompare_part.cpp:537
83
#: komparepart/kompare_part.cpp:546
83
85
msgstr "Сохранить .diff"
85
#: komparepart/kompare_part.cpp:540
87
#: komparepart/kompare_part.cpp:549
86
88
msgid "The file exists or is write-protected; do you want to overwrite it?"
87
89
msgstr "Файл уже существует. Заменить его?"
89
#: komparepart/kompare_part.cpp:540
91
#: komparepart/kompare_part.cpp:549
90
92
msgid "File Exists"
91
93
msgstr "Файл уже существует"
93
#: komparepart/kompare_part.cpp:540
95
#: komparepart/kompare_part.cpp:549
97
#: komparepart/kompare_part.cpp:540
99
#: komparepart/kompare_part.cpp:549
98
100
msgid "Do Not Overwrite"
99
101
msgstr "Не заменять"
101
#: komparepart/kompare_part.cpp:574
103
#: komparepart/kompare_part.cpp:629
102
104
msgid "KomparePart"
103
105
msgstr "KomparePart"
105
#: komparepart/kompare_part.cpp:575 main.cpp:62
107
#: komparepart/kompare_part.cpp:630 main.cpp:62
106
108
#: komparenavtreepart/komparenavtreepart.cpp:789
107
109
msgid "John Firebaugh"
110
#: komparepart/kompare_part.cpp:575 komparepart/kompare_part.cpp:576
111
#: main.cpp:62 main.cpp:63 komparenavtreepart/komparenavtreepart.cpp:789
112
#: komparepart/kompare_part.cpp:630 komparepart/kompare_part.cpp:631
113
#: komparepart/kompare_part.cpp:632 main.cpp:62 main.cpp:63
114
#: komparenavtreepart/komparenavtreepart.cpp:789
112
115
#: komparenavtreepart/komparenavtreepart.cpp:790
116
#: komparepart/kompare_part.cpp:576 main.cpp:63
119
#: komparepart/kompare_part.cpp:631 main.cpp:63
117
120
#: komparenavtreepart/komparenavtreepart.cpp:790
118
121
msgid "Otto Bruggeman"
121
#: komparepart/kompare_part.cpp:586
124
#: komparepart/kompare_part.cpp:632 main.cpp:65
128
#: komparepart/kompare_part.cpp:642
122
129
msgid "Running diff..."
123
130
msgstr "Запущен diff..."
125
#: komparepart/kompare_part.cpp:589
132
#: komparepart/kompare_part.cpp:645
126
133
msgid "Parsing diff output..."
127
134
msgstr "Обрабатывается вывод diff..."
129
#: komparepart/kompare_part.cpp:638
136
#: komparepart/kompare_part.cpp:694
131
138
msgid "Comparing file %1 with file %2"
132
139
msgstr "Сравниваются файл %1 с файлом %2"
134
#: komparepart/kompare_part.cpp:643
141
#: komparepart/kompare_part.cpp:699
136
143
msgid "Comparing files in %1 with files in %2"
137
144
msgstr "Сравниваются файлы в %1 с файлами в %2"
139
#: komparepart/kompare_part.cpp:648
146
#: komparepart/kompare_part.cpp:704
141
148
msgid "Viewing diff output from %1"
142
149
msgstr "Просмотр вывода diff из %1"
144
#: komparepart/kompare_part.cpp:651
151
#: komparepart/kompare_part.cpp:707
146
153
msgid "Blending diff output from %1 into file %2"
147
154
msgstr "Смешивание вывода diff из файла %1 в файл %2"
149
#: komparepart/kompare_part.cpp:656
156
#: komparepart/kompare_part.cpp:712
151
158
msgid "Blending diff output from %1 into folder %2"
152
159
msgstr "Смешивание вывода diff из файла %1 в папку %2"
154
#: komparepart/kompare_part.cpp:679 komparepart/kompare_part.cpp:710
155
#: komparepart/kompare_part.cpp:825
161
#: komparepart/kompare_part.cpp:735 komparepart/kompare_part.cpp:766
162
#: komparepart/kompare_part.cpp:881
157
164
"You have made changes to the destination file(s).\n"
158
165
"Would you like to save them?"
160
167
"Файл назначения был изменён.\n"
161
168
"Вы хотите его сохранить?"
163
#: komparepart/kompare_part.cpp:681 komparepart/kompare_part.cpp:712
164
#: komparepart/kompare_part.cpp:827
170
#: komparepart/kompare_part.cpp:737 komparepart/kompare_part.cpp:768
171
#: komparepart/kompare_part.cpp:883
165
172
msgid "Save Changes?"
166
173
msgstr "Сохранить изменения?"
168
#. i18n: file: komparepart/komparesaveoptionsbase.ui:238
175
#. i18n: file: komparepart/komparesaveoptionsbase.ui:235
169
176
#. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB)
170
#: komparepart/kompare_part.cpp:750 libdialogpages/diffpage.cpp:253 rc.cpp:77
177
#: komparepart/kompare_part.cpp:806 libdialogpages/diffpage.cpp:238 rc.cpp:77
172
179
msgstr "Объединённый"
174
#. i18n: file: komparepart/komparesaveoptionsbase.ui:210
181
#. i18n: file: komparepart/komparesaveoptionsbase.ui:207
175
182
#. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB)
176
#: komparepart/kompare_part.cpp:753 libdialogpages/diffpage.cpp:249 rc.cpp:65
183
#: komparepart/kompare_part.cpp:809 libdialogpages/diffpage.cpp:236 rc.cpp:65
178
185
msgstr "Контекст"
180
#. i18n: file: komparepart/komparesaveoptionsbase.ui:231
187
#. i18n: file: komparepart/komparesaveoptionsbase.ui:228
181
188
#. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB)
182
#: komparepart/kompare_part.cpp:756 rc.cpp:74
189
#: komparepart/kompare_part.cpp:812 rc.cpp:74
186
#. i18n: file: komparepart/komparesaveoptionsbase.ui:217
193
#. i18n: file: komparepart/komparesaveoptionsbase.ui:214
187
194
#. i18n: ectx: property (text), widget (QRadioButton, m_EdRB)
188
#: komparepart/kompare_part.cpp:759 rc.cpp:68
195
#: komparepart/kompare_part.cpp:815 rc.cpp:68
192
#. i18n: file: komparepart/komparesaveoptionsbase.ui:224
199
#. i18n: file: komparepart/komparesaveoptionsbase.ui:221
193
200
#. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB)
194
#: komparepart/kompare_part.cpp:762 libdialogpages/diffpage.cpp:251 rc.cpp:71
201
#: komparepart/kompare_part.cpp:818 libdialogpages/diffpage.cpp:237 rc.cpp:71
198
#: komparepart/kompare_part.cpp:766
205
#: komparepart/kompare_part.cpp:822
199
206
#: komparenavtreepart/komparenavtreepart.cpp:624
201
208
msgstr "Неизвестный"
203
#: komparepart/kompare_part.cpp:782
210
#: komparepart/kompare_part.cpp:838
205
212
"No diff file, or no 2 files have been diffed. Therefore no stats are "
342
349
"является Unified, т.к. он лёгок для чтения. Пожалуйста, используйте именно "
343
350
"его для заплаток, которые вы отправляете разработчикам KDE."
345
#: libdialogpages/diffpage.cpp:245
352
#: libdialogpages/diffpage.cpp:233
346
353
msgid "Output Format"
347
354
msgstr "Формат вывода"
349
#: libdialogpages/diffpage.cpp:259
356
#: libdialogpages/diffpage.cpp:243
350
357
msgid "Lines of Context"
351
358
msgstr "Строки контекста"
353
#. i18n: file: komparepart/komparesaveoptionsbase.ui:266
354
#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
355
#: libdialogpages/diffpage.cpp:262 rc.cpp:83
356
msgid "Number of context lines:"
357
msgstr "Количество строк контекста:"
359
#: libdialogpages/diffpage.cpp:264
360
#: libdialogpages/diffpage.cpp:244 libdialogpages/diffpage.cpp:248
361
#: libdialogpages/diffpage.cpp:250
361
363
"The number of context lines is normally 2 or 3. This makes the diff readable "
362
364
"and applicable in most cases. More than 3 lines will only bloat the diff "
364
366
msgstr "Количество строк, стоящих рядом с изменённой. Обычно это 2 или 3."
366
#. i18n: file: komparepart/komparesaveoptionsbase.ui:198
368
#. i18n: file: komparepart/komparesaveoptionsbase.ui:263
369
#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
370
#: libdialogpages/diffpage.cpp:247 rc.cpp:83
371
msgid "Number of context lines:"
372
msgstr "Количество строк контекста:"
374
#. i18n: file: komparepart/komparesaveoptionsbase.ui:195
367
375
#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_FormatBG)
368
#: libdialogpages/diffpage.cpp:270 rc.cpp:62
376
#: libdialogpages/diffpage.cpp:256 rc.cpp:62
372
#: libdialogpages/diffpage.cpp:284
380
#: libdialogpages/diffpage.cpp:270
376
#: libdialogpages/diffpage.cpp:287
384
#: libdialogpages/diffpage.cpp:273
386
#| msgid "Treat new files as empty"
387
msgid "&Treat new files as empty"
388
msgstr "Считать новые файлы как пустые"
390
#: libdialogpages/diffpage.cpp:274
392
#| msgid "This option corresponds to the -I diff option."
393
msgid "This option corresponds to the -N diff option."
394
msgstr "Отвечает ключу -l."
396
#: libdialogpages/diffpage.cpp:275
398
"With this option enabled diff will treat a file that only exists in one of "
399
"the directories as empty in the other directory. This means that the file is "
400
"compared with an empty file and because of this will appear as one big "
401
"insertion or deletion."
404
#: libdialogpages/diffpage.cpp:278
377
405
msgid "&Look for smaller changes"
378
406
msgstr "Искать &наименьшие изменения"
380
#: libdialogpages/diffpage.cpp:288
408
#: libdialogpages/diffpage.cpp:279
381
409
msgid "This corresponds to the -d diff option."
382
410
msgstr "Отвечает ключу -d."
384
#: libdialogpages/diffpage.cpp:290
412
#: libdialogpages/diffpage.cpp:280
414
"With this option enabled diff will try a little harder (at the cost of more "
415
"memory) to find fewer changes."
418
#: libdialogpages/diffpage.cpp:282
385
419
msgid "O&ptimize for large files"
386
420
msgstr "Оптимизация для &больших файлов"
388
#: libdialogpages/diffpage.cpp:291
422
#: libdialogpages/diffpage.cpp:283
389
423
msgid "This corresponds to the -H diff option."
390
424
msgstr "Отвечает ключу -H."
392
#: libdialogpages/diffpage.cpp:293
426
#: libdialogpages/diffpage.cpp:284
428
"This option lets diff makes better diffs when using large files. The "
429
"definition of large is nowhere to be found though."
432
#: libdialogpages/diffpage.cpp:286
393
433
msgid "&Ignore changes in case"
394
434
msgstr "&Игнорировать изменения в регистре символов"
396
#: libdialogpages/diffpage.cpp:294
436
#: libdialogpages/diffpage.cpp:287
397
437
msgid "This corresponds to the -i diff option."
398
438
msgstr "Отвечает ключу -i."
400
#: libdialogpages/diffpage.cpp:302
440
#: libdialogpages/diffpage.cpp:288
442
"With this option to ignore changes in case enabled, diff will not indicate a "
443
"difference when something in one file is changed into SoMEthing in the other "
447
#: libdialogpages/diffpage.cpp:296
401
448
msgid "Ignore regexp:"
402
449
msgstr "Игнорировать строки по регулярному выражению:"
404
#: libdialogpages/diffpage.cpp:303
451
#: libdialogpages/diffpage.cpp:297
405
452
msgid "This option corresponds to the -I diff option."
406
453
msgstr "Отвечает ключу -l."
408
#: libdialogpages/diffpage.cpp:307
455
#: libdialogpages/diffpage.cpp:298
457
"When this checkbox is enabled, an option to diff is given that will make "
458
"diff ignore lines that match the regular expression."
461
#: libdialogpages/diffpage.cpp:302
410
463
"Add the regular expression here that you want to use\n"
411
464
"to ignore lines that match it."
412
465
msgstr "Добавьте регулярное выражение для игнорируемых строк здесь."
414
#: libdialogpages/diffpage.cpp:313
467
#: libdialogpages/diffpage.cpp:308
416
469
msgstr "&Изменить..."
418
#: libdialogpages/diffpage.cpp:314
471
#: libdialogpages/diffpage.cpp:309
420
473
"Clicking this will open a regular expression dialog where\n"
421
474
"you can graphically create regular expressions."
422
475
msgstr "Открыть редактор регулярных выражений."
424
#: libdialogpages/diffpage.cpp:322
477
#: libdialogpages/diffpage.cpp:317
425
478
msgid "Whitespace"
428
#: libdialogpages/diffpage.cpp:325
481
#: libdialogpages/diffpage.cpp:320
429
482
msgid "E&xpand tabs to spaces in output"
430
483
msgstr "В &выводе пробелы вместо символов табуляции"
432
#: libdialogpages/diffpage.cpp:326
485
#: libdialogpages/diffpage.cpp:321
433
486
msgid "This option corresponds to the -t diff option."
434
487
msgstr "Отвечает ключу -t."
436
#: libdialogpages/diffpage.cpp:328
489
#: libdialogpages/diffpage.cpp:322
491
"This option does not always produce the right result. Due to this expansion "
492
"Kompare may have problems applying the change to the destination file."
495
#: libdialogpages/diffpage.cpp:324
437
496
msgid "I&gnore added or removed empty lines"
438
497
msgstr "И&гнорировать добавленные или удалённые пустые строки"
440
#: libdialogpages/diffpage.cpp:329
499
#: libdialogpages/diffpage.cpp:325
441
500
msgid "This option corresponds to the -B diff option."
442
501
msgstr "Отвечает ключу -B."
444
#: libdialogpages/diffpage.cpp:331
503
#: libdialogpages/diffpage.cpp:326
505
"This can be very useful in situations where code has been reorganized and "
506
"empty lines have been added or removed to improve legibility."
509
#: libdialogpages/diffpage.cpp:328
445
510
msgid "Ig&nore changes in the amount of whitespace"
446
511
msgstr "Игнорировать изменение &количества пробелов"
448
#: libdialogpages/diffpage.cpp:332
513
#: libdialogpages/diffpage.cpp:329
449
514
msgid "This option corresponds to the -b diff option."
450
515
msgstr "Отвечает ключу -b."
452
#: libdialogpages/diffpage.cpp:334
517
#: libdialogpages/diffpage.cpp:330
519
"If you are uninterested in differences arising due to, for example, changes "
520
"in indentation, then use this option."
523
#: libdialogpages/diffpage.cpp:332
453
524
msgid "Ign&ore all whitespace"
454
525
msgstr "Игнорировать &пробельное пространство"
456
#: libdialogpages/diffpage.cpp:335
527
#: libdialogpages/diffpage.cpp:333
457
528
msgid "This option corresponds to the -w diff option."
458
529
msgstr "Отвечает ключу -w."
460
#: libdialogpages/diffpage.cpp:337
531
#: libdialogpages/diffpage.cpp:334
533
"This is useful for seeing the significant changes without being overwhelmed "
534
"by all the white space changes."
537
#: libdialogpages/diffpage.cpp:336
461
538
msgid "Igno&re changes due to tab expansion"
462
539
msgstr "Игнорировать &изменения по замене табуляции пробелами"
464
#: libdialogpages/diffpage.cpp:338
541
#: libdialogpages/diffpage.cpp:337
465
542
msgid "This option corresponds to the -E diff option."
466
543
msgstr "Отвечает ключу -E."
468
#. i18n: file: komparepart/komparesaveoptionsbase.ui:102
545
#: libdialogpages/diffpage.cpp:338
547
"If there is a change because tabs have been expanded into spaces in the "
548
"other file, then this option will make sure that these do not show up. "
549
"Kompare currently has some problems applying such changes so be careful when "
550
"you use this option."
553
#. i18n: file: komparepart/komparesaveoptionsbase.ui:99
469
554
#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_OptionsGB)
470
555
#: libdialogpages/diffpage.cpp:344 rc.cpp:32
785
871
msgid "Your emails"
786
872
msgstr "wizardkde@yandex.ru"
788
#. i18n: file: komparepart/komparepartui.rc:14
874
#. i18n: file: komparepart/komparepartui.rc:17
789
875
#. i18n: ectx: Menu (difference)
791
877
msgid "&Difference"
792
878
msgstr "&Различие"
794
#. i18n: file: komparepart/komparesaveoptionsbase.ui:36
880
#. i18n: file: komparepart/komparesaveoptionsbase.ui:33
795
881
#. i18n: ectx: property (title), widget (Q3GroupBox, GroupBox2)
797
883
msgid "Run Diff In"
798
884
msgstr "Запустить Diff в"
800
#. i18n: file: komparepart/komparesaveoptionsbase.ui:74
886
#. i18n: file: komparepart/komparesaveoptionsbase.ui:71
801
887
#. i18n: ectx: property (title), widget (Q3GroupBox, m_CommandLineGB)
803
889
msgid "Command Line"
804
890
msgstr "Командная строка"
806
#. i18n: file: komparepart/komparesaveoptionsbase.ui:89
892
#. i18n: file: komparepart/komparesaveoptionsbase.ui:86
807
893
#. i18n: ectx: property (text), widget (QLabel, m_CommandLineLabel)
809
895
msgid "cd dir && diff -udHprNa -- source destination"
810
896
msgstr "cd dir && diff -udHprNa -- <источник> <назначение>"
812
#. i18n: file: komparepart/komparesaveoptionsbase.ui:114
898
#. i18n: file: komparepart/komparesaveoptionsbase.ui:111
813
899
#. i18n: ectx: property (text), widget (QCheckBox, m_SmallerChangesCB)
815
901
msgid "Look for smaller changes"
816
902
msgstr "Поиск наименьших изменений"
818
#. i18n: file: komparepart/komparesaveoptionsbase.ui:124
904
#. i18n: file: komparepart/komparesaveoptionsbase.ui:121
819
905
#. i18n: ectx: property (text), widget (QCheckBox, m_LargeFilesCB)
821
907
msgid "Optimize for large files"
822
908
msgstr "Оптимизация для больших файлов"
824
#. i18n: file: komparepart/komparesaveoptionsbase.ui:134
910
#. i18n: file: komparepart/komparesaveoptionsbase.ui:131
825
911
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreCaseCB)
827
913
msgid "Ignore changes in case"
828
914
msgstr "Игнорировать изменения в регистре букв"
830
#. i18n: file: komparepart/komparesaveoptionsbase.ui:141
916
#. i18n: file: komparepart/komparesaveoptionsbase.ui:138
831
917
#. i18n: ectx: property (text), widget (QCheckBox, m_ExpandTabsCB)
833
919
msgid "Expand tabs to spaces"
834
920
msgstr "Заменить табуляцию пробелами"
836
#. i18n: file: komparepart/komparesaveoptionsbase.ui:148
922
#. i18n: file: komparepart/komparesaveoptionsbase.ui:145
837
923
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreEmptyLinesCB)
839
925
msgid "Ignore added or removed empty lines"
840
926
msgstr "Игнорировать добавленные и удалённые пустые строки"
842
#. i18n: file: komparepart/komparesaveoptionsbase.ui:155
928
#. i18n: file: komparepart/komparesaveoptionsbase.ui:152
843
929
#. i18n: ectx: property (text), widget (QCheckBox, m_IgnoreWhiteSpaceCB)
845
931
msgid "Ignore changes in whitespace"
846
932
msgstr "Игнорировать изменения пробелов"
848
#. i18n: file: komparepart/komparesaveoptionsbase.ui:162
934
#. i18n: file: komparepart/komparesaveoptionsbase.ui:159
849
935
#. i18n: ectx: property (text), widget (QCheckBox, m_FunctionNamesCB)
851
937
msgid "Show function names"
852
938
msgstr "Показывать имена функций"
854
#. i18n: file: komparepart/komparesaveoptionsbase.ui:172
940
#. i18n: file: komparepart/komparesaveoptionsbase.ui:169
855
941
#. i18n: ectx: property (text), widget (QCheckBox, m_RecursiveCB)
857
943
msgid "Compare folders recursively"
858
944
msgstr "Сравнить папки рекурсивно"
860
#. i18n: file: komparepart/komparesaveoptionsbase.ui:182
946
#. i18n: file: komparepart/komparesaveoptionsbase.ui:179
861
947
#. i18n: ectx: property (text), widget (QCheckBox, m_NewFilesCB)
863
949
msgid "Treat new files as empty"
864
950
msgstr "Считать новые файлы как пустые"
866
#. i18n: file: komparepart/komparesaveoptionsbase.ui:248
952
#. i18n: file: komparepart/komparesaveoptionsbase.ui:245
867
953
#. i18n: ectx: property (text), widget (QRadioButton, m_SideBySideRB)
869
955
msgid "Side-by-side"