Skip to content

Commit 8995ac6

Browse files
Merge branch 'release/3.1.4.37'
2 parents 0d33c7f + d321023 commit 8995ac6

29 files changed

+1217
-701
lines changed

files_reference.txt

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,10 @@ includes/js/CreateRandomString.js 169408165b8be967ba25505524d1f676
172172
includes/js/functions.js b174482aa8f1df4be18a7c305804e4c1
173173
includes/js/secure-clipboard-cleaner.js 098bc87fbbc3e0b8626306dcd8a10273
174174
includes/language/arabic.php fbead6ad419ab93ec4af5fe46316dd46
175-
includes/language/bulgarian.php 4b9b123bb2fbe10318e720d31537ecfa
176-
includes/language/catalan.php 91ed3f003cb6edec953800fc2ff27622
177-
includes/language/chinese.php 0f01c6d35ab5cd77655ef7c6bbf48f79
178-
includes/language/czech.php 6ec32cfce2210e6b5f761568b2bb467c
175+
includes/language/bulgarian.php 85aee8b207e40e30bdd9a422d071e93e
176+
includes/language/catalan.php 89fda3a229887ad5a0bfe3b9f5282e8c
177+
includes/language/chinese.php 3bcc579f375017fac30d1debd6345538
178+
includes/language/czech.php f8c56cee622de1e5054ed744fdc56eed
179179
includes/language/datatables.bulgarian.txt f8760db3ed02790a55d9831ae9f2107a
180180
includes/language/datatables.catalan.txt 620a880abafdfaa4ceeffbf8caac43e2
181181
includes/language/datatables.chinese.txt 2323b2f7a18fc09834c30b113e6c8928
@@ -197,26 +197,26 @@ includes/language/datatables.spanish.txt 4ef4ed678ab1d06aef7e6029a09ccfb4
197197
includes/language/datatables.turkish.txt 72029c69092185073e741d1b0cae543f
198198
includes/language/datatables.ukrainian.txt 8c9f26eee807a87411b5d7c5e8fdf149
199199
includes/language/datatables.vietnamese.txt f9b6e7a07d0f6533f186dac4b3499dd4
200-
includes/language/dutch.php 4c1bc46c8154e7ec2e17dae8f62b7f7f
201-
includes/language/english.php b2fd2daf8792cc62ca8d507df95b3d09
202-
includes/language/estonian.php 2e53a36e136fb84eb707b3cb022cac43
203-
includes/language/french.php 10e7b83c2deec2503cd5899fa38277b1
204-
includes/language/german.php 4002b71b6e07a3da93bb5d40681d17c1
205-
includes/language/greek.php 2f46d24a96385e80e405a57cb21d8c2f
206-
includes/language/hungarian.php bf0e9ab165b770ff358e7675c7e83688
207-
includes/language/italian.php 82f7099697b68238e6a984176e5a9d34
208-
includes/language/japanese.php 8ac1860b5b66cbbbd33fb6b968957d66
209-
includes/language/norwegian.php 53fdc4ca89713495c97704e0fb107836
210-
includes/language/polish.php 39b4383d77be546885609adf8f784f63
211-
includes/language/portuguese.php e4eb3c2d9f1696943d2d258ca245418d
212-
includes/language/portuguese_br.php 19a1d002cef1f08250f107b6b90f8961
213-
includes/language/romanian.php 112f2ca069f4fff182f48c8ccb4b7d55
214-
includes/language/russian.php 8feefe6446b59862ce9be7dba42837ec
215-
includes/language/spanish.php f44fc6b0c70c3e846b1f07d4248c8884
216-
includes/language/swedish.php 2b29ed04b311c42b5446b4ec706d163f
217-
includes/language/turkish.php 344417296bc9b102e2a21d67baf4e0f2
218-
includes/language/ukrainian.php e73777a10e84aaa105659656334d4884
219-
includes/language/vietnamese.php 1e27c305caa46f56f006688ed589b313
200+
includes/language/dutch.php 6cb521d5d8bc54861f6d493b811ab67e
201+
includes/language/english.php a3845c76854fa23bb6b8b3abd338fdea
202+
includes/language/estonian.php aefeccd968c20a33763409a0e17b0472
203+
includes/language/french.php 9f7ce9ab1740c5418340d7cc3938f564
204+
includes/language/german.php 24ec92184dc09769624d44913eade679
205+
includes/language/greek.php d556c4fca1b8e0dc9044b32688cb5598
206+
includes/language/hungarian.php a80b025ff5fc56c9ad352407090768be
207+
includes/language/italian.php d0b77a815ffb56f81ba3e40032d74606
208+
includes/language/japanese.php 833f4154ee95395e4f1a804e65c71b9d
209+
includes/language/norwegian.php db2886513e0a42f5a1484379b31d71b6
210+
includes/language/polish.php ce04738973911de975b80acf44664069
211+
includes/language/portuguese.php 103b7b75648f3a0a37e1c0d13a6ac363
212+
includes/language/portuguese_br.php b8bb8b6aec828ce78e217261ff4d0fbc
213+
includes/language/romanian.php c6ec3bece7ea65952b69848dbb7a0e33
214+
includes/language/russian.php 6f9e0096c1c0a73ffacd6bed84672947
215+
includes/language/spanish.php 82ba26e3552b4ef47d08caae6ad21c12
216+
includes/language/swedish.php f55777bcce69286fd0674b7ba459a513
217+
includes/language/turkish.php ab65a702ce338521d444d4b0b139a7f0
218+
includes/language/ukrainian.php 0a6d9db4063c6e6b9dee60aaecde6216
219+
includes/language/vietnamese.php 36c65a59837f5908b6063c76afc7ba36
220220
includes/libraries/cryptojs/CONTRIBUTING.md dbdfd6f23697cc7dc263b000b951d0c4
221221
includes/libraries/cryptojs/Encryption.php 4f6252cda32ff52f74d4e85113f07e87
222222
includes/libraries/cryptojs/LICENSE ae3e116844af349909de6f126e8b1fac
@@ -349,12 +349,12 @@ install/images/minus-circle.png 1764d2e728759d84f558455afd1305a8
349349
install/images/tick-circle.png e5fef4280f78af4b3f50c8cc96dc3151
350350
install/images/tick.png 9c16ecd780078250afaf9069352b5a17
351351
install/install-steps/install.functions.php 96c90f820abb8e4253da2313940f634a
352-
install/install-steps/install.js 22af1d3172d1cb19ddc6d01847cde9f7
352+
install/install-steps/install.js 407df7706e8a00bf764cbc2adf2e3fea
353353
install/install-steps/run.step1.php a60c2e61f765e9ebafc7b3f8ea0aaf51
354354
install/install-steps/run.step2.php 39bc0e5714cc404bbd60297f62ad2910
355355
install/install-steps/run.step3.php aedae1cc4680f8e48c524530a001d753
356356
install/install-steps/run.step4.php 9769f64928708599889a574e122eab0c
357-
install/install-steps/run.step5.php 3c2f813360b35daa3c3ddfae7a2b2faa
357+
install/install-steps/run.step5.php 0a1e508bdcda77c4b67cff10da3556bd
358358
install/install-steps/run.step6.php 1165f4ddef4ca91c54a9335e536a26d1
359359
install/install.php 79dea4155acc861977f957303257982f
360360
install/js/aes.min.js deaf035d40420d4ce6d4018e0bd63801
@@ -415,7 +415,7 @@ pages/ldap.php 9659d31f97963aec777d2ac43df7846c
415415
pages/oauth.js.php 11d2e3336c4697d5a5264432f848c3a7
416416
pages/oauth.php 07d67e553fbcce813e01607e89aa6e80
417417
pages/options.js.php 521e06fe2c30c92f8ee64278a46786bc
418-
pages/options.php 0cf4fecd3eaa7005ef2d377b20114069
418+
pages/options.php 09931dab68157ade2161a71c7d801b5a
419419
pages/profile.js.php b1bd1ce8a6a855a22755b348c5c610d6
420420
pages/profile.php 621ecc4b2cf53c1f34308b920fe18a49
421421
pages/roles.js.php 6318dba6a31df24cad54615dd1fa64c0

