tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '689-Change_translations_in_mr_and_um_section' into 'develop' 

Translations changed

See merge request !344
This commit is contained in:
vgilc 2017-05-16 12:05:50 +02:00
parent 88ccb3b364 1546e48e15
commit 754484cf1d
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_console/godmode/update_manager/update_manager.offline.php
View File

@ -54,8 +54,9 @@ $baseurl = ui_get_full_url(false, false, false, false);
var package_success = "<?php echo __('Package updated successfully'); ?>\n"; var package_success = "<?php echo __('Package updated successfully'); ?>\n";
var package_error = "<?php echo __('Error in package updated'); ?>\n"; var package_error = "<?php echo __('Error in package updated'); ?>\n";
var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n"; var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n"; var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n"; var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
var text3_mr_file = "<?php echo __('planned downtime'); ?>\n"; var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
var text4_mr_file = "<?php echo __(' to this process'); ?>\n"; var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
var text1_package_file = "<?php echo __('There is a new update available'); ?>\n"; var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";

2
pandora_console/godmode/update_manager/update_manager.online.php
View File

@ -82,7 +82,7 @@ echo "<span class='loading' style='font-size:18pt;'>";
echo "<img src='images/wait.gif' />"; echo "<img src='images/wait.gif' />";
echo "</span><br><br>"; echo "</span><br><br>";
echo "<div><b>" . __('The last version of package installed is:') . "</b></div><br>"; echo "<div><b>" . __('The latest version of package installed is:') . "</b></div><br>";
echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold;'>" . $current_package . "</div>"; echo "<div id='pkg_version' style='color:#82b92e;font-size:40pt;font-weight:bold;'>" . $current_package . "</div>";
echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>"; echo "<div class='checking_package' style='font-size:18pt;width:100%; text-align: center; display: none;'>";

5
pandora_console/include/functions_update_manager.php
View File

@ -354,8 +354,9 @@ function update_manager_check_online_free_packages ($is_ajax=true) {
var package_success = "<?php echo __('Package updated successfully'); ?>\n"; var package_success = "<?php echo __('Package updated successfully'); ?>\n";
var package_error = "<?php echo __('Error in package updated'); ?>\n"; var package_error = "<?php echo __('Error in package updated'); ?>\n";
var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n"; var bad_mr_file = "<?php echo __('Database MR version is inconsistent, do you want to apply the package?'); ?>\n";
var text1_mr_file = "<?php echo __('There are a new database changes available to apply. Do you want to start the DB update process?'); ?>\n"; var mr_available_header = "<?php echo __('There are db changes'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launch a '); ?>\n"; var text1_mr_file = "<?php echo __('There are new database changes available to apply. Do you want to start the DB update process?'); ?>\n";
var text2_mr_file = "<?php echo __('We recommend launching '); ?>\n";
var text3_mr_file = "<?php echo __('planned downtime'); ?>\n"; var text3_mr_file = "<?php echo __('planned downtime'); ?>\n";
var text4_mr_file = "<?php echo __(' to this process'); ?>\n"; var text4_mr_file = "<?php echo __(' to this process'); ?>\n";
var text1_package_file = "<?php echo __('There is a new update available'); ?>\n"; var text1_package_file = "<?php echo __('There is a new update available'); ?>\n";