diff --git a/ui/about.ui b/ui/about.ui index 76bf0c98..96618f18 100644 --- a/ui/about.ui +++ b/ui/about.ui @@ -84,7 +84,7 @@ - Version Information + Version information diff --git a/ui/backupdlg.ui b/ui/backupdlg.ui index f66e0ac8..efaa9ec3 100644 --- a/ui/backupdlg.ui +++ b/ui/backupdlg.ui @@ -11,7 +11,7 @@ - Qubes OS - Backup qubes + Qubes Backup @@ -26,7 +26,7 @@ - Select qubes to backup: + Select qubes to back up: @@ -83,7 +83,7 @@ - Compress the backup + Compress backup true @@ -137,7 +137,7 @@ - Warning: unrecognized data found in configuration files. + Warning: Unrecognized data found in configuration files. @@ -238,7 +238,7 @@ - <html><head/><body><p>WARNING: password will be saved in dom0 in plain text.<br/>The file is located in dom0 in /etc/qubes/backup/qubes-manager-backup .</p></body></html> + <html><head/><body><p>WARNING: Passphrase will be saved in dom0 in plain text.<br/>File location: /etc/qubes/backup/qubes-manager-backup</p></body></html> @@ -260,14 +260,14 @@ - <html><head/><body><p>Reenter passphrase:</p></body></html> + <html><head/><body><p>Confirm passphrase:</p></body></html> - <html><head/><body><p>Encryption / Verification<br/>passphrase:</p></body></html> + <html><head/><body><p>Encryption passphrase:</p></body></html> @@ -307,7 +307,7 @@ - NOTE: Only running qubes are listed. + Note: Only running qubes are listed. diff --git a/ui/clonevmdlg.ui b/ui/clonevmdlg.ui index f72c5861..6a9d64b3 100644 --- a/ui/clonevmdlg.ui +++ b/ui/clonevmdlg.ui @@ -131,7 +131,7 @@ - <html><head/><body><p><span style=" font-weight:600;">Caution</span>: changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Caution</span>: Changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.</p></body></html> true diff --git a/ui/devicelist.ui b/ui/devicelist.ui index 65ba7c9c..552fc6f9 100644 --- a/ui/devicelist.ui +++ b/ui/devicelist.ui @@ -17,7 +17,7 @@ - Which PCI devices should use the no strict reset option? + Which PCI devices should use the "no strict reset" option? @@ -36,7 +36,7 @@ - Note: use this option only if "unable to reset PCI device" error occurs. + Note: Use this option only if an "unable to reset PCI device" error occurs. true diff --git a/ui/globalsettingsdlg.ui b/ui/globalsettingsdlg.ui index ad29cf6e..1ca232fb 100644 --- a/ui/globalsettingsdlg.ui +++ b/ui/globalsettingsdlg.ui @@ -347,7 +347,7 @@ - DisposableVM Template + disposable template @@ -360,7 +360,7 @@ - NetVM + net qube @@ -416,7 +416,7 @@ - ClockVM + Clock qube @@ -429,7 +429,7 @@ - dom0 Updates Proxy + Dom0 update qube @@ -668,12 +668,12 @@ - ITL template updates + Official template updates - ITL template updates (testing) + Official template updates (testing) @@ -739,7 +739,7 @@ - Minimal qube memory: + Minimum qube memory: @@ -771,7 +771,7 @@ true - Additional memory allocated to dom0 by Qubes Memory Balancer. + Additional memory allocated to dom0 by Qubes Memory Balancer MiB diff --git a/ui/logdlg.ui b/ui/logdlg.ui index b1e69cd0..20375129 100644 --- a/ui/logdlg.ui +++ b/ui/logdlg.ui @@ -25,7 +25,7 @@ - Copy Dom0 clipboard to Qubes clipboard + Copy dom0 clipboard to global clipboard. @@ -56,7 +56,7 @@ Qt::TabFocus - Copy to Qubes clipboard + Copy to global clipboard diff --git a/ui/newappvmdlg.ui b/ui/newappvmdlg.ui index a5db4f28..fc2c8b6f 100644 --- a/ui/newappvmdlg.ui +++ b/ui/newappvmdlg.ui @@ -106,7 +106,7 @@ - launch settings after creation + Launch settings after creation @@ -180,7 +180,7 @@ - <html><head/><body><p><span style=" font-weight:600;">Caution</span>: changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Caution</span>: Changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.</p></body></html> true @@ -214,14 +214,14 @@ false - install system from device (also available from settings) + Install system from device (also available from settings) - provides network to other qubes + Provides network access to other qubes diff --git a/ui/newfwruledlg.ui b/ui/newfwruledlg.ui index 63c359db..2ff69bb1 100644 --- a/ui/newfwruledlg.ui +++ b/ui/newfwruledlg.ui @@ -99,7 +99,7 @@ - <html><head/><body><p>Port/service can be provided as either port number (e.g. 122), port range (1024-1234) or service name (e.g. smtp) . For full list of services known, see /etc/services in dom0.</p></body></html> + <html><head/><body><p>Port/service can be provided as a port number (e.g. 122), port range (1024-1234), or service name (e.g. smtp). For a full list of known services, see /etc/services in dom0.</p></body></html> true diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui index 26cd3419..16b288a0 100644 --- a/ui/qubemanager.ui +++ b/ui/qubemanager.ui @@ -146,7 +146,7 @@ Name - Qube name + The name of each qube @@ -154,7 +154,7 @@ State - Update info + The running state and update status of each qube @@ -162,15 +162,15 @@ Template - Qube template + The template on which each qube is based - NetVM + Net qube - Qube netVM + The qube that provides network access to each qube @@ -178,43 +178,67 @@ Disk usage + + The amount of disk space used by each qube + Internal + + Whether each qube is internal to the operation of the system and not intended for normal use by end users + IP + + The internal IP address assigned to each qube + Include in backups + + Whether each qube is included in backups by default + Last backup + + Timestamp indicating the last time at which each qube was backed up + - Default DisposableVM -Template + Default disposable +template + + + The disposable template used by default when launching disposables from each qube - DisposableVM -Template + Disposable +template + + + Whether each qube is itself a disposable template - Virtualization Mode + Virtualization mode + + + The hypervisor mode used when running each qube as a virtual machine @@ -473,7 +497,7 @@ Template &Delete qube - Remove an existing qube (must be stopped first) + Remove an existing qube (must be shut down first) @@ -503,7 +527,7 @@ Template Emergency &pause - <p>Pause selected qube</p><p>Stops all CPU activity in the selected VM until the VM is unpaused. This action does not change how much memory is allocated to the VM. (EXPERIMENTAL)</p> + <p>Pause selected qube</p><p>Stops all CPU activity in the selected qube until the qube is unpaused. This action does not change how much memory is allocated to the qube. (EXPERIMENTAL)</p> @@ -518,7 +542,7 @@ Template &Shutdown - Shutdown selected qube + Shut down selected qube @@ -563,7 +587,7 @@ Template &Update - Update qube system + Update qube @@ -590,7 +614,7 @@ Template Show graphs - Show Graphs + Show graphs @@ -622,7 +646,7 @@ Template true - &NetVM + &Net qube @@ -634,7 +658,7 @@ Template S&ettings - Qube Settings + Qube settings @@ -658,7 +682,7 @@ Template &Backup - Backup qubes + Back up qubes @@ -676,7 +700,7 @@ Template :/networking.png:/networking.png - &Qubes Network + &Qubes network false @@ -728,7 +752,7 @@ Template T&ype - Qube Type + Qube type @@ -848,10 +872,10 @@ Template :/resumevm.png:/resumevm.png - Start qube for Window Tools installation + Start qube for Qubes Windows Tools installation - Start qube for Window Tools installation + Start qube for Qubes Windows Tools installation @@ -916,10 +940,10 @@ Template true - Default DisposableVM Template + Default disposable template - <html><head/><body><p>Default DisposableVM Template<br/><br/>Which qube should be used by default as a template for DisposableVMs started from this one? DisposableVMs will inherit their template's configuration and installed programs.</p></body></html> + <html><head/><body><p>Default disposable template<br/><br/>Which qube should be used by default as a template for disposables started from this one? Disposables will inherit their template's configuration and installed programs.</p></body></html> @@ -933,7 +957,7 @@ Template DisposableVM Template - <html><head/><body><p>DisposableVM Template</p><p><br/></p><p>Allows using this qube as a template for DisposableVMs. The DisposableVMs will inherit the VM's state (configuration, installed programs etc.), but their state will not persist between restarts. </p></body></html> + <html><head/><body><p>Disposable template</p><p><br/></p><p>Allows using this qube as a template for disposables. Disposables will inherit the qube's state (configuration, installed programs, etc.), but their state will not persist between restarts. </p></body></html> @@ -944,7 +968,7 @@ Template true - Virtualization Mode + Virtualization mode @@ -957,7 +981,7 @@ Template Open console in qube - Open a secure Xen console in the qube. Useful chiefly for debugging purposes: for normal operation, use "Run Terminal" from the Domains widget. + Open a secure Xen console in the qube. Useful chiefly for debugging purposes. For normal operation, use "Run Terminal" from Qubes Domains. @@ -974,7 +998,7 @@ Template true - Compact View + Compact view diff --git a/ui/qvmtemplate.ui b/ui/qvmtemplate.ui index 0901e4af..79554482 100644 --- a/ui/qvmtemplate.ui +++ b/ui/qvmtemplate.ui @@ -28,7 +28,7 @@ - Select actions to perform in "Status" column: + Select actions to perform in the "Status" column: @@ -57,7 +57,7 @@ true - Use "Status" column to select actions to execute on a given template; when desired actions are selected, use "Apply" to perform them. + Use the "Status" column to select actions to execute on a given template. Once the desired actions are selected, use "Apply" to perform them. diff --git a/ui/restoredlg.ui b/ui/restoredlg.ui index 5b76c856..27725409 100644 --- a/ui/restoredlg.ui +++ b/ui/restoredlg.ui @@ -11,7 +11,7 @@ - Qubes OS - Restore qubes + Qubes Backup Restore @@ -49,27 +49,27 @@ - Ignore missing templates or netvms, restore VMs anyway. + Ignore missing templates and net qubes; restore qubes anyway. - Ignore missing templates and net VMs + Ignore missing templates and net qubes. - Ignore dom0 username mismatch while restoring homedir. + Ignore dom0 username mismatch when restoring home directory. - Ignore username mismatch + Ignore dom0 username mismatch. - Verify backup integrity, do not restore the data + Test restore to verify backup integrity (no data actually restored). @@ -113,7 +113,7 @@ - <html><head/><body><p>Backup file:<br><span style=" font-size:8pt;">(for old backup format select qubes.xml file)</span></p></body></html> + <html><head/><body><p>Backup file:<br><span style=" font-size:8pt;">(For legacy backup formats, select the qubes.xml file.)</span></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop @@ -169,7 +169,7 @@ - <html><head/><body><p>Decryption / Verification<br/>passphrase:</p></body></html> + <html><head/><body><p>Decryption passphrase:</p></body></html> @@ -272,7 +272,7 @@ p, li { white-space: pre-wrap; } - When finished, open file selection dialog to allow me to unmount the disk + When finished, open file selection dialog to allow me to unmount the disk. diff --git a/ui/settingsdlg.ui b/ui/settingsdlg.ui index ed77fa16..aa4ee41d 100644 --- a/ui/settingsdlg.ui +++ b/ui/settingsdlg.ui @@ -134,7 +134,7 @@ true - System storage max. size: + System storage max size: @@ -166,7 +166,7 @@ - Private storage max. size: + Private storage max size: max_priv_storage @@ -192,7 +192,7 @@ - Networking + Net qube @@ -371,7 +371,7 @@ border-width: 1px; - <html><head/><body><p><span style=" font-weight:600;">Caution:</span> The Default DisposableVM Template (see the Advanced tab) has a different Networking setting than this qube. This configuration may result in unexpected network access. For example, you may have set this qube's Networking to &quot;none&quot; in order to prevent any data from being transmitted out. However, if the Default DisposableVM Template's Networking is set to &quot;sys-firewall,&quot; then a DisposableVM started from this qube may be able to transmit data out, contrary to your intention. You may wish to set the Default DisposableVM Template for this qube to one with equally restrictive Networking settings.</p></body></html> + <html><head/><body><p><span style=" font-weight:600;">Caution:</span> The default disposable template (see the Advanced tab) has a different net qube setting than this qube. This configuration may result in unexpected network access. For example, you may have set this qube's net qube to &quot;none&quot; in order to prevent any data from being transmitted out. However, if the default disposable template's net qube is set to &quot;sys-firewall,&quot; then a disposable started from this qube may be able to transmit data out, contrary to your intention. You may wish to set the default disposable template for this qube to one with equally restrictive networking settings.</p></body></html> @@ -401,7 +401,7 @@ border-width: 1px; - <html><head/><body><p>&quot;default ([name])&quot; denotes system-wide default - if the default is changed in Global Settings, the networking qube will change. <br/>If you want to keep using a given networking qube regardless of system settings, select &quot;[name]&quot;.</p></body></html> + <html><head/><body><p>&quot;default ([name])&quot; denotes the system-wide default. If the default is changed in Global Settings, the net qube will change. <br/>If you want to keep using a given net qube regardless of system settings, select &quot;[name]&quot;.</p></body></html> @@ -425,7 +425,7 @@ border-width: 1px; - Networking: + Net qube: netVM @@ -481,7 +481,7 @@ border-width: 1px; - VCPUs no.: + VCPUs: vcpus @@ -752,17 +752,17 @@ border-width: 1px; - <html><head/><body><p>Allows using this qube as a template for DisposableVMs. The DisposableVMs will inherit the VM's state (configuration, installed programs etc.), but their state will not persist between restarts. </p><p>Setting this option will cause this qube to be listed as an option in the &quot;Default DisposableVM Template&quot; dropdown for all other qubes. </p></body></html> + <html><head/><body><p>Allows using this qube as a template for disposables. Disposables will inherit the qube's state (configuration, installed programs, etc.), but their state will not persist between restarts. </p><p>Setting this option will cause this qube to be listed as an option in the &quot;Default disposable template&quot; list for all other qubes. </p></body></html> - Disposable VM Template + Disposable template - Boot qube from CDROM + Boot qube from CD-ROM @@ -772,7 +772,7 @@ border-width: 1px; Windows (with Qubes Windows Tools installed) only. -The qube must be running to enable seamless mode; this setting is not persistent. +The qube must be running to enable seamless mode. This setting is not persistent. Enable seamless mode @@ -783,7 +783,7 @@ The qube must be running to enable seamless mode; this setting is not persisten Windows (with Qubes Windows Tools installed) only. -The qube must be running to disable seamless mode; this setting is not persistent. +The qube must be running to disable seamless mode. This setting is not persistent. Disable seamless mode @@ -797,10 +797,10 @@ The qube must be running to disable seamless mode; this setting is not persisten - <html><head/><body><p>Which qube should be used by default as a template for DisposableVMs started from this one? DisposableVMs will inherit their template's configuration and installed programs.<br/>For a qube to to appear in this list, it must have the &quot;DisposableVM Template&quot; checkbox enabled. </p></body></html> + <html><head/><body><p>Which qube should be used by default as a template for disposables started from this one? Disposables will inherit their template's configuration and installed programs.<br/>For a qube to to appear in this list, it must have the &quot;Disposable template&quot; setting enabled. </p></body></html> - Default DisposableVM Template + Default disposable template default_dispvm @@ -816,7 +816,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - <html><head/><body><p>Which qube should be used by default as a template for DisposableVMs started from this one? DisposableVMs will inherit their template's configuration and installed programs.<br/>For a qube to to appear in this list, it must have the &quot;DisposableVM Template&quot; checkbox enabled. </p></body></html> + <html><head/><body><p>Which qube should be used by default as a template for disposables started from this one? Disposables will inherit their template's configuration and installed programs.<br/>For a qube to to appear in this list, it must have the &quot;Disposable template&quot; setting enabled. </p></body></html> @@ -864,7 +864,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Window Options + Window options @@ -1107,7 +1107,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - PVH mode is recommended if possible (Linux kernel 4.11 or newer, no PCI passthrough). For Windows qubes always use HVM. + PVH mode is recommended, if possible (Linux kernel 4.11 or newer, no PCI passthrough). For Windows qubes, always use HVM. true @@ -1194,7 +1194,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - NOTE: To block all network access, set Networking to (none) on the Basic settings tab. This tab provides a very simplified firewall configuration. All DNS requests and ICMP (pings) will be allowed. For more granular control, use the command line tool qvm-firewall. + NOTE: To block all network access, set the net qube to '(none)' on the Basic settings tab. This tab provides a very simplified firewall configuration. All DNS requests and ICMP (pings) will be allowed. For more granular control, use the command line tool 'qvm-firewall'. Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter @@ -1251,7 +1251,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - This qube has no networking - it will not have any network access anyway. + This qube has no net qube. It will not have any network access anyway. true @@ -1268,7 +1268,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - List of allowed (whitelisted) addresses: + List of allowed addresses: @@ -1319,7 +1319,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Networking qube does not support 'qubes-firewall' - firewall restrictions will not be applied. + Net qube does not support 'qubes-firewall'. Firewall restrictions will not be applied. @@ -1370,7 +1370,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Firewall has been modified manually - please use qvm-firewall for any further configuration. + Firewall has been modified manually. Please use the 'qvm-firewall' command in dom0 for any further configuration. @@ -1492,7 +1492,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Allow all outgoing Internet connections + Allow all outgoing connections @@ -1502,7 +1502,7 @@ The qube must be running to disable seamless mode; this setting is not persisten Changing firewall settings does NOT affect existing connections. - Limit outgoing Internet connections to ... + Limit outgoing connections to ... @@ -1555,7 +1555,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - This qube has direct network access and Qubes Firewall settings will not be used. Configure other qubes' network access in their network settings or in a dedicated firewall qube. + This qube has direct network access. Therefore, Qubes firewall settings cannot be used. Configure other qubes' network access in their network settings or in a dedicated firewall qube. true @@ -1591,7 +1591,7 @@ The qube must be running to disable seamless mode; this setting is not persisten color: rgb(255, 0, 0) - You've enabled dynamic memory balancing, some devices might not work! + You've enabled dynamic memory balancing. Some devices might not work! @@ -1605,7 +1605,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - To modify PCI devices you have to turn off the qube. + To modify PCI devices, you must first shut down the qube. @@ -1619,7 +1619,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Currently PVH qubes don't support PCI passthrough. Select another virtualization mode if you want to add PCI devices + Currently, PVH qubes don't support PCI passthrough. Select another virtualization mode if you want to add PCI devices. @@ -1652,7 +1652,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Refresh Applications + Refresh applications @@ -1682,7 +1682,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Checked services will be turned on. + Selected services will be turned on. @@ -1696,7 +1696,7 @@ The qube must be running to disable seamless mode; this setting is not persisten - Unchecked services will be turned off. + Unselected services will be turned off. diff --git a/ui/templateinstallconfirmdlg.ui b/ui/templateinstallconfirmdlg.ui index 84e054b6..b8185eb8 100644 --- a/ui/templateinstallconfirmdlg.ui +++ b/ui/templateinstallconfirmdlg.ui @@ -11,7 +11,7 @@ - Template Install Confirmation + Template installation confirmation diff --git a/ui/templatemanager.ui b/ui/templatemanager.ui index c1004461..881bd21f 100644 --- a/ui/templatemanager.ui +++ b/ui/templatemanager.ui @@ -102,7 +102,7 @@ - Clear Selection + Clear selection