Skip to content

Commit 1f1d9d5

Browse files
committed
Merge branch 'develop'
2 parents 4df10ad + c776fa4 commit 1f1d9d5

File tree

1,438 files changed

+21947
-15782
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,438 files changed

+21947
-15782
lines changed
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?php
22

33
return array(
4-
'about_accessories_title' => 'About Accessories',
5-
'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
6-
'accessory_category' => 'Accessory Category',
7-
'accessory_name' => 'Accessory Name',
4+
'about_accessories_title' => 'Oor Toebehore',
5+
'about_accessories_text' => 'Toebehore is enigiets wat jy aan gebruikers uitreik, maar dit het nie \'n reeksnommer (of jy gee nie om om hulle unieke te volg nie). Byvoorbeeld, rekenaarmuise of sleutelborde.',
6+
'accessory_category' => 'Toebehore Kategorie',
7+
'accessory_name' => 'Toebehore Naam',
88
'checkout' => 'Checkout Accessory',
99
'checkin' => 'Checkin Accessory',
10-
'create' => 'Create Accessory',
11-
'edit' => 'Edit Accessory',
12-
'eula_text' => 'Category EULA',
13-
'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
14-
'require_acceptance' => 'Require users to confirm acceptance of assets in this category.',
15-
'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
16-
'total' => 'Total',
17-
'remaining' => 'Avail',
18-
'update' => 'Update Accessory',
19-
'use_default_eula' => 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
20-
'use_default_eula_disabled' => '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
10+
'create' => 'Skep bykomstighede',
11+
'edit' => 'Wysig bykomstighede',
12+
'eula_text' => 'Kategorie EULA',
13+
'eula_text_help' => 'Hierdie veld laat u toe om u EULA\'s vir spesifieke soorte bates aan te pas. As u slegs een EULA vir al u bates het, kan u die onderstaande boks selekteer om die primêre standaard te gebruik.',
14+
'require_acceptance' => 'Vereis gebruikers om die aanvaarding van bates in hierdie kategorie te bevestig.',
15+
'no_default_eula' => 'Geen primêre standaard EULA gevind nie. Voeg een by Instellings.',
16+
'total' => 'totale',
17+
'remaining' => 'opgelewer',
18+
'update' => 'Opdatering bywerk',
19+
'use_default_eula' => 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
20+
'use_default_eula_disabled' => '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
2121

2222
);

resources/lang/af/admin/accessories/message.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,35 @@
22

