kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/firefly-iii/firefly-iii into develop

Browse Source 
* 'develop' of https://github.com/firefly-iii/firefly-iii:
  New translation strings.
  Update JournalRepository.php
  Update Amount.php
  Update ImportStorage.php
  Fix #854
  Enable mod_ssl by default
This commit is contained in:
James Cole
2017-09-24 21:18:57 +02:00
parent 260ef1a07e 9f1ea0807b
commit ac0e2c9885
7 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/en_US/firefly.php
View File

@@ -474,7 +474,7 @@ return [
'converted_to_Withdrawal' => 'The transaction has been converted to a withdrawal',
'converted_to_Deposit' => 'The transaction has been converted to a deposit',
'converted_to_Transfer' => 'The transaction has been converted to a transfer',
'invalid_convert_selection' => 'The account you have selected is already used in this transaction or does not exist.',
// create new stuff:
'create_new_withdrawal' => 'Create new withdrawal',