Skip to content

Commit 9151868

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents c8baf4c + 8c6aaec commit 9151868

File tree

242 files changed

+20301
-497
lines changed

Some content is hidden

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

242 files changed

+20301
-497
lines changed

‎resources/lang/af/admin/settings/general.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
'ldap_auth_filter_query' => 'LDAP-verifikasie navraag',
110110
'ldap_version' => 'LDAP-weergawe',
111111
'ldap_active_flag' => 'LDAP-aktiewe vlag',
112-
'ldap_activated_flag_help' => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
112+
'ldap_activated_flag_help' => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
113113
'ldap_emp_num' => 'LDAP Werknemersnommer',
114114
'ldap_email' => 'LDAP-e-pos',
115115
'ldap_test' => 'Test LDAP',
@@ -176,7 +176,7 @@
176176
'saml_idp_metadata_help' => 'You can specify the IdP metadata using a URL or XML file.',
177177
'saml_attr_mapping_username' => 'Attribute Mapping - Username',
178178
'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
179-
'saml_forcelogin_label' => 'SAML Default Login',
179+
'saml_forcelogin_label' => 'SAML Force Login',
180180
'saml_forcelogin' => 'Make SAML the primary login',
181181
'saml_forcelogin_help' => 'You can use \'/login?nosaml\' to get to the normal login page.',
182182
'saml_slo_label' => 'SAML Single Log Out',

‎resources/lang/af/general.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,11 @@
378378
'pie_chart_type' => 'Dashboard Pie Chart Type',
379379
'hello_name' => 'Hello, :name!',
380380
'unaccepted_profile_warning' => 'You have :count items requiring acceptance. Click here to accept or decline them',
381+
'start_date' => 'Start Date',
382+
'end_date' => 'End Date',
383+
'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
384+
'placeholder_kit' => 'Select a kit'
385+
381386

382387

383388
];

‎resources/lang/af/localizations.php‎

Lines changed: 315 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,315 @@
1+
<?php
2+
3+
return [
4+
5+
'select_language' => 'Select a language',
6+
'languages' => [
7+
'en'=> 'English, US',
8+
'en-GB'=> 'English, UK',
9+
'af'=> 'Afrikaans',
10+
'ar'=> 'Arabic',
11+
'bg'=> 'Bulgarian',
12+
'zh-CN'=> 'Chinese Simplified',
13+
'zh-TW'=> 'Chinese Traditional',
14+
'hr'=> 'Croatian',
15+
'cs'=> 'Czech',
16+
'da'=> 'Danish',
17+
'nl'=> 'Dutch',
18+
'en-ID'=> 'English, Indonesia',
19+
'et'=> 'Estonian',
20+
'fil'=> 'Filipino',
21+
'fi'=> 'Finnish',
22+
'fr'=> 'French',
23+
'de'=> 'German',
24+
'de-i'=> 'German (Informal)',
25+
'el'=> 'Greek',
26+
'he'=> 'Hebrew',
27+
'hu'=> 'Hungarian',
28+
'is' => 'Icelandic',
29+
'id'=> 'Indonesian',
30+
'ga-IE'=> 'Irish',
31+
'it'=> 'Italian',
32+
'ja'=> 'Japanese',
33+
'ko'=> 'Korean',
34+
'lv'=>'Latvian',
35+
'lt'=> 'Lithuanian',
36+
'mk'=> 'Macedonian',
37+
'ms'=> 'Malay',
38+
'mi'=> 'Maori',
39+
'mn'=> 'Mongolian',
40+
'no'=> 'Norwegian',
41+
'fa'=> 'Persian',
42+
'pl'=> 'Polish',
43+
'pt-PT'=> 'Portuguese',
44+
'pt-BR'=> 'Portuguese, Brazilian',
45+
'ro'=> 'Romanian',
46+
'ru'=> 'Russian',
47+
'sr-CS' => 'Serbian (Latin)',
48+
'sl'=> 'Slovenian',
49+
'es-ES'=> 'Spanish',
50+
'es-CO'=> 'Spanish, Colombia',
51+
'es-MX'=> 'Spanish, Mexico',
52+
'es-VE'=> 'Spanish, Venezuela',
53+
'sv-SE'=> 'Swedish',
54+
'tl'=> 'Tagalog',
55+
'ta'=> 'Tamil',
56+
'th'=> 'Thai',
57+
'tr'=> 'Turkish',
58+
'uk'=> 'Ukranian',
59+
'vi'=> 'Vietnamese',
60+
'cy'=> 'Welsh',
61+
'zu'=> 'Zulu',
62+
],
63+
64+
'select_country' => 'Select a country',
65+
66+
'countries' => [
67+
'AC'=>'Ascension Island',
68+
'AD'=>'Andorra',
69+
'AE'=>'United Arab Emirates',
70+
'AF'=>'Afghanistan',
71+
'AG'=>'Antigua And Barbuda',
72+
'AI'=>'Anguilla',
73+
'AL'=>'Albania',
74+
'AM'=>'Armenia',
75+
'AN'=>'Netherlands Antilles',
76+
'AO'=>'Angola',
77+
'AQ'=>'Antarctica',
78+
'AR'=>'Argentina',
79+
'AS'=>'American Samoa',
80+
'AT'=>'Austria',
81+
'AU'=>'Australia',
82+
'AW'=>'Aruba',
83+
'AX'=>'Ã…land',
84+
'AZ'=>'Azerbaijan',
85+
'BA'=>'Bosnia And Herzegovina',
86+
'BB'=>'Barbados',
87+
'BE'=>'Belgium',
88+
'BD'=>'Bangladesh',
89+
'BF'=>'Burkina Faso',
90+
'BG'=>'Bulgaria',
91+
'BH'=>'Bahrain',
92+
'BI'=>'Burundi',
93+
'BJ'=>'Benin',
94+
'BM'=>'Bermuda',
95+
'BN'=>'Brunei Darussalam',
96+
'BO'=>'Bolivia',
97+
'BR'=>'Brazil',
98+
'BS'=>'Bahamas',
99+
'BT'=>'Bhutan',
100+
'BV'=>'Bouvet Island',
101+
'BW'=>'Botswana',
102+
'BY'=>'Belarus',
103+
'BZ'=>'Belize',
104+
'CA'=>'Canada',
105+
'CC'=>'Cocos (Keeling) Islands',
106+
'CD'=>'Congo (Democratic Republic)',
107+
'CF'=>'Central African Republic',
108+
'CG'=>'Congo (Republic)',
109+
'CH'=>'Switzerland',
110+
'CI'=>'Côte d\'Ivoire',
111+
'CK'=>'Cook Islands',
112+
'CL'=>'Chile',
113+
'CM'=>'Cameroon',
114+
'CN'=>'People\'s Republic of China',
115+
'CO'=>'Colombia',
116+
'CR'=>'Costa Rica',
117+
'CU'=>'Cuba',
118+
'CV'=>'Cape Verde',
119+
'CX'=>'Christmas Island',
120+
'CY'=>'Cyprus',
121+
'CZ'=>'Czech Republic',
122+
'DE'=>'Germany',
123+
'DJ'=>'Djibouti',
124+
'DK'=>'Denmark',
125+
'DM'=>'Dominica',
126+
'DO'=>'Dominican Republic',
127+
'DZ'=>'Algeria',
128+
'EC'=>'Ecuador',
129+
'EE'=>'Estonia',
130+
'EG'=>'Egypt',
131+
'ER'=>'Eritrea',
132+
'ES'=>'Spain',
133+
'ET'=>'Ethiopia',
134+
'EU'=>'European Union',
135+
'FI'=>'Finland',
136+
'FJ'=>'Fiji',
137+
'FK'=>'Falkland Islands (Malvinas)',
138+
'FM'=>'Micronesia, Federated States Of',
139+
'FO'=>'Faroe Islands',
140+
'FR'=>'France',
141+
'GA'=>'Gabon',
142+
'GD'=>'Grenada',
143+
'GE'=>'Georgia',
144+
'GF'=>'French Guiana',
145+
'GG'=>'Guernsey',
146+
'GH'=>'Ghana',
147+
'GI'=>'Gibraltar',
148+
'GL'=>'Greenland',
149+
'GM'=>'Gambia',
150+
'GN'=>'Guinea',
151+
'GP'=>'Guadeloupe',
152+
'GQ'=>'Equatorial Guinea',
153+
'GR'=>'Greece',
154+
'GS'=>'South Georgia And The South Sandwich Islands',
155+
'GT'=>'Guatemala',
156+
'GU'=>'Guam',
157+
'GW'=>'Guinea-Bissau',
158+
'GY'=>'Guyana',
159+
'HK'=>'Hong Kong',
160+
'HM'=>'Heard And Mc Donald Islands',
161+
'HN'=>'Honduras',
162+
'HR'=>'Croatia (local name: Hrvatska)',
163+
'HT'=>'Haiti',
164+
'HU'=>'Hungary',
165+
'ID'=>'Indonesia',
166+
'IE'=>'Ireland',
167+
'IL'=>'Israel',
168+
'IM'=>'Isle of Man',
169+
'IN'=>'India',
170+
'IO'=>'British Indian Ocean Territory',
171+
'IQ'=>'Iraq',
172+
'IR'=>'Iran, Islamic Republic Of',
173+
'IS'=>'Iceland',
174+
'IT'=>'Italy',
175+
'JE'=>'Jersey',
176+
'JM'=>'Jamaica',
177+
'JO'=>'Jordan',
178+
'JP'=>'Japan',
179+
'KE'=>'Kenya',
180+
'KG'=>'Kyrgyzstan',
181+
'KH'=>'Cambodia',
182+
'KI'=>'Kiribati',
183+
'KM'=>'Comoros',
184+
'KN'=>'Saint Kitts And Nevis',
185+
'KR'=>'Korea, Republic Of',
186+
'KW'=>'Kuwait',
187+
'KY'=>'Cayman Islands',
188+
'KZ'=>'Kazakhstan',
189+
'LA'=>'Lao People\'s Democratic Republic',
190+
'LB'=>'Lebanon',
191+
'LC'=>'Saint Lucia',
192+
'LI'=>'Liechtenstein',
193+
'LK'=>'Sri Lanka',
194+
'LR'=>'Liberia',
195+
'LS'=>'Lesotho',
196+
'LT'=>'Lithuania',
197+
'LU'=>'Luxembourg',
198+
'LV'=>'Latvia',
199+
'LY'=>'Libyan Arab Jamahiriya',
200+
'MA'=>'Morocco',
201+
'MC'=>'Monaco',
202+
'MD'=>'Moldova, Republic Of',
203+
'ME'=>'Montenegro',
204+
'MG'=>'Madagascar',
205+
'MH'=>'Marshall Islands',
206+
'MK'=>'Macedonia, The Former Yugoslav Republic Of',
207+
'ML'=>'Mali',
208+
'MM'=>'Myanmar',
209+
'MN'=>'Mongolia',
210+
'MO'=>'Macau',
211+
'MP'=>'Northern Mariana Islands',
212+
'MQ'=>'Martinique',
213+
'MR'=>'Mauritania',
214+
'MS'=>'Montserrat',
215+
'MT'=>'Malta',
216+
'MU'=>'Mauritius',
217+
'MV'=>'Maldives',
218+
'MW'=>'Malawi',
219+
'MX'=>'Mexico',
220+
'MY'=>'Malaysia',
221+
'MZ'=>'Mozambique',
222+
'NA'=>'Namibia',
223+
'NC'=>'New Caledonia',
224+
'NE'=>'Niger',
225+
'NF'=>'Norfolk Island',
226+
'NG'=>'Nigeria',
227+
'NI'=>'Nicaragua',
228+
'NL'=>'Netherlands',
229+
'NO'=>'Norway',
230+
'NP'=>'Nepal',
231+
'NR'=>'Nauru',
232+
'NU'=>'Niue',
233+
'NZ'=>'New Zealand',
234+
'OM'=>'Oman',
235+
'PA'=>'Panama',
236+
'PE'=>'Peru',
237+
'PF'=>'French Polynesia',
238+
'PG'=>'Papua New Guinea',
239+
'PH'=>'Philippines, Republic of the',
240+
'PK'=>'Pakistan',
241+
'PL'=>'Poland',
242+
'PM'=>'St. Pierre And Miquelon',
243+
'PN'=>'Pitcairn',
244+
'PR'=>'Puerto Rico',
245+
'PS'=>'Palestine',
246+
'PT'=>'Portugal',
247+
'PW'=>'Palau',
248+
'PY'=>'Paraguay',
249+
'QA'=>'Qatar',
250+
'RE'=>'Reunion',
251+
'RO'=>'Romania',
252+
'RS'=>'Serbia',
253+
'RU'=>'Russian Federation',
254+
'RW'=>'Rwanda',
255+
'SA'=>'Saudi Arabia',
256+
'UK'=>'Scotland',
257+
'SB'=>'Solomon Islands',
258+
'SC'=>'Seychelles',
259+
'SD'=>'Sudan',
260+
'SE'=>'Sweden',
261+
'SG'=>'Singapore',
262+
'SH'=>'St. Helena',
263+
'SI'=>'Slovenia',
264+
'SJ'=>'Svalbard And Jan Mayen Islands',
265+
'SK'=>'Slovakia (Slovak Republic)',
266+
'SL'=>'Sierra Leone',
267+
'SM'=>'San Marino',
268+
'SN'=>'Senegal',
269+
'SO'=>'Somalia',
270+
'SR'=>'Suriname',
271+
'ST'=>'Sao Tome And Principe',
272+
'SU'=>'Soviet Union',
273+
'SV'=>'El Salvador',
274+
'SY'=>'Syrian Arab Republic',
275+
'SZ'=>'Swaziland',
276+
'TC'=>'Turks And Caicos Islands',
277+
'TD'=>'Chad',
278+
'TF'=>'French Southern Territories',
279+
'TG'=>'Togo',
280+
'TH'=>'Thailand',
281+
'TJ'=>'Tajikistan',
282+
'TK'=>'Tokelau',
283+
'TI'=>'East Timor',
284+
'TM'=>'Turkmenistan',
285+
'TN'=>'Tunisia',
286+
'TO'=>'Tonga',
287+
'TP'=>'East Timor (old code)',
288+
'TR'=>'Turkey',
289+
'TT'=>'Trinidad And Tobago',
290+
'TV'=>'Tuvalu',
291+
'TW'=>'Taiwan',
292+
'TZ'=>'Tanzania, United Republic Of',
293+
'UA'=>'Ukraine',
294+
'UG'=>'Uganda',
295+
'UK'=>'United Kingdom',
296+
'US'=>'United States',
297+
'UM'=>'United States Minor Outlying Islands',
298+
'UY'=>'Uruguay',
299+
'UZ'=>'Uzbekistan',
300+
'VA'=>'Vatican City State (Holy See)',
301+
'VC'=>'Saint Vincent And The Grenadines',
302+
'VE'=>'Venezuela',
303+
'VG'=>'Virgin Islands (British)',
304+
'VI'=>'Virgin Islands (U.S.)',
305+
'VN'=>'Viet Nam',
306+
'VU'=>'Vanuatu',
307+
'WF'=>'Wallis And Futuna Islands',
308+
'WS'=>'Samoa',
309+
'YE'=>'Yemen',
310+
'YT'=>'Mayotte',
311+
'ZA'=>'South Africa',
312+
'ZM'=>'Zambia',
313+
'ZW'=>'Zimbabwe',
314+
],
315+
];

