Merge branch 'develop' into l10n_develop

This commit is contained in:
James Cole
2017-02-16 22:42:24 +01:00
committed by GitHub
927 changed files with 40417 additions and 23932 deletions

View File

@@ -25,4 +25,4 @@ return [
'failed' => '帳號或密碼錯誤。',
'throttle' => '登入失敗次數過多,請等待 :seconds 秒後再試。',
];
];

View File

@@ -38,4 +38,4 @@ return [
'createTag' => '建立新標籤',
'edit_tag' => '編輯標籤 ":tag"',
'delete_tag' => '刪除標籤 ":tag"',
];
];

View File

@@ -20,4 +20,4 @@ return [
'year' => '%Y',
'half_year' => '%B %Y',
];
];

View File

@@ -77,4 +77,4 @@ return [
'column_tags-space' => '標籤 (空格分隔)',
'column_account-number' => '資產帳戶 (帳號號碼)',
'column_opposing-number' => '抵銷的帳戶 (帳號號碼)',
];
];

View File

@@ -21,4 +21,4 @@ return [
'import-index' => 'Of course, any CSV file can be imported into Firefly III ',
'import-configure-security' => 'Because of security concerns, your upload has been replaced with a local file.',
'import-configure-configuration' => 'The configuration you see below is correct for the local file.',
];
];

View File

@@ -965,4 +965,4 @@ return [
// sandstorm.io errors and messages:
'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.',
];
];

View File

@@ -181,4 +181,4 @@ return [
'payment_date' => 'Payment date',
'invoice_date' => 'Invoice date',
'internal_reference' => 'Internal reference',
];
];

View File

@@ -30,4 +30,4 @@ return [
'main-content-end-text' => '每一頁在右上方有一個小問號。按一下它可以取得與頁面相關説明。',
'index' => '首頁',
'home' => '首頁',
];
];

View File

@@ -86,4 +86,4 @@ return [
'budget_count' => 'Number of budgets',
'rule_and_groups_count' => 'Number of rules and rule groups',
'tags_count' => 'Number of tags',
];
];

View File

@@ -14,4 +14,4 @@ return [
'previous' => '« 上一頁',
'next' => '下一頁 »',
];
];

View File

@@ -16,4 +16,4 @@ return [
'sent' => '我們已經將密碼重置連結發送至您的電郵!',
'reset' => '你的密碼已經被重置!',
'blocked' => '好一個嘗試。',
];
];

View File

@@ -88,4 +88,4 @@ return [
'in_array' => 'The :attribute field does not exist in :other.',
'present' => 'The :attribute field must be present.',
'amount_zero' => 'The total amount cannot be zero',
];
];