33
return array(
44

5-
'does_not_exist' => 'The accessory does not exist.',
6-
'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
5+
'does_not_exist' => 'Die accessoire bestaan ​​nie.',
6+
'assoc_users' => 'Hierdie bykomstige het tans: tel items wat uitgekontroleer is aan gebruikers. Kontroleer asseblief die bykomstighede en en probeer weer.',
77

88
'create' => array(
9-
'error' => 'The accessory was not created, please try again.',
10-
'success' => 'The accessory was successfully created.'
9+
'error' => 'Die bykomstigheid is nie geskep nie, probeer asseblief weer.',
10+
'success' => 'Die bykomstigheid is suksesvol geskep.'
1111
),
1212

1313
'update' => array(
14-
'error' => 'The accessory was not updated, please try again',
15-
'success' => 'The accessory was updated successfully.'
14+
'error' => 'Die bykomstigheid is nie opgedateer nie, probeer asseblief weer',
15+
'success' => 'Die bykomstigheid is suksesvol opgedateer.'
1616
),
1717

1818
'delete' => array(
19-
'confirm' => 'Are you sure you wish to delete this accessory?',
20-
'error' => 'There was an issue deleting the accessory. Please try again.',
21-
'success' => 'The accessory was deleted successfully.'
19+
'confirm' => 'Is jy seker jy wil hierdie toebehore uitvee?',
20+
'error' => 'Daar was \'n probleem met die verwydering van die bykomstigheid. Probeer asseblief weer.',
21+
'success' => 'Die bykomstigheid is suksesvol verwyder.'
2222
),
2323

2424
'checkout' => array(
25-
'error' => 'Accessory was not checked out, please try again',
26-
'success' => 'Accessory checked out successfully.',
27-
'user_does_not_exist' => 'That user is invalid. Please try again.'
25+
'error' => 'Toebehore is nie nagegaan nie, probeer asseblief weer',
26+
'success' => 'Toebehore suksesvol nagegaan.',
27+
'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
2828
),
2929

3030
'checkin' => array(
31-
'error' => 'Accessory was not checked in, please try again',
32-
'success' => 'Accessory checked in successfully.',
33-
'user_does_not_exist' => 'That user is invalid. Please try again.'
31+
'error' => 'Toebehore is nie nagegaan nie, probeer asseblief weer',
32+
'success' => 'Toebehore is suksesvol nagegaan.',
33+
'user_does_not_exist' => 'Die gebruiker is ongeldig. Probeer asseblief weer.'
3434
)
3535

3636

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

33
return array(
4-
'dl_csv' => 'Download CSV',
4+
'dl_csv' => 'Laai CSV af',
55
'eula_text' => 'EULA',
66
'id' => 'ID',
7-
'require_acceptance' => 'Acceptance',
8-
'title' => 'Accessory Name',
7+
'require_acceptance' => 'aanvaarding',
8+
'title' => 'Toebehore Naam',
99

1010

1111
);
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

33
return [
4-
'asset_maintenance_type' => 'Maintenance Type',
5-
'title' => 'Title',
6-
'start_date' => 'Started',
7-
'completion_date' => 'Completed',
8-
'cost' => 'Cost',
9-
'is_warranty' => 'Warranty Improvement',
10-
'asset_maintenance_time' => 'Days',
11-
'notes' => 'Notes',
12-
'update' => 'Update',
13-
'create' => 'Create'
4+
'asset_maintenance_type' => 'Onderhoudstipe',
5+
'title' => 'Titel',
6+
'start_date' => 'begin',
7+
'completion_date' => 'voltooi',
8+
'cost' => 'koste',
9+
'is_warranty' => 'Garantieverbetering',
10+
'asset_maintenance_time' => 'dae',
11+
'notes' => 'notas',
12+
'update' => 'Opdateer',
13+
'create' => 'Skep'
1414
];

resources/lang/af/admin/asset_maintenances/general.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
return [
44
'asset_maintenances' => 'Asset Maintenances',
5-
'edit' => 'Edit Asset Maintenance',
6-
'delete' => 'Delete Asset Maintenance',
7-
'view' => 'View Asset Maintenance Details',
8-
'repair' => 'Repair',
9-
'maintenance' => 'Maintenance',
10-
'upgrade' => 'Upgrade'
5+
'edit' => 'Wysig bateonderhoud',
6+
'delete' => 'Verwyder Bate Onderhoud',
7+
'view' => 'Bekyk Bate Onderhoud Besonderhede',
8+
'repair' => 'herstel',
9+
'maintenance' => 'onderhoud',
10+
'upgrade' => 'opgradering'
1111
];
Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?php
22

33
return [
4-
'not_found' => 'Asset Maintenance you were looking for was not found!',
4+
'not_found' => 'Bate-instandhouding waarna jy gesoek is, is nie gevind nie!',
55
'delete' => [
6-
'confirm' => 'Are you sure you wish to delete this asset maintenance?',
7-
'error' => 'There was an issue deleting the asset maintenance. Please try again.',
8-
'success' => 'The asset maintenance was deleted successfully.'
6+
'confirm' => 'Is jy seker jy wil hierdie bate instandhouding uitvee?',
7+
'error' => 'Daar was \'n probleem met die verwydering van die bate-instandhouding. Probeer asseblief weer.',
8+
'success' => 'Die bate-instandhouding is suksesvol verwyder.'
99
],
1010
'create' => [
11-
'error' => 'Asset Maintenance was not created, please try again.',
12-
'success' => 'Asset Maintenance created successfully.'
11+
'error' => 'Asset Maintenance is nie geskep nie, probeer asseblief weer.',
12+
'success' => 'Bate Onderhoud geskep suksesvol.'
1313
],
1414
'edit' => [
15-
'error' => 'Asset Maintenance was not edited, please try again.',
16-
'success' => 'Asset Maintenance edited successfully.'
15+
'error' => 'Bateonderhoud is nie geredigeer nie, probeer asseblief weer.',
16+
'success' => 'Bate Onderhoud suksesvol geredigeer.'
1717
],
18-
'asset_maintenance_incomplete' => 'Not Completed Yet',
19-
'warranty' => 'Warranty',
20-
'not_warranty' => 'Not Warranty',
18+
'asset_maintenance_incomplete' => 'Nog nie voltooi nie',
19+
'warranty' => 'waarborg',
20+
'not_warranty' => 'Nie waarborg nie',
2121
];
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

33
return [
4-
'title' => 'Asset Maintenance',
5-
'asset_name' => 'Asset Name',
6-
'is_warranty' => 'Warranty',
7-
'dl_csv' => 'Download CSV'
4+
'title' => 'Bate Onderhoud',
5+
'asset_name' => 'Bate Naam',
6+
'is_warranty' => 'waarborg',
7+
'dl_csv' => 'Laai CSV af'
88
];
Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?php
22

33
return array(
4-
'about_categories_title' => 'About Categories',
5-
'about_categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
6-
'asset_categories' => 'Asset Categories',
7-
'category_name' => 'Category Name',
8-
'checkin_email' => 'Send email to user on checkin.',
9-
'clone' => 'Clone Category',
10-
'create' => 'Create Category',
11-
'edit' => 'Edit Category',
12-
'eula_text' => 'Category EULA',
13-
'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
14-
'name' => 'Category Name',
15-
'require_acceptance' => 'Require users to confirm acceptance of assets in this category.',
16-
'required_acceptance' => 'This user will be emailed with a link to confirm acceptance of this item.',
17-
'required_eula' => 'This user will be emailed a copy of the EULA',
18-
'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
19-
'update' => 'Update Category',
20-
'use_default_eula' => 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
21-
'use_default_eula_disabled' => '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
4+
'about_categories_title' => 'Oor Kategorieë',
5+
'about_categories' => 'Kategorieë help jou om jou items te organiseer. Sommige voorbeeldkategorieë kan wees &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, ensovoorts, maar jy kan kategorieë gebruik wat vir jou sin maak.',
6+
'asset_categories' => 'Bate kategorieë',
7+
'category_name' => 'Kategorie Naam',
8+
'checkin_email' => 'Stuur e-pos aan gebruiker op inskrywing.',
9+
'clone' => 'Klone Kategorie',
10+
'create' => 'Skep Kategorie',
11+
'edit' => 'Wysig Kategorie',
12+
'eula_text' => 'Kategorie EULA',
13+
'eula_text_help' => 'Hierdie veld laat u toe om u EULA\'s vir spesifieke soorte bates aan te pas. As u slegs een EULA vir al u bates het, kan u die onderstaande boks selekteer om die primêre standaard te gebruik.',
14+
'name' => 'Kategorie Naam',
15+
'require_acceptance' => 'Vereis gebruikers om die aanvaarding van bates in hierdie kategorie te bevestig.',
16+
'required_acceptance' => 'Hierdie gebruiker sal per e-pos met \'n skakel gestuur word om die aanvaarding van hierdie item te bevestig.',
17+
'required_eula' => 'Hierdie gebruiker sal \'n afskrif van die EULA ontvang',
18+
'no_default_eula' => 'Geen primêre standaard EULA gevind nie. Voeg een by Instellings.',
19+
'update' => 'Opdateer kategorie',
20+
'use_default_eula' => 'Gebruik eerder die <a href="#" data-toggle="modal" data-target="#eulaModal">primary standaard EULA</a>.',
21+
'use_default_eula_disabled' => '<del>Gebruik die primêre standaardverlof in plaas daarvan.</del> Geen primêre standaard EULA is ingestel nie. Voeg asseblief een by Instellings.',
2222

2323
);

resources/lang/af/admin/categories/message.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
return array(
44

5-
'does_not_exist' => 'Category does not exist.',
6-
'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. ',
7-
'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. ',
5+
'does_not_exist' => 'Kategorie bestaan ​​nie.',
6+
'assoc_models' => 'Hierdie kategorie is tans gekoppel aan ten minste een model en kan nie uitgevee word nie. Dateer asseblief jou modelle op om nie meer hierdie kategorie te verwys nie en probeer weer.',
7+
'assoc_items' => 'Hierdie kategorie word tans geassosieer met ten minste een: asset_type en kan nie uitgevee word nie. Werk asseblief jou: bat_type op om nie meer hierdie kategorie te verwys nie en probeer weer.',
88

99
'create' => array(
10-
'error' => 'Category was not created, please try again.',
11-
'success' => 'Category created successfully.'
10+
'error' => 'Kategorie is nie geskep nie, probeer asseblief weer.',
11+
'success' => 'Kategorie geskep suksesvol.'
1212
),
1313

1414
'update' => array(
15-
'error' => 'Category was not updated, please try again',
16-
'success' => 'Category updated successfully.'
15+
'error' => 'Kategorie is nie opgedateer nie, probeer asseblief weer',
16+
'success' => 'Kategorie suksesvol opgedateer.'
1717
),
1818

1919
'delete' => array(
20-
'confirm' => 'Are you sure you wish to delete this category?',
21-
'error' => 'There was an issue deleting the category. Please try again.',
22-
'success' => 'The category was deleted successfully.'
20+
'confirm' => 'Is jy seker jy wil hierdie kategorie uitvee?',
21+
'error' => 'Daar was \'n probleem met die verwydering van die kategorie. Probeer asseblief weer.',
22+
'success' => 'Die kategorie is suksesvol verwyder.'
2323
)
2424

2525
);

resources/lang/af/admin/categories/table.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
return array(
44
'eula_text' => 'EULA',
55
'id' => 'ID',
6-
'parent' => 'Parent',
7-
'require_acceptance' => 'Acceptance',
8-
'title' => 'Asset Category Name',
6+
'parent' => 'Ouer',
7+
'require_acceptance' => 'aanvaarding',
8+
'title' => 'Bate Kategorie Naam',
99

1010
);

0 commit comments

Comments
 (0)