diff --git a/app/config/version.php b/app/config/version.php
index 36358b4295..bd29734b45 100644
--- a/app/config/version.php
+++ b/app/config/version.php
@@ -1,5 +1,5 @@
'v2.0-153',
- 'hash_version' => 'v2.0-153-g141c77f',
+ 'app_version' => 'v2.0-154',
+ 'hash_version' => 'v2.0-154-g10909a2',
);
\ No newline at end of file
diff --git a/app/lang/ar/admin/consumables/message.php b/app/lang/ar/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/ar/admin/consumables/message.php
+++ b/app/lang/ar/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/bg/admin/consumables/message.php b/app/lang/bg/admin/consumables/message.php
index 0f5cbaecf6..f737d315bd 100755
--- a/app/lang/bg/admin/consumables/message.php
+++ b/app/lang/bg/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Сигурни ли сте, че желаете да изтриете аксесоара?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Проблем при изтриването на консуматива. Моля опитайте отново.',
- 'success' => 'Аксесоарът беше изтрит успешно.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/cs/admin/consumables/message.php b/app/lang/cs/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/cs/admin/consumables/message.php
+++ b/app/lang/cs/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/da/admin/consumables/message.php b/app/lang/da/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/da/admin/consumables/message.php
+++ b/app/lang/da/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/de/admin/consumables/message.php b/app/lang/de/admin/consumables/message.php
index c46133f25e..fb6b542dcd 100755
--- a/app/lang/de/admin/consumables/message.php
+++ b/app/lang/de/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Wollen Sie dieses Zubehör wirklich löschen?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Es gab Probleme das Verbrauchsmaterial zu löschen. Bitte versuchen Sie es noch einmal.',
- 'success' => 'Zubehör wurde erfolgreich gelöscht.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/en-GB/admin/consumables/message.php b/app/lang/en-GB/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/en-GB/admin/consumables/message.php
+++ b/app/lang/en-GB/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/en-ID/admin/consumables/message.php b/app/lang/en-ID/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/en-ID/admin/consumables/message.php
+++ b/app/lang/en-ID/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/es-CO/admin/consumables/message.php b/app/lang/es-CO/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/es-CO/admin/consumables/message.php
+++ b/app/lang/es-CO/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/es-ES/admin/consumables/message.php b/app/lang/es-ES/admin/consumables/message.php
index 9a88bf44eb..6fd5767695 100755
--- a/app/lang/es-ES/admin/consumables/message.php
+++ b/app/lang/es-ES/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Esta seguro de querer borrar este accesorio?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Hubo un error al borrar este consumible. Por favor intente nuevamente.',
- 'success' => 'El accesorio fue borrado con éxito.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/fi/admin/consumables/message.php b/app/lang/fi/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/fi/admin/consumables/message.php
+++ b/app/lang/fi/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/fr/admin/consumables/message.php b/app/lang/fr/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/fr/admin/consumables/message.php
+++ b/app/lang/fr/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/hr/admin/consumables/message.php b/app/lang/hr/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/hr/admin/consumables/message.php
+++ b/app/lang/hr/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/hu/admin/consumables/message.php b/app/lang/hu/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/hu/admin/consumables/message.php
+++ b/app/lang/hu/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/it/admin/consumables/message.php b/app/lang/it/admin/consumables/message.php
index d0fa02e7f4..3ad9057f4a 100755
--- a/app/lang/it/admin/consumables/message.php
+++ b/app/lang/it/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Sei sicuro di voler eliminare quest\'accessorio?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'C\'è stato un problema durante l\'eliminazione del consumabile. Prova di nuovo.',
- 'success' => 'L\'accessorio è stato eliminato con successo.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ja/admin/consumables/message.php b/app/lang/ja/admin/consumables/message.php
index e02070a9d1..23736eb24d 100755
--- a/app/lang/ja/admin/consumables/message.php
+++ b/app/lang/ja/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'この付属品を本当に削除してもよいですか？',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => '消耗品の削除に失敗しました。もう一度試して下さい。',
- 'success' => '付属品の削除に成功しました。'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ja/admin/settings/general.php b/app/lang/ja/admin/settings/general.php
index 47ea14b894..6bd430822e 100755
--- a/app/lang/ja/admin/settings/general.php
+++ b/app/lang/ja/admin/settings/general.php
@@ -22,7 +22,7 @@ return array(
'eula_settings' => 'EULA設定',
'eula_markdown' => 'この EULA は、Github flavored markdownで、利用可能です。',
'general_settings' => '全般設定',
- 'generate_backup' => 'Generate Backup',
+ 'generate_backup' => 'バックアップを作成',
'header_color' => 'ヘッダーカラー',
'info' => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。',
'laravel' => 'Laravelバージョン',
diff --git a/app/lang/ja/admin/settings/message.php b/app/lang/ja/admin/settings/message.php
index 8e7a1e116a..e7718f52d7 100755
--- a/app/lang/ja/admin/settings/message.php
+++ b/app/lang/ja/admin/settings/message.php
@@ -8,10 +8,10 @@ return array(
'success' => '更新に成功しました。'
),
'backup' => array(
- 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
- 'file_deleted' => 'The backup file was successfully deleted. ',
- 'generated' => 'A new backup file was successfully created.',
- 'file_not_found' => 'That backup file could not be found on the server.',
+ 'delete_confirm' => 'このバックアップファイルを削除してもよろしいですか？この操作は、もとに戻すことは出来ません。 ',
+ 'file_deleted' => 'バックアップファイルの削除に成功しました。 ',
+ 'generated' => '新しいバックアップファイルが作成されました。',
+ 'file_not_found' => 'そのバックアップファイルをサーバー上に見つけることが出来ませんでした。',
),
);
diff --git a/app/lang/ko/admin/consumables/message.php b/app/lang/ko/admin/consumables/message.php
index 7d776ba624..11d25b7054 100755
--- a/app/lang/ko/admin/consumables/message.php
+++ b/app/lang/ko/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => '이 부속품을 삭제하시겠습니까?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => '소모품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.',
- 'success' => '부속품이 삭제되었습니다.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/lt/admin/consumables/message.php b/app/lang/lt/admin/consumables/message.php
index 8a9c43acf5..45b3a14c35 100755
--- a/app/lang/lt/admin/consumables/message.php
+++ b/app/lang/lt/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Ar jūs tikrai norite ištrinti šią suvartojamą įrangą?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Nepavyko ištrinti suvartojamos įrangos. Prašome bandykite dar kartą.',
- 'success' => 'Ši įranga sėkmingai ištrinta.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ms/admin/consumables/message.php b/app/lang/ms/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/ms/admin/consumables/message.php
+++ b/app/lang/ms/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/nl/admin/consumables/message.php b/app/lang/nl/admin/consumables/message.php
index 17c685eb8e..48a3cfbd9f 100755
--- a/app/lang/nl/admin/consumables/message.php
+++ b/app/lang/nl/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'Het accessoire is succesvol verwijderd.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/no/admin/consumables/message.php b/app/lang/no/admin/consumables/message.php
index 4a8b9ed6fb..3df81b8def 100755
--- a/app/lang/no/admin/consumables/message.php
+++ b/app/lang/no/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Er du sikker på at du vil slette dette tilbehør?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Noe gikk feil under sletting av forbruksvaren. Prøv igjen.',
- 'success' => 'Tilbehør ble slettet.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/pl/admin/consumables/message.php b/app/lang/pl/admin/consumables/message.php
index bb65d46cad..eb56c42220 100755
--- a/app/lang/pl/admin/consumables/message.php
+++ b/app/lang/pl/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Czy na pewno chcesz usunąć te akcesoria?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'Akcesoria usunięte pomyślnie.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/pt-BR/admin/consumables/message.php b/app/lang/pt-BR/admin/consumables/message.php
index a2cd8ae72d..da46bf7cd0 100755
--- a/app/lang/pt-BR/admin/consumables/message.php
+++ b/app/lang/pt-BR/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Tem certeza de que deseja excluir este acessório ?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Houve um problema ao excluir o consumível. Por favor, tente novamente.',
- 'success' => 'O acessório foi excluído com sucesso.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/pt-BR/admin/settings/general.php b/app/lang/pt-BR/admin/settings/general.php
index 22576fb71c..012f8e8c3a 100755
--- a/app/lang/pt-BR/admin/settings/general.php
+++ b/app/lang/pt-BR/admin/settings/general.php
@@ -22,7 +22,7 @@ return array(
'eula_settings' => 'Configuração do termo de uso',
'eula_markdown' => 'Este EULA permite Github flavored markdown.',
'general_settings' => 'Configuracoes Gerais',
- 'generate_backup' => 'Generate Backup',
+ 'generate_backup' => 'Backup Criado',
'header_color' => 'Cor do Cabeçalho',
'info' => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.',
'laravel' => 'Versão do Laravel',
diff --git a/app/lang/pt-BR/admin/settings/message.php b/app/lang/pt-BR/admin/settings/message.php
index bc38f6ee2d..ecb202a053 100755
--- a/app/lang/pt-BR/admin/settings/message.php
+++ b/app/lang/pt-BR/admin/settings/message.php
@@ -8,10 +8,10 @@ return array(
'success' => 'Configurações atualizadas com sucesso.'
),
'backup' => array(
- 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ',
- 'file_deleted' => 'The backup file was successfully deleted. ',
- 'generated' => 'A new backup file was successfully created.',
- 'file_not_found' => 'That backup file could not be found on the server.',
+ 'delete_confirm' => 'Você tem certeza que quer apagar este arquivo de backup? Esta ação não pode ser desfeita. ',
+ 'file_deleted' => 'O arquivo de backup foi apagado com sucesso. ',
+ 'generated' => 'Um novo arquivo de backup foi criado com sucesso.',
+ 'file_not_found' => 'Arquivo de backup não foi encontrado no servidor.',
),
);
diff --git a/app/lang/pt-PT/admin/consumables/message.php b/app/lang/pt-PT/admin/consumables/message.php
index 1e6c335110..03a57fa6e6 100755
--- a/app/lang/pt-PT/admin/consumables/message.php
+++ b/app/lang/pt-PT/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Tem a certeza que pretende remover este acessório?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Ocorreu um problema ao remover o consumível. Por favor, tente novamente.',
- 'success' => 'O acessório foi removido com sucesso.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ro/admin/consumables/message.php b/app/lang/ro/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/ro/admin/consumables/message.php
+++ b/app/lang/ro/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ru/admin/accessories/table.php b/app/lang/ru/admin/accessories/table.php
index b4a1ebbbe5..462df93d03 100755
--- a/app/lang/ru/admin/accessories/table.php
+++ b/app/lang/ru/admin/accessories/table.php
@@ -1,7 +1,7 @@
'Download CSV',
+ 'dl_csv' => 'Загрузить CSV',
'eula_text' => 'EULA',
'id' => 'ID',
'require_acceptance' => 'Принятие',
diff --git a/app/lang/ru/admin/asset_maintenances/form.php b/app/lang/ru/admin/asset_maintenances/form.php
index 785d06b08f..e9fee069ef 100755
--- a/app/lang/ru/admin/asset_maintenances/form.php
+++ b/app/lang/ru/admin/asset_maintenances/form.php
@@ -2,7 +2,7 @@
return [
'asset_maintenance_type' => 'Asset Maintenance Type',
- 'title' => 'Title',
+ 'title' => 'Заголовок',
'start_date' => 'Start Date',
'completion_date' => 'Completion Date',
'cost' => 'Cost',
diff --git a/app/lang/ru/admin/asset_maintenances/table.php b/app/lang/ru/admin/asset_maintenances/table.php
index 02e9060bf6..42e7661726 100755
--- a/app/lang/ru/admin/asset_maintenances/table.php
+++ b/app/lang/ru/admin/asset_maintenances/table.php
@@ -4,6 +4,6 @@
'title' => 'Asset Maintenance',
'asset_name' => 'Asset Name',
'supplier_name' => 'Supplier Name',
- 'is_warranty' => 'Warranty',
- 'dl_csv' => 'Download CSV'
+ 'is_warranty' => 'Гарантия',
+ 'dl_csv' => 'Загрузить CSV'
];
\ No newline at end of file
diff --git a/app/lang/ru/admin/consumables/message.php b/app/lang/ru/admin/consumables/message.php
index 6fa3daf913..2ee5eaab3e 100755
--- a/app/lang/ru/admin/consumables/message.php
+++ b/app/lang/ru/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Вы уверены, что хотите удалить этот аксессуар?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'В процессе удаления расходного материала произошла ошибка. Попробуйте ещё раз.',
- 'success' => 'Аксесуар был успешно удалён.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/ru/admin/settings/general.php b/app/lang/ru/admin/settings/general.php
index 07b44c4f1d..8fc7216c6f 100755
--- a/app/lang/ru/admin/settings/general.php
+++ b/app/lang/ru/admin/settings/general.php
@@ -12,7 +12,7 @@ return array(
'barcode_settings' => 'Настройки штрихкода',
'custom_css' => 'Custom CSS',
'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
- 'default_currency' => 'Default Currency',
+ 'default_currency' => 'Валюта по-умолчанию',
'default_eula_text' => 'Пользовательское соглашение по умолчанию',
'default_eula_help_text' => 'Вы так же можете привязать собственные пользовательские соглашения к определенным категориям активов.',
'display_asset_name' => 'Отображаемое имя актива',
diff --git a/app/lang/ru/auth/message.php b/app/lang/ru/auth/message.php
index b497600bef..fdb7bc4c92 100755
--- a/app/lang/ru/auth/message.php
+++ b/app/lang/ru/auth/message.php
@@ -3,7 +3,7 @@
return array(
'account_already_exists' => 'Учетная запись с таким адресом электронной почты уже существует.',
- 'account_not_found' => 'The username or password is incorrect.',
+ 'account_not_found' => 'Неверный Логин или Пароль.',
'account_not_activated' => 'Эта учетная запись не активирована.',
'account_suspended' => 'Эта учетная запись приостановлена.',
'account_banned' => 'Эта учетная запись заблокирована.',
diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php
index da65f5a95f..5b12d3ed33 100755
--- a/app/lang/ru/general.php
+++ b/app/lang/ru/general.php
@@ -73,8 +73,8 @@
'licenses' => 'Лицензии',
'list_all' => 'Весь список',
'loading' => 'Загрузка',
- 'lock_passwords' => 'This field cannot be edited in this installation.',
- 'feature_disabled' => 'This feature has been disabled for this installation.',
+ 'lock_passwords' => 'Поле не может быть изменено в этой версии.',
+ 'feature_disabled' => 'Функция отключена в этой версии.',
'location' => 'Расположение',
'locations' => 'Места',
'logout' => 'Выйти',
@@ -102,7 +102,7 @@
'ready_to_deploy' => 'Готов к установке',
'recent_activity' => 'Недавняя активность',
'reports' => 'Отчеты',
- 'requested' => 'Requested',
+ 'requested' => 'Запрошено',
'save' => 'Сохранить',
'select' => 'Выбор',
'search' => 'Поиск',
@@ -113,7 +113,7 @@
'select_supplier' => 'Выберите поставщика',
'select_user' => 'Выберите пользователя',
'select_date' => 'Выберите дату',
- 'select_statuslabel' => 'Select Status',
+ 'select_statuslabel' => 'Выбрать статус',
'settings' => 'Настройки',
'sign_in' => 'Вход',
'site_name' => 'Название сайта',
diff --git a/app/lang/ru/validation.php b/app/lang/ru/validation.php
index 565e0ead04..b9480a2af9 100755
--- a/app/lang/ru/validation.php
+++ b/app/lang/ru/validation.php
@@ -77,7 +77,7 @@ return array(
*/
'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'alpha_space' => "Поле :attribute содержит запрещенные символы.",
/*
|--------------------------------------------------------------------------
diff --git a/app/lang/sv-SE/admin/consumables/message.php b/app/lang/sv-SE/admin/consumables/message.php
index 45c803c4c2..48a3cfbd9f 100755
--- a/app/lang/sv-SE/admin/consumables/message.php
+++ b/app/lang/sv-SE/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/th/admin/consumables/message.php b/app/lang/th/admin/consumables/message.php
index 063ca0b906..b29064e420 100755
--- a/app/lang/th/admin/consumables/message.php
+++ b/app/lang/th/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'คุณแน่ใจที่จะลบอุปกรณ์เสริมนี้?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'มีปัญหาระหว่างการลบวัสดุสิ้นเปลือง กรุณาลองอีกครั้ง',
- 'success' => 'ลบอุปกรณ์เสริมเรียบร้อยแล้ว'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/tr/admin/consumables/message.php b/app/lang/tr/admin/consumables/message.php
index 699b64585a..f01f50ca4e 100755
--- a/app/lang/tr/admin/consumables/message.php
+++ b/app/lang/tr/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bu aksesuarı silmek istediğinize emin misiniz?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Sarf malzemesi\'ni silerken hata oluştu. Lütfen tekrar deneyin.',
- 'success' => 'Aksesuar silindi.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/tr/admin/users/table.php b/app/lang/tr/admin/users/table.php
index 8c9b40a454..d70375df90 100755
--- a/app/lang/tr/admin/users/table.php
+++ b/app/lang/tr/admin/users/table.php
@@ -2,35 +2,35 @@
return array(
- 'activated' => 'Active',
- 'allow' => 'Allow',
- 'checkedout' => 'Assets',
- 'created_at' => 'Created',
- 'createuser' => 'Create User',
- 'deny' => 'Deny',
- 'email' => 'Email',
+ 'activated' => 'Aktif',
+ 'allow' => 'Kabul Et',
+ 'checkedout' => 'Demirbaşlar',
+ 'created_at' => 'Oluşturuldu',
+ 'createuser' => 'Kullanıcı Oluştur',
+ 'deny' => 'Reddet',
+ 'email' => 'E-Posta',
'employee_num' => 'Employee No.',
- 'first_name' => 'First Name',
+ 'first_name' => 'Ad',
'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.',
'id' => 'Id',
'inherit' => 'Inherit',
'job' => 'Job Title',
- 'last_login' => 'Last Login',
- 'last_name' => 'Last Name',
+ 'last_login' => 'Son oturum açma',
+ 'last_name' => 'Soyad',
'location' => 'Location',
'lock_passwords' => 'Login details cannot be changed on this installation.',
'manager' => 'Manager',
- 'name' => 'Name',
- 'notes' => 'Notes',
- 'password_confirm' => 'Confirm Password',
- 'password' => 'Password',
- 'phone' => 'Phone',
+ 'name' => 'Adı',
+ 'notes' => 'Notlar',
+ 'password_confirm' => 'Şifreyi Doğrula',
+ 'password' => 'Şifre',
+ 'phone' => 'Telefon',
'show_current' => 'Show Current Users',
'show_deleted' => 'Show Deleted Users',
- 'title' => 'Title',
+ 'title' => 'Başlık',
'updateuser' => 'Update User',
- 'username' => 'Username',
+ 'username' => 'Kullanıcı Adı',
'username_note' => '(This is used for Active Directory binding only, not for login.)',
- 'cloneuser' => 'Clone User',
- 'viewusers' => 'View Users',
+ 'cloneuser' => 'Kullanıcıyı Kopyala',
+ 'viewusers' => 'Kullanıcıları Görüntüle',
);
diff --git a/app/lang/tr/button.php b/app/lang/tr/button.php
index 6cafdf61a6..ed722e7e1e 100755
--- a/app/lang/tr/button.php
+++ b/app/lang/tr/button.php
@@ -2,14 +2,14 @@
return array(
- 'actions' => 'Actions',
- 'add' => 'Add New',
- 'cancel' => 'Cancel',
- 'delete' => 'Delete',
- 'edit' => 'Edit',
- 'restore' => 'Restore',
- 'request' => 'Request',
- 'submit' => 'Submit',
- 'upload' => 'Upload',
+ 'actions' => 'Hareketler',
+ 'add' => 'Yeni ekle',
+ 'cancel' => 'İptal',
+ 'delete' => 'Sil',
+ 'edit' => 'Düzenle',
+ 'restore' => 'Geri yükle',
+ 'request' => 'İstek',
+ 'submit' => 'Gönder',
+ 'upload' => 'Yükle',
);
diff --git a/app/lang/tr/general.php b/app/lang/tr/general.php
index e1fc1fe930..7c72c7fc79 100755
--- a/app/lang/tr/general.php
+++ b/app/lang/tr/general.php
@@ -1,56 +1,56 @@
'Accessories',
- 'accessory' => 'Accessory',
- 'accessory_report' => 'Accessory Report',
- 'action' => 'Action',
- 'activity_report' => 'Activity Report',
- 'address' => 'Address',
- 'admin' => 'Admin',
- 'all_assets' => 'All Assets',
- 'all' => 'All',
- 'archived' => 'Archived',
- 'asset_models' => 'Asset Models',
- 'asset' => 'Asset',
- 'asset_report' => 'Asset Report',
- 'asset_tag' => 'Asset Tag',
- 'assets_available' => 'assets available',
- 'assets' => 'Assets',
- 'avatar_delete' => 'Delete Avatar',
- 'avatar_upload' => 'Upload Avatar',
- 'back' => 'Back',
- 'bad_data' => 'Nothing found. Maybe bad data?',
- 'cancel' => 'Cancel',
- 'categories' => 'Categories',
- 'category' => 'Category',
- 'changeemail' => 'Change Email Address',
- 'changepassword' => 'Change Password',
- 'checkin' => 'Checkin',
+ 'accessories' => 'Aksesuarlar',
+ 'accessory' => 'Aksesuar',
+ 'accessory_report' => 'Aksesuar Raporu',
+ 'action' => 'Hareket',
+ 'activity_report' => 'Aktivite Raporu',
+ 'address' => 'Adres',
+ 'admin' => 'Yönetici',
+ 'all_assets' => 'Tüm Demirbaşlar',
+ 'all' => 'Tümü',
+ 'archived' => 'Arşivlenmiş',
+ 'asset_models' => 'Demirbaş Modelleri',
+ 'asset' => 'Demirbaş',
+ 'asset_report' => 'Demirbaş Raporu',
+ 'asset_tag' => 'Demirbaş Etiketi',
+ 'assets_available' => 'Kullanılabilir Demirbaşlar',
+ 'assets' => 'Demirbaşlar',
+ 'avatar_delete' => 'Profil Resmini Sil',
+ 'avatar_upload' => 'Profil Resmi Yükle',
+ 'back' => 'Geri',
+ 'bad_data' => 'Hiçbir veri bulunamadı. Bozuk veri olabilir.',
+ 'cancel' => 'İptal',
+ 'categories' => 'Kategoriler',
+ 'category' => 'Kategori',
+ 'changeemail' => 'E-posta Adresini Değiştir',
+ 'changepassword' => 'Şifreyi Değiştir',
+ 'checkin' => 'Giriş',
'checkin_from' => 'Checkin from',
'checkout' => 'Checkout',
- 'city' => 'City',
- 'consumable' => 'Consumable',
- 'consumables' => 'Consumables',
- 'country' => 'Country',
- 'create' => 'Create New',
- 'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'city' => 'Şehir',
+ 'consumable' => 'Sarf Malzeme',
+ 'consumables' => 'Sarf Malzemeleri',
+ 'country' => 'Ülke',
+ 'create' => 'Yeni Oluştur',
+ 'created_asset' => 'Oluşturulmuş Demirbaş',
+ 'created_at' => 'Şurada oluşturuldu',
'currency' => '$', // this is deprecated
- 'current' => 'Current',
+ 'current' => 'Geçerli',
'custom_report' => 'Custom Asset Report',
- 'dashboard' => 'Dashboard',
- 'date' => 'Date',
- 'delete' => 'Delete',
- 'deleted' => 'Deleted',
+ 'dashboard' => 'Pano',
+ 'date' => 'Tarih',
+ 'delete' => 'Sil',
+ 'deleted' => 'Silinmiş',
'deployed' => 'Deployed',
'depreciation_report' => 'Depreciation Report',
- 'download' => 'Download',
+ 'download' => 'İndir',
'depreciation' => 'Depreciation',
- 'editprofile' => 'Edit Your Profile',
+ 'editprofile' => 'Profil Düzenle',
'eol' => 'EOL',
- 'first' => 'First',
- 'first_name' => 'First Name',
+ 'first' => 'İlk',
+ 'first_name' => 'Ad',
'file_name' => 'File',
'file_uploads' => 'File Uploads',
'generate' => 'Generate',
@@ -65,78 +65,78 @@
'asset_maintenance_report' => 'Asset Maintenance Report',
'asset_maintenances' => 'Asset Maintenances',
'item' => 'Item',
- 'last' => 'Last',
+ 'last' => 'Son',
'last_name' => 'Last Name',
'license' => 'License',
'license_report' => 'License Report',
'licenses_available' => 'licenses available',
- 'licenses' => 'Licenses',
+ 'licenses' => 'Lisanslar',
'list_all' => 'List All',
'loading' => 'Loading',
'lock_passwords' => 'This field cannot be edited in this installation.',
'feature_disabled' => 'This feature has been disabled for this installation.',
'location' => 'Location',
- 'locations' => 'Locations',
- 'logout' => 'Logout',
- 'manufacturer' => 'Manufacturer',
- 'manufacturers' => 'Manufacturers',
+ 'locations' => 'Konumlar',
+ 'logout' => 'Çıkış Yap',
+ 'manufacturer' => 'Üretici',
+ 'manufacturers' => 'Üreticiler',
'model_no' => 'Model No.',
- 'months' => 'months',
- 'moreinfo' => 'More Info',
- 'name' => 'Name',
- 'next' => 'Next',
+ 'months' => 'ay',
+ 'moreinfo' => 'Daha Fazla Bilgi',
+ 'name' => 'Adı',
+ 'next' => 'Sonraki',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
- 'no' => 'No',
- 'notes' => 'Notes',
+ 'no' => 'Hayır',
+ 'notes' => 'Notlar',
'page_menu' => 'Showing _MENU_ items',
'pagination_info' => 'Showing _START_ to _END_ of _TOTAL_ items',
- 'pending' => 'Pending',
- 'people' => 'People',
- 'per_page' => 'Results Per Page',
- 'previous' => 'Previous',
- 'processing' => 'Processing',
- 'profile' => 'Your profile',
+ 'pending' => 'Bekliyor',
+ 'people' => 'Kişiler',
+ 'per_page' => 'Sayfa başına sonuç sayısı',
+ 'previous' => 'Önceki',
+ 'processing' => 'İşleniyor',
+ 'profile' => 'Profiliniz',
'qty' => 'QTY',
'quanitity' => 'Quanitity',
'ready_to_deploy' => 'Ready to Deploy',
'recent_activity' => 'Recent Activity',
- 'reports' => 'Reports',
+ 'reports' => 'Raporlar',
'requested' => 'Requested',
- 'save' => 'Save',
- 'select' => 'Select',
- 'search' => 'Search',
+ 'save' => 'Kaydet',
+ 'select' => 'Seç',
+ 'search' => 'Ara',
'select_depreciation' => 'Select a Depreciation Type',
- 'select_location' => 'Select a Location',
+ 'select_location' => 'Konum Seç',
'select_manufacturer' => 'Select a Manufacturer',
- 'select_model' => 'Select a Model',
+ 'select_model' => 'Model Seç',
'select_supplier' => 'Select a Supplier',
- 'select_user' => 'Select a User',
- 'select_date' => 'Select Date',
- 'select_statuslabel' => 'Select Status',
- 'settings' => 'Settings',
- 'sign_in' => 'Sign in',
- 'site_name' => 'Site Name',
+ 'select_user' => 'Kullanıcı Seç',
+ 'select_date' => 'Tarih seç',
+ 'select_statuslabel' => 'Durum Seç',
+ 'settings' => 'Ayarlar',
+ 'sign_in' => 'Oturum Aç',
+ 'site_name' => 'Site Adı',
'state' => 'State',
- 'status_labels' => 'Status Labels',
- 'status' => 'Status',
- 'suppliers' => 'Suppliers',
- 'total_assets' => 'total assets',
- 'total_licenses' => 'total licenses',
- 'type' => 'Type',
+ 'status_labels' => 'Durum Etiketleri',
+ 'status' => 'Durum',
+ 'suppliers' => 'Tedarikçiler',
+ 'total_assets' => 'Toplam Demirbaşlar',
+ 'total_licenses' => 'Toplam Lisanslar',
+ 'type' => 'Tip',
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
- 'update' => 'Update',
- 'uploaded' => 'Uploaded',
- 'user' => 'User',
+ 'update' => 'Güncelle',
+ 'uploaded' => 'Yüklendi',
+ 'user' => 'Kullanıcı',
'accepted' => 'accepted',
'declined' => 'declined',
'unaccepted_asset_report' => 'Unaccepted Assets',
- 'users' => 'Users',
+ 'users' => 'Kullanıcılar',
'viewassets' => 'View Assigned Assets',
- 'website' => 'Website',
- 'welcome' => 'Welcome, :name',
- 'years' => 'years',
- 'yes' => 'Yes',
+ 'website' => 'İnternet sitesi',
+ 'welcome' => 'Hoşgeldiniz, :name',
+ 'years' => 'Yıl',
+ 'yes' => 'Evet',
'zip' => 'Zip',
];
diff --git a/app/lang/tr/reminders.php b/app/lang/tr/reminders.php
index e7a476e3a2..f782bdb878 100755
--- a/app/lang/tr/reminders.php
+++ b/app/lang/tr/reminders.php
@@ -15,7 +15,7 @@ return array(
"password" => "Passwords must be six characters and match the confirmation.",
- "user" => "Username or email address is incorrect",
+ "user" => "Kullanıcı adı veya e-mail adresi hatalı",
"token" => "This password reset token is invalid.",
diff --git a/app/lang/tr/table.php b/app/lang/tr/table.php
index f7a49d86c1..c4d85cebe0 100755
--- a/app/lang/tr/table.php
+++ b/app/lang/tr/table.php
@@ -2,9 +2,9 @@
return array(
- 'actions' => 'Actions',
- 'action' => 'Action',
- 'by' => 'By',
- 'item' => 'Item',
+ 'actions' => 'Hareketler',
+ 'action' => 'Hareket',
+ 'by' => 'Tarafından',
+ 'item' => 'Ürün',
);
diff --git a/app/lang/vi/admin/consumables/message.php b/app/lang/vi/admin/consumables/message.php
index 96eb5b5079..19f2eceaa8 100755
--- a/app/lang/vi/admin/consumables/message.php
+++ b/app/lang/vi/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => 'Bạn có chắc muốn xóa phụ kiện này?',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => 'Có vấn đề khi xóa vật tư phụ. Xin vui lòng thử lại.',
- 'success' => 'Phụ kiện đã xóa thành công.'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(
diff --git a/app/lang/zh-CN/admin/consumables/message.php b/app/lang/zh-CN/admin/consumables/message.php
index 4f45a42eae..c3890003eb 100755
--- a/app/lang/zh-CN/admin/consumables/message.php
+++ b/app/lang/zh-CN/admin/consumables/message.php
@@ -15,9 +15,9 @@ return array(
),
'delete' => array(
- 'confirm' => '是否确定删除此配件？',
+ 'confirm' => 'Are you sure you wish to delete this consumable?',
'error' => '删除耗材失败，请重试',
- 'success' => '配件删除成功'
+ 'success' => 'The consumable was deleted successfully.'
),
'checkout' => array(