diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/ar/admin/settings/general.php
+++ b/resources/lang/ar/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/ar/auth/general.php b/resources/lang/ar/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ar/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ar/passwords.php b/resources/lang/ar/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ar/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
index 701e73af1a..dc51c9f6db 100644
--- a/resources/lang/bg/admin/settings/general.php
+++ b/resources/lang/bg/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Префикс (незадължително)',
'auto_incrementing_help' => 'Първо включете автоматично генериране на инвентарни номера, за да включите тази опция.',
'backups' => 'Архивиране',
- 'barcode_type' => 'Тип на баркод',
'barcode_settings' => 'Настройки на баркод',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Визуализиране на EOL в таблиците',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Тип на баркод',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Настройки на EULA',
'eula_markdown' => 'Съдържанието на EULA може да бъде форматирано с Github flavored markdown.',
diff --git a/resources/lang/bg/auth/general.php b/resources/lang/bg/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/bg/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/bg/passwords.php b/resources/lang/bg/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/bg/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
index 315e2fd85a..3b1da352bc 100644
--- a/resources/lang/cs/admin/settings/general.php
+++ b/resources/lang/cs/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Předpona (volitnelná)',
'auto_incrementing_help' => 'Nastavte nejdříve automaticky se zvyšující ID majetku pro nastavení tohoto',
'backups' => 'Zálohy',
- 'barcode_type' => 'Tyo čárového kódu',
'barcode_settings' => 'Nastavení čárového kódu',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Zobrazit EOL v tabulkovém zobrazení',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Tyo čárového kódu',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Nastavení EULA',
'eula_markdown' => 'Tato EULA umožňuje Github markdown.',
diff --git a/resources/lang/cs/auth/general.php b/resources/lang/cs/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/cs/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/cs/passwords.php b/resources/lang/cs/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/cs/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/da/admin/settings/general.php
+++ b/resources/lang/da/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/da/auth/general.php b/resources/lang/da/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/da/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/da/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index 279b60ca8c..8fd95471b0 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Präfix (optional)',
'auto_incrementing_help' => 'Aktiviere zuerst fortlaufende Asset IDs um dies zu setzen',
'backups' => 'Sicherungen',
- 'barcode_type' => 'Barcode Typ',
'barcode_settings' => 'Barcode Einstellungen',
'confirm_purge' => 'Bereinigung bestätigen',
'confirm_purge_help' => 'Geben Sie das Wort "Löschen" in das untere Feld ein um die gelöschten Einträge zu bereinigen. Dies kann nicht rückgängig gemacht werden.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Zeige EOL in der Tabellenansicht',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Typ',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Einstellungen',
'eula_markdown' => 'Diese EULA erlaubt Github Flavored Markdown.',
diff --git a/resources/lang/de/auth/general.php b/resources/lang/de/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/de/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/de/passwords.php b/resources/lang/de/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/de/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/el/admin/settings/general.php
+++ b/resources/lang/el/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/el/auth/general.php b/resources/lang/el/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/el/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/el/passwords.php b/resources/lang/el/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/el/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 03f31a2e3b..5a6806c610 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -23,9 +22,9 @@ return array(
'display_asset_name' => 'Display Asset Name',
'display_checkout_date' => 'Display Checkout Date',
'display_eol' => 'Display EOL in table view',
- 'display_qr' => 'Display Square Codes',
+ 'display_qr' => 'Display 3D Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/en-GB/auth/general.php b/resources/lang/en-GB/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/en-GB/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/en-GB/passwords.php b/resources/lang/en-GB/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/en-GB/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/en-ID/auth/general.php b/resources/lang/en-ID/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/en-ID/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/en-ID/passwords.php b/resources/lang/en-ID/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/en-ID/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 41883acd5f..82b3d1e5d1 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => '3D barcode type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/es-CO/auth/general.php b/resources/lang/es-CO/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/es-CO/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/es-CO/passwords.php b/resources/lang/es-CO/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/es-CO/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 5b450db3c8..3db53c4dcc 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Activa la generación automática de IDs de equipo antes de configurar esto',
'backups' => 'Copias de seguridad',
- 'barcode_type' => 'Tipo de código de barras',
'barcode_settings' => 'Configuración de Código de Barras',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Mostrar EOL',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Tipo de código de barras',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Configuración EULA',
'eula_markdown' => 'Este EULS permite makrdown estilo Github.',
diff --git a/resources/lang/es-ES/auth/general.php b/resources/lang/es-ES/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/es-ES/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/es-ES/passwords.php b/resources/lang/es-ES/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/es-ES/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php
index 2ad225c3fc..e72eb43015 100644
--- a/resources/lang/fa/admin/settings/general.php
+++ b/resources/lang/fa/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'پیشوند (اختیاری)',
'auto_incrementing_help' => 'فعال کردن شناسه دارایی (افزایش خودکار) اول به این مجموعه',
'backups' => 'پشتیبان گیری',
- 'barcode_type' => 'نوع بارکد',
'barcode_settings' => 'تنظیمات بارکد',
'confirm_purge' => 'تایید پاکسازی',
'confirm_purge_help' => 'متن "حذف" در کادر زیر برای پاکسازی پرونده حذف شده خود را وارد کنید. این دستور قابل بازگشت نیست.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'نمایش EOL در جدول',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'نوع بارکد',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA تنظیمات',
'eula_markdown' => 'این EULA اجازه می دهد تا Github با طعم markdown.',
diff --git a/resources/lang/fa/auth/general.php b/resources/lang/fa/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/fa/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/fa/passwords.php b/resources/lang/fa/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/fa/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php
index aa715c29ae..32defe9395 100644
--- a/resources/lang/fi/admin/settings/general.php
+++ b/resources/lang/fi/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Etuliite (valinnainen)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Varmuuskopiointi',
- 'barcode_type' => 'Viivakoodin tyyppi',
'barcode_settings' => 'Viivakoodi asetukset',
'confirm_purge' => 'Vahvista poisto',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Näytä elinaika listauksessa',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Viivakoodin tyyppi',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/fi/auth/general.php b/resources/lang/fi/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/fi/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/fi/passwords.php b/resources/lang/fi/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/fi/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index ea0a93a3dd..aa9d28bd17 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/resources/lang/fr/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Préfixe (optionnel)',
'auto_incrementing_help' => 'Activer l\'auto-incrémentation des ID d\'actif avant de sélectionner cette option',
'backups' => 'Sauvegardes',
- 'barcode_type' => 'Type de code à bar',
'barcode_settings' => 'Configuration des codes à barres',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Afficher la fin de vie dans les tables',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Type de code à bar',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Configuration pour les licences d\'utilisation',
'eula_markdown' => 'Cette licence d\'utilisation permet l\'utilisation des "Github flavored markdown".',
diff --git a/resources/lang/fr/auth/general.php b/resources/lang/fr/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/fr/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/fr/passwords.php b/resources/lang/fr/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/fr/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/he/admin/settings/general.php
+++ b/resources/lang/he/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/he/auth/general.php b/resources/lang/he/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/he/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/he/passwords.php b/resources/lang/he/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/he/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/hr/admin/settings/general.php
+++ b/resources/lang/hr/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/hr/auth/general.php b/resources/lang/hr/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/hr/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/hr/passwords.php b/resources/lang/hr/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/hr/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index 5bd4946da9..2c37039b89 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/resources/lang/hu/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/hu/auth/general.php b/resources/lang/hu/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/hu/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/hu/passwords.php b/resources/lang/hu/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/hu/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index 35208eb2d3..75a5007913 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefisso (Opzionale)',
'auto_incrementing_help' => 'Abilita auto-incremento ID beni prima di impostare questa',
'backups' => 'Backups',
- 'barcode_type' => 'Tipo Barcode',
'barcode_settings' => 'Impostazioni codice a barre',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Visualizzare EOL in vista tabella',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Tipo Barcode',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Impostazioni EULA',
'eula_markdown' => 'Questa EULA consente Github flavored markdown.',
diff --git a/resources/lang/it/auth/general.php b/resources/lang/it/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/it/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/it/passwords.php b/resources/lang/it/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/it/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php
index b9730f62fd..6ca2094181 100644
--- a/resources/lang/ja/admin/settings/general.php
+++ b/resources/lang/ja/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'プレフィクス (オプション)',
'auto_incrementing_help' => 'この初期値を使って資産IDの自動採番を有効化',
'backups' => 'バックアップ',
- 'barcode_type' => 'バーコードタイプ',
'barcode_settings' => 'バーコード設定',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => '表形式でEOLを表示',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'バーコードタイプ',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA設定',
'eula_markdown' => 'この EULA は、Github flavored markdownで、利用可能です。',
diff --git a/resources/lang/ja/auth/general.php b/resources/lang/ja/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ja/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ja/passwords.php b/resources/lang/ja/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ja/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php
index b8209a319e..c87440495e 100644
--- a/resources/lang/ko/admin/settings/general.php
+++ b/resources/lang/ko/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => '접두사 (부가적)',
'auto_incrementing_help' => '이 것을 설정하려면 자동-증가 자산 ID 사용을 하세요.',
'backups' => '예비품',
- 'barcode_type' => '바코드 형식',
'barcode_settings' => '바코드 설정',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => '테이블 보기에서 폐기일 표시',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => '바코드 형식',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => '최종 사용 계약 설정',
'eula_markdown' => '이 최종 사용 계약은 GFM을 따른다.',
diff --git a/resources/lang/ko/auth/general.php b/resources/lang/ko/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ko/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ko/passwords.php b/resources/lang/ko/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ko/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php
index aba84f2cfe..29d5cf0f78 100644
--- a/resources/lang/lt/admin/settings/general.php
+++ b/resources/lang/lt/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Papilomas priedėlis (pasirinktinai)',
'auto_incrementing_help' => 'Įjungti automatiškai didėjantį įrangos ID pirmajam suteikiant šį nr.',
'backups' => 'Atsarginė kopija',
- 'barcode_type' => 'Prekės kodo tipas',
'barcode_settings' => 'Prekės kodo nustatymai',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Rodyti įrangos naudojimo pabaigos datas lentelės pavidalu',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Prekės kodo tipas',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA nustatymai',
'eula_markdown' => 'Šis EULA leidžia Github flavored markdown.',
diff --git a/resources/lang/lt/auth/general.php b/resources/lang/lt/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/lt/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/lt/passwords.php b/resources/lang/lt/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/lt/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php
index ffba045a49..06aa75c3ee 100644
--- a/resources/lang/ms/admin/settings/general.php
+++ b/resources/lang/ms/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Papar EOL dalam paparan jadual',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/ms/auth/general.php b/resources/lang/ms/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ms/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ms/passwords.php b/resources/lang/ms/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ms/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index 8f131852f7..7ae4029a8e 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Voorvoegsel (niet verplicht)',
'auto_incrementing_help' => 'Schakel eerst auto-verhoging voor product ID\'s in',
'backups' => 'Back-ups',
- 'barcode_type' => 'Barcode type',
'barcode_settings' => 'Barcode instellingen',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Laat EOL in tabel zien',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Gebruikersovereenkomsten instellingen',
'eula_markdown' => 'Deze gebruikersovereenkomst staat Github flavored markdown toe.',
diff --git a/resources/lang/nl/auth/general.php b/resources/lang/nl/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/nl/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/nl/passwords.php b/resources/lang/nl/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/nl/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php
index 3f776a6872..45bd4c79d6 100644
--- a/resources/lang/no/admin/settings/general.php
+++ b/resources/lang/no/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefiks (valgfritt)',
'auto_incrementing_help' => 'Aktiver først automatisk øking av eiendels-IDer for å velge dette alternativet',
'backups' => 'Sikkerhetskopier',
- 'barcode_type' => 'Strekkodetype',
'barcode_settings' => 'Strekkodeinnstillinger',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Vis levetid i tabellvisning',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Strekkodetype',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA-innstillinger',
'eula_markdown' => 'Denne EULAen tillater Github Flavored markdown.',
diff --git a/resources/lang/no/auth/general.php b/resources/lang/no/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/no/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/no/passwords.php b/resources/lang/no/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/no/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index e1dfcd20d5..65e916bba5 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (opcjonalnie)',
'auto_incrementing_help' => 'Najpierw aktywuj automatycznie zwiększane ID Aktywa, by móc ustawić te opcje.',
'backups' => 'Kopie zapasowe',
- 'barcode_type' => 'Typ Kodu Kreskowego',
'barcode_settings' => 'Ustawienia Kodów Kreskowych',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Wyświetl koniec linii w widoku tabeli',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Typ Kodu Kreskowego',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Ustawienia Licencji',
'eula_markdown' => 'Ta licencja zezwala na Github flavored markdown.',
diff --git a/resources/lang/pl/auth/general.php b/resources/lang/pl/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/pl/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/pl/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index cfd22bcd30..dbdb641b0b 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefixo (opcional)',
'auto_incrementing_help' => 'Permitir auto insercao dessa ID de ativo antes de configurar isso',
'backups' => 'Backups',
- 'barcode_type' => 'Tipo do Código de Barras',
'barcode_settings' => 'Configuração do código de barras',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Exibir EOL na visualização de tabela',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Tipo do Código de Barras',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Configuração do termo de uso',
'eula_markdown' => 'Este EULA permite Github flavored markdown.',
diff --git a/resources/lang/pt-BR/auth/general.php b/resources/lang/pt-BR/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/pt-BR/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/pt-BR/passwords.php b/resources/lang/pt-BR/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/pt-BR/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index beabe3f595..2f42def190 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefixo (opcional)',
'auto_incrementing_help' => 'Ative IDs auto-incrementais antes da configuração',
'backups' => 'Cópias de segurança',
- 'barcode_type' => 'Tipo de Código de Barras',
'barcode_settings' => 'Definições de Código de Barras',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Mostrar EOL na tabela',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Tipo de Código de Barras',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Definições de EULA',
'eula_markdown' => 'Este EULA permite Github flavored markdown.',
diff --git a/resources/lang/pt-PT/auth/general.php b/resources/lang/pt-PT/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/pt-PT/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/pt-PT/passwords.php b/resources/lang/pt-PT/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/pt-PT/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index 3666b6380e..2b68f19c08 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Arata EOL in tabel',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/ro/auth/general.php b/resources/lang/ro/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ro/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ro/passwords.php b/resources/lang/ro/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ro/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php
index 581749dccc..8d1222a49e 100644
--- a/resources/lang/ru/admin/settings/general.php
+++ b/resources/lang/ru/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Префикс ( не обязательно )',
'auto_incrementing_help' => 'Включить автоматические возрастание ID активов начиная с',
'backups' => 'Резервные копии',
- 'barcode_type' => 'Тип штрихкода',
'barcode_settings' => 'Настройки штрихкода',
'confirm_purge' => 'Подтвердить удаление',
'confirm_purge_help' => 'Введите "DELETE" в поле ниже для подтверждения удаления. Это действие необратимо.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Отображать дату истечения срока гарантии в таблице',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Тип штрихкода',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Настройки лицензионного соглашения',
'eula_markdown' => 'Это EULA поддерживает форматирование Github flavored markdown.',
diff --git a/resources/lang/ru/auth/general.php b/resources/lang/ru/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/ru/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/ru/passwords.php b/resources/lang/ru/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/ru/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/sv-SE/auth/general.php b/resources/lang/sv-SE/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/sv-SE/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/sv-SE/passwords.php b/resources/lang/sv-SE/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/sv-SE/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php
index cec09471e4..fdf041d16b 100644
--- a/resources/lang/th/admin/settings/general.php
+++ b/resources/lang/th/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (ส่วนเสริม)',
'auto_incrementing_help' => 'เปิดใช้งานการเพิ่มรหัสสินทรัพย์อัตโนมัติก่อนตั้งค่าส่วนนี้',
'backups' => 'สำรอง',
- 'barcode_type' => 'ชนิดบาร์โค๊ด',
'barcode_settings' => 'ตั้งค่าบาร์โค๊ด',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'ดู EOL ในแบบตาราง',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'ชนิดบาร์โค๊ด',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'ตั้งค่าข้อตกลงการใช้งาน',
'eula_markdown' => 'อนุญาต EULA นี้ Github flavored markdown.',
diff --git a/resources/lang/th/auth/general.php b/resources/lang/th/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/th/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/th/passwords.php b/resources/lang/th/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/th/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index ee8879e046..512bfccb14 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Ünvan (opsiyonel)',
'auto_incrementing_help' => 'Otomatik artan demirbaş No ilk buradan başlasın',
'backups' => 'Yedekler',
- 'barcode_type' => 'Barkod Tipi',
'barcode_settings' => 'Barkod Ayarları',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Tablo görüntüsünde Sözleşmeyi görüntüle',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barkod Tipi',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Son Kullanıcı Lisans Sözleşmesi Ayarları',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/tr/auth/general.php b/resources/lang/tr/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/tr/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/tr/passwords.php b/resources/lang/tr/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/tr/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php
index 33a422543b..fb52080b19 100644
--- a/resources/lang/vi/admin/settings/general.php
+++ b/resources/lang/vi/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Tiền tố (tùy chọn)',
'auto_incrementing_help' => 'Cho phép ID tài sản tự động tăng đầu tiên được đặt cho nó',
'backups' => 'Sao lưu',
- 'barcode_type' => 'Loại mã vạch',
'barcode_settings' => 'Cài đặt mã vạch',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Hiển thị EOL ở bảng',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Loại mã vạch',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'Cài đặt EULA',
'eula_markdown' => 'Đây là EULA cho phép Github flavored markdown.',
diff --git a/resources/lang/vi/auth/general.php b/resources/lang/vi/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/vi/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/vi/passwords.php b/resources/lang/vi/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/vi/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/zh-CN/admin/categories/message.php b/resources/lang/zh-CN/admin/categories/message.php
index 7e7403fb77..68f33b8920 100644
--- a/resources/lang/zh-CN/admin/categories/message.php
+++ b/resources/lang/zh-CN/admin/categories/message.php
@@ -3,8 +3,8 @@
return array(
'does_not_exist' => '分类不存在',
- 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
- 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ',
+ 'assoc_models' => '此分类下至少还有一个相关资产型号，目前不能被删除，请你确定您的所有资产型号不在此分类下，然后重试。',
+ 'assoc_items' => '此分类下至少还有一个相关资产类型，目前不能被删除，请你确定您的所有资产类型不在此分类下，然后重试。',
'create' => array(
'error' => '分类创建失败，请重试。',
diff --git a/resources/lang/zh-CN/admin/consumables/general.php b/resources/lang/zh-CN/admin/consumables/general.php
index 9b05e383ff..3b6b8db9de 100644
--- a/resources/lang/zh-CN/admin/consumables/general.php
+++ b/resources/lang/zh-CN/admin/consumables/general.php
@@ -7,7 +7,7 @@ return array(
'cost' => '采购成本',
'create' => '创建耗材',
'date' => '采购日期',
- 'item_no' => 'Item No.',
+ 'item_no' => '项目编号',
'order' => '订单号',
'remaining' => '剩余',
'total' => '总计',
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 2d5c0e8573..fb57a8f771 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -2,15 +2,14 @@
return array(
'alert_email' => '发送警报',
- 'alerts_enabled' => 'Alerts Enabled',
- 'alert_interval' => 'Expiring Alerts Threshold (in days)',
+ 'alerts_enabled' => '警报已启用',
+ 'alert_interval' => '警报阈值(天)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => '资产ID',
'auto_increment_assets' => '生成自动递增资产ID',
'auto_increment_prefix' => '前缀（可选）',
'auto_incrementing_help' => '在启用自动递增的资产ID之前设置此处。',
'backups' => '备份',
- 'barcode_type' => '条码类型',
'barcode_settings' => '条码设置',
'confirm_purge' => '确认清除',
'confirm_purge_help' => '请在文本框内输入“DELETE” 清楚已经标记删除的记录。 注意，此操作无法撤销。',
@@ -23,10 +22,10 @@ return array(
'display_asset_name' => '显示资产名称',
'display_checkout_date' => '显示借出日期',
'display_eol' => '以表格形式显示寿命期限',
- 'display_qr' => 'Display Square Codes',
- 'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => '条码类型',
- 'alt_barcode_type' => '2D barcode type',
+ 'display_qr' => '显示二维码',
+ 'display_alt_barcode' => '显示条码',
+ 'barcode_type' => '3D Barcode Type',
+ 'alt_barcode_type' => '条码类型',
'eula_settings' => '最终用户许可协议(EULA)设置',
'eula_markdown' => 'EULA中可以使用Github flavored markdown.',
'general_settings' => '一般设置',
diff --git a/resources/lang/zh-CN/auth/general.php b/resources/lang/zh-CN/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/zh-CN/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/zh-CN/passwords.php b/resources/lang/zh-CN/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/zh-CN/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index 03f31a2e3b..82b3d1e5d1 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -10,7 +10,6 @@ return array(
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
'backups' => 'Backups',
- 'barcode_type' => 'Barcode Type',
'barcode_settings' => 'Barcode Settings',
'confirm_purge' => 'Confirm Purge',
'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
@@ -25,7 +24,7 @@ return array(
'display_eol' => 'Display EOL in table view',
'display_qr' => 'Display Square Codes',
'display_alt_barcode' => 'Display 2D barcode',
- 'barcode_type' => 'Barcode Type',
+ 'barcode_type' => '3D Barcode Type',
'alt_barcode_type' => '2D barcode type',
'eula_settings' => 'EULA Settings',
'eula_markdown' => 'This EULA allows Github flavored markdown.',
diff --git a/resources/lang/zh-TW/auth/general.php b/resources/lang/zh-TW/auth/general.php
new file mode 100644
index 0000000000..bf88cba77a
--- /dev/null
+++ b/resources/lang/zh-TW/auth/general.php
@@ -0,0 +1,12 @@
+ 'Send Password Reset Link',
+ 'email_reset_password' => 'Email Password Reset',
+ 'reset_password' => 'Reset Password',
+ 'login' => 'Login',
+ 'login_prompt' => 'Please Login',
+ 'forgot_password' => 'I forgot my password',
+ 'remember_me' => 'Remember Me',
+ ];
+
diff --git a/resources/lang/zh-TW/passwords.php b/resources/lang/zh-TW/passwords.php
new file mode 100644
index 0000000000..5195a9b77c
--- /dev/null
+++ b/resources/lang/zh-TW/passwords.php
@@ -0,0 +1,7 @@
+ 'Your password link has been sent!',
+ 'user' => 'That user does not exist or does not have an email address associated',
+];
+