31
31
msgid "Show ignored files"
34
#: lib\annotate.py:271 lib\annotate.py:389 lib\annotate.py:461
35
#: lib\annotate.py:465 lib\log.py:570
35
msgid "Nothing selected to add"
38
#: lib\annotate.py:272 lib\annotate.py:390 lib\annotate.py:464
39
#: lib\annotate.py:468 lib\log.py:572
39
#: lib\annotate.py:271 lib\diffwindow.py:122 lib\util.py:476
43
#: lib\annotate.py:272 lib\diffwindow.py:124 lib\util.py:512
41
45
msgstr "กำลังโหลด..."
43
#: lib\annotate.py:338 lib/widgets\shelve.py:316 lib/widgets\shelvelist.py:126
47
#: lib\annotate.py:339 lib/widgets\shelve.py:317 lib/widgets\shelvelist.py:127
47
#: lib\annotate.py:360 lib/widgets\shelve.py:300 lib/widgets\shelvelist.py:107
51
#: lib\annotate.py:361 lib/widgets\shelve.py:301 lib/widgets\shelvelist.py:108
48
52
#: lib/widgets\toolbars.py:64
52
#: lib\annotate.py:364 lib\annotate.py:716
56
#: lib\annotate.py:365 lib\annotate.py:746
56
#: lib\annotate.py:368 lib\diffwindow.py:261 lib/widgets\shelve.py:320
57
#: lib/widgets\shelvelist.py:130
60
#: lib\annotate.py:369 lib\diffwindow.py:264 lib/widgets\shelve.py:321
61
#: lib/widgets\shelvelist.py:131
58
62
msgid "&View Options"
61
#: lib\annotate.py:369 lib\diffwindow.py:262 lib/widgets\shelve.py:304
62
#: lib/widgets\shelvelist.py:113
65
#: lib\annotate.py:370 lib\diffwindow.py:265 lib/widgets\shelve.py:305
66
#: lib/widgets\shelvelist.py:114
63
67
msgid "View Options"
66
#: lib\annotate.py:372
70
#: lib\annotate.py:373
70
#: lib\annotate.py:382
74
#: lib\annotate.py:383
74
#: lib\annotate.py:462
78
#: lib\annotate.py:465
76
80
msgid "Revision %s"
79
#: lib\annotate.py:724
83
#: lib\annotate.py:754
80
84
msgid "Goto Line: "
83
#: lib\annotate.py:732
87
#: lib\annotate.py:762
87
#: lib\annotate.py:744
91
#: lib\annotate.py:774
88
92
msgid "Close Goto Line"
91
#: lib\annotate.py:774
95
#: lib\annotate.py:804
92
96
msgid "&Annotate this revision"
193
196
#: lib\commit.py:309 lib\logmodel.py:44 lib\treewidget.py:355
194
#: lib/widgets\shelve.py:262 lib/widgets\shelvelist.py:85
197
#: lib/widgets\shelve.py:263 lib/widgets\shelvelist.py:86
199
202
msgid "Show non-versioned files"
203
206
msgid "Enter the commit message"
207
210
msgid "&Fixed bugs:"
211
214
msgid "Set the IDs of bugs fixed by this commit"
216
219
"Enter the list of bug IDs in format <i>tag:id</i> separated by a space, e.g. "
217
220
"<i>project:123 project:765</i>"
225
228
msgid "Set the author of this change, if it's different from the committer"
230
233
"Enter the author's name, e.g. <i>John Doe <jdoe@example.com></i>"
238
241
msgid "Pending Merges"
241
#: lib\commit.py:419 lib\main.py:355 lib\subprocess.py:195
242
#: lib\treewidget.py:357 lib/widgets\shelve.py:284
243
#: lib/widgets\shelvelist.py:90
244
#: lib\commit.py:422 lib\main.py:355 lib\subprocess.py:245
245
#: lib\treewidget.py:357 lib/widgets\shelve.py:285
246
#: lib/widgets\shelvelist.py:91
248
251
msgid "View changes in files selected to commit"
252
255
msgid "You should provide a commit message."
255
#: lib\commit.py:639 lib\conflicts.py:193 lib\conflicts.py:198
256
#: lib\diffwindow.py:486 lib\util.py:69 lib/widgets\shelve.py:624
257
#: lib/widgets\shelve.py:668 lib/widgets\shelve.py:715
258
#: lib/widgets\shelve.py:719
263
msgid "No changes to commit."
268
260
"No changes selected to commit.\n"
269
261
"Do you want to commit anyway?"
274
266
"A commit will be made directly to the master branch, keeping the local and "
275
267
"master branches in sync."
280
272
"A local commit to the branch will be performed. The master branch will not "
281
273
"be updated until a non-local commit is made."
284
#: lib\commit.py:786 lib\diff.py:114 lib\diffwindow.py:122
285
#: lib\diffwindow.py:178 lib\diffwindow.py:392 lib\diffwindow.py:476
286
#: lib\diffwindow.py:484 lib\revert.py:291
276
#: lib\commit.py:779 lib\diff.py:140 lib\diffwindow.py:124
277
#: lib\diffwindow.py:181 lib\diffwindow.py:395 lib\diffwindow.py:452
278
#: lib\diffwindow.py:459 lib\revert.py:301
538
530
msgid "Mark as &resolved"
541
#: lib\conflicts.py:190
533
#: lib\conflicts.py:193
543
535
msgid "%d conflict auto-resolved."
544
536
msgid_plural "%d conflicts auto-resolved."
548
#: lib\conflicts.py:197
540
#: lib\conflicts.py:196 lib\conflicts.py:201 lib\diffwindow.py:461
541
#: lib\util.py:69 lib/widgets\shelve.py:630 lib/widgets\shelve.py:674
542
#: lib/widgets\shelve.py:721 lib/widgets\shelve.py:725
546
#: lib\conflicts.py:200
549
547
msgid "All conflicts resolved."
552
#: lib\conflicts.py:232
550
#: lib\conflicts.py:235
554
552
msgid "Error while running merge tool (code %d)"
557
#: lib\conflicts.py:233 lib\conflicts.py:295 lib\tag.py:204 lib\trace.py:177
558
#: lib\trace.py:184 lib\tree_branch.py:95 lib\util.py:975 lib\util.py:985
555
#: lib\conflicts.py:236 lib\conflicts.py:298 lib\tag.py:194 lib\trace.py:190
556
#: lib\trace.py:197 lib\tree_branch.py:95 lib\util.py:420 lib\util.py:1011
562
#: lib\conflicts.py:262
561
#: lib\conflicts.py:265
563
562
msgid "Bazaar 2.4 or later is required for external mergetools support"
566
#: lib\conflicts.py:272
565
#: lib\conflicts.py:275
567
566
msgid "Set up external_merge app in qconfig under the Merge tab"
570
#: lib\conflicts.py:276
569
#: lib\conflicts.py:279
572
571
msgid "External merge tool %(tool)s is not available"
575
#: lib\conflicts.py:296
574
#: lib\conflicts.py:299
578
577
"The extmerge definition: '%(tool)s' is invalid.\n"
583
#: lib\conflicts.py:302
582
#: lib\conflicts.py:305
585
584
msgid "Missing the flag: %s. Configure in qconfig under the merge tab."
588
#: lib\conflicts.py:307
587
#: lib\conflicts.py:310
589
588
msgid "path conflict"
592
#: lib\conflicts.py:308
591
#: lib\conflicts.py:311
593
592
msgid "contents conflict"
596
#: lib\conflicts.py:309
595
#: lib\conflicts.py:312
597
596
msgid "text conflict"
600
#: lib\conflicts.py:310
599
#: lib\conflicts.py:313
601
600
msgid "duplicate id"
604
#: lib\conflicts.py:311
603
#: lib\conflicts.py:314
605
604
msgid "duplicate"
608
#: lib\conflicts.py:312
607
#: lib\conflicts.py:315
609
608
msgid "parent loop"
612
#: lib\conflicts.py:313
611
#: lib\conflicts.py:316
613
612
msgid "unversioned parent"
616
#: lib\conflicts.py:314
615
#: lib\conflicts.py:317
617
616
msgid "missing parent"
620
#: lib\conflicts.py:315
619
#: lib\conflicts.py:318
621
620
msgid "deleting parent"
624
#: lib\conflicts.py:316
623
#: lib\conflicts.py:319
625
624
msgid "non-directory parent"
628
#: lib\diff.py:90 lib\treewidget.py:1701
627
#: lib\diff.py:116 lib\treewidget.py:1701
629
628
msgid "Show &differences"
632
#: lib\diff.py:199 lib\treewidget.py:331
631
#: lib\diff.py:262 lib\treewidget.py:331
636
#: lib\diff.py:201 lib\treewidget.py:329
635
#: lib\diff.py:264 lib\treewidget.py:329
641
640
msgid "renamed and modified"
644
#: lib\diff.py:205 lib\treewidget.py:342
643
#: lib\diff.py:268 lib\treewidget.py:342
648
#: lib\diff.py:207 lib\treewidget.py:344
647
#: lib\diff.py:270 lib\treewidget.py:344
674
673
msgid "\\ No newline at end of file"
677
#: lib\diffwindow.py:80
676
#: lib\diffwindow.py:81
679
678
msgid "Working Tree for %s"
682
#: lib\diffwindow.py:82
681
#: lib\diffwindow.py:83
683
682
msgid "Working Tree"
686
#: lib\diffwindow.py:101
685
#: lib\diffwindow.py:102
688
687
msgid "Rev %(rev)s for %(branch)s"
691
#: lib\diffwindow.py:103
690
#: lib\diffwindow.py:104
696
#: lib\diffwindow.py:106
695
#: lib\diffwindow.py:107
698
697
msgid "Revid: %(revid)s for %(branch)s"
701
#: lib\diffwindow.py:108
700
#: lib\diffwindow.py:109
703
702
msgid "Revid: %s"
706
#: lib\diffwindow.py:111
705
#: lib\diffwindow.py:112
707
706
msgid "Merge Preview"
710
#: lib\diffwindow.py:215
709
#: lib\diffwindow.py:218
714
#: lib\diffwindow.py:217
713
#: lib\diffwindow.py:220
715
714
msgid "Find on active panel"
718
#: lib\diffwindow.py:224 lib/widgets\shelvelist.py:110
717
#: lib\diffwindow.py:227 lib/widgets\shelvelist.py:111
722
#: lib\diffwindow.py:226
721
#: lib\diffwindow.py:229
723
722
msgid "Toggle between Side by side and Unidiff view modes"
726
#: lib\diffwindow.py:238 lib\main.py:274 lib\util.py:73
727
#: lib/widgets\shelve.py:368 lib/widgets\shelvelist.py:202
725
#: lib\diffwindow.py:241 lib\main.py:274 lib\util.py:73
726
#: lib/widgets\shelve.py:369 lib/widgets\shelvelist.py:203
731
#: lib\diffwindow.py:249
730
#: lib\diffwindow.py:252
732
731
msgid "&External Diff"
735
#: lib\diffwindow.py:251
734
#: lib\diffwindow.py:254
736
735
msgid "Launch an external diff application"
739
#: lib\diffwindow.py:265 lib/widgets\shelvelist.py:115
738
#: lib\diffwindow.py:268 lib/widgets\shelvelist.py:116
740
739
msgid "&Complete"
743
#: lib\diffwindow.py:281 lib/widgets\shelve.py:311
744
#: lib/widgets\shelvelist.py:122
742
#: lib\diffwindow.py:284 lib/widgets\shelve.py:312
743
#: lib/widgets\shelvelist.py:123
745
744
msgid "Tab width"
748
#: lib\diffwindow.py:291
747
#: lib\diffwindow.py:294
749
748
msgid "Left side tab width"
752
#: lib\diffwindow.py:301
751
#: lib\diffwindow.py:304
753
752
msgid "Right side tab width"
756
#: lib\diffwindow.py:317
755
#: lib\diffwindow.py:320
757
756
msgid "Left side encoding"
760
#: lib\diffwindow.py:327
759
#: lib\diffwindow.py:330
761
760
msgid "Right side encoding"
764
#: lib\diffwindow.py:333
763
#: lib\diffwindow.py:336
765
764
msgid "&Ignore whitespace changes"
768
#: lib\diffwindow.py:398 lib/widgets\shelve.py:461
767
#: lib\diffwindow.py:401 lib/widgets\shelve.py:462
771
770
msgid_plural "%d files"
775
#: lib\diffwindow.py:477
774
#: lib\diffwindow.py:453
778
777
"File %s is not versioned.\n"
779
778
"Operation aborted."
782
#: lib\diffwindow.py:479 lib\tag.py:138 lib\tag.py:169 lib\tag.py:206
783
#: lib\tree_branch.py:97 lib\util.py:71 lib\util.py:978 lib\util.py:988
781
#: lib\diffwindow.py:455 lib\tag.py:196 lib\tree_branch.py:97 lib\util.py:71
782
#: lib\util.py:1014 lib\util.py:1024
787
#: lib\diffwindow.py:485
786
#: lib\diffwindow.py:460
788
787
msgid "No changes found."
821
#: lib\export.py:321 lib\export.py:326
822
msgid "Export location is invalid"
826
msgid "Export revision is invalid"
830
msgid "You should specify branch source"
834
msgid "You should select destination directory"
838
msgid "Do you really want to checkout into a non-empty folder?"
842
msgid "Do you really want to branch into a non-empty folder?"
847
"The destination folder is not empty.\n"
848
"Populating new working tree there may create conflicts."
851
#: lib\getupdates.py:77 lib\getupdates.py:140
852
msgid "You should specify source branch location"
822
855
#: lib\help.py:59
824
857
msgid "No help can be found for <i>%s</i>"
924
953
msgid "Initialize"
928
msgid "You must specify a location"
957
msgid "You should specify a location"
948
977
msgid "Revision IDs"
952
981
msgid "Revision Numbers"
965
994
"It is not possible to specify different file paths and different branches at "
970
999
msgid "Messages and File text (indexed)"
973
#: lib\log.py:565 lib\logwidget.py:162
1002
#: lib\log.py:567 lib\logwidget.py:162
974
1003
msgid "Show &differences..."
978
1007
msgid "View file"
982
1011
msgid "Save file on this revision as..."
986
1015
msgid "Revert to this revision"
990
1019
msgid "Not a file"
994
1023
#, python-format
996
1025
"Operation is supported for a single file only,\n"
1001
1030
msgid "Save file in this revision as..."
1005
1034
msgid "Revert File"
1010
1039
"Are you sure you want to revert this file to the state it was at the "
1011
1040
"selected revision?"
1426
1449
msgid "Revisions:"
1429
#: lib\shelvewindow.py:63 lib\shelvewindow.py:111 lib\shelvewindow.py:120
1430
#: lib\shelvewindow.py:122 lib/widgets\shelvelist.py:512
1453
msgid "Email address not entered."
1457
msgid "Email address is not valid."
1461
msgid "Filename not entered."
1465
msgid "No submit branch entered."
1468
#: lib\shelvewindow.py:64 lib\shelvewindow.py:112 lib\shelvewindow.py:121
1469
#: lib\shelvewindow.py:123 lib/widgets\shelvelist.py:506
1431
1470
msgid "Shelve Manager"
1434
#: lib\shelvewindow.py:85 lib/widgets\shelve.py:345 lib/widgets\shelve.py:349
1435
#: lib/widgets\shelve.py:623 lib/widgets\shelve.py:662
1436
#: lib/widgets\shelve.py:667 lib/widgets\shelve.py:713
1437
#: lib/widgets\shelve.py:718 lib/widgets\shelvelist.py:484
1473
#: lib\shelvewindow.py:86 lib\subprocess.py:125 lib/widgets\shelve.py:346
1474
#: lib/widgets\shelve.py:350 lib/widgets\shelve.py:629
1475
#: lib/widgets\shelve.py:668 lib/widgets\shelve.py:673
1476
#: lib/widgets\shelve.py:719 lib/widgets\shelve.py:724
1477
#: lib/widgets\shelvelist.py:478
1441
#: lib\shelvewindow.py:86
1481
#: lib\shelvewindow.py:87
1442
1482
msgid "View shelved changes"
1445
#: lib\subprocess.py:154
1485
#: lib\subprocess.py:129
1486
msgid "Working tree has conflicts."
1489
#: lib\subprocess.py:130
1493
#: lib\subprocess.py:136 lib\trace.py:80
1494
msgid "Could not acquire lock. Please retry later."
1497
#: lib\subprocess.py:137
1501
#: lib\subprocess.py:217
1449
#: lib\subprocess.py:440
1505
#: lib\subprocess.py:518
1453
#: lib\subprocess.py:512
1509
#: lib\subprocess.py:591
1454
1510
msgid "Starting..."
1457
#: lib\subprocess.py:575
1513
#: lib\subprocess.py:654
1458
1514
msgid "Could not locate \"bzr.exe\"."
1461
#: lib\subprocess.py:594
1517
#: lib\subprocess.py:673
1462
1518
msgid "Could not locate \"bzr\" script."
1465
#: lib\subprocess.py:615
1521
#: lib\subprocess.py:694
1466
1522
msgid "Aborting..."
1469
#: lib\subprocess.py:626 lib\subprocess.py:760
1525
#: lib\subprocess.py:705 lib\subprocess.py:844
1470
1526
msgid "Finished!"
1473
#: lib\subprocess.py:653 lib\uifactory.py:108
1529
#: lib\subprocess.py:732 lib\uifactory.py:108
1474
1530
msgid "Enter Password"
1477
#: lib\subprocess.py:663 lib\uifactory.py:119
1533
#: lib\subprocess.py:742 lib\uifactory.py:119
1478
1534
msgid "Enter Username"
1481
#: lib\subprocess.py:740 lib\subprocess.py:763
1537
#: lib\subprocess.py:824 lib\subprocess.py:850
1482
1538
msgid "Failed!"
1485
#: lib\subprocess.py:743
1541
#: lib\subprocess.py:827
1486
1542
msgid "Failed to start bzr."
1489
#: lib\subprocess.py:745
1545
#: lib\subprocess.py:829
1490
1546
#, python-format
1491
1547
msgid "Error while running bzr. (error code: %d)"
1494
#: lib\subprocess.py:753
1550
#: lib\subprocess.py:837
1495
1551
msgid "Aborted!"
2154
2218
msgid "modify binary"
2157
#: lib/widgets\shelve.py:270
2221
#: lib/widgets\shelve.py:271
2158
2222
msgid "Enter the shelve message"
2161
#: lib/widgets\shelve.py:284
2225
#: lib/widgets\shelve.py:285
2165
#: lib/widgets\shelve.py:306
2229
#: lib/widgets\shelve.py:307
2166
2230
msgid "Complete"
2169
#: lib/widgets\shelve.py:324
2233
#: lib/widgets\shelve.py:325
2170
2234
msgid "Previous hunk"
2173
#: lib/widgets\shelve.py:326
2237
#: lib/widgets\shelve.py:327
2174
2238
msgid "Next hunk"
2177
#: lib/widgets\shelve.py:329
2241
#: lib/widgets\shelve.py:330
2178
2242
msgid "Use editor"
2181
#: lib/widgets\shelve.py:346
2245
#: lib/widgets\shelve.py:347
2182
2246
msgid "Destroy"
2185
#: lib/widgets\shelve.py:355
2249
#: lib/widgets\shelve.py:356
2186
2250
msgid "Select all"
2189
#: lib/widgets\shelve.py:358
2253
#: lib/widgets\shelve.py:359
2190
2254
msgid "Unselect all"
2193
#: lib/widgets\shelve.py:365 lib/widgets\shelvelist.py:199
2257
#: lib/widgets\shelve.py:366 lib/widgets\shelvelist.py:200
2194
2258
msgid "&Layout"
2197
#: lib/widgets\shelve.py:624
2261
#: lib/widgets\shelve.py:630
2198
2262
msgid "Change editor is not defined."
2201
#: lib/widgets\shelve.py:655
2265
#: lib/widgets\shelve.py:661
2202
2266
#, python-format
2203
2267
msgid "Delete changes of %d file without shelving"
2204
2268
msgid_plural "Delete changes of %d files without shelving"
2208
#: lib/widgets\shelve.py:659
2272
#: lib/widgets\shelve.py:665
2209
2273
#, python-format
2210
2274
msgid "Shelve changes of %d file"
2211
2275
msgid_plural "Shelve changes of %d files"
2215
#: lib/widgets\shelve.py:668
2279
#: lib/widgets\shelve.py:674
2216
2280
msgid "No changes selected."
2219
#: lib/widgets\shelve.py:705 lib/widgets\shelvelist.py:285
2283
#: lib/widgets\shelve.py:711 lib/widgets\shelvelist.py:285
2220
2284
msgid "<no message>"
2223
#: lib/widgets\shelve.py:714
2287
#: lib/widgets\shelve.py:720
2224
2288
msgid "Operation aborted because working tree has pending merges."
2227
#: lib/widgets\shelve.py:719
2291
#: lib/widgets\shelve.py:725
2228
2292
msgid "Operation aborted because target files has been changed."
2231
#: lib/widgets\shelve.py:959
2295
#: lib/widgets\shelve.py:965
2232
2296
msgid "Edited by change editor.\n"
2235
#: lib/widgets\shelvelist.py:85
2299
#: lib/widgets\shelvelist.py:86
2239
#: lib/widgets\shelvelist.py:119
2303
#: lib/widgets\shelvelist.py:120
2240
2304
msgid "Ignore whitespace"
2243
#: lib/widgets\shelvelist.py:174 lib/widgets\shelvelist.py:182
2307
#: lib/widgets\shelvelist.py:175 lib/widgets\shelvelist.py:183
2244
2308
msgid "Unshelve"
2247
#: lib/widgets\shelvelist.py:175
2311
#: lib/widgets\shelvelist.py:176
2248
2312
msgid "Dry run"
2251
#: lib/widgets\shelvelist.py:177
2315
#: lib/widgets\shelvelist.py:178
2255
#: lib/widgets\shelvelist.py:179
2319
#: lib/widgets\shelvelist.py:180
2259
#: lib/widgets\shelvelist.py:193
2323
#: lib/widgets\shelvelist.py:194
2260
2324
msgid "Show filelist"
2263
#: lib/widgets\shelvelist.py:490
2327
#: lib/widgets\shelvelist.py:484
2264
2328
#, python-format
2265
2329
msgid "Apply changes in shelf[%(id)d], and remove from the shelf"
2268
#: lib/widgets\shelvelist.py:492
2332
#: lib/widgets\shelvelist.py:486
2269
2333
#, python-format
2271
2335
"Simulate to apply changes in shelf[%(id)d] without changing working tree"
2274
#: lib/widgets\shelvelist.py:494
2338
#: lib/widgets\shelvelist.py:488
2275
2339
#, python-format
2276
2340
msgid "Apply changes in shelf[%(id)d], but keep it shelved"
2279
#: lib/widgets\shelvelist.py:496
2343
#: lib/widgets\shelvelist.py:490
2280
2344
#, python-format
2281
2345
msgid "Remove shelf[%(id)d] without applying"