References to Google Authenticator modified

app/admin/2fa/index.php

@@ -163,14 +163,16 @@ else {
 <article style='margin-top:50px;' class="text-muted">
 <?php print _("phpIPAM supports two-factor-authentication to add additional security layer for user authentication."); ?>
 <br>
-<?php print _("After user successfully logs in it will be presented with additional screen to enter code from Google authenticator application."); ?>
+<?php print _("After user successfully logs in it will be presented with additional screen to enter code from your preferred authenticator application."); ?>
 <br><br>
-<?php print _("Google Authenticator is available on following links based on your OS:"); ?>
+<?php print _("Authenticator apps are available on following links based on your OS:"); ?>
 <ul>
-	<li> <a href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8' target="_self">Apple iOS</a></li>
-	<li> <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_self">Android</a></li>
+	<li> <a href='https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8' target="_self">Google Authenticator - Apple iOS</a></li>
+	<li> <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2" target="_self">Google Authenticator - Android</a></li>
+	<li> <a href='https://itunes.apple.com/us/app/microsoft-authenticator/id983156458?mt=8' target="_self">Microsoft Authenticator - Apple iOS</a></li>
+	<li> <a href="https://play.google.com/store/apps/details?id=com.azure.authenticator" target="_self">Microsoft Authenticator - Android</a></li>
 </ul>
-<?php print _("You can also use Microsoft or any other otp provider."); ?>
+<?php print _("You can also use any other OTP provider."); ?>
 </article>
 
 

app/admin/admin-menu-config.php

@@ -15,7 +15,7 @@ $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-cogs",
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-user",           "href"=>"users",                  "name"=>_("Users"),                    "description"=>_("User management")];
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-users",          "href"=>"groups",                 "name"=>_("Groups"),                   "description"=>_("User group management")];
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-server",         "href"=>"authentication-methods", "name"=>_("Authentication methods"),   "description"=>_("Manage user authentication methods and servers")];
-$admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-shield",         "href"=>"2fa",                    "name"=>_("2FA"),                      "description"=>_("Two-factor authentication with Google Authenticator")];
+$admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-shield",         "href"=>"2fa",                    "name"=>_("2FA"),                      "description"=>_("Two-factor authentication with TOTP provider")];
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-unlock",         "href"=>"password-policy",        "name"=>_("Password policy"),          "description"=>_("Set user password policy")];
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-envelope-o",     "href"=>"mail",                   "name"=>_("Mail settings"),            "description"=>_("Set mail parameters and mail server settings")];
 $admin_menu[_('Server management')][] =     ["show"=>true, "icon"=>"fa-cogs",           "href"=>"api",                    "name"=>_("API"),                      "description"=>_("API settings")];

app/login/2fa/2fa_create.php

@@ -33,13 +33,13 @@ else {
 	$html[] = '		<legend style="margin-top:10px;">'._('Two-factor authentication details').'</legend>';
 	$html[] = '	</div>';
 	$html[] = '	<div>';
-	$html[] = '		'._('Details for your Google Authenticator are below. Please write down your details, otherwise you will not be able to login to phpipam');
+	$html[] = '		'._('Details for your preferred authenticator application are below. Please write down your details, otherwise you will not be able to login to phpipam');
 	$html[] = '		<div style="border: 2px dashed red;margin:20px;padding: 10px" class="text-center row">';
 	$html[] = '			<div class="col-xs-12" style="padding:5px 10px 3px 20px;"><strong>'._('Account').': <span style="color:red; font-size: 16px">'.$username.'</span></strong></div>';
 	$html[] = '			<div class="col-xs-12" style="padding:0px 10px 3px 20px;"><strong>'._('Secret').' : <span style="color:red; font-size: 16px">'.$secret.'</span></strong></div>';
 	$html[] = '		</div>';
 	$html[] = '		<div class="text-center">';
-	$html[] = '		<hr>'._('You can also scan followign QR code with Google Authenticator application').':<br><br>';
+	$html[] = '		<hr>'._('You can also scan following QR code with your preferred authenticator application').':<br><br>';
 	$html[] = '			<div id="qrcode" style="width:200px;margin:auto;"></div>';
 	$html[] = '		</div>';
 	$html[] = '		<div class="text-right" style="margin-top:10px;">';

app/login/2fa/2fa_form.php

@@ -26,7 +26,7 @@ $csrf = $User->Crypto->csrf_cookie ("create", "2fa_validation");
 	    ?>
 	</div>
 	<div class="col-xs-12">
-	<?php print _("Please enter two-factor authentication code from Google Authenticator"); ?>
+	<?php print _("Please enter two-factor authentication code from your preferred authenticator application"); ?>
 		<hr>
 	</div>
 	<div class="col-xs-12 text-right">

app/tools/user-menu/2fa.php

@@ -63,13 +63,13 @@ $username = strtolower($User->user->username)."@".$User->settings->{'2fa_name'};
 if($User->user->{'2fa_secret'}!=null) {
 	$html   = [];
 	$html[] = '<div class="loginForm row" style="width:400px;">';
-	$html[] = '		'._('Details for your Google Authenticator are below. Please write down your details, otherwise you will not be able to login to phpipam').".";
+	$html[] = '		'._('Details for your preferred authenticator application are below. Please write down your details, otherwise you will not be able to login to phpipam').".";
 	$html[] = '		<div style="border: 2px dashed red;margin:20px;padding: 10px" class="text-center row">';
 	$html[] = '			<div class="col-xs-12" style="padding:5px 10px 3px 20px;"><strong>'._('Account').': <span style="color:red; font-size: 16px">'.$username.'</span></strong></div>';
 	$html[] = '			<div class="col-xs-12" style="padding:0px 10px 3px 20px;"><strong>'._('Secret').' : <span style="color:red; font-size: 16px">'.$User->user->{'2fa_secret'}.'</span></strong></div>';
 	$html[] = '		</div>';
 	$html[] = '		<div class="text-center">';
-	$html[] = '		<hr>'._('You can also scan followign QR code with Google Authenticator application').':<br><br>';
+	$html[] = '		<hr>'._('You can also scan following QR code with your preferred authenticator application').':<br><br>';
 	$html[] = '			<div id="qrcode" style="width:200px;margin:auto;"></div>';
 	$html[] = '		</div><br>';
 	$html[] = '</div>';

functions/locale/de_DE.UTF-8/LC_MESSAGES/phpipam.po

@@ -10498,7 +10498,7 @@ msgstr "Benutzerkonto"
 #: app/login/2fa/2fa_create.php:42 app/tools/user-menu/2fa.php:72
 msgid ""
-"You can also scan followign QR code with Google Authenticator application"
+"You can also scan following QR code with Google Authenticator application"
 msgstr ""
 "Sie können auch folgenden QR-Code mit der Google Authenticator "
 "Anwendung scannen"

functions/locale/ru_RU.UTF-8/LC_MESSAGES/phpipam.po

@@ -5770,7 +5770,7 @@ msgid "Account"
 msgstr "Учётная запись"
 #: app/login/2fa/2fa_create.php:42 app/tools/user-menu/2fa.php:72
-msgid "You can also scan followign QR code with Google Authenticator application"
+msgid "You can also scan following QR code with Google Authenticator application"
 msgstr "Вы также можете отсканировать следующий QR код в приложении Google Authenticator"
 #: app/login/2fa/2fa_create.php:46 app/login/2fa/2fa_form.php:37