baculum: Improve texts in restore wizard

diff --git a/gui/baculum/protected/Web/Lang/en/messages.mo b/gui/baculum/protected/Web/Lang/en/messages.mo
index c7a7775c9d72cee97163fd94e82f9e35ceb62c64..6ed8a35f31bd8c98863a2834733203977ce5bff8 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/en/messages.mo and b/gui/baculum/protected/Web/Lang/en/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/en/messages.po b/gui/baculum/protected/Web/Lang/en/messages.po
index 65a3578b698f64cef80f54f2d4be9320ff90fdd4..2014807408b1be5ce0845dca0df8d48532c173ce 100644 (file)
--- a/gui/baculum/protected/Web/Lang/en/messages.po
+++ b/gui/baculum/protected/Web/Lang/en/messages.po
@@ -425,8 +425,8 @@ msgstr "Backup from client:"
 msgid "Restore to client:"
 msgstr "Restore to client:"
 
-msgid "Backup for restore:"
-msgstr "Backup for restore:"
+msgid "Backup to restore:"
+msgstr "Backup to restore:"
 
 msgid "Step 1 - select source backup client"
 msgstr "Step 1 - select source backup client"
@@ -443,8 +443,8 @@ msgstr "Step 2 - select backup to restore"
 msgid "Backup selection method:"
 msgstr "Backup selection method:"
 
-msgid "Only selected backup"
-msgstr "Only selected backup"
+msgid "Selected backup"
+msgstr "Selected backup"
 
 msgid "FileSet resource:"
 msgstr "FileSet resource:"
@@ -512,8 +512,8 @@ msgstr "Source parameters"
 msgid "Backup data from client:"
 msgstr "Backup data from client:"
 
-msgid "FileSet for restore:"
-msgstr "FileSet for restore:"
+msgid "FileSet to restore:"
+msgstr "FileSet to restore:"
 
 msgid "Files for restore"
 msgstr "Files for restore"
@@ -1409,8 +1409,8 @@ msgstr "This wizard enables you to do in easy way restore files to destination B
 msgid "To start, please select backup Client which data you want to restore."
 msgstr "To start, please select backup Client which data you want to restore."
 
-msgid "There are two ways to select backup to restore. Only selected backup way provides list of jobs from which there is possible to select one job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
-msgstr "There are two ways to select backup to restore. Only selected backup way provides list of jobs from which there is possible to select one job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
+msgid "There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
+msgstr "There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
 
 msgid "Do not relocate files"
 msgstr "Do not relocate files"
@@ -2515,3 +2515,6 @@ msgstr "Tip: checking 'All' message type causes, that rest checked message types
 
 msgid "Enable restore from copy jobs feature:"
 msgstr "Enable restore from copy jobs feature:"
+
+msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.mo b/gui/baculum/protected/Web/Lang/ja/messages.mo
index 0b8d16ec68df15e54a413bbb87f88cd7918db429..deafb7a03fa679ced9325d0700906a8038e50a24 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/ja/messages.mo and b/gui/baculum/protected/Web/Lang/ja/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/ja/messages.po b/gui/baculum/protected/Web/Lang/ja/messages.po
index 5f3f74b06d124c39ccf0c8d79fd248e09b92314c..fa7a6323f58ffeeed46800e13cbbf8078f6bb9a1 100644 (file)
--- a/gui/baculum/protected/Web/Lang/ja/messages.po
+++ b/gui/baculum/protected/Web/Lang/ja/messages.po
@@ -191,9 +191,6 @@ msgstr "バックアップ"
 msgid "Backup data from client:"
 msgstr "リストア対象クライアント:"
 
-msgid "Backup for restore:"
-msgstr "リストア一覧:"
-
 msgid "Backup from client:"
 msgstr "リストア対象クライアント:"
 
@@ -534,8 +531,11 @@ msgstr "File retention value must be positive integer or zero."
 msgid "FileSet details"
 msgstr "FileSet details"
 
-msgid "FileSet for restore:"
-msgstr "FileSet for restore:"
+msgid "Backup to restore:"
+msgstr "Backup to restore:"
+
+msgid "FileSet to restore:"
+msgstr "FileSet to restore:"
 
 msgid "FileSet list"
 msgstr "FileSet list"
@@ -1036,8 +1036,8 @@ msgstr "OAuth2 scopes (space separated):"
 msgid "OK"
 msgstr "OK"
 
-msgid "Only selected backup"
-msgstr "手動でリストア対象を選択"
+msgid "Selected backup"
+msgstr "Selected backup"
 
 msgid "Operation is in progress"
 msgstr "Operation is in progress"
