Merge branch 'master' into remove_unused_vars
Conflicts: apps/files_encryption/lib/session.php apps/files_encryption/lib/util.phpremotes/origin/stable6
commit
09b54ccb2b
@ -1,4 +1,16 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Recovery key successfully " => "成功還原金鑰",
|
||||
"Could not " => "無法",
|
||||
"Password successfully changed." => "成功變更密碼。",
|
||||
"Could not change the password. Maybe the old password was not correct." => "無法變更密碼,或許是輸入的舊密碼不正確。",
|
||||
"Saving..." => "儲存中...",
|
||||
"Encryption" => "加密"
|
||||
"Encryption" => "加密",
|
||||
"Enabled" => "已啓用",
|
||||
"Disabled" => "已停用",
|
||||
"Change encryption passwords recovery key:" => "變更加密密碼還原金鑰:",
|
||||
"Change Password" => "變更密碼",
|
||||
"Enable password recovery by sharing all files with your administrator:" => "與管理員分享所有檔案以啓用密碼還原功能:",
|
||||
"Enabling this option will allow you to reobtain access to your encrypted files if your password is lost" => "啓用此選項允許您未來遺失密碼時重新取得已加密的檔案",
|
||||
"File recovery settings updated" => "檔案還原設定已更新",
|
||||
"Could not update file recovery" => "無法更新檔案還原設定"
|
||||
);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue