Merge pull request #16115 from snipe/localization/2025-01-22

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

@@ -70,7 +70,6 @@
     'footer_text'               => 'crwdns1987:0crwdne1987:0',
     'footer_text_help'          => 'crwdns1988:0crwdne1988:0',
     'general_settings'			=> 'crwdns1297:0crwdne1297:0',
-    'general_settings_keywords' => 'crwdns12084:0crwdne12084:0',
     'general_settings_help'     => 'crwdns6341:0crwdne6341:0',
     'generate_backup'			=> 'crwdns1427:0crwdne1427:0',
     'google_workspaces'         => 'crwdns12080:0crwdne12080:0',
@@ -154,7 +153,6 @@
     'php'                       => 'crwdns1120:0crwdne1120:0',
     'php_info'                  => 'crwdns12298:0crwdne12298:0',
     'php_overview'              => 'crwdns6367:0crwdne6367:0',
-    'php_overview_keywords'     => 'crwdns6369:0crwdne6369:0',
     'php_overview_help'         => 'crwdns6371:0crwdne6371:0',
     'php_gd_info'               => 'crwdns833:0crwdne833:0',
     'php_gd_warning'            => 'crwdns834:0crwdne834:0',
@@ -231,7 +229,6 @@
     'update'                    => 'crwdns840:0crwdne840:0',
     'value'                     => 'crwdns841:0crwdne841:0',
     'brand'                     => 'crwdns1433:0crwdne1433:0',
-    'brand_keywords'            => 'crwdns6397:0crwdne6397:0',
     'brand_help'                => 'crwdns6399:0crwdne6399:0',
     'web_brand'                 => 'crwdns5916:0crwdne5916:0',
     'about_settings_title'      => 'crwdns1434:0crwdne1434:0',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'crwdns6431:0crwdne6431:0',
     'security' => 'crwdns6433:0crwdne6433:0',
     'security_title' => 'crwdns6435:0crwdne6435:0',
-    'security_keywords' => 'crwdns6437:0crwdne6437:0',
     'security_help' => 'crwdns6439:0crwdne6439:0',
-    'groups_keywords' => 'crwdns6441:0crwdne6441:0',
     'groups_help' => 'crwdns6443:0crwdne6443:0',
     'localization' => 'crwdns6445:0crwdne6445:0',
     'localization_title' => 'crwdns6447:0crwdne6447:0',
-    'localization_keywords' => 'crwdns6449:0crwdne6449:0',
     'localization_help' => 'crwdns6451:0crwdne6451:0',
     'notifications' => 'crwdns6453:0crwdne6453:0',
     'notifications_help' => 'crwdns11363:0crwdne11363:0',
     'asset_tags_help' => 'crwdns6457:0crwdne6457:0',
     'labels' => 'crwdns6459:0crwdne6459:0',
     'labels_title' => 'crwdns6461:0crwdne6461:0',
-    'labels_help' => 'crwdns6463:0crwdne6463:0',
-    'purge_keywords' => 'crwdns6467:0crwdne6467:0',
+    'labels_help' => 'crwdns12840:0crwdne12840:0',
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
     'ldap_ad' => 'crwdns6473:0crwdne6473:0',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => 'crwdns11745:0crwdne11745:0',
     'label2_2d_type_help'     => 'crwdns11747:0crwdne11747:0',
     'label2_2d_target'        => 'crwdns11749:0crwdne11749:0',
-    'label2_2d_target_help'   => 'crwdns11751:0crwdne11751:0',
+    'label2_2d_target_help'   => 'crwdns12832:0crwdne12832:0',
     'label2_fields'           => 'crwdns11753:0crwdne11753:0',
     'label2_fields_help'      => 'crwdns11755:0crwdne11755:0',
     'help_asterisk_bold'    => 'crwdns11757:0crwdne11757:0',
     'help_blank_to_use'     => 'crwdns11759:0crwdne11759:0',
-    'help_default_will_use' => 'crwdns12828:0crwdne12828:0',
+    'help_default_will_use' => 'crwdns12834:0crwdne12834:0',
+    'asset_id'              => 'crwdns12836:0crwdne12836:0',
+    'data'               => 'crwdns12838:0crwdne12838:0',
     'default'               => 'crwdns11763:0crwdne11763:0',
     'none'                  => 'crwdns11765:0crwdne11765:0',
     'google_callback_help' => 'crwdns11615:0crwdne11615:0',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'crwdns12682:0crwdne12682:0',
     'no_groups' => 'crwdns12760:0crwdne12760:0',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'crwdns12842:0crwdne12842:0',
+        'general_settings'  => 'crwdns12844:0crwdne12844:0',
+        'groups'            => 'crwdns12846:0crwdne12846:0',
+        'labels'            => 'crwdns12848:0crwdne12848:0',
+        'localization'      => 'crwdns12850:0crwdne12850:0',
+        'php_overview'      => 'crwdns12852:0crwdne12852:0',
+        'purge'             => 'crwdns12854:0crwdne12854:0',
+        'security'          => 'crwdns12856:0crwdne12856:0',
+    ],
+
 ];

resources/lang/aa-ER/admin/settings/message.php

@@ -45,5 +45,6 @@
         'error' => 'crwdns11381:0crwdne11381:0',
         'error_redirect' => 'crwdns11843:0crwdne11843:0',
         'error_misc' => 'crwdns11383:0crwdne11383:0',
+        'webhook_fail' => 'crwdns12830:0crwdne12830:0',
     ]
 ];

resources/lang/aa-ER/general.php

@@ -216,6 +216,12 @@
     'no_results'			=> 'crwdns1074:0crwdne1074:0',
     'no'  					=> 'crwdns1075:0crwdne1075:0',
     'notes'  				=> 'crwdns1076:0crwdne1076:0',
+    'note_added'            => 'crwdns12858:0crwdne12858:0',
+    'add_note'              => 'crwdns12860:0crwdne12860:0',
+    'note_edited'            => 'crwdns12862:0crwdne12862:0',
+    'edit_note'              => 'crwdns12864:0crwdne12864:0',
+    'note_deleted'            => 'crwdns12866:0crwdne12866:0',
+    'delete_note'              => 'crwdns12868:0crwdne12868:0',
     'order_number'          => 'crwdns1829:0crwdne1829:0',
     'only_deleted'          => 'crwdns10520:0crwdne10520:0',
     'page_menu'				=> 'crwdns1276:0crwdne1276:0',
@@ -566,5 +572,8 @@
     'import_asset_tag_exists' => 'crwdns12692:0crwdne12692:0',
     'countries_manually_entered_help' => 'crwdns12702:0crwdne12702:0',
     'accessories_assigned' => 'crwdns12800:0crwdne12800:0',
+    'user_managed_passwords' => 'crwdns12870:0crwdne12870:0',
+    'user_managed_passwords_disallow' => 'crwdns12872:0crwdne12872:0',
+    'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
 
 ];

resources/lang/af-ZA/admin/settings/general.php

@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'Algemene instellings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Genereer rugsteun',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP weergawe',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'Jy moet php-gd installeer om QR-kodes te vertoon, sien installeringsinstruksies.',
     'php_gd_warning'            => 'PHP Image Processing en GD plugin is NIE geïnstalleer nie.',
@@ -231,7 +229,6 @@
     'update'                    => 'Opdateer instellings',
     'value'                     => 'waarde',
     'brand'                     => 'Handelsmerk',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'Oor instellings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Verwyder verwyderde rekords',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];

resources/lang/af-ZA/admin/settings/message.php

@@ -45,5 +45,6 @@
         'error' => 'Something went wrong. :app responded with: :error_message',
         'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
         'error_misc' => 'Something went wrong. :( ',
+        'webhook_fail' => ' webhook notification failed: Check to make sure the URL is still valid.',
     ]
 ];

resources/lang/af-ZA/general.php

@@ -216,6 +216,12 @@
     'no_results'			=> 'Geen resultate.',
     'no'  					=> 'Geen',
     'notes'  				=> 'notas',
+    'note_added'            => 'Note Added',
+    'add_note'              => 'Add Note',
+    'note_edited'            => 'Note Edited',
+    'edit_note'              => 'Edit Note',
+    'note_deleted'            => 'Note Deleted',
+    'delete_note'              => 'Delete Note',
     'order_number'          => 'Bestellingnommer',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
