Skip to content

Commit 199eefa

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents c5b58f9 + adc3a34 commit 199eefa

File tree

1,060 files changed

+14676
-4391
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,060 files changed

+14676
-4391
lines changed

‎resources/lang/aa-ER/admin/asset_maintenances/form.php‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?php
2+
3+
return [
4+
'select_type' => 'crwdns13392:0crwdne13392:0',
5+
'asset_maintenance_type' => 'crwdns11333:0crwdne11333:0',
6+
'title' => 'crwdns1354:0crwdne1354:0',
7+
'start_date' => 'crwdns11335:0crwdne11335:0',
8+
'completion_date' => 'crwdns11337:0crwdne11337:0',
9+
'cost' => 'crwdns1357:0crwdne1357:0',
10+
'is_warranty' => 'crwdns1358:0crwdne1358:0',
11+
'asset_maintenance_time' => 'crwdns11339:0crwdne11339:0',
12+
'notes' => 'crwdns1360:0crwdne1360:0',
13+
'update' => 'crwdns11341:0crwdne11341:0',
14+
'create' => 'crwdns11343:0crwdne11343:0'
15+
];

‎resources/lang/aa-ER/admin/asset_maintenances/general.php‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?php
2+
3+
return [
4+
'asset_maintenances' => 'crwdns1363:0crwdne1363:0',
5+
'edit' => 'crwdns1364:0crwdne1364:0',
6+
'delete' => 'crwdns1365:0crwdne1365:0',
7+
'view' => 'crwdns1366:0crwdne1366:0',
8+
'repair' => 'crwdns1367:0crwdne1367:0',
9+
'maintenance' => 'crwdns1368:0crwdne1368:0',
10+
'upgrade' => 'crwdns1369:0crwdne1369:0',
11+
'calibration' => 'crwdns5812:0crwdne5812:0',
12+
'software_support' => 'crwdns5814:0crwdne5814:0',
13+
'hardware_support' => 'crwdns5816:0crwdne5816:0',
14+
'configuration_change' => 'crwdns10530:0crwdne10530:0',
15+
'pat_test' => 'crwdns10532:0crwdne10532:0',
16+
];

‎resources/lang/aa-ER/admin/asset_maintenances/message.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?php
2+
3+
return [
4+
'not_found' => 'crwdns1370:0crwdne1370:0',
5+
'delete' => [
6+
'confirm' => 'crwdns1371:0crwdne1371:0',
7+
'error' => 'crwdns1372:0crwdne1372:0',
8+
'success' => 'crwdns1373:0crwdne1373:0',
9+
],
10+
'create' => [
11+
'error' => 'crwdns1374:0crwdne1374:0',
12+
'success' => 'crwdns1375:0crwdne1375:0',
13+
],
14+
'edit' => [
15+
'error' => 'crwdns1903:0crwdne1903:0',
16+
'success' => 'crwdns1904:0crwdne1904:0',
17+
],
18+
'asset_maintenance_incomplete' => 'crwdns1376:0crwdne1376:0',
19+
'warranty' => 'crwdns1377:0crwdne1377:0',
20+
'not_warranty' => 'crwdns1378:0crwdne1378:0',
21+
];

‎resources/lang/aa-ER/admin/asset_maintenances/table.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?php
2+
3+
return [
4+
'title' => 'crwdns1379:0crwdne1379:0',
5+
'asset_name' => 'crwdns1794:0crwdne1794:0',
6+
'is_warranty' => 'crwdns1382:0crwdne1382:0',
7+
'dl_csv' => 'crwdns1383:0crwdne1383:0',
8+
];

‎resources/lang/aa-ER/admin/custom_fields/general.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
'manage' => 'crwdns6501:0crwdne6501:0',
66
'field' => 'crwdns1487:0crwdne1487:0',
77
'about_fieldsets_title' => 'crwdns1488:0crwdne1488:0',
8-
'about_fieldsets_text' => 'crwdns13482:0crwdne13482:0',
8+
'about_fieldsets_text' => 'crwdns13508:0crwdne13508:0',
99
'custom_format' => 'crwdns6505:0crwdne6505:0',
1010
'encrypt_field' => 'crwdns1792:0crwdne1792:0',
1111
'encrypt_field_help' => 'crwdns1683:0crwdne1683:0',
@@ -33,7 +33,7 @@
3333
'create_fieldset_title' => 'crwdns6507:0crwdne6507:0',
3434
'create_field' => 'crwdns1504:0crwdne1504:0',
3535
'create_field_title' => 'crwdns6509:0crwdne6509:0',
36-
'value_encrypted' => 'crwdns1696:0crwdne1696:0',
36+
'value_encrypted' => 'crwdns13532:0crwdne13532:0',
3737
'show_in_email' => 'crwdns11854:0crwdne11854:0',
3838
'show_in_email_short' => 'crwdns12933:0crwdne12933:0',
3939
'help_text' => 'crwdns6511:0crwdne6511:0',

