#
#
# patch "AdvancedFind.pm"
# from [9403bfc2e2ec4155da6ca1b6460d450efe5dcebf]
# to [0df145e7f63d83d0d31fb191e9fd758ef81cac5f]
#
# patch "ComboAutoCompletion.pm"
# from [adfea7a4a9b159b9f304f112644c3c3951a2391c]
# to [397253841576af0e8935360c5bc39820c7f016e5]
#
# patch "Common.pm"
# from [2071b3e516e2db9781963a6fed62fc169d571291]
# to [c3f5580d02f5d16b1c1364b5e9f3ae74391c3dd1]
#
# patch "FindFiles.pm"
# from [a0a330c0bf3a006487a06c645ce78eb705de0f7d]
# to [b00f4bb068df519f3b552d2373b4aaf465908c33]
#
# patch "History.pm"
# from [1fea04fcf7d196ce884c4c1d74162f783e1a4f0b]
# to [5541b98ade535910280cc2c3485d8a0fa7b76e97]
#
# patch "Preferences.pm"
# from [e7a7991e6e5d4b6df1b5eb1e790989251e7c1829]
# to [aa95319d71e080bd6fb6a5c6cc32780d94dff0f6]
#
# patch "WindowManager.pm"
# from [3e96305d61a5d4de8aec18e65e580f251b321143]
# to [22103783ebb0475581144a676cc5e2e749117c74]
#
# patch "mtn-browse"
# from [fe58c0701ae849dd67f692545e201088a2d39b9f]
# to [b8ae7273e8d6b067c129da19fb005d10996929ad]
#
============================================================
--- AdvancedFind.pm 9403bfc2e2ec4155da6ca1b6460d450efe5dcebf
+++ AdvancedFind.pm 0df145e7f63d83d0d31fb191e9fd758ef81cac5f
@@ -944,10 +944,10 @@ sub update_advanced_find_state($$)
["modal"],
"warning",
"close",
- __("Problem with your query, Monotone ")
- . __x("gave:\n{error_message}",
- error_message =>
- Glib::Markup::escape_text($message)));
+ __x("There is a problem with your query, Monotone "
+ . "gave:\n{error_message}",
+ error_message =>
+ Glib::Markup::escape_text($message)));
$wm->allow_input(sub { $dialog->run(); });
$dialog->destroy();
die("Bad query"); });
============================================================
--- ComboAutoCompletion.pm adfea7a4a9b159b9f304f112644c3c3951a2391c
+++ ComboAutoCompletion.pm 397253841576af0e8935360c5bc39820c7f016e5
@@ -227,10 +227,9 @@ sub comboboxentry_key_release_event_cb($
}
else
{
- $instance->{appbar}->
- push(__x("Invalid {name} name `{value}'",
- name => $name,
- value => $value));
+ $instance->{appbar}->push(__x("Invalid {name} name `{value}'",
+ name => $name,
+ value => $value));
}
$value = $completion;
$len = length($value);
============================================================
--- Common.pm 2071b3e516e2db9781963a6fed62fc169d571291
+++ Common.pm c3f5580d02f5d16b1c1364b5e9f3ae74391c3dd1
@@ -167,10 +167,10 @@ sub run_command($@)
["modal"],
"warning",
"close",
- __x("The {name} subprocess could not start,\n",
- name => Glib::Markup::escape_text($args[0]))
- . __x("the system gave:\n{error_message}",
- error_message => Glib::Markup::escape_text($@)));
+ __x("The {name} subprocess could not start,\n"
+ . "the system gave:\n{error_message}",
+ name => Glib::Markup::escape_text($args[0]),
+ error_message => Glib::Markup::escape_text($@)));
WindowManager->instance()->allow_input(sub { $dialog->run(); });
$dialog->destroy();
return;
@@ -239,13 +239,12 @@ sub run_command($@)
["modal"],
"warning",
"close",
- __x("The {name} subprocess failed with an exit status\n",
- name => Glib::Markup::escape_text($args[0]))
- . __x("of {exit_code} and printed the following on stderr:\n",
- exit_code => WEXITSTATUS($status))
- . __x("{error_message}",
- error_message =>
- Glib::Markup::escape_text(join("", @err))));
+ __x("The {name} subprocess failed with an exit status\n"
+ . "of {exit_code} and printed the following on stderr:\n"
+ . "{error_message}",
+ name => Glib::Markup::escape_text($args[0]),
+ exit_code => WEXITSTATUS($status),
+ error_message => Glib::Markup::escape_text(join("", @err))));
WindowManager->instance()->allow_input(sub { $dialog->run(); });
$dialog->destroy();
return;
============================================================
--- FindFiles.pm a0a330c0bf3a006487a06c645ce78eb705de0f7d
+++ FindFiles.pm b00f4bb068df519f3b552d2373b4aaf465908c33
@@ -1111,8 +1111,8 @@ sub validate_query($$)
["modal"],
"warning",
"close",
- __("The `between' dates are either\n")
- . __("the same or the wrong way round."));
+ __("The `between' dates are either\n"
+ . "the same or the wrong way round."));
$dialog->run();
$dialog->destroy();
return;
============================================================
--- History.pm 1fea04fcf7d196ce884c4c1d74162f783e1a4f0b
+++ History.pm 5541b98ade535910280cc2c3485d8a0fa7b76e97
@@ -55,6 +55,27 @@ use constant CLS_FILE_ID_2_COLUMN => 3;
use constant CLS_FILE_ID_1_COLUMN => 2;
use constant CLS_FILE_ID_2_COLUMN => 3;
+# The translated history strings.
+
+my $__browse_file = __("Browse File");
+my $__browse_file_ttip = __("Browse the file in\na new browser window");
+my $__browse_rev = __("Browse Revision");
+my $__browse_rev_ttip = __("Browse the revision in\n"
+ . "a new browser window");
+my $__full_changelog = __("Full Change Log");
+my $__full_changelog_ttip = __("View the revision's full change log");
+my $__select_id_1 = __("Select As Id 1");
+my $__select_id_2 = __("Select As Id 2");
+my $__select_id_file_1_ttip = __("Select this file revision for\n"
+ . "comparison as the first file");
+my $__select_id_file_2_ttip = __("Select this file revision for\n"
+ . "comparison as the second file");
+my $__select_id_rev_1_ttip = __("Select this revision for comparison\n"
+ . "as the second revision");
+my $__select_id_rev_2_ttip = __("Select this revision for comparison\n"
+ . "as the first revision");
+
+
# ***** FUNCTIONAL PROTOTYPES *****
# Public routines.
@@ -173,15 +194,13 @@ sub display_revision_change_history($$$)
# Add the buttons.
- $button = Gtk2::Button->new(__("Select As Id 1"));
+ $button = Gtk2::Button->new($__select_id_1);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "1"});
- $tooltips->set_tip($button,
- __("Select this revision for comparison\n")
- . __("as the first revision"));
+ $tooltips->set_tip($button, $__select_id_rev_1_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -191,15 +210,13 @@ sub display_revision_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Select As Id 2"));
+ $button = Gtk2::Button->new($__select_id_2);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "2"});
- $tooltips->set_tip($button,
- __("Select this revision for comparison\n")
- . __("as the second revision"));
+ $tooltips->set_tip($button, $__select_id_rev_2_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -209,14 +226,13 @@ sub display_revision_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Browse Revision"));
+ $button = Gtk2::Button->new($__browse_rev);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "browse-revision"});
- $tooltips->set_tip($button,
- __("Browse the revision in\na new browser window"));
+ $tooltips->set_tip($button, $__browse_rev_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -226,13 +242,13 @@ sub display_revision_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Full Change Log"));
+ $button = Gtk2::Button->new($__full_changelog);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "revision-changelog"});
- $tooltips->set_tip($button, __("View the revision's full change log"));
+ $tooltips->set_tip($button, $__full_changelog_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -380,15 +396,13 @@ sub display_file_change_history($$$)
# Add the buttons.
- $button = Gtk2::Button->new(__("Select As Id 1"));
+ $button = Gtk2::Button->new($__select_id_1);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "1"});
- $tooltips->set_tip($button,
- __("Select this file revision for\n")
- . __("comparison as the first file"));
+ $tooltips->set_tip($button, $__select_id_file_1_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -398,15 +412,13 @@ sub display_file_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Select As Id 2"));
+ $button = Gtk2::Button->new($__select_id_2);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "2"});
- $tooltips->set_tip($button,
- __("Select this file revision for\n")
- . __("comparison as the second file"));
+ $tooltips->set_tip($button, $__select_id_file_2_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -416,14 +428,13 @@ sub display_file_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Browse File"));
+ $button = Gtk2::Button->new($__browse_file);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "browse-file"});
- $tooltips->set_tip($button,
- __("Browse the file in\na new browser window"));
+ $tooltips->set_tip($button, $__browse_file_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
@@ -433,13 +444,13 @@ sub display_file_change_history($$$)
$instance->{history_buffer}->
insert($instance->{history_buffer}->get_end_iter(), " ");
- $button = Gtk2::Button->new(__("Full Change Log"));
+ $button = Gtk2::Button->new($__full_changelog);
$button->signal_connect("clicked",
\&history_list_button_clicked_cb,
{instance => $instance,
revision_id => $revision_id,
button_type => "revision-changelog"});
- $tooltips->set_tip($button, __("View the revision's full change log"));
+ $tooltips->set_tip($button, $__full_changelog_ttip);
$instance->{history_textview}->add_child_at_anchor
($button,
$instance->{history_buffer}->
============================================================
--- Preferences.pm e7a7991e6e5d4b6df1b5eb1e790989251e7c1829
+++ Preferences.pm aa95319d71e080bd6fb6a5c6cc32780d94dff0f6
@@ -657,8 +657,7 @@ sub add_mime_type_button_clicked_cb($$)
["modal"],
"warning",
"close",
- __x("`{mime_type}' is already listed.",
- mime_type => $mime_type));
+ __x("`{mime_type}' is already listed.", mime_type => $mime_type));
$dialog->run();
$dialog->destroy();
return;
@@ -1477,8 +1476,8 @@ sub validate_preferences($)
["modal"],
"warning",
"close",
- __("The external file comparison application field is\n")
- . __("invalid, please correct before attempting to resave."));
+ __("The external file comparison application field is\n"
+ . "invalid, please correct before attempting to resave."));
$dialog->run();
$dialog->destroy();
return;
============================================================
--- WindowManager.pm 3e96305d61a5d4de8aec18e65e580f251b321143
+++ WindowManager.pm 22103783ebb0475581144a676cc5e2e749117c74
@@ -246,8 +246,7 @@ sub add_busy_windows($$@)
last;
}
}
- croak(__("Called with an unmanaged instance record"))
- unless (defined($entry));
+ croak("Called with an unmanaged instance record") unless (defined($entry));
push(@{$entry->{busy_windows}}, @windows);
@@ -369,8 +368,7 @@ sub make_busy($$$;$)
last;
}
}
- croak(__("Called with an unmanaged instance record"))
- unless (defined($entry));
+ croak("Called with an unmanaged instance record") unless (defined($entry));
# When making things busy filter out keyboard and mouse button events
# unless they relate to the grab widget (usually a `stop' button) and make
============================================================
--- mtn-browse fe58c0701ae849dd67f692545e201088a2d39b9f
+++ mtn-browse b8ae7273e8d6b067c129da19fb005d10996929ad
@@ -1167,9 +1167,9 @@ sub view_button_clicked_cb($$)
["modal"],
"info",
"close",
- __("No application is associated with\n")
- . __x("Mime type {mime_type},\nusing Vi instead.",
- mime_type => $mime_type));
+ __x("No application is associated with\n"
+ . "Mime type {mime_type},\nusing Vi instead.",
+ mime_type => $mime_type));
system("xterm -e vi " . $file_name . " &");
}
@@ -1883,11 +1883,11 @@ sub update_browser_state($$)
{
my $message;
$message =
- __x("The `{branch}' branch has multiple heads\n",
- branch => $browser->{branch_combo_details}->{value})
- . __("and Auto select head revision is switched ")
- . __("on.\nPlease manually select the revision.\n")
- . __("The head revision ids are:");
+ __x("The `{branch}' branch has multiple heads\nand "
+ . "Auto select head revision is switched "
+ . "on.\nPlease manually select the revision.\n"
+ . "The head revision ids are:",
+ branch => $browser->{branch_combo_details}->{value});
foreach my $item (@revision_ids)
{
$message .= "\n" . Glib::Markup::escape_text($item);
@@ -1998,12 +1998,12 @@ sub update_browser_state($$)
{
my $message;
$message =
- __x("The `{tag_name}' tag is not unique on this branch.\n",
+ __x("The `{tag_name}' tag is not unique on this branch.\n"
+ . "Please either select the revision by its id\n"
+ . "or use the Advanced Find feature.\n"
+ . "The matching revision ids are:",
tag_name =>
- $browser->{revision_combo_details}->{value})
- . __("Please either select the revision by its id\n")
- . __("or use the Advanced Find feature.\n")
- . __("The matching revision ids are:");
+ $browser->{revision_combo_details}->{value});
foreach my $item (@revision_ids)
{
$message .= "\n" . Glib::Markup::escape_text($item);
@@ -2638,8 +2638,8 @@ sub mtn_db_locked_handler($$)
["modal"],
"info",
"ok",
- __("The Monotone database is currently locked, please\n")
- . __("dismiss this dialog when this is no longer the case."));
+ __("The Monotone database is currently locked, please\n"
+ . "dismiss this dialog when this is no longer the case."));
$wm->allow_input(sub { $dialog->run(); });
$dialog->destroy();
@@ -2676,10 +2676,10 @@ sub mtn_error_handler($$)
["modal"],
"warning",
"close",
- __("Problem with monotone request, got:\n")
- . __x("{error_message}\n",
- error_message => Glib::Markup::escape_text($message))
- . __("This should not be happening!"));
+ __x("Problem with monotone request, got:\n"
+ . "{error_message}\n"
+ . "This should not be happening!",
+ error_message => Glib::Markup::escape_text($message)));
$wm->allow_input(sub { $dialog->run(); });
$dialog->destroy();
$wm->reset_state();
@@ -2692,10 +2692,10 @@ sub mtn_error_handler($$)
["modal"],
"error",
"close",
- __("Monotone process unexpectedly exiting with:\n")
- . __x("{error_message}\n",
- error_message => Glib::Markup::escape_text($message))
- . __("This is fatal, I am going to exit."));
+ __x("Monotone process unexpectedly exiting with:\n"
+ . "{error_message}\n"
+ . "This is fatal, I am going to exit.",
+ error_message => Glib::Markup::escape_text($message)));
$wm->allow_input(sub { $dialog->run(); });
$dialog->destroy();
Gtk2->main_quit() unless (Gtk2->main_level() == 0);
@@ -2757,11 +2757,11 @@ sub sigchld_handler()
["modal"],
"warning",
"close",
- __("The mtn subprocess just unexpectedly\n")
- . __x("exited ({error_message}).\n",
- error_message => $message)
- . __("This should not be happening!\n")
- . __("It will be restarted when needed."));
+ __x("The mtn subprocess just unexpectedly\n"
+ . "exited ({error_message}).\n"
+ . "This should not be happening!\n"
+ . "It will be restarted when needed.",
+ error_message => $message));
$wm->allow_input(sub { $dialog->run(); });
$dialog->destroy();
$wm->reset_state();