mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for conflicts
This commit is contained in:
parent
1a44955f0f
commit
7730b398d8
@ -5000,7 +5000,8 @@ $LANG = array(
|
|||||||
'sync_from' => 'Sync From',
|
'sync_from' => 'Sync From',
|
||||||
'gateway_payment_text' => 'Invoices: :invoices for :amount for client :client',
|
'gateway_payment_text' => 'Invoices: :invoices for :amount for client :client',
|
||||||
'gateway_payment_text_no_invoice' => 'Payment with no invoice for amount :amount for client :client',
|
'gateway_payment_text_no_invoice' => 'Payment with no invoice for amount :amount for client :client',
|
||||||
|
'click_to_variables' => 'Client here to see all variables.',
|
||||||
|
'ship_to' => 'Ship to',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user