diff --git a/language/fa.php b/language/fa.php
index 3feb7cdbc6..71c9a8095a 100755
--- a/language/fa.php
+++ b/language/fa.php
@@ -249,7 +249,7 @@
"Github Connect"=>"Github Connect",
"Hide From Combined Pages"=>"پنهان کردن از صفحات ترکیبی",
"Save Settings"=>"تنظیمات را ذخیره کن",
- "Settings are not saved permanently on the server unless you explicitly allow it. If you don't save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently."=>"تنظیمات برای همیشه در سرور ذخیره نمی شوند ، مگر اینکه صریحاً اجازه آن را بدهید. اگر تنظیمات خود را ذخیره نکنید ، با اتمام جلسه یا خارج شدن از سیستم ، هر تغییری که از آخرین ورود به سیستم انجام داده اید ، حذف خواهد شد. برای ذخیره تنظیمات خود باید دوباره رمز ورود خود را برای اهداف امنیتی وارد کنید.",
+ "Settings are not saved permanently on the server unless you explicitly allow it. If you don\'t save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently."=>"تنظیمات برای همیشه در سرور ذخیره نمی شوند ، مگر اینکه صریحاً اجازه آن را بدهید. اگر تنظیمات خود را ذخیره نکنید ، با اتمام جلسه یا خارج شدن از سیستم ، هر تغییری که از آخرین ورود به سیستم انجام داده اید ، حذف خواهد شد. برای ذخیره تنظیمات خود باید دوباره رمز ورود خود را برای اهداف امنیتی وارد کنید.",
"Add a Repository"=>"مخزن اضافه کنید",
"Disconnect"=>"قطع شدن",
"Already connected"=>"قبلاً متصل شده اید",
diff --git a/modules/2fa/modules.php b/modules/2fa/modules.php
index ca0d15bb18..21750235bb 100644
--- a/modules/2fa/modules.php
+++ b/modules/2fa/modules.php
@@ -147,19 +147,6 @@ protected function output() {
if (array_key_exists('2fa_enable', $settings)) {
$enabled = $settings['2fa_enable'];
}
-<<<<<<< HEAD
- $res = '
'), $res->output_response);
}
/**
* @preserveGlobalState disabled
@@ -1289,10 +1289,10 @@ public function test_settings_menu_start() {
public function test_save_form() {
$test = new Output_Test('save_form', 'core');
$res = $test->run();
- $this->assertEquals(array('
Save Settings
Settings are not saved permanently on the server unless you explicitly allow it. If you don\'t save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently.
Settings are not saved permanently on the server unless you explicitly allow it. If you don\'t save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently.
Settings are not saved permanently on the server unless you explicitly allow it. If you don\'t save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently.
Settings are not saved permanently on the server unless you explicitly allow it. If you don\'t save your settings, any changes made since you last logged in will be deleted when your session expires or you logout. You must re-enter your password for security purposes to save your settings permanently.
Unsaved Changes
foo (1X)
'), $res->output_response);
}
/**
* @preserveGlobalState disabled
@@ -1301,7 +1301,7 @@ public function test_save_form() {
public function test_settings_servers_link() {
$test = new Output_Test('settings_servers_link', 'core');
$res = $test->run();
- $this->assertEquals(array('formatted_folder_list' => '