includes/config/include.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
define('TP_VERSION', '3.1.4');
3030
define("UPGRADE_MIN_DATE", "1759676726");
31-
define('TP_VERSION_MINOR', '36');
31+
define('TP_VERSION_MINOR', '37');
3232
define('TP_TOOL_NAME', 'Teampass');
3333
define('TP_ONE_DAY_SECONDS', 86400);
3434
define('TP_ONE_WEEK_SECONDS', 604800);

includes/language/bulgarian.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,5 +1270,26 @@
12701270
'suggested_value' => 'Suggested value',
12711271
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
12721272
'no_previous_valide_private_key' => 'No previous private key fits provided password',
1273+
'copy_sub_directories' => 'Copy sub-directories',
1274+
'copy_items' => 'Copy items',
1275+
'no_subfolders' => 'No sub-directories',
1276+
'show_subfolders_in_main_view' => 'Show sub-folders in main items list',
1277+
'no_folder_selected' => 'No folder is selected',
1278+
'settings_category_general_info_title' => 'General information & installation paths',
1279+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
1280+
'settings_category_system_title' => 'System settings & maintenance',
1281+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
1282+
'settings_category_security_title' => 'Security & authentication',
1283+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
1284+
'settings_category_users_title' => 'User and role management',
1285+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
1286+
'settings_category_items_title' => 'Items and folders management',
1287+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
1288+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
1289+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
1290+
'settings_category_integration_goal' => 'Integrations & automation',
1291+
'settings_category_integration_title' => 'Interact with external systems or enable automated processes.',
1292+
'settings_category_logging_title' => 'Logging & history',
1293+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
12731294

