More string changes

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@474 4979c152-3d1c-0410-bac9-87ea11338e46

7 files changed, 28 insertions, 31 deletions

diff --git a/bin/am.pl b/bin/am.pl
index 54f93163..25b0b29b 100755
--- a/bin/am.pl
+++ b/bin/am.pl
@@ -294,7 +294,7 @@ sub save_account {
   foreach $item ("AR", "AP") {
     $i = 0;
     for ("${item}_amount", "${item}_paid", "${item}_tax") { $i++ if $form->{$_} }
-    $form->error($locale->text('Cannot set multiple options for')." $item") if $i > 1;
+    $form->error($locale->text('Cannot set multiple options for [_1]', $item)) if $i > 1;
   }
   
   if (AM->save_account(\%myconfig, \%$form)) {
@@ -1447,7 +1447,7 @@ sub delete_language {
   print qq|
 <h2 class=confirm>$form->{title}</h2>
 
-<h4>|.$locale->text('Deleting a language will also delete the templates for the language').qq| $form->{invnumber}</h4>
+<h4>|.$locale->text('Deleting a language will also delete the templates for the language [_1]', $form->{invnumber}).qq|</h4>
 
 <input type=hidden name=action value=continue>
 <input type=hidden name=nextsub value=yes_delete_language>
@@ -2082,7 +2082,7 @@ sub config {
 |;
   }
   
-  $form->{title} = $locale->text('Edit Preferences for').qq| $form->{login}|;
+  $form->{title} = $locale->text('Edit Preferences for [_1]', $form->{login});
   
   $form->header;
 
@@ -2246,9 +2246,6 @@ sub backup {
 
   if ($form->{media} eq 'email') {
     $form->error($locale->text('No email address for [_1]', $myconfig{name})) unless ($myconfig{email});
-    
-    $form->{OUT} = "${LedgerSMB::Sysconfig::sendmail}";
-
   }
 
   $SIG{INT} = 'IGNORE';
@@ -3064,17 +3061,17 @@ sub process_transactions {
 
           if ($pt->{invoice}) {
 	    if ($pt->{arid}) {
-	      $form->info("\n".$locale->text('Posting')." ".$locale->text('Sales Invoice')." $form->{invnumber}");
+	      $form->info("\n".$locale->text('Posting Sales Invoice [_1]', $form->{invnumber}));
 	      $ok = IS->post_invoice(\%myconfig, \%$form);
 	    } else {
-	      $form->info("\n".$locale->text('Posting')." ".$locale->text('Vendor Invoice')." $form->{invnumber}");
+	      $form->info("\n".$locale->text('Posting Vendor Invoice [_1]', $form->{invnumber}));
 	      $ok = IR->post_invoice(\%myconfig, \%$form);
 	    }
 	  } else {
 	    if ($pt->{arid}) {
-	      $form->info("\n".$locale->text('Posting')." ".$locale->text('Transaction')." $form->{invnumber}");
+	      $form->info("\n".$locale->text('Posting Transaction [_1]', $form->{invnumber}));
 	    } else {
-	      $form->info("\n".$locale->text('Posting')." ".$locale->text('Transaction')." $form->{invnumber}");
+	      $form->info("\n".$locale->text('Posting Transaction [_1]', $form->{invnumber}));
 	    }
 
 	    $ok = AA->post_transaction(\%myconfig, \%$form);
@@ -3128,7 +3125,7 @@ sub process_transactions {
 	  for ("$ordnumber", "reference") { $form->{$_} = $form->unquote($form->{$_}) }
 	  $form->{closed} = 0;
 
-	  $form->info("\n".$locale->text('Saving')." ".$flabel." $form->{$ordnumber}");
+	  $form->info("\n".$locale->text('Saving [_1] [_2]', $flabel, $form->{$ordnumber}));
 	  if ($ok = OE->save(\%myconfig, \%$form)) {
 	    $form->info(" ..... ".$locale->text('done'));
 	  } else {
@@ -3170,7 +3167,7 @@ sub process_transactions {
 	$form->{rowcount} = $j;
 
 	for (qw(id recurring)) { delete $form->{$_} }
-	$form->info("\n".$locale->text('Posting')." ".$locale->text('GL Transaction')." $form->{reference}");
+	$form->info("\n".$locale->text('Posting GL Transaction [_1]', $form->{reference}));
 	$ok = GL->post_transaction(\%myconfig, \%$form);
 	$form->info(" ..... ".$locale->text('done'));
 	
diff --git a/bin/bp.pl b/bin/bp.pl
index 337b7c5a..0d770bda 100755
--- a/bin/bp.pl
+++ b/bin/bp.pl
@@ -214,7 +214,7 @@ sub remove {
     }
   }
 
-  $form->error('Nothing selected!') unless $selected;
+  $form->error($locale->text('Nothing selected!')) unless $selected;
  
   $form->{title} = $locale->text('Confirm!');
   
diff --git a/bin/gl.pl b/bin/gl.pl
index 79c80698..2db8611d 100755
--- a/bin/gl.pl
+++ b/bin/gl.pl
@@ -193,7 +193,7 @@ sub create_links {
 
 sub search {
 
-  $form->{title} = $locale->text('General Ledger')." ".$locale->text('Reports');
+  $form->{title} = $locale->text('General Ledger Reports');
   
   $colspan = 5;
   $form->all_departments(\%myconfig);
@@ -654,13 +654,13 @@ sub generate_report {
   if ($myconfig{acs} !~ /AR--AR/) {
     $button{'AR--Add Transaction'}{code} = qq|<button class="submit" type="submit" name="action" value="ar_transaction">|.$locale->text('AR Transaction').qq|</button> |;
     $button{'AR--Add Transaction'}{order} = $i++;
-    $button{'AR--Sales Invoice'}{code} = qq|<button class="submit" type="submit" name="action" value="sales_invoice_">|.$locale->text('Sales Invoice ').qq|</button> |;
+    $button{'AR--Sales Invoice'}{code} = qq|<button class="submit" type="submit" name="action" value="sales_invoice_">|.$locale->text('Sales Invoice').qq|</button> |;
     $button{'AR--Sales Invoice'}{order} = $i++;
   }
   if ($myconfig{acs} !~ /AP--AP/) {
     $button{'AP--Add Transaction'}{code} = qq|<button class="submit" type="submit" name="action" value="ap_transaction">|.$locale->text('AP Transaction').qq|</button> |;
     $button{'AP--Add Transaction'}{order} = $i++;
-    $button{'AP--Vendor Invoice'}{code} = qq|<button class="submit" type="submit" name="action" value="vendor_invoice_">|.$locale->text('Vendor Invoice ').qq|</button> |;
+    $button{'AP--Vendor Invoice'}{code} = qq|<button class="submit" type="submit" name="action" value="vendor_invoice_">|.$locale->text('Vendor Invoice').qq|</button> |;
     $button{'AP--Vendor Invoice'}{order} = $i++;
   }
 
@@ -1104,7 +1104,7 @@ sub delete {
   print qq|
 <h2 class=confirm>|.$locale->text('Confirm!').qq|</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Transaction').qq| $form->{reference}</h4>
+<h4>|.$locale->text('Are you sure you want to delete Transaction [_1]', $form->{reference}).qq|</h4>
 
 <button name="action" class="submit" type="submit" value="yes">|.$locale->text('Yes').qq|</button>
 </form>
diff --git a/bin/ic.pl b/bin/ic.pl
index 148b86d8..64a399d7 100755
--- a/bin/ic.pl
+++ b/bin/ic.pl
@@ -119,25 +119,25 @@ sub link_part {
   # readonly
   if ($form->{item} eq 'part') {
     $form->{readonly} = 1 if $myconfig{acs} =~ /Goods \& Services--Add Part/;
-    $form->error($locale->text('Cannot create Part').";".$locale->text('Inventory account does not exist!')) if ! @{ $form->{IC_links}{IC} };
-    $form->error($locale->text('Cannot create Part').";".$locale->text('Income account does not exist!')) if ! @{ $form->{IC_links}{IC_sale} };
-    $form->error($locale->text('Cannot create Part').";".$locale->text('COGS account does not exist!')) if ! @{ $form->{IC_links}{IC_cogs} };
+    $form->error($locale->text('Cannot create Part; Inventory account does not exist!')) if ! @{ $form->{IC_links}{IC} };
+    $form->error($locale->text('Cannot create Part; Income account does not exist!')) if ! @{ $form->{IC_links}{IC_sale} };
+    $form->error($locale->text('Cannot create Part; COGS account does not exist!')) if ! @{ $form->{IC_links}{IC_cogs} };
   }
   
   if ($form->{item} eq 'service') {
     $form->{readonly} = 1 if $myconfig{acs} =~ /Goods \& Services--Add Service/;
-    $form->error($locale->text('Cannot create Service').";".$locale->text('Income account does not exist!')) if ! @{ $form->{IC_links}{IC_income} };
-    $form->error($locale->text('Cannot create Service').";".$locale->text('Expense account does not exist!')) if ! @{ $form->{IC_links}{IC_expense} };
+    $form->error($locale->text('Cannot create Service; Income account does not exist!')) if ! @{ $form->{IC_links}{IC_income} };
+    $form->error($locale->text('Cannot create Service; Expense account does not exist!')) if ! @{ $form->{IC_links}{IC_expense} };
   }
   
   if ($form->{item} eq 'assembly') {
     $form->{readonly} = 1 if $myconfig{acs} =~ /Goods \& Services--Add Assembly/;
-    $form->error($locale->text('Cannot create Assembly').";".$locale->text('Income account does not exist!')) if ! @{ $form->{IC_links}{IC_income} };
+    $form->error($locale->text('Cannot create Assembly; Income account does not exist!')) if ! @{ $form->{IC_links}{IC_income} };
   }
   if ($form->{item} eq 'labor') {
     $form->{readonly} = 1 if $myconfig{acs} =~ /Goods \& Services--Add Labor\/Overhead/;
-    $form->error($locale->text('Cannot create Labor').";".$locale->text('Inventory account does not exist!')) if ! @{ $form->{IC_links}{IC} };
-    $form->error($locale->text('Cannot create Labor').";".$locale->text('COGS account does not exist!')) if ! @{ $form->{IC_links}{IC_cogs} };
+    $form->error($locale->text('Cannot create Labor; Inventory account does not exist!')) if ! @{ $form->{IC_links}{IC} };
+    $form->error($locale->text('Cannot create Labor; COGS account does not exist!')) if ! @{ $form->{IC_links}{IC_cogs} };
   }
 
   
@@ -2684,7 +2684,7 @@ sub check_vendor {
 	$form->{"vendor_$i"} = qq|$form->{name_list}[0]->{name}--$form->{name_list}[0]->{id}|;
       } else {
 	# name is not on file
-	$form->error(qq|$form->{"vendor_$i"} : |.$locale->text('Vendor not on file!'));
+	$form->error($locale->text('[_1]: Vendor not on file!', $form->{"vendor_$i"}));
       }
     }
   }
@@ -2743,7 +2743,7 @@ sub check_customer {
 	$form->{"customer_$i"} = qq|$form->{name_list}[0]->{name}--$form->{name_list}[0]->{id}|;
       } else {
 	# name is not on file
-	$form->error(qq|$form->{customer} : |.$locale->text('Customer not on file!'));
+	$form->error($locale->text('[_1]: Customer not on file!', $form->{customer}));
       }
     }
   }
diff --git a/bin/io.pl b/bin/io.pl
index efeaf8b4..ec824540 100755
--- a/bin/io.pl
+++ b/bin/io.pl
@@ -869,7 +869,7 @@ sub validate_items {
   }
     
   for $i (1 .. $form->{rowcount} - 1) {
-    $form->isblank("partnumber_$i", $locale->text('Number missing in Row') . " $i");
+    $form->isblank("partnumber_$i", $locale->text('Number missing in Row [_1]', $i));
   }
 
 }
diff --git a/bin/ir.pl b/bin/ir.pl
index cd6e43fb..ac51c59b 100755
--- a/bin/ir.pl
+++ b/bin/ir.pl
@@ -908,7 +908,7 @@ sub delete {
   print qq|
 <h2 class=confirm>|.$locale->text('Confirm!').qq|</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Invoice Number').qq| $form->{invnumber}</h4>
+<h4>|.$locale->text('Are you sure you want to delete Invoice Number [_1]?', $form->{invnumber}).qq|</h4>
 <p>
 <button name="action" class="submit" type="submit" value="yes">|.$locale->text('Yes').qq|</button>
 </form>
diff --git a/bin/is.pl b/bin/is.pl
index 705906df..d34419d7 100755
--- a/bin/is.pl
+++ b/bin/is.pl
@@ -900,7 +900,7 @@ sub post {
   ($form->{AR_paid}) = split /--/, $form->{AR_paid};
 
   if (IS->post_invoice(\%myconfig, \%$form)) {
-    $form->redirect($locale->text('Invoice')." $form->{invnumber} ".$locale->text('posted!'));
+    $form->redirect($locale->text('Invoice [_1] posted!', $form->{invnumber}));
   } else {
     $form->error($locale->text('Cannot post invoice!'));
   }
@@ -947,7 +947,7 @@ sub delete {
   print qq|
 <h2 class=confirm>|.$locale->text('Confirm!').qq|</h2>
 
-<h4>|.$locale->text('Are you sure you want to delete Invoice Number').qq| $form->{invnumber}
+<h4>|.$locale->text('Are you sure you want to delete Invoice Number [_1]?', $form->{invnumber}).qq|
 </h4>
 
 <p>