~ubuntu-branches/ubuntu/karmic/quilt/karmic

« back to all changes in this revision

Viewing changes to po/quilt.pot

  • Committer: Bazaar Package Importer
  • Author(s): Raphael Hertzog
  • Date: 2008-06-19 21:40:27 UTC
  • mfrom: (4.1.4 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080619214027-so7yis356zayzu1c
Tags: 0.46-6
Change back patchsys-quilt.mk to enter DEB_SRCDIR by default before
applying patches (8 packages FTBFS due to this change). But we can now
use DEB_QUILT_TOPDIR to override the default choice of DEB_SRCDIR.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
"--quiltrc file\n"
22
22
"\tUse the specified configuration file instead of ~/.quiltrc (or\n"
23
23
"\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
24
 
"\tdocumentation for details about its possible contents.\n"
 
24
"\tdocumentation for details about its possible contents.  The\n"
 
25
"\tspecial value \\\"-\\\" causes quilt not to read any configuration\n"
 
26
"\tfile.\n"
25
27
"\n"
26
28
"--version\n"
27
29
"\tPrint the version number and exit immediately."
117
119
msgid "No next patch\\n"
118
120
msgstr ""
119
121
 
120
 
#: quilt/delete.in:95 quilt/scripts/patchfns.in:445
121
 
msgid "No patches in series\\n"
122
 
msgstr ""
123
 
 
124
 
#: quilt/delete.in:101 quilt/scripts/patchfns.in:543
 
122
#: quilt/delete.in:102 quilt/scripts/patchfns.in:562
125
123
msgid "Patch %s is currently applied\\n"
126
124
msgstr ""
127
125
 
128
 
#: quilt/delete.in:113
 
126
#: quilt/delete.in:114
129
127
msgid "Removed patch %s\\n"
130
128
msgstr ""
131
129
 
132
 
#: quilt/delete.in:115
 
130
#: quilt/delete.in:116
133
131
msgid "Failed to remove patch %s\\n"
134
132
msgstr ""
135
133
 
136
 
#: quilt/delete.in:126
 
134
#: quilt/delete.in:127
137
135
msgid "Failed to backup patch file %s\\n"
138
136
msgstr ""
139
137
 
140
 
#: quilt/delete.in:133
 
138
#: quilt/delete.in:134
141
139
msgid "Failed to remove patch file %s\\n"
142
140
msgstr ""
143
141
 
144
142
#: quilt/diff.in:24
145
143
msgid ""
146
 
"Usage: quilt diff [-p n] [-u|-U num|-c|-C num] [--combine patch|-z] [-R] [-P "
147
 
"patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] [--sort] "
148
 
"[--color] [file ...]\\n"
 
144
"Usage: quilt diff [-p n|-p ab] [-u|-U num|-c|-C num] [--combine patch|-z] [-"
 
145
"R] [-P patch] [--snapshot] [--diff=utility] [--no-timestamps] [--no-index] "
 
146
"[--sort] [--color] [file ...]\\n"
149
147
msgstr ""
150
148
 
151
149
#: quilt/diff.in:28
157
155
"\n"
158
156
"-p n\tCreate a -p n style patch (-p0 or -p1 are supported).\n"
159
157
"\n"
 
158
"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
 
159
"\toriginal and new filenames instead of the default\n"
 
160
"\tdir.orig/file and dir/file names.\n"
 
161
"\n"
160
162
"-u, -U num, -c, -C num\n"
161
163
"\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
162
164
"\ta context diff (-c, -C) with num lines of context. The number of\n"
195
197
"--sort\tSort files by their name instead of preserving the original order.\n"
196
198
msgstr ""
197
199
 
198
 
#: quilt/diff.in:213
 
200
#: quilt/diff.in:217
199
201
msgid ""
200
202
"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n"
201
203
msgstr ""
202
204
 
203
 
#: quilt/diff.in:225
 
205
#: quilt/diff.in:231
204
206
msgid "Cannot diff patches with -p%s, please specify -p0 or -p1 instead\\n"
205
207
msgstr ""
206
208
 
207
 
#: quilt/diff.in:258 quilt/files.in:105
 
209
#: quilt/diff.in:265 quilt/files.in:105
208
210
msgid "Patch %s not applied before patch %s\\n"
209
211
msgstr ""
210
212
 
211
 
#: quilt/diff.in:308 quilt/pop.in:98
 
213
#: quilt/diff.in:315 quilt/pop.in:98
212
214
msgid "Failed to copy files to temporary directory\\n"
213
215
msgstr ""
214
216
 
215
 
#: quilt/diff.in:332 quilt/pop.in:122
 
217
#: quilt/diff.in:339 quilt/pop.in:122
216
218
msgid "Failed to patch temporary files\\n"
217
219
msgstr ""
218
220
 
219
 
#: quilt/diff.in:351
 
221
#: quilt/diff.in:358
220
222
msgid "File %s is not being modified\\n"
221
223
msgstr ""
222
224
 
223
 
#: quilt/diff.in:371 quilt/refresh.in:177
 
225
#: quilt/diff.in:378 quilt/refresh.in:188
224
226
msgid "Diff failed, aborting\\n"
225
227
msgstr ""
226
228
 
227
 
#: quilt/diff.in:378
 
229
#: quilt/diff.in:385
228
230
msgid "Warning: more recent patches modify files in patch %s\\n"
229
231
msgstr ""
230
232
 
419
421
"\tPatch filename to use inside quilt. This option can only be\n"
420
422
"\tused when importing a single patch.\n"
421
423
"\n"
422
 
"-f\tOverwite/update existing patches.\n"
 
424
"-f\tOverwrite/update existing patches.\n"
423
425
"\n"
424
426
"-d {o|a|n}\n"
425
427
"\tWhen overwriting in existing patch, keep the old (o), all (a), or\n"
474
476
#: quilt/mail.in:24
475
477
msgid ""
476
478
"Usage: quilt mail {--mbox file|--send} [-m text] [--prefix prefix] [--"
477
 
"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...]\\n"
 
479
"sender ...] [--from ...] [--to ...] [--cc ...] [--bcc ...] [--subject ...] "
 
480
"[--signature file]\\n"
478
481
msgstr ""
479
482
 
480
483
#: quilt/mail.in:27
510
513
"\n"
511
514
"--to, --cc, --bcc\n"
512
515
"\tAppend a recipient to the To, Cc, or Bcc header.\n"
 
516
"\n"
 
517
"--signature file\n"
 
518
"\n"
 
519
"\tAppend  the specified signature file if it exists.\n"
 
520
"\tDefault is ~/.signature\n"
513
521
msgstr ""
514
522
 
515
 
#: quilt/mail.in:176
 
523
#: quilt/mail.in:185
516
524
msgid "Could not determine the envelope sender address. Please use --sender."
517
525
msgstr ""
518
526
 
519
 
#: quilt/mail.in:314
 
527
#: quilt/mail.in:323
520
528
msgid "Unable to extract a subject header from %s\\n"
521
529
msgstr ""
522
530
 
523
 
#: quilt/mail.in:337
 
531
#: quilt/mail.in:346
524
532
msgid "Patches %s have duplicate subject headers.\\n"
525
533
msgstr ""
526
534
 
527
 
#: quilt/mail.in:379
 
535
#: quilt/mail.in:388
528
536
msgid "Introduction has no subject header (saved as %s)\\n"
529
537
msgstr ""
530
538
 
531
 
#: quilt/mail.in:382
 
539
#: quilt/mail.in:391
532
540
msgid "Introduction has no subject header\\n"
533
541
msgstr ""
534
542
 
535
 
#: quilt/mail.in:472
 
543
#: quilt/mail.in:481
536
544
msgid "Introduction saved as %s\\n"
537
545
msgstr ""
538
546
 
625
633
msgid "Patch %s appears to be empty, removing\\n"
626
634
msgstr ""
627
635
 
628
 
#: quilt/pop.in:169
 
636
#: quilt/pop.in:170
629
637
msgid "Removing patch %s\\n"
630
638
msgstr ""
631
639
 
632
 
#: quilt/pop.in:240
 
640
#: quilt/pop.in:241
633
641
msgid "Patch %s needs to be refreshed first.\\n"
634
642
msgstr ""
635
643
 
636
 
#: quilt/pop.in:250
 
644
#: quilt/pop.in:251
637
645
msgid "No patch removed\\n"
638
646
msgstr ""
639
647
 
640
 
#: quilt/pop.in:266 quilt/scripts/patchfns.in:458
 
648
#: quilt/pop.in:267 quilt/scripts/patchfns.in:477
641
649
msgid "No patches applied\\n"
642
650
msgstr ""
643
651
 
644
 
#: quilt/pop.in:273 quilt/push.in:378
 
652
#: quilt/pop.in:274 quilt/push.in:380
645
653
msgid "Now at patch %s\\n"
646
654
msgstr ""
647
655
 
701
709
msgid "Applying patch %s\\n"
702
710
msgstr ""
703
711
 
704
 
#: quilt/push.in:188 quilt/scripts/patchfns.in:581
 
712
#: quilt/push.in:188 quilt/scripts/patchfns.in:600
705
713
msgid "Patch %s does not exist\\n"
706
714
msgstr ""
707
715
 
708
 
#: quilt/push.in:216
 
716
#: quilt/push.in:218
709
717
msgid "Patch %s does not exist; applied empty patch\\n"
710
718
msgstr ""
711
719
 
712
 
#: quilt/push.in:220
 
720
#: quilt/push.in:222
713
721
msgid "Patch %s appears to be empty; applied\\n"
714
722
msgstr ""
715
723
 
716
 
#: quilt/push.in:224
 
724
#: quilt/push.in:226
717
725
msgid "Applied patch %s (forced; needs refresh)\\n"
718
726
msgstr ""
719
727
 
720
 
#: quilt/push.in:234
 
728
#: quilt/push.in:236
721
729
msgid "Patch %s can be reverse-applied\\n"
722
730
msgstr ""
723
731
 
724
 
#: quilt/push.in:237
 
732
#: quilt/push.in:239
725
733
msgid "Patch %s does not apply (enforce with -f)\\n"
726
734
msgstr ""
727
735
 
728
 
#: quilt/push.in:358
 
736
#: quilt/push.in:360
729
737
msgid "The topmost patch %s needs to be refreshed first.\\n"
730
738
msgstr ""
731
739
 
732
740
#: quilt/refresh.in:22
733
741
msgid ""
734
 
"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
735
 
"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
736
 
"[patch]\\n"
 
742
"Usage: quilt refresh [-p n|-p ab] [-u|-U num|-c|-C num] [-f] [--no-"
 
743
"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
 
744
"whitespace] [patch]\\n"
737
745
msgstr ""
738
746
 
739
747
#: quilt/refresh.in:26
753
761
"\n"
754
762
"-p n\tCreate a -p n style patch (-p0 or -p1 supported).\n"
755
763
"\n"
 
764
"-p ab\tCreate a -p1 style patch, but use a/file and b/file as the\n"
 
765
"\toriginal and new filenames instead of the default\n"
 
766
"\tdir.orig/file and dir/file names.\n"
 
767
"\n"
756
768
"-u, -U num, -c, -C num\n"
757
769
"\tCreate a unified diff (-u, -U) with num lines of context. Create\n"
758
770
"\ta context diff (-c, -C) with num lines of context. The number of\n"
779
791
"\tStrip trailing whitespace at the end of lines.\n"
780
792
msgstr ""
781
793
 
782
 
#: quilt/refresh.in:149
 
794
#: quilt/refresh.in:159
783
795
msgid "Cannot refresh patches with -p%s, please specify -p0 or -p1 instead\\n"
784
796
msgstr ""
785
797
 
786
 
#: quilt/refresh.in:183
 
798
#: quilt/refresh.in:194
787
799
msgid ""
788
800
"More recent patches modify files in patch %s. Enforce refresh with -f.\\n"
789
801
msgstr ""
790
802
 
791
 
#: quilt/refresh.in:189
 
803
#: quilt/refresh.in:200
792
804
msgid ""
793
805
"Cannot use --strip-trailing-whitespace on a patch that has shadowed files.\\n"
794
806
msgstr ""
795
807
 
796
 
#: quilt/refresh.in:195
 
808
#: quilt/refresh.in:206
797
809
msgid "Nothing in patch %s\\n"
798
810
msgstr ""
799
811
 
800
 
#: quilt/refresh.in:272
 
812
#: quilt/refresh.in:284
801
813
msgid "Patch %s is unchanged\\n"
802
814
msgstr ""
803
815
 
804
 
#: quilt/refresh.in:277
 
816
#: quilt/refresh.in:290
805
817
msgid "Refreshed patch %s\\n"
806
818
msgstr ""
807
819
 
881
893
msgid "Failed to rename %s to %s: %s\n"
882
894
msgstr ""
883
895
 
884
 
#: quilt/scripts/patchfns.in:494
 
896
#: quilt/scripts/patchfns.in:464
 
897
msgid "No patches in series\\n"
 
898
msgstr ""
 
899
 
 
900
#: quilt/scripts/patchfns.in:513
885
901
msgid "Patch %s is not in series\\n"
886
902
msgstr ""
887
903
 
888
 
#: quilt/scripts/patchfns.in:522
 
904
#: quilt/scripts/patchfns.in:541
889
905
msgid "Patch %s is not applied\\n"
890
906
msgstr ""
891
907
 
892
 
#: quilt/scripts/patchfns.in:559
 
908
#: quilt/scripts/patchfns.in:578
893
909
msgid "File series fully applied, ends at patch %s\\n"
894
910
msgstr ""
895
911
 
896
 
#: quilt/scripts/patchfns.in:836
 
912
#: quilt/scripts/patchfns.in:860
897
913
msgid ""
898
914
"The quilt meta-data in this tree has version %s, but this version of quilt "
899
915
"can only handle meta-data formats up to and including version %s. Please pop "
901
917
"downgrading.\\n"
902
918
msgstr ""
903
919
 
904
 
#: quilt/scripts/patchfns.in:921
 
920
#: quilt/scripts/patchfns.in:945
905
921
msgid ""
906
922
"The working tree was created by an older version of quilt. Please run 'quilt "
907
923
"upgrade'.\\n"