‎resources/lang/am/admin/settings/general.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
'ldap_auth_filter_query' => 'LDAP Authentication query',
110110
'ldap_version' => 'LDAP Version',
111111
'ldap_active_flag' => 'LDAP Active Flag',
112-
'ldap_activated_flag_help' => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.',
112+
'ldap_activated_flag_help' => 'This value is used to determine whether a synced user can login to Snipe-IT. <strong>It does not affect the ability to check items in or out to them</strong>, and should be the <strong>attribute name</strong> within your AD/LDAP, <strong>not the value</strong>. <br><br>If this field is set to a field name that does not exist in your AD/LDAP, or the value in the AD/LDAP field is set to <code>0</code> or <code>false</code>, <strong>user login will be disabled</strong>. If the value in the AD/LDAP field is set to <code>1</code> or <code>true</code> or <em>any other text</em> means the user can log in. When the field is blank in your AD, we respect the <code>userAccountControl</code> attribute, which usually allows non-suspended users to log in.',
113113
'ldap_emp_num' => 'LDAP Employee Number',
114114
'ldap_email' => 'LDAP Email',
115115
'ldap_test' => 'Test LDAP',
@@ -176,7 +176,7 @@
176176
'saml_idp_metadata_help' => 'You can specify the IdP metadata using a URL or XML file.',
177177
'saml_attr_mapping_username' => 'Attribute Mapping - Username',
178178
'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
179-
'saml_forcelogin_label' => 'SAML Default Login',
179+
'saml_forcelogin_label' => 'SAML Force Login',
180180
'saml_forcelogin' => 'Make SAML the primary login',
181181
'saml_forcelogin_help' => 'You can use \'/login?nosaml\' to get to the normal login page.',
182182
'saml_slo_label' => 'SAML Single Log Out',

‎resources/lang/am/general.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,11 @@
378378
'pie_chart_type' => 'Dashboard Pie Chart Type',
379379
'hello_name' => 'Hello, :name!',
380380
'unaccepted_profile_warning' => 'You have :count items requiring acceptance. Click here to accept or decline them',
381+
'start_date' => 'Start Date',
382+
'end_date' => 'End Date',
383+
'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail',
384+
'placeholder_kit' => 'Select a kit'
385+
381386

382387

383388
];

0 commit comments

Comments
 (0)