12741295
);

includes/language/catalan.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,5 +1270,26 @@
12701270
'suggested_value' => 'Suggested value',
12711271
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
12721272
'no_previous_valide_private_key' => 'No previous private key fits provided password',
1273+
'copy_sub_directories' => 'Copy sub-directories',
1274+
'copy_items' => 'Copy items',
1275+
'no_subfolders' => 'No sub-directories',
1276+
'show_subfolders_in_main_view' => 'Show sub-folders in main items list',
1277+
'no_folder_selected' => 'No folder is selected',
1278+
'settings_category_general_info_title' => 'General information & installation paths',
1279+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
1280+
'settings_category_system_title' => 'System settings & maintenance',
1281+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
1282+
'settings_category_security_title' => 'Security & authentication',
1283+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
1284+
'settings_category_users_title' => 'User and role management',
1285+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
1286+
'settings_category_items_title' => 'Items and folders management',
1287+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
1288+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
1289+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
1290+
'settings_category_integration_goal' => 'Integrations & automation',
1291+
'settings_category_integration_title' => 'Interact with external systems or enable automated processes.',
1292+
'settings_category_logging_title' => 'Logging & history',
1293+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
12731294

12741295
);

includes/language/chinese.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,5 +1270,26 @@
12701270
'suggested_value' => 'Suggested value',
12711271
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
12721272
'no_previous_valide_private_key' => 'No previous private key fits provided password',
1273+
'copy_sub_directories' => 'Copy sub-directories',
1274+
'copy_items' => 'Copy items',
1275+
'no_subfolders' => 'No sub-directories',
1276+
'show_subfolders_in_main_view' => 'Show sub-folders in main items list',
1277+
'no_folder_selected' => 'No folder is selected',
1278+
'settings_category_general_info_title' => 'General information & installation paths',
1279+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
1280+
'settings_category_system_title' => 'System settings & maintenance',
1281+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
1282+
'settings_category_security_title' => 'Security & authentication',
1283+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
1284+
'settings_category_users_title' => 'User and role management',
1285+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
1286+
'settings_category_items_title' => 'Items and folders management',
1287+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
1288+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
1289+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
1290+
'settings_category_integration_goal' => 'Integrations & automation',
1291+
'settings_category_integration_title' => 'Interact with external systems or enable automated processes.',
1292+
'settings_category_logging_title' => 'Logging & history',
1293+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
12731294

12741295
);