@@ -567,5 +573,8 @@
     'import_asset_tag_exists' => 'An asset with the asset tag :asset_tag already exists and an update was not requested. No change was made.',
     'countries_manually_entered_help' => 'Values with an asterisk (*) were manually entered and do not match existing ISO 3166 dropdown values',
     'accessories_assigned' => 'Assigned Accessories',
+    'user_managed_passwords' => 'Password Management',
+    'user_managed_passwords_disallow' => 'Disallow users from managing their own passwords',
+    'user_managed_passwords_allow' => 'Allow users to manage their own passwords',
 
 ];

resources/lang/am-ET/admin/settings/general.php

@@ -70,7 +70,6 @@
     'footer_text'               => 'Additional Footer Text ',
     'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
     'general_settings_help'     => 'Default EULA and more',
     'generate_backup'			=> 'Generate Backup',
     'google_workspaces'         => 'Google Workspaces',
@@ -154,7 +153,6 @@
     'php'                       => 'PHP Version',
     'php_info'                  => 'PHP info',
     'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
     'php_overview_help'         => 'PHP System info',
     'php_gd_info'               => 'You must install php-gd to display QR codes, see install instructions.',
     'php_gd_warning'            => 'PHP Image Processing and GD plugin is NOT installed.',
@@ -231,7 +229,6 @@
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
     'brand_help'                => 'Logo, Site Name',
     'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
@@ -319,21 +316,17 @@
     'filter_by_keyword' => 'Filter by setting keyword',
     'security' => 'Security',
     'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
     'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
     'groups_help' => 'Account permission groups',
     'localization' => 'Localization',
     'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
     'localization_help' => 'Language, date display',
     'notifications' => 'Notifications',
     'notifications_help' => 'Email Alerts & Audit Settings',
     'asset_tags_help' => 'Incrementing and prefixes',
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge_keywords' => 'permanently delete',
+    'labels_help' => 'Barcodes &amp; label settings',
     'purge_help' => 'Purge Deleted Records',
     'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
     'ldap_ad' => 'LDAP/AD',
@@ -362,12 +355,14 @@
     'label2_2d_type'          => '2D Barcode Type',
     'label2_2d_type_help'     => 'Format for 2D barcodes',
     'label2_2d_target'        => '2D Barcode Target',
-    'label2_2d_target_help'   => 'The URL the 2D barcode points to when scanned',
+    'label2_2d_target_help'   => 'The data that will be contained in the 2D barcode',
     'label2_fields'           => 'Field Definitions',
     'label2_fields_help'      => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
     'help_asterisk_bold'    => 'Text entered as <code>**text**</code> will be displayed as bold',
     'help_blank_to_use'     => 'Leave blank to use the value from <code>:setting_name</code>',
-    'help_default_will_use' => '<br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'help_default_will_use' => '<code>:default</code> will use the value from <code>:setting_name</code>. <br>Note that the value of the barcodes must comply with the respective barcode spec in order to be successfully generated. Please see <a href="https://snipe-it.readme.io/docs/barcodes">the documentation <i class="fa fa-external-link"></i></a> for more details. ',
+    'asset_id'              => 'Asset ID',
+    'data'               => 'Data',
     'default'               => 'Default',
     'none'                  => 'None',
     'google_callback_help' => 'This should be entered as the callback URL in your Google OAuth app settings in your organization&apos;s <strong><a href="https://console.cloud.google.com/" target="_blank">Google developer console <i class="fa fa-external-link" aria-hidden="true"></i></a></strong>.',
@@ -389,4 +384,17 @@
     'due_checkin_days_help' => 'How many days before the expected checkin of an asset should it be listed in the "Due for checkin" page?',
     'no_groups' => 'No groups have been created yet. Visit <code>Admin Settings > Permission Groups</code> to add one.',
 
+
+    /* Keywords for settings overview help */
+    'keywords' => [
+        'brand'             => 'footer, logo, print, theme, skin, header, colors, color, css',
+        'general_settings'  => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, gravatar, tos, dashboard, privacy',
+        'groups'            => 'permissions, permission groups, authorization',
+        'labels'            => 'labels, barcodes, barcode, sheets, print, upc, qr, 1d, 2d',
+        'localization'      => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+        'php_overview'      => 'phpinfo, system, info',
+        'purge'             => 'permanently delete',
+        'security'          => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
+    ],
+
 ];