Mercurial > hg > easyhg
comparison easyhg_en.ts @ 485:e29685e52654
Update translations, fixing #266
author | Chris Cannam |
---|---|
date | Wed, 17 Aug 2011 16:28:00 +0100 |
parents | 5144926b715e |
children | 533519ebc0cb |
comparison
equal
deleted
inserted
replaced
484:896b7903e8f2 | 485:e29685e52654 |
---|---|
1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
2 <!DOCTYPE TS> | 2 <!DOCTYPE TS> |
3 <TS version="2.0" language="en_GB"> | 3 <TS version="2.0" language="en_GB"> |
4 <context> | 4 <context> |
5 <name>AnnotateDialog</name> | |
6 <message> | |
7 <source>User</source> | |
8 <translation type="unfinished"></translation> | |
9 </message> | |
10 <message> | |
11 <source>Revision</source> | |
12 <translation type="unfinished"></translation> | |
13 </message> | |
14 <message> | |
15 <source>Date</source> | |
16 <translation type="unfinished"></translation> | |
17 </message> | |
18 <message> | |
19 <source>Content</source> | |
20 <translation type="unfinished"></translation> | |
21 </message> | |
22 </context> | |
23 <context> | |
5 <name>ChangesetItem</name> | 24 <name>ChangesetItem</name> |
6 <message> | 25 <message> |
7 <source><qt><b>&nbsp;Revision: </b>%1</qt></source> | 26 <source><qt><b>&nbsp;Revision: </b>%1</qt></source> |
8 <translation type="unfinished"></translation> | 27 <translation type="unfinished"></translation> |
9 </message> | 28 </message> |
107 <message> | 126 <message> |
108 <source>These files are recorded in the version control, but absent from your working folder.<br>If you intended to delete them, select them and use Remove to tell the version control system about it.<br>If you deleted them by accident, select them and use Revert to restore their previous contents.</source> | 127 <source>These files are recorded in the version control, but absent from your working folder.<br>If you intended to delete them, select them and use Remove to tell the version control system about it.<br>If you deleted them by accident, select them and use Revert to restore their previous contents.</source> |
109 <translation type="unfinished"></translation> | 128 <translation type="unfinished"></translation> |
110 </message> | 129 </message> |
111 <message> | 130 <message> |
112 <source>These files are unresolved following an incomplete merge.<br>Select a file and use Merge to try to resolve the merge again.</source> | |
113 <translation type="unfinished"></translation> | |
114 </message> | |
115 <message> | |
116 <source>Files highlighted <font color=#d40000>in red</font> have appeared since your most recent commit or update.</source> | 131 <source>Files highlighted <font color=#d40000>in red</font> have appeared since your most recent commit or update.</source> |
117 <translation type="unfinished"></translation> | 132 <translation type="unfinished"></translation> |
118 </message> | 133 </message> |
119 <message> | 134 <message> |
120 <source>Ignored:</source> | 135 <source>Ignored:</source> |
156 <source>To open the working folder in your system file manager,<br>click the &ldquo;Local&rdquo; folder path shown above.</source> | 171 <source>To open the working folder in your system file manager,<br>click the &ldquo;Local&rdquo; folder path shown above.</source> |
157 <translation type="unfinished"></translation> | 172 <translation type="unfinished"></translation> |
158 </message> | 173 </message> |
159 <message> | 174 <message> |
160 <source><qt>You have no uncommitted changes.</qt></source> | 175 <source><qt>You have no uncommitted changes.</qt></source> |
176 <translation type="unfinished"></translation> | |
177 </message> | |
178 <message> | |
179 <source>Show annotated version</source> | |
180 <translation type="unfinished"></translation> | |
181 </message> | |
182 <message> | |
183 <source>Diff to parent</source> | |
184 <translation type="unfinished"></translation> | |
185 </message> | |
186 <message> | |
187 <source>Commit...</source> | |
188 <translation type="unfinished"></translation> | |
189 </message> | |
190 <message> | |
191 <source>Revert to last committed state</source> | |
192 <translation type="unfinished"></translation> | |
193 </message> | |
194 <message> | |
195 <source>Rename...</source> | |
196 <translation type="unfinished"></translation> | |
197 </message> | |
198 <message> | |
199 <source>Copy...</source> | |
200 <translation type="unfinished"></translation> | |
201 </message> | |
202 <message> | |
203 <source>Add to version control</source> | |
204 <translation type="unfinished"></translation> | |
205 </message> | |
206 <message> | |
207 <source>Remove from version control</source> | |
208 <translation type="unfinished"></translation> | |
209 </message> | |
210 <message> | |
211 <source>Redo merge</source> | |
212 <translation type="unfinished"></translation> | |
213 </message> | |
214 <message> | |
215 <source>Mark conflict as resolved</source> | |
216 <translation type="unfinished"></translation> | |
217 </message> | |
218 <message> | |
219 <source>Ignore...</source> | |
220 <translation type="unfinished"></translation> | |
221 </message> | |
222 <message> | |
223 <source>Edit .hgignore File</source> | |
224 <translation type="unfinished"></translation> | |
225 </message> | |
226 <message> | |
227 <source>These files are unresolved following an incomplete merge.<br>Use Merge to try to resolve the merge again.</source> | |
228 <translation type="unfinished"></translation> | |
229 </message> | |
230 </context> | |
231 <context> | |
232 <name>HgIgnoreDialog</name> | |
233 <message> | |
234 <source>Ignore files</source> | |
235 <translation type="unfinished"></translation> | |
236 </message> | |
237 <message> | |
238 <source>You have asked to ignore the following files:</p><p></source> | |
239 <translation type="unfinished"></translation> | |
240 </message> | |
241 <message numerus="yes"> | |
242 <source>You have asked to ignore %n file(s).</source> | |
243 <translation type="unfinished"> | |
244 <numerusform></numerusform> | |
245 </translation> | |
246 </message> | |
247 <message> | |
248 <source>Ignore these files only</source> | |
249 <translation type="unfinished"></translation> | |
250 </message> | |
251 <message> | |
252 <source>Ignore files with these names, in any folder</source> | |
253 <translation type="unfinished"></translation> | |
254 </message> | |
255 <message> | |
256 <source>Ignore this file only</source> | |
257 <translation type="unfinished"></translation> | |
258 </message> | |
259 <message> | |
260 <source>Ignore files with the same name as this, in any folder</source> | |
261 <translation type="unfinished"></translation> | |
262 </message> | |
263 <message> | |
264 <source>Ignore the whole folder "%1"</source> | |
265 <translation type="unfinished"></translation> | |
266 </message> | |
267 <message> | |
268 <source>Ignore all files with these extensions: | |
269 %1</source> | |
270 <translation type="unfinished"></translation> | |
271 </message> | |
272 <message> | |
273 <source>Ignore all files with the extension "%1"</source> | |
274 <translation type="unfinished"></translation> | |
275 </message> | |
276 <message> | |
277 <source><p>Please choose whether to:</p></source> | |
278 <translation type="unfinished"></translation> | |
279 </message> | |
280 <message> | |
281 <source>Ignore</source> | |
161 <translation type="unfinished"></translation> | 282 <translation type="unfinished"></translation> |
162 </message> | 283 </message> |
163 </context> | 284 </context> |
164 <context> | 285 <context> |
165 <name>HgRunner</name> | 286 <name>HgRunner</name> |
213 <source>The command output was:</source> | 334 <source>The command output was:</source> |
214 <translation type="unfinished"></translation> | 335 <translation type="unfinished"></translation> |
215 </message> | 336 </message> |
216 <message numerus="yes"> | 337 <message numerus="yes"> |
217 <source>There are %n change(s) ready to pull</source> | 338 <source>There are %n change(s) ready to pull</source> |
218 <translation type="unfinished"> | 339 <translation> |
219 <numerusform>There is %n change ready to pull</numerusform> | 340 <numerusform>There is %n change ready to pull</numerusform> |
220 <numerusform>There are %n changes ready to pull</numerusform> | 341 <numerusform>There are %n changes ready to pull</numerusform> |
221 </translation> | 342 </translation> |
222 </message> | 343 </message> |
223 <message> | 344 <message> |
251 <source>Revert files</source> | 372 <source>Revert files</source> |
252 <translation type="unfinished"></translation> | 373 <translation type="unfinished"></translation> |
253 </message> | 374 </message> |
254 <message numerus="yes"> | 375 <message numerus="yes"> |
255 <source>You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</source> | 376 <source>You are about to <b>revert</b> %n file(s).<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</source> |
256 <translation type="unfinished"> | 377 <translation> |
257 <numerusform>You are about to <b>revert</b> %n file.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</numerusform> | 378 <numerusform>You are about to <b>revert</b> %n file.<br><br>This will <b>throw away any changes</b> that you have made to this file but have not committed.</numerusform> |
258 <numerusform>You are about to <b>revert</b> %n files.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</numerusform> | 379 <numerusform>You are about to <b>revert</b> %n files.<br><br>This will <b>throw away any changes</b> that you have made to these files but have not committed.</numerusform> |
259 </translation> | 380 </translation> |
260 </message> | 381 </message> |
261 <message> | 382 <message> |
262 <source>Merge from the default branch</source> | 383 <source>Merge from the default branch</source> |
361 <message> | 482 <message> |
362 <source>Folder has no repository</source> | 483 <source>Folder has no repository</source> |
363 <translation type="unfinished"></translation> | 484 <translation type="unfinished"></translation> |
364 </message> | 485 </message> |
365 <message> | 486 <message> |
366 <source><qt><b>Initialise a repository here?</b><br><br>You asked to open "%1".<br>This folder does not contain a Mercurial repository.<br><br>Would you like to initialise a repository here?</qt></source> | |
367 <translation type="unfinished"></translation> | |
368 </message> | |
369 <message> | |
370 <source><qt><b>Initialise a new repository?</b><br><br>You asked to open "%1".<br>This folder does not yet exist.<br><br>Would you like to create the folder and initialise a new empty repository in it?</qt></source> | 487 <source><qt><b>Initialise a new repository?</b><br><br>You asked to open "%1".<br>This folder does not yet exist.<br><br>Would you like to create the folder and initialise a new empty repository in it?</qt></source> |
371 <translation type="unfinished"></translation> | 488 <translation type="unfinished"></translation> |
372 </message> | 489 </message> |
373 <message> | 490 <message> |
374 <source>Repository exists</source> | 491 <source>Repository exists</source> |
375 <translation type="unfinished"></translation> | 492 <translation type="unfinished"></translation> |
376 </message> | 493 </message> |
377 <message> | 494 <message> |
378 <source><qt><b>Open existing repository?</b><br><br>You asked to initialise a new repository at "%1".<br>This folder already contains a repository. Would you like to open it?</qt></source> | 495 <source><qt><b>Open existing repository?</b><br><br>You asked to initialise a new repository at "%1".<br>This folder already contains a repository. Would you like to open it?</qt></source> |
379 <translation type="unfinished"></translation> | |
380 </message> | |
381 <message> | |
382 <source>Ok</source> | |
383 <translation type="unfinished"></translation> | |
384 </message> | |
385 <message> | |
386 <source>Mercurial command did not return any output.</source> | |
387 <translation type="unfinished"></translation> | 496 <translation type="unfinished"></translation> |
388 </message> | 497 </message> |
389 <message numerus="yes"> | 498 <message numerus="yes"> |
390 <source>Pushed %n changeset(s)</source> | 499 <source>Pushed %n changeset(s)</source> |
391 <translation type="unfinished"> | 500 <translation> |
392 <numerusform>Pushed %n changeset</numerusform> | 501 <numerusform>Pushed %n changeset</numerusform> |
393 <numerusform>Pushed %n changesets</numerusform> | 502 <numerusform>Pushed %n changesets</numerusform> |
394 </translation> | 503 </translation> |
395 </message> | 504 </message> |
396 <message> | 505 <message> |
401 <source>Push complete</source> | 510 <source>Push complete</source> |
402 <translation type="unfinished"></translation> | 511 <translation type="unfinished"></translation> |
403 </message> | 512 </message> |
404 <message numerus="yes"> | 513 <message numerus="yes"> |
405 <source>Pulled %n changeset(s)</source> | 514 <source>Pulled %n changeset(s)</source> |
406 <translation type="unfinished"> | 515 <translation> |
407 <numerusform>Pulled %n changeset</numerusform> | 516 <numerusform>Pulled %n changeset</numerusform> |
408 <numerusform>Pulled %n changesets</numerusform> | 517 <numerusform>Pulled %n changesets</numerusform> |
409 </translation> | 518 </translation> |
410 </message> | 519 </message> |
411 <message> | 520 <message> |
452 <source><b>Awaiting merge</b> on %1</source> | 561 <source><b>Awaiting merge</b> on %1</source> |
453 <translation type="unfinished"></translation> | 562 <translation type="unfinished"></translation> |
454 </message> | 563 </message> |
455 <message numerus="yes"> | 564 <message numerus="yes"> |
456 <source>You are about to commit %n file(s) to %1.</source> | 565 <source>You are about to commit %n file(s) to %1.</source> |
457 <translation type="unfinished"> | 566 <translation type="obsolete"> |
458 <numerusform>You are about to commit %n file to %1.</numerusform> | 567 <numerusform>You are about to commit %n file to %1.</numerusform> |
459 <numerusform>You are about to commit %n files to %1.</numerusform> | 568 <numerusform>You are about to commit %n files to %1.</numerusform> |
460 </translation> | 569 </translation> |
461 </message> | 570 </message> |
462 <message> | 571 <message> |
483 <source>On %1. Not at the head of the branch</source> | 592 <source>On %1. Not at the head of the branch</source> |
484 <translation type="unfinished"></translation> | 593 <translation type="unfinished"></translation> |
485 </message> | 594 </message> |
486 <message numerus="yes"> | 595 <message numerus="yes"> |
487 <source>At one of %n heads of %1</source> | 596 <source>At one of %n heads of %1</source> |
488 <translation type="unfinished"> | 597 <translation> |
489 <numerusform>At one of %n heads of %1</numerusform> | 598 <numerusform>At one of %n heads of %1</numerusform> |
490 <numerusform>At one of %n heads of %1</numerusform> | 599 <numerusform>At one of %n heads of %1</numerusform> |
491 </translation> | 600 </translation> |
492 </message> | 601 </message> |
493 <message> | 602 <message> |
494 <source>At the head of %1</source> | 603 <source>At the head of %1</source> |
495 <translation type="unfinished"></translation> | 604 <translation type="unfinished"></translation> |
496 </message> | 605 </message> |
497 <message> | 606 <message> |
498 <source>Open...</source> | |
499 <translation type="unfinished"></translation> | |
500 </message> | |
501 <message> | |
502 <source>Settings...</source> | |
503 <translation type="unfinished"></translation> | |
504 </message> | |
505 <message> | |
506 <source>View and change application settings</source> | 607 <source>View and change application settings</source> |
507 <translation type="unfinished"></translation> | 608 <translation type="unfinished"></translation> |
508 </message> | 609 </message> |
509 <message> | 610 <message> |
510 <source>Refresh</source> | |
511 <translation type="unfinished"></translation> | |
512 </message> | |
513 <message> | |
514 <source>Preview</source> | 611 <source>Preview</source> |
515 <translation type="unfinished"></translation> | 612 <translation type="unfinished"></translation> |
516 </message> | 613 </message> |
517 <message> | 614 <message> |
518 <source>Pull</source> | 615 <source>Pull</source> |
525 <message> | 622 <message> |
526 <source>Diff</source> | 623 <source>Diff</source> |
527 <translation type="unfinished"></translation> | 624 <translation type="unfinished"></translation> |
528 </message> | 625 </message> |
529 <message> | 626 <message> |
530 <source>Revert</source> | |
531 <translation type="unfinished"></translation> | |
532 </message> | |
533 <message> | |
534 <source>Add</source> | 627 <source>Add</source> |
535 <translation type="unfinished"></translation> | 628 <translation type="unfinished"></translation> |
536 </message> | 629 </message> |
537 <message> | 630 <message> |
538 <source>Remove</source> | 631 <source>Remove</source> |
539 <translation type="unfinished"></translation> | 632 <translation type="unfinished"></translation> |
540 </message> | 633 </message> |
541 <message> | 634 <message> |
542 <source>Commit</source> | |
543 <translation type="unfinished"></translation> | |
544 </message> | |
545 <message> | |
546 <source>Annotate</source> | |
547 <translation type="unfinished"></translation> | |
548 </message> | |
549 <message> | |
550 <source>Show line-by-line version information for selected file</source> | |
551 <translation type="unfinished"></translation> | |
552 </message> | |
553 <message> | |
554 <source>Serve local repository via http for workgroup access</source> | |
555 <translation type="unfinished"></translation> | |
556 </message> | |
557 <message> | |
558 <source>File</source> | 635 <source>File</source> |
559 <translation type="unfinished"></translation> | 636 <translation type="unfinished"></translation> |
560 </message> | 637 </message> |
561 <message> | 638 <message> |
562 <source>Advanced</source> | |
563 <translation type="unfinished"></translation> | |
564 </message> | |
565 <message> | |
566 <source>Help</source> | |
567 <translation type="unfinished"></translation> | |
568 </message> | |
569 <message> | |
570 <source>Ready</source> | 639 <source>Ready</source> |
571 <translation type="unfinished"></translation> | 640 <translation type="unfinished"></translation> |
572 </message> | 641 </message> |
573 <message> | 642 <message> |
574 <source><p><b>Note:</b> you are committing only the files you have selected, not all of the files that have been changed!</source> | 643 <source><p><b>Note:</b> you are committing only the files you have selected, not all of the files that have been changed!</source> |
577 <message> | 646 <message> |
578 <source><h3>%1</h3><p>%2%3</source> | 647 <source><h3>%1</h3><p>%2%3</source> |
579 <translation type="unfinished"></translation> | 648 <translation type="unfinished"></translation> |
580 </message> | 649 </message> |
581 <message> | 650 <message> |
582 <source>You are about to commit the following files to %1:</source> | |
583 <translation type="unfinished"></translation> | |
584 </message> | |
585 <message> | |
586 <source>New Branch</source> | 651 <source>New Branch</source> |
587 <translation type="unfinished"></translation> | 652 <translation type="unfinished"></translation> |
588 </message> | 653 </message> |
589 <message> | 654 <message> |
590 <source>Enter new branch name:</source> | 655 <source>Enter new branch name:</source> |
591 <translation type="unfinished"></translation> | 656 <translation type="unfinished"></translation> |
592 </message> | 657 </message> |
593 <message> | 658 <message> |
594 <source>Start Branch</source> | |
595 <translation type="unfinished"></translation> | |
596 </message> | |
597 <message> | |
598 <source>Add Tag</source> | |
599 <translation type="unfinished"></translation> | |
600 </message> | |
601 <message> | |
602 <source><p><b>Note:</b> you are reverting only the files you have selected, not all of the files that have been changed!</source> | 659 <source><p><b>Note:</b> you are reverting only the files you have selected, not all of the files that have been changed!</source> |
603 <translation type="unfinished"></translation> | 660 <translation type="unfinished"></translation> |
604 </message> | 661 </message> |
605 <message> | 662 <message> |
606 <source>Unable to revert</source> | 663 <source>Unable to revert</source> |
625 <message> | 682 <message> |
626 <source><qt><h3>Push to remote repository?</h3></qt></source> | 683 <source><qt><h3>Push to remote repository?</h3></qt></source> |
627 <translation type="unfinished"></translation> | 684 <translation type="unfinished"></translation> |
628 </message> | 685 </message> |
629 <message> | 686 <message> |
630 <source><qt><p>You are about to push your changes to the remote repository at <code>%1</code>.</p></qt></source> | |
631 <translation type="unfinished"></translation> | |
632 </message> | |
633 <message> | |
634 <source>Serve</source> | 687 <source>Serve</source> |
635 <translation type="unfinished"></translation> | 688 <translation type="unfinished"></translation> |
636 </message> | 689 </message> |
637 <message> | 690 <message> |
638 <source>Failed to identify an active IPv4 address</source> | 691 <source>Failed to identify an active IPv4 address</source> |
639 <translation type="unfinished"></translation> | 692 <translation type="unfinished"></translation> |
640 </message> | 693 </message> |
641 <message> | 694 <message> |
642 <source><p>Press Close to stop the server and return.</p></source> | |
643 <translation type="unfinished"></translation> | |
644 </message> | |
645 <message> | |
646 <source>Change Remote Location</source> | |
647 <translation type="unfinished"></translation> | |
648 </message> | |
649 <message> | |
650 <source><qt><big>Change the remote location</big></qt></source> | |
651 <translation type="unfinished"></translation> | |
652 </message> | |
653 <message> | |
654 <source>Provide a new URL to use for push and pull actions from the current local repository.</source> | 695 <source>Provide a new URL to use for push and pull actions from the current local repository.</source> |
655 <translation type="unfinished"></translation> | 696 <translation type="unfinished"></translation> |
656 </message> | 697 </message> |
657 <message> | 698 <message> |
658 <source>Path does not exist</source> | 699 <source>Path does not exist</source> |
693 <message> | 734 <message> |
694 <source>%1<p>You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.</source> | 735 <source>%1<p>You do have some uncommitted changes. If you wish to push those to the remote repository, commit them locally first.</source> |
695 <translation type="unfinished"></translation> | 736 <translation type="unfinished"></translation> |
696 </message> | 737 </message> |
697 <message> | 738 <message> |
698 <source>The new changes will be highlighted in the history.<br>Use Update to bring these changes into your working copy.</source> | |
699 <translation type="unfinished"></translation> | |
700 </message> | |
701 <message> | |
702 <source>Your local repository already contains all changes found in the remote repository.</source> | 739 <source>Your local repository already contains all changes found in the remote repository.</source> |
703 <translation type="unfinished"></translation> | 740 <translation type="unfinished"></translation> |
704 </message> | 741 </message> |
705 <message> | 742 <message> |
706 <source>Push failed</source> | 743 <source>Push failed</source> |
725 <message> | 762 <message> |
726 <source>Failed to run Mercurial</source> | 763 <source>Failed to run Mercurial</source> |
727 <translation type="unfinished"></translation> | 764 <translation type="unfinished"></translation> |
728 </message> | 765 </message> |
729 <message> | 766 <message> |
730 <source>The Mercurial program either could not be found or failed to run.<br>Check that the Mercurial program path is correct in %1.</source> | |
731 <translation type="unfinished"></translation> | |
732 </message> | |
733 <message> | |
734 <source>Failed to run Mercurial with extension enabled</source> | 767 <source>Failed to run Mercurial with extension enabled</source> |
735 <translation type="unfinished"></translation> | 768 <translation type="unfinished"></translation> |
736 </message> | 769 </message> |
737 <message> | 770 <message> |
738 <source>The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication might not work if you do this.</source> | 771 <source>The Mercurial program failed to run with the EasyMercurial interaction extension enabled.<br>This may indicate an installation problem.<br><br>You may be able to continue working if you switch off &ldquo;Use EasyHg Mercurial Extension&rdquo; in %1. Note that remote repositories that require authentication might not work if you do this.</source> |
745 <message> | 778 <message> |
746 <source>Clone</source> | 779 <source>Clone</source> |
747 <translation type="unfinished"></translation> | 780 <translation type="unfinished"></translation> |
748 </message> | 781 </message> |
749 <message> | 782 <message> |
750 <source>Clone successful</source> | |
751 <translation type="unfinished"></translation> | |
752 </message> | |
753 <message> | |
754 <source>The remote repository was successfully cloned to the local folder <code>%1</code>.</source> | 783 <source>The remote repository was successfully cloned to the local folder <code>%1</code>.</source> |
755 <translation type="unfinished"></translation> | 784 <translation type="unfinished"></translation> |
756 </message> | 785 </message> |
757 <message> | 786 <message> |
758 <source>Summary of changes</source> | 787 <source>Summary of changes</source> |
797 <message> | 826 <message> |
798 <source>Open an existing repository or working folder</source> | 827 <source>Open an existing repository or working folder</source> |
799 <translation type="unfinished"></translation> | 828 <translation type="unfinished"></translation> |
800 </message> | 829 </message> |
801 <message> | 830 <message> |
802 <source>Change Remote Location...</source> | |
803 <translation type="unfinished"></translation> | |
804 </message> | |
805 <message> | |
806 <source>Change the default remote repository for pull and push actions</source> | |
807 <translation type="unfinished"></translation> | |
808 </message> | |
809 <message> | |
810 <source>Quit</source> | |
811 <translation type="unfinished"></translation> | |
812 </message> | |
813 <message> | |
814 <source>Quit EasyMercurial</source> | |
815 <translation type="unfinished"></translation> | |
816 </message> | |
817 <message> | |
818 <source>Refresh the window to show the current state of the working folder</source> | 831 <source>Refresh the window to show the current state of the working folder</source> |
819 <translation type="unfinished"></translation> | 832 <translation type="unfinished"></translation> |
820 </message> | 833 </message> |
821 <message> | 834 <message> |
822 <source>See what changes are available in the remote repository waiting to be pulled</source> | 835 <source>See what changes are available in the remote repository waiting to be pulled</source> |
837 <message> | 850 <message> |
838 <source>Throw away your changes and return to the last committed state</source> | 851 <source>Throw away your changes and return to the last committed state</source> |
839 <translation type="unfinished"></translation> | 852 <translation type="unfinished"></translation> |
840 </message> | 853 </message> |
841 <message> | 854 <message> |
842 <source>Mark the selected file(s) to be added on the next commit</source> | |
843 <translation type="unfinished"></translation> | |
844 </message> | |
845 <message> | |
846 <source>Mark the selected file(s) to be removed from version control on the next commit</source> | |
847 <translation type="unfinished"></translation> | |
848 </message> | |
849 <message> | |
850 <source>Update the working folder to the head of the current repository branch</source> | 855 <source>Update the working folder to the head of the current repository branch</source> |
851 <translation type="unfinished"></translation> | 856 <translation type="unfinished"></translation> |
852 </message> | 857 </message> |
853 <message> | 858 <message> |
854 <source>Commit your changes to the local repository</source> | 859 <source>Commit your changes to the local repository</source> |
857 <message> | 862 <message> |
858 <source>Merge the two independent sets of changes in the local repository into the working folder</source> | 863 <source>Merge the two independent sets of changes in the local repository into the working folder</source> |
859 <translation type="unfinished"></translation> | 864 <translation type="unfinished"></translation> |
860 </message> | 865 </message> |
861 <message> | 866 <message> |
862 <source>Edit .hgignore File</source> | |
863 <translation type="unfinished"></translation> | |
864 </message> | |
865 <message> | |
866 <source>Edit the .hgignore file, containing the names of files that should be ignored by Mercurial</source> | 867 <source>Edit the .hgignore file, containing the names of files that should be ignored by Mercurial</source> |
867 <translation type="unfinished"></translation> | 868 <translation type="unfinished"></translation> |
868 </message> | 869 </message> |
869 <message> | 870 <message> |
870 <source>Serve via HTTP</source> | |
871 <translation type="unfinished"></translation> | |
872 </message> | |
873 <message> | |
874 <source><qt><h2>EasyMercurial v%1</h2><font size=-1><p>EasyMercurial is a simple user interface for the Mercurial</a> version control system.</p><h4>Credits and Copyright</h4><p>Development carried out by Chris Cannam for SoundSoftware.ac.uk at the Centre for Digital Music, Queen Mary, University of London.</p><p>EasyMercurial is based on HgExplorer by Jari Korhonen, with thanks.</p><p style="margin-left: 2em;">Copyright &copy; 2011 Queen Mary, University of London.<br>Copyright &copy; 2010 Jari Korhonen.<br>Copyright &copy; 2011 Chris Cannam.</p><p style="margin-left: 2em;">This program requires Mercurial, by Matt Mackall and others.<br>This program uses Qt by Nokia.<br>This program uses Nuvola icons by David Vignoni.<br>This program may use KDiff3 by Joachim Eibl.<br>This program may use PyQt by River Bank Computing.<br>Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others.</p><h4>License</h4><p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information.</p></font></source> | 871 <source><qt><h2>EasyMercurial v%1</h2><font size=-1><p>EasyMercurial is a simple user interface for the Mercurial</a> version control system.</p><h4>Credits and Copyright</h4><p>Development carried out by Chris Cannam for SoundSoftware.ac.uk at the Centre for Digital Music, Queen Mary, University of London.</p><p>EasyMercurial is based on HgExplorer by Jari Korhonen, with thanks.</p><p style="margin-left: 2em;">Copyright &copy; 2011 Queen Mary, University of London.<br>Copyright &copy; 2010 Jari Korhonen.<br>Copyright &copy; 2011 Chris Cannam.</p><p style="margin-left: 2em;">This program requires Mercurial, by Matt Mackall and others.<br>This program uses Qt by Nokia.<br>This program uses Nuvola icons by David Vignoni.<br>This program may use KDiff3 by Joachim Eibl.<br>This program may use PyQt by River Bank Computing.<br>Packaging for Mercurial and other dependencies on Windows is derived from TortoiseHg by Steve Borho and others.</p><h4>License</h4><p>This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. See the file COPYING included with this distribution for more information.</p></font></source> |
875 <translation type="unfinished"></translation> | 872 <translation type="unfinished"></translation> |
876 </message> | 873 </message> |
874 <message> | |
875 <source>You are about to commit changes to the following files in %1:</source> | |
876 <translation type="unfinished"></translation> | |
877 </message> | |
877 <message numerus="yes"> | 878 <message numerus="yes"> |
878 <source>Running temporary server at %n address(es):</source> | 879 <source>You are about to commit changes to %n file(s) in %1.</source> |
879 <translation type="unfinished"> | 880 <translation> |
880 <numerusform></numerusform> | 881 <numerusform>You are about to commit changes to %n file in %1.</numerusform> |
882 <numerusform>You are about to commit changes to %n files in %1.</numerusform> | |
881 </translation> | 883 </translation> |
882 </message> | 884 </message> |
885 <message> | |
886 <source>Co&mmit</source> | |
887 <translation type="unfinished"></translation> | |
888 </message> | |
889 <message> | |
890 <source>Start &Branch</source> | |
891 <translation type="unfinished"></translation> | |
892 </message> | |
893 <message> | |
894 <source>Add &Tag</source> | |
895 <translation type="unfinished"></translation> | |
896 </message> | |
897 <message> | |
898 <source><qt><h3>Ignored File Patterns</h3></qt></source> | |
899 <translation type="unfinished"></translation> | |
900 </message> | |
901 <message> | |
902 <source>Write failed</source> | |
903 <translation type="unfinished"></translation> | |
904 </message> | |
905 <message> | |
906 <source>Failed to open file %1 for writing</source> | |
907 <translation type="unfinished"></translation> | |
908 </message> | |
909 <message> | |
910 <source>Ignored files</source> | |
911 <translation type="unfinished"></translation> | |
912 </message> | |
913 <message> | |
914 <source>The following lines have been added to the .hgignore file for this working copy:</source> | |
915 <translation type="unfinished"></translation> | |
916 </message> | |
917 <message> | |
918 <source>Re&vert</source> | |
919 <translation type="unfinished"></translation> | |
920 </message> | |
921 <message> | |
922 <source>Rename</source> | |
923 <translation type="unfinished"></translation> | |
924 </message> | |
925 <message> | |
926 <source>Rename <code>%1</code> to:</source> | |
927 <translation type="unfinished"></translation> | |
928 </message> | |
929 <message> | |
930 <source>Re&name</source> | |
931 <translation type="unfinished"></translation> | |
932 </message> | |
933 <message> | |
934 <source>Copy</source> | |
935 <translation type="unfinished"></translation> | |
936 </message> | |
937 <message> | |
938 <source>Copy <code>%1</code> to:</source> | |
939 <translation type="unfinished"></translation> | |
940 </message> | |
941 <message> | |
942 <source>Co&py</source> | |
943 <translation type="unfinished"></translation> | |
944 </message> | |
945 <message> | |
946 <source>&Pull</source> | |
947 <translation type="unfinished"></translation> | |
948 </message> | |
949 <message> | |
950 <source><p><b>Note:</b> You have uncommitted changes. If you want to push these changes to the remote repository, you need to commit them first.</source> | |
951 <translation type="unfinished"></translation> | |
952 </message> | |
953 <message> | |
954 <source><qt><p>You are about to push your commits to the remote repository at <code>%1</code>.</p>%2</qt></source> | |
955 <translation type="unfinished"></translation> | |
956 </message> | |
957 <message> | |
958 <source>&Push</source> | |
959 <translation type="unfinished"></translation> | |
960 </message> | |
961 <message> | |
962 <source>Sharing Repository</source> | |
963 <translation type="unfinished"></translation> | |
964 </message> | |
965 <message> | |
966 <source>Your local repository is now being made temporarily available via HTTP for workgroup access.</source> | |
967 <translation type="unfinished"></translation> | |
968 </message> | |
969 <message> | |
970 <source>Users who have network access to your computer can now clone your repository, by using one of the following URLs as a remote location:</source> | |
971 <translation type="unfinished"></translation> | |
972 </message> | |
973 <message> | |
974 <source>Users who have network access to your computer can now clone your repository, by using the following URL as a remote location:</source> | |
975 <translation type="unfinished"></translation> | |
976 </message> | |
977 <message> | |
978 <source><p>Press Close to terminate this server, end remote access, and return.</p></source> | |
979 <translation type="unfinished"></translation> | |
980 </message> | |
981 <message> | |
982 <source>Share Repository</source> | |
983 <translation type="unfinished"></translation> | |
984 </message> | |
985 <message> | |
986 <source>Set Remote Location</source> | |
987 <translation type="unfinished"></translation> | |
988 </message> | |
989 <message> | |
990 <source><qt><big>Set the remote location</big></qt></source> | |
991 <translation type="unfinished"></translation> | |
992 </message> | |
993 <message> | |
994 <source>Provide a URL to use for push and pull actions from the current local repository.<br>This will be the default for subsequent pushes and pulls.<br>You can change it using &ldquo;Set Remote Location&rdquo; on the File menu.</source> | |
995 <translation type="unfinished"></translation> | |
996 </message> | |
997 <message> | |
998 <source><qt><b>Initialise a repository here?</b><br><br>You asked to open "%1".<br>This folder is not a Mercurial working copy.<br><br>Would you like to initialise a repository here?</qt></source> | |
999 <translation type="unfinished"></translation> | |
1000 </message> | |
1001 <message> | |
1002 <source>New changes will be highlighted in yellow in the history.</source> | |
1003 <translation type="unfinished"></translation> | |
1004 </message> | |
1005 <message> | |
1006 <source>Your local repository could not be pushed to the remote repository.<br><br>You have an uncommitted merge in your local folder. You probably need to commit it before you push.</source> | |
1007 <translation type="unfinished"></translation> | |
1008 </message> | |
1009 <message> | |
1010 <source>Authorization failed</source> | |
1011 <translation type="unfinished"></translation> | |
1012 </message> | |
1013 <message> | |
1014 <source>You may have entered an incorrect user name or password, or the remote URL may be wrong.<br><br>Or you may lack the necessary permissions on the remote repository.<br><br>Check with the administrator of your remote repository if necessary.</source> | |
1015 <translation type="unfinished"></translation> | |
1016 </message> | |
1017 <message> | |
1018 <source>The Mercurial program either could not be found or failed to run.<br><br>Check that the Mercurial program path is correct in %1.</source> | |
1019 <translation type="unfinished"></translation> | |
1020 </message> | |
1021 <message> | |
1022 <source>Merge failed</source> | |
1023 <translation type="unfinished"></translation> | |
1024 </message> | |
1025 <message> | |
1026 <source>Some files were not merged successfully.<p>You can Merge again to repeat the interactive merge; use Revert to abandon the merge entirely; or edit the files that are in conflict in an editor and, when you are happy with them, choose Mark Resolved in each file's right-button menu.</source> | |
1027 <translation type="unfinished"></translation> | |
1028 </message> | |
1029 <message> | |
1030 <source>A Mercurial command failed to run correctly. This may indicate an installation problem or some other problem with EasyMercurial.</source> | |
1031 <translation type="unfinished"></translation> | |
1032 </message> | |
1033 <message> | |
1034 <source>Newer Mercurial version required</source> | |
1035 <translation type="unfinished"></translation> | |
1036 </message> | |
1037 <message> | |
1038 <source>To use EasyMercurial, you should have at least Mercurial v1.7 installed.<br><br>The version found on this system (v%1.%2) does not support all of the features required by EasyMercurial.</source> | |
1039 <translation type="unfinished"></translation> | |
1040 </message> | |
1041 <message> | |
1042 <source>Open successful</source> | |
1043 <translation type="unfinished"></translation> | |
1044 </message> | |
1045 <message> | |
1046 <source>No recent local repositories</source> | |
1047 <translation type="unfinished"></translation> | |
1048 </message> | |
1049 <message> | |
1050 <source>&Open...</source> | |
1051 <translation type="unfinished"></translation> | |
1052 </message> | |
1053 <message> | |
1054 <source>Ctrl+O</source> | |
1055 <translation type="unfinished"></translation> | |
1056 </message> | |
1057 <message> | |
1058 <source>Set Remote &Location...</source> | |
1059 <translation type="unfinished"></translation> | |
1060 </message> | |
1061 <message> | |
1062 <source>Set or change the default remote repository for pull and push actions</source> | |
1063 <translation type="unfinished"></translation> | |
1064 </message> | |
1065 <message> | |
1066 <source>&Settings...</source> | |
1067 <translation type="unfinished"></translation> | |
1068 </message> | |
1069 <message> | |
1070 <source>E&xit</source> | |
1071 <translation type="unfinished"></translation> | |
1072 </message> | |
1073 <message> | |
1074 <source>&Quit</source> | |
1075 <translation type="unfinished"></translation> | |
1076 </message> | |
1077 <message> | |
1078 <source>Exit EasyMercurial</source> | |
1079 <translation type="unfinished"></translation> | |
1080 </message> | |
1081 <message> | |
1082 <source>&Refresh</source> | |
1083 <translation type="unfinished"></translation> | |
1084 </message> | |
1085 <message> | |
1086 <source>Ctrl+R</source> | |
1087 <translation type="unfinished"></translation> | |
1088 </message> | |
1089 <message> | |
1090 <source>Pre&view Incoming Changes</source> | |
1091 <translation type="unfinished"></translation> | |
1092 </message> | |
1093 <message> | |
1094 <source>Pu&ll from Remote Repository</source> | |
1095 <translation type="unfinished"></translation> | |
1096 </message> | |
1097 <message> | |
1098 <source>Ctrl+L</source> | |
1099 <translation type="unfinished"></translation> | |
1100 </message> | |
1101 <message> | |
1102 <source>Pus&h to Remote Repository</source> | |
1103 <translation type="unfinished"></translation> | |
1104 </message> | |
1105 <message> | |
1106 <source>Ctrl+H</source> | |
1107 <translation type="unfinished"></translation> | |
1108 </message> | |
1109 <message> | |
1110 <source>&Diff</source> | |
1111 <translation type="unfinished"></translation> | |
1112 </message> | |
1113 <message> | |
1114 <source>Ctrl+D</source> | |
1115 <translation type="unfinished"></translation> | |
1116 </message> | |
1117 <message> | |
1118 <source>&Add Files</source> | |
1119 <translation type="unfinished"></translation> | |
1120 </message> | |
1121 <message> | |
1122 <source>+</source> | |
1123 <translation type="unfinished"></translation> | |
1124 </message> | |
1125 <message> | |
1126 <source>Mark the selected files to be added on the next commit</source> | |
1127 <translation type="unfinished"></translation> | |
1128 </message> | |
1129 <message> | |
1130 <source>&Remove Files</source> | |
1131 <translation type="unfinished"></translation> | |
1132 </message> | |
1133 <message> | |
1134 <source>Del</source> | |
1135 <translation type="unfinished"></translation> | |
1136 </message> | |
1137 <message> | |
1138 <source>Mark the selected files to be removed from version control on the next commit</source> | |
1139 <translation type="unfinished"></translation> | |
1140 </message> | |
1141 <message> | |
1142 <source>&Ignore Files...</source> | |
1143 <translation type="unfinished"></translation> | |
1144 </message> | |
1145 <message> | |
1146 <source>Add the selected filenames to the ignored list, of files that should never be tracked in this repository</source> | |
1147 <translation type="unfinished"></translation> | |
1148 </message> | |
1149 <message> | |
1150 <source>Edit Ignored List</source> | |
1151 <translation type="unfinished"></translation> | |
1152 </message> | |
1153 <message> | |
1154 <source>&Update to Branch Head</source> | |
1155 <translation type="unfinished"></translation> | |
1156 </message> | |
1157 <message> | |
1158 <source>Ctrl+U</source> | |
1159 <translation type="unfinished"></translation> | |
1160 </message> | |
1161 <message> | |
1162 <source>&Commit...</source> | |
1163 <translation type="unfinished"></translation> | |
1164 </message> | |
1165 <message> | |
1166 <source>Ctrl+Return</source> | |
1167 <translation type="unfinished"></translation> | |
1168 </message> | |
1169 <message> | |
1170 <source>&Merge</source> | |
1171 <translation type="unfinished"></translation> | |
1172 </message> | |
1173 <message> | |
1174 <source>Ctrl+M</source> | |
1175 <translation type="unfinished"></translation> | |
1176 </message> | |
1177 <message> | |
1178 <source>Serve local repository temporarily via HTTP for workgroup access</source> | |
1179 <translation type="unfinished"></translation> | |
1180 </message> | |
1181 <message> | |
1182 <source>&File</source> | |
1183 <translation type="unfinished"></translation> | |
1184 </message> | |
1185 <message> | |
1186 <source>Open Re&cent</source> | |
1187 <translation type="unfinished"></translation> | |
1188 </message> | |
1189 <message> | |
1190 <source>&Work</source> | |
1191 <translation type="unfinished"></translation> | |
1192 </message> | |
1193 <message> | |
1194 <source>&Remote</source> | |
1195 <translation type="unfinished"></translation> | |
1196 </message> | |
1197 <message> | |
1198 <source>&Help</source> | |
1199 <translation type="unfinished"></translation> | |
1200 </message> | |
1201 <message> | |
1202 <source>Remote</source> | |
1203 <translation type="unfinished"></translation> | |
1204 </message> | |
1205 <message> | |
1206 <source>Work</source> | |
1207 <translation type="unfinished"></translation> | |
1208 </message> | |
883 </context> | 1209 </context> |
884 <context> | 1210 <context> |
885 <name>MoreInformationDialog</name> | 1211 <name>MoreInformationDialog</name> |
886 <message> | 1212 <message> |
887 <source>More Details...</source> | 1213 <source>More Details...</source> |
920 </message> | 1246 </message> |
921 <message> | 1247 <message> |
922 <source>&Folder:</source> | 1248 <source>&Folder:</source> |
923 <translation type="unfinished"></translation> | 1249 <translation type="unfinished"></translation> |
924 </message> | 1250 </message> |
1251 <message> | |
1252 <source>Documents</source> | |
1253 <translation type="unfinished"></translation> | |
1254 </message> | |
1255 <message> | |
1256 <source>My Documents</source> | |
1257 <translation type="unfinished"></translation> | |
1258 </message> | |
1259 <message> | |
1260 <source>Desktop</source> | |
1261 <translation type="unfinished"></translation> | |
1262 </message> | |
925 </context> | 1263 </context> |
926 <context> | 1264 <context> |
927 <name>QApplication</name> | 1265 <name>QApplication</name> |
928 <message> | 1266 <message> |
929 <source>EasyMercurial</source> | 1267 <source>EasyMercurial</source> |
1037 <message> | 1375 <message> |
1038 <source>External file-merge program:</source> | 1376 <source>External file-merge program:</source> |
1039 <translation type="unfinished"></translation> | 1377 <translation type="unfinished"></translation> |
1040 </message> | 1378 </message> |
1041 <message> | 1379 <message> |
1042 <source>External text editor:</source> | |
1043 <translation type="unfinished"></translation> | |
1044 </message> | |
1045 <message> | |
1046 <source>EasyHg Mercurial extension:</source> | 1380 <source>EasyHg Mercurial extension:</source> |
1047 <translation type="unfinished"></translation> | 1381 <translation type="unfinished"></translation> |
1048 </message> | 1382 </message> |
1049 <message> | 1383 <message> |
1050 <source>Use EasyHg Mercurial extension</source> | 1384 <source>Use EasyHg Mercurial extension</source> |
1065 <message> | 1399 <message> |
1066 <source>External file-merge program</source> | 1400 <source>External file-merge program</source> |
1067 <translation type="unfinished"></translation> | 1401 <translation type="unfinished"></translation> |
1068 </message> | 1402 </message> |
1069 <message> | 1403 <message> |
1070 <source>External text editor</source> | |
1071 <translation type="unfinished"></translation> | |
1072 </message> | |
1073 <message> | |
1074 <source>EasyHg Mercurial extension</source> | 1404 <source>EasyHg Mercurial extension</source> |
1075 <translation type="unfinished"></translation> | 1405 <translation type="unfinished"></translation> |
1076 </message> | 1406 </message> |
1077 <message> | 1407 <message> |
1078 <source>Restore default settings?</source> | 1408 <source>Restore default settings?</source> |
1080 </message> | 1410 </message> |
1081 <message> | 1411 <message> |
1082 <source><qt><b>Restore default settings?</b><br><br>Are you sure you want to reset all settings to their default values?</source> | 1412 <source><qt><b>Restore default settings?</b><br><br>Are you sure you want to reset all settings to their default values?</source> |
1083 <translation type="unfinished"></translation> | 1413 <translation type="unfinished"></translation> |
1084 </message> | 1414 </message> |
1415 <message> | |
1416 <source>SSH program (for ssh URLs):</source> | |
1417 <translation type="unfinished"></translation> | |
1418 </message> | |
1419 <message> | |
1420 <source>SSH program</source> | |
1421 <translation type="unfinished"></translation> | |
1422 </message> | |
1085 </context> | 1423 </context> |
1086 <context> | 1424 <context> |
1087 <name>StartupDialog</name> | 1425 <name>StartupDialog</name> |
1088 <message> | 1426 <message> |
1089 <source>About me</source> | 1427 <source>About me</source> |
1146 </message> | 1484 </message> |
1147 <message> | 1485 <message> |
1148 <source>Cancel new branch</source> | 1486 <source>Cancel new branch</source> |
1149 <translation type="unfinished"></translation> | 1487 <translation type="unfinished"></translation> |
1150 </message> | 1488 </message> |
1489 <message> | |
1490 <source><qt><b>&nbsp;Uncommitted merge</b></qt></source> | |
1491 <translation type="unfinished"></translation> | |
1492 </message> | |
1493 <message> | |
1494 <source>Uncommitted merge</source> | |
1495 <translation type="unfinished"></translation> | |
1496 </message> | |
1497 <message> | |
1498 <source>merge</source> | |
1499 <translation type="unfinished"></translation> | |
1500 </message> | |
1151 </context> | 1501 </context> |
1152 <context> | 1502 <context> |
1153 <name>WorkStatusWidget</name> | 1503 <name>WorkStatusWidget</name> |
1154 <message> | 1504 <message> |
1155 <source>Local:</source> | 1505 <source>Local:</source> |