@@ -1513,17 +1513,17 @@ msgid "The most often used:"
 msgstr "The most often used:"
 
 msgid ""
-"There are two ways to select backup to restore. Only selected backup way "
-"provides list of jobs from which there is possible to select one job. If you "
+"There are two ways to select backup to restore. The selected backup way "
+"provides list of jobs from which there is possible to select a job. If you "
 "need the latest backups from the Client alternatively you can use Group most "
 "recent backups way which will select backups for you basing on backup job "
 "name and fileset resource."
 msgstr ""
-"リストア方法は2種類あります。"
-"手動でリアストア対象を選択するか、自動的に最近ファイルからリストアするか選択できます"
-""
-""
-""
+"There are two ways to select backup to restore. The selected backup way "
+"provides list of jobs from which there is possible to select a job. If you "
+"need the latest backups from the Client alternatively you can use Group most "
+"recent backups way which will select backups for you basing on backup job "
+"name and fileset resource."
 
 msgid ""
 "There is no backup for restore. Please go to previous step and select "
@@ -2601,3 +2601,6 @@ msgstr "Tip: checking 'All' message type causes, that rest checked message types
 
 msgid "Enable restore from copy jobs feature:"
 msgstr "Enable restore from copy jobs feature:"
+
+msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.mo b/gui/baculum/protected/Web/Lang/pl/messages.mo
index f246ab3ed313b68f079f47c029531c939f431d31..ac535cddb992eb99a4577cfd5526892f3067e717 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pl/messages.mo and b/gui/baculum/protected/Web/Lang/pl/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pl/messages.po b/gui/baculum/protected/Web/Lang/pl/messages.po
index 238f90ebf39f9939f193e9d0263c3a729b41663e..14744bc9f7652002c429ef57de2d0dd35dd77bf1 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pl/messages.po
+++ b/gui/baculum/protected/Web/Lang/pl/messages.po
@@ -320,6 +320,9 @@ msgstr "Przerwij"
 msgid "select pool"
 msgstr "wybierz pulę"
 
+msgid "Backup to restore:"
+msgstr "Kopia zapasowa do przywrócenia:"
+
 msgid "Step 1 - select source backup client"
 msgstr "Krok 1 - wybierz źródłowego klienta backupu"
 
@@ -335,15 +338,12 @@ msgstr "Nie ma żadnych backupów do przywrócenia. Proszę przejść do poprzed
 msgid "Backup selection method:"
 msgstr "Metoda wyboru backupu:"
 
-msgid "Only selected backup"
-msgstr "Tylko wybrany backup"
+msgid "Selected backup"
+msgstr "Wybrany backup"
 
 msgid "Group most recent backups"
 msgstr "Grupa najaktualniejszych backupów"
 
-msgid "Backup for restore:"
-msgstr "Backup do przywrócenia:"
-
 msgid "FileSet resource:"
 msgstr "Zasób FileSet:"
 
@@ -440,8 +440,8 @@ msgstr "Przywróć do lokalizacji:"
 msgid "Restore job options"
 msgstr "Opcje zadania przywracania"
 
-msgid "FileSet for restore:"
-msgstr "FIleSet dla przywracania"
+msgid "FileSet to restore:"
+msgstr "FileSet do przywrócenia"
 
 msgid "Director:"
 msgstr "Zarządca:"
@@ -1419,8 +1419,8 @@ msgstr "Ten konfigurator umożliwia wykonanie w łatwy sposób przywracania plik
 msgid "To start, please select backup Client which data you want to restore."
 msgstr "Aby zacząć, proszę wybrać Klienta kopii zapasowych, którego dane chcesz przywrócić."
 
-msgid "There are two ways to select backup to restore. Only selected backup way provides list of jobs from which there is possible to select one job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
-msgstr "Są dwa sposoby na wybranie kopii zapasowych do przywrócenia. Sposób 'Tylko wybrany backup' dostarcza listę zadań, z których możliwe jest wybranie jednej kopii zapasowej. Jeśli potrzebujesz przywrócić dane z najnowszych backupów alternatywnie możesz użyć opcję 'Grupa najaktualniejszych backupów', która będzie wybierać backupy za ciebie bazując na zadaniu kopii zapasowych i zasobie fileset."
+msgid "There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
+msgstr "Są dwa sposoby na wybranie kopii zapasowych do przywrócenia. Sposób 'Wybrany backup' dostarcza listę zadań, z których możliwe jest wybranie kopii zapasowej. Jeśli potrzebujesz przywrócić dane z najnowszych backupów alternatywnie możesz użyć opcję 'Grupa najaktualniejszych backupów', która będzie wybierać backupy za ciebie bazując na zadaniu kopii zapasowych i zasobie fileset."
 
 msgid "Do not relocate files"
 msgstr "Nie relokuj plików"