‎resources/lang/aa-ER/admin/maintenances/form.php‎

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

33
return [
4-
'select_type' => 'crwdns13392:0crwdne13392:0',
5-
'asset_maintenance_type' => 'crwdns11333:0crwdne11333:0',
6-
'title' => 'crwdns1354:0crwdne1354:0',
7-
'start_date' => 'crwdns11335:0crwdne11335:0',
8-
'completion_date' => 'crwdns11337:0crwdne11337:0',
9-
'cost' => 'crwdns1357:0crwdne1357:0',
10-
'is_warranty' => 'crwdns1358:0crwdne1358:0',
11-
'asset_maintenance_time' => 'crwdns11339:0crwdne11339:0',
12-
'notes' => 'crwdns1360:0crwdne1360:0',
13-
'update' => 'crwdns11341:0crwdne11341:0',
14-
'create' => 'crwdns11343:0crwdne11343:0'
4+
'select_type' => 'crwdns13584:0crwdne13584:0',
5+
'asset_maintenance_type' => 'crwdns13586:0crwdne13586:0',
6+
'title' => 'crwdns13588:0crwdne13588:0',
7+
'start_date' => 'crwdns13590:0crwdne13590:0',
8+
'completion_date' => 'crwdns13592:0crwdne13592:0',
9+
'cost' => 'crwdns13594:0crwdne13594:0',
10+
'is_warranty' => 'crwdns13596:0crwdne13596:0',
11+
'asset_maintenance_time' => 'crwdns13598:0crwdne13598:0',
12+
'notes' => 'crwdns13600:0crwdne13600:0',
13+
'update' => 'crwdns13602:0crwdne13602:0',
14+
'create' => 'crwdns13604:0crwdne13604:0'
1515
];

‎resources/lang/aa-ER/admin/maintenances/general.php‎

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

33
return [
4-
'asset_maintenances' => 'crwdns1363:0crwdne1363:0',
5-
'edit' => 'crwdns1364:0crwdne1364:0',
6-
'delete' => 'crwdns1365:0crwdne1365:0',
7-
'view' => 'crwdns1366:0crwdne1366:0',
8-
'repair' => 'crwdns1367:0crwdne1367:0',
9-
'maintenance' => 'crwdns1368:0crwdne1368:0',
10-
'upgrade' => 'crwdns1369:0crwdne1369:0',
11-
'calibration' => 'crwdns5812:0crwdne5812:0',
12-
'software_support' => 'crwdns5814:0crwdne5814:0',
13-
'hardware_support' => 'crwdns5816:0crwdne5816:0',
14-
'configuration_change' => 'crwdns10530:0crwdne10530:0',
15-
'pat_test' => 'crwdns10532:0crwdne10532:0',
4+
'asset_maintenances' => 'crwdns13558:0crwdne13558:0', // not used anymore
5+
'maintenances' => 'crwdns13614:0crwdne13614:0',
6+
'edit' => 'crwdns13560:0crwdne13560:0',
7+
'delete' => 'crwdns13562:0crwdne13562:0',
8+
'view' => 'crwdns13564:0crwdne13564:0',
9+
'repair' => 'crwdns13566:0crwdne13566:0',
10+
'maintenance' => 'crwdns13568:0crwdne13568:0',
11+
'upgrade' => 'crwdns13570:0crwdne13570:0',
12+
'calibration' => 'crwdns13572:0crwdne13572:0',
13+
'software_support' => 'crwdns13574:0crwdne13574:0',
14+
'hardware_support' => 'crwdns13576:0crwdne13576:0',
15+
'configuration_change' => 'crwdns13578:0crwdne13578:0',
16+
'pat_test' => 'crwdns13580:0crwdne13580:0',
1617
];

‎resources/lang/aa-ER/admin/maintenances/message.php‎

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' => 'crwdns1370:0crwdne1370:0',
4+
'not_found' => 'crwdns13536:0crwdne13536:0',
55
'delete' => [
6-
'confirm' => 'crwdns1371:0crwdne1371:0',
7-
'error' => 'crwdns1372:0crwdne1372:0',
8-
'success' => 'crwdns1373:0crwdne1373:0',
6+
'confirm' => 'crwdns13538:0crwdne13538:0',
7+
'error' => 'crwdns13540:0crwdne13540:0',
8+
'success' => 'crwdns13542:0crwdne13542:0',
99
],
1010
'create' => [
11-
'error' => 'crwdns1374:0crwdne1374:0',
12-
'success' => 'crwdns1375:0crwdne1375:0',
11+
'error' => 'crwdns13544:0crwdne13544:0',
12+
'success' => 'crwdns13546:0crwdne13546:0',
1313
],
1414
'edit' => [
15-
'error' => 'crwdns1903:0crwdne1903:0',
16-
'success' => 'crwdns1904:0crwdne1904:0',
15+
'error' => 'crwdns13548:0crwdne13548:0',
16+
'success' => 'crwdns13550:0crwdne13550:0',
1717
],
18-
'asset_maintenance_incomplete' => 'crwdns1376:0crwdne1376:0',
19-
'warranty' => 'crwdns1377:0crwdne1377:0',
20-
'not_warranty' => 'crwdns1378:0crwdne1378:0',
18+
'asset_maintenance_incomplete' => 'crwdns13552:0crwdne13552:0',
19+
'warranty' => 'crwdns13554:0crwdne13554:0',
20+
'not_warranty' => 'crwdns13556:0crwdne13556:0',
2121
];

‎resources/lang/aa-ER/admin/maintenances/table.php‎

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' => 'crwdns1379:0crwdne1379:0',
5-
'asset_name' => 'crwdns1794:0crwdne1794:0',
6-
'is_warranty' => 'crwdns1382:0crwdne1382:0',
7-
'dl_csv' => 'crwdns1383:0crwdne1383:0',
4+
'title' => 'crwdns13606:0crwdne13606:0',
5+
'asset_name' => 'crwdns13608:0crwdne13608:0',
6+
'is_warranty' => 'crwdns13610:0crwdne13610:0',
7+
'dl_csv' => 'crwdns13612:0crwdne13612:0',
88
];

‎resources/lang/aa-ER/admin/settings/general.php‎

Lines changed: 33 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@
9393
'ldap_integration' => 'crwdns1449:0crwdne1449:0',
9494
'ldap_settings' => 'crwdns1450:0crwdne1450:0',
9595
'ldap_client_tls_cert_help' => 'crwdns6091:0crwdne6091:0',
96-
'ldap_location' => 'crwdns11583:0crwdne11583:0',
97-
'ldap_location_help' => 'crwdns11585:0crwdne11585:0',
96+
'ldap_location' => 'crwdns13698:0crwdne13698:0',
97+
'ldap_location_help' => 'crwdns13700:0crwdne13700:0',
9898
'ldap_login_test_help' => 'crwdns1968:0crwdne1968:0',
99-
'ldap_login_sync_help' => 'crwdns1969:0crwdne1969:0',
100-
'ldap_manager' => 'crwdns6814:0crwdne6814:0',
99+
'ldap_login_sync_help' => 'crwdns13742:0crwdne13742:0',
100+
'ldap_manager' => 'crwdns13702:0crwdne13702:0',
101101
'ldap_server' => 'crwdns1451:0crwdne1451:0',
102102
'ldap_server_help' => 'crwdns12578:0crwdne12578:0',
103103
'ldap_server_cert' => 'crwdns1475:0crwdne1475:0',
@@ -106,26 +106,33 @@
106106
'ldap_tls' => 'crwdns1676:0crwdne1676:0',
107107
'ldap_tls_help' => 'crwdns1677:0crwdne1677:0',
108108
'ldap_uname' => 'crwdns1452:0crwdne1452:0',
109-
'ldap_dept' => 'crwdns6052:0crwdne6052:0',
110-
'ldap_phone' => 'crwdns6054:0crwdne6054:0',
111-
'ldap_jobtitle' => 'crwdns6056:0crwdne6056:0',
112-
'ldap_country' => 'crwdns6058:0crwdne6058:0',
109+
'ldap_dept' => 'crwdns13704:0crwdne13704:0',
110+
'ldap_phone' => 'crwdns13706:0crwdne13706:0',
111+
'ldap_jobtitle' => 'crwdns13708:0crwdne13708:0',
112+
'ldap_country' => 'crwdns13710:0crwdne13710:0',
113113
'ldap_pword' => 'crwdns1453:0crwdne1453:0',
114114
'ldap_basedn' => 'crwdns1454:0crwdne1454:0',
115115
'ldap_filter' => 'crwdns1455:0crwdne1455:0',
116116
'ldap_pw_sync' => 'crwdns12882:0crwdne12882:0',
117117
'ldap_pw_sync_help' => 'crwdns12884:0crwdne12884:0',
118-
'ldap_username_field' => 'crwdns1456:0crwdne1456:0',
119-
'ldap_lname_field' => 'crwdns1457:0crwdne1457:0',
120-
'ldap_fname_field' => 'crwdns1458:0crwdne1458:0',
118+
'ldap_username_field' => 'crwdns13712:0crwdne13712:0',
119+
'ldap_display_name' => 'crwdns13714:0crwdne13714:0',
120+
'ldap_display_name_help' => 'crwdns13716:0crwdne13716:0',
121+
'ldap_lname_field' => 'crwdns13718:0crwdne13718:0',
122+
'ldap_fname_field' => 'crwdns13720:0crwdne13720:0',
121123
'ldap_auth_filter_query' => 'crwdns1459:0crwdne1459:0',
122124
'ldap_version' => 'crwdns1460:0crwdne1460:0',
123125
'ldap_active_flag' => 'crwdns1461:0crwdne1461:0',
124126
'ldap_activated_flag_help' => 'crwdns11176:0crwdne11176:0',
125127
'ldap_invert_active_flag' => 'crwdns12951:0crwdne12951:0',
126128
'ldap_invert_active_flag_help' => 'crwdns12953:0crwdne12953:0',
127-
'ldap_emp_num' => 'crwdns1462:0crwdne1462:0',
128-
'ldap_email' => 'crwdns1463:0crwdne1463:0',
129+
'ldap_emp_num' => 'crwdns13722:0crwdne13722:0',
130+
'ldap_email' => 'crwdns13724:0crwdne13724:0',
131+
'ldap_mobile' => 'crwdns13726:0crwdne13726:0',
132+
'ldap_address' => 'crwdns13728:0crwdne13728:0',
133+
'ldap_city' => 'crwdns13730:0crwdne13730:0',
134+
'ldap_state' => 'crwdns13732:0crwdne13732:0',
135+
'ldap_zip' => 'crwdns13734:0crwdne13734:0',
129136
'ldap_test' => 'crwdns6349:0crwdne6349:0',
130137
'ldap_test_sync' => 'crwdns6351:0crwdne6351:0',
131138
'license' => 'crwdns1989:0crwdne1989:0',
@@ -462,21 +469,24 @@
462469

463470

464471
'legends' => [
465-
'scoping' => 'crwdns13192:0crwdne13192:0',
466-
'formats' => 'crwdns13194:0crwdne13194:0',
467-
'profiles' => 'crwdns13196:0crwdne13196:0',
468-
'eula' => 'crwdns13224:0crwdne13224:0',
469-
'misc_display' => 'crwdns13200:0crwdne13200:0',
470-
'email' => 'crwdns13202:0crwdne13202:0',
471472
'checkin' => 'crwdns13204:0crwdne13204:0',
472-
'dashboard' => 'crwdns13206:0crwdne13206:0',
473-
'misc' => 'crwdns13208:0crwdne13208:0',
474-
'logos' => 'crwdns13212:0crwdne13212:0',
475473
'colors' => 'crwdns13214:0crwdne13214:0',
474+
'dashboard' => 'crwdns13206:0crwdne13206:0',
475+
'email' => 'crwdns13202:0crwdne13202:0',
476+
'eula' => 'crwdns13224:0crwdne13224:0',
476477
'footer' => 'crwdns13216:0crwdne13216:0',
477-
'security' => 'crwdns13218:0crwdne13218:0',
478+
'formats' => 'crwdns13194:0crwdne13194:0',
478479
'general' => 'crwdns13220:0crwdne13220:0',
479480
'intervals' => 'crwdns13222:0crwdne13222:0',
481+
'logos' => 'crwdns13212:0crwdne13212:0',
482+
'mapping' => 'crwdns13736:0crwdne13736:0',
483+
'test' => 'crwdns13738:0crwdne13738:0',
484+
'misc' => 'crwdns13208:0crwdne13208:0',
485+
'misc_display' => 'crwdns13200:0crwdne13200:0',
486+
'profiles' => 'crwdns13196:0crwdne13196:0',
487+
'server' => 'crwdns13740:0crwdne13740:0',
488+
'scoping' => 'crwdns13192:0crwdne13192:0',
489+
'security' => 'crwdns13218:0crwdne13218:0',
480490
],
481491

482492

0 commit comments

Comments
 (0)