# # # patch "Makefile.PL" # from [ec3a12eb0a35b677fa4569ac780d0e14d35a668e] # to [780e217031de613e4ae3a26bbb179b06cac1ca21] # # patch "README" # from [afe810aa2473bcf27fda14fb41ca6424a2c3d952] # to [cd0190a6d1bc7fa7ede3eb0ec38b1dd7c16643d6] # # patch "devl-install" # from [5e0dd67c5d937cc7e558bdbdbb31a5672ce4b4a3] # to [9eab9fbef6afe2871670f95146b26e721fcf10ea] # # patch "linux-installer" # from [bb9ea0aef19434b71a3f6991cc4d4c0e87eb1596] # to [e223405a4251e0e8d9ba13558bfd96c3ab9cb516] # # patch "locale/mtn-browse.pot" # from [3c70aa766ecf3847a7b3af600c6a32dd39115f7a] # to [94a675d2bd9b1daa92474629bc0fed68703987ac] # # patch "mtn-browse" # from [853a8ac1c6358d0cf7d8650d50dd58e5739b57aa] # to [2cca409af357ff2a1290088afbea10d5f7813e1b] # ============================================================ --- Makefile.PL ec3a12eb0a35b677fa4569ac780d0e14d35a668e +++ Makefile.PL 780e217031de613e4ae3a26bbb179b06cac1ca21 @@ -5,12 +5,14 @@ my($dest_dir, my($dest_dir, $globs_file, + $help_viewer, $lib_dir, $makefile, $no_use_dists_mas, $prefix_dir); my %valid_options = (DESTDIR => \$dest_dir, GLOBS_FILE => \$globs_file, + HELP_VIEWER => \$help_viewer, LIBDIR => \$lib_dir, NO_USE_DISTS_MAS => \$no_use_dists_mas, PREFIX => \$prefix_dir); @@ -30,10 +32,11 @@ foreach my $arg (@ARGV) else { print(STDERR - "usage: perl Makefile.PL [PREFIX=] [DESTDIR=] [DESTDIR=] " . "[LIBDIR=]\n" . " [GLOBS_FILE=] " - . "[NO_USE_DISTS_MAS=1]\n"); + . "[HELP_VIEWER=]\n" + . " [NO_USE_DISTS_MAS=1]\n"); exit(1); } } @@ -55,10 +58,11 @@ $makefile->print(<new("Makefile", "w"))); $makefile->print(<print(" \$(INSTALLER)"); +$makefile->print("\t\$(INSTALLER)"); $makefile->print(" --globs-file=\$(GLOBS_FILE)") if (defined($globs_file)); $makefile->print(" --destdir=\$(DESTDIR)") if (defined($dest_dir)); $makefile->print(" --libdir=\$(LIBDIR)") if (defined($lib_dir)); +$makefile->print(" --help-viewer=\$(HELP_VIEWER)") if (defined($help_viewer)); $makefile->print(" --no-use-dists-mas") if (defined($no_use_dists_mas) && $no_use_dists_mas != 0); $makefile->print(" --prefix=\$(PREFIX)") if (defined($prefix_dir)); ============================================================ --- README afe810aa2473bcf27fda14fb41ca6424a2c3d952 +++ README cd0190a6d1bc7fa7ede3eb0ec38b1dd7c16643d6 @@ -20,6 +20,44 @@ mtn-browse see http://www.coosoft.plus.com/software.html. +DEPENDENCIES +------------ + +This module requires these other modules and libraries: + + * Perl 5.8.5 or later + * Gnome and Gtk2 + * The following Perl CPAN modules: + - Glib (1.144) * + - Gnome2 (1.040) * + - Gnome2-Canvas (1.002) * + - Gnome2-Print (0.950) * + - Gnome2-VFS (1.080) * + - Gtk2 (1.146) * + - Gtk2-GladeXML (1.006) * + - Gtk2-SourceView (1.000) * + - libintl-perl (1.16) + - Monotone::AutomateStdio (0.05 or later) + +Please note that the Gtk2 CPAN bundle will probably satisfy all of the +dependencies marked with * at the end of the line. + +Older versions of Perl may work but these have not been tested at this point in +time. + +Monotone::AutomateStdio Library +------------------------------- + +This library module is a Perl interface to Monotone's automate stdio interface +and is heavily used by mtn-browse. As such it is probably best to upgrade this +library each time you upgrade Monotone itself. For this reason you may decide +to just install this library as a part of mtn-browse. If you need to upgrade +the library then all you need do is just copy the new version into place. + +The installation process will, by default, install a copy of this library in +mtn-browse's lib directory. + + INSTALLATION ------------ @@ -56,15 +94,15 @@ also be specified via Makefile.PL, meaning that the full list of arguments are: perl Makefile.PL PREFIX= DESTDIR= LIBDIR= \ - GLOBS_FILE= NO_USE_DISTS_MAS=1 + GLOBS_FILE= HELP_VIEWER= NO_USE_DISTS_MAS=1 For further information on what these options mean please run: ./linux-installer -m PREFIX equates to --prefix, DESTDIR equates to --destdir, LIBDIR equates to ---libdir, GLOBS_FILE equates to --globs-file and NO_USE_DISTS_MAS equates to ---no-use-dists-mas. +--libdir, GLOBS_FILE equates to --globs-file, HELP_VIEWER equates to +--help-viewer and NO_USE_DISTS_MAS equates to --no-use-dists-mas. Alternatively one can run the installer directly. See the next subsection. @@ -93,151 +131,7 @@ under /opt/mtn-browse but actually installs it under /tmp/install-dir (i.e. the application can be found at /tmp/install-dir/opt/mtn-browse/bin/mtn-browse). -Manual Installation -------------------- -If you prefer to install this application manually then copy the files into -place using the following directory structure: - - - |-- bin - | `-- mtn-browse - |-- lib - | `-- mtn-browse - | |-- perl - | | |-- AdvancedFind.pm - | | |-- Annotate.pm - | | |-- CachingAutomateStdio.pm - | | |-- ChangeLog.pm - | | |-- ComboAutoCompletion.pm - | | |-- Common.pm - | | |-- Completion.pm - | | |-- FindFiles.pm - | | |-- FindText.pm - | | |-- Globals.pm - | | |-- History.pm - | | |-- Monotone <- 1) - | | | |-- AutomateStdio.pm - | | | `-- AutomateStdio.pod - | | |-- Preferences.pm - | | `-- WindowManager.pm - | `-- ui - | |-- annotate.png - | |-- diffs.png - | |-- external-diffs.png - | |-- line.png - | |-- monotone-viz.png - | |-- mtn-browse-large.png - | |-- mtn-browse.glade - | `-- mtn-browse.png - `-- share - |-- gnome - | `-- help - | `-- mtn-browse - | `-- C - | |-- figures - | | |-- advanced-find-helper-widgets.png - | | |-- advanced-find-window-advanced-mode.png - | | |-- advanced-find-window-empty.png - | | |-- advanced-find-window-simple-mode.png - | | |-- annotate-button.png - | | |-- annotate-window-with-menu.png - | | |-- branch-combobox-entry-with-completion.png - | | |-- change-log-window.png - | | |-- changelog-button.png - | | |-- close-toolbar-button.png - | | |-- combobox-entry-down-button.png - | | |-- compare-button.png - | | |-- differences-window.png - | | |-- execute-button-small.png - | | |-- execute-button.png - | | |-- external-compare-button.png - | | |-- file-viewer-button.png - | | |-- find-button.png - | | |-- find-files-window-empty.png - | | |-- find-files-window-query.png - | | |-- help-toolbar-button.png - | | |-- information-button.png - | | |-- line-numbers-toggle-button.png - | | |-- main-window-empty.png - | | |-- main-window-showing-file.png - | | |-- main-window-showing-hex-dump.png - | | |-- main-window-showing-image-file.png - | | |-- main-window-showing-tooltip-and-selection.png - | | |-- montone-viz-button.png - | | |-- new-toolbar-button.png - | | |-- non-unique-tag-dialog.png - | | |-- open-database-dialog.png - | | |-- open-toolbar-button.png - | | |-- preferences-toolbar-button.png - | | |-- preferences-window.png - | | |-- reload-toolbar-button.png - | | |-- revision-history-window.png - | | |-- save-button.png - | | |-- stop-button.png - | | |-- up-button-small.png - | | `-- up-button.png - | `-- mtn-browse.xml - `-- locale - `-- - `-- LC_MESSAGES - `-- mtn-browse.mo - -The only file that needs to be executable is the mtn-browse file under the bin -directory. - -The mtn-browse.mo file is generated from the relevant .po file by using the -msgfmt(1) command. - -Once the files are in place then edit the mtn-browse executable and change the -constants at the top containing the "@INST:LIB_DIR@", "@INST:GLOBS_FILE@" and -"@INST:PREFIX_DIR@" values so that they contain the correct values. It is -probably best that you actually run the installer as a non-privileged user and -install it somewhere under your home directory and then change the paths -accordingly. - -1) The Monotone directory is only needed if the Monotone::AutomateStdio package - from CPAN has not already been installed. - -Monotone::AutomateStdio Library -------------------------------- - -This library module is a Perl interface to Monotone's automate stdio interface -and is heavily used by mtn-browse. As such it is probably best to upgrade this -library each time you upgrade Monotone itself. For this reason you may decide -to just install this library as a part of mtn-browse. If you need to upgrade -the library then all you need do is just copy the new version into place. - -The installation process will, by default, install a copy of this library in -mtn-browse's lib directory. - - -DEPENDENCIES ------------- - -This module requires these other modules and libraries: - - * Perl 5.8.5 or later - * Gnome and Gtk2 - * The following Perl CPAN modules: - - Glib (1.144) * - - Gnome2 (1.042) * - - Gnome2-Canvas (1.002) * - - Gnome2-Print (1.000) * - - Gnome2-VFS (1.080) * - - Gtk2 (1.146) * - - Gtk2-GladeXML (1.006) * - - Gtk2-SourceView (1.000) * - - libintl-perl (1.16) - - Monotone::AutomateStdio (0.02 or later) - -Please note that the Gtk2 CPAN bundle will probably satisfy all of the -dependencies marked with * at the end of the line. - -Older versions of Perl may work but these have not been tested at this point in -time. - - COPYRIGHT AND LICENCE --------------------- ============================================================ --- devl-install 5e0dd67c5d937cc7e558bdbdbb31a5672ce4b4a3 +++ devl-install 9eab9fbef6afe2871670f95146b26e721fcf10ea @@ -149,6 +149,7 @@ use IO::File; while (defined($input = $infile->getline())) { my $orig = $input; + $input =~ s/address@hidden:HELP_VIEWER_CMD\@//g; $input =~ s/address@hidden:LIB_DIR\@/$lib_dir/g; $input =~ s/address@hidden:GLOBS_FILE\@/$globs_file/g; $input =~ s/address@hidden:PREFIX_DIR\@/$prefix_dir/g; @@ -162,9 +163,12 @@ use IO::File; rename("mtn-browse.out", "mtn-browse"); chmod(0755, "mtn-browse"); - # Do the pixmap symlinks. + # Link in Glade and the pixmaps. - system("cd ${lib_dir}/ui ; ln -s pixmaps/*.png ."); + system("mkdir -p share/mtn-browse ; " + . "ln -s `pwd`/lib/ui share/mtn-browse/glade ; " + . "cd ${lib_dir}/ui ; " + . "ln -s pixmaps/*.png ."); # Link in Monotone::AutomateStdio. ============================================================ --- linux-installer bb9ea0aef19434b71a3f6991cc4d4c0e87eb1596 +++ linux-installer e223405a4251e0e8d9ba13558bfd96c3ab9cb516 @@ -81,6 +81,7 @@ use Installer; $file, $globs_file, $help, + $help_viewer, $infile, $input, $installer, @@ -105,6 +106,7 @@ use Installer; $globs_file = "/usr/share/mime/globs"; $prefix_dir = "/usr"; $lib_dir = "/lib/mtn-browse"; + $help_viewer = ""; $use_dists_mas_lib = 1; # Process any command line options. @@ -115,6 +117,7 @@ use Installer; "dep-level=i" => \$dep_level, "destdir|d=s" => \$dest_dir, "globs-file|g=s" => \$globs_file, + "help-viewer=s" => \$help_viewer, "interactive|i" => \$interactive, "libdir|l=s" => \$lib_dir, "prefix|p=s" => \$prefix_dir, @@ -140,15 +143,15 @@ use Installer; # Build up the dependency list. %deps = ("Glib" => 1.144, - "Gnome2" => 1.042, + "Gnome2" => 1.040, "Gnome2::Canvas" => 1.002, - "Gnome2::Print" => 1.000, + "Gnome2::Print" => 0.950, "Gnome2::VFS" => 1.080, "Gtk2" => 1.146, "Gtk2::GladeXML" => 1.006, "Gtk2::SourceView" => 1.000, "Locale::TextDomain" => 1.16); - $deps{"Monotone::AutomateStdio"} = 0.02 if (! $use_dists_mas_lib); + $deps{"Monotone::AutomateStdio"} = 0.05 if (! $use_dists_mas_lib); # Do the check. @@ -242,6 +245,47 @@ use Installer; if ($interactive) { + print("Use Yelp or web browser to display help (HELP_VIEWER_CMD)? " + . "[Use Yelp]: "); + chomp($input = ); + ($input) = ($input =~ m/^\s*(.*)\s*$/); + $help_viewer = $input if ($input ne ""); + } + if ($help_viewer ne "") + { + my $found; + + # Check full paths or scan $PATH for it. + + if ($help_viewer =~ m/^\//) + { + $found = 1 if (-x $help_viewer); + } + else + { + my $cmd; + $cmd = (split(/[[:blank:]]/, $help_viewer))[0]; + foreach my $dir (split(/:/, $ENV{PATH})) + { + if (-x "${dir}/$cmd") + { + $found = 1; + last; + } + } + } + + if (! $found) + { + print("Error: Program `" . $help_viewer + . "' cannot be found or is not executable.\n"); + exit(1) if (! $interactive); + next; + } + } + + if ($interactive) + { print("Use the Monotone::AutomateStdio (MAS) library that came " . "with this package? [Y]: "); chomp($input = ); @@ -258,11 +302,13 @@ use Installer; if ($confirm || $interactive || ! $quiet) { print("\nInstallation options are:\n"); - print("GLOBS_FILE = " . $globs_file . "\n"); - print("PREFIX_DIR = " . $prefix_dir . "\n"); - print("DEST_DIR = " . $dest_dir . "\n"); - print("LIB_DIR = /" . $lib_dir . "\n"); - print("Use my MAS = " . ($use_dists_mas_lib ? "Yes" : "No") + print("GLOBS_FILE = " . $globs_file . "\n"); + print("PREFIX_DIR = " . $prefix_dir . "\n"); + print("DEST_DIR = " . $dest_dir . "\n"); + print("LIB_DIR = /" . $lib_dir . "\n"); + print("HELP_VIEWER_CMD = " + . (($help_viewer ne "") ? $help_viewer : "Use Yelp") . "\n"); + print("Use my MAS = " . ($use_dists_mas_lib ? "Yes" : "No") . "\n"); } if ($interactive) @@ -297,6 +343,7 @@ use Installer; if (! defined($outfile = IO::File->new("mtn-browse.out", "w"))); while (defined($input = $infile->getline())) { + $input =~ s/address@hidden:HELP_VIEWER_CMD\@/$help_viewer/g; $input =~ s/address@hidden:LIB_DIR\@/$lib_prefix_dir/g; $input =~ s/address@hidden:GLOBS_FILE\@/$globs_file/g; $input =~ s/address@hidden:PREFIX_DIR\@/$prefix_dir/g; @@ -349,12 +396,14 @@ use Installer; # Install GUI components. $installer->install("lib/ui/mtn-browse.glade", - "${lib_dest_dir}/ui/mtn-browse.glade"); + "${prefix_dest_dir}/share/mtn-browse/glade/" + . "mtn-browse.glade"); die("IO::Dir failed with $!") if (! defined($dir = IO::Dir->new("lib/ui/pixmaps"))); while (defined($file = $dir->read())) { - $installer->install("lib/ui/pixmaps/$file", "${lib_dest_dir}/ui/$file") + $installer->install("lib/ui/pixmaps/$file", + "${prefix_dest_dir}/share/mtn-browse/glade/$file") if ($file =~ m/.*\.png$/); } $dir->close(); @@ -385,9 +434,38 @@ use Installer; next if ($locale eq "." || $locale eq ".."); my($figures_dir, $img_file); - $installer->install("locale/help/${locale}/mtn-browse.xml", - "${prefix_dest_dir}/share/gnome/help/mtn-browse/" - . "${locale}/mtn-browse.xml"); + if ($help_viewer ne "") + { + my($html_file, + $subdir); + die("IO::Dir failed with $!") + if (! defined($subdir = + IO::Dir->new("locale/help/${locale}"))); + while (defined($html_file = $subdir->read())) + { + next unless ($html_file =~ m/^[^.]+\.html$/); + $installer->install("locale/help/${locale}/$html_file", + "${prefix_dest_dir}/share/gnome/help/" + . "mtn-browse/${locale}/$html_file"); + } + die("IO::Dir failed with $!") + if (! defined($subdir = + IO::Dir->new("locale/help/${locale}/images"))); + while (defined($img_file = $subdir->read())) + { + next if ($img_file eq "." || $img_file eq ".."); + $installer->install("locale/help/${locale}/images/$img_file", + "${prefix_dest_dir}/share/gnome/help/" + . "mtn-browse/${locale}/images/" + . "$img_file"); + } + } + else + { + $installer->install("locale/help/${locale}/mtn-browse.xml", + "${prefix_dest_dir}/share/gnome/help/" + . "mtn-browse/${locale}/mtn-browse.xml"); + } die("IO::Dir failed with $!") if (! defined($figures_dir = IO::Dir->new("locale/help/${locale}/figures"))); @@ -399,6 +477,17 @@ use Installer; . "mtn-browse/${locale}/figures/" . "$img_file"); } + die("IO::Dir failed with $!") + if (! defined($figures_dir = + IO::Dir->new("locale/help/${locale}/figures"))); + while (defined($img_file = $figures_dir->read())) + { + next if ($img_file eq "." || $img_file eq ".."); + $installer->install("locale/help/${locale}/figures/$img_file", + "${prefix_dest_dir}/share/gnome/help/" + . "mtn-browse/${locale}/figures/" + . "$img_file"); + } } $dir->close(); @@ -429,6 +518,7 @@ linux-installer [options] --dep-level= LEVEL Specify type of dependency checking --destdir= -d DIR Specify temp installation location --globs-file= -g FILE Location of MIME globs file + --help-viewer PATH Viewer used to display help files --interactive -i Ask questions interactively --libdir= -l DIR Library dir relative to PREFIX_DIR --prefix= -p DIR Installation location @@ -469,6 +559,22 @@ Specify the location of the system's MIM Specify the location of the system's MIME globs file. The default is /usr/share/mime/globs. +=item B<--help-viewer> + +Specify the the program used to display the HTML help pages. Normally Yelp +style help documentation is installed (in the form of XML files). Whilst Yelp +is the Gnome desktop's help system there are some installations where Yelp +itself is not available. In these situations one can specify the name of a web +browser that can be used to display the help documentation in the form of HTML +files (i.e. there is no need for the web browser to understand Yelp XML files). + +Specifying this switch has two effects. Firstly mtn-browse is configured to run +the specified web browser when it needs to display help documentation, and +secondly HTML documentation is installed in the place of the Yelp XML +documentation. + +The default is to use Yelp and simply install the XML documentation files. + =item B<--interactive or -i> Ask for all of the installation options interactively rather than getting ============================================================ --- locale/mtn-browse.pot 3c70aa766ecf3847a7b3af600c6a32dd39115f7a +++ locale/mtn-browse.pot 94a675d2bd9b1daa92474629bc0fed68703987ac @@ -8,7 +8,7 @@ msgstr "" msgstr "" "Project-Id-Version: mtn-browse 0.1\n" "Report-Msgid-Bugs-To: address@hidden" -"POT-Creation-Date: 2009-05-03 17:19+0100\n" +"POT-Creation-Date: 2009-06-05 21:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,26 +17,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: mtn-browse:225 +#: mtn-browse:231 #, perl-brace-format msgid "" "Your preferences cannot be loaded:\n" "{error_message}" msgstr "" -#: mtn-browse:247 +#: mtn-browse:253 #, perl-brace-format msgid "" "{error_message}\n" "This is fatal, I am going to exit." msgstr "" -#: mtn-browse:307 +#: mtn-browse:313 #, perl-brace-format msgid "Cannot open database {database_name}." msgstr "" -#: mtn-browse:498 +#: mtn-browse:505 #, perl-brace-format msgid "" "Gnome cannot display Monotone Browser's\n" @@ -44,39 +44,39 @@ msgstr "" "{gnome_error_message}" msgstr "" -#: mtn-browse:537 +#: mtn-browse:544 msgid "Copyright © 2007-2009 Anthony Cooper" msgstr "" -#: mtn-browse:538 +#: mtn-browse:545 msgid "A graphical front-end browser for Monotone VCS databases" msgstr "" -#: mtn-browse:540 +#: mtn-browse:547 msgid "Anthony Cooper " msgstr "" -#: mtn-browse:541 +#: mtn-browse:548 msgid "Thomas Keller (German translation)" msgstr "" -#: mtn-browse:1205 lib/perl/History.pm:1964 +#: mtn-browse:1212 lib/perl/History.pm:1966 #, perl-brace-format msgid "" "Cannot generate temporary file name:\n" "{error_message}." msgstr "" -#: mtn-browse:1221 lib/perl/Common.pm:535 lib/perl/History.pm:1981 +#: mtn-browse:1228 lib/perl/Common.pm:545 lib/perl/History.pm:1983 #, perl-brace-format msgid "{error_message}." msgstr "" -#: mtn-browse:1281 +#: mtn-browse:1288 msgid "Unknown file type, not viewing." msgstr "" -#: mtn-browse:1298 +#: mtn-browse:1305 #, perl-brace-format msgid "" "Gnome cannot launch the helper application\n" @@ -85,7 +85,7 @@ msgstr "" "{gnome_error_message}" msgstr "" -#: mtn-browse:1314 +#: mtn-browse:1321 #, perl-brace-format msgid "" "No application is associated with\n" @@ -93,69 +93,69 @@ msgstr "" "using Vi instead." msgstr "" -#: mtn-browse:1705 +#: mtn-browse:1713 msgid "File Name" msgstr "" -#: mtn-browse:1720 +#: mtn-browse:1728 msgid "Last Update" msgstr "" -#: mtn-browse:1730 lib/perl/AdvancedFind.pm:306 lib/perl/AdvancedFind.pm:687 +#: mtn-browse:1738 lib/perl/AdvancedFind.pm:306 lib/perl/AdvancedFind.pm:688 msgid "Author" msgstr "" -#: mtn-browse:1793 +#: mtn-browse:1802 msgid "mtnb-gsc-menus" msgstr "" -#: mtn-browse:1795 +#: mtn-browse:1804 msgid "mtnb-gsc-tool-bar" msgstr "" -#: mtn-browse:1797 +#: mtn-browse:1806 msgid "mtnb-gsc-selecting-a-branch-and-revision" msgstr "" -#: mtn-browse:1799 mtn-browse:1803 mtn-browse:1809 lib/perl/FindText.pm:787 +#: mtn-browse:1808 mtn-browse:1812 mtn-browse:1818 lib/perl/FindText.pm:784 msgid "mtnb-gsc-browser-buttons" msgstr "" -#: mtn-browse:1801 mtn-browse:1805 +#: mtn-browse:1810 mtn-browse:1814 msgid "mtnb-gsc-selecting-a-file-to-display" msgstr "" -#: mtn-browse:1807 mtn-browse:1811 +#: mtn-browse:1816 mtn-browse:1820 msgid "mtnb-gsc-information-fields" msgstr "" -#: mtn-browse:1813 +#: mtn-browse:1822 msgid "mtnb-gsc-monotone-browser-window-at-a-glance" msgstr "" -#: mtn-browse:1942 lib/perl/Preferences.pm:316 lib/perl/Preferences.pm:367 +#: mtn-browse:1951 lib/perl/Preferences.pm:316 lib/perl/Preferences.pm:367 #, perl-brace-format msgid "open failed: {error_message}\n" msgstr "" -#: mtn-browse:2066 +#: mtn-browse:2075 #, perl-brace-format msgid " ({database_name})" msgstr "" -#: mtn-browse:2108 lib/perl/AdvancedFind.pm:833 +#: mtn-browse:2117 lib/perl/AdvancedFind.pm:835 msgid "Fetching branch list" msgstr "" -#: mtn-browse:2115 lib/perl/AdvancedFind.pm:841 +#: mtn-browse:2124 lib/perl/AdvancedFind.pm:843 msgid "Populating branch list" msgstr "" -#: mtn-browse:2157 +#: mtn-browse:2166 msgid "Auto selecting head revision" msgstr "" -#: mtn-browse:2172 +#: mtn-browse:2181 #, perl-brace-format msgid "" "The `{branch}' branch has multiple heads\n" @@ -164,20 +164,20 @@ msgstr "" "The head revision ids are:" msgstr "" -#: mtn-browse:2208 lib/perl/AdvancedFind.pm:890 lib/perl/History.pm:156 +#: mtn-browse:2217 lib/perl/AdvancedFind.pm:892 lib/perl/History.pm:156 #: lib/perl/History.pm:358 msgid "Fetching revision list" msgstr "" -#: mtn-browse:2221 lib/perl/AdvancedFind.pm:905 +#: mtn-browse:2230 lib/perl/AdvancedFind.pm:907 msgid "Populating revision list" msgstr "" -#: mtn-browse:2277 +#: mtn-browse:2286 msgid "Fetching manifest" msgstr "" -#: mtn-browse:2287 +#: mtn-browse:2296 #, perl-brace-format msgid "" "The `{tag_name}' tag is not unique on this branch.\n" @@ -186,40 +186,40 @@ msgstr "" "The matching revision ids are:" msgstr "" -#: mtn-browse:2356 +#: mtn-browse:2365 msgid "Populating directory list" msgstr "" -#: mtn-browse:2428 +#: mtn-browse:2437 msgid "Populating file details" msgstr "" -#: mtn-browse:2668 +#: mtn-browse:2677 msgid "Unknown Contents" msgstr "" -#: mtn-browse:2725 +#: mtn-browse:2734 msgid "Hex dump:\n" msgstr "" -#: mtn-browse:2881 +#: mtn-browse:2891 msgid "" "Your version of Monotone does not support\n" "suspend certificates. I will adjusted your\n" "preferences accordingly." msgstr "" -#: mtn-browse:2899 lib/perl/Common.pm:1183 lib/perl/Preferences.pm:269 +#: mtn-browse:2909 lib/perl/Common.pm:1193 lib/perl/Preferences.pm:269 msgid "Your preferences could not be saved:\n" msgstr "" -#: mtn-browse:2940 +#: mtn-browse:2950 msgid "" "The Monotone database is currently locked, please\n" "dismiss this dialog when this is no longer the case." msgstr "" -#: mtn-browse:2980 +#: mtn-browse:2990 #, perl-brace-format msgid "" "Problem with monotone request, got:\n" @@ -227,7 +227,7 @@ msgstr "" "This should not be happening!" msgstr "" -#: mtn-browse:2997 +#: mtn-browse:3007 #, perl-brace-format msgid "" "Monotone process unexpectedly exiting with:\n" @@ -235,17 +235,17 @@ msgstr "" "This is fatal, I am going to exit." msgstr "" -#: mtn-browse:3049 +#: mtn-browse:3059 #, perl-brace-format msgid "terminated by signal {number}" msgstr "" -#: mtn-browse:3054 +#: mtn-browse:3064 #, perl-brace-format msgid "exited with status {number}" msgstr "" -#: mtn-browse:3062 +#: mtn-browse:3072 #, perl-brace-format msgid "" "The mtn subprocess just unexpectedly\n" @@ -254,12 +254,12 @@ msgstr "" "It will be restarted when needed." msgstr "" -#: mtn-browse:3077 +#: mtn-browse:3087 #, perl-brace-format msgid "waitpid failed: {error_message}" msgstr "" -#: mtn-browse:3107 +#: mtn-browse:3117 #, perl-brace-format msgid "pipe failed: {error_message}" msgstr "" @@ -268,7 +268,7 @@ msgstr "" msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:310 lib/perl/AdvancedFind.pm:667 +#: lib/perl/AdvancedFind.pm:310 lib/perl/AdvancedFind.pm:668 msgid "Branch" msgstr "" @@ -312,7 +312,7 @@ msgstr "" msgid "Logical And" msgstr "" -#: lib/perl/AdvancedFind.pm:342 lib/perl/AdvancedFind.pm:631 +#: lib/perl/AdvancedFind.pm:342 lib/perl/AdvancedFind.pm:632 msgid "Message" msgstr "" @@ -320,7 +320,7 @@ msgstr "" msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:346 lib/perl/AdvancedFind.pm:633 +#: lib/perl/AdvancedFind.pm:346 lib/perl/AdvancedFind.pm:634 msgid "Parent" msgstr "" @@ -332,53 +332,53 @@ msgstr "" msgid "" msgstr "" -#: lib/perl/AdvancedFind.pm:400 lib/perl/AdvancedFind.pm:677 +#: lib/perl/AdvancedFind.pm:400 lib/perl/AdvancedFind.pm:678 msgid "Date" msgstr "" -#: lib/perl/AdvancedFind.pm:655 +#: lib/perl/AdvancedFind.pm:656 msgid "Revision Id" msgstr "" -#: lib/perl/AdvancedFind.pm:727 +#: lib/perl/AdvancedFind.pm:729 msgid "mtnb-mcqc-simple-queries" msgstr "" -#: lib/perl/AdvancedFind.pm:729 +#: lib/perl/AdvancedFind.pm:731 msgid "mtnb-mcqc-helper-tools" msgstr "" -#: lib/perl/AdvancedFind.pm:731 +#: lib/perl/AdvancedFind.pm:733 msgid "mtnb-mcqc-the-advanced-find-dialog-window" msgstr "" -#: lib/perl/AdvancedFind.pm:945 +#: lib/perl/AdvancedFind.pm:947 msgid "Finding revisions" msgstr "" -#: lib/perl/AdvancedFind.pm:977 +#: lib/perl/AdvancedFind.pm:979 #, perl-brace-format msgid "" "There is a problem with your query, Monotone gave:\n" "{error_message}" msgstr "" -#: lib/perl/AdvancedFind.pm:1005 +#: lib/perl/AdvancedFind.pm:1007 msgid "No revisions matched your query." msgstr "" -#: lib/perl/AdvancedFind.pm:1023 +#: lib/perl/AdvancedFind.pm:1025 msgid "Populating revision details" msgstr "" -#: lib/perl/AdvancedFind.pm:1197 +#: lib/perl/AdvancedFind.pm:1199 #, perl-brace-format msgid "Found 1 revision" msgid_plural "Found {revisions_found} revisions" msgstr[0] "" msgstr[1] "" -#: lib/perl/AdvancedFind.pm:1204 lib/perl/FindFiles.pm:657 +#: lib/perl/AdvancedFind.pm:1206 lib/perl/FindFiles.pm:659 msgid "Nothing found" msgstr "" @@ -470,11 +470,11 @@ msgstr "" "the specific parent revision." msgstr "" -#: lib/perl/Annotate.pm:755 +#: lib/perl/Annotate.pm:756 msgid "mtnb-lachc-the-annotated-listing-window" msgstr "" -#: lib/perl/Annotate.pm:833 +#: lib/perl/Annotate.pm:834 #, perl-brace-format msgid "" "Problem running mtn annotate, got:\n" @@ -511,36 +511,36 @@ msgstr "" msgid "Revision id: " msgstr "" -#: lib/perl/ChangeLog.pm:248 +#: lib/perl/ChangeLog.pm:275 #, perl-brace-format msgid "" "\n" "Change Log{optional_count}:\n" msgstr "" -#: lib/perl/ChangeLog.pm:266 +#: lib/perl/ChangeLog.pm:293 msgid "" "\n" "\n" "Changes Made:\n" msgstr "" -#: lib/perl/ChangeLog.pm:298 +#: lib/perl/ChangeLog.pm:325 #, perl-brace-format msgid "{name}: {attribute} was cleared" msgstr "" -#: lib/perl/ChangeLog.pm:343 +#: lib/perl/ChangeLog.pm:370 msgid "" "\n" "Parent revision id(s): " msgstr "" -#: lib/perl/ChangeLog.pm:350 +#: lib/perl/ChangeLog.pm:377 msgid "Manifest id: " msgstr "" -#: lib/perl/ChangeLog.pm:437 +#: lib/perl/ChangeLog.pm:465 msgid "mtnb-lachc-the-change-log-window" msgstr "" @@ -561,7 +561,7 @@ msgstr "" msgid "Invalid {name} name `{value}'" msgstr "" -#: lib/perl/Common.pm:179 +#: lib/perl/Common.pm:189 #, perl-brace-format msgid "" "The {name} subprocess could not start,\n" @@ -569,14 +569,14 @@ msgstr "" "{error_message}" msgstr "" -#: lib/perl/Common.pm:236 +#: lib/perl/Common.pm:246 #, perl-brace-format msgid "" "waitpid failed with:\n" "{error_message}" msgstr "" -#: lib/perl/Common.pm:251 +#: lib/perl/Common.pm:261 #, perl-brace-format msgid "" "The {name} subprocess failed with an exit status\n" @@ -584,96 +584,102 @@ msgstr "" "{error_message}" msgstr "" -#: lib/perl/Common.pm:268 +#: lib/perl/Common.pm:278 #, perl-brace-format msgid "The {name} subprocess was terminated by signal {number}." msgstr "" -#: lib/perl/Common.pm:366 +#: lib/perl/Common.pm:376 msgid "Open Database" msgstr "" -#: lib/perl/Common.pm:426 +#: lib/perl/Common.pm:436 msgid "Not a valid Monotone database." msgstr "" -#: lib/perl/Common.pm:486 +#: lib/perl/Common.pm:496 msgid "Save As" msgstr "" -#: lib/perl/Common.pm:517 +#: lib/perl/Common.pm:527 msgid "" "File already exists.\n" "Do you want to replace it?" msgstr "" -#: lib/perl/Common.pm:518 +#: lib/perl/Common.pm:528 msgid "Confirm" msgstr "" -#: lib/perl/Common.pm:629 +#: lib/perl/Common.pm:639 msgid "Select As Search Column" msgstr "" +#: lib/perl/Common.pm:1276 +msgid "" +"The requested help section\n" +"cannot be found or is not known." +msgstr "" + #: lib/perl/FindFiles.pm:128 #, perl-brace-format msgid "Find Files Within Revision {rev}" msgstr "" -#: lib/perl/FindFiles.pm:499 +#: lib/perl/FindFiles.pm:501 msgid "Finding matching files" msgstr "" -#: lib/perl/FindFiles.pm:641 +#: lib/perl/FindFiles.pm:643 #, perl-brace-format msgid "Found 1 file" msgid_plural "Found {files_found} files" msgstr[0] "" msgstr[1] "" -#: lib/perl/FindFiles.pm:654 +#: lib/perl/FindFiles.pm:656 msgid "No files matched your query." msgstr "" -#: lib/perl/FindFiles.pm:995 lib/perl/FindFiles.pm:997 -#: lib/perl/FindFiles.pm:999 +#: lib/perl/FindFiles.pm:998 lib/perl/FindFiles.pm:1000 +#: lib/perl/FindFiles.pm:1002 msgid "mtnb-ffwarc-query-fields" msgstr "" -#: lib/perl/FindFiles.pm:1001 +#: lib/perl/FindFiles.pm:1004 msgid "mtnb-ffwarc-query-buttons" msgstr "" -#: lib/perl/FindFiles.pm:1003 +#: lib/perl/FindFiles.pm:1006 msgid "mtnb-ffwarc-the-find-files-window" msgstr "" -#: lib/perl/FindFiles.pm:1078 lib/perl/Preferences.pm:870 +#: lib/perl/FindFiles.pm:1081 lib/perl/Preferences.pm:870 #, perl-brace-format msgid "" "`{pattern}' is an invalid\n" "file name pattern." msgstr "" -#: lib/perl/FindFiles.pm:1101 lib/perl/FindText.pm:402 +#: lib/perl/FindFiles.pm:1104 lib/perl/FindText.pm:398 #, perl-brace-format msgid "" "`{pattern}' is an invalid\n" "content search pattern." msgstr "" -#: lib/perl/FindFiles.pm:1119 +#: lib/perl/FindFiles.pm:1122 msgid "" "The `between' dates are either\n" "the same or the wrong way round." msgstr "" -#: lib/perl/FindFiles.pm:1139 +#: lib/perl/FindFiles.pm:1142 #, perl-brace-format msgid "A duration of {months} months is too long." msgstr "" -#: lib/perl/FindFiles.pm:1153 +#: lib/perl/FindFiles.pm:1156 #, perl-brace-format msgid "A duration of {years} years is too long." msgstr "" @@ -682,7 +688,7 @@ msgstr "" msgid "_Find" msgstr "" -#: lib/perl/FindText.pm:574 +#: lib/perl/FindText.pm:569 #, perl-brace-format msgid "" "Could not find\n" @@ -827,50 +833,50 @@ msgstr "" msgid "unified_diff.patch" msgstr "" -#: lib/perl/History.pm:1569 lib/perl/History.pm:1571 +#: lib/perl/History.pm:1570 lib/perl/History.pm:1572 msgid "mtnb-lachc-history-buttons" msgstr "" -#: lib/perl/History.pm:1573 +#: lib/perl/History.pm:1574 msgid "mtnb-lachc-the-revision-and-file-history-windows" msgstr "" -#: lib/perl/History.pm:1835 lib/perl/History.pm:1842 +#: lib/perl/History.pm:1837 lib/perl/History.pm:1844 msgid "Revision Change Log" msgstr "" -#: lib/perl/History.pm:1848 +#: lib/perl/History.pm:1850 msgid "- Revision Change Log" msgstr "" -#: lib/perl/History.pm:1850 +#: lib/perl/History.pm:1852 msgid "+ Revision Change Log" msgstr "" -#: lib/perl/History.pm:1862 lib/perl/History.pm:1864 +#: lib/perl/History.pm:1864 lib/perl/History.pm:1866 msgid "mtnb-lachc-differences-buttons" msgstr "" -#: lib/perl/History.pm:1866 +#: lib/perl/History.pm:1868 msgid "mtnb-lachc-the-differences-window" msgstr "" -#: lib/perl/History.pm:1944 +#: lib/perl/History.pm:1946 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 +#: lib/perl/History.pm:1956 msgid "OLDER_" msgstr "" -#: lib/perl/History.pm:1957 +#: lib/perl/History.pm:1959 msgid "NEWER_" msgstr "" -#: lib/perl/History.pm:2073 +#: lib/perl/History.pm:2075 #, perl-brace-format msgid "" "Problem running mtn diff, got:\n" @@ -927,29 +933,29 @@ msgstr "" "`{mime_type}'." msgstr "" -#: lib/perl/Preferences.pm:1115 +#: lib/perl/Preferences.pm:1116 msgid "MIME Type" msgstr "" -#: lib/perl/Preferences.pm:1125 +#: lib/perl/Preferences.pm:1126 msgid "File Name Patterns" msgstr "" -#: lib/perl/Preferences.pm:1135 +#: lib/perl/Preferences.pm:1136 msgid "Helper Application" msgstr "" -#: lib/perl/Preferences.pm:1187 +#: lib/perl/Preferences.pm:1189 msgid "mtnb-upc-the-preferences-dialog-window" msgstr "" -#: lib/perl/Preferences.pm:1582 +#: lib/perl/Preferences.pm:1584 msgid "" "The external file comparison application field is\n" "invalid, please correct before attempting to resave." msgstr "" -#: lib/perl/Preferences.pm:1692 +#: lib/perl/Preferences.pm:1694 msgid "Cannot load system MIME types.\n" msgstr "" ============================================================ --- mtn-browse 853a8ac1c6358d0cf7d8650d50dd58e5739b57aa +++ mtn-browse 2cca409af357ff2a1290088afbea10d5f7813e1b @@ -117,7 +117,10 @@ use constant MLS_MANIFEST_ENTRY_COLUMN = # Constants for various file paths. -use constant UI_DIR => File::Spec->catfile(LIB_DIR, "ui"); +use constant UI_DIR => File::Spec->catfile(PREFIX_DIR, + "share", + "mtn-browse", + "glade"); # The type of window that is going to be managed by this module.