Skip to content

Commit

Permalink
Fix some typos
Browse files Browse the repository at this point in the history
  • Loading branch information
mnhauke authored and jopohl committed Dec 30, 2019
1 parent ac0ff35 commit b0dea42
Show file tree
Hide file tree
Showing 31 changed files with 38 additions and 38 deletions.
2 changes: 1 addition & 1 deletion data/ui/generator.ui
Expand Up @@ -160,7 +160,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The pauses will be added automatically when you drag a protocol from the tree above to the table on the right.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can see the &lt;span style=&quot; font-weight:600;&quot;&gt;position&lt;/span&gt; of each pause by &lt;span style=&quot; font-weight:600;&quot;&gt;selecting it&lt;/span&gt;. There will be drawn a line in the table indiciating the position of the pause.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Use context menu or double click to &lt;span style=&quot; font-weight:600;&quot;&gt;edit a pauses' length&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The pauses will be added automatically when you drag a protocol from the tree above to the table on the right.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;You can see the &lt;span style=&quot; font-weight:600;&quot;&gt;position&lt;/span&gt; of each pause by &lt;span style=&quot; font-weight:600;&quot;&gt;selecting it&lt;/span&gt;. There will be drawn a line in the table indicating the position of the pause.&lt;br/&gt;&lt;/p&gt;&lt;p&gt;Use context menu or double click to &lt;span style=&quot; font-weight:600;&quot;&gt;edit a pauses' length&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editTriggers">
<set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set>
Expand Down
2 changes: 1 addition & 1 deletion data/ui/main.ui
Expand Up @@ -567,7 +567,7 @@ image: url(:/icons/icons/splitter_handle_vertical.svg);
<bool>true</bool>
</property>
<property name="text">
<string>Seperate &amp;Protocols in Compare Frame</string>
<string>Separate &amp;Protocols in Compare Frame</string>
</property>
</action>
<action name="actionOpenArchive">
Expand Down
2 changes: 1 addition & 1 deletion data/ui/messagetype_options.ui
Expand Up @@ -23,7 +23,7 @@
</item>
<item>
<property name="text">
<string>At leat one rule must apply (OR)</string>
<string>At least one rule must apply (OR)</string>
</property>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion data/ui/options.ui
Expand Up @@ -162,7 +162,7 @@
<item>
<widget class="QCheckBox" name="checkBoxHoldShiftToDrag">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, you need to &lt;span style=&quot; font-weight:600;&quot;&gt;hold the Shift key to drag&lt;/span&gt; with the mouse inside graphic views like the drawn signal in Interpreation tab, while making a selection with the mouse does not require holding any buttons.&lt;/p&gt;&lt;p&gt;If unchecked, this is inverted: Hold shift to make a selection, and drag by default.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If checked, you need to &lt;span style=&quot; font-weight:600;&quot;&gt;hold the Shift key to drag&lt;/span&gt; with the mouse inside graphic views like the drawn signal in Interpretation tab, while making a selection with the mouse does not require holding any buttons.&lt;/p&gt;&lt;p&gt;If unchecked, this is inverted: Hold shift to make a selection, and drag by default.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Hold shift to drag</string>
Expand Down
6 changes: 3 additions & 3 deletions data/ui/signal_frame.ui
Expand Up @@ -405,7 +405,7 @@
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose the view of your signal. Analog, Demodulated or Spectrogram.&lt;/p&gt;&lt;p&gt;The quadrature demodulation uses a &lt;span style=&quot; font-weight:600;&quot;&gt;threshold of magnitudes,&lt;/span&gt; to &lt;span style=&quot; font-weight:600;&quot;&gt;supress noise&lt;/span&gt;. All samples with a magnitude lower than this treshold will be eliminated after demodulation.&lt;/p&gt;&lt;p&gt;Tune this value by selecting a &lt;span style=&quot; font-style:italic;&quot;&gt;noisy area&lt;/span&gt; and mark it as noise using &lt;span style=&quot; font-weight:600;&quot;&gt;context menu&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Choose the view of your signal. Analog, Demodulated or Spectrogram.&lt;/p&gt;&lt;p&gt;The quadrature demodulation uses a &lt;span style=&quot; font-weight:600;&quot;&gt;threshold of magnitudes,&lt;/span&gt; to &lt;span style=&quot; font-weight:600;&quot;&gt;suppress noise&lt;/span&gt;. All samples with a magnitude lower than this threshold will be eliminated after demodulation.&lt;/p&gt;&lt;p&gt;Tune this value by selecting a &lt;span style=&quot; font-style:italic;&quot;&gt;noisy area&lt;/span&gt; and mark it as noise using &lt;span style=&quot; font-weight:600;&quot;&gt;context menu&lt;/span&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<item>
<property name="text">
Expand Down Expand Up @@ -571,7 +571,7 @@
<property name="toolTip">
<string>Show the extracted protocol based on the parameters InfoLen, PauseLen and ZeroTreshold (in QuadratureDemod-View).