@@ -2522,3 +2522,6 @@ msgstr "Porada: zaznaczenie typu wiadomości 'All' powoduje, że reszta zaznaczo
 
 msgid "Enable restore from copy jobs feature:"
 msgstr "Włącz funkcję przywracania danych z kopii zadań:"
+
+msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+msgstr "Uwaga: jeśli wybierzesz kopię przyrostową lub różnicową, w następnym kroku będą również załadowane wszystkie pliki i katalogi ze starszych kopii wymaganych do przywrócenia zadania. Innymi słowy, wybrana kopia zapasowa określa punkt czasowy z którego będzie załadowana wybrana kopia i inne starsze kopie (przyrostowe, różnicowe) aż do najbliższej kopii pełnej."

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.mo b/gui/baculum/protected/Web/Lang/pt/messages.mo
index 5fed9cc460fcc8d3017698fa44ded6b3286bd1ea..9c413734b7919c4f927eabb9acd512376a202962 100644 (file)
Binary files a/gui/baculum/protected/Web/Lang/pt/messages.mo and b/gui/baculum/protected/Web/Lang/pt/messages.mo differ

diff --git a/gui/baculum/protected/Web/Lang/pt/messages.po b/gui/baculum/protected/Web/Lang/pt/messages.po
index 971c2c66050fa85212a86f04455872760f5bf58e..711282ab09402f7a98f716813f912f67e0edd8f3 100644 (file)
--- a/gui/baculum/protected/Web/Lang/pt/messages.po
+++ b/gui/baculum/protected/Web/Lang/pt/messages.po
@@ -429,7 +429,7 @@ msgstr "Backup a partir do cliente:"
 msgid "Restore to client:"
 msgstr "Restaurar para o cliente:"
 
-msgid "Backup for restore:"
+msgid "Backup to restore:"
 msgstr "Backup para restauração:"
 
 msgid "Step 1 - select source backup client"
@@ -447,8 +447,8 @@ msgstr "Etapa 2 - Selecione o backup que deseja restaurar"
 msgid "Backup selection method:"
 msgstr "Método de seleção de backup:"
 
-msgid "Only selected backup"
-msgstr "Apenas o backup selecionado"
+msgid "Selected backup"
+msgstr "Selected backup"
 
 msgid "FileSet resource:"
 msgstr "FileSet:"
@@ -516,7 +516,7 @@ msgstr "Parâmetros de origem"
 msgid "Backup data from client:"
 msgstr "Backup a partir do cliente:"
 
-msgid "FileSet for restore:"
+msgid "FileSet to restore:"
 msgstr "FileSet:"
 
 msgid "Files for restore"
@@ -1427,8 +1427,8 @@ msgstr "Este assistente permite que você execute de maneira fácil a restauraç
 msgid "To start, please select backup Client which data you want to restore."
 msgstr "Para começar, selecione o cliente que você deseja restaurar."
 
-msgid "There are two ways to select backup to restore. Only selected backup way provides list of jobs from which there is possible to select one job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
-msgstr "Existem duas maneiras de selecionar backups para restauração. Apenas o modo de backup selecionado fornece uma lista de jobs a partir da qual é possível selecionar um único job. Se você precisar dos backups mais recentes do Cliente, poderá usar o modo de backup mais recente do Grupo, que selecionará os backups para você com base no nome do job de backup e no recurso do fileset."
+msgid "There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
+msgstr "There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource."
 
 msgid "Do not relocate files"
 msgstr "Não realoque arquivos"
@@ -2530,3 +2530,6 @@ msgstr "Tip: checking 'All' message type causes, that rest checked message types
 
 msgid "Enable restore from copy jobs feature:"
 msgstr "Enable restore from copy jobs feature:"
+
+msgid "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."
+msgstr "Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup."

diff --git a/gui/baculum/protected/Web/Pages/RestoreWizard.page b/gui/baculum/protected/Web/Pages/RestoreWizard.page
index 2e750fdb1a7a4096a26a90a833f9cfb7bca8605f..cec294c86924fe7038947a7dfb9091cdb4237b89 100644 (file)
--- a/gui/baculum/protected/Web/Pages/RestoreWizard.page
+++ b/gui/baculum/protected/Web/Pages/RestoreWizard.page
@@ -139,7 +139,7 @@
                </com:TWizardStep>
                <com:TWizardStep ID="Step2" Title="<%[ Step 2 - select backup to restore ]%>" StepType="Auto">
                        <p>
