17
17
"X-Generator: KBabel 1.11.4\n"
18
18
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20
#: komparepart/kompareprefdlg.cpp:33
20
#: komparepart/kompareprefdlg.cpp:35
21
21
msgid "Preferences"
24
#: komparepart/kompareprefdlg.cpp:43
24
#: komparepart/kompareprefdlg.cpp:45
28
#: komparepart/kompareprefdlg.cpp:45
28
#: komparepart/kompareprefdlg.cpp:47
29
29
msgid "View Settings"
30
30
msgstr "ਵੇਖਣ ਸੈਟਿੰਗ"
32
#: komparepart/kompareprefdlg.cpp:49 libdialogpages/diffpage.cpp:229
32
#: komparepart/kompareprefdlg.cpp:51 libdialogpages/diffpage.cpp:230
33
33
#: kompareurldialog.cpp:47
35
35
msgstr "ਅੰਤਰ(Diff)"
37
#: komparepart/kompareprefdlg.cpp:51
37
#: komparepart/kompareprefdlg.cpp:53
38
38
msgid "Diff Settings"
39
39
msgstr "ਅੰਤਰ ਸੈਟਿੰਗ"
41
#: komparepart/kompare_part.cpp:166
41
#: komparepart/kompare_part.cpp:172
43
43
msgstr "ਸਭ ਸੰਭਾਲੋ(&A)"
45
#: komparepart/kompare_part.cpp:168
45
#: komparepart/kompare_part.cpp:174
46
46
msgid "Save .&diff..."
47
47
msgstr ".&diff ਸੰਭਾਲੋ..."
49
#: komparepart/kompare_part.cpp:170
49
#: komparepart/kompare_part.cpp:176
50
50
msgid "Swap Source with Destination"
51
51
msgstr "ਟਿਕਾਣੇ ਨੂੰ ਸਰੋਤ ਨਾਲ ਬਦਲੋ"
53
#: komparepart/kompare_part.cpp:172
53
#: komparepart/kompare_part.cpp:178
54
54
msgid "Show Statistics"
55
55
msgstr "ਅੰਕੜੇ ਵੇਖੋ"
57
#: komparepart/kompare_part.cpp:175
57
#: komparepart/kompare_part.cpp:181
58
58
msgid "Refresh Diff"
59
59
msgstr "ਅੰਤਰ ਤਾਜ਼ਾ"
61
#: komparepart/kompare_part.cpp:270
61
#: komparepart/kompare_part.cpp:286 komparepart/kompare_part.cpp:297
63
63
msgid "<qt>The URL <b>%1</b> cannot be downloaded.</qt>"
64
64
msgstr "<qt>URL <b>%1</b> ਡਾਊਨਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।</qt>"
66
#: komparepart/kompare_part.cpp:282
66
#: komparepart/kompare_part.cpp:335
68
68
msgid "<qt>The URL <b>%1</b> does not exist on your system.</qt>"
69
69
msgstr "<qt>URL <b>%1</b> ਤੁਹਾਡੇ ਸਿਸਟਮ ਉੱਤੇ ਮੌਜੂਦ ਨਹੀਂ ਹੈ।</qt>"
71
#: komparepart/kompare_part.cpp:428
71
#: komparepart/kompare_part.cpp:520
72
72
msgid "Diff Options"
73
73
msgstr "ਅੰਤਰ ਚੋਣਾਂ"
75
#: komparepart/kompare_part.cpp:446
75
#: komparepart/kompare_part.cpp:538
76
76
msgid "*.diff *.dif *.patch|Patch Files"
77
77
msgstr "*.diff *.dif *.patch|ਪੈਂਚ ਫਾਇਲਾਂ"
79
#: komparepart/kompare_part.cpp:446
79
#: komparepart/kompare_part.cpp:538
81
81
msgstr ".diff ਸੰਭਾਲੋ"
83
#: komparepart/kompare_part.cpp:449
83
#: komparepart/kompare_part.cpp:541
84
84
msgid "The file exists or is write-protected; do you want to overwrite it?"
87
#: komparepart/kompare_part.cpp:449
87
#: komparepart/kompare_part.cpp:541
88
88
msgid "File Exists"
89
89
msgstr "ਫਾਇਲ ਮੌਜੂਦ ਹੈ"
91
#: komparepart/kompare_part.cpp:449
91
#: komparepart/kompare_part.cpp:541
95
#: komparepart/kompare_part.cpp:449
95
#: komparepart/kompare_part.cpp:541
96
96
msgid "Do Not Overwrite"
97
97
msgstr "ਉੱਤੇ ਨਾ ਲਿਖੋ"
99
#: komparepart/kompare_part.cpp:484
99
#: komparepart/kompare_part.cpp:575
100
100
msgid "KomparePart"
101
101
msgstr "KomparePart"
103
#: komparepart/kompare_part.cpp:485 main.cpp:62
104
#: komparenavtreepart/komparenavtreepart.cpp:774
103
#: komparepart/kompare_part.cpp:576 main.cpp:62
104
#: komparenavtreepart/komparenavtreepart.cpp:789
105
105
msgid "John Firebaugh"
108
#: komparepart/kompare_part.cpp:485 komparepart/kompare_part.cpp:486
109
#: main.cpp:62 main.cpp:63 komparenavtreepart/komparenavtreepart.cpp:774
110
#: komparenavtreepart/komparenavtreepart.cpp:775
108
#: komparepart/kompare_part.cpp:576 komparepart/kompare_part.cpp:577
109
#: main.cpp:62 main.cpp:63 komparenavtreepart/komparenavtreepart.cpp:789
110
#: komparenavtreepart/komparenavtreepart.cpp:790
114
#: komparepart/kompare_part.cpp:486 main.cpp:63
115
#: komparenavtreepart/komparenavtreepart.cpp:775
114
#: komparepart/kompare_part.cpp:577 main.cpp:63
115
#: komparenavtreepart/komparenavtreepart.cpp:790
116
116
msgid "Otto Bruggeman"
119
#: komparepart/kompare_part.cpp:496
119
#: komparepart/kompare_part.cpp:587
120
120
msgid "Running diff..."
121
121
msgstr "ਅੰਤਰ (diff) ਚੱਲ ਰਿਹਾ ਹੈ..."
123
#: komparepart/kompare_part.cpp:499
123
#: komparepart/kompare_part.cpp:590
124
124
msgid "Parsing diff output..."
125
125
msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ ਪਾਰਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
127
#: komparepart/kompare_part.cpp:548
127
#: komparepart/kompare_part.cpp:639
129
129
msgid "Comparing file %1 with file %2"
130
130
msgstr "ਫਾਇਲ %1 ਦੀ ਫਾਇਲ %2 ਨਾਲ ਤੁਲਨਾ..."
132
#: komparepart/kompare_part.cpp:553
132
#: komparepart/kompare_part.cpp:644
134
134
msgid "Comparing files in %1 with files in %2"
135
135
msgstr "%1 ਵਿੱਚੋਂ ਫਾਇਲਾਂ ਦੀ %2 ਵਿਚਲੀਆਂ ਫਾਇਲਾਂ ਨਾਲ ਤੁਲਨਾ"
137
#: komparepart/kompare_part.cpp:558
137
#: komparepart/kompare_part.cpp:649
139
139
msgid "Viewing diff output from %1"
140
140
msgstr "%1 ਤੋਂ ਅੰਤਰ ਆਉਟਪੁੱਟ ਵੇਖੋ"
142
#: komparepart/kompare_part.cpp:561
142
#: komparepart/kompare_part.cpp:652
144
144
msgid "Blending diff output from %1 into file %2"
147
#: komparepart/kompare_part.cpp:566
147
#: komparepart/kompare_part.cpp:657
149
149
msgid "Blending diff output from %1 into folder %2"
152
#: komparepart/kompare_part.cpp:589 komparepart/kompare_part.cpp:626
153
#: komparepart/kompare_part.cpp:737
152
#: komparepart/kompare_part.cpp:680 komparepart/kompare_part.cpp:711
153
#: komparepart/kompare_part.cpp:826
155
155
"You have made changes to the destination file(s).\n"
156
156
"Would you like to save them?"
158
158
"ਤੁਸੀਂ ਟਿਕਾਣਾ ਫਾਇਲਾਂ ਵਿੱਚ ਬਦਲਾਅ ਕੀਤੇ ਹਨ।\n"
159
159
"ਕੀ ਤੁਸੀਂ ਉਨ੍ਹਾਂ ਨੂੰ ਸੰਭਾਲਣਾ ਚਾਹੁੰਦੇ ਹੋ?"
161
#: komparepart/kompare_part.cpp:591 komparepart/kompare_part.cpp:628
162
#: komparepart/kompare_part.cpp:739
161
#: komparepart/kompare_part.cpp:682 komparepart/kompare_part.cpp:713
162
#: komparepart/kompare_part.cpp:828
163
163
msgid "Save Changes?"
164
164
msgstr "ਕੀ ਤਬਦੀਲੀਆਂ ਸੰਭਾਲਣੀਆਂ ਹਨ?"
166
166
#. i18n: file: komparepart/komparesaveoptionsbase.ui:238
167
167
#. i18n: ectx: property (text), widget (QRadioButton, m_UnifiedRB)
168
#: komparepart/kompare_part.cpp:662 libdialogpages/diffpage.cpp:258 rc.cpp:77
168
#: komparepart/kompare_part.cpp:751 libdialogpages/diffpage.cpp:253 rc.cpp:77
172
172
#. i18n: file: komparepart/komparesaveoptionsbase.ui:210
173
173
#. i18n: ectx: property (text), widget (QRadioButton, m_ContextRB)
174
#: komparepart/kompare_part.cpp:665 libdialogpages/diffpage.cpp:248 rc.cpp:65
174
#: komparepart/kompare_part.cpp:754 libdialogpages/diffpage.cpp:249 rc.cpp:65
178
178
#. i18n: file: komparepart/komparesaveoptionsbase.ui:231
179
179
#. i18n: ectx: property (text), widget (QRadioButton, m_RCSRB)
180
#: komparepart/kompare_part.cpp:668 libdialogpages/diffpage.cpp:255 rc.cpp:74
180
#: komparepart/kompare_part.cpp:757 rc.cpp:74
184
184
#. i18n: file: komparepart/komparesaveoptionsbase.ui:217
185
185
#. i18n: ectx: property (text), widget (QRadioButton, m_EdRB)
186
#: komparepart/kompare_part.cpp:671 libdialogpages/diffpage.cpp:250 rc.cpp:68
186
#: komparepart/kompare_part.cpp:760 rc.cpp:68
190
190
#. i18n: file: komparepart/komparesaveoptionsbase.ui:224
191
191
#. i18n: ectx: property (text), widget (QRadioButton, m_NormalRB)
192
#: komparepart/kompare_part.cpp:674 libdialogpages/diffpage.cpp:253 rc.cpp:71
192
#: komparepart/kompare_part.cpp:763 libdialogpages/diffpage.cpp:251 rc.cpp:71
196
#: komparepart/kompare_part.cpp:678
197
#: komparenavtreepart/komparenavtreepart.cpp:610
196
#: komparepart/kompare_part.cpp:767
197
#: komparenavtreepart/komparenavtreepart.cpp:624
201
#: komparepart/kompare_part.cpp:694
201
#: komparepart/kompare_part.cpp:783
203
203
"No diff file, or no 2 files have been diffed. Therefore no stats are "
207
#: komparepart/kompare_part.cpp:696 komparepart/kompare_part.cpp:710
208
#: komparepart/kompare_part.cpp:726
207
#: komparepart/kompare_part.cpp:785 komparepart/kompare_part.cpp:799
208
#: komparepart/kompare_part.cpp:815
209
209
msgid "Diff Statistics"
210
210
msgstr "ਅੰਤਰ ਅੰਕੜੇ"
212
#: komparepart/kompare_part.cpp:700
212
#: komparepart/kompare_part.cpp:789
255
255
"ਟੁਕੜਿਆਂ ਦੀ ਗਿਣਤੀ: %5\n"
256
256
"ਅੰਤਰਾਂ ਗਿਣਤੀ: %6"
258
#: libdialogpages/viewpage.cpp:59
258
#: libdialogpages/viewpage.cpp:58
262
#: libdialogpages/viewpage.cpp:65
262
#: libdialogpages/viewpage.cpp:64
263
263
msgid "Removed color:"
264
264
msgstr "ਹਟਾਉਣ ਰੰਗ:"
266
#: libdialogpages/viewpage.cpp:72
266
#: libdialogpages/viewpage.cpp:71
267
267
msgid "Changed color:"
268
268
msgstr "ਤਬਦੀਲੀ ਰੰਗ:"
270
#: libdialogpages/viewpage.cpp:79
270
#: libdialogpages/viewpage.cpp:78
271
271
msgid "Added color:"
272
272
msgstr "ਜੋੜਨ ਰੰਗ:"
274
#: libdialogpages/viewpage.cpp:86
274
#: libdialogpages/viewpage.cpp:85
275
275
msgid "Applied color:"
276
276
msgstr "ਲਾਗੂ ਰੰਗ:"
278
#: libdialogpages/viewpage.cpp:94
278
#: libdialogpages/viewpage.cpp:93
279
279
msgid "Mouse Wheel"
280
280
msgstr "ਮਾਊਸ ਪਹੀਆ"
282
#: libdialogpages/viewpage.cpp:98
282
#: libdialogpages/viewpage.cpp:97
283
283
msgid "Number of lines:"
284
284
msgstr "ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:"
286
#: libdialogpages/viewpage.cpp:105
286
#: libdialogpages/viewpage.cpp:104
287
287
msgid "Tabs to Spaces"
288
288
msgstr "ਟੈਬਾਂ ਤੋਂ ਸਪੇਸ"
290
#: libdialogpages/viewpage.cpp:109
290
#: libdialogpages/viewpage.cpp:108
291
291
msgid "Number of spaces to convert a tab character to:"
294
#: libdialogpages/viewpage.cpp:116 kompareurldialog.cpp:55
294
#: libdialogpages/viewpage.cpp:115 kompareurldialog.cpp:55
295
295
msgid "Appearance"
298
#: libdialogpages/viewpage.cpp:124
298
#: libdialogpages/viewpage.cpp:123
299
299
msgid "Text Font"
300
300
msgstr "ਟੈਕਸਟ ਫੋਂਟ"
302
#: libdialogpages/viewpage.cpp:128
302
#: libdialogpages/viewpage.cpp:127
306
#: libdialogpages/viewpage.cpp:133
306
#: libdialogpages/viewpage.cpp:132
310
#: libdialogpages/viewpage.cpp:140
310
#: libdialogpages/viewpage.cpp:139
314
#: libdialogpages/diffpage.cpp:218
314
#: libdialogpages/diffpage.cpp:219
315
315
msgid "Diff Program"
316
316
msgstr "ਅੰਤਰ ਪਰੋਗਰਾਮ"
318
#: libdialogpages/diffpage.cpp:223
318
#: libdialogpages/diffpage.cpp:224
320
320
"You can select a different diff program here. On Solaris the standard diff "
321
321
"program does not support all the options that the GNU version does. This way "
322
322
"you can select that version."
325
#: libdialogpages/diffpage.cpp:241
325
#: libdialogpages/diffpage.cpp:242
327
327
"Select the format of the output generated by diff. Unified is the one that "
328
328
"is used most frequently because it is very readable. The KDE developers like "
329
329
"this format the best so use it for sending patches."
332
#: libdialogpages/diffpage.cpp:244
332
#: libdialogpages/diffpage.cpp:245
333
333
msgid "Output Format"
334
334
msgstr "ਆਉਟਪੁੱਟ ਫਾਰਮੈਟ"
336
#: libdialogpages/diffpage.cpp:264
336
#: libdialogpages/diffpage.cpp:259
337
337
msgid "Lines of Context"
338
338
msgstr "ਪਰਸੰਗ ਦੀਆਂ ਲਾਈਨਾਂ"
340
340
#. i18n: file: komparepart/komparesaveoptionsbase.ui:266
341
341
#. i18n: ectx: property (text), widget (QLabel, m_ContextLinesLabel)
342
#: libdialogpages/diffpage.cpp:267 rc.cpp:83
342
#: libdialogpages/diffpage.cpp:262 rc.cpp:83
343
343
msgid "Number of context lines:"
344
344
msgstr "ਪਰਸੰਗ ਸਤਰਾਂ ਦੀ ਗਿਣਤੀ:"
346
#: libdialogpages/diffpage.cpp:269
346
#: libdialogpages/diffpage.cpp:264
348
348
"The number of context lines is normally 2 or 3. This makes the diff readable "
349
349
"and applicable in most cases. More than 3 lines will only bloat the diff "
353
353
#. i18n: file: komparepart/komparesaveoptionsbase.ui:198
354
354
#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_FormatBG)
355
#: libdialogpages/diffpage.cpp:275 rc.cpp:62
355
#: libdialogpages/diffpage.cpp:270 rc.cpp:62
359
#: libdialogpages/diffpage.cpp:289
359
#: libdialogpages/diffpage.cpp:284
363
#: libdialogpages/diffpage.cpp:292
363
#: libdialogpages/diffpage.cpp:287
364
364
msgid "&Look for smaller changes"
365
365
msgstr "ਛੋਟੀਆਂ ਤਬਦੀਲੀਆਂ ਲਈ ਖੋਜ(&L)"
367
#: libdialogpages/diffpage.cpp:293
367
#: libdialogpages/diffpage.cpp:288
368
368
msgid "This corresponds to the -d diff option."
371
#: libdialogpages/diffpage.cpp:295
371
#: libdialogpages/diffpage.cpp:290
372
372
msgid "O&ptimize for large files"
375
#: libdialogpages/diffpage.cpp:296
375
#: libdialogpages/diffpage.cpp:291
376
376
msgid "This corresponds to the -H diff option."
379
#: libdialogpages/diffpage.cpp:298
379
#: libdialogpages/diffpage.cpp:293
380
380
msgid "&Ignore changes in case"
383
#: libdialogpages/diffpage.cpp:299
383
#: libdialogpages/diffpage.cpp:294
384
384
msgid "This corresponds to the -i diff option."
387
#: libdialogpages/diffpage.cpp:307
387
#: libdialogpages/diffpage.cpp:302
388
388
msgid "Ignore regexp:"
391
#: libdialogpages/diffpage.cpp:308
391
#: libdialogpages/diffpage.cpp:303
392
392
msgid "This option corresponds to the -I diff option."
395
#: libdialogpages/diffpage.cpp:312
395
#: libdialogpages/diffpage.cpp:307
397
397
"Add the regular expression here that you want to use\n"
398
398
"to ignore lines that match it."
401
#: libdialogpages/diffpage.cpp:318
401
#: libdialogpages/diffpage.cpp:313
403
403
msgstr "ਸੋਧ(&E)..."
405
#: libdialogpages/diffpage.cpp:319
405
#: libdialogpages/diffpage.cpp:314
407
407
"Clicking this will open a regular expression dialog where\n"
408
408
"you can graphically create regular expressions."
411
#: libdialogpages/diffpage.cpp:327
411
#: libdialogpages/diffpage.cpp:322
412
412
msgid "Whitespace"
413
413
msgstr "ਖਾਲੀ ਥਾਂ"
415
#: libdialogpages/diffpage.cpp:330
415
#: libdialogpages/diffpage.cpp:325
416
416
msgid "E&xpand tabs to spaces in output"
419
#: libdialogpages/diffpage.cpp:331
419
#: libdialogpages/diffpage.cpp:326
420
420
msgid "This option corresponds to the -t diff option."
423
#: libdialogpages/diffpage.cpp:333
423
#: libdialogpages/diffpage.cpp:328
424
424
msgid "I&gnore added or removed empty lines"
427
#: libdialogpages/diffpage.cpp:334
427
#: libdialogpages/diffpage.cpp:329
428
428
msgid "This option corresponds to the -B diff option."
431
#: libdialogpages/diffpage.cpp:336
431
#: libdialogpages/diffpage.cpp:331
432
432
msgid "Ig&nore changes in the amount of whitespace"
435
#: libdialogpages/diffpage.cpp:337
435
#: libdialogpages/diffpage.cpp:332
436
436
msgid "This option corresponds to the -b diff option."
439
#: libdialogpages/diffpage.cpp:339
439
#: libdialogpages/diffpage.cpp:334
440
440
msgid "Ign&ore all whitespace"
443
#: libdialogpages/diffpage.cpp:340
443
#: libdialogpages/diffpage.cpp:335
444
444
msgid "This option corresponds to the -w diff option."
447
#: libdialogpages/diffpage.cpp:342
447
#: libdialogpages/diffpage.cpp:337
448
448
msgid "Igno&re changes due to tab expansion"
451
#: libdialogpages/diffpage.cpp:343
451
#: libdialogpages/diffpage.cpp:338
452
452
msgid "This option corresponds to the -E diff option."
455
455
#. i18n: file: komparepart/komparesaveoptionsbase.ui:102
456
456
#. i18n: ectx: property (title), widget (Q3ButtonGroup, m_OptionsGB)
457
#: libdialogpages/diffpage.cpp:349 rc.cpp:32
457
#: libdialogpages/diffpage.cpp:344 rc.cpp:32
461
#: libdialogpages/diffpage.cpp:360
461
#: libdialogpages/diffpage.cpp:355
462
462
msgid "File Pattern to Exclude"
463
463
msgstr "ਅੱਡ ਰੱਖਣ ਲਈ ਫਾਇਲ ਤਰਤੀਬ"
465
#: libdialogpages/diffpage.cpp:362
465
#: libdialogpages/diffpage.cpp:357
467
467
"If this is checked you can enter a shell pattern in the text box on the "
468
468
"right or select entries from the list."
471
#: libdialogpages/diffpage.cpp:367
471
#: libdialogpages/diffpage.cpp:362
473
473
"Here you can enter or remove a shell pattern or select one or more entries "
477
#: libdialogpages/diffpage.cpp:374
477
#: libdialogpages/diffpage.cpp:369
478
478
msgid "File with Filenames to Exclude"
479
479
msgstr "ਅੱਡ ਰੱਖਣ ਲਈ ਫਾਇਲ ਨਾਂ ਨਾਲ ਫਾਇਲ"
481
#: libdialogpages/diffpage.cpp:376
481
#: libdialogpages/diffpage.cpp:371
483
483
"If this is checked you can enter a filename in the combo box on the right."
486
#: libdialogpages/diffpage.cpp:379
486
#: libdialogpages/diffpage.cpp:374
488
488
"Here you can enter the URL of a file with shell patterns to ignore during "
489
489
"the comparison of the folders."
492
#: libdialogpages/diffpage.cpp:382
492
#: libdialogpages/diffpage.cpp:377
494
494
"Any file you select in the dialog that pops up when you click it will be put "
495
495
"in the dialog to the left of this button."
498
#: libdialogpages/diffpage.cpp:390
498
#: libdialogpages/diffpage.cpp:385
500
500
msgstr "ਅੱਡ ਰੱਖੋ"
502
#: libdialogpages/filespage.cpp:53
502
#: libdialogpages/filespage.cpp:60
665
665
msgid "Difference"
668
#: komparenavtreepart/komparenavtreepart.cpp:427
668
#: komparenavtreepart/komparenavtreepart.cpp:441
670
670
msgid "Applied: Changes made to %1 line undone"
671
671
msgid_plural "Applied: Changes made to %1 lines undone"
675
#: komparenavtreepart/komparenavtreepart.cpp:430
675
#: komparenavtreepart/komparenavtreepart.cpp:444
677
677
msgid "Changed %1 line"
678
678
msgid_plural "Changed %1 lines"
679
679
msgstr[0] "%1 ਲਾਇਨ ਬਦਲੀ"
680
680
msgstr[1] "%1 ਲਾਇਨਾਂ ਬਦਲੀਆਂ"
682
#: komparenavtreepart/komparenavtreepart.cpp:435
682
#: komparenavtreepart/komparenavtreepart.cpp:449
684
684
msgid "Applied: Insertion of %1 line undone"
685
685
msgid_plural "Applied: Insertion of %1 lines undone"
689
#: komparenavtreepart/komparenavtreepart.cpp:438
689
#: komparenavtreepart/komparenavtreepart.cpp:452
691
691
msgid "Inserted %1 line"
692
692
msgid_plural "Inserted %1 lines"
693
693
msgstr[0] "%1 ਲਾਇਨ ਸ਼ਾਮਿਲ ਕੀਤੀ"
694
694
msgstr[1] "%1 ਲਾਇਨਾਂ ਸ਼ਾਮਿਲ ਕੀਤੀਆਂ"
696
#: komparenavtreepart/komparenavtreepart.cpp:443
696
#: komparenavtreepart/komparenavtreepart.cpp:457
698
698
msgid "Applied: Deletion of %1 line undone"
699
699
msgid_plural "Applied: Deletion of %1 lines undone"
703
#: komparenavtreepart/komparenavtreepart.cpp:446
703
#: komparenavtreepart/komparenavtreepart.cpp:460
705
705
msgid "Deleted %1 line"
706
706
msgid_plural "Deleted %1 lines"
707
707
msgstr[0] "%1 ਸਤਰ ਹਟਾਈ"
708
708
msgstr[1] "%1 ਸਤਰਾਂ ਹਟਾਈਆਂ"
710
#: komparenavtreepart/komparenavtreepart.cpp:773
710
#: komparenavtreepart/komparenavtreepart.cpp:788
711
711
msgid "KompareNavTreePart"
712
712
msgstr "KompareNavTreePart"
847
847
msgid "Could not load our KompareNavigationPart."
848
848
msgstr "ਸਾਡਾ KompareNavigationPart ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"
850
#: kompare_shell.cpp:246
850
#: kompare_shell.cpp:249
851
851
msgid "&Open Diff..."
852
852
msgstr "ਅੰਤਰ ਖੋਲ੍ਹੋ(&O)..."
854
#: kompare_shell.cpp:249
854
#: kompare_shell.cpp:252
855
855
msgid "&Compare Files..."
856
856
msgstr "ਫਾਇਲ ਤੁਲਨਾ(&C)..."
858
#: kompare_shell.cpp:252
858
#: kompare_shell.cpp:255
859
859
msgid "&Blend URL with Diff..."
860
860
msgstr "ਅੰਤਰ ਨਾਲ URL ਰਲਾਓ(&B)..."
862
#: kompare_shell.cpp:258
862
#: kompare_shell.cpp:261
863
863
msgid "Show T&ext View"
864
864
msgstr "ਪਾਠ ਵੇਖਣ ਵੇਖਾਓ(&e)"
866
#: kompare_shell.cpp:271
866
#: kompare_shell.cpp:274
867
867
msgid " 0 of 0 differences "
868
868
msgstr " 0 ਵਿੱਚੋਂ 0 ਅੰਤਰ "
870
#: kompare_shell.cpp:272
870
#: kompare_shell.cpp:275
871
871
msgid " 0 of 0 files "
872
872
msgstr " 0 ਵਿੱਚੋਂ 0 ਫਾਇਲਾਂ "
874
#: kompare_shell.cpp:287
874
#: kompare_shell.cpp:290
876
876
msgid " %2 of %1 file "
877
877
msgid_plural " %2 of %1 files "
878
878
msgstr[0] " %1 ਵਿੱਚੋਂ %2 ਫਾਇਲ "
879
879
msgstr[1] " %1 ਫਾਇਲਾਂ ਵਿੱਚੋਂ %2 "
881
#: kompare_shell.cpp:289
881
#: kompare_shell.cpp:292
883
883
msgid " %1 file "
884
884
msgid_plural " %1 files "
885
885
msgstr[0] " %1 ਫਾਇਲ "
886
886
msgstr[1] " %1 ਫਾਇਲਾਂ "
888
#: kompare_shell.cpp:292
888
#: kompare_shell.cpp:295
890
890
msgid " %2 of %1 difference, %3 applied "
891
891
msgid_plural " %2 of %1 differences, %3 applied "
892
892
msgstr[0] "%1 ਅੰਤਰ ਵਿੱਚੋਂ %2, %3 ਲਾਗੂ "
893
893
msgstr[1] "%1 ਅੰਤਰਾਂ ਵਿੱਚੋਂ %2, %3 ਲਾਗੂ "
895
#: kompare_shell.cpp:295
895
#: kompare_shell.cpp:298
897
897
msgid " %1 difference "
898
898
msgid_plural " %1 differences "
899
899
msgstr[0] " %1 ਅੰਤਰ "
900
900
msgstr[1] " %1 ਅੰਤਰ "
902
#: kompare_shell.cpp:383
902
#: kompare_shell.cpp:386
903
903
msgid "Blend File/Folder with diff Output"
904
904
msgstr "ਫਾਇਲ/ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ"
906
#: kompare_shell.cpp:384
906
#: kompare_shell.cpp:387
907
907
msgid "File/Folder"
908
908
msgstr "ਫਾਇਲ/ਫੋਲਡਰ"
910
#: kompare_shell.cpp:385
910
#: kompare_shell.cpp:388
911
911
msgid "Diff Output"
912
912
msgstr "ਅੰਤਰ ਆਉਟਪੁੱਟ"
914
#: kompare_shell.cpp:387
914
#: kompare_shell.cpp:390
918
#: kompare_shell.cpp:387
918
#: kompare_shell.cpp:390
919
919
msgid "Blend this file or folder with the diff output"
920
920
msgstr "ਇਸ ਫਾਇਲ ਜਾਂ ਫੋਲਡਰ ਨੂੰ ਅੰਤਰ ਆਉਟਪੁੱਟ ਨਾਲ ਘੋਲੋ"
922
#: kompare_shell.cpp:387
922
#: kompare_shell.cpp:390
924
924
"If you have entered a file or folder name and a file that contains diff "
925
925
"output in the fields in this dialog then this button will be enabled and "
928
928
"apply the difference(s) to a file or to the files. "
931
#: kompare_shell.cpp:416
931
#: kompare_shell.cpp:419
932
932
msgid "Compare these files or folders"
933
933
msgstr "ਇਹ ਫਾਇਲਾਂ ਜਾਂ ਫੋਲਡਰਾਂ ਦੀ ਤੁਲਨਾ"
935
#: kompare_shell.cpp:454
935
#: kompare_shell.cpp:455
936
936
msgid "Text View"
939
#: libdiff2/komparemodellist.cpp:64
939
#: libdiff2/komparemodellist.cpp:66
940
940
msgid "&Apply Difference"
941
941
msgstr "ਅੰਤਰ ਲਾਗੂ(&A)"
943
#: libdiff2/komparemodellist.cpp:68
943
#: libdiff2/komparemodellist.cpp:70
944
944
msgid "Un&apply Difference"
945
945
msgstr "ਅੰਤਰ ਲਾਗੂ ਕਰਨਾ ਵਾਪਸ(&a)"
947
#: libdiff2/komparemodellist.cpp:72
947
#: libdiff2/komparemodellist.cpp:74
948
948
msgid "App&ly All"
949
949
msgstr "ਸਭ ਲਾਗੂ(&l)"
951
#: libdiff2/komparemodellist.cpp:76
951
#: libdiff2/komparemodellist.cpp:78
952
952
msgid "&Unapply All"
953
953
msgstr "ਸਭ ਲਾਗੂ ਵਾਪਸ(&U)"
955
#: libdiff2/komparemodellist.cpp:80
955
#: libdiff2/komparemodellist.cpp:82
956
956
msgid "P&revious File"
957
957
msgstr "ਪਿੱਛੇ ਫਾਇਲ(&r)"
959
#: libdiff2/komparemodellist.cpp:84
959
#: libdiff2/komparemodellist.cpp:86
960
960
msgid "N&ext File"
961
961
msgstr "ਅੱਗੇ ਫਾਇਲ(&e)"
963
#: libdiff2/komparemodellist.cpp:88
963
#: libdiff2/komparemodellist.cpp:90
964
964
msgid "&Previous Difference"
965
965
msgstr "ਪਿੱਛੇ ਅੰਤਰ(&P)"
967
#: libdiff2/komparemodellist.cpp:92
967
#: libdiff2/komparemodellist.cpp:94
968
968
msgid "&Next Difference"
969
969
msgstr "ਅੱਗੇ ਅੰਤਰ(&N)"
971
#: libdiff2/komparemodellist.cpp:247 libdiff2/komparemodellist.cpp:271
971
#: libdiff2/komparemodellist.cpp:255 libdiff2/komparemodellist.cpp:278
974
974
"<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff "
978
#: libdiff2/komparemodellist.cpp:255
978
#: libdiff2/komparemodellist.cpp:262
981
981
"<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</"
985
#: libdiff2/komparemodellist.cpp:280
985
#: libdiff2/komparemodellist.cpp:287
988
988
"<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>."
992
#: libdiff2/komparemodellist.cpp:309 libdiff2/komparemodellist.cpp:596
992
#: libdiff2/komparemodellist.cpp:316 libdiff2/komparemodellist.cpp:611
993
993
msgid "Could not open a temporary file."
994
994
msgstr "ਇੱਕ ਆਰਜ਼ੀ ਫਾਇਲ ਖੋਲੀ ਨਹੀਂ ਜਾ ਸਕੀ ਹੈ।"
996
#: libdiff2/komparemodellist.cpp:360
996
#: libdiff2/komparemodellist.cpp:366
998
998
msgid "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>"
1001
#: libdiff2/komparemodellist.cpp:378
1001
#: libdiff2/komparemodellist.cpp:394
1004
1004
"<qt>Could not create destination directory <b>%1</b>.\n"
1005
1005
"The file has not been saved.</qt>"
1008
#: libdiff2/komparemodellist.cpp:393
1008
#: libdiff2/komparemodellist.cpp:410
1011
1011
"<qt>Could not upload the temporary file to the destination location <b>%1</"