If you want your protocol to be better seperated, edit the PauseLen using right-click menu from a selection in SignalView or ProtocolView.</string>
If you want your protocol to be better separated, edit the PauseLen using right-click menu from a selection in SignalView or ProtocolView.</string>
</property>
<property name="text">
<string>Show Signal as</string>
Expand Down Expand Up @@ -606,7 +606,7 @@ If you want your protocol to be better seperated, edit the PauseLen using right-
</sizepolicy>
</property>
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Automatically detect &lt;span style=&quot; font-weight:600;&quot;&gt;center&lt;/span&gt;, &lt;span style=&quot; font-weight:600;&quot;&gt;bit length&lt;/span&gt; and &lt;span style=&quot; font-weight:600;&quot;&gt;tolerance&lt;/span&gt;. You can also choose to addtionally detect the &lt;span style=&quot; font-weight:600;&quot;&gt;noise&lt;/span&gt; and &lt;span style=&quot; font-weight:600;&quot;&gt;modulation&lt;/span&gt; when clicking this button.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Automatically detect &lt;span style=&quot; font-weight:600;&quot;&gt;center&lt;/span&gt;, &lt;span style=&quot; font-weight:600;&quot;&gt;bit length&lt;/span&gt; and &lt;span style=&quot; font-weight:600;&quot;&gt;tolerance&lt;/span&gt;. You can also choose to additionally detect the &lt;span style=&quot; font-weight:600;&quot;&gt;noise&lt;/span&gt; and &lt;span style=&quot; font-weight:600;&quot;&gt;modulation&lt;/span&gt; when clicking this button.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Autodetect parameters</string>
Expand Down
2 changes: 1 addition & 1 deletion src/urh/ainterpretation/AutoInterpretation.py
Expand Up @@ -102,7 +102,7 @@ def merge_message_segments_for_ook(segments: list):
return segments

result = []
# Get a array of pauses for comparision
# Get a array of pauses for comparison
pauses = np.fromiter(
(segments[i + 1][0] - segments[i][1] for i in range(len(segments) - 1)),
count=len(segments) - 1,
Expand Down
2 changes: 1 addition & 1 deletion src/urh/awre/Preprocessor.py
Expand Up @@ -151,7 +151,7 @@ def determine_sync_candidates(self,
additional_syncs = self.__find_additional_sync_words(estimated_sync_length, sync_words, possible_sync_words)

if additional_syncs:
self.__debug("Found addtional sync words", additional_syncs)
self.__debug("Found additional sync words", additional_syncs)
sync_words.update(additional_syncs)

result = []
Expand Down
2 changes: 1 addition & 1 deletion src/urh/controller/CompareFrameController.py
Expand Up @@ -476,7 +476,7 @@ def add_sniffed_protocol_messages(self, messages: list):
self.refresh()

def add_protocol_label(self, start: int, end: int, messagenr: int, proto_view: int, edit_label_name=True):
# Ensure atleast one Group is active
# Ensure at least one Group is active
start, end = self.proto_analyzer.convert_range(start, end, proto_view, 0, decoded=True, message_indx=messagenr)
message_type = self.proto_analyzer.messages[messagenr].message_type
try:
Expand Down
2 changes: 1 addition & 1 deletion src/urh/controller/MainController.py
Expand Up @@ -278,7 +278,7 @@ def add_signalfile(self, filename: str, group_id=0, enforce_sample_rate=None):
sig_name = os.path.splitext(os.path.basename(filename))[0]

# Use default sample rate for signal
# Sample rate will be overriden in case of a project later
# Sample rate will be overridden in case of a project later
if enforce_sample_rate is not None:
sample_rate = enforce_sample_rate
else:
Expand Down
2 changes: 1 addition & 1 deletion src/urh/controller/dialogs/ModulatorDialog.py
Expand Up @@ -82,7 +82,7 @@ def __init__(self, modulators, tree_model=None, parent=None):
self.set_bits_per_symbol_enabled_status()
self.set_modulation_profile_status()

# Ensure full sceen shown after resize
# Ensure full srceen shown after resize
QTimer.singleShot(100, self.show_full_scene)

def __cur_selected_mod_type(self):
Expand Down
2 changes: 1 addition & 1 deletion src/urh/dev/BackendHandler.py
Expand Up @@ -79,7 +79,7 @@ class BackendHandler(object):
"""
This class controls the devices backend.
1) List available backends for devices
2) List available devices (atleast one backend)
2) List available devices (at least one backend)
3) Manage the selection of devices backend
"""
Expand Down
4 changes: 2 additions & 2 deletions src/urh/dev/gr/AbstractBaseThread.py
Expand Up @@ -231,11 +231,11 @@ def initialize_process(self):
t.start()

def init_recv_socket(self):
logger.info("Initalizing receive socket")
logger.info("Initializing receive socket")
self.context = zmq.Context()
self.socket = self.context.socket(zmq.PULL)
self.socket.setsockopt(zmq.RCVTIMEO, 90)
logger.info("Initalized receive socket")
logger.info("Initialized receive socket")

while not self.isInterruptionRequested():
try:
Expand Down
2 changes: 1 addition & 1 deletion src/urh/dev/gr/SpectrumThread.py
Expand Up @@ -18,7 +18,7 @@ def __init__(self, freq, sample_rate, bandwidth, gain, if_gain, baseband_gain, i
def run(self):
logger.debug("Spectrum Thread: Init Process")
self.initialize_process()
logger.debug("Spectrum Thread: Process Intialized")
logger.debug("Spectrum Thread: Process initialized")
self.init_recv_socket()
logger.debug("Spectrum Thread: Socket initialized")

Expand Down
4 changes: 2 additions & 2 deletions src/urh/dev/native/lib/limesdr.pyx
Expand Up @@ -156,7 +156,7 @@ cpdef tuple get_sample_rate_range():
cpdef int set_center_frequency(float_type frequency):
"""
Set RF center frequency in Hz. This automatically selects the appropriate
antenna (band path) for the desired frequency. In oder to override antenna selection use LMS_SetAntenna().
antenna (band path) for the desired frequency. In order to override antenna selection use LMS_SetAntenna().
:param frequency: Desired RF center frequency in Hz
:return: 0 on success, (-1) on failure
"""
Expand Down Expand Up @@ -253,7 +253,7 @@ cpdef calibrate(double bw):
"""
Perform the automatic calibration of specified RX/TX channel. The automatic
calibration must be run after device configuration is finished because
calibration values are dependant on various configuration settings.
calibration values are dependent on various configuration settings.
automatic RX calibration is not available when RX_LNA_H path is
selected
Expand Down
2 changes: 1 addition & 1 deletion src/urh/models/ProtocolTreeModel.py
Expand Up @@ -258,7 +258,7 @@ def dropMimeData(self, mimedata, action, row, column, parentIndex):
else:
# Dropped on file
if contains_groups:
# Cant drop groups on files
# Can't drop groups on files
return False

elif parent_node.containsChilds(drag_nodes) and drop_node in parent_node.children:
Expand Down
4 changes: 2 additions & 2 deletions src/urh/models/TableModel.py
Expand Up @@ -157,7 +157,7 @@ def update(self):

# Cache background colors for performance
self.refresh_bgcolors()
self.refresh_fonts() # Will be overriden
self.refresh_fonts() # Will be overridden
self.refresh_vertical_header()

self.beginResetModel()
Expand Down Expand Up @@ -191,7 +191,7 @@ def refresh_bgcolors(self):

def refresh_fonts(self):
"""
Will be overriden
Will be overridden
:return:
"""
Expand Down
2 changes: 1 addition & 1 deletion src/urh/plugins/RfCat/RfCatPlugin.py
Expand Up @@ -151,7 +151,7 @@ def configure_rfcat(self, modulation = "MOD_ASK_OOK", freq = 433920000, sample_r
self.set_parameter("d.setMdmSyncMode(0)", log=False)
self.set_parameter("d.setMdmDRate({})".format(int(sample_rate // samples_per_symbol)), log=False)
self.set_parameter("d.setMaxPower()", log=False)
logger.info("Configured RfCat to Modulation={}, Freqency={} Hz, Datarate={} baud".format(modulation, int(freq), int(sample_rate // samples_per_symbol)))
logger.info("Configured RfCat to Modulation={}, Frequency={} Hz, Datarate={} baud".format(modulation, int(freq), int(sample_rate // samples_per_symbol)))

def send_data(self, data) -> str:
prepared_data = "d.RFxmit({})".format(str(data)[11:-1]) #[11:-1] Removes "bytearray(b...)
Expand Down
2 changes: 1 addition & 1 deletion src/urh/signalprocessing/MessageType.py
Expand Up @@ -162,7 +162,7 @@ def remove(self, lbl: ProtocolLabel):
if lbl in self:
super().remove(lbl)
else:
logger.warning(lbl.name + " is not in set, so cant be removed")
logger.warning(lbl.name + " is not in set, so can't be removed")

def change_field_type_of_label(self, label: ProtocolLabel, field_type: FieldType):
if not isinstance(label, ProtocolLabel) and hasattr(label, "field_type"):
Expand Down
2 changes: 1 addition & 1 deletion src/urh/signalprocessing/ProtocolAnalyzerContainer.py
Expand Up @@ -146,7 +146,7 @@ def create_fuzzing_label(self, start, end, msg_index) -> ProtocolLabel:
return fuz_lbl

def set_decoder_for_messages(self, decoder, messages=None):
raise NotImplementedError("Encoding cant be set in Generator!")
raise NotImplementedError("Encoding can't be set in Generator!")

def to_xml_file(self, filename: str, decoders, participants, tag_name="fuzz_profile",
include_message_types=True, write_bits=True, modulators=None):
Expand Down
2 changes: 1 addition & 1 deletion src/urh/ui/KillerDoubleSpinBox.py
Expand Up @@ -16,7 +16,7 @@ def __init__(self, parent=None):

self.lineEdit().setValidator(None)

# Cant connect to value changed, as it would delete the number when changing a digit
# Can't connect to value changed, as it would delete the number when changing a digit
# see: https://github.com/jopohl/urh/issues/129
self.editingFinished.connect(self.adjust_step)

Expand Down
2 changes: 1 addition & 1 deletion src/urh/ui/ui_generator.py
Expand Up @@ -343,7 +343,7 @@ def retranslateUi(self, GeneratorTab):
GeneratorTab.setWindowTitle(_translate("GeneratorTab", "Form"))
self.treeProtocols.setToolTip(_translate("GeneratorTab", "<html><head/><body><p>Drag&amp;Drop Protocols to the table on the right to fill the generation table.</p></body></html>"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_proto), _translate("GeneratorTab", "Protocols"))
self.lWPauses.setToolTip(_translate("GeneratorTab", "<html><head/><body><p>The pauses will be added automatically when you drag a protocol from the tree above to the table on the right.<br/></p><p>You can see the <span style=\" font-weight:600;\">position</span> of each pause by <span style=\" font-weight:600;\">selecting it</span>. There will be drawn a line in the table indiciating the position of the pause.<br/></p><p>Use context menu or double click to <span style=\" font-weight:600;\">edit a pauses\' length</span>.</p></body></html>"))
self.lWPauses.setToolTip(_translate("GeneratorTab", "<html><head/><body><p>The pauses will be added automatically when you drag a protocol from the tree above to the table on the right.<br/></p><p>You can see the <span style=\" font-weight:600;\">position</span> of each pause by <span style=\" font-weight:600;\">selecting it</span>. There will be drawn a line in the table indicating the position of the pause.<br/></p><p>Use context menu or double click to <span style=\" font-weight:600;\">edit a pauses\' length</span>.</p></body></html>"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_pauses), _translate("GeneratorTab", "Pauses"))
self.groupBox.setTitle(_translate("GeneratorTab", "Add fuzzing values to generated data"))
self.btnFuzz.setText(_translate("GeneratorTab", "Fuzz"))
Expand Down
2 changes: 1 addition & 1 deletion src/urh/ui/ui_main.py
Expand Up @@ -381,7 +381,7 @@ def retranslateUi(self, MainWindow):
self.actionShow_Compare_Frame.setText(_translate("MainWindow", "Show &Compare Frame"))
self.actionCloseAllFiles.setText(_translate("MainWindow", "&Close all files"))
self.actionSaveAllSignals.setText(_translate("MainWindow", "&Save all signals"))
self.actionSeperate_Protocols_in_Compare_Frame.setText(_translate("MainWindow", "Seperate &Protocols in Compare Frame"))
self.actionSeperate_Protocols_in_Compare_Frame.setText(_translate("MainWindow", "Separate &Protocols in Compare Frame"))
self.actionOpenArchive.setText(_translate("MainWindow", "&Archive"))
self.actionOpen.setText(_translate("MainWindow", "&Open..."))
self.actionOpen_Folder.setText(_translate("MainWindow", "Open &Folder.."))
Expand Down
2 changes: 1 addition & 1 deletion src/urh/ui/ui_messagetype_options.py
Expand Up @@ -51,7 +51,7 @@ def retranslateUi(self, DialogMessageType):
_translate = QtCore.QCoreApplication.translate
DialogMessageType.setWindowTitle(_translate("DialogMessageType", "Dialog"))
self.cbRulesetMode.setItemText(0, _translate("DialogMessageType", "All rules must apply (AND)"))
self.cbRulesetMode.setItemText(1, _translate("DialogMessageType", "At leat one rule must apply (OR)"))
self.cbRulesetMode.setItemText(1, _translate("DialogMessageType", "At least one rule must apply (OR)"))
self.cbRulesetMode.setItemText(2, _translate("DialogMessageType", "No rule must apply (NOR)"))
self.btnRemoveRule.setToolTip(_translate("DialogMessageType", "Remove ruleset"))
self.btnRemoveRule.setText(_translate("DialogMessageType", "..."))
Expand Down
2 changes: 1 addition & 1 deletion src/urh/ui/ui_options.py
Expand Up @@ -319,7 +319,7 @@ def retranslateUi(self, DialogOptions):
self.comboBoxDefaultView.setItemText(1, _translate("DialogOptions", "Hex"))
self.comboBoxDefaultView.setItemText(2, _translate("DialogOptions", "ASCII"))
self.checkBoxShowConfirmCloseDialog.setText(_translate("DialogOptions", "Show \"confirm close\" dialog"))
self.checkBoxHoldShiftToDrag.setToolTip(_translate("DialogOptions", "<html><head/><body><p>If checked, you need to <span style=\" font-weight:600;\">hold the Shift key to drag</span> with the mouse inside graphic views like the drawn signal in Interpreation tab, while making a selection with the mouse does not require holding any buttons.</p><p>If unchecked, this is inverted: Hold shift to make a selection, and drag by default.</p></body></html>"))
self.checkBoxHoldShiftToDrag.setToolTip(_translate("DialogOptions", "<html><head/><body><p>If checked, you need to <span style=\" font-weight:600;\">hold the Shift key to drag</span> with the mouse inside graphic views like the drawn signal in Interpretation tab, while making a selection with the mouse does not require holding any buttons.</p><p>If unchecked, this is inverted: Hold shift to make a selection, and drag by default.</p></body></html>"))
self.checkBoxHoldShiftToDrag.setText(_translate("DialogOptions", "Hold shift to drag"))
self.checkBoxPauseTime.setText(_translate("DialogOptions", "Show pauses as time"))
self.checkBoxAlignLabels.setText(_translate("DialogOptions", "Align on labels"))
Expand Down

0 comments on commit b0dea42

Please sign in to comment.