-                               <%[ There are two ways to select backup to restore. Only selected backup way provides list of jobs from which there is possible to select one job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource. ]%>
+                               <%[ There are two ways to select backup to restore. The selected backup way provides list of jobs from which there is possible to select a job. If you need the latest backups from the Client alternatively you can use Group most recent backups way which will select backups for you basing on backup job name and fileset resource. ]%>
                        </p>
                        <div class="w3-container w3-padding-16">
                                <div class="w3-col w3-third"><com:TLabel Text="<%[ Backup selection method: ]%>" /></div>
@@ -151,7 +151,7 @@
                                                Checked="true"
                                                Attributes.onclick="$('#group_backup_to_restore_field').hide(); $('#backup_to_restore_field').show();"
                                        />
-                                       <com:TLabel ForControl="OnlySelectedBackupSelection" Text="<%[ Only selected backup ]%>" /> &nbsp;
+                                       <com:TLabel ForControl="OnlySelectedBackupSelection" Text="<%[ Selected backup ]%>" /> &nbsp;
                                        <com:TRadioButton
                                                ID="GroupBackupSelection"
                                                GroupName="BackupSelection"
@@ -162,7 +162,7 @@
                        </div>
                        <com:TLabel Text="<%[ There is no backup for restore. Please go to previous step and select another client for restore or proceed backups for the client selected in previous step. ]%>" CssClass="w3-text-red" Visible="<%=(count($this->getPage()->jobs_to_restore) === 0 && $this->GroupBackupToRestore->ItemCount == 0)%>"/>
                        <div id="backup_to_restore_field" style="display: <%=!$this->OnlySelectedBackupSelection->Checked ? 'none' : 'block'%>">
-                               <p><%[ Backup for restore: ]%></p>
+                               <p><strong><%[ Note: if you select incremental or differential backup, on the next step will be also loaded all directories and files from older backups required to do the job restore. In other words, the selected backup determines time point from which will be loaded the selected backup and other older backups (incremental, differential) backups up till closest full backup. ]%></strong></p>
                                <table id="job_to_restore_list" style="width: 100%">
                                        <thead>
                                                <tr>
@@ -364,7 +364,7 @@ oJobsToRestoreList.init();
                        </div>
                        <div id="group_backup_to_restore_field" style="display: <%=!$this->GroupBackupSelection->Checked ? 'none' : 'block'%>">
                                <div class="w3-section w3-row">
-                                       <div class="w3-col w3-third"><com:TLabel ForControl="GroupBackupToRestore" Text="<%[ Backup for restore: ]%>" /></div>
+                                       <div class="w3-col w3-third"><com:TLabel ForControl="GroupBackupToRestore" Text="<%[ Backup to restore: ]%>" /></div>
                                        <div class="w3-col w3-third">
                                                <com:TDropDownList
                                                        ID="GroupBackupToRestore"
@@ -765,19 +765,17 @@ oJobsToRestoreList.init();
                                <div class="w3-section w3-row">
                                        <div class="w3-col w3-third"><%[ Backup selection method: ]%></div>
                                        <div class="w3-col w3-third bold">
-                                               <com:TLabel Text="<%[ Only selected backup ]%>" Visible="<%=$this->OnlySelectedBackupSelection->Checked%>" />
+                                               <com:TLabel Text="<%[ Selected backup ]%>" Visible="<%=$this->OnlySelectedBackupSelection->Checked%>" />
                                                <com:TLabel Text="<%[ Group most recent backups ]%>" Visible="<%=$this->GroupBackupSelection->Checked%>" />
                                        </div>
                                </div>
-                               <div class="w3-section w3-row">
-                                       <div class="w3-col w3-third"><%[ Backup for restore: ]%></div>
-                                       <div class="w3-col w3-third bold">
-                                               <com:TLabel Text="<%=$this->GroupBackupToRestore->SelectedValue%>" Visible="<%=$this->GroupBackupSelection->Checked%>" />
-                                       </div>
-                               </div>
                                <com:TPanel Visible="<%=$this->GroupBackupSelection->Checked%>">
                                        <div class="w3-section w3-row">
-                                               <div class="w3-col w3-third"><%[ FileSet for restore: ]%></div>
+                                               <div class="w3-col w3-third"><%[ Backup to restore: ]%></div>
+                                               <div class="w3-col w3-third bold"><%=$this->GroupBackupToRestore->SelectedValue%></div>
+                                       </div>
+                                       <div class="w3-section w3-row">
+                                               <div class="w3-col w3-third"><%[ FileSet to restore: ]%></div>
                                                <div class="w3-col w3-third bold"><%=$this->GroupBackupFileSet->SelectedItem->Text%></div>
                                        </div>
                                </com:TPanel>