#
#
# patch "ChangeLog"
# from [829ac5155b7f125338673a65a41be6d1c7620db6]
# to [4cee5a3f40e4898ae9a711e767e9ff58dceedf5f]
#
# patch "NEWS"
# from [64bd6c59ecd767472236d782f63e0118ba8053fc]
# to [064aa9b9a3793744ef2099d229158e5e6d46b83b]
#
# patch "README"
# from [fcc67ac8f6e37461e90c2783ad0e1b46d4ae2826]
# to [b0d7599bc78688deb18c6e50c8e5b24a686b5a8f]
#
# patch "locale/mtn-browse.pot"
# from [358944c0d7b6745a1d9f4a7fd5a0eaee08682a12]
# to [fe823a5415bb42f040807022410f91687e653033]
#
============================================================
--- ChangeLog 829ac5155b7f125338673a65a41be6d1c7620db6
+++ ChangeLog 4cee5a3f40e4898ae9a711e767e9ff58dceedf5f
@@ -1,5 +1,73 @@ Revision history for mtn-browse.
Revision history for mtn-browse.
+0.70 Sun May 23 14:50:00 2010 Anthony Cooper
+ - Updated the help documentation in light of the changes made to
+ mtn-browse (the manage server bookmarks dialog window, the file
+ encoding menu options and the compare arbitrary revisions window).
+ - Updated the code to reference the new help sections.
+ - Updated mtn-browse's version number and the year on the copyright
+ notice.
+ - Removed the scrolled windows and layouts from the revision id value
+ labels in the compare arbitrary revisions window as I couldn't get
+ the text lines to line up horizontally between the labels and
+ corresponding values due to the advanced find buttons being in the
+ same row.
+ - Made sure that all the buttons on the compare arbitrary revisions
+ window don't accept focus (like all the other flush buttons).
+ - Made sure that the first value label gets the focus so as to take it
+ away from the first button.
+ - Improved, updated and corrected a few tooltips and removed some
+ others that are dynamically generated by the application.
+ - Worked around a bug in Gnome::VFS which causes a core dump on Debian
+ Lenny.
+ - Updated the figures with snapshots of the new version of mtn-browse.
+ - Added eye.png to the ignore list.
+ - Implemented the select arbitrary revisions feature.
+ - The advanced find dialog window now puts the keyboard focus onto the
+ branch comboboxentry field by default (just like the main browser
+ window).
+ - All menu items that rely on an open database are now disabled when
+ there isn't one.
+ - The server bookmarks menu is only enabled if mtn supports that
+ feature, this information is also cached in the user's preferences
+ just in case they don't start mtn-browse with a default database.
+ - The annotate button is disabled when accessing a remote server.
+ - Entered in the help reference for the server bookmarks manager
+ window.
+ - The run_command() routine now supports command termination and errors
+ from sysread() are dealt with.
+ - The revision comparison window now allows a user to stop the
+ comparison not only during the formatting stage but also during the
+ actual mtn diff operation as well.
+ - Now guard against re-entrancy in custom dialog windows when calling
+ the hide() method.
+ - Needless updates to the MIME types treeview are now avoided.
+ - Now track changes in paths inside the MIME treeview as a result of
+ the user changing the display order.
+ - Now disable Monotone-Viz button with remote connections.
+ - Put manage menu item the end of the servers menu.
+ - Now rely on Monotone::AutomateStdio to report all server connection
+ problems.
+ - Sorted out the focus issue with all TreeViews when searching for text
+ (the selection would change but nothing else acted on that selection
+ change).
+ - Added the `connect to service' logic and GUIs.
+ - Now deal with errors resulting from trying to open a Monotone
+ database in a much more intelligent way.
+ - Improved some of the messages in error dialogs.
+ - Added a View menu that allows the user to select the character
+ encoding in use inside text files stored inside a Monotone database
+ rather than just assume it is UTF-8.
+ - Now a bit more explicit about the error handing from the
+ encode/decode routines.
+ - The character decoding is now done specifically by the annotation and
+ history modules rather than generically by run_command (this is to
+ cope with a mixture of character encodings in the output from
+ annotate and content_diff - i.e. the UTF-8 explanatory text added by
+ Monotone and the character encoding used in the original text file).
+ - Minor code tidy ups and comment corrections.
+ - Updated the translation files.
+
0.63 Sun Nov 08 13:27:00 2009 Anthony Cooper
- Updated the help documentation in light of the changes made to the
GUI, i.e.:
============================================================
--- NEWS 64bd6c59ecd767472236d782f63e0118ba8053fc
+++ NEWS 064aa9b9a3793744ef2099d229158e5e6d46b83b
@@ -1,3 +1,41 @@
+Overview Of Changes In mtn-browse 0.70 (2010-05-23 14:50:00)
+============================================================
+
+New:
+- Added support for connecting to networked Monotone servers, this also
+ includes a bookmark and bookmark manager features.
+- Added support for comparing any two arbitrary revisions in a database.
+- Added a View menu that allows the user to select the character encoding in
+ use inside text files stored inside a Monotone database rather than just
+ assume it is UTF-8.
+
+Changes:
+- The revision comparison window now allows a user to stop the comparison not
+ only during the formatting stage but also during the actual mtn diff
+ operation as well.
+- Improved some of the messages in error dialogs.
+- Improved and corrected a few tooltips and removed some others that are
+ dynamically generated by the application.
+- Now a bit more explicit about the error handing from the character
+ encode/decode routines. The character decoding is now handled more
+ specifically for files.
+- Updated the help documentation and the translation files in light of the
+ changes made to mtn-browse.
+
+Bugs Fixed:
+- Worked around a bug in Gnome::VFS which causes a core dump on Debian Lenny.
+- All menu items that rely on an open database are now disabled when there
+ isn't one.
+- Now guard against re-entrancy in custom dialog windows when calling the
+ hide() method.
+- Needless updates to the MIME types treeview are now avoided.
+- Now track changes in paths inside the MIME treeview as a result of the user
+ changing the display order.
+- Sorted out the focus issue with all TreeViews when searching for text (the
+ selection would change but nothing else acted on that selection change).
+- Now deal with errors resulting from trying to open a Monotone database in a
+ much more intelligent way.
+
Overview Of Changes In mtn-browse 0.63 (2009-11-08 13:53:00)
============================================================
============================================================
--- README fcc67ac8f6e37461e90c2783ad0e1b46d4ae2826
+++ README b0d7599bc78688deb18c6e50c8e5b24a686b5a8f
@@ -1,4 +1,4 @@
-mtn-browse Version 0.63
+mtn-browse Version 0.70
=======================
mtn-browse is an application for browsing Monotone VCS databases without the
============================================================
--- locale/mtn-browse.pot 358944c0d7b6745a1d9f4a7fd5a0eaee08682a12
+++ locale/mtn-browse.pot fe823a5415bb42f040807022410f91687e653033
@@ -8,7 +8,7 @@ msgstr ""
msgstr ""
"Project-Id-Version: mtn-browse 0.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2009-11-08 14:24+0000\n"
+"POT-Creation-Date: 2010-05-23 15:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -17,66 +17,83 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: mtn-browse:238
+#: mtn-browse:243
#, perl-brace-format
msgid ""
"Your preferences cannot be loaded:\n"
"{error_message}"
msgstr ""
-#: mtn-browse:262
+#: mtn-browse:267
#, perl-brace-format
msgid ""
"{error_message}\n"
"This is fatal, I am going to exit."
msgstr ""
-#: mtn-browse:322
+#: mtn-browse:327
#, perl-brace-format
msgid "Cannot open database {database_name}."
msgstr ""
-#: mtn-browse:514
+#: mtn-browse:452
#, perl-brace-format
msgid ""
+"There is a problem connecting to the server, the details are:\n"
+"{error_message}"
+msgstr ""
+
+#: mtn-browse:460
+#, perl-brace-format
+msgid "Connecting to server `{server}'"
+msgstr ""
+
+#: mtn-browse:529 mtn-browse:3465 mtn-browse:3500 lib/perl/Common.pm:1413
+#: lib/perl/Preferences.pm:273
+msgid "Your preferences could not be saved:\n"
+msgstr ""
+
+#: mtn-browse:700
+#, perl-brace-format
+msgid ""
"Gnome cannot display Monotone Browser's\n"
"home page. Gnome gave:\n"
"{gnome_error_message}"
msgstr ""
-#: mtn-browse:553
-msgid "Copyright © 2007-2009 Anthony Cooper"
+#: mtn-browse:739
+msgid "Copyright © 2007-2010 Anthony Cooper"
msgstr ""
-#: mtn-browse:554
+#: mtn-browse:740
msgid "A graphical front-end browser for Monotone VCS databases"
msgstr ""
-#: mtn-browse:556
+#: mtn-browse:742
msgid "Anthony Cooper "
msgstr ""
-#: mtn-browse:557
+#: mtn-browse:743
msgid "Thomas Keller (German translation)"
msgstr ""
-#: mtn-browse:1182 lib/perl/History.pm:1985
+#: mtn-browse:1368 lib/perl/History.pm:2278
#, perl-brace-format
msgid ""
"Cannot generate temporary file name:\n"
"{error_message}."
msgstr ""
-#: mtn-browse:1198 lib/perl/Common.pm:664 lib/perl/History.pm:2002
+#: mtn-browse:1384 lib/perl/Common.pm:695 lib/perl/History.pm:2295
#, perl-brace-format
msgid "{error_message}."
msgstr ""
-#: mtn-browse:1260
+#: mtn-browse:1446
msgid "Unknown file type, not viewing."
msgstr ""
-#: mtn-browse:1277
+#: mtn-browse:1473
#, perl-brace-format
msgid ""
"Gnome cannot launch the helper application\n"
@@ -85,7 +102,7 @@ msgstr ""
"{gnome_error_message}"
msgstr ""
-#: mtn-browse:1293
+#: mtn-browse:1490
#, perl-brace-format
msgid ""
"No application is associated with\n"
@@ -93,69 +110,91 @@ msgstr ""
"using Vi instead."
msgstr ""
-#: mtn-browse:1685
+#: mtn-browse:1870
+#, perl-brace-format
+msgid "Changed file encoding from `{old_encoding}' to `{new_encoding}'"
+msgstr ""
+
+#: mtn-browse:1898
+msgid "All Encodings"
+msgstr ""
+
+#: mtn-browse:1959
msgid "File Name"
msgstr ""
-#: mtn-browse:1700
+#: mtn-browse:1974
msgid "Last Update"
msgstr ""
-#: mtn-browse:1710 lib/perl/AdvancedFind.pm:307 lib/perl/AdvancedFind.pm:689
+#: mtn-browse:1984 lib/perl/AdvancedFind.pm:317 lib/perl/AdvancedFind.pm:709
msgid "Author"
msgstr ""
-#: mtn-browse:1774
+#: mtn-browse:2053
msgid "mtnb-gsc-menus"
msgstr ""
-#: mtn-browse:1776
+#: mtn-browse:2055
msgid "mtnb-gsc-tool-bar"
msgstr ""
-#: mtn-browse:1778
+#: mtn-browse:2057
msgid "mtnb-gsc-selecting-a-branch-and-revision"
msgstr ""
-#: mtn-browse:1780 mtn-browse:1784 mtn-browse:1790 lib/perl/FindText.pm:786
+#: mtn-browse:2059 mtn-browse:2063 mtn-browse:2069 lib/perl/FindText.pm:786
msgid "mtnb-gsc-browser-buttons"
msgstr ""
-#: mtn-browse:1782 mtn-browse:1786
+#: mtn-browse:2061 mtn-browse:2065
msgid "mtnb-gsc-selecting-a-file-to-display"
msgstr ""
-#: mtn-browse:1788 mtn-browse:1792
+#: mtn-browse:2067 mtn-browse:2071
msgid "mtnb-gsc-information-fields"
msgstr ""
-#: mtn-browse:1794
+#: mtn-browse:2073
msgid "mtnb-gsc-monotone-browser-window-at-a-glance"
msgstr ""
-#: mtn-browse:1932 lib/perl/Preferences.pm:317 lib/perl/Preferences.pm:368
+#: mtn-browse:2211 lib/perl/Preferences.pm:320 lib/perl/Preferences.pm:371
#, perl-brace-format
msgid "open failed: {error_message}\n"
msgstr ""
-#: mtn-browse:2057
+#: mtn-browse:2320
+msgid "No Bookmarks"
+msgstr ""
+
+#: mtn-browse:2328 lib/ui/mtn-browse.glade:9718
+msgid "Manage Server Bookmarks"
+msgstr ""
+
+#: mtn-browse:2410
#, perl-brace-format
+msgid " ({service_name})"
+msgstr ""
+
+#: mtn-browse:2425
+#, perl-brace-format
msgid " ({database_name})"
msgstr ""
-#: mtn-browse:2099 lib/perl/AdvancedFind.pm:843
+#: mtn-browse:2464 lib/perl/AdvancedFind.pm:872
msgid "Fetching branch list"
msgstr ""
-#: mtn-browse:2106 lib/perl/AdvancedFind.pm:851
+#: mtn-browse:2471 lib/perl/AdvancedFind.pm:880
msgid "Populating branch list"
msgstr ""
-#: mtn-browse:2152
+#: mtn-browse:2517
msgid "Auto selecting head revision"
msgstr ""
-#: mtn-browse:2179
+#: mtn-browse:2544
#, perl-brace-format
msgid ""
"The `{branch}' branch\n"
@@ -164,20 +203,20 @@ msgstr ""
"below or use the Advanced Find feature."
msgstr ""
-#: mtn-browse:2261 lib/perl/AdvancedFind.pm:900 lib/perl/History.pm:157
-#: lib/perl/History.pm:359
+#: mtn-browse:2626 lib/perl/AdvancedFind.pm:929 lib/perl/History.pm:160
+#: lib/perl/History.pm:362
msgid "Fetching revision list"
msgstr ""
-#: mtn-browse:2274 lib/perl/AdvancedFind.pm:915
+#: mtn-browse:2639 lib/perl/AdvancedFind.pm:944
msgid "Populating revision list"
msgstr ""
-#: mtn-browse:2330
+#: mtn-browse:2695
msgid "Fetching manifest"
msgstr ""
-#: mtn-browse:2356
+#: mtn-browse:2721
#, perl-brace-format
msgid ""
"The `{tag_name}' tag is not unique on this\n"
@@ -185,199 +224,195 @@ msgstr ""
"combobox below or use the Advanced Find feature."
msgstr ""
-#: mtn-browse:2472
+#: mtn-browse:2837
msgid "Populating directory list"
msgstr ""
-#: mtn-browse:2544
+#: mtn-browse:2909
msgid "Populating file details"
msgstr ""
-#: mtn-browse:2858
+#: mtn-browse:3225
msgid "Unknown Contents"
msgstr ""
-#: mtn-browse:2915
+#: mtn-browse:3282
msgid "Hex dump:\n"
msgstr ""
-#: mtn-browse:3072
+#: mtn-browse:3446
msgid ""
"Your version of Monotone does not support\n"
"suspend certificates. I will adjusted your\n"
"preferences accordingly."
msgstr ""
-#: mtn-browse:3090 lib/perl/Common.pm:1382 lib/perl/Preferences.pm:270
-msgid "Your preferences could not be saved:\n"
-msgstr ""
-
-#: mtn-browse:3131
+#: mtn-browse:3540
msgid ""
"The Monotone database is currently locked, please\n"
"dismiss this dialog when this is no longer the case."
msgstr ""
-#: mtn-browse:3171
+#: mtn-browse:3580
#, perl-brace-format
msgid ""
-"Problem with monotone request, got:\n"
+"Problem with Monotone request, got:\n"
"{error_message}\n"
"This should not be happening!"
msgstr ""
-#: mtn-browse:3188
+#: mtn-browse:3597
#, perl-brace-format
msgid ""
-"Monotone process unexpectedly exiting with:\n"
+"The Monotone subprocess unexpectedly exited with:\n"
"{error_message}\n"
"This is fatal, I am going to exit."
msgstr ""
-#: mtn-browse:3239
+#: mtn-browse:3648
#, perl-brace-format
msgid "terminated by signal {number}"
msgstr ""
-#: mtn-browse:3245
+#: mtn-browse:3654
#, perl-brace-format
msgid "exited with status {number}"
msgstr ""
-#: mtn-browse:3253
+#: mtn-browse:3662
#, perl-brace-format
msgid ""
-"The mtn subprocess just unexpectedly\n"
+"The Monotone subprocess just unexpectedly\n"
"exited ({error_message}).\n"
"This should not be happening!\n"
"It will be restarted when needed."
msgstr ""
-#: mtn-browse:3268
+#: mtn-browse:3677
#, perl-brace-format
msgid "waitpid failed: {error_message}"
msgstr ""
-#: mtn-browse:3298
+#: mtn-browse:3707
#, perl-brace-format
msgid "pipe failed: {error_message}"
msgstr ""
-#: lib/perl/AdvancedFind.pm:309
+#: lib/perl/AdvancedFind.pm:319
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:311 lib/perl/AdvancedFind.pm:669
+#: lib/perl/AdvancedFind.pm:321 lib/perl/AdvancedFind.pm:689
msgid "Branch"
msgstr ""
-#: lib/perl/AdvancedFind.pm:313 lib/perl/AdvancedFind.pm:333
+#: lib/perl/AdvancedFind.pm:323 lib/perl/AdvancedFind.pm:343
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:315
+#: lib/perl/AdvancedFind.pm:325
msgid "Cert"
msgstr ""
-#: lib/perl/AdvancedFind.pm:317
+#: lib/perl/AdvancedFind.pm:327
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:319
+#: lib/perl/AdvancedFind.pm:329
msgid "Date (=)"
msgstr ""
-#: lib/perl/AdvancedFind.pm:323
+#: lib/perl/AdvancedFind.pm:333
msgid "Date (<=)"
msgstr ""
-#: lib/perl/AdvancedFind.pm:327
+#: lib/perl/AdvancedFind.pm:337
msgid "Date (>)"
msgstr ""
-#: lib/perl/AdvancedFind.pm:331
+#: lib/perl/AdvancedFind.pm:341
msgid "Head Revision"
msgstr ""
-#: lib/perl/AdvancedFind.pm:335
+#: lib/perl/AdvancedFind.pm:345
msgid "Identifier"
msgstr ""
-#: lib/perl/AdvancedFind.pm:337 lib/perl/AdvancedFind.pm:349
+#: lib/perl/AdvancedFind.pm:347 lib/perl/AdvancedFind.pm:359
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:339 lib/perl/AdvancedFind.pm:407
+#: lib/perl/AdvancedFind.pm:349 lib/perl/AdvancedFind.pm:417
msgid "Logical And"
msgstr ""
-#: lib/perl/AdvancedFind.pm:343 lib/perl/AdvancedFind.pm:633
+#: lib/perl/AdvancedFind.pm:353 lib/perl/AdvancedFind.pm:653
msgid "Message"
msgstr ""
-#: lib/perl/AdvancedFind.pm:345
+#: lib/perl/AdvancedFind.pm:355
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:347 lib/perl/AdvancedFind.pm:635
+#: lib/perl/AdvancedFind.pm:357 lib/perl/AdvancedFind.pm:655
msgid "Parent"
msgstr ""
-#: lib/perl/AdvancedFind.pm:351
+#: lib/perl/AdvancedFind.pm:361
msgid "Tag"
msgstr ""
-#: lib/perl/AdvancedFind.pm:353
+#: lib/perl/AdvancedFind.pm:363
msgid ""
msgstr ""
-#: lib/perl/AdvancedFind.pm:401 lib/perl/AdvancedFind.pm:679
+#: lib/perl/AdvancedFind.pm:411 lib/perl/AdvancedFind.pm:699
msgid "Date"
msgstr ""
-#: lib/perl/AdvancedFind.pm:657
+#: lib/perl/AdvancedFind.pm:677
msgid "Revision Id"
msgstr ""
-#: lib/perl/AdvancedFind.pm:730
+#: lib/perl/AdvancedFind.pm:753
msgid "mtnb-mcqc-simple-queries"
msgstr ""
-#: lib/perl/AdvancedFind.pm:732
+#: lib/perl/AdvancedFind.pm:755
msgid "mtnb-mcqc-helper-tools"
msgstr ""
-#: lib/perl/AdvancedFind.pm:734
+#: lib/perl/AdvancedFind.pm:757
msgid "mtnb-mcqc-the-advanced-find-dialog-window"
msgstr ""
-#: lib/perl/AdvancedFind.pm:955
+#: lib/perl/AdvancedFind.pm:984
msgid "Finding revisions"
msgstr ""
-#: lib/perl/AdvancedFind.pm:987
+#: lib/perl/AdvancedFind.pm:1016
#, perl-brace-format
msgid ""
"There is a problem with your query, Monotone gave:\n"
"{error_message}"
msgstr ""
-#: lib/perl/AdvancedFind.pm:1015
+#: lib/perl/AdvancedFind.pm:1045
msgid "No revisions matched your query."
msgstr ""
-#: lib/perl/AdvancedFind.pm:1033
+#: lib/perl/AdvancedFind.pm:1063
msgid "Populating revision details"
msgstr ""
-#: lib/perl/AdvancedFind.pm:1207
+#: lib/perl/AdvancedFind.pm:1237
#, perl-brace-format
msgid "Found 1 revision"
msgid_plural "Found {revisions_found} revisions"
msgstr[0] ""
msgstr[1] ""
-#: lib/perl/AdvancedFind.pm:1214 lib/perl/FindFiles.pm:660
+#: lib/perl/AdvancedFind.pm:1244 lib/perl/FindFiles.pm:660
msgid "Nothing found"
msgstr ""
@@ -390,66 +425,66 @@ msgstr ""
msgid "Annotating file"
msgstr ""
-#: lib/perl/Annotate.pm:150
+#: lib/perl/Annotate.pm:152
msgid "Formatting and displaying annotated file"
msgstr ""
-#: lib/perl/Annotate.pm:296
+#: lib/perl/Annotate.pm:298
msgid "Display Change _Log"
msgstr ""
-#: lib/perl/Annotate.pm:314
+#: lib/perl/Annotate.pm:316
msgid "Displaying change log"
msgstr ""
-#: lib/perl/Annotate.pm:320
+#: lib/perl/Annotate.pm:322
msgid "Display File _History"
msgstr ""
-#: lib/perl/Annotate.pm:344 lib/perl/History.pm:386
+#: lib/perl/Annotate.pm:346 lib/perl/History.pm:389
msgid "Displaying file history"
msgstr ""
-#: lib/perl/Annotate.pm:350
+#: lib/perl/Annotate.pm:352
msgid "Display _Revision History"
msgstr ""
-#: lib/perl/Annotate.pm:368 lib/perl/History.pm:178
+#: lib/perl/Annotate.pm:370 lib/perl/History.pm:181
msgid "Displaying revision history"
msgstr ""
-#: lib/perl/Annotate.pm:379
+#: lib/perl/Annotate.pm:381
msgid "Compare File With Previous _Version"
msgstr ""
-#: lib/perl/Annotate.pm:395
+#: lib/perl/Annotate.pm:397
msgid "Doing file comparison"
msgstr ""
-#: lib/perl/Annotate.pm:402
+#: lib/perl/Annotate.pm:404
msgid "Compare Revision _With Parent"
msgstr ""
-#: lib/perl/Annotate.pm:418
+#: lib/perl/Annotate.pm:420
msgid "Doing revision comparison"
msgstr ""
-#: lib/perl/Annotate.pm:474
+#: lib/perl/Annotate.pm:476
msgid "Cannot access unique revision id."
msgstr ""
-#: lib/perl/Annotate.pm:536
+#: lib/perl/Annotate.pm:538
msgid ""
"The selected revision has more than one parent.\n"
"I will display the file's history so you can select\n"
"the specific parent revision."
msgstr ""
-#: lib/perl/Annotate.pm:553 lib/perl/Annotate.pm:670
+#: lib/perl/Annotate.pm:555 lib/perl/Annotate.pm:672
msgid "The selected revision has no parents."
msgstr ""
-#: lib/perl/Annotate.pm:568
+#: lib/perl/Annotate.pm:570
msgid ""
"The current version of the file probably\n"
"resulted from a merge as it is directly\n"
@@ -458,22 +493,22 @@ msgstr ""
"can select the specific parent revision."
msgstr ""
-#: lib/perl/Annotate.pm:587
+#: lib/perl/Annotate.pm:589
msgid "The selected file version has no ancestors."
msgstr ""
-#: lib/perl/Annotate.pm:655
+#: lib/perl/Annotate.pm:657
msgid ""
"The selected revision has more than one parent.\n"
"I will display the revision's history so you can select\n"
"the specific parent revision."
msgstr ""
-#: lib/perl/Annotate.pm:760
+#: lib/perl/Annotate.pm:762
msgid "mtnb-lachc-the-annotated-listing-window"
msgstr ""
-#: lib/perl/Annotate.pm:838
+#: lib/perl/Annotate.pm:841
#, perl-brace-format
msgid ""
"Problem running mtn annotate, got:\n"
@@ -560,12 +595,12 @@ msgstr ""
msgid "Invalid {name} name `{value}'"
msgstr ""
-#: lib/perl/Common.pm:201
+#: lib/perl/Common.pm:206
#, perl-brace-format
msgid "open3 failed: {error_message}"
msgstr ""
-#: lib/perl/Common.pm:215
+#: lib/perl/Common.pm:220
#, perl-brace-format
msgid ""
"The {name} subprocess could not start,\n"
@@ -573,7 +608,7 @@ msgstr ""
"{error_message}"
msgstr ""
-#: lib/perl/Common.pm:300
+#: lib/perl/Common.pm:316
#, perl-brace-format
msgid ""
"The {name} subprocess failed with an exit status\n"
@@ -581,52 +616,55 @@ msgstr ""
"{error_message}"
msgstr ""
-#: lib/perl/Common.pm:320
+#: lib/perl/Common.pm:337
#, perl-brace-format
msgid "The {name} subprocess was terminated by signal {number}."
msgstr ""
-#: lib/perl/Common.pm:371
+#: lib/perl/Common.pm:389
#, perl-brace-format
msgid ""
"waitpid failed with:\n"
"{error_message}"
msgstr ""
-#: lib/perl/Common.pm:495
+#: lib/perl/Common.pm:513
msgid "Open Database"
msgstr ""
-#: lib/perl/Common.pm:555
-msgid "Not a valid Monotone database."
+#: lib/perl/Common.pm:574
+#, perl-brace-format
+msgid ""
+"There is a problem opening the database, the details are:\n"
+"{error_message}"
msgstr ""
-#: lib/perl/Common.pm:615
+#: lib/perl/Common.pm:646
msgid "Save As"
msgstr ""
-#: lib/perl/Common.pm:646
+#: lib/perl/Common.pm:677
msgid ""
"File already exists.\n"
"Do you want to replace it?"
msgstr ""
-#: lib/perl/Common.pm:647
+#: lib/perl/Common.pm:678
msgid "Confirm"
msgstr ""
-#: lib/perl/Common.pm:758
+#: lib/perl/Common.pm:789
msgid "Select As Search Column"
msgstr ""
-#: lib/perl/Common.pm:1306
+#: lib/perl/Common.pm:1337
#, perl-brace-format
msgid ""
"The program `{program_name}' cannot be found.\n"
"Is it installed?"
msgstr ""
-#: lib/perl/Common.pm:1464
+#: lib/perl/Common.pm:1495
msgid ""
"The requested help section\n"
"cannot be found or is not known."
@@ -652,45 +690,45 @@ msgstr ""
msgid "No files matched your query."
msgstr ""
-#: lib/perl/FindFiles.pm:999 lib/perl/FindFiles.pm:1001
-#: lib/perl/FindFiles.pm:1003
+#: lib/perl/FindFiles.pm:1004 lib/perl/FindFiles.pm:1006
+#: lib/perl/FindFiles.pm:1008
msgid "mtnb-ffwarc-query-fields"
msgstr ""
-#: lib/perl/FindFiles.pm:1005
+#: lib/perl/FindFiles.pm:1010
msgid "mtnb-ffwarc-query-buttons"
msgstr ""
-#: lib/perl/FindFiles.pm:1007
+#: lib/perl/FindFiles.pm:1012
msgid "mtnb-ffwarc-the-find-files-window"
msgstr ""
-#: lib/perl/FindFiles.pm:1084 lib/perl/Preferences.pm:874
+#: lib/perl/FindFiles.pm:1089 lib/perl/Preferences.pm:876
#, perl-brace-format
msgid ""
"`{pattern}' is an invalid\n"
"file name pattern."
msgstr ""
-#: lib/perl/FindFiles.pm:1107 lib/perl/FindText.pm:399
+#: lib/perl/FindFiles.pm:1112 lib/perl/FindText.pm:399
#, perl-brace-format
msgid ""
"`{pattern}' is an invalid\n"
"content search pattern."
msgstr ""
-#: lib/perl/FindFiles.pm:1125
+#: lib/perl/FindFiles.pm:1130
msgid ""
"The `between' dates are either\n"
"the same or the wrong way round."
msgstr ""
-#: lib/perl/FindFiles.pm:1145
+#: lib/perl/FindFiles.pm:1150
#, perl-brace-format
msgid "A duration of {months} months is too long."
msgstr ""
-#: lib/perl/FindFiles.pm:1159
+#: lib/perl/FindFiles.pm:1164
#, perl-brace-format
msgid "A duration of {years} years is too long."
msgstr ""
@@ -766,62 +804,62 @@ msgstr ""
"as the first revision"
msgstr ""
-#: lib/perl/History.pm:141
+#: lib/perl/History.pm:144
#, perl-brace-format
msgid "Revision History For {rev}"
msgstr ""
-#: lib/perl/History.pm:144
+#: lib/perl/History.pm:147
msgid "Revision History"
msgstr ""
-#: lib/perl/History.pm:165 lib/perl/History.pm:374
+#: lib/perl/History.pm:168 lib/perl/History.pm:377
msgid "Sorting revision list"
msgstr ""
-#: lib/perl/History.pm:345
+#: lib/perl/History.pm:348
#, perl-brace-format
msgid "File History For {file}"
msgstr ""
-#: lib/perl/History.pm:347
+#: lib/perl/History.pm:350
msgid "File History"
msgstr ""
-#: lib/perl/History.pm:545
+#: lib/perl/History.pm:548
#, perl-brace-format
msgid "Differences Between Revisions {rev_1} and {rev_2}"
msgstr ""
-#: lib/perl/History.pm:551
+#: lib/perl/History.pm:554
msgid "File Comparison"
msgstr ""
-#: lib/perl/History.pm:556
+#: lib/perl/History.pm:559
msgid "Revision Comparison"
msgstr ""
-#: lib/perl/History.pm:571
+#: lib/perl/History.pm:576
msgid "Calculating differences"
msgstr ""
-#: lib/perl/History.pm:648
+#: lib/perl/History.pm:695
msgid "Formatting and displaying differences"
msgstr ""
-#: lib/perl/History.pm:812
+#: lib/perl/History.pm:859
msgid "Displaying differences"
msgstr ""
-#: lib/perl/History.pm:911
+#: lib/perl/History.pm:963
msgid "Populating file list"
msgstr ""
-#: lib/perl/History.pm:918
+#: lib/perl/History.pm:970
msgid "Summary"
msgstr ""
-#: lib/perl/History.pm:1017
+#: lib/perl/History.pm:1069
msgid ""
"The name of the selected file has changed\n"
"between the two selected revisions and cannot\n"
@@ -829,65 +867,73 @@ msgstr ""
"the comparison using the external helper application?"
msgstr ""
-#: lib/perl/History.pm:1021
+#: lib/perl/History.pm:1073
msgid "External Comparison"
msgstr ""
-#: lib/perl/History.pm:1062
+#: lib/perl/History.pm:1114
msgid ""
"The file contents cannot be\n"
"found in the selected revisions.\n"
"This should not be happening."
msgstr ""
-#: lib/perl/History.pm:1425
+#: lib/perl/History.pm:1582
msgid "unified_diff.patch"
msgstr ""
-#: lib/perl/History.pm:1585 lib/perl/History.pm:1587
+#: lib/perl/History.pm:1742 lib/perl/History.pm:1744
msgid "mtnb-lachc-history-buttons"
msgstr ""
-#: lib/perl/History.pm:1589
+#: lib/perl/History.pm:1746
msgid "mtnb-lachc-the-revision-and-file-history-windows"
msgstr ""
-#: lib/perl/History.pm:1852 lib/perl/History.pm:1859
+#: lib/perl/History.pm:1984 lib/perl/History.pm:1987 lib/perl/History.pm:1990
+msgid "mtnb-lachc-compare-arbitrary-revisions-buttons"
+msgstr ""
+
+#: lib/perl/History.pm:1993
+msgid "mtnb-lachc-the-compare-arbitrary-revisions-window"
+msgstr ""
+
+#: lib/perl/History.pm:2145 lib/perl/History.pm:2152
msgid "Revision Change Log"
msgstr ""
-#: lib/perl/History.pm:1865
+#: lib/perl/History.pm:2158
msgid "- Revision Change Log"
msgstr ""
-#: lib/perl/History.pm:1867
+#: lib/perl/History.pm:2160
msgid "+ Revision Change Log"
msgstr ""
-#: lib/perl/History.pm:1879 lib/perl/History.pm:1881
+#: lib/perl/History.pm:2172 lib/perl/History.pm:2174
msgid "mtnb-lachc-differences-buttons"
msgstr ""
-#: lib/perl/History.pm:1883
+#: lib/perl/History.pm:2176
msgid "mtnb-lachc-the-differences-window"
msgstr ""
-#: lib/perl/History.pm:1961
+#: lib/perl/History.pm:2254
msgid ""
"Cannot call the external helper application\n"
"to do the comparison as one has not been\n"
"specified in the user's preferences."
msgstr ""
-#: lib/perl/History.pm:1975
+#: lib/perl/History.pm:2268
msgid "OLDER_"
msgstr ""
-#: lib/perl/History.pm:1978
+#: lib/perl/History.pm:2271
msgid "NEWER_"
msgstr ""
-#: lib/perl/History.pm:2094
+#: lib/perl/History.pm:2398
#, perl-brace-format
msgid ""
"Problem running mtn diff, got:\n"
@@ -895,78 +941,96 @@ msgstr ""
"This should not be happening!"
msgstr ""
-#: lib/perl/Preferences.pm:211
+#: lib/perl/ManageServerBookmarks.pm:223
+#, perl-brace-format
+msgid ""
+"`{server}' is an invalid server\n"
+"name ([:port] is expected)."
+msgstr ""
+
+#: lib/perl/ManageServerBookmarks.pm:240
+#, perl-brace-format
+msgid ""
+"`{server}' is already entered\n"
+"into your bookmarks list."
+msgstr ""
+
+#: lib/perl/ManageServerBookmarks.pm:427
+msgid "mtnb-upc-the-manage-server-bookmarks-dialog-window"
+msgstr ""
+
+#: lib/perl/Preferences.pm:212
msgid "The preferences dialog cannot be displayed:\n"
msgstr ""
-#: lib/perl/Preferences.pm:320
+#: lib/perl/Preferences.pm:323
#, perl-brace-format
msgid "Invalid user preferences file: {error_message}\n"
msgstr ""
-#: lib/perl/Preferences.pm:324
+#: lib/perl/Preferences.pm:327
#, perl-brace-format
msgid "Preferences file, `{file_name}',\n"
msgstr ""
-#: lib/perl/Preferences.pm:325
+#: lib/perl/Preferences.pm:328
msgid "is corrupt, please remove it.\n"
msgstr ""
-#: lib/perl/Preferences.pm:372
+#: lib/perl/Preferences.pm:375
msgid "# DO NOT EDIT! This is an automatically generated file.\n"
msgstr ""
-#: lib/perl/Preferences.pm:373
+#: lib/perl/Preferences.pm:376
msgid "# Changes to this file may be lost or cause "
msgstr ""
-#: lib/perl/Preferences.pm:374
+#: lib/perl/Preferences.pm:377
msgid "mtn-browse to malfunction.\n"
msgstr ""
-#: lib/perl/Preferences.pm:671
+#: lib/perl/Preferences.pm:670
#, perl-brace-format
msgid ""
"`{mime_type}' does not\n"
"look like a valid MIME type."
msgstr ""
-#: lib/perl/Preferences.pm:695
+#: lib/perl/Preferences.pm:694
#, perl-brace-format
msgid "`{mime_type}' is already listed."
msgstr ""
-#: lib/perl/Preferences.pm:898
+#: lib/perl/Preferences.pm:900
#, perl-brace-format
msgid ""
"`{pattern}' is already used in MIME type\n"
"`{mime_type}'."
msgstr ""
-#: lib/perl/Preferences.pm:1123
+#: lib/perl/Preferences.pm:1125
msgid "MIME Type"
msgstr ""
-#: lib/perl/Preferences.pm:1133
+#: lib/perl/Preferences.pm:1135
msgid "File Name Patterns"
msgstr ""
-#: lib/perl/Preferences.pm:1143
+#: lib/perl/Preferences.pm:1145
msgid "Helper Application"
msgstr ""
-#: lib/perl/Preferences.pm:1196
+#: lib/perl/Preferences.pm:1251
msgid "mtnb-upc-the-preferences-dialog-window"
msgstr ""
-#: lib/perl/Preferences.pm:1606
+#: lib/perl/Preferences.pm:1707
msgid ""
"The external file comparison application field is\n"
"invalid, please correct before attempting to resave."
msgstr ""
-#: lib/perl/Preferences.pm:1724
+#: lib/perl/Preferences.pm:1830
msgid "Cannot load system MIME types.\n"
msgstr ""
@@ -982,288 +1046,304 @@ msgstr ""
msgid "New _Blank"
msgstr ""
-#: lib/ui/mtn-browse.glade:105
+#: lib/ui/mtn-browse.glade:91
+msgid "Connect To _Server"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:125
msgid "_Quit"
msgstr ""
-#: lib/ui/mtn-browse.glade:158
+#: lib/ui/mtn-browse.glade:178
+msgid "File Encoding"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:190
+msgid "_Tools"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:199
+msgid "_Compare Arbitrary Revisions"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:220
msgid "_Help Contents"
msgstr ""
-#: lib/ui/mtn-browse.glade:180
+#: lib/ui/mtn-browse.glade:242
msgid "Help On _Window"
msgstr ""
-#: lib/ui/mtn-browse.glade:202
+#: lib/ui/mtn-browse.glade:264
msgid "_Context Help"
msgstr ""
-#: lib/ui/mtn-browse.glade:230
+#: lib/ui/mtn-browse.glade:292
msgid "_Home Page"
msgstr ""
-#: lib/ui/mtn-browse.glade:293
+#: lib/ui/mtn-browse.glade:355
msgid "New browser window"
msgstr ""
-#: lib/ui/mtn-browse.glade:322
+#: lib/ui/mtn-browse.glade:384
msgid "Open a database"
msgstr ""
-#: lib/ui/mtn-browse.glade:338
+#: lib/ui/mtn-browse.glade:400
msgid "Close the current database"
msgstr ""
-#: lib/ui/mtn-browse.glade:367
+#: lib/ui/mtn-browse.glade:429
msgid "Reload the current database"
msgstr ""
-#: lib/ui/mtn-browse.glade:368
+#: lib/ui/mtn-browse.glade:430
msgid "Reload"
msgstr ""
-#: lib/ui/mtn-browse.glade:398
+#: lib/ui/mtn-browse.glade:460
msgid "User preferences"
msgstr ""
-#: lib/ui/mtn-browse.glade:414
+#: lib/ui/mtn-browse.glade:476
msgid "Display help contents page"
msgstr ""
-#: lib/ui/mtn-browse.glade:474 lib/ui/mtn-browse.glade:2347
+#: lib/ui/mtn-browse.glade:536 lib/ui/mtn-browse.glade:2408
msgid "Project branch to access"
msgstr ""
-#: lib/ui/mtn-browse.glade:481 lib/ui/mtn-browse.glade:2354
+#: lib/ui/mtn-browse.glade:543 lib/ui/mtn-browse.glade:2415
msgid "Branch:"
msgstr ""
-#: lib/ui/mtn-browse.glade:533 lib/ui/mtn-browse.glade:2406
+#: lib/ui/mtn-browse.glade:595 lib/ui/mtn-browse.glade:2467
msgid "Revision within project to access"
msgstr ""
-#: lib/ui/mtn-browse.glade:540 lib/ui/mtn-browse.glade:2413
+#: lib/ui/mtn-browse.glade:602 lib/ui/mtn-browse.glade:2474
msgid " Revision:"
msgstr ""
-#: lib/ui/mtn-browse.glade:592 lib/ui/mtn-browse.glade:2465
+#: lib/ui/mtn-browse.glade:654 lib/ui/mtn-browse.glade:2526
msgid ""
"Select this if only those revisions\n"
"that have been tagged on the\n"
"current branch are to be listed"
msgstr ""
-#: lib/ui/mtn-browse.glade:596 lib/ui/mtn-browse.glade:2469
+#: lib/ui/mtn-browse.glade:658 lib/ui/mtn-browse.glade:2530
msgid "Tagged"
msgstr ""
-#: lib/ui/mtn-browse.glade:621
+#: lib/ui/mtn-browse.glade:683
msgid ""
"Use more advanced selection\n"
-"criteria for selecting a revision"
+"criteria for choosing a revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:650
+#: lib/ui/mtn-browse.glade:712
msgid ""
"View revision history\n"
"in Monotone-Viz"
msgstr ""
-#: lib/ui/mtn-browse.glade:678
+#: lib/ui/mtn-browse.glade:740
msgid "View revision's change history"
msgstr ""
-#: lib/ui/mtn-browse.glade:706
+#: lib/ui/mtn-browse.glade:768
msgid "View revision's change log"
msgstr ""
-#: lib/ui/mtn-browse.glade:745
+#: lib/ui/mtn-browse.glade:807
msgid "View"
msgstr ""
-#: lib/ui/mtn-browse.glade:809
+#: lib/ui/mtn-browse.glade:871
msgid "Directory to be viewed"
msgstr ""
-#: lib/ui/mtn-browse.glade:816
+#: lib/ui/mtn-browse.glade:878
msgid "Directory:"
msgstr ""
-#: lib/ui/mtn-browse.glade:875
+#: lib/ui/mtn-browse.glade:937
msgid "Go up one directory level"
msgstr ""
-#: lib/ui/mtn-browse.glade:903
+#: lib/ui/mtn-browse.glade:965
msgid ""
"Find files based on one\n"
"or more search criteria"
msgstr ""
-#: lib/ui/mtn-browse.glade:979
+#: lib/ui/mtn-browse.glade:1040
msgid "Revision Browser"
msgstr ""
-#: lib/ui/mtn-browse.glade:1167
+#: lib/ui/mtn-browse.glade:1228
msgid "Name of file being displayed"
msgstr ""
-#: lib/ui/mtn-browse.glade:1174
+#: lib/ui/mtn-browse.glade:1235
msgid "File:"
msgstr ""
-#: lib/ui/mtn-browse.glade:1200
+#: lib/ui/mtn-browse.glade:1261
msgid ""
"Time when the displayed file was last\n"
"updated with respect to this revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:1208 lib/ui/mtn-browse.glade:9057
+#: lib/ui/mtn-browse.glade:1269 lib/ui/mtn-browse.glade:9113
msgid "Last update:"
msgstr ""
-#: lib/ui/mtn-browse.glade:1372
+#: lib/ui/mtn-browse.glade:1433
msgid "Author of the file revision being displayed"
msgstr ""
-#: lib/ui/mtn-browse.glade:1379 lib/ui/mtn-browse.glade:1902
-#: lib/ui/mtn-browse.glade:9023
+#: lib/ui/mtn-browse.glade:1440 lib/ui/mtn-browse.glade:1963
+#: lib/ui/mtn-browse.glade:9079
msgid "Author:"
msgstr ""
-#: lib/ui/mtn-browse.glade:1405
+#: lib/ui/mtn-browse.glade:1466
msgid ""
"Revision id in which the displayed file was\n"
"last updated with respect to this revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:1413 lib/ui/mtn-browse.glade:9265
+#: lib/ui/mtn-browse.glade:1474 lib/ui/mtn-browse.glade:9321
msgid "Revision id:"
msgstr ""
-#: lib/ui/mtn-browse.glade:1485
+#: lib/ui/mtn-browse.glade:1546
msgid ""
"Toggle the showing\n"
"of line numbers"
msgstr ""
-#: lib/ui/mtn-browse.glade:1516
+#: lib/ui/mtn-browse.glade:1577
msgid "Search text"
msgstr ""
-#: lib/ui/mtn-browse.glade:1544
+#: lib/ui/mtn-browse.glade:1605
msgid "Save file contents to disk"
msgstr ""
-#: lib/ui/mtn-browse.glade:1572
+#: lib/ui/mtn-browse.glade:1633
msgid ""
"Load file contents\n"
"into a viewer"
msgstr ""
-#: lib/ui/mtn-browse.glade:1600
+#: lib/ui/mtn-browse.glade:1661
msgid "Annotate file contents"
msgstr ""
-#: lib/ui/mtn-browse.glade:1627
+#: lib/ui/mtn-browse.glade:1688
msgid "View file's change history"
msgstr ""
-#: lib/ui/mtn-browse.glade:1673
+#: lib/ui/mtn-browse.glade:1734
msgid "File Viewer"
msgstr ""
-#: lib/ui/mtn-browse.glade:1862
+#: lib/ui/mtn-browse.glade:1923
msgid "Name of the database being accessed"
msgstr ""
-#: lib/ui/mtn-browse.glade:1869
+#: lib/ui/mtn-browse.glade:1930
msgid "Database:"
msgstr ""
-#: lib/ui/mtn-browse.glade:1895
+#: lib/ui/mtn-browse.glade:1956
msgid "Author of the currently selected revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:2066
+#: lib/ui/mtn-browse.glade:2127
msgid "Date of the currently selected revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:2073
+#: lib/ui/mtn-browse.glade:2134
msgid "Date:"
msgstr ""
-#: lib/ui/mtn-browse.glade:2099
+#: lib/ui/mtn-browse.glade:2160
msgid "Change log for the currently selected revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:2106
+#: lib/ui/mtn-browse.glade:2167
msgid "Change log:"
msgstr ""
-#: lib/ui/mtn-browse.glade:2143 lib/ui/mtn-browse.glade:2984
+#: lib/ui/mtn-browse.glade:2204 lib/ui/mtn-browse.glade:3044
msgid "Details"
msgstr ""
-#: lib/ui/mtn-browse.glade:2190 lib/ui/mtn-browse.glade:9428
+#: lib/ui/mtn-browse.glade:2251 lib/ui/mtn-browse.glade:9484
msgid "Advanced Find"
msgstr ""
-#: lib/ui/mtn-browse.glade:2247
+#: lib/ui/mtn-browse.glade:2308
msgid ""
"Select Simple Query you you just want to manually\n"
"select the branch and revision from drop down lists"
msgstr ""
-#: lib/ui/mtn-browse.glade:2250
+#: lib/ui/mtn-browse.glade:2311
msgid "Simple query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2269
+#: lib/ui/mtn-browse.glade:2330
msgid ""
"Select Advanced Query if you want to\n"
"specify very specific selection critia"
msgstr ""
-#: lib/ui/mtn-browse.glade:2272
+#: lib/ui/mtn-browse.glade:2333
msgid "Advanced query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2295
+#: lib/ui/mtn-browse.glade:2356
msgid "Mode"
msgstr ""
-#: lib/ui/mtn-browse.glade:2492
+#: lib/ui/mtn-browse.glade:2553
msgid "Simply Query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2550
+#: lib/ui/mtn-browse.glade:2611
msgid ""
"Enter an advanced Monotone selection query - \n"
"you can use the helper tools directly below this\n"
"entry field if you cannot remember the syntax"
msgstr ""
-#: lib/ui/mtn-browse.glade:2559
+#: lib/ui/mtn-browse.glade:2620
msgid "Search term:"
msgstr ""
-#: lib/ui/mtn-browse.glade:2617
+#: lib/ui/mtn-browse.glade:2678
msgid "Execute the query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2646
+#: lib/ui/mtn-browse.glade:2707
msgid "Stop the query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2693
+#: lib/ui/mtn-browse.glade:2754
msgid "Enter the current selector into the query above"
msgstr ""
-#: lib/ui/mtn-browse.glade:2721
+#: lib/ui/mtn-browse.glade:2782
msgid "The type of selector that is to be inserted above"
msgstr ""
-#: lib/ui/mtn-browse.glade:2728
+#: lib/ui/mtn-browse.glade:2789
msgid ""
"Author\n"
"Branch\n"
@@ -1279,215 +1359,209 @@ msgstr ""
"Tag"
msgstr ""
-#: lib/ui/mtn-browse.glade:2754
+#: lib/ui/mtn-browse.glade:2815
msgid "Enter any arguments here"
msgstr ""
-#: lib/ui/mtn-browse.glade:2783
+#: lib/ui/mtn-browse.glade:2844
msgid "Use this to specify the date for date based selectors"
msgstr ""
-#: lib/ui/mtn-browse.glade:2826
+#: lib/ui/mtn-browse.glade:2887
msgid "Advanced Query"
msgstr ""
-#: lib/ui/mtn-browse.glade:2904
+#: lib/ui/mtn-browse.glade:2964
msgid "Revisions"
msgstr ""
-#: lib/ui/mtn-browse.glade:3199
+#: lib/ui/mtn-browse.glade:3259
msgid "Change Log"
msgstr ""
-#: lib/ui/mtn-browse.glade:3391
+#: lib/ui/mtn-browse.glade:3451
msgid "Number of revisions listed"
msgstr ""
-#: lib/ui/mtn-browse.glade:3398
+#: lib/ui/mtn-browse.glade:3458
msgid "Number of revisions:"
msgstr ""
-#: lib/ui/mtn-browse.glade:3432
+#: lib/ui/mtn-browse.glade:3492
msgid "Stop gathering history details"
msgstr ""
-#: lib/ui/mtn-browse.glade:3550
-msgid "File id of the first file that is to be compared"
-msgstr ""
-
-#: lib/ui/mtn-browse.glade:3612
-msgid "File id of the second file that is to be compared"
-msgstr ""
-
-#: lib/ui/mtn-browse.glade:3655
+#: lib/ui/mtn-browse.glade:3713 lib/ui/mtn-browse.glade:9980
msgid ""
-"Revision id of the first selected\n"
-"file version that is to be compared"
+"The first of two revision ids\n"
+"selected for comparison"
msgstr ""
-#: lib/ui/mtn-browse.glade:3663
+#: lib/ui/mtn-browse.glade:3721 lib/ui/mtn-browse.glade:9988
msgid "First revision id:"
msgstr ""
-#: lib/ui/mtn-browse.glade:3689
+#: lib/ui/mtn-browse.glade:3747 lib/ui/mtn-browse.glade:10014
msgid ""
-"Revision id of the second selected\n"
-"file version that is to be compared"
+"The second of two revision\n"
+"ids selected for comparison"
msgstr ""
-#: lib/ui/mtn-browse.glade:3697
+#: lib/ui/mtn-browse.glade:3755 lib/ui/mtn-browse.glade:10022
msgid "Second revision id:"
msgstr ""
-#: lib/ui/mtn-browse.glade:3740
-msgid "Compare the two selected files"
+#: lib/ui/mtn-browse.glade:3798
+msgid ""
+"Compare the two selected\n"
+"revisions or files"
msgstr ""
-#: lib/ui/mtn-browse.glade:3781
+#: lib/ui/mtn-browse.glade:3840 lib/ui/mtn-browse.glade:10236
msgid "Compare"
msgstr ""
-#: lib/ui/mtn-browse.glade:3886
+#: lib/ui/mtn-browse.glade:3945
msgid "Jump to the selected file"
msgstr ""
-#: lib/ui/mtn-browse.glade:3893
+#: lib/ui/mtn-browse.glade:3952
msgid "Jump to file:"
msgstr ""
-#: lib/ui/mtn-browse.glade:3946
+#: lib/ui/mtn-browse.glade:4005
msgid ""
"Display the differences for the currently\n"
"selected file in an external viewer"
msgstr ""
-#: lib/ui/mtn-browse.glade:3974
+#: lib/ui/mtn-browse.glade:4033
msgid "Save the differences to disk"
msgstr ""
-#: lib/ui/mtn-browse.glade:4003
-msgid "Stop formatting the comparison results"
+#: lib/ui/mtn-browse.glade:4062
+msgid "Stop the comparison"
msgstr ""
-#: lib/ui/mtn-browse.glade:4088
+#: lib/ui/mtn-browse.glade:4147
msgid "View the change log of the older revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:4116
+#: lib/ui/mtn-browse.glade:4175
msgid "View the change log of the younger revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:4277
+#: lib/ui/mtn-browse.glade:4336
msgid "Annotation"
msgstr ""
-#: lib/ui/mtn-browse.glade:4317
+#: lib/ui/mtn-browse.glade:4376
msgid "Find Text"
msgstr ""
-#: lib/ui/mtn-browse.glade:4393
+#: lib/ui/mtn-browse.glade:4452
msgid ""
"Enter the text that is\n"
"to be searched for"
msgstr ""
-#: lib/ui/mtn-browse.glade:4401
+#: lib/ui/mtn-browse.glade:4460
msgid "Search for:"
msgstr ""
-#: lib/ui/mtn-browse.glade:4449 lib/ui/mtn-browse.glade:8057
-#: lib/ui/mtn-browse.glade:8199
+#: lib/ui/mtn-browse.glade:4508 lib/ui/mtn-browse.glade:8114
+#: lib/ui/mtn-browse.glade:8256
msgid ""
"Choose whether searches are\n"
"to be case sensitive or not"
msgstr ""
-#: lib/ui/mtn-browse.glade:4452 lib/ui/mtn-browse.glade:8060
-#: lib/ui/mtn-browse.glade:8202
+#: lib/ui/mtn-browse.glade:4511 lib/ui/mtn-browse.glade:8117
+#: lib/ui/mtn-browse.glade:8259
msgid "Case sensitive"
msgstr ""
-#: lib/ui/mtn-browse.glade:4470
+#: lib/ui/mtn-browse.glade:4529
msgid ""
"Select the direction\n"
"of the search"
msgstr ""
-#: lib/ui/mtn-browse.glade:4473
+#: lib/ui/mtn-browse.glade:4532
msgid "Search backwards"
msgstr ""
-#: lib/ui/mtn-browse.glade:4491 lib/ui/mtn-browse.glade:8220
+#: lib/ui/mtn-browse.glade:4550 lib/ui/mtn-browse.glade:8277
msgid ""
"Use regular expression\n"
"search patterns"
msgstr ""
-#: lib/ui/mtn-browse.glade:4494 lib/ui/mtn-browse.glade:8223
+#: lib/ui/mtn-browse.glade:4553 lib/ui/mtn-browse.glade:8280
msgid "Regular expression"
msgstr ""
-#: lib/ui/mtn-browse.glade:4527
+#: lib/ui/mtn-browse.glade:4586
msgid "Preferences"
msgstr ""
-#: lib/ui/mtn-browse.glade:4652
+#: lib/ui/mtn-browse.glade:4711
msgid ""
"Look for a Monotone\n"
"database to open"
msgstr ""
-#: lib/ui/mtn-browse.glade:4655
+#: lib/ui/mtn-browse.glade:4714
msgid "Browse ..."
msgstr ""
-#: lib/ui/mtn-browse.glade:4674
+#: lib/ui/mtn-browse.glade:4733
msgid ""
"Name of the Monotone database to\n"
"open automatically on startup"
msgstr ""
-#: lib/ui/mtn-browse.glade:4682
+#: lib/ui/mtn-browse.glade:4741
msgid "Database to open:"
msgstr ""
-#: lib/ui/mtn-browse.glade:4708
+#: lib/ui/mtn-browse.glade:4767
msgid ""
"Actions to take when starting up\n"
"inside a Monotone workspace"
msgstr ""
-#: lib/ui/mtn-browse.glade:4716
+#: lib/ui/mtn-browse.glade:4775
msgid "Workspace:"
msgstr ""
-#: lib/ui/mtn-browse.glade:4748
+#: lib/ui/mtn-browse.glade:4807
msgid ""
"Select this if the workspace's database\n"
"is to be opened instead of the named\n"
"database above upon startup"
msgstr ""
-#: lib/ui/mtn-browse.glade:4752
+#: lib/ui/mtn-browse.glade:4811
msgid "Takes precedence"
msgstr ""
-#: lib/ui/mtn-browse.glade:4770
+#: lib/ui/mtn-browse.glade:4829
msgid ""
"Select this if the workspace's branch\n"
"and revision are to be automatically\n"
"loaded into the browser upon startup"
msgstr ""
-#: lib/ui/mtn-browse.glade:4774
+#: lib/ui/mtn-browse.glade:4833
msgid "Auto select branch and revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:4828
+#: lib/ui/mtn-browse.glade:4887
msgid "Startup Defaults"
msgstr ""
-#: lib/ui/mtn-browse.glade:4874
+#: lib/ui/mtn-browse.glade:4933
msgid ""
"Select if the head revision on a branch\n"
"should automatically be loaded into a\n"
@@ -1497,108 +1571,108 @@ msgstr ""
"by their tags)"
msgstr ""
-#: lib/ui/mtn-browse.glade:4881
+#: lib/ui/mtn-browse.glade:4940
msgid "Auto select head revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:4896
+#: lib/ui/mtn-browse.glade:4955
msgid "Revision Selection"
msgstr ""
-#: lib/ui/mtn-browse.glade:4951
+#: lib/ui/mtn-browse.glade:5010
msgid ""
"Settings for controlling the listing of\n"
"tagged revisions in ComboBox menus"
msgstr ""
-#: lib/ui/mtn-browse.glade:4959
+#: lib/ui/mtn-browse.glade:5018
msgid "Tagged lists:"
msgstr ""
-#: lib/ui/mtn-browse.glade:4985
+#: lib/ui/mtn-browse.glade:5044
msgid ""
"The maximum number of tags\n"
"to be displayed (starting from\n"
"the most recent, 0 = unlimited)"
msgstr ""
-#: lib/ui/mtn-browse.glade:4994 lib/ui/mtn-browse.glade:5029
-#: lib/ui/mtn-browse.glade:5261
+#: lib/ui/mtn-browse.glade:5053 lib/ui/mtn-browse.glade:5088
+#: lib/ui/mtn-browse.glade:5320
msgid "Limit to:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5020
+#: lib/ui/mtn-browse.glade:5079
msgid ""
"The maximum number of ids\n"
"to be displayed (starting from\n"
"the most recent, 0 = unlimited)"
msgstr ""
-#: lib/ui/mtn-browse.glade:5055
+#: lib/ui/mtn-browse.glade:5114
msgid ""
"Settings for controlling the listing of\n"
"revision ids in ComboBox menus"
msgstr ""
-#: lib/ui/mtn-browse.glade:5063
+#: lib/ui/mtn-browse.glade:5122
msgid "Id lists:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5095
+#: lib/ui/mtn-browse.glade:5154
msgid ""
"Select Sort chronologically if you\n"
"want the ids to be order on date,\n"
"starting with the newest"
msgstr ""
-#: lib/ui/mtn-browse.glade:5099 lib/ui/mtn-browse.glade:5159
+#: lib/ui/mtn-browse.glade:5158 lib/ui/mtn-browse.glade:5218
msgid "Sort chronologically"
msgstr ""
-#: lib/ui/mtn-browse.glade:5117
+#: lib/ui/mtn-browse.glade:5176
msgid ""
"Select Sort by id if you want the\n"
"tags to be order aphabetically"
msgstr ""
-#: lib/ui/mtn-browse.glade:5120
+#: lib/ui/mtn-browse.glade:5179
msgid "Sort by id"
msgstr ""
-#: lib/ui/mtn-browse.glade:5155
+#: lib/ui/mtn-browse.glade:5214
msgid ""
"Select Sort chronologically if you\n"
"want the tags to be order on date,\n"
"starting with the newest"
msgstr ""
-#: lib/ui/mtn-browse.glade:5177
+#: lib/ui/mtn-browse.glade:5236
msgid ""
"Select Sort by name if you want\n"
"the tags to be order aphabetically"
msgstr ""
-#: lib/ui/mtn-browse.glade:5180
+#: lib/ui/mtn-browse.glade:5239
msgid "Sort by name"
msgstr ""
-#: lib/ui/mtn-browse.glade:5253
+#: lib/ui/mtn-browse.glade:5312
msgid ""
"The maximum number of\n"
"items to store in histories"
msgstr ""
-#: lib/ui/mtn-browse.glade:5287
+#: lib/ui/mtn-browse.glade:5346
msgid ""
"Setting for controlling the amount of\n"
"history stored in ComboBox menus"
msgstr ""
-#: lib/ui/mtn-browse.glade:5295
+#: lib/ui/mtn-browse.glade:5354
msgid "History size:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5349
+#: lib/ui/mtn-browse.glade:5408
msgid ""
"Select this if you do not want the\n"
"branch and revision ComboBox entry\n"
@@ -1607,47 +1681,47 @@ msgstr ""
"with large lists)"
msgstr ""
-#: lib/ui/mtn-browse.glade:5355
+#: lib/ui/mtn-browse.glade:5414
msgid "Static lists"
msgstr ""
-#: lib/ui/mtn-browse.glade:5373
+#: lib/ui/mtn-browse.glade:5432
msgid ""
"Select this if you want feedback in the\n"
"form of special tooltips when typing in\n"
"values into ComboBox entry fields"
msgstr ""
-#: lib/ui/mtn-browse.glade:5377
+#: lib/ui/mtn-browse.glade:5436
msgid "Show tooltips"
msgstr ""
-#: lib/ui/mtn-browse.glade:5404
+#: lib/ui/mtn-browse.glade:5463
msgid ""
"Settings for controlling the behaviour of\n"
"auto-completion in ComboBox entry fields"
msgstr ""
-#: lib/ui/mtn-browse.glade:5412
+#: lib/ui/mtn-browse.glade:5471
msgid "Auto-completion:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5442
+#: lib/ui/mtn-browse.glade:5501
msgid "ComboBox Settings"
msgstr ""
-#: lib/ui/mtn-browse.glade:5500
+#: lib/ui/mtn-browse.glade:5559
msgid ""
"Select this if you want suspended\n"
"revisions and their related branches\n"
"to be displayed"
msgstr ""
-#: lib/ui/mtn-browse.glade:5504
+#: lib/ui/mtn-browse.glade:5563
msgid "Show suspended revisions"
msgstr ""
-#: lib/ui/mtn-browse.glade:5522
+#: lib/ui/mtn-browse.glade:5581
msgid ""
"Select this if you want a file's\n"
"latest modification time and\n"
@@ -1661,50 +1735,50 @@ msgstr ""
"that you are using"
msgstr ""
-#: lib/ui/mtn-browse.glade:5533
+#: lib/ui/mtn-browse.glade:5592
msgid "Detailed file listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:5551
+#: lib/ui/mtn-browse.glade:5610
msgid ""
"Select this if you want all folders\n"
"to be listed before any files"
msgstr ""
-#: lib/ui/mtn-browse.glade:5554
+#: lib/ui/mtn-browse.glade:5613
msgid "Folders come first"
msgstr ""
-#: lib/ui/mtn-browse.glade:5572
+#: lib/ui/mtn-browse.glade:5631
msgid ""
"Select this if you want line numbers\n"
"to be shown in file listings by default"
msgstr ""
-#: lib/ui/mtn-browse.glade:5575
+#: lib/ui/mtn-browse.glade:5634
msgid "Show line numbers"
msgstr ""
-#: lib/ui/mtn-browse.glade:5606
+#: lib/ui/mtn-browse.glade:5665
msgid ""
"The binary threshold, above which\n"
"a file's contents are considered to be\n"
"binary in nature"
msgstr ""
-#: lib/ui/mtn-browse.glade:5615
+#: lib/ui/mtn-browse.glade:5674
msgid "Binary threshold:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5657
+#: lib/ui/mtn-browse.glade:5716
msgid "%"
msgstr ""
-#: lib/ui/mtn-browse.glade:5689
+#: lib/ui/mtn-browse.glade:5748
msgid "Browser Display Options"
msgstr ""
-#: lib/ui/mtn-browse.glade:5735
+#: lib/ui/mtn-browse.glade:5794
msgid ""
"Select this if the search terms used when\n"
"searching lists (invoked by typing Ctrl-F)\n"
@@ -1712,15 +1786,15 @@ msgstr ""
"instead of plain text"
msgstr ""
-#: lib/ui/mtn-browse.glade:5740
+#: lib/ui/mtn-browse.glade:5799
msgid "Search as regular expression"
msgstr ""
-#: lib/ui/mtn-browse.glade:5755
+#: lib/ui/mtn-browse.glade:5814
msgid "List Options"
msgstr ""
-#: lib/ui/mtn-browse.glade:5807
+#: lib/ui/mtn-browse.glade:5866
msgid ""
"Enter a command for displaying\n"
"the differences between two text\n"
@@ -1742,241 +1816,241 @@ msgstr ""
"that referred to by {file2}"
msgstr ""
-#: lib/ui/mtn-browse.glade:5831
+#: lib/ui/mtn-browse.glade:5890
msgid "Application:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5878
+#: lib/ui/mtn-browse.glade:5937
msgid "External File Comparison Application"
msgstr ""
-#: lib/ui/mtn-browse.glade:5910
+#: lib/ui/mtn-browse.glade:5969
msgid "General"
msgstr ""
-#: lib/ui/mtn-browse.glade:5962
+#: lib/ui/mtn-browse.glade:6021
msgid ""
"Select the font used for displaying file\n"
"contents and reports (for best results\n"
"make sure it is mono-spaced)"
msgstr ""
-#: lib/ui/mtn-browse.glade:5971
+#: lib/ui/mtn-browse.glade:6030
msgid "File content/report font:"
msgstr ""
-#: lib/ui/mtn-browse.glade:5995
+#: lib/ui/mtn-browse.glade:6054
msgid "Pick A Font"
msgstr ""
-#: lib/ui/mtn-browse.glade:6016
+#: lib/ui/mtn-browse.glade:6075
msgid "Fonts"
msgstr ""
-#: lib/ui/mtn-browse.glade:6068
+#: lib/ui/mtn-browse.glade:6127
msgid ""
"Select if the toolbar buttons are to\n"
"hide their text labels"
msgstr ""
-#: lib/ui/mtn-browse.glade:6071
+#: lib/ui/mtn-browse.glade:6130
msgid "Hide text"
msgstr ""
-#: lib/ui/mtn-browse.glade:6089
+#: lib/ui/mtn-browse.glade:6148
msgid ""
"Select if the toolbars are to be fixed\n"
"rather than movable"
msgstr ""
-#: lib/ui/mtn-browse.glade:6092
+#: lib/ui/mtn-browse.glade:6151
msgid "Fixed"
msgstr ""
-#: lib/ui/mtn-browse.glade:6114
+#: lib/ui/mtn-browse.glade:6173
msgid "Toolbar Settings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6160
+#: lib/ui/mtn-browse.glade:6219
msgid ""
"Select if comparisons between files\n"
"and revisions are to be highlighted in\n"
"colour instead of plain black text"
msgstr ""
-#: lib/ui/mtn-browse.glade:6164
+#: lib/ui/mtn-browse.glade:6223
msgid "Coloured comparison listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6179
+#: lib/ui/mtn-browse.glade:6238
msgid "File/Revision Comparison"
msgstr ""
-#: lib/ui/mtn-browse.glade:6234
+#: lib/ui/mtn-browse.glade:6293
msgid ""
"The first set of line prefix colours\n"
"used in annotated listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6242
+#: lib/ui/mtn-browse.glade:6301
msgid "Annotation prefix 1:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6268
+#: lib/ui/mtn-browse.glade:6327
msgid ""
"Colour of the first revision\n"
"in comparison listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6276
+#: lib/ui/mtn-browse.glade:6335
msgid "Revision 1:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6302
+#: lib/ui/mtn-browse.glade:6361
msgid ""
"Colour of the second revision\n"
"in comparison listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6310
+#: lib/ui/mtn-browse.glade:6369
msgid "Revision 2:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6336 lib/ui/mtn-browse.glade:6369
-#: lib/ui/mtn-browse.glade:6576 lib/ui/mtn-browse.glade:6779
-#: lib/ui/mtn-browse.glade:6947 lib/ui/mtn-browse.glade:6980
+#: lib/ui/mtn-browse.glade:6395 lib/ui/mtn-browse.glade:6428
+#: lib/ui/mtn-browse.glade:6635 lib/ui/mtn-browse.glade:6838
+#: lib/ui/mtn-browse.glade:7006 lib/ui/mtn-browse.glade:7039
msgid "Text foreground colour"
msgstr ""
-#: lib/ui/mtn-browse.glade:6343 lib/ui/mtn-browse.glade:6376
-#: lib/ui/mtn-browse.glade:6583 lib/ui/mtn-browse.glade:6786
-#: lib/ui/mtn-browse.glade:6954 lib/ui/mtn-browse.glade:6987
+#: lib/ui/mtn-browse.glade:6402 lib/ui/mtn-browse.glade:6435
+#: lib/ui/mtn-browse.glade:6642 lib/ui/mtn-browse.glade:6845
+#: lib/ui/mtn-browse.glade:7013 lib/ui/mtn-browse.glade:7046
msgid "Foreground:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6402 lib/ui/mtn-browse.glade:6435
-#: lib/ui/mtn-browse.glade:6609 lib/ui/mtn-browse.glade:6830
-#: lib/ui/mtn-browse.glade:7013 lib/ui/mtn-browse.glade:7046
+#: lib/ui/mtn-browse.glade:6461 lib/ui/mtn-browse.glade:6494
+#: lib/ui/mtn-browse.glade:6668 lib/ui/mtn-browse.glade:6889
+#: lib/ui/mtn-browse.glade:7072 lib/ui/mtn-browse.glade:7105
msgid "Text background colour"
msgstr ""
-#: lib/ui/mtn-browse.glade:6409 lib/ui/mtn-browse.glade:6442
-#: lib/ui/mtn-browse.glade:6616 lib/ui/mtn-browse.glade:6837
-#: lib/ui/mtn-browse.glade:7020 lib/ui/mtn-browse.glade:7053
+#: lib/ui/mtn-browse.glade:6468 lib/ui/mtn-browse.glade:6501
+#: lib/ui/mtn-browse.glade:6675 lib/ui/mtn-browse.glade:6896
+#: lib/ui/mtn-browse.glade:7079 lib/ui/mtn-browse.glade:7112
msgid "Background:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6470 lib/ui/mtn-browse.glade:6488
-#: lib/ui/mtn-browse.glade:6506 lib/ui/mtn-browse.glade:6524
-#: lib/ui/mtn-browse.glade:6542 lib/ui/mtn-browse.glade:6560
-#: lib/ui/mtn-browse.glade:6678 lib/ui/mtn-browse.glade:6730
-#: lib/ui/mtn-browse.glade:6814 lib/ui/mtn-browse.glade:6865
-#: lib/ui/mtn-browse.glade:7081 lib/ui/mtn-browse.glade:7099
-#: lib/ui/mtn-browse.glade:7117 lib/ui/mtn-browse.glade:7135
+#: lib/ui/mtn-browse.glade:6529 lib/ui/mtn-browse.glade:6547
+#: lib/ui/mtn-browse.glade:6565 lib/ui/mtn-browse.glade:6583
+#: lib/ui/mtn-browse.glade:6601 lib/ui/mtn-browse.glade:6619
+#: lib/ui/mtn-browse.glade:6737 lib/ui/mtn-browse.glade:6789
+#: lib/ui/mtn-browse.glade:6873 lib/ui/mtn-browse.glade:6924
+#: lib/ui/mtn-browse.glade:7140 lib/ui/mtn-browse.glade:7158
+#: lib/ui/mtn-browse.glade:7176 lib/ui/mtn-browse.glade:7194
msgid "Pick A Colour"
msgstr ""
-#: lib/ui/mtn-browse.glade:6642 lib/ui/mtn-browse.glade:6694
+#: lib/ui/mtn-browse.glade:6701 lib/ui/mtn-browse.glade:6753
msgid ""
"Text foreground colour\n"
"used in context lines"
msgstr ""
-#: lib/ui/mtn-browse.glade:6650 lib/ui/mtn-browse.glade:6702
+#: lib/ui/mtn-browse.glade:6709 lib/ui/mtn-browse.glade:6761
msgid "Highlight:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6746
+#: lib/ui/mtn-browse.glade:6805
msgid ""
"The first set of line text colours\n"
"used in annotated listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6754
+#: lib/ui/mtn-browse.glade:6813
msgid "Annotation text 1:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6881
+#: lib/ui/mtn-browse.glade:6940
msgid ""
"The second set of line prefix colours\n"
"used in annotated listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6889
+#: lib/ui/mtn-browse.glade:6948
msgid "Annotation prefix 2:"
msgstr ""
-#: lib/ui/mtn-browse.glade:6914
+#: lib/ui/mtn-browse.glade:6973
msgid ""
"The second set of line text colours\n"
"used in annotated listings"
msgstr ""
-#: lib/ui/mtn-browse.glade:6922
+#: lib/ui/mtn-browse.glade:6981
msgid "Annotation text 2:"
msgstr ""
-#: lib/ui/mtn-browse.glade:7155
+#: lib/ui/mtn-browse.glade:7214
msgid "Colours"
msgstr ""
-#: lib/ui/mtn-browse.glade:7187
+#: lib/ui/mtn-browse.glade:7246
msgid "Appearance"
msgstr ""
-#: lib/ui/mtn-browse.glade:7299
+#: lib/ui/mtn-browse.glade:7357
msgid ""
"Add a new MIME\n"
"type to the list"
msgstr ""
-#: lib/ui/mtn-browse.glade:7328
+#: lib/ui/mtn-browse.glade:7386
msgid ""
"Remove the currently selected\n"
"MIME type from the list"
msgstr ""
-#: lib/ui/mtn-browse.glade:7375 lib/ui/mtn-browse.glade:7791
+#: lib/ui/mtn-browse.glade:7433 lib/ui/mtn-browse.glade:7848
msgid "MIME Types"
msgstr ""
-#: lib/ui/mtn-browse.glade:7469
+#: lib/ui/mtn-browse.glade:7526
msgid ""
"Add a new file name\n"
"pattern to the list"
msgstr ""
-#: lib/ui/mtn-browse.glade:7501
+#: lib/ui/mtn-browse.glade:7558
msgid ""
"Remove the currently selected\n"
"file name pattern from the list"
msgstr ""
-#: lib/ui/mtn-browse.glade:7567
+#: lib/ui/mtn-browse.glade:7624
msgid "File Name Patterns"
msgstr ""
-#: lib/ui/mtn-browse.glade:7625
+#: lib/ui/mtn-browse.glade:7682
msgid ""
"Select this if files of the selected type are\n"
"to be displayed in the browser's internal viewer"
msgstr ""
-#: lib/ui/mtn-browse.glade:7628
+#: lib/ui/mtn-browse.glade:7685
msgid "Display internally"
msgstr ""
-#: lib/ui/mtn-browse.glade:7646
+#: lib/ui/mtn-browse.glade:7703
msgid ""
"Select this if syntax highlighting is to be\n"
"attempted for files of the selected type"
msgstr ""
-#: lib/ui/mtn-browse.glade:7649
+#: lib/ui/mtn-browse.glade:7706
msgid "Syntax highlight"
msgstr ""
-#: lib/ui/mtn-browse.glade:7680
+#: lib/ui/mtn-browse.glade:7737
msgid ""
"Enter a command for loading\n"
"files of the selected type into\n"
@@ -1994,73 +2068,73 @@ msgstr ""
"of the command"
msgstr ""
-#: lib/ui/mtn-browse.glade:7700
+#: lib/ui/mtn-browse.glade:7757
msgid "Helper application:"
msgstr ""
-#: lib/ui/mtn-browse.glade:7753
+#: lib/ui/mtn-browse.glade:7810
msgid "File Actions"
msgstr ""
-#: lib/ui/mtn-browse.glade:7915
+#: lib/ui/mtn-browse.glade:7972
msgid ""
"Enter the file name pattern\n"
"that is to be searched for"
msgstr ""
-#: lib/ui/mtn-browse.glade:7923
+#: lib/ui/mtn-browse.glade:7980
msgid "Files named:"
msgstr ""
-#: lib/ui/mtn-browse.glade:7949
+#: lib/ui/mtn-browse.glade:8006
msgid ""
"The place in the directory hierarchy\n"
"where the search will start from"
msgstr ""
-#: lib/ui/mtn-browse.glade:7957
+#: lib/ui/mtn-browse.glade:8014
msgid "Searching from:"
msgstr ""
-#: lib/ui/mtn-browse.glade:8078
+#: lib/ui/mtn-browse.glade:8135
msgid ""
"Choose whether to search\n"
"subdirectories or not"
msgstr ""
-#: lib/ui/mtn-browse.glade:8081
+#: lib/ui/mtn-browse.glade:8138
msgid "Search subdirectories"
msgstr ""
-#: lib/ui/mtn-browse.glade:8112
+#: lib/ui/mtn-browse.glade:8169
msgid "Name"
msgstr ""
-#: lib/ui/mtn-browse.glade:8144
+#: lib/ui/mtn-browse.glade:8201
msgid ""
"Enter the text that is to be\n"
"searched for inside files"
msgstr ""
-#: lib/ui/mtn-browse.glade:8152
+#: lib/ui/mtn-browse.glade:8209
msgid "Files containing:"
msgstr ""
-#: lib/ui/mtn-browse.glade:8241
+#: lib/ui/mtn-browse.glade:8298
msgid ""
"Search binary files\n"
"as well as text files"
msgstr ""
-#: lib/ui/mtn-browse.glade:8244
+#: lib/ui/mtn-browse.glade:8301
msgid "Search binary files"
msgstr ""
-#: lib/ui/mtn-browse.glade:8275
+#: lib/ui/mtn-browse.glade:8332
msgid "Contents"
msgstr ""
-#: lib/ui/mtn-browse.glade:8304
+#: lib/ui/mtn-browse.glade:8361
msgid ""
"Select this mode if you want\n"
"to search for files that were\n"
@@ -2068,78 +2142,78 @@ msgstr ""
"two specified dates"
msgstr ""
-#: lib/ui/mtn-browse.glade:8309
+#: lib/ui/mtn-browse.glade:8366
msgid "between"
msgstr ""
-#: lib/ui/mtn-browse.glade:8331
+#: lib/ui/mtn-browse.glade:8388
msgid ""
"Select files based upon their\n"
"last modification date and time"
msgstr ""
-#: lib/ui/mtn-browse.glade:8334
+#: lib/ui/mtn-browse.glade:8391
msgid "Find all files created or modified:"
msgstr ""
-#: lib/ui/mtn-browse.glade:8356
+#: lib/ui/mtn-browse.glade:8413
msgid ""
"Select this mode if you want to\n"
"select files last modified within\n"
"the last n hours/days/months..."
msgstr ""
-#: lib/ui/mtn-browse.glade:8360
+#: lib/ui/mtn-browse.glade:8417
msgid "during the previous"
msgstr ""
-#: lib/ui/mtn-browse.glade:8382
+#: lib/ui/mtn-browse.glade:8439
msgid "and"
msgstr ""
-#: lib/ui/mtn-browse.glade:8406
+#: lib/ui/mtn-browse.glade:8463
msgid "Select files based upon their size"
msgstr ""
-#: lib/ui/mtn-browse.glade:8413
+#: lib/ui/mtn-browse.glade:8470
msgid "File size is:"
msgstr ""
-#: lib/ui/mtn-browse.glade:8439
+#: lib/ui/mtn-browse.glade:8496
msgid ""
"Select files last modified\n"
"by the specified user"
msgstr ""
-#: lib/ui/mtn-browse.glade:8447
+#: lib/ui/mtn-browse.glade:8504
msgid "Files last modified by:"
msgstr ""
-#: lib/ui/mtn-browse.glade:8486
+#: lib/ui/mtn-browse.glade:8543
msgid "Enter the duration here"
msgstr ""
-#: lib/ui/mtn-browse.glade:8508
+#: lib/ui/mtn-browse.glade:8565
msgid "Enter the file size here"
msgstr ""
-#: lib/ui/mtn-browse.glade:8530
+#: lib/ui/mtn-browse.glade:8587
msgid ""
"Use this to specify the oldest\n"
"modification date for your search"
msgstr ""
-#: lib/ui/mtn-browse.glade:8556
+#: lib/ui/mtn-browse.glade:8613
msgid ""
"Use this to specify the youngest\n"
"modification date for your search"
msgstr ""
-#: lib/ui/mtn-browse.glade:8582
+#: lib/ui/mtn-browse.glade:8639
msgid "The unit of time to be used"
msgstr ""
-#: lib/ui/mtn-browse.glade:8589
+#: lib/ui/mtn-browse.glade:8646
msgid ""
"Minute(s)\n"
"Hour(s)\n"
@@ -2148,13 +2222,13 @@ msgstr ""
"Year(s)"
msgstr ""
-#: lib/ui/mtn-browse.glade:8610
+#: lib/ui/mtn-browse.glade:8667
msgid ""
"The type of comparison\n"
"to be performed"
msgstr ""
-#: lib/ui/mtn-browse.glade:8618
+#: lib/ui/mtn-browse.glade:8675
msgid ""
"Any Size\n"
"At Least\n"
@@ -2162,93 +2236,121 @@ msgstr ""
"Equal To"
msgstr ""
-#: lib/ui/mtn-browse.glade:8639
+#: lib/ui/mtn-browse.glade:8696
msgid "The unit of file size to be used"
msgstr ""
-#: lib/ui/mtn-browse.glade:8646
+#: lib/ui/mtn-browse.glade:8703
msgid ""
"Bytes\n"
"KB\n"
"MB"
msgstr ""
-#: lib/ui/mtn-browse.glade:8665
+#: lib/ui/mtn-browse.glade:8722
msgid " "
msgstr ""
-#: lib/ui/mtn-browse.glade:8695
+#: lib/ui/mtn-browse.glade:8752
msgid "Properties"
msgstr ""
-#: lib/ui/mtn-browse.glade:8728
+#: lib/ui/mtn-browse.glade:8785
msgid "Stop finding files"
msgstr ""
-#: lib/ui/mtn-browse.glade:8756
+#: lib/ui/mtn-browse.glade:8813
msgid "Find the files"
msgstr ""
-#: lib/ui/mtn-browse.glade:8796
+#: lib/ui/mtn-browse.glade:8853
msgid "Query"
msgstr ""
-#: lib/ui/mtn-browse.glade:8901
+#: lib/ui/mtn-browse.glade:8957
msgid "Name of the file being displayed"
msgstr ""
-#: lib/ui/mtn-browse.glade:8963
+#: lib/ui/mtn-browse.glade:9019
msgid "Date of when file was last changed"
msgstr ""
-#: lib/ui/mtn-browse.glade:9016
+#: lib/ui/mtn-browse.glade:9072
msgid "Author of the selected file"
msgstr ""
-#: lib/ui/mtn-browse.glade:9049
+#: lib/ui/mtn-browse.glade:9105
msgid ""
"Time when the selected file was last\n"
"updated with respect to this revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:9108
+#: lib/ui/mtn-browse.glade:9164
msgid "File's unique id in database"
msgstr ""
-#: lib/ui/mtn-browse.glade:9170
+#: lib/ui/mtn-browse.glade:9226
msgid ""
"Id of revision when\n"
"file was last changed"
msgstr ""
-#: lib/ui/mtn-browse.glade:9224
+#: lib/ui/mtn-browse.glade:9280
msgid "Id of the selected file"
msgstr ""
-#: lib/ui/mtn-browse.glade:9231
+#: lib/ui/mtn-browse.glade:9287
msgid "File id:"
msgstr ""
-#: lib/ui/mtn-browse.glade:9257
+#: lib/ui/mtn-browse.glade:9313
msgid ""
"Revision id in which the selected file was\n"
"last updated with respect to this revision"
msgstr ""
-#: lib/ui/mtn-browse.glade:9309
+#: lib/ui/mtn-browse.glade:9365
msgid "Results"
msgstr ""
-#: lib/ui/mtn-browse.glade:9356
+#: lib/ui/mtn-browse.glade:9412
msgid "Multiple Revisions"
msgstr ""
-#: lib/ui/mtn-browse.glade:9559
+#: lib/ui/mtn-browse.glade:9615
msgid ""
"Select the revision\n"
"that you want"
msgstr ""
-#: lib/ui/mtn-browse.glade:9567
+#: lib/ui/mtn-browse.glade:9623
msgid "Revisions:"
msgstr ""
+
+#: lib/ui/mtn-browse.glade:9825
+msgid ""
+"Add a new Monotone\n"
+"server to the list"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:9857
+msgid ""
+"Remove the currently selected\n"
+"Monotone server from the list"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:9928
+msgid "Compare Arbitrary Revisions"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:10048 lib/ui/mtn-browse.glade:10079
+msgid ""
+"Choose a revision using\n"
+"advanced selection criteria"
+msgstr ""
+
+#: lib/ui/mtn-browse.glade:10194
+msgid ""
+"Compare the two\n"
+"chosen revisions"
+msgstr ""