# # # patch "ChangeLog" # from [63fd8c37350595075affd26bd63276f98753cd7d] # to [562e66ef916dba861d04165217b29c46125ed53e] # # patch "NEWS" # from [054f1d97f9fce8791ebf832e842601e3eb6becf6] # to [74e1787aefd8d15cb52a4b76ac7510f50fc69e1f] # # patch "README" # from [7926cf7d2a1f994dd0c5f2f33b1995e6e39c0a40] # to [afe810aa2473bcf27fda14fb41ca6424a2c3d952] # # patch "lib/perl/Globals.pm" # from [87cb4f70823641b29e500c38f25773f2f093b487] # to [ec8fe1bfec2013217496d5991ad7532ef30a7b84] # # patch "locale/README" # from [aa8700ae8e632325ca87dd12b59005fea62370be] # to [d8112aeeb913c87597ee3af5bf977b29ffb1e8a2] # # patch "locale/mtn-browse.pot" # from [6bc27cc3af1b9b7e2edc8ef8a1a359b78a97925d] # to [3c70aa766ecf3847a7b3af600c6a32dd39115f7a] # # patch "mtn-browse" # from [7120b85f4c8a396c26251f3eb075013e53c19e12] # to [8f65af008b4621935e275303e9ecee8ac3d03cd0] # ============================================================ --- ChangeLog 63fd8c37350595075affd26bd63276f98753cd7d +++ ChangeLog 562e66ef916dba861d04165217b29c46125ed53e @@ -1,5 +1,83 @@ Revision history for mtn-browse. Revision history for mtn-browse. +0.62 Sun May 03 18:00:00 2009 Anthony Cooper + - Added the new relevant selectors introduced in Monotone 0.43. + - Added the help files. + - Added the help on window feature. + - Set up all of the windows for help and context sensitive help. + - Implemented the context sensitive help feature. + - Added the home page help menu option. + - Updated the help manual with details about the new help options and + modes, the new selectors introduced in Monotone version 0.43 and the + new preference options. + - Implemented a caching class derived from Monotone::AutomateStdio for + caching branch list information. Switched the rest of the application + over to this new class. + - Now weed out unsupported selectors from the GUI depending upon the + version of Monotone being used. + - Added a user preference option for determining how a list search is + done (either plain text or as a re). + - Added user preference options for controlling the look of the + toolbar. + - Gtk2::FileChooserDialog dialog windows now have their current + directory location saved between invocations. + - Added calls to the present() method after each call to + show()/show_all() for each window (fixes the focus issue with windows + not shown by default on desktops that use click to focus). + - Corrected a bug with the Advanced Find dialog window's handling of + the Find Text dialog window (it didn't reset the search context when + loaded with new data nor disabled it when there was no data to + search). + - Enabled the use of the Find Text dialog window within the Advanced + Find dialog window. + - Both the Advanced Find and Preferences dialog windows are now no + longer modal as this is taken care of by the WindowManager class. + - Now no longer rely on modal dialog windows, deal with it ourselves + (also supporting context sensitive help). This will allow the + Advanced Find dialog window to use the Find Text dialog window. + - Started using the update method on spinbuttons in order to make sure + that their internal state is consistent. + - Fixed the bug where the Advanced Find dialog window did not respond + to Shift-. Basically it seems that the window must not be + realised before the accelerator keys have been set up + (i.e. ...->show_all() and WindowManager->update_gui() can only be + called after WindowManager->instance()->manage()). + - Renamed the `Separator' selector to `Logical And', it makes more + sense. + - Cleaned up and restructured WindowManager.pm a bit to make it more + modular, increase code reuse and make it easier to understand. + - Corrected a few stack handling issues in the WindowManager class. + - mtn-browse now correctly gets the name of the database from a + workspace regardless of the user's `auto_select' setting. + - Now display a file's author instead of file id in the main browser + window. + - Fixed a bug whereby the external file comparison button remained + enabled when a lone binary file was selected for comparison. + - When a single file is selected for comparison, the results window is + now scrolled to that file. + - Added Thomas Keller's German locale file for mtn-browse. + - Switched over to using the supports method instead of the can method. + - References to MIME are now correctly in upper case. + - Corrected spelling of cronologically to chronologically. + - Renamed a few things in the code, Glade file and the help file so as + to be more consistent. + - Removed a redundant routine prototype in Completion.pm (actually + caused a warning message). + - Reinstated the Gnome save window settings setting. + - Updated the README file in light of additional Makefile.PL command + line options and the additional help files that are now installed. + - The Linux installer now copes with help files. + - linux-installer now does not require the LIB_DIR setting to have a + leading /. + - Corrected the built in help that comes with linux-installer. + - The dependency checker now returns the error message rather than + displaying it. + - Corrected some symbolic linking in devl-install relating to help + files. + - Makefile.PL now allows one to specify all of linux-installer's useful + options. + - Did some small code tidy ups. + 0.61 Sun Feb 08 18:00:00 2009 Anthony Cooper - Added a Makefile.PL style install capability. - Split out the dependency checker into a separate module. ============================================================ --- NEWS 054f1d97f9fce8791ebf832e842601e3eb6becf6 +++ NEWS 74e1787aefd8d15cb52a4b76ac7510f50fc69e1f @@ -1,3 +1,48 @@ +Overview Of Changes In mtn-browse 0.62 (2009-05-03 18:00:00) +============================================================ + +New: +- Added the new relevant selectors introduced in Monotone 0.43. +- Implemented the help sub-system and wrote the manual. This not only supports + displaying the help manual but also `help on window' and `context sensitive + help' features. +- Added the home page help menu option. +- Added a user preference option for determining how a list search is done + (either plain text or as a re). +- Added user preference options for controlling the look of the toolbar. +- Added Thomas Keller's German locale file for mtn-browse. + +Changes: +- Implemented a caching class derived from Monotone::AutomateStdio for caching + branch list information. Switched the rest of the application over to this + new class. +- Now weed out unsupported selectors from the GUI depending upon the version of + Monotone being used. +- Gtk2::FileChooserDialog dialog windows now have their current directory + location saved between invocations. +- Enabled the use of the Find Text dialog window within the Advanced Find + dialog window. +- References to MIME are now correctly in upper case. +- Corrected spelling of cronologically to chronologically. +- Reinstated the Gnome save window settings setting. +- Now display a file's author instead of file id in the main browser window. +- Renamed the `Separator' selector to `Logical And', it makes more sense. + +Bugs Fixed: +- Added calls to the present() method after each call to show()/show_all() for + each window (fixes the focus issue with windows not shown by default on + desktops that use click to focus). +- Started using the update method on spinbuttons in order to make sure that + their internal state is consistent. +- Corrected a few stack handling issues in the WindowManager class. +- mtn-browse now correctly gets the name of the database from a workspace + regardless of the user's `auto_select' setting. +- When a single file is selected for comparison, the results window is now + scrolled to that file. +- Fixed a bug whereby the external file comparison button remained enabled when + a lone binary file was selected for comparison. + + Overview Of Changes In mtn-browse 0.61 (2009-02-08 18:00:00) ============================================================ ============================================================ --- README 7926cf7d2a1f994dd0c5f2f33b1995e6e39c0a40 +++ README afe810aa2473bcf27fda14fb41ca6424a2c3d952 @@ -1,4 +1,4 @@ -mtn-browse Version 0.61 +mtn-browse Version 0.62 ======================= mtn-browse is an application for browsing Monotone VCS databases without the @@ -107,6 +107,7 @@ | |-- perl | | |-- AdvancedFind.pm | | |-- Annotate.pm + | | |-- CachingAutomateStdio.pm | | |-- ChangeLog.pm | | |-- ComboAutoCompletion.pm | | |-- Common.pm ============================================================ --- lib/perl/Globals.pm 87cb4f70823641b29e500c38f25773f2f093b487 +++ lib/perl/Globals.pm ec8fe1bfec2013217496d5991ad7532ef30a7b84 @@ -56,7 +56,7 @@ use constant APPLICATION_NAME => "mtn # Constants for the name and version of this application. use constant APPLICATION_NAME => "mtn-browse"; -use constant APPLICATION_VERSION => 0.61; +use constant APPLICATION_VERSION => 0.62; # Constants used to represent the different groups of widgets. ============================================================ --- locale/README aa8700ae8e632325ca87dd12b59005fea62370be +++ locale/README d8112aeeb913c87597ee3af5bf977b29ffb1e8a2 @@ -1,4 +1,7 @@ -Copy the mtn-browse.pot file to .po, e.g. de_DE.po, and then edit as +Creating A New Translation File +=============================== + +Copy the mtn-browse.pot file to .po, e.g. de.po, and then edit as appropriate. The installer will convert the po files to mo format and store them under: @@ -8,6 +11,51 @@ e.g. .../share/locale/de_DE/LC_MESSAGES/mtn-browse.mo + +Updating An Existing .PO File With Changes From The Latest .POT File +==================================================================== + +Unfortunately from time to time there will be changes made to the code that +affect the corresponding .POT file, and so all the .PO files have to be updated +as well. + +When you want to update your .po file to contain the latest message strings from +the .POT file, use a command like: + + msgmerge -u .po mtn-browse.pot + +For example: + + msgmerge -u de.po mtn-browse.pot + +This will update de.po with the changes from the new mtn-browse.pot file. The +state of the message entries in the updated file will be one of: + + Translated - Exact match found, existing translation used. + Fuzzy - Close enough to the original to use its old translation but + will need some attention. + Untranslated - No match found, needs a new translation. + Obsolete - No longer required, can be deleted. + +Emacs has a .PO file mode and has a quite few useful commands to help you. Some +are: + + t/T - Find next/previous translated entry. + z/Z - Find next/previous fuzzy entry. + u/U - Find next/previous untranslated entry. + o/O - Find next/previous obsolete entry. + +For more information please see info gettext updating for more information. + +Please note that message entries of the form mtnb-.... (for example +mtnb-gsc-menus) are reference labels used by the application to call up specific +sections in the help documentation. If or when you translate the help manual, it +is up to you whether you bother to translate these labels into your native +language (these are never displayed to the user) or leave them alone. Either +way, please make sure that these labels are consistent across the mtn-browse.xml +file and the .PO file. + + Thank you. Tony Cooper. ============================================================ --- locale/mtn-browse.pot 6bc27cc3af1b9b7e2edc8ef8a1a359b78a97925d +++ locale/mtn-browse.pot 3c70aa766ecf3847a7b3af600c6a32dd39115f7a @@ -8,7 +8,7 @@ msgstr "" msgstr "" "Project-Id-Version: mtn-browse 0.1\n" "Report-Msgid-Bugs-To: address@hidden" -"POT-Creation-Date: 2009-01-25 00:49+0000\n" +"POT-Creation-Date: 2009-05-03 17:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,58 +17,66 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: mtn-browse:214 +#: mtn-browse:225 #, perl-brace-format msgid "" "Your preferences cannot be loaded:\n" "{error_message}" msgstr "" -#: mtn-browse:236 +#: mtn-browse:247 #, perl-brace-format msgid "" "{error_message}\n" "This is fatal, I am going to exit." msgstr "" -#: mtn-browse:276 +#: mtn-browse:307 #, perl-brace-format msgid "Cannot open database {database_name}." msgstr "" -#: mtn-browse:403 +#: mtn-browse:498 +#, perl-brace-format +msgid "" +"Gnome cannot display Monotone Browser's\n" +"home page. Gnome gave:\n" +"{gnome_error_message}" +msgstr "" + +#: mtn-browse:537 msgid "Copyright © 2007-2009 Anthony Cooper" msgstr "" -#: mtn-browse:404 +#: mtn-browse:538 msgid "A graphical front-end browser for Monotone VCS databases" msgstr "" -#: mtn-browse:406 mtn-browse:407 -msgid "TBD" +#: mtn-browse:540 +msgid "Anthony Cooper " msgstr "" -#: mtn-browse:665 -msgid "Not implemented." +#: mtn-browse:541 +msgid "Thomas Keller (German translation)" msgstr "" -#: mtn-browse:1079 lib/perl/History.pm:1862 +#: mtn-browse:1205 lib/perl/History.pm:1964 #, perl-brace-format msgid "" "Cannot generate temporary file name:\n" "{error_message}." msgstr "" -#: mtn-browse:1095 lib/perl/Common.pm:523 lib/perl/History.pm:1879 +#: mtn-browse:1221 lib/perl/Common.pm:535 lib/perl/History.pm:1981 #, perl-brace-format msgid "{error_message}." msgstr "" -#: mtn-browse:1155 +#: mtn-browse:1281 msgid "Unknown file type, not viewing." msgstr "" -#: mtn-browse:1172 +#: mtn-browse:1298 #, perl-brace-format msgid "" "Gnome cannot launch the helper application\n" @@ -77,7 +85,7 @@ msgstr "" "{gnome_error_message}" msgstr "" -#: mtn-browse:1188 +#: mtn-browse:1314 #, perl-brace-format msgid "" "No application is associated with\n" @@ -85,36 +93,69 @@ msgstr "" "using Vi instead." msgstr "" -#: mtn-browse:1578 +#: mtn-browse:1705 msgid "File Name" msgstr "" -#: mtn-browse:1593 +#: mtn-browse:1720 msgid "Last Update" msgstr "" -#: mtn-browse:1603 lib/perl/AdvancedFind.pm:305 lib/perl/AdvancedFind.pm:659 +#: mtn-browse:1730 lib/perl/AdvancedFind.pm:306 lib/perl/AdvancedFind.pm:687 msgid "Author" msgstr "" +#: mtn-browse:1793 +msgid "mtnb-gsc-menus" +msgstr "" + #: mtn-browse:1795 +msgid "mtnb-gsc-tool-bar" +msgstr "" + +#: mtn-browse:1797 +msgid "mtnb-gsc-selecting-a-branch-and-revision" +msgstr "" + +#: mtn-browse:1799 mtn-browse:1803 mtn-browse:1809 lib/perl/FindText.pm:787 +msgid "mtnb-gsc-browser-buttons" +msgstr "" + +#: mtn-browse:1801 mtn-browse:1805 +msgid "mtnb-gsc-selecting-a-file-to-display" +msgstr "" + +#: mtn-browse:1807 mtn-browse:1811 +msgid "mtnb-gsc-information-fields" +msgstr "" + +#: mtn-browse:1813 +msgid "mtnb-gsc-monotone-browser-window-at-a-glance" +msgstr "" + +#: mtn-browse:1942 lib/perl/Preferences.pm:316 lib/perl/Preferences.pm:367 #, perl-brace-format +msgid "open failed: {error_message}\n" +msgstr "" + +#: mtn-browse:2066 +#, perl-brace-format msgid " ({database_name})" msgstr "" -#: mtn-browse:1837 lib/perl/AdvancedFind.pm:798 +#: mtn-browse:2108 lib/perl/AdvancedFind.pm:833 msgid "Fetching branch list" msgstr "" -#: mtn-browse:1844 lib/perl/AdvancedFind.pm:806 +#: mtn-browse:2115 lib/perl/AdvancedFind.pm:841 msgid "Populating branch list" msgstr "" -#: mtn-browse:1886 +#: mtn-browse:2157 msgid "Auto selecting head revision" msgstr "" -#: mtn-browse:1901 +#: mtn-browse:2172 #, perl-brace-format msgid "" "The `{branch}' branch has multiple heads\n" @@ -123,20 +164,20 @@ msgstr "" "The head revision ids are:" msgstr "" -#: mtn-browse:1937 lib/perl/AdvancedFind.pm:855 lib/perl/History.pm:154 -#: lib/perl/History.pm:355 +#: mtn-browse:2208 lib/perl/AdvancedFind.pm:890 lib/perl/History.pm:156 +#: lib/perl/History.pm:358 msgid "Fetching revision list" msgstr "" -#: mtn-browse:1950 lib/perl/AdvancedFind.pm:870 +#: mtn-browse:2221 lib/perl/AdvancedFind.pm:905 msgid "Populating revision list" msgstr "" -#: mtn-browse:2006 +#: mtn-browse:2277 msgid "Fetching manifest" msgstr "" -#: mtn-browse:2016 +#: mtn-browse:2287 #, perl-brace-format msgid "" "The `{tag_name}' tag is not unique on this branch.\n" @@ -145,40 +186,40 @@ msgstr "" "The matching revision ids are:" msgstr "" -#: mtn-browse:2085 +#: mtn-browse:2356 msgid "Populating directory list" msgstr "" -#: mtn-browse:2157 +#: mtn-browse:2428 msgid "Populating file details" msgstr "" -#: mtn-browse:2394 +#: mtn-browse:2668 msgid "Unknown Contents" msgstr "" -#: mtn-browse:2451 +#: mtn-browse:2725 msgid "Hex dump:\n" msgstr "" -#: mtn-browse:2606 +#: mtn-browse:2881 msgid "" "Your version of Monotone does not support\n" "suspend certificates. I will adjusted your\n" "preferences accordingly." msgstr "" -#: mtn-browse:2624 lib/perl/Common.pm:1157 lib/perl/Preferences.pm:250 +#: mtn-browse:2899 lib/perl/Common.pm:1183 lib/perl/Preferences.pm:269 msgid "Your preferences could not be saved:\n" msgstr "" -#: mtn-browse:2665 +#: mtn-browse:2940 msgid "" "The Monotone database is currently locked, please\n" "dismiss this dialog when this is no longer the case." msgstr "" -#: mtn-browse:2703 +#: mtn-browse:2980 #, perl-brace-format msgid "" "Problem with monotone request, got:\n" @@ -186,7 +227,7 @@ msgstr "" "This should not be happening!" msgstr "" -#: mtn-browse:2719 +#: mtn-browse:2997 #, perl-brace-format msgid "" "Monotone process unexpectedly exiting with:\n" @@ -194,17 +235,17 @@ msgstr "" "This is fatal, I am going to exit." msgstr "" -#: mtn-browse:2771 +#: mtn-browse:3049 #, perl-brace-format msgid "terminated by signal {number}" msgstr "" -#: mtn-browse:2776 +#: mtn-browse:3054 #, perl-brace-format msgid "exited with status {number}" msgstr "" -#: mtn-browse:2784 +#: mtn-browse:3062 #, perl-brace-format msgid "" "The mtn subprocess just unexpectedly\n" @@ -213,135 +254,234 @@ msgstr "" "It will be restarted when needed." msgstr "" -#: mtn-browse:2799 +#: mtn-browse:3077 #, perl-brace-format msgid "waitpid failed: {error_message}" msgstr "" -#: mtn-browse:2830 +#: mtn-browse:3107 #, perl-brace-format msgid "pipe failed: {error_message}" msgstr "" -#: lib/perl/AdvancedFind.pm:307 +#: lib/perl/AdvancedFind.pm:308 msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:309 lib/perl/AdvancedFind.pm:639 +#: lib/perl/AdvancedFind.pm:310 lib/perl/AdvancedFind.pm:667 msgid "Branch" msgstr "" -#: lib/perl/AdvancedFind.pm:311 lib/perl/AdvancedFind.pm:331 +#: lib/perl/AdvancedFind.pm:312 lib/perl/AdvancedFind.pm:332 msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:313 +#: lib/perl/AdvancedFind.pm:314 msgid "Cert" msgstr "" -#: lib/perl/AdvancedFind.pm:315 +#: lib/perl/AdvancedFind.pm:316 msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:317 +#: lib/perl/AdvancedFind.pm:318 msgid "Date (=)" msgstr "" -#: lib/perl/AdvancedFind.pm:321 +#: lib/perl/AdvancedFind.pm:322 msgid "Date (<=)" msgstr "" -#: lib/perl/AdvancedFind.pm:325 +#: lib/perl/AdvancedFind.pm:326 msgid "Date (>)" msgstr "" -#: lib/perl/AdvancedFind.pm:329 +#: lib/perl/AdvancedFind.pm:330 msgid "Head Revision" msgstr "" -#: lib/perl/AdvancedFind.pm:333 +#: lib/perl/AdvancedFind.pm:334 msgid "Identifier" msgstr "" -#: lib/perl/AdvancedFind.pm:335 lib/perl/AdvancedFind.pm:339 +#: lib/perl/AdvancedFind.pm:336 lib/perl/AdvancedFind.pm:348 msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:337 -msgid "Parent" +#: lib/perl/AdvancedFind.pm:338 lib/perl/AdvancedFind.pm:406 +msgid "Logical And" msgstr "" -#: lib/perl/AdvancedFind.pm:341 lib/perl/AdvancedFind.pm:400 -msgid "Separator" +#: lib/perl/AdvancedFind.pm:342 lib/perl/AdvancedFind.pm:631 +msgid "Message" msgstr "" -#: lib/perl/AdvancedFind.pm:345 +#: lib/perl/AdvancedFind.pm:344 +msgid "" +msgstr "" + +#: lib/perl/AdvancedFind.pm:346 lib/perl/AdvancedFind.pm:633 +msgid "Parent" +msgstr "" + +#: lib/perl/AdvancedFind.pm:350 msgid "Tag" msgstr "" -#: lib/perl/AdvancedFind.pm:347 +#: lib/perl/AdvancedFind.pm:352 msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:627 +#: lib/perl/AdvancedFind.pm:400 lib/perl/AdvancedFind.pm:677 +msgid "Date" +msgstr "" + +#: lib/perl/AdvancedFind.pm:655 msgid "Revision Id" msgstr "" -#: lib/perl/AdvancedFind.pm:649 -msgid "Date" +#: lib/perl/AdvancedFind.pm:727 +msgid "mtnb-mcqc-simple-queries" msgstr "" -#: lib/perl/AdvancedFind.pm:910 +#: lib/perl/AdvancedFind.pm:729 +msgid "mtnb-mcqc-helper-tools" +msgstr "" + +#: lib/perl/AdvancedFind.pm:731 +msgid "mtnb-mcqc-the-advanced-find-dialog-window" +msgstr "" + +#: lib/perl/AdvancedFind.pm:945 msgid "Finding revisions" msgstr "" -#: lib/perl/AdvancedFind.pm:942 +#: lib/perl/AdvancedFind.pm:977 #, perl-brace-format msgid "" "There is a problem with your query, Monotone gave:\n" "{error_message}" msgstr "" -#: lib/perl/AdvancedFind.pm:970 +#: lib/perl/AdvancedFind.pm:1005 msgid "No revisions matched your query." msgstr "" -#: lib/perl/AdvancedFind.pm:988 +#: lib/perl/AdvancedFind.pm:1023 msgid "Populating revision details" msgstr "" -#: lib/perl/AdvancedFind.pm:1161 +#: lib/perl/AdvancedFind.pm:1197 #, perl-brace-format msgid "Found 1 revision" msgid_plural "Found {revisions_found} revisions" msgstr[0] "" msgstr[1] "" -#: lib/perl/AdvancedFind.pm:1168 lib/perl/FindFiles.pm:656 +#: lib/perl/AdvancedFind.pm:1204 lib/perl/FindFiles.pm:657 msgid "Nothing found" msgstr "" -#: lib/perl/Annotate.pm:99 +#: lib/perl/Annotate.pm:104 #, perl-brace-format msgid "Annotated Listing Of {file}" msgstr "" -#: lib/perl/Annotate.pm:109 +#: lib/perl/Annotate.pm:115 msgid "Annotating file" msgstr "" -#: lib/perl/Annotate.pm:130 +#: lib/perl/Annotate.pm:146 msgid "Formatting and displaying annotated file" msgstr "" -#: lib/perl/Annotate.pm:294 -msgid "Finding change log" +#: lib/perl/Annotate.pm:292 +msgid "Display Change _Log" msgstr "" -#: lib/perl/Annotate.pm:313 +#: lib/perl/Annotate.pm:310 +msgid "Displaying change log" +msgstr "" + +#: lib/perl/Annotate.pm:316 +msgid "Display File _History" +msgstr "" + +#: lib/perl/Annotate.pm:340 lib/perl/History.pm:385 +msgid "Displaying file history" +msgstr "" + +#: lib/perl/Annotate.pm:346 +msgid "Display _Revision History" +msgstr "" + +#: lib/perl/Annotate.pm:364 lib/perl/History.pm:177 +msgid "Displaying revision history" +msgstr "" + +#: lib/perl/Annotate.pm:375 +msgid "Compare File With Previous _Version" +msgstr "" + +#: lib/perl/Annotate.pm:391 +msgid "Doing file comparison" +msgstr "" + +#: lib/perl/Annotate.pm:398 +msgid "Compare Revision _With Parent" +msgstr "" + +#: lib/perl/Annotate.pm:414 +msgid "Doing revision comparison" +msgstr "" + +#: lib/perl/Annotate.pm:470 msgid "Cannot access unique revision id." msgstr "" +#: lib/perl/Annotate.pm:532 +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:549 lib/perl/Annotate.pm:666 +msgid "The selected revision has no parents." +msgstr "" + +#: lib/perl/Annotate.pm:564 +msgid "" +"The current version of the file probably\n" +"resulted from a merge as it is directly\n" +"descended from multiple versions.\n" +"I will display the file's history so you\n" +"can select the specific parent revision." +msgstr "" + +#: lib/perl/Annotate.pm:583 +msgid "The selected file version has no ancestors." +msgstr "" + +#: lib/perl/Annotate.pm:651 +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:755 +msgid "mtnb-lachc-the-annotated-listing-window" +msgstr "" + +#: lib/perl/Annotate.pm:833 +#, perl-brace-format +msgid "" +"Problem running mtn annotate, got:\n" +"{error_message}\n" +"This should not be happening!" +msgstr "" + #: lib/perl/ChangeLog.pm:52 msgid "Added" msgstr "" @@ -364,48 +504,64 @@ msgstr "" #: lib/perl/ChangeLog.pm:110 #, perl-brace-format -msgid "Revision {rev}" +msgid "Change Log For {rev}" msgstr "" -#: lib/perl/ChangeLog.pm:191 +#: lib/perl/ChangeLog.pm:192 msgid "Revision id: " msgstr "" -#: lib/perl/ChangeLog.pm:247 +#: lib/perl/ChangeLog.pm:248 #, perl-brace-format msgid "" "\n" "Change Log{optional_count}:\n" msgstr "" -#: lib/perl/ChangeLog.pm:265 +#: lib/perl/ChangeLog.pm:266 msgid "" "\n" "\n" "Changes Made:\n" msgstr "" -#: lib/perl/ChangeLog.pm:297 +#: lib/perl/ChangeLog.pm:298 #, perl-brace-format msgid "{name}: {attribute} was cleared" msgstr "" -#: lib/perl/ChangeLog.pm:342 +#: lib/perl/ChangeLog.pm:343 msgid "" "\n" "Parent revision id(s): " msgstr "" -#: lib/perl/ChangeLog.pm:349 +#: lib/perl/ChangeLog.pm:350 msgid "Manifest id: " msgstr "" +#: lib/perl/ChangeLog.pm:437 +msgid "mtnb-lachc-the-change-log-window" +msgstr "" + +#: lib/perl/ComboAutoCompletion.pm:177 +msgid "branch" +msgstr "" + +#: lib/perl/ComboAutoCompletion.pm:184 +msgid "revision" +msgstr "" + +#: lib/perl/ComboAutoCompletion.pm:191 +msgid "directory" +msgstr "" + #: lib/perl/ComboAutoCompletion.pm:242 #, perl-brace-format msgid "Invalid {name} name `{value}'" msgstr "" -#: lib/perl/Common.pm:173 +#: lib/perl/Common.pm:179 #, perl-brace-format msgid "" "The {name} subprocess could not start,\n" @@ -413,14 +569,14 @@ msgstr "" "{error_message}" msgstr "" -#: lib/perl/Common.pm:230 +#: lib/perl/Common.pm:236 #, perl-brace-format msgid "" "waitpid failed with:\n" "{error_message}" msgstr "" -#: lib/perl/Common.pm:245 +#: lib/perl/Common.pm:251 #, perl-brace-format msgid "" "The {name} subprocess failed with an exit status\n" @@ -428,84 +584,105 @@ msgstr "" "{error_message}" msgstr "" -#: lib/perl/Common.pm:262 +#: lib/perl/Common.pm:268 #, perl-brace-format msgid "The {name} subprocess was terminated by signal {number}." msgstr "" -#: lib/perl/Common.pm:360 +#: lib/perl/Common.pm:366 msgid "Open Database" msgstr "" -#: lib/perl/Common.pm:418 +#: lib/perl/Common.pm:426 msgid "Not a valid Monotone database." msgstr "" -#: lib/perl/Common.pm:476 +#: lib/perl/Common.pm:486 msgid "Save As" msgstr "" -#: lib/perl/Common.pm:505 +#: lib/perl/Common.pm:517 msgid "" "File already exists.\n" "Do you want to replace it?" msgstr "" -#: lib/perl/Common.pm:506 +#: lib/perl/Common.pm:518 msgid "Confirm" msgstr "" +#: lib/perl/Common.pm:629 +msgid "Select As Search Column" +msgstr "" + #: lib/perl/FindFiles.pm:128 #, perl-brace-format msgid "Find Files Within Revision {rev}" msgstr "" -#: lib/perl/FindFiles.pm:498 +#: lib/perl/FindFiles.pm:499 msgid "Finding matching files" msgstr "" -#: lib/perl/FindFiles.pm:640 +#: lib/perl/FindFiles.pm:641 #, perl-brace-format msgid "Found 1 file" msgid_plural "Found {files_found} files" msgstr[0] "" msgstr[1] "" -#: lib/perl/FindFiles.pm:653 +#: lib/perl/FindFiles.pm:654 msgid "No files matched your query." msgstr "" -#: lib/perl/FindFiles.pm:1064 lib/perl/Preferences.pm:845 +#: lib/perl/FindFiles.pm:995 lib/perl/FindFiles.pm:997 +#: lib/perl/FindFiles.pm:999 +msgid "mtnb-ffwarc-query-fields" +msgstr "" + +#: lib/perl/FindFiles.pm:1001 +msgid "mtnb-ffwarc-query-buttons" +msgstr "" + +#: lib/perl/FindFiles.pm:1003 +msgid "mtnb-ffwarc-the-find-files-window" +msgstr "" + +#: lib/perl/FindFiles.pm:1078 lib/perl/Preferences.pm:870 #, perl-brace-format msgid "" "`{pattern}' is an invalid\n" "file name pattern." msgstr "" -#: lib/perl/FindFiles.pm:1087 lib/perl/FindText.pm:401 +#: lib/perl/FindFiles.pm:1101 lib/perl/FindText.pm:402 #, perl-brace-format msgid "" "`{pattern}' is an invalid\n" "content search pattern." msgstr "" -#: lib/perl/FindFiles.pm:1105 +#: lib/perl/FindFiles.pm:1119 msgid "" "The `between' dates are either\n" "the same or the wrong way round." msgstr "" -#: lib/perl/FindFiles.pm:1125 +#: lib/perl/FindFiles.pm:1139 #, perl-brace-format msgid "A duration of {months} months is too long." msgstr "" -#: lib/perl/FindFiles.pm:1139 +#: lib/perl/FindFiles.pm:1153 #, perl-brace-format msgid "A duration of {years} years is too long." msgstr "" -#: lib/perl/FindText.pm:573 +#: lib/perl/FindText.pm:245 +msgid "_Find" +msgstr "" + +#: lib/perl/FindText.pm:574 #, perl-brace-format msgid "" "Could not find\n" @@ -572,185 +749,207 @@ msgstr "" "as the first revision" msgstr "" -#: lib/perl/History.pm:139 +#: lib/perl/History.pm:140 #, perl-brace-format msgid "Revision History For {rev}" msgstr "" -#: lib/perl/History.pm:142 +#: lib/perl/History.pm:143 msgid "Revision History" msgstr "" -#: lib/perl/History.pm:162 lib/perl/History.pm:368 +#: lib/perl/History.pm:164 lib/perl/History.pm:373 msgid "Sorting revision list" msgstr "" -#: lib/perl/History.pm:175 -msgid "Displaying revision history" -msgstr "" - -#: lib/perl/History.pm:342 +#: lib/perl/History.pm:344 #, perl-brace-format msgid "File History For {file}" msgstr "" -#: lib/perl/History.pm:344 +#: lib/perl/History.pm:346 msgid "File History" msgstr "" -#: lib/perl/History.pm:380 -msgid "Displaying file history" -msgstr "" - -#: lib/perl/History.pm:691 -msgid "" -"The name of the selected file has changed\n" -"between the two selected revisions and cannot\n" -"be compared internally. Would you like to do\n" -"the comparison using the external helper application?" -msgstr "" - -#: lib/perl/History.pm:695 -msgid "External Comparison" -msgstr "" - -#: lib/perl/History.pm:738 -msgid "" -"The file contents cannot be\n" -"found in the select revisions.\n" -"This should not be happening." -msgstr "" - -#: lib/perl/History.pm:812 +#: lib/perl/History.pm:544 #, perl-brace-format msgid "Differences Between Revisions {rev_1} and {rev_2}" msgstr "" -#: lib/perl/History.pm:818 +#: lib/perl/History.pm:550 msgid "File Comparison" msgstr "" -#: lib/perl/History.pm:823 +#: lib/perl/History.pm:555 msgid "Revision Comparison" msgstr "" -#: lib/perl/History.pm:837 +#: lib/perl/History.pm:570 msgid "Calculating differences" msgstr "" -#: lib/perl/History.pm:900 +#: lib/perl/History.pm:633 msgid "Formatting and displaying differences" msgstr "" -#: lib/perl/History.pm:1064 +#: lib/perl/History.pm:797 msgid "Displaying differences" msgstr "" -#: lib/perl/History.pm:1163 +#: lib/perl/History.pm:896 msgid "Populating file list" msgstr "" -#: lib/perl/History.pm:1170 +#: lib/perl/History.pm:903 msgid "Summary" msgstr "" -#: lib/perl/History.pm:1350 +#: lib/perl/History.pm:1002 +msgid "" +"The name of the selected file has changed\n" +"between the two selected revisions and cannot\n" +"be compared internally. Would you like to do\n" +"the comparison using the external helper application?" +msgstr "" + +#: lib/perl/History.pm:1006 +msgid "External Comparison" +msgstr "" + +#: lib/perl/History.pm:1047 +msgid "" +"The file contents cannot be\n" +"found in the selected revisions.\n" +"This should not be happening." +msgstr "" + +#: lib/perl/History.pm:1410 msgid "unified_diff.patch" msgstr "" -#: lib/perl/History.pm:1767 lib/perl/History.pm:1774 +#: lib/perl/History.pm:1569 lib/perl/History.pm:1571 +msgid "mtnb-lachc-history-buttons" +msgstr "" + +#: lib/perl/History.pm:1573 +msgid "mtnb-lachc-the-revision-and-file-history-windows" +msgstr "" + +#: lib/perl/History.pm:1835 lib/perl/History.pm:1842 msgid "Revision Change Log" msgstr "" -#: lib/perl/History.pm:1780 +#: lib/perl/History.pm:1848 msgid "- Revision Change Log" msgstr "" -#: lib/perl/History.pm:1782 +#: lib/perl/History.pm:1850 msgid "+ Revision Change Log" msgstr "" -#: lib/perl/History.pm:1852 +#: lib/perl/History.pm:1862 lib/perl/History.pm:1864 +msgid "mtnb-lachc-differences-buttons" +msgstr "" + +#: lib/perl/History.pm:1866 +msgid "mtnb-lachc-the-differences-window" +msgstr "" + +#: lib/perl/History.pm:1944 +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:1954 msgid "OLDER_" msgstr "" -#: lib/perl/History.pm:1855 +#: lib/perl/History.pm:1957 msgid "NEWER_" msgstr "" -#: lib/perl/Preferences.pm:191 -msgid "The preferences dialog cannot be displayed:\n" +#: lib/perl/History.pm:2073 +#, perl-brace-format +msgid "" +"Problem running mtn diff, got:\n" +"{error_message}\n" +"This should not be happening!" msgstr "" -#: lib/perl/Preferences.pm:298 lib/perl/Preferences.pm:349 -#, perl-brace-format -msgid "open failed: {error_message}\n" +#: lib/perl/Preferences.pm:210 +msgid "The preferences dialog cannot be displayed:\n" msgstr "" -#: lib/perl/Preferences.pm:300 +#: lib/perl/Preferences.pm:319 #, perl-brace-format msgid "Invalid user preferences file: {error_message}\n" msgstr "" -#: lib/perl/Preferences.pm:304 +#: lib/perl/Preferences.pm:323 #, perl-brace-format msgid "Preferences file, `{file_name}',\n" msgstr "" -#: lib/perl/Preferences.pm:305 +#: lib/perl/Preferences.pm:324 msgid "is corrupt, please remove it.\n" msgstr "" -#: lib/perl/Preferences.pm:352 +#: lib/perl/Preferences.pm:371 msgid "# DO NOT EDIT! This is an automatically generated file.\n" msgstr "" -#: lib/perl/Preferences.pm:353 +#: lib/perl/Preferences.pm:372 msgid "# Changes to this file may be lost or cause " msgstr "" -#: lib/perl/Preferences.pm:354 +#: lib/perl/Preferences.pm:373 msgid "mtn-browse to malfunction.\n" msgstr "" -#: lib/perl/Preferences.pm:642 +#: lib/perl/Preferences.pm:667 #, perl-brace-format msgid "" "`{mime_type}' does not\n" "look like a valid MIME type." msgstr "" -#: lib/perl/Preferences.pm:666 +#: lib/perl/Preferences.pm:691 #, perl-brace-format msgid "`{mime_type}' is already listed." msgstr "" -#: lib/perl/Preferences.pm:869 +#: lib/perl/Preferences.pm:894 #, perl-brace-format msgid "" "`{pattern}' is already used in MIME type\n" "`{mime_type}'." msgstr "" -#: lib/perl/Preferences.pm:1085 -msgid "Mime Type" +#: lib/perl/Preferences.pm:1115 +msgid "MIME Type" msgstr "" -#: lib/perl/Preferences.pm:1095 +#: lib/perl/Preferences.pm:1125 msgid "File Name Patterns" msgstr "" -#: lib/perl/Preferences.pm:1105 +#: lib/perl/Preferences.pm:1135 msgid "Helper Application" msgstr "" -#: lib/perl/Preferences.pm:1511 +#: lib/perl/Preferences.pm:1187 +msgid "mtnb-upc-the-preferences-dialog-window" +msgstr "" + +#: lib/perl/Preferences.pm:1582 msgid "" "The external file comparison application field is\n" "invalid, please correct before attempting to resave." msgstr "" -#: lib/perl/Preferences.pm:1599 +#: lib/perl/Preferences.pm:1692 msgid "Cannot load system MIME types.\n" msgstr "" @@ -770,289 +969,284 @@ msgstr "" msgid "_Quit" msgstr "" -#: lib/ui/mtn-browse.glade:194 -msgid "New browser" +#: lib/ui/mtn-browse.glade:158 +msgid "_Help Contents" msgstr "" -#: lib/ui/mtn-browse.glade:223 +#: lib/ui/mtn-browse.glade:180 +msgid "Help On _Window" +msgstr "" + +#: lib/ui/mtn-browse.glade:202 +msgid "_Context Help" +msgstr "" + +#: lib/ui/mtn-browse.glade:230 +msgid "_Home Page" +msgstr "" + +#: lib/ui/mtn-browse.glade:293 +msgid "New browser window" +msgstr "" + +#: lib/ui/mtn-browse.glade:322 msgid "Open a database" msgstr "" -#: lib/ui/mtn-browse.glade:239 +#: lib/ui/mtn-browse.glade:338 msgid "Close the current database" msgstr "" -#: lib/ui/mtn-browse.glade:268 +#: lib/ui/mtn-browse.glade:367 msgid "Reload the current database" msgstr "" -#: lib/ui/mtn-browse.glade:269 +#: lib/ui/mtn-browse.glade:368 msgid "Reload" msgstr "" -#: lib/ui/mtn-browse.glade:299 +#: lib/ui/mtn-browse.glade:398 msgid "User preferences" msgstr "" -#: lib/ui/mtn-browse.glade:315 -msgid "Help" +#: lib/ui/mtn-browse.glade:414 +msgid "Display help contents page" msgstr "" -#: lib/ui/mtn-browse.glade:375 lib/ui/mtn-browse.glade:2260 +#: lib/ui/mtn-browse.glade:474 lib/ui/mtn-browse.glade:2354 msgid "Project branch to access" msgstr "" -#: lib/ui/mtn-browse.glade:382 lib/ui/mtn-browse.glade:2267 +#: lib/ui/mtn-browse.glade:481 lib/ui/mtn-browse.glade:2361 msgid "Branch:" msgstr "" -#: lib/ui/mtn-browse.glade:436 lib/ui/mtn-browse.glade:2321 +#: lib/ui/mtn-browse.glade:535 lib/ui/mtn-browse.glade:2415 msgid "Revision within project to access" msgstr "" -#: lib/ui/mtn-browse.glade:443 lib/ui/mtn-browse.glade:2328 +#: lib/ui/mtn-browse.glade:542 lib/ui/mtn-browse.glade:2422 msgid " Revision:" msgstr "" -#: lib/ui/mtn-browse.glade:497 lib/ui/mtn-browse.glade:2382 +#: lib/ui/mtn-browse.glade:596 lib/ui/mtn-browse.glade:2476 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:501 lib/ui/mtn-browse.glade:2386 +#: lib/ui/mtn-browse.glade:600 lib/ui/mtn-browse.glade:2480 msgid "Tagged" msgstr "" -#: lib/ui/mtn-browse.glade:526 +#: lib/ui/mtn-browse.glade:625 msgid "" "Use more advanced selection\n" "criteria for selecting a revision" msgstr "" -#: lib/ui/mtn-browse.glade:555 +#: lib/ui/mtn-browse.glade:654 msgid "" "View revision history\n" "in Monotone-Viz" msgstr "" -#: lib/ui/mtn-browse.glade:583 +#: lib/ui/mtn-browse.glade:682 msgid "View revision's change history" msgstr "" -#: lib/ui/mtn-browse.glade:611 +#: lib/ui/mtn-browse.glade:710 msgid "View revision's change log" msgstr "" -#: lib/ui/mtn-browse.glade:650 +#: lib/ui/mtn-browse.glade:749 msgid "View" msgstr "" -#: lib/ui/mtn-browse.glade:714 +#: lib/ui/mtn-browse.glade:813 msgid "Directory to be viewed" msgstr "" -#: lib/ui/mtn-browse.glade:721 +#: lib/ui/mtn-browse.glade:820 msgid "Directory:" msgstr "" -#: lib/ui/mtn-browse.glade:782 +#: lib/ui/mtn-browse.glade:881 msgid "Go up one directory level" msgstr "" -#: lib/ui/mtn-browse.glade:810 +#: lib/ui/mtn-browse.glade:909 msgid "" "Find files based on one\n" "or more search criteria" msgstr "" -#: lib/ui/mtn-browse.glade:886 +#: lib/ui/mtn-browse.glade:985 msgid "Revision Browser" msgstr "" -#: lib/ui/mtn-browse.glade:961 lib/ui/mtn-browse.glade:8417 -msgid "Name of the file being displayed" -msgstr "" - -#: lib/ui/mtn-browse.glade:1023 lib/ui/mtn-browse.glade:8479 -msgid "Date of when file was last changed" -msgstr "" - -#: lib/ui/mtn-browse.glade:1076 +#: lib/ui/mtn-browse.glade:1173 msgid "Name of file being displayed" msgstr "" -#: lib/ui/mtn-browse.glade:1083 +#: lib/ui/mtn-browse.glade:1180 msgid "File:" msgstr "" -#: lib/ui/mtn-browse.glade:1109 +#: lib/ui/mtn-browse.glade:1206 msgid "" "Time when the displayed file was last\n" "updated with respect to this revision" msgstr "" -#: lib/ui/mtn-browse.glade:1117 lib/ui/mtn-browse.glade:8573 +#: lib/ui/mtn-browse.glade:1214 lib/ui/mtn-browse.glade:8878 msgid "Last update:" msgstr "" -#: lib/ui/mtn-browse.glade:1168 lib/ui/mtn-browse.glade:8624 -msgid "File's unique id in database" +#: lib/ui/mtn-browse.glade:1378 +msgid "Author of the file revision being displayed" msgstr "" -#: lib/ui/mtn-browse.glade:1230 lib/ui/mtn-browse.glade:8686 -msgid "" -"Id of revision when\n" -"file was last changed" +#: lib/ui/mtn-browse.glade:1385 lib/ui/mtn-browse.glade:1909 +#: lib/ui/mtn-browse.glade:8844 +msgid "Author:" msgstr "" -#: lib/ui/mtn-browse.glade:1284 -msgid "Id of file being displayed" -msgstr "" - -#: lib/ui/mtn-browse.glade:1291 lib/ui/mtn-browse.glade:8747 -msgid "File id:" -msgstr "" - -#: lib/ui/mtn-browse.glade:1317 +#: lib/ui/mtn-browse.glade:1411 msgid "" "Revision id in which the displayed file was\n" "last updated with respect to this revision" msgstr "" -#: lib/ui/mtn-browse.glade:1325 lib/ui/mtn-browse.glade:8781 +#: lib/ui/mtn-browse.glade:1419 lib/ui/mtn-browse.glade:9086 msgid "Revision id:" msgstr "" -#: lib/ui/mtn-browse.glade:1397 +#: lib/ui/mtn-browse.glade:1491 msgid "" "Toggle the showing\n" "of line numbers" msgstr "" -#: lib/ui/mtn-browse.glade:1428 +#: lib/ui/mtn-browse.glade:1522 msgid "Search text" msgstr "" -#: lib/ui/mtn-browse.glade:1456 +#: lib/ui/mtn-browse.glade:1550 msgid "Save file contents to disk" msgstr "" -#: lib/ui/mtn-browse.glade:1484 +#: lib/ui/mtn-browse.glade:1578 msgid "" "Load file contents\n" "into a viewer" msgstr "" -#: lib/ui/mtn-browse.glade:1513 +#: lib/ui/mtn-browse.glade:1607 msgid "Annotate file contents" msgstr "" -#: lib/ui/mtn-browse.glade:1540 +#: lib/ui/mtn-browse.glade:1634 msgid "View file's change history" msgstr "" -#: lib/ui/mtn-browse.glade:1586 +#: lib/ui/mtn-browse.glade:1680 msgid "File Viewer" msgstr "" -#: lib/ui/mtn-browse.glade:1775 +#: lib/ui/mtn-browse.glade:1869 msgid "Name of the database being accessed" msgstr "" -#: lib/ui/mtn-browse.glade:1782 +#: lib/ui/mtn-browse.glade:1876 msgid "Database:" msgstr "" -#: lib/ui/mtn-browse.glade:1808 +#: lib/ui/mtn-browse.glade:1902 msgid "Author of the currently selected revision" msgstr "" -#: lib/ui/mtn-browse.glade:1815 lib/ui/mtn-browse.glade:8539 -msgid "Author:" -msgstr "" - -#: lib/ui/mtn-browse.glade:1979 +#: lib/ui/mtn-browse.glade:2073 msgid "Date of the currently selected revision" msgstr "" -#: lib/ui/mtn-browse.glade:1986 +#: lib/ui/mtn-browse.glade:2080 msgid "Date:" msgstr "" -#: lib/ui/mtn-browse.glade:2012 +#: lib/ui/mtn-browse.glade:2106 msgid "Change log for the currently selected revision" msgstr "" -#: lib/ui/mtn-browse.glade:2019 +#: lib/ui/mtn-browse.glade:2113 msgid "Change log:" msgstr "" -#: lib/ui/mtn-browse.glade:2056 lib/ui/mtn-browse.glade:2898 +#: lib/ui/mtn-browse.glade:2150 lib/ui/mtn-browse.glade:2995 msgid "Details" msgstr "" -#: lib/ui/mtn-browse.glade:2103 +#: lib/ui/mtn-browse.glade:2197 msgid "Advanced Find" msgstr "" -#: lib/ui/mtn-browse.glade:2160 +#: lib/ui/mtn-browse.glade:2254 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:2163 +#: lib/ui/mtn-browse.glade:2257 msgid "Simple query" msgstr "" -#: lib/ui/mtn-browse.glade:2182 +#: lib/ui/mtn-browse.glade:2276 msgid "" "Select Advanced Query if you want to\n" "specify very specific selection critia" msgstr "" -#: lib/ui/mtn-browse.glade:2185 +#: lib/ui/mtn-browse.glade:2279 msgid "Advanced query" msgstr "" -#: lib/ui/mtn-browse.glade:2208 +#: lib/ui/mtn-browse.glade:2302 msgid "Mode" msgstr "" -#: lib/ui/mtn-browse.glade:2409 +#: lib/ui/mtn-browse.glade:2503 msgid "Simply Query" msgstr "" -#: lib/ui/mtn-browse.glade:2467 +#: lib/ui/mtn-browse.glade:2561 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:2476 +#: lib/ui/mtn-browse.glade:2570 msgid "Search term:" msgstr "" -#: lib/ui/mtn-browse.glade:2534 +#: lib/ui/mtn-browse.glade:2628 msgid "Execute the query" msgstr "" -#: lib/ui/mtn-browse.glade:2563 +#: lib/ui/mtn-browse.glade:2657 msgid "Stop the query" msgstr "" -#: lib/ui/mtn-browse.glade:2610 +#: lib/ui/mtn-browse.glade:2704 msgid "Enter the current selector into the query above" msgstr "" -#: lib/ui/mtn-browse.glade:2638 +#: lib/ui/mtn-browse.glade:2732 msgid "The type of selector that is to be inserted above" msgstr "" -#: lib/ui/mtn-browse.glade:2645 +#: lib/ui/mtn-browse.glade:2739 msgid "" "Author\n" "Branch\n" @@ -1062,220 +1256,221 @@ msgid "" "Date (>)\n" "Head Revision\n" "Identifier\n" +"Logical And\n" +"Message\n" "Parent\n" -"Separator\n" "Tag" msgstr "" -#: lib/ui/mtn-browse.glade:2670 +#: lib/ui/mtn-browse.glade:2765 msgid "Enter any arguments here" msgstr "" -#: lib/ui/mtn-browse.glade:2699 +#: lib/ui/mtn-browse.glade:2794 msgid "Use this to specify the date for date based selectors" msgstr "" -#: lib/ui/mtn-browse.glade:2742 +#: lib/ui/mtn-browse.glade:2837 msgid "Advanced Query" msgstr "" -#: lib/ui/mtn-browse.glade:2820 +#: lib/ui/mtn-browse.glade:2915 msgid "Revisions" msgstr "" -#: lib/ui/mtn-browse.glade:3113 +#: lib/ui/mtn-browse.glade:3210 msgid "Change Log" msgstr "" -#: lib/ui/mtn-browse.glade:3305 +#: lib/ui/mtn-browse.glade:3402 msgid "Number of revisions listed" msgstr "" -#: lib/ui/mtn-browse.glade:3312 +#: lib/ui/mtn-browse.glade:3409 msgid "Number of revisions:" msgstr "" -#: lib/ui/mtn-browse.glade:3346 +#: lib/ui/mtn-browse.glade:3443 msgid "Stop gathering history details" msgstr "" -#: lib/ui/mtn-browse.glade:3464 +#: lib/ui/mtn-browse.glade:3561 msgid "File id of the first file that is to be compared" msgstr "" -#: lib/ui/mtn-browse.glade:3526 +#: lib/ui/mtn-browse.glade:3623 msgid "File id of the second file that is to be compared" msgstr "" -#: lib/ui/mtn-browse.glade:3569 +#: lib/ui/mtn-browse.glade:3666 msgid "" "Revision id of the first selected\n" "file version that is to be compared" msgstr "" -#: lib/ui/mtn-browse.glade:3577 +#: lib/ui/mtn-browse.glade:3674 msgid "First revision id:" msgstr "" -#: lib/ui/mtn-browse.glade:3603 +#: lib/ui/mtn-browse.glade:3700 msgid "" "Revision id of the second selected\n" "file version that is to be compared" msgstr "" -#: lib/ui/mtn-browse.glade:3611 +#: lib/ui/mtn-browse.glade:3708 msgid "Second revision id:" msgstr "" -#: lib/ui/mtn-browse.glade:3654 +#: lib/ui/mtn-browse.glade:3751 msgid "Compare the two selected files" msgstr "" -#: lib/ui/mtn-browse.glade:3695 +#: lib/ui/mtn-browse.glade:3792 msgid "Compare" msgstr "" -#: lib/ui/mtn-browse.glade:3800 +#: lib/ui/mtn-browse.glade:3897 msgid "Jump to the selected file" msgstr "" -#: lib/ui/mtn-browse.glade:3807 +#: lib/ui/mtn-browse.glade:3904 msgid "Jump to file:" msgstr "" -#: lib/ui/mtn-browse.glade:3860 +#: lib/ui/mtn-browse.glade:3957 msgid "" "Display the differences for the currently\n" "selected file in an external viewer" msgstr "" -#: lib/ui/mtn-browse.glade:3888 +#: lib/ui/mtn-browse.glade:3985 msgid "Save the differences to disk" msgstr "" -#: lib/ui/mtn-browse.glade:3917 +#: lib/ui/mtn-browse.glade:4014 msgid "Stop formatting the comparison results" msgstr "" -#: lib/ui/mtn-browse.glade:4002 +#: lib/ui/mtn-browse.glade:4099 msgid "View the change log of the older revision" msgstr "" -#: lib/ui/mtn-browse.glade:4030 +#: lib/ui/mtn-browse.glade:4127 msgid "View the change log of the younger revision" msgstr "" -#: lib/ui/mtn-browse.glade:4191 +#: lib/ui/mtn-browse.glade:4288 msgid "Annotation" msgstr "" -#: lib/ui/mtn-browse.glade:4231 +#: lib/ui/mtn-browse.glade:4328 msgid "Find Text" msgstr "" -#: lib/ui/mtn-browse.glade:4307 +#: lib/ui/mtn-browse.glade:4404 msgid "" "Enter the text that is\n" "to be searched for" msgstr "" -#: lib/ui/mtn-browse.glade:4315 +#: lib/ui/mtn-browse.glade:4412 msgid "Search for:" msgstr "" -#: lib/ui/mtn-browse.glade:4363 lib/ui/mtn-browse.glade:7573 -#: lib/ui/mtn-browse.glade:7715 +#: lib/ui/mtn-browse.glade:4460 lib/ui/mtn-browse.glade:7878 +#: lib/ui/mtn-browse.glade:8020 msgid "" "Choose whether searches are\n" "to be case sensitive or not" msgstr "" -#: lib/ui/mtn-browse.glade:4366 lib/ui/mtn-browse.glade:7576 -#: lib/ui/mtn-browse.glade:7718 +#: lib/ui/mtn-browse.glade:4463 lib/ui/mtn-browse.glade:7881 +#: lib/ui/mtn-browse.glade:8023 msgid "Case sensitive" msgstr "" -#: lib/ui/mtn-browse.glade:4384 +#: lib/ui/mtn-browse.glade:4481 msgid "" "Select the direction\n" "of the search" msgstr "" -#: lib/ui/mtn-browse.glade:4387 +#: lib/ui/mtn-browse.glade:4484 msgid "Search backwards" msgstr "" -#: lib/ui/mtn-browse.glade:4405 lib/ui/mtn-browse.glade:7736 +#: lib/ui/mtn-browse.glade:4502 lib/ui/mtn-browse.glade:8041 msgid "" "Use regular expression\n" "search patterns" msgstr "" -#: lib/ui/mtn-browse.glade:4408 lib/ui/mtn-browse.glade:7739 +#: lib/ui/mtn-browse.glade:4505 lib/ui/mtn-browse.glade:8044 msgid "Regular expression" msgstr "" -#: lib/ui/mtn-browse.glade:4441 +#: lib/ui/mtn-browse.glade:4538 msgid "Preferences" msgstr "" -#: lib/ui/mtn-browse.glade:4566 +#: lib/ui/mtn-browse.glade:4663 msgid "" "Look for a Monotone\n" "database to open" msgstr "" -#: lib/ui/mtn-browse.glade:4569 +#: lib/ui/mtn-browse.glade:4666 msgid "Browse ..." msgstr "" -#: lib/ui/mtn-browse.glade:4588 +#: lib/ui/mtn-browse.glade:4685 msgid "" "Name of the Monotone database to\n" "open automatically on startup" msgstr "" -#: lib/ui/mtn-browse.glade:4596 +#: lib/ui/mtn-browse.glade:4693 msgid "Database to open:" msgstr "" -#: lib/ui/mtn-browse.glade:4622 +#: lib/ui/mtn-browse.glade:4719 msgid "" "Actions to take when starting up\n" "inside a Monotone workspace" msgstr "" -#: lib/ui/mtn-browse.glade:4630 +#: lib/ui/mtn-browse.glade:4727 msgid "Workspace:" msgstr "" -#: lib/ui/mtn-browse.glade:4662 +#: lib/ui/mtn-browse.glade:4759 msgid "" -"Select if the workspace's database\n" +"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:4666 +#: lib/ui/mtn-browse.glade:4763 msgid "Takes precedence" msgstr "" -#: lib/ui/mtn-browse.glade:4684 +#: lib/ui/mtn-browse.glade:4781 msgid "" -"Select if the workspace's branch\n" +"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:4688 +#: lib/ui/mtn-browse.glade:4785 msgid "Auto select branch and revision" msgstr "" -#: lib/ui/mtn-browse.glade:4742 +#: lib/ui/mtn-browse.glade:4839 msgid "Startup Defaults" msgstr "" -#: lib/ui/mtn-browse.glade:4788 +#: lib/ui/mtn-browse.glade:4885 msgid "" "Select if the head revision on a branch\n" "should automatically be loaded into a\n" @@ -1285,128 +1480,127 @@ msgstr "" "by their tags)" msgstr "" -#: lib/ui/mtn-browse.glade:4795 +#: lib/ui/mtn-browse.glade:4892 msgid "Auto select head revision" msgstr "" -#: lib/ui/mtn-browse.glade:4810 +#: lib/ui/mtn-browse.glade:4907 msgid "Revision Selection" msgstr "" -#: lib/ui/mtn-browse.glade:4865 +#: lib/ui/mtn-browse.glade:4962 msgid "" "Settings for controlling the listing of\n" "tagged revisions in ComboBox menus" msgstr "" -#: lib/ui/mtn-browse.glade:4873 +#: lib/ui/mtn-browse.glade:4970 msgid "Tagged lists:" msgstr "" -#: lib/ui/mtn-browse.glade:4899 +#: lib/ui/mtn-browse.glade:4996 msgid "" "The maximum number of tags\n" "to be displayed (starting from\n" "the most recent, 0 = unlimited)" msgstr "" -#: lib/ui/mtn-browse.glade:4908 lib/ui/mtn-browse.glade:4943 -#: lib/ui/mtn-browse.glade:5175 +#: lib/ui/mtn-browse.glade:5005 lib/ui/mtn-browse.glade:5040 +#: lib/ui/mtn-browse.glade:5272 msgid "Limit to:" msgstr "" -#: lib/ui/mtn-browse.glade:4934 +#: lib/ui/mtn-browse.glade:5031 msgid "" "The maximum number of ids\n" "to be displayed (starting from\n" "the most recent, 0 = unlimited)" msgstr "" -#: lib/ui/mtn-browse.glade:4969 +#: lib/ui/mtn-browse.glade:5066 msgid "" "Settings for controlling the listing of\n" "revision ids in ComboBox menus" msgstr "" -#: lib/ui/mtn-browse.glade:4977 +#: lib/ui/mtn-browse.glade:5074 msgid "Id lists:" msgstr "" -#: lib/ui/mtn-browse.glade:5009 +#: lib/ui/mtn-browse.glade:5106 msgid "" -"Select Sort cronologically if you\n" +"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:5013 lib/ui/mtn-browse.glade:5073 -msgid "Sort cronologically" +#: lib/ui/mtn-browse.glade:5110 lib/ui/mtn-browse.glade:5170 +msgid "Sort chronologically" msgstr "" -#: lib/ui/mtn-browse.glade:5031 +#: lib/ui/mtn-browse.glade:5128 msgid "" "Select Sort by id if you want the\n" "tags to be order aphabetically" msgstr "" -#: lib/ui/mtn-browse.glade:5034 +#: lib/ui/mtn-browse.glade:5131 msgid "Sort by id" msgstr "" -#: lib/ui/mtn-browse.glade:5069 +#: lib/ui/mtn-browse.glade:5166 msgid "" -"Select Sort cronologically if you\n" +"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:5091 +#: lib/ui/mtn-browse.glade:5188 msgid "" "Select Sort by name if you want\n" "the tags to be order aphabetically" msgstr "" -#: lib/ui/mtn-browse.glade:5094 +#: lib/ui/mtn-browse.glade:5191 msgid "Sort by name" msgstr "" -#: lib/ui/mtn-browse.glade:5167 +#: lib/ui/mtn-browse.glade:5264 msgid "" "The maximum number of\n" "items to store in histories" msgstr "" -#: lib/ui/mtn-browse.glade:5201 +#: lib/ui/mtn-browse.glade:5298 msgid "" "Setting for controlling the amount of\n" "history stored in ComboBox menus" msgstr "" -#: lib/ui/mtn-browse.glade:5209 +#: lib/ui/mtn-browse.glade:5306 msgid "History size:" msgstr "" -#: lib/ui/mtn-browse.glade:5261 +#: lib/ui/mtn-browse.glade:5358 msgid "ComboBox Settings" msgstr "" -#: lib/ui/mtn-browse.glade:5313 +#: lib/ui/mtn-browse.glade:5410 msgid "" -"Select Show suspended revisions\n" -"if you want suspended revisions\n" -"and their related branches to be\n" -"displayed" +"Select this if you want suspended\n" +"revisions and their related branches\n" +"to be displayed" msgstr "" -#: lib/ui/mtn-browse.glade:5318 +#: lib/ui/mtn-browse.glade:5414 msgid "Show suspended revisions" msgstr "" -#: lib/ui/mtn-browse.glade:5336 +#: lib/ui/mtn-browse.glade:5432 msgid "" -"Select Detailed file listings if you\n" -"want a file's latest modification\n" -"time and author to be displayed\n" +"Select this if you want a file's\n" +"latest modification time and\n" +"author to be displayed\n" "alongside the file name\n" "\n" "Please note that selecting this\n" @@ -1416,16 +1610,55 @@ msgstr "" "that you are using" msgstr "" -#: lib/ui/mtn-browse.glade:5347 +#: lib/ui/mtn-browse.glade:5443 msgid "Detailed file listings" msgstr "" -#: lib/ui/mtn-browse.glade:5369 +#: lib/ui/mtn-browse.glade:5461 +msgid "" +"Select this if you want line numbers\n" +"to be shown in file listings by default" +msgstr "" + +#: lib/ui/mtn-browse.glade:5464 +msgid "Show line numbers" +msgstr "" + +#: lib/ui/mtn-browse.glade:5482 +msgid "" +"Select this if you do not want the\n" +"branch and revision combobox entry\n" +"lists to update as you type in values\n" +"(can help with speed when dealing\n" +"with large lists)" +msgstr "" + +#: lib/ui/mtn-browse.glade:5488 +msgid "Static branch and revision lists" +msgstr "" + +#: lib/ui/mtn-browse.glade:5510 msgid "Browser Display Options" msgstr "" -#: lib/ui/mtn-browse.glade:5421 +#: lib/ui/mtn-browse.glade:5556 msgid "" +"Select this if the search terms used when\n" +"searching lists (invoked by typing Ctrl-F)\n" +"are to be treated as regular expressions\n" +"instead of plain text" +msgstr "" + +#: lib/ui/mtn-browse.glade:5561 +msgid "Search as regular expression" +msgstr "" + +#: lib/ui/mtn-browse.glade:5576 +msgid "List Options" +msgstr "" + +#: lib/ui/mtn-browse.glade:5628 +msgid "" "Enter a command for displaying\n" "the differences between two text\n" "files\n" @@ -1446,217 +1679,241 @@ msgstr "" "that referred to by {file2}" msgstr "" -#: lib/ui/mtn-browse.glade:5445 +#: lib/ui/mtn-browse.glade:5652 msgid "Application:" msgstr "" -#: lib/ui/mtn-browse.glade:5492 +#: lib/ui/mtn-browse.glade:5699 msgid "External File Comparison Application" msgstr "" -#: lib/ui/mtn-browse.glade:5524 +#: lib/ui/mtn-browse.glade:5731 msgid "General" msgstr "" -#: lib/ui/mtn-browse.glade:5576 +#: lib/ui/mtn-browse.glade:5783 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:5585 +#: lib/ui/mtn-browse.glade:5792 msgid "File content/report font:" msgstr "" -#: lib/ui/mtn-browse.glade:5609 +#: lib/ui/mtn-browse.glade:5816 msgid "Pick A Font" msgstr "" -#: lib/ui/mtn-browse.glade:5630 +#: lib/ui/mtn-browse.glade:5837 msgid "Fonts" msgstr "" -#: lib/ui/mtn-browse.glade:5676 +#: lib/ui/mtn-browse.glade:5889 msgid "" +"Select if the toolbar buttons are to\n" +"hide their text labels" +msgstr "" + +#: lib/ui/mtn-browse.glade:5892 +msgid "Hide text" +msgstr "" + +#: lib/ui/mtn-browse.glade:5910 +msgid "" +"Select if the toolbars are to be fixed\n" +"rather than movable" +msgstr "" + +#: lib/ui/mtn-browse.glade:5913 +msgid "Fixed" +msgstr "" + +#: lib/ui/mtn-browse.glade:5935 +msgid "Toolbar Settings" +msgstr "" + +#: lib/ui/mtn-browse.glade:5981 +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:5680 +#: lib/ui/mtn-browse.glade:5985 msgid "Coloured comparison listings" msgstr "" -#: lib/ui/mtn-browse.glade:5695 +#: lib/ui/mtn-browse.glade:6000 msgid "File/Revision Comparison" msgstr "" -#: lib/ui/mtn-browse.glade:5750 +#: lib/ui/mtn-browse.glade:6055 msgid "" "The first set of line prefix colours\n" "used in annotated listings" msgstr "" -#: lib/ui/mtn-browse.glade:5758 +#: lib/ui/mtn-browse.glade:6063 msgid "Annotation prefix 1:" msgstr "" -#: lib/ui/mtn-browse.glade:5784 +#: lib/ui/mtn-browse.glade:6089 msgid "" "Colour of the first revision\n" "in comparison listings" msgstr "" -#: lib/ui/mtn-browse.glade:5792 +#: lib/ui/mtn-browse.glade:6097 msgid "Revision 1:" msgstr "" -#: lib/ui/mtn-browse.glade:5818 +#: lib/ui/mtn-browse.glade:6123 msgid "" "Colour of the second revision\n" "in comparison listings" msgstr "" -#: lib/ui/mtn-browse.glade:5826 +#: lib/ui/mtn-browse.glade:6131 msgid "Revision 2:" msgstr "" -#: lib/ui/mtn-browse.glade:5852 lib/ui/mtn-browse.glade:5885 -#: lib/ui/mtn-browse.glade:6092 lib/ui/mtn-browse.glade:6295 -#: lib/ui/mtn-browse.glade:6463 lib/ui/mtn-browse.glade:6496 +#: lib/ui/mtn-browse.glade:6157 lib/ui/mtn-browse.glade:6190 +#: lib/ui/mtn-browse.glade:6397 lib/ui/mtn-browse.glade:6600 +#: lib/ui/mtn-browse.glade:6768 lib/ui/mtn-browse.glade:6801 msgid "Text foreground colour" msgstr "" -#: lib/ui/mtn-browse.glade:5859 lib/ui/mtn-browse.glade:5892 -#: lib/ui/mtn-browse.glade:6099 lib/ui/mtn-browse.glade:6302 -#: lib/ui/mtn-browse.glade:6470 lib/ui/mtn-browse.glade:6503 +#: lib/ui/mtn-browse.glade:6164 lib/ui/mtn-browse.glade:6197 +#: lib/ui/mtn-browse.glade:6404 lib/ui/mtn-browse.glade:6607 +#: lib/ui/mtn-browse.glade:6775 lib/ui/mtn-browse.glade:6808 msgid "Foreground:" msgstr "" -#: lib/ui/mtn-browse.glade:5918 lib/ui/mtn-browse.glade:5951 -#: lib/ui/mtn-browse.glade:6125 lib/ui/mtn-browse.glade:6346 -#: lib/ui/mtn-browse.glade:6529 lib/ui/mtn-browse.glade:6562 +#: lib/ui/mtn-browse.glade:6223 lib/ui/mtn-browse.glade:6256 +#: lib/ui/mtn-browse.glade:6430 lib/ui/mtn-browse.glade:6651 +#: lib/ui/mtn-browse.glade:6834 lib/ui/mtn-browse.glade:6867 msgid "Text background colour" msgstr "" -#: lib/ui/mtn-browse.glade:5925 lib/ui/mtn-browse.glade:5958 -#: lib/ui/mtn-browse.glade:6132 lib/ui/mtn-browse.glade:6353 -#: lib/ui/mtn-browse.glade:6536 lib/ui/mtn-browse.glade:6569 +#: lib/ui/mtn-browse.glade:6230 lib/ui/mtn-browse.glade:6263 +#: lib/ui/mtn-browse.glade:6437 lib/ui/mtn-browse.glade:6658 +#: lib/ui/mtn-browse.glade:6841 lib/ui/mtn-browse.glade:6874 msgid "Background:" msgstr "" -#: lib/ui/mtn-browse.glade:5986 lib/ui/mtn-browse.glade:6004 -#: lib/ui/mtn-browse.glade:6022 lib/ui/mtn-browse.glade:6040 -#: lib/ui/mtn-browse.glade:6058 lib/ui/mtn-browse.glade:6076 -#: lib/ui/mtn-browse.glade:6194 lib/ui/mtn-browse.glade:6246 -#: lib/ui/mtn-browse.glade:6330 lib/ui/mtn-browse.glade:6381 -#: lib/ui/mtn-browse.glade:6597 lib/ui/mtn-browse.glade:6615 -#: lib/ui/mtn-browse.glade:6633 lib/ui/mtn-browse.glade:6651 +#: lib/ui/mtn-browse.glade:6291 lib/ui/mtn-browse.glade:6309 +#: lib/ui/mtn-browse.glade:6327 lib/ui/mtn-browse.glade:6345 +#: lib/ui/mtn-browse.glade:6363 lib/ui/mtn-browse.glade:6381 +#: lib/ui/mtn-browse.glade:6499 lib/ui/mtn-browse.glade:6551 +#: lib/ui/mtn-browse.glade:6635 lib/ui/mtn-browse.glade:6686 +#: lib/ui/mtn-browse.glade:6902 lib/ui/mtn-browse.glade:6920 +#: lib/ui/mtn-browse.glade:6938 lib/ui/mtn-browse.glade:6956 msgid "Pick A Colour" msgstr "" -#: lib/ui/mtn-browse.glade:6158 lib/ui/mtn-browse.glade:6210 +#: lib/ui/mtn-browse.glade:6463 lib/ui/mtn-browse.glade:6515 msgid "" "Text foreground colour\n" "used in context lines" msgstr "" -#: lib/ui/mtn-browse.glade:6166 lib/ui/mtn-browse.glade:6218 +#: lib/ui/mtn-browse.glade:6471 lib/ui/mtn-browse.glade:6523 msgid "Highlight:" msgstr "" -#: lib/ui/mtn-browse.glade:6262 +#: lib/ui/mtn-browse.glade:6567 msgid "" "The first set of line text colours\n" "used in annotated listings" msgstr "" -#: lib/ui/mtn-browse.glade:6270 +#: lib/ui/mtn-browse.glade:6575 msgid "Annotation text 1:" msgstr "" -#: lib/ui/mtn-browse.glade:6397 +#: lib/ui/mtn-browse.glade:6702 msgid "" "The second set of line prefix colours\n" "used in annotated listings" msgstr "" -#: lib/ui/mtn-browse.glade:6405 +#: lib/ui/mtn-browse.glade:6710 msgid "Annotation prefix 2:" msgstr "" -#: lib/ui/mtn-browse.glade:6430 +#: lib/ui/mtn-browse.glade:6735 msgid "" "The second set of line text colours\n" "used in annotated listings" msgstr "" -#: lib/ui/mtn-browse.glade:6438 +#: lib/ui/mtn-browse.glade:6743 msgid "Annotation text 2:" msgstr "" -#: lib/ui/mtn-browse.glade:6671 +#: lib/ui/mtn-browse.glade:6976 msgid "Colours" msgstr "" -#: lib/ui/mtn-browse.glade:6703 +#: lib/ui/mtn-browse.glade:7008 msgid "Appearance" msgstr "" -#: lib/ui/mtn-browse.glade:6815 +#: lib/ui/mtn-browse.glade:7120 msgid "" "Add a new MIME\n" "type to the list" msgstr "" -#: lib/ui/mtn-browse.glade:6844 +#: lib/ui/mtn-browse.glade:7149 msgid "" "Remove the currently selected\n" "MIME type from the list" msgstr "" -#: lib/ui/mtn-browse.glade:6891 -msgid "Mime Types" +#: lib/ui/mtn-browse.glade:7196 lib/ui/mtn-browse.glade:7612 +msgid "MIME Types" msgstr "" -#: lib/ui/mtn-browse.glade:6985 +#: lib/ui/mtn-browse.glade:7290 msgid "" "Add a new file name\n" "pattern to the list" msgstr "" -#: lib/ui/mtn-browse.glade:7017 +#: lib/ui/mtn-browse.glade:7322 msgid "" "Remove the currently selected\n" "file name pattern from the list" msgstr "" -#: lib/ui/mtn-browse.glade:7083 +#: lib/ui/mtn-browse.glade:7388 msgid "File Name Patterns" msgstr "" -#: lib/ui/mtn-browse.glade:7141 +#: lib/ui/mtn-browse.glade:7446 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:7144 +#: lib/ui/mtn-browse.glade:7449 msgid "Display internally" msgstr "" -#: lib/ui/mtn-browse.glade:7162 +#: lib/ui/mtn-browse.glade:7467 msgid "" "Select this if syntax highlighting is to be\n" "attempted for files of the selected type" msgstr "" -#: lib/ui/mtn-browse.glade:7165 +#: lib/ui/mtn-browse.glade:7470 msgid "Syntax highlight" msgstr "" -#: lib/ui/mtn-browse.glade:7196 +#: lib/ui/mtn-browse.glade:7501 msgid "" "Enter a command for loading\n" "files of the selected type into\n" @@ -1674,77 +1931,73 @@ msgstr "" "of the command" msgstr "" -#: lib/ui/mtn-browse.glade:7216 +#: lib/ui/mtn-browse.glade:7521 msgid "Helper application:" msgstr "" -#: lib/ui/mtn-browse.glade:7269 +#: lib/ui/mtn-browse.glade:7574 msgid "File Actions" msgstr "" -#: lib/ui/mtn-browse.glade:7307 -msgid "MIME Types" -msgstr "" - -#: lib/ui/mtn-browse.glade:7431 +#: lib/ui/mtn-browse.glade:7736 msgid "" "Enter the file name pattern\n" "that is to be searched for" msgstr "" -#: lib/ui/mtn-browse.glade:7439 +#: lib/ui/mtn-browse.glade:7744 msgid "Files named:" msgstr "" -#: lib/ui/mtn-browse.glade:7465 +#: lib/ui/mtn-browse.glade:7770 msgid "" "The place in the directory hierarchy\n" "where the search will start from" msgstr "" -#: lib/ui/mtn-browse.glade:7473 +#: lib/ui/mtn-browse.glade:7778 msgid "Searching from:" msgstr "" -#: lib/ui/mtn-browse.glade:7594 +#: lib/ui/mtn-browse.glade:7899 msgid "" "Choose whether to search\n" "subdirectories or not" msgstr "" -#: lib/ui/mtn-browse.glade:7597 +#: lib/ui/mtn-browse.glade:7902 msgid "Search subdirectories" msgstr "" -#: lib/ui/mtn-browse.glade:7628 +#: lib/ui/mtn-browse.glade:7933 msgid "Name" msgstr "" -#: lib/ui/mtn-browse.glade:7660 +#: lib/ui/mtn-browse.glade:7965 msgid "" "Enter the text that is to be\n" "searched for inside files" msgstr "" -#: lib/ui/mtn-browse.glade:7668 +#: lib/ui/mtn-browse.glade:7973 msgid "Files containing:" msgstr "" -#: lib/ui/mtn-browse.glade:7757 +#: lib/ui/mtn-browse.glade:8062 msgid "" "Search binary files\n" "as well as text files" msgstr "" -#: lib/ui/mtn-browse.glade:7760 +#: lib/ui/mtn-browse.glade:8065 msgid "Search binary files" msgstr "" -#: lib/ui/mtn-browse.glade:7791 +#: lib/ui/mtn-browse.glade:8096 msgid "Contents" msgstr "" -#: lib/ui/mtn-browse.glade:7820 +#: lib/ui/mtn-browse.glade:8125 msgid "" "Select this mode if you want\n" "to search for files that were\n" @@ -1752,78 +2005,78 @@ msgstr "" "two specified dates" msgstr "" -#: lib/ui/mtn-browse.glade:7825 +#: lib/ui/mtn-browse.glade:8130 msgid "between" msgstr "" -#: lib/ui/mtn-browse.glade:7847 +#: lib/ui/mtn-browse.glade:8152 msgid "" "Select files based upon their\n" "last modification date and time" msgstr "" -#: lib/ui/mtn-browse.glade:7850 +#: lib/ui/mtn-browse.glade:8155 msgid "Find all files created or modified:" msgstr "" -#: lib/ui/mtn-browse.glade:7872 +#: lib/ui/mtn-browse.glade:8177 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:7876 +#: lib/ui/mtn-browse.glade:8181 msgid "during the previous" msgstr "" -#: lib/ui/mtn-browse.glade:7898 +#: lib/ui/mtn-browse.glade:8203 msgid "and" msgstr "" -#: lib/ui/mtn-browse.glade:7922 +#: lib/ui/mtn-browse.glade:8227 msgid "Select files based upon their size" msgstr "" -#: lib/ui/mtn-browse.glade:7929 +#: lib/ui/mtn-browse.glade:8234 msgid "File size is:" msgstr "" -#: lib/ui/mtn-browse.glade:7955 +#: lib/ui/mtn-browse.glade:8260 msgid "" "Select files last modified\n" "by the specified user" msgstr "" -#: lib/ui/mtn-browse.glade:7963 +#: lib/ui/mtn-browse.glade:8268 msgid "Files last modified by:" msgstr "" -#: lib/ui/mtn-browse.glade:8002 +#: lib/ui/mtn-browse.glade:8307 msgid "Enter the duration here" msgstr "" -#: lib/ui/mtn-browse.glade:8024 +#: lib/ui/mtn-browse.glade:8329 msgid "Enter the file size here" msgstr "" -#: lib/ui/mtn-browse.glade:8046 +#: lib/ui/mtn-browse.glade:8351 msgid "" "Use this to specify the oldest\n" "modification date for your search" msgstr "" -#: lib/ui/mtn-browse.glade:8072 +#: lib/ui/mtn-browse.glade:8377 msgid "" "Use this to specify the youngest\n" "modification date for your search" msgstr "" -#: lib/ui/mtn-browse.glade:8098 +#: lib/ui/mtn-browse.glade:8403 msgid "The unit of time to be used" msgstr "" -#: lib/ui/mtn-browse.glade:8105 +#: lib/ui/mtn-browse.glade:8410 msgid "" "Minute(s)\n" "Hour(s)\n" @@ -1832,13 +2085,13 @@ msgstr "" "Year(s)" msgstr "" -#: lib/ui/mtn-browse.glade:8126 +#: lib/ui/mtn-browse.glade:8431 msgid "" "The type of comparison\n" "to be performed" msgstr "" -#: lib/ui/mtn-browse.glade:8134 +#: lib/ui/mtn-browse.glade:8439 msgid "" "Any Size\n" "At Least\n" @@ -1846,57 +2099,79 @@ msgstr "" "Equal To" msgstr "" -#: lib/ui/mtn-browse.glade:8155 +#: lib/ui/mtn-browse.glade:8460 msgid "The unit of file size to be used" msgstr "" -#: lib/ui/mtn-browse.glade:8162 +#: lib/ui/mtn-browse.glade:8467 msgid "" "Bytes\n" "KB\n" "MB" msgstr "" -#: lib/ui/mtn-browse.glade:8181 +#: lib/ui/mtn-browse.glade:8486 msgid " " msgstr "" -#: lib/ui/mtn-browse.glade:8211 +#: lib/ui/mtn-browse.glade:8516 msgid "Properties" msgstr "" -#: lib/ui/mtn-browse.glade:8244 +#: lib/ui/mtn-browse.glade:8549 msgid "Stop finding files" msgstr "" -#: lib/ui/mtn-browse.glade:8272 +#: lib/ui/mtn-browse.glade:8577 msgid "Find the files" msgstr "" -#: lib/ui/mtn-browse.glade:8312 +#: lib/ui/mtn-browse.glade:8617 msgid "Query" msgstr "" -#: lib/ui/mtn-browse.glade:8532 +#: lib/ui/mtn-browse.glade:8722 +msgid "Name of the file being displayed" +msgstr "" + +#: lib/ui/mtn-browse.glade:8784 +msgid "Date of when file was last changed" +msgstr "" + +#: lib/ui/mtn-browse.glade:8837 msgid "Author of the selected file" msgstr "" -#: lib/ui/mtn-browse.glade:8565 +#: lib/ui/mtn-browse.glade:8870 msgid "" "Time when the selected file was last\n" "updated with respect to this revision" msgstr "" -#: lib/ui/mtn-browse.glade:8740 +#: lib/ui/mtn-browse.glade:8929 +msgid "File's unique id in database" +msgstr "" + +#: lib/ui/mtn-browse.glade:8991 +msgid "" +"Id of revision when\n" +"file was last changed" +msgstr "" + +#: lib/ui/mtn-browse.glade:9045 msgid "Id of the selected file" msgstr "" -#: lib/ui/mtn-browse.glade:8773 +#: lib/ui/mtn-browse.glade:9052 +msgid "File id:" +msgstr "" + +#: lib/ui/mtn-browse.glade:9078 msgid "" "Revision id in which the selected file was\n" "last updated with respect to this revision" msgstr "" -#: lib/ui/mtn-browse.glade:8825 +#: lib/ui/mtn-browse.glade:9130 msgid "Results" msgstr "" ============================================================ --- mtn-browse 7120b85f4c8a396c26251f3eb075013e53c19e12 +++ mtn-browse 8f65af008b4621935e275303e9ecee8ac3d03cd0 @@ -537,8 +537,8 @@ sub about_activate_cb($$) __("Copyright \xa9 2007-2009 Anthony Cooper"), __("A graphical front-end browser for Monotone VCS databases"), ["Anthony Cooper "], - __("TBD"), - __("TBD"), + __("Anthony Cooper "), + __("Thomas Keller (German translation)"), $large_logo)->run(); }