diff --git a/qubesmanager/block.py b/qubesmanager/block.py
index ed4ff0a..779193a 100644
--- a/qubesmanager/block.py
+++ b/qubesmanager/block.py
@@ -153,8 +153,8 @@ class QubesBlockDevicesManager():
serves_for.append((self.attached_devs[d]['dev'], self.attached_devs[d]['attached_to']['vm']))
if len(serves_for) > 0:
- msg = "VM " + vm.name + " attaches block devices to other VMs: "
+ msg = "Qube " + vm.name + " attaches block devices to other qubes: "
msg += ', '.join([""+v.name+"("+d+")" for (d,v) in serves_for ])
- msg += ".
Shutting the VM down will dettach the devices from them."
+ msg += ".
Shutting the qube down will dettach the devices from them."
QMessageBox.warning (None, "Warning!", msg)
diff --git a/qubesmanager/create_new_vm.py b/qubesmanager/create_new_vm.py
index d31c5db..f33e8fe 100644
--- a/qubesmanager/create_new_vm.py
+++ b/qubesmanager/create_new_vm.py
@@ -83,8 +83,8 @@ class NewVmDlg(QtGui.QDialog, Ui_NewVMDlg):
# Order of types is important and used elsewhere; if it's changed
# check for changes needed in self.type_change and TODO
type_list = [self.tr("AppVM"),
- self.tr("Standalone VM based on a template"),
- self.tr("Standalone VM not based on a template")]
+ self.tr("Standalone qube based on a template"),
+ self.tr("Standalone qube not based on a template")]
self.vm_type.addItems(type_list)
self.vm_type.currentIndexChanged.connect(self.type_change)
diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py
index 30eed29..838fa3f 100755
--- a/qubesmanager/settings.py
+++ b/qubesmanager/settings.py
@@ -250,11 +250,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
QtGui.QMessageBox.warning(
None,
self.tr("Qube configuration problem!"),
- self.tr("The '{vm}' AppVM is network connected to "
+ self.tr("The '{vm}' qube is network connected to "
"'{netvm}', which does not support firewall!
"
- "You may edit the '{vm}' VM firewall rules, but these "
- "will not take any effect until you connect it to "
- "a working Firewall VM.").format(
+ "You may edit the '{vm}' qube firewall rules, but "
+ "these will not take any effect until you connect it "
+ "to a working Firewall qube.").format(
vm=self.vm.name, netvm=netvm.name))
def current_tab_changed(self, idx):
@@ -287,7 +287,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
if self.vm.is_running():
self.delete_vm_button.setText(
- self.tr('Delete VM (cannot delete a running VM)'))
+ self.tr('Delete qube (cannot delete a running qube)'))
if self.vm.qid == 0:
self.vmlabel.setVisible(False)
@@ -482,7 +482,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
new_vm_name, ok = QtGui.QInputDialog.getText(
self,
- self.tr('Rename VM'),
+ self.tr('Rename qube'),
self.tr('New name: (WARNING: all other changes will be discarded)'))
if ok:
@@ -504,11 +504,11 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
answer, ok = QtGui.QInputDialog.getText(
self,
- self.tr('Delete VM'),
- self.tr('Are you absolutely sure you want to delete this VM? '
- '
All VM settings and data will be irrevocably'
+ self.tr('Delete qube'),
+ self.tr('Are you absolutely sure you want to delete this qube? '
+ '
All qube settings and data will be irrevocably'
' deleted.
If you are sure, please enter this '
- 'VM\'s name below.'))
+ 'qube\'s name below.'))
if ok and answer == self.vm.name:
self._run_in_thread(self._remove_vm)
@@ -518,7 +518,7 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
QtGui.QMessageBox.warning(
None,
self.tr("Removal cancelled"),
- self.tr("The VM will not be removed."))
+ self.tr("The qube will not be removed."))
def _clone_vm(self, t_monitor, name):
try:
@@ -535,15 +535,15 @@ class VMSettingsWindow(ui_settingsdlg.Ui_SettingsDialog, QtGui.QDialog):
cloned_vm_name, ok = QtGui.QInputDialog.getText(
self,
- self.tr('Clone VM'),
- self.tr('Name for the cloned VM:'))
+ self.tr('Clone qube'),
+ self.tr('Name for the cloned qube:'))
if ok:
self._run_in_thread(self._clone_vm, cloned_vm_name)
QtGui.QMessageBox.warning(
None,
self.tr("Success"),
- self.tr("The VM was cloned successfully."))
+ self.tr("The qube was cloned successfully."))
######### advanced tab
@@ -1120,7 +1120,7 @@ def main(args=None):
qapp = QtGui.QApplication(sys.argv)
qapp.setOrganizationName('Invisible Things Lab')
qapp.setOrganizationDomain("https://www.qubes-os.org/")
- qapp.setApplicationName("Qubes VM Settings")
+ qapp.setApplicationName("Qube Settings")
if not utils.is_debug():
sys.excepthook = handle_exception
diff --git a/qubesmanager/table_widgets.py b/qubesmanager/table_widgets.py
index c49d05f..9c4ae02 100644
--- a/qubesmanager/table_widgets.py
+++ b/qubesmanager/table_widgets.py
@@ -404,17 +404,17 @@ class VmUpdateInfoWidget(QtGui.QWidget):
icon_path = ":/update-recommended.png"
tooltip_text = self.tr("Updates pending!")
elif state == "outdated":
- label_text = "VM outdated"
+ label_text = "Qube outdated"
icon_path = ":/outdated.png"
tooltip_text = self.tr(
- "The VM must be restarted for its filesystem to reflect the "
+ "The qube must be restarted for its filesystem to reflect the "
"template's recent committed changes.")
elif state == "to-be-outdated":
- label_text = "TemplateVM running"
+ label_text = "Template running"
icon_path = ":/to-be-outdated.png"
tooltip_text = self.tr(
- "The TemplateVM must be stopped before changes from its "
- "current session can be picked up by this VM.")
+ "The Template must be stopped before changes from its "
+ "current session can be picked up by this qube.")
else:
label_text = ""
icon_path = None
diff --git a/ui/backupdlg.ui b/ui/backupdlg.ui
index 5330fb3..1fb0943 100644
--- a/ui/backupdlg.ui
+++ b/ui/backupdlg.ui
@@ -11,7 +11,7 @@
- Qubes Backup VMs
+ Qubes OS - Backup qubes
@@ -26,7 +26,7 @@
-
- Select VMs to backup:
+ Select qubes to backup:
@@ -173,14 +173,14 @@
-
- Target AppVM:
+ Target qube:
-
- Backup directory or VM command:
+ Backup directory or command:
true
@@ -286,7 +286,7 @@
- NOTE: Only running VMs are listed.
+ NOTE: Only running qubes are listed.
@@ -316,7 +316,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html>
diff --git a/ui/globalsettingsdlg.ui b/ui/globalsettingsdlg.ui
index de826a6..de66b0e 100644
--- a/ui/globalsettingsdlg.ui
+++ b/ui/globalsettingsdlg.ui
@@ -115,7 +115,7 @@
true
- Minimal VM's memory:
+ Minimal qube memory:
@@ -211,7 +211,7 @@
Unknown current state
- Check for VM updates
+ Check for qube updates
diff --git a/ui/newappvmdlg.ui b/ui/newappvmdlg.ui
index 8bd4d0f..eb8e47b 100644
--- a/ui/newappvmdlg.ui
+++ b/ui/newappvmdlg.ui
@@ -121,7 +121,7 @@
-
- my-new-vm
+ my-new-qube
diff --git a/ui/qubemanager.ui b/ui/qubemanager.ui
index dbe2789..bcdb882 100644
--- a/ui/qubemanager.ui
+++ b/ui/qubemanager.ui
@@ -182,7 +182,7 @@
Name
- VM name
+ Qube name
@@ -198,7 +198,7 @@
Template
- VM's template
+ Qube template
@@ -206,7 +206,7 @@
NetVM
- VM's netVM
+ Qube netVM
@@ -244,7 +244,7 @@
0
0
769
- 28
+ 23
diff --git a/ui/restoredlg.ui b/ui/restoredlg.ui
index 284b867..2e4c30a 100644
--- a/ui/restoredlg.ui
+++ b/ui/restoredlg.ui
@@ -11,7 +11,7 @@
- Qubes Restore VMs
+ Qubes OS - Restore qubes
@@ -129,7 +129,7 @@
-
- AppVM:
+ Qube:
@@ -183,7 +183,7 @@
-
- VMs to restore
+ Qubes to restore
@@ -214,7 +214,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;">
+</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;">
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"><br /></p></body></html>
diff --git a/ui/settingsdlg.ui b/ui/settingsdlg.ui
index 9f0d40f..44515e8 100644
--- a/ui/settingsdlg.ui
+++ b/ui/settingsdlg.ui
@@ -6,7 +6,7 @@
0
0
- 813
+ 904
573
@@ -258,7 +258,7 @@
-
- <html><head/><body><p><span style=" color:#ff0000;">* </span><span style=" color:#000000;">Cannot be changed while the VM is running</span></p></body></html>
+ <html><head/><body><p><span style=" color:#ff0000;">* </span><span style=" color:#000000;">Cannot be changed while the qube is running</span></p></body></html>
@@ -357,7 +357,7 @@
-
- Start VM automatically on boot
+ Start qube automatically on boot
@@ -382,14 +382,14 @@ border-style: solid;
border-width: 1px;
- Delete VM
+ Delete qube
-
- Clone VM
+ Clone qube
@@ -1196,7 +1196,7 @@ border-width: 1px;
- To modify PCI devices you have to turn off the VM.
+ To modify PCI devices you have to turn off the qube.
@@ -1210,7 +1210,7 @@ border-width: 1px;
- Currently PVH VMs 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