includes/language/czech.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,5 +1270,26 @@
12701270
'suggested_value' => 'Suggested value',
12711271
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
12721272
'no_previous_valide_private_key' => 'No previous private key fits provided password',
1273+
'copy_sub_directories' => 'Copy sub-directories',
1274+
'copy_items' => 'Copy items',
1275+
'no_subfolders' => 'No sub-directories',
1276+
'show_subfolders_in_main_view' => 'Show sub-folders in main items list',
1277+
'no_folder_selected' => 'No folder is selected',
1278+
'settings_category_general_info_title' => 'General information & installation paths',
1279+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
1280+
'settings_category_system_title' => 'System settings & maintenance',
1281+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
1282+
'settings_category_security_title' => 'Security & authentication',
1283+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
1284+
'settings_category_users_title' => 'User and role management',
1285+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
1286+
'settings_category_items_title' => 'Items and folders management',
1287+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
1288+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
1289+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
1290+
'settings_category_integration_goal' => 'Integrations & automation',
1291+
'settings_category_integration_title' => 'Interact with external systems or enable automated processes.',
1292+
'settings_category_logging_title' => 'Logging & history',
1293+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
12731294

12741295
);

includes/language/dutch.php

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1270,5 +1270,26 @@
12701270
'suggested_value' => 'Suggested value',
12711271
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
12721272
'no_previous_valide_private_key' => 'No previous private key fits provided password',
1273+
'copy_sub_directories' => 'Copy sub-directories',
1274+
'copy_items' => 'Copy items',
1275+
'no_subfolders' => 'No sub-directories',
1276+
'show_subfolders_in_main_view' => 'Show sub-folders in main items list',
1277+
'no_folder_selected' => 'No folder is selected',
1278+
'settings_category_general_info_title' => 'General information & installation paths',
1279+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
1280+
'settings_category_system_title' => 'System settings & maintenance',
1281+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
1282+
'settings_category_security_title' => 'Security & authentication',
1283+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
1284+
'settings_category_users_title' => 'User and role management',
1285+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
1286+
'settings_category_items_title' => 'Items and folders management',
1287+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
1288+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
1289+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
1290+
'settings_category_integration_goal' => 'Integrations & automation',
1291+
'settings_category_integration_title' => 'Interact with external systems or enable automated processes.',
1292+
'settings_category_logging_title' => 'Logging & history',
1293+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
12731294

12741295
);

includes/language/english.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,23 @@
3232
// - selected_items_to_be_imported
3333

3434
return array(
35+
'highlight_selected' => 'Highlight selected',
36+
'settings_category_general_info_title' => 'General information & installation paths',
37+
'settings_category_general_info_goal' => 'Define where TeamPass files and resources are stored.',
38+
'settings_category_system_title' => 'System settings & maintenance',
39+
'settings_category_system_goal' => 'Control the overall system behavior and its availability.',
40+
'settings_category_security_title' => 'Security & authentication',
41+
'settings_category_security_goal' => 'Manage security, access control, and encryption policies.',
42+
'settings_category_users_title' => 'User and role management',
43+
'settings_category_users_goal' => 'Define user capabilities and restrictions within the system.',
44+
'settings_category_items_title' => 'Items and folders management',
45+
'settings_category_items_goal' => 'Control how password items and folders are organized and handled.',
46+
'settings_category_collaboration_title' => 'Collaborative & advanced features',
47+
'settings_category_collaboration_goal' => 'Provide additional tools and features for teamwork and extended functionality.',
48+
'settings_category_integration_title' => 'Integrations & automation',
49+
'settings_category_integration_goal' => 'Interact with external systems or enable automated processes.',
50+
'settings_category_logging_title' => 'Logging & history',
51+
'settings_category_logging_goal' => 'Manage logs and track user actions for audit and traceability.',
3552
'no_previous_valide_private_key' => 'No previous private key fits provided password',
3653
'user_password_changed' => 'Your password has changed. Please provide your previous password to re-encrypt your personal items. Once done, please wait a few minutes before accessing your personal items.',
3754
'suggested_value' => 'Suggested value',

0 commit comments

Comments
 (0)