Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/pr/299'
Browse files Browse the repository at this point in the history 
* origin/pr/299:
  Improve language
  • Loading branch information
@marmarek
marmarek committed Oct 14, 2021
2 parents b8d42f6 + cf2699a commit 0535c9d
Show file tree
Hide file tree
Showing 14 changed files with 123 additions and 99 deletions.
2 changes: 1 addition & 1 deletion ui/about.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<item>
<widget class="QPushButton" name="informationNotes">
<property name="text">
<string>Version Information</string>
<string>Version information</string>
</property>
</widget>
</item>
Expand Down
16 changes: 8 additions & 8 deletions ui/backupdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>Qubes OS - Backup qubes</string>
<string>Qubes Backup</string>
</property>
<property name="locale">
<locale language="English" country="UnitedStates"/>
Expand All @@ -26,7 +26,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>Select qubes to backup:</string>
<string>Select qubes to back up:</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -83,7 +83,7 @@
<item>
<widget class="QCheckBox" name="compress_checkbox">
<property name="text">
<string>Compress the backup</string>
<string>Compress backup</string>
</property>
<property name="checked">
<bool>true</bool>
Expand Down Expand Up @@ -137,7 +137,7 @@
</font>
</property>
<property name="text">
<string>Warning: unrecognized data found in configuration files. </string>
<string>Warning: Unrecognized data found in configuration files. </string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -238,7 +238,7 @@
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;WARNING: password will be saved in dom0 in plain text.&lt;br/&gt;The file is located in dom0 in /etc/qubes/backup/qubes-manager-backup .&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;WARNING: Passphrase will be saved in dom0 in plain text.&lt;br/&gt;File location: /etc/qubes/backup/qubes-manager-backup&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand All @@ -260,14 +260,14 @@
<item row="2" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Reenter passphrase:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Confirm passphrase:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Encryption / Verification&lt;br/&gt;passphrase:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Encryption passphrase:&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -307,7 +307,7 @@
</font>
</property>
<property name="text">
<string>NOTE: Only running qubes are listed.</string>
<string>Note: Only running qubes are listed.</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion ui/clonevmdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Caution&lt;/span&gt;: changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Caution&lt;/span&gt;: Changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
4 changes: 2 additions & 2 deletions ui/devicelist.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Which PCI devices should use the no strict reset option?</string>
<string>Which PCI devices should use the &quot;no strict reset&quot; option?</string>
</property>
</widget>
</item>
Expand All @@ -36,7 +36,7 @@
</font>
</property>
<property name="text">
<string>Note: use this option only if &quot;unable to reset PCI device&quot; error occurs. </string>
<string>Note: Use this option only if an &quot;unable to reset PCI device&quot; error occurs. </string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down
16 changes: 8 additions & 8 deletions ui/globalsettingsdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
</sizepolicy>
</property>
<property name="text">
<string>DisposableVM Template</string>
<string>disposable template</string>
</property>
</widget>
</item>
Expand All @@ -360,7 +360,7 @@
</sizepolicy>
</property>
<property name="text">
<string>NetVM</string>
<string>net qube</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -416,7 +416,7 @@
</sizepolicy>
</property>
<property name="text">
<string>ClockVM</string>
<string>Clock qube</string>
</property>
</widget>
</item>
Expand All @@ -429,7 +429,7 @@
</sizepolicy>
</property>
<property name="text">
<string>dom0 Updates Proxy</string>
<string>Dom0 update qube</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -668,12 +668,12 @@
</property>
<item>
<property name="text">
<string>ITL template updates</string>
<string>Official template updates</string>
</property>
</item>
<item>
<property name="text">
<string>ITL template updates (testing)</string>
<string>Official template updates (testing)</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -739,7 +739,7 @@
<item row="2" column="0">
<widget class="QLabel" name="label_36">
<property name="text">
<string>Minimal qube memory:</string>
<string>Minimum qube memory:</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -771,7 +771,7 @@
<bool>true</bool>
</property>
<property name="toolTip">
<string>Additional memory allocated to dom0 by Qubes Memory Balancer.</string>
<string>Additional memory allocated to dom0 by Qubes Memory Balancer</string>
</property>
<property name="suffix">
<string> MiB</string>
Expand Down
4 changes: 2 additions & 2 deletions ui/logdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</font>
</property>
<property name="toolTip">
<string>Copy Dom0 clipboard to Qubes clipboard</string>
<string>Copy dom0 clipboard to global clipboard.</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -56,7 +56,7 @@
<enum>Qt::TabFocus</enum>
</property>
<property name="text">
<string>Copy to Qubes clipboard</string>
<string>Copy to global clipboard</string>
</property>
<property name="icon">
<iconset resource="../resources.qrc">
Expand Down
8 changes: 4 additions & 4 deletions ui/newappvmdlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
<item row="7" column="1" colspan="3">
<widget class="QCheckBox" name="launch_settings">
<property name="text">
<string>launch settings after creation</string>
<string>Launch settings after creation</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -180,7 +180,7 @@
</sizepolicy>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Caution&lt;/span&gt;: changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Caution&lt;/span&gt;: Changing these settings can compromise your system or make the qube unable to boot. Use only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
Expand Down Expand Up @@ -214,14 +214,14 @@
<bool>false</bool>
</property>
<property name="text">
<string>install system from device (also available from settings)</string>
<string>Install system from device (also available from settings)</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="provides_network">
<property name="text">
<string>provides network to other qubes</string>
<string>Provides network access to other qubes</string>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion ui/newfwruledlg.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
<item row="1" column="1" colspan="3">
<widget class="QComboBox" name="serviceComboBox">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;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.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
Expand Down
Loading

0 comments on commit 0535c9d

Please sign in to comment.