More do not concatenate translatable strings

[clawsker.git] / clawsker

diff --git a/clawsker b/clawsker
index f4960811e242db28c0b9363b4871eda66b60731f..dc14d845b3521ca7646b4aba0fe13c4fb53910b0 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -165,11 +165,11 @@ sub _ {
     l_beh_warn_dnd => _('Warn on drag \'n\' drop'),
     h_beh_warn_dnd => _('Display a confirmation dialogue on drag \'n\' drop of folders.'),
     l_beh_out_ascii => _('Outgoing messages fallback to ASCII'),
-    h_beh_out_ascii => _('If content allows, ASCII will be used to encode outgoing messages, otherwise the user-defined encoding is enforced always.'),
+    h_beh_out_ascii => _('If allowed by content, ASCII will be used to encode outgoing messages, otherwise the user-defined encoding is always enforced.'),
     l_beh_pp_unsel => _('Primary paste unselects selection'),
     h_beh_pp_unsel => _('Controls how pasting using middle-click changes the selected text and insertion point.'),
     l_beh_inline_at => _('Show inline attachments'),
-    h_beh_inline_at => _('Allows hiding inline attachments already shown in mail structure view.'),
+    h_beh_inline_at => _('Allows to hide inline attachments already shown in mail structure view.'),
     l_beh_addr_swc => _('Address search in compose window matches any'),
     h_beh_addr_swc => _('On Tab-key completion, address text will match any part of the string or only from the start.'),
     l_beh_fold_swc => _('Folder search in folder selector matches any'),
@@ -226,10 +226,6 @@ sub _ {
     l_plu_prl_manual => _('Manual'),
     l_plu_prl_action => _('Actions'),
     l_plu_prl_match => _('Matches'),
-
-    e_error => _('Error: '),
-    e_noclawsrc => _('resource file for Claws Mail was not found.'),
-    e_running => _('seems Claws Mail is currently running, close it first.'),
 );
 
 # data and metadata of resource files
@@ -412,7 +408,7 @@ sub error_dialog {
 }
 
 sub claws_is_running {
-    my $emsg = "$xl::s{e_error}$xl::s{e_running}";
+    my $emsg = _('Error: seems Claws Mail is currently running, close it first.');
     log_message ($emsg);
     error_dialog ($emsg);
     return FALSE;
@@ -435,7 +431,7 @@ sub check_claws_not_running {
 sub check_rc_file {
     my ($rcfile) = @_;
     (defined($rcfile) && -f $rcfile) or do {
-        my $emsg = "$xl::s{e_error}$xl::s{e_noclawsrc}\n";
+        my $emsg = _('Error: resource file for Claws Mail was not found.');
         log_message ($emsg);
         error_dialog ($emsg);
         return FALSE;
@@ -603,8 +599,8 @@ sub new_selection_box_for($$$) {
 sub new_hbox_pack {
     my $hbox = Gtk2::HBox->new (FALSE, 5);
     $hbox->set_border_width (PAGE_SPC);
-    foreach my $item (@_) {
-        $hbox->pack_start ($item, FALSE, FALSE, 0);
+    foreach (@_) {
+        $hbox->pack_start ($_, FALSE, FALSE, 0);
     }
     return $hbox;
 }
@@ -612,8 +608,8 @@ sub new_hbox_pack {
 sub new_vbox_pack {
     my $vbox = Gtk2::VBox->new (FALSE, 5);
     $vbox->set_border_width (PAGE_SPC);
-    foreach my $item (@_) {
-        $vbox->pack_start ($item, FALSE, FALSE, 0);
+    foreach (@_) {
+        $vbox->pack_start ($_, FALSE, FALSE, 0);
     }
     return $vbox;
 }
@@ -621,8 +617,8 @@ sub new_vbox_pack {
 sub new_vbox_pack_compact {
     my $vbox = Gtk2::VBox->new (FALSE, 0);
     $vbox->set_border_width (0);
-    foreach my $item (@_) {
-        $vbox->pack_start ($item, FALSE, FALSE, 0);
+    foreach (@_) {
+        $vbox->pack_start ($_, FALSE, FALSE, 0);
     }
     return $vbox;
 }
@@ -2062,18 +2058,28 @@ sub print_version() {
     print $xl::s{about_title} . "\n";
     print $xl::s{about_version} . " $VERSION\n";
     my $v = get_toolkit_versions ();
-    print "Perl-GLib " . $v->{'glib'};
-    print _(", built for ") . $v->{'glib-b'}
-        . _(", running with ") . $v->{'glib-r'} if $v->{'glib-b'};
+    if ($v->{'glib-b'}) {
+        print _("Perl-GLib version {glibv}, built for {glibb}, running with {glibr}.",
+                glibv => $v->{'glib'},
+                glibb => $v->{'glib-b'},
+                glibr => $v->{'glib-r'});
+    } else {
+        print _("Perl-GLib version {glibv}.", glibv => $v->{'glib'});
+    }
     print "\n";
-    print "Perl-GTK2 " . $v->{'gtk2'};
-    print _(", built for ") . $v->{'gtk2-b'}
-        . _(", running with ") . $v->{'gtk2-r'} if $v->{'gtk2-b'};
+    if ($v->{'gtk2-b'}) {
+        print _("Perl-GTK2 version {gtkv}, built for {gtkb}, running with {gtkr}.",
+                gtkv => $v->{'gtk2'},
+                gtkb => $v->{'gtk2-b'},
+                gtkr => $v->{'gtk2-r'});
+    } else {
+        print _("Perl-GTK2 version {gtkv}.", gtkv => $v->{'gtk2'});
+    }
     print "\n";
     my $clawsver = ($CLAWSV eq "") ?
-                _("was not found!") :
-                (_("returned version ") . $CLAWSV);
-    print "Claws Mail " . $clawsver . "\n";
+                _("Claws Mail was not found!") :
+                _("Claws Mail returned version {cmv}.", cmv => $CLAWSV);
+    print $clawsver . "\n";
 }
 
 # the command line help