← Back to branch summary

~ubuntu-dev/ubuntu/lucid/quilt/lucid-201002110858

« back to all changes in this revision

Viewing changes to po/quilt.pot

  • Committer: Bazaar Package Importer
  • Author(s): Martin Quinson
  • Date: 2005-03-23 11:10:07 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20050323111007-p47150ucnnuyc07p
Tags: 0.39-2
http://bugs.debian.org/298785
* Pass -p $opt_strip_level option to diffstat in refresh command.
  (Closes: #298785)
* fixes from upstream cvs:
  - Add a missing "exit 1" to quilt/fold.in when no patches are applied.
  - typo in graph help message
  

Show diffs side-by-side

added added

removed removed

Lines of Context:
po/quilt.pot
1
 
#: ../bin/quilt.in:20
 
1
#: ../bin/quilt.in:23
2
2
msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
3
3
msgstr ""
4
4
 
5
 
#: ../bin/quilt.in:22
 
5
#: ../bin/quilt.in:25
6
6
msgid "Commands are:"
7
7
msgstr ""
8
8
 
9
 
#: ../bin/quilt.in:27
 
9
#: ../bin/quilt.in:30
10
10
msgid ""
11
11
"\n"
12
12
"Common options to all commands:\n"
15
15
"\tRuns the command in bash trace mode (-x). For internal debugging.\n"
16
16
"\n"
17
17
"--quiltrc file\n"
18
 
"\tUse the specified configuration file instead of ~/.quiltrc. \n"
19
 
"\tSee pdf documentation for details about its possible content."
 
18
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
 
19
"\t/etc/quilt.quiltrc if ~/.quiltrc is missing).  See the pdf\n"
 
20
"\tdocumentation for details about its possible content."
20
21
msgstr ""
21
22
 
22
23
#: ../quilt/add.in:22
35
36
msgstr ""
36
37
 
37
38
#: ../quilt/add.in:54 ../quilt/applied.in:62 ../quilt/delete.in:76
38
 
#: ../quilt/diff.in:148 ../quilt/diff.in:159 ../quilt/next.in:62
39
 
#: ../quilt/pop.in:129 ../quilt/previous.in:62 ../quilt/push.in:145
 
39
#: ../quilt/diff.in:153 ../quilt/diff.in:164 ../quilt/next.in:62
 
40
#: ../quilt/pop.in:239 ../quilt/previous.in:62 ../quilt/push.in:311
40
41
#: ../quilt/refresh.in:129 ../quilt/remove.in:53 ../quilt/unapplied.in:62
41
42
msgid "Patch %s is not in series\\n"
42
43
msgstr ""
43
44
 
44
 
#: ../quilt/add.in:75 ../quilt/diff.in:221 ../quilt/pop.in:150
 
45
#: ../quilt/add.in:75 ../quilt/diff.in:226 ../quilt/pop.in:254
45
46
#: ../quilt/refresh.in:135 ../quilt/remove.in:74
46
47
msgid "Patch %s is not applied\\n"
47
48
msgstr ""
48
49
 
49
 
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:229
 
50
#: ../quilt/add.in:82 ../quilt/delete.in:68 ../quilt/diff.in:234
50
51
#: ../quilt/files.in:103 ../quilt/fold.in:79 ../quilt/fork.in:65
51
 
#: ../quilt/pop.in:185 ../quilt/push.in:182 ../quilt/push.in:221
52
 
#: ../quilt/refresh.in:143 ../quilt/remove.in:81
 
52
#: ../quilt/pop.in:288 ../quilt/push.in:349 ../quilt/refresh.in:143
 
53
#: ../quilt/remove.in:81
53
54
msgid "No patches applied\\n"
54
55
msgstr ""
55
56
 
104
105
msgid "Failed to remove patch %s\\n"
105
106
msgstr ""
106
107
 
107
 
#: ../quilt/diff.in:22
 
108
#: ../quilt/diff.in:24
108
109
msgid ""
109
110
"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
110
111
"patch] [--snapshot] [--diff=utility] [--color] [file ...]\\n"
111
112
msgstr ""
112
113
 
113
 
#: ../quilt/diff.in:26
 
114
#: ../quilt/diff.in:28
114
115
msgid ""
115
116
"\n"
116
117
"Produces a diff of the specified file(s) in the topmost or specified\n"
152
153
"\tUse syntax coloring.\n"
153
154
msgstr ""
154
155
 
155
 
#: ../quilt/diff.in:213
 
156
#: ../quilt/diff.in:218
156
157
msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n"
157
158
msgstr ""
158
159
 
159
 
#: ../quilt/diff.in:240
 
160
#: ../quilt/diff.in:245
160
161
msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
161
162
msgstr ""
162
163
 
163
 
#: ../quilt/diff.in:275 ../quilt/files.in:122
 
164
#: ../quilt/diff.in:280 ../quilt/files.in:122
164
165
msgid "Patch %s not applied before patch %s\\n"
165
166
msgstr ""
166
167
 
167
 
#: ../quilt/diff.in:311
 
168
#: ../quilt/diff.in:316
168
169
msgid "Cannot change into directory %s\\n"
169
170
msgstr ""
170
171
 
171
 
#: ../quilt/diff.in:318 ../scripts/rpatch.in:62
 
172
#: ../quilt/diff.in:323 ../quilt/pop.in:114
172
173
msgid "Failed to copy files to temporary directory\\n"
173
174
msgstr ""
174
175
 
175
 
#: ../quilt/diff.in:329
 
176
#: ../quilt/diff.in:334
176
177
msgid "Cannot change to temporary directory\\n"
177
178
msgstr ""
178
179
 
179
 
#: ../quilt/diff.in:348 ../scripts/rpatch.in:85
 
180
#: ../quilt/diff.in:353 ../quilt/pop.in:138
180
181
msgid "Failed to patch temporary files\\n"
181
182
msgstr ""
182
183
 
183
 
#: ../quilt/diff.in:354
 
184
#: ../quilt/diff.in:359
184
185
msgid "Cannot change to source directory\\n"
185
186
msgstr ""
186
187
 
187
 
#: ../quilt/diff.in:372
 
188
#: ../quilt/diff.in:377
188
189
msgid "File %s is not being modified\\n"
189
190
msgstr ""
190
191
 
191
 
#: ../quilt/diff.in:392 ../quilt/refresh.in:175
 
192
#: ../quilt/diff.in:397 ../quilt/refresh.in:175
192
193
msgid "Diff failed, aborting\\n"
193
194
msgstr ""
194
195
 
195
 
#: ../quilt/diff.in:399
 
196
#: ../quilt/diff.in:404
196
197
msgid "More recent patches modify files in patch %s\\n"
197
198
msgstr ""
198
199
 
401
402
"-v\tVerbose operation.\n"
402
403
msgstr ""
403
404
 
404
 
#: ../quilt/pop.in:160
 
405
#: ../quilt/pop.in:156
 
406
msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
 
407
msgstr ""
 
408
 
 
409
#: ../quilt/pop.in:178
 
410
msgid "Removing patch %s\\n"
 
411
msgstr ""
 
412
 
 
413
#: ../quilt/pop.in:262
 
414
msgid "Patch %s needs to be refreshed first.\\n"
 
415
msgstr ""
 
416
 
 
417
#: ../quilt/pop.in:272
405
418
msgid "No patch removed\\n"
406
419
msgstr ""
407
420
 
408
 
#: ../quilt/pop.in:176 ../quilt/push.in:212
409
 
msgid "Interrupted by user\\n"
410
 
msgstr ""
411
 
 
412
 
#: ../quilt/pop.in:192 ../quilt/push.in:223
 
421
#: ../quilt/pop.in:295 ../quilt/push.in:371
413
422
msgid "Now at patch %s\\n"
414
423
msgstr ""
415
424
 
424
433
"patch in the series file.\n"
425
434
msgstr ""
426
435
 
427
 
#: ../quilt/push.in:22
 
436
#: ../quilt/push.in:24
428
437
msgid "Usage: quilt push [-afqv] [--leave-rejects] [num|patch]\\n"
429
438
msgstr ""
430
439
 
431
 
#: ../quilt/push.in:25
 
440
#: ../quilt/push.in:27
432
441
msgid ""
433
442
"\n"
434
443
"Apply patch(es) from the series file.  Without options, the next patch\n"
454
463
"\tAllow the patch utility to ask how to deal with conflicts. If\n"
455
464
"\tthis option is not given, the option -f will be passed to the \n"
456
465
"\tpatch program.\n"
457
 
msgstr ""
458
 
 
459
 
#: ../quilt/push.in:87
 
466
"\n"
 
467
"--color[=always|auto|never]\n"
 
468
"        Use syntax coloring.\n"
 
469
msgstr ""
 
470
 
 
471
#: ../quilt/push.in:64
 
472
msgid "Interrupted by user; patch %s was not applied.\\n"
 
473
msgstr ""
 
474
 
 
475
#: ../quilt/push.in:96
 
476
msgid "Patch %s appears to be empty\\n"
 
477
msgstr ""
 
478
 
 
479
#: ../quilt/push.in:160
 
480
msgid "Applying patch %s\\n"
 
481
msgstr ""
 
482
 
 
483
#: ../quilt/push.in:192
 
484
msgid "Patch %s appears to be empty, applied\\n"
 
485
msgstr ""
 
486
 
 
487
#: ../quilt/push.in:196
 
488
msgid "Applied patch %s (forced; needs refresh)\\n"
 
489
msgstr ""
 
490
 
 
491
#: ../quilt/push.in:201
 
492
msgid "Patch %s does not apply (enforce with -f)\\n"
 
493
msgstr ""
 
494
 
 
495
#: ../quilt/push.in:240
460
496
msgid "Patch %s not found in file series\\n"
461
497
msgstr ""
462
498
 
463
 
#: ../quilt/push.in:168
 
499
#: ../quilt/push.in:328
464
500
msgid "Patch %s is already applied\\n"
465
501
msgstr ""
466
502
 
467
 
#: ../quilt/push.in:187
468
 
msgid ""
469
 
"The topmost patch %s is not in the series file anymore;\n"
470
 
"cannot determine the next patch from the series file.\n"
471
 
"Please pop -f the top patch and check your series file.\\n"
 
503
#: ../quilt/push.in:337
 
504
msgid "The topmost patch %s needs to be refreshed first.\\n"
472
505
msgstr ""
473
506
 
474
 
#: ../quilt/push.in:193
 
507
#: ../quilt/push.in:351
475
508
msgid "File series fully applied, ends at patch %s\\n"
476
509
msgstr ""
477
510
 
559
592
msgid "Failed to remove file %s from patch %s\\n"
560
593
msgstr ""
561
594
 
562
 
#: ../quilt/remove.in:115
 
595
#: ../quilt/remove.in:123
563
596
msgid "File %s removed from patch %s\\n"
564
597
msgstr ""
565
598
 
683
716
"patches from scratch.\\n"
684
717
msgstr ""
685
718
 
686
 
#: ../scripts/apatch.in:22
687
 
msgid "Usage: $0 [-fqv] patchname\\n"
688
 
msgstr ""
689
 
 
690
 
#: ../scripts/apatch.in:29
691
 
msgid "Interrupted by user; patch %s was not applied.\\n"
692
 
msgstr ""
693
 
 
694
 
#: ../scripts/apatch.in:41
695
 
msgid "Patch %s appears to be empty\\n"
696
 
msgstr ""
697
 
 
698
 
#: ../scripts/apatch.in:79
699
 
msgid "Applying patch %s\\n"
700
 
msgstr ""
701
 
 
702
 
#: ../scripts/apatch.in:129
703
 
msgid "Patch %s appears to be empty, applied\\n"
704
 
msgstr ""
705
 
 
706
 
#: ../scripts/apatch.in:133
707
 
msgid "Applied patch %s (forced; needs refresh)\\n"
708
 
msgstr ""
709
 
 
710
 
#: ../scripts/apatch.in:138
711
 
msgid "Patch %s does not apply (enforce with -f)\\n"
712
 
msgstr ""
713
 
 
714
 
#: ../scripts/apatch.in:196
715
 
msgid "The topmost patch %s needs to be refreshed first.\\n"
716
 
msgstr ""
717
 
 
718
 
#: ../scripts/patchfns.in:703
 
719
#: ../scripts/patchfns.in:732
719
720
msgid ""
720
721
"The quilt meta-data in this tree has version %s, but this version of quilt "
721
722
"can only handle meta-data formats up to and including version %s. Please pop "
723
724
"downgrading.\\n"
724
725
msgstr ""
725
726
 
726
 
#: ../scripts/patchfns.in:770
 
727
#: ../scripts/patchfns.in:809
727
728
msgid ""
728
729
"The working tree was created by an older version of quilt. Please run 'quilt "
729
730
"upgrade'.\\n"
730
731
msgstr ""
731
 
 
732
 
#: ../scripts/rpatch.in:22
733
 
msgid "Usage: %s [-fRq] patchname\\n"
734
 
msgstr ""
735
 
 
736
 
#: ../scripts/rpatch.in:100
737
 
msgid "Patch %s does not remove cleanly (refresh it or enforce with -f)\\n"
738
 
msgstr ""
739
 
 
740
 
#: ../scripts/rpatch.in:123
741
 
msgid "Removing patch %s\\n"
742
 
msgstr ""
743
 
 
744
 
#: ../scripts/rpatch.in:179
745
 
msgid "Patch %s needs to be refreshed first.\\n"
746
 
msgstr ""