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

* 'develop' of https://github.com/JC5/firefly-iii: (23 commits)
  New translations
  Approved. Step name: Proofread
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  New translations
  Approved. Step name: Proofread
  New translations
  Translated
  ...
This commit is contained in:
James Cole 2016-12-17 08:35:19 +01:00
commit 560f6cbf24
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
21 changed files with 203 additions and 126 deletions

View File

@ -858,6 +858,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?',
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'Die eine Überweisungen, die mit dieser Kategorie verknüpft ist, wird nicht gelöscht. | Keine der :count Kategorien, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
'tag_keep_transactions' => 'Die einzige Überweisung, die mit diesem Tag verknüpft ist, wird nicht gelöscht. | Keiner der :count Tags, die mit dieser Rechnung verknüpft sind, werden gelöscht.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domain',
'single_user_mode' => 'Einzelnutzermodus',
'must_confirm_account' => 'Erstanwender müssen ihr Konto aktivieren',
'is_demo_site' => 'Ist eine Demonstrationsseite',
'mail_for_lockout' => 'Ausgesperrt',
'mail_for_blocked_domain' => 'Gesperrte Domain',
'mail_for_blocked_email' => 'Gesperrte Email-Adresse',
'mail_for_bad_login' => 'Anmeldung fehlgeschlagen',
'mail_for_blocked_login' => 'Gesperrter Benutzer',
'domain' => 'Domain',
'single_user_mode' => 'Einzelnutzermodus',
'must_confirm_account' => 'Erstanwender müssen ihr Konto aktivieren',
'is_demo_site' => 'Ist eine Demonstrationsseite',
'mail_for_lockout' => 'Ausgesperrt',
'mail_for_blocked_domain' => 'Gesperrte Domain',
'mail_for_blocked_email' => 'Gesperrte Email-Adresse',
'mail_for_bad_login' => 'Anmeldung fehlgeschlagen',
'mail_for_blocked_login' => 'Gesperrter Benutzer',
// import
'import_file' => 'Datei importieren',
'configuration_file' => 'Konfigurationsdatei',
'import_file_type' => 'Import-Dateityp',
'csv_comma' => 'Ein Komma (,)',
'csv_semicolon' => 'Ein Semikolon (;)',
'csv_tab' => 'Ein Tab (unsichtbar)',
'csv_delimiter' => 'CSV-Trennzeichen',
'csv_import_account' => 'Standard Import-Konto',
'csv_config' => 'CSV-Import Einstellungen',
'import_file' => 'Datei importieren',
'configuration_file' => 'Konfigurationsdatei',
'import_file_type' => 'Import-Dateityp',
'csv_comma' => 'Ein Komma (,)',
'csv_semicolon' => 'Ein Semikolon (;)',
'csv_tab' => 'Ein Tab (unsichtbar)',
'csv_delimiter' => 'CSV-Trennzeichen',
'csv_import_account' => 'Standard Import-Konto',
'csv_config' => 'CSV-Import Einstellungen',
'due_date' => 'Fälligkeitstermin',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Schaltfläche',
'icon' => 'Icon',
'id' => 'ID',
'create_date' => 'Erstellt am',
'update_date' => 'Aktualisiert am',
'balance_before' => 'Bilanz vor',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'La seule opération liée à cette catégorie ne sera pas supprimée.|Les :count opérations liées à cette catégorie ne seront pas supprimées.',
'tag_keep_transactions' => 'La seule opération liée à ce tag ne sera pas supprimée.|Les :count opérations liées à ce tag ne seront pas supprimées.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domaine',
'single_user_mode' => 'Mode utilisateur unique',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
'domain' => 'Domaine',
'single_user_mode' => 'Mode utilisateur unique',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
// import
'import_file' => 'Fichier à importer',
'configuration_file' => 'Fichier de configuration',
'import_file_type' => 'Type de fichier de configuration',
'csv_comma' => 'Une virgule (,)',
'csv_semicolon' => 'Un point-virgule (;)',
'csv_tab' => 'Un onglet (invisible)',
'csv_delimiter' => 'Délimiteur de champ CSV',
'csv_import_account' => 'Compte dimportation par défaut',
'csv_config' => 'Configuration d\'importation CSV',
'import_file' => 'Fichier à importer',
'configuration_file' => 'Fichier de configuration',
'import_file_type' => 'Type de fichier de configuration',
'csv_comma' => 'Une virgule (,)',
'csv_semicolon' => 'Un point-virgule (;)',
'csv_tab' => 'Un onglet (invisible)',
'csv_delimiter' => 'Délimiteur de champ CSV',
'csv_import_account' => 'Compte dimportation par défaut',
'csv_config' => 'Configuration d\'importation CSV',
'due_date' => 'Due date',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Boutons',
'icon' => 'Icône',
'id' => 'ID',
'create_date' => 'Créé le',
'update_date' => 'Mis à jour le',
'balance_before' => 'Solde avant',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
// import
'import_file' => 'Import file',
'configuration_file' => 'Configuration file',
'import_file_type' => 'Import file type',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'import_file' => 'Import file',
'configuration_file' => 'Configuration file',
'import_file_type' => 'Import file type',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'due_date' => 'Due date',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Buttons',
'icon' => 'Icon',
'id' => 'ID',
'create_date' => 'Created at',
'update_date' => 'Updated at',
'balance_before' => 'Balance before',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'Als een gebruiker wil registreren met een geblokkeerd e-mailadres',
'mail_for_bad_login_help' => 'Als een user met de verkeerde gegevens probeert in te loggen',
'mail_for_blocked_login_help' => 'Als een geblokkeerde gebruiker probeert in te loggen',
'block_code_bounced' => 'Email kwam niet aan',
'block_code_expired' => 'Demo-account verlopen',
'no_block_code' => 'Geen reden of gebruiker niet geblokkeerd',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'De transactie verbonden aan deze categorie blijft bewaard.|De :count transacties verbonden aan deze categorie blijven bewaard.',
'tag_keep_transactions' => 'De transactie verbonden aan deze tag blijft bewaard.|De :count transacties verbonden aan deze tag blijven bewaard.',
'email' => 'E-mailadres',
'password' => 'Wachtwoord',
'password_confirmation' => 'Wachtwoord (nogmaals)',
'blocked' => 'Is geblokkeerd?',
'blocked_code' => 'Reden voor blokkade',
// admin
'domain' => 'Domein',
'single_user_mode' => 'Enkele gebruiker-modus',
'must_confirm_account' => 'Nieuwe gebruikers moeten hun account activeren',
'is_demo_site' => 'Is demo website',
'mail_for_lockout' => 'Tijdelijk niet inloggen',
'mail_for_blocked_domain' => 'Geblokkeerd domein',
'mail_for_blocked_email' => 'Geblokkeerd e-mailadres',
'mail_for_bad_login' => 'Mislukte login',
'mail_for_blocked_login' => 'Geblokkeerde gebruiker',
'domain' => 'Domein',
'single_user_mode' => 'Enkele gebruiker-modus',
'must_confirm_account' => 'Nieuwe gebruikers moeten hun account activeren',
'is_demo_site' => 'Is demo website',
'mail_for_lockout' => 'Tijdelijk niet inloggen',
'mail_for_blocked_domain' => 'Geblokkeerd domein',
'mail_for_blocked_email' => 'Geblokkeerd e-mailadres',
'mail_for_bad_login' => 'Mislukte login',
'mail_for_blocked_login' => 'Geblokkeerde gebruiker',
// import
'import_file' => 'Importbestand',
'configuration_file' => 'Configuratiebestand',
'import_file_type' => 'Importbestandstype',
'csv_comma' => 'Een komma (,)',
'csv_semicolon' => 'Een puntkomma (;)',
'csv_tab' => 'Een tab (onzichtbaar)',
'csv_delimiter' => 'CSV scheidingsteken',
'csv_import_account' => 'Standaard rekening voor importeren',
'csv_config' => 'Configuratiebestand',
'import_file' => 'Importbestand',
'configuration_file' => 'Configuratiebestand',
'import_file_type' => 'Importbestandstype',
'csv_comma' => 'Een komma (,)',
'csv_semicolon' => 'Een puntkomma (;)',
'csv_tab' => 'Een tab (onzichtbaar)',
'csv_delimiter' => 'CSV scheidingsteken',
'csv_import_account' => 'Standaard rekening voor importeren',
'csv_config' => 'Configuratiebestand',
'due_date' => 'Vervaldatum',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Knoppen',
'icon' => 'Icoon',
'id' => 'ID',
'create_date' => 'Aangemaakt op',
'update_date' => 'Bijgewerkt op',
'balance_before' => 'Saldo voor',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'A única transação ligada a esta categoria não será excluída.|Todos :count transações ligadas a esta categoria não serão excluídos.',
'tag_keep_transactions' => 'A única transação ligada a essa marca não será excluída.|Todos :count transações ligadas a essa marca não serão excluídos.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domínio',
'single_user_mode' => 'Modo de usuário único',
'must_confirm_account' => 'Novos usuários devem ativar a conta',
'is_demo_site' => 'É o site de demonstração',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
'domain' => 'Domínio',
'single_user_mode' => 'Modo de usuário único',
'must_confirm_account' => 'Novos usuários devem ativar a conta',
'is_demo_site' => 'É o site de demonstração',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
// import
'import_file' => 'Importar arquivo',
'configuration_file' => 'Arquivo de configuração',
'import_file_type' => 'Tipo de arquivo de importação',
'csv_comma' => 'Uma vírgula (,)',
'csv_semicolon' => 'Um ponto e vírgula (;)',
'csv_tab' => 'Um Tab (invisível)',
'csv_delimiter' => 'Delimitador de campo CSV',
'csv_import_account' => 'Conta de importação padrão',
'csv_config' => 'Importar CSV de configuração',
'import_file' => 'Importar arquivo',
'configuration_file' => 'Arquivo de configuração',
'import_file_type' => 'Tipo de arquivo de importação',
'csv_comma' => 'Uma vírgula (,)',
'csv_semicolon' => 'Um ponto e vírgula (;)',
'csv_tab' => 'Um Tab (invisível)',
'csv_delimiter' => 'Delimitador de campo CSV',
'csv_import_account' => 'Conta de importação padrão',
'csv_config' => 'Importar CSV de configuração',
'due_date' => 'Data de vencimento',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Botões',
'icon' => 'Ícone',
'id' => 'ID',
'create_date' => 'Criado em',
'update_date' => 'Atualizado em',
'balance_before' => 'Saldo Antes',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
// import
'import_file' => 'Import file',
'configuration_file' => 'Configuration file',
'import_file_type' => 'Import file type',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'import_file' => 'Import file',
'configuration_file' => 'Configuration file',
'import_file_type' => 'Import file type',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'due_date' => 'Due date',

View File

@ -12,6 +12,7 @@
return [
'buttons' => 'Buttons',
'icon' => 'Icon',
'id' => 'ID',
'create_date' => 'Created at',
'update_date' => 'Updated at',
'balance_before' => 'Balance before',

View File

@ -857,6 +857,9 @@ return [
'mail_for_blocked_email_help' => 'When a user tries to register using a blocked email address',
'mail_for_bad_login_help' => 'When a user fails to login',
'mail_for_blocked_login_help' => 'When a blocked user tries to login',
'block_code_bounced' => 'Email message(s) bounced',
'block_code_expired' => 'Demo account expired',
'no_block_code' => 'No reason for block or user not blocked',
// split a transaction:

View File

@ -150,28 +150,35 @@ return [
'category_keep_transactions' => 'The only transaction connected to this category will not be deleted.|All :count transactions connected to this category will spared deletion.',
'tag_keep_transactions' => 'The only transaction connected to this tag will not be deleted.|All :count transactions connected to this tag will spared deletion.',
'email' => 'Email address',
'password' => 'Password',
'password_confirmation' => 'Password (again)',
'blocked' => 'Is blocked?',
'blocked_code' => 'Reason for block',
// admin
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
'domain' => 'Domain',
'single_user_mode' => 'Single user mode',
'must_confirm_account' => 'New users must activate account',
'is_demo_site' => 'Is demo site',
'mail_for_lockout' => 'Locked out',
'mail_for_blocked_domain' => 'Blocked domain',
'mail_for_blocked_email' => 'Blocked email address',
'mail_for_bad_login' => 'Login failure',
'mail_for_blocked_login' => 'Blocked user',
// import
'import_file' => '匯入檔案',
'configuration_file' => 'Configuration file',
'import_file_type' => '匯入檔案類型',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'import_file' => '匯入檔案',
'configuration_file' => 'Configuration file',
'import_file_type' => '匯入檔案類型',
'csv_comma' => 'A comma (,)',
'csv_semicolon' => 'A semicolon (;)',
'csv_tab' => 'A tab (invisible)',
'csv_delimiter' => 'CSV field delimiter',
'csv_import_account' => 'Default import account',
'csv_config' => 'CSV import configuration',
'due_date' => '到期日',

View File

@ -12,6 +12,7 @@
return [
'buttons' => '按鈕',
'icon' => '圖標',
'id' => 'ID',
'create_date' => '建立於',
'update_date' => '更新於',
'balance_before' => '交易前餘額',