=== modified file 'src/api/wrts.py' --- src/api/wrts.py 2010-10-03 13:41:56 +0000 +++ src/api/wrts.py 2010-11-24 13:41:19 +0000 @@ -87,7 +87,7 @@ importWordLIst(url) Properties: - lists - gets all lists of the opened account + lists - gets all lists from the open account loggedIn - tells if the connection keeps valid (working) credentials of the user""" class HeadRequest(urllib2.Request): === modified file 'src/dialogs.py' --- src/dialogs.py 2010-11-12 10:33:55 +0000 +++ src/dialogs.py 2010-11-24 13:50:30 +0000 @@ -146,7 +146,7 @@ #Tell the user the language changed. QtGui.QMessageBox.information(self, QtCore.QCoreApplication.translate("Settings", "Restart please"), - QtCore.QCoreApplication.translate("Settings", "You changed the language. In order to use the newly choosen language, you need to restart OpenTeacher.")) + QtCore.QCoreApplication.translate("Settings", "You changed the language. In order to use the newly selected language, you need to restart OpenTeacher.")) #Show 'overwrite'-dialogs === modified file 'src/gui/openteacher.py' --- src/gui/openteacher.py 2010-11-20 10:28:05 +0000 +++ src/gui/openteacher.py 2010-11-24 13:35:05 +0000 @@ -616,7 +616,7 @@ self.correctButton.setText(QtGui.QApplication.translate("MainWindow", "Correct anyway", None, QtGui.QApplication.UnicodeUTF8)) self.questionType.setTabText(self.questionType.indexOf(self.typeAnswers), QtGui.QApplication.translate("MainWindow", "Type Answer", None, QtGui.QApplication.UnicodeUTF8)) self.thinkLabel.setText(QtGui.QApplication.translate("MainWindow", "Translation:", None, QtGui.QApplication.UnicodeUTF8)) - self.viewAnswerButton.setStatusTip(QtGui.QApplication.translate("MainWindow", "Click here to view the answer of the current showed question.", None, QtGui.QApplication.UnicodeUTF8)) + self.viewAnswerButton.setStatusTip(QtGui.QApplication.translate("MainWindow", "Click here to view the answer of the currently displayed question.", None, QtGui.QApplication.UnicodeUTF8)) self.viewAnswerButton.setText(QtGui.QApplication.translate("MainWindow", "View answer", None, QtGui.QApplication.UnicodeUTF8)) self.viewAnswerButton.setShortcut(QtGui.QApplication.translate("MainWindow", "Enter", None, QtGui.QApplication.UnicodeUTF8)) self.rightButton.setStatusTip(QtGui.QApplication.translate("MainWindow", "Click here if the answer matches to what you were thinking.", None, QtGui.QApplication.UnicodeUTF8)) @@ -631,7 +631,7 @@ self.checkButtonShuffle.setShortcut(QtGui.QApplication.translate("MainWindow", "Return", None, QtGui.QApplication.UnicodeUTF8)) self.correctButtonShuffle.setStatusTip(QtGui.QApplication.translate("MainWindow", "Click here to correct the last checked answer anyway.", None, QtGui.QApplication.UnicodeUTF8)) self.correctButtonShuffle.setText(QtGui.QApplication.translate("MainWindow", "Correct anyway", None, QtGui.QApplication.UnicodeUTF8)) - self.questionType.setTabText(self.questionType.indexOf(self.shuffleAnswers), QtGui.QApplication.translate("MainWindow", "Shuffle answer", None, QtGui.QApplication.UnicodeUTF8)) + self.questionType.setTabText(self.questionType.indexOf(self.shuffleAnswers), QtGui.QApplication.translate("MainWindow", "Shuffle answers", None, QtGui.QApplication.UnicodeUTF8)) self.hintLabelRepeat.setText(QtGui.QApplication.translate("MainWindow", "Hint:", None, QtGui.QApplication.UnicodeUTF8)) self.checkButtonRepeat.setStatusTip(QtGui.QApplication.translate("MainWindow", "Click here to check if your answer is right.", None, QtGui.QApplication.UnicodeUTF8)) self.checkButtonRepeat.setText(QtGui.QApplication.translate("MainWindow", "Check!", None, QtGui.QApplication.UnicodeUTF8)) @@ -645,7 +645,7 @@ self.charTab_teach.setTabText(self.charTab_teach.indexOf(self.tab_6), QtGui.QApplication.translate("MainWindow", "Greek", None, QtGui.QApplication.UnicodeUTF8)) self.label_3.setText(QtGui.QApplication.translate("MainWindow", "Total Questions:", None, QtGui.QApplication.UnicodeUTF8)) self.totalQuestionsLabel.setText(QtGui.QApplication.translate("MainWindow", "0", None, QtGui.QApplication.UnicodeUTF8)) - self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Right Answers:", None, QtGui.QApplication.UnicodeUTF8)) + self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Correct Answers:", None, QtGui.QApplication.UnicodeUTF8)) self.rightAnswersLabel.setText(QtGui.QApplication.translate("MainWindow", "0", None, QtGui.QApplication.UnicodeUTF8)) self.label_5.setText(QtGui.QApplication.translate("MainWindow", "Note:", None, QtGui.QApplication.UnicodeUTF8)) self.noteLabel.setText(QtGui.QApplication.translate("MainWindow", "0", None, QtGui.QApplication.UnicodeUTF8)) @@ -655,12 +655,12 @@ self.menuImport.setTitle(QtGui.QApplication.translate("MainWindow", "Import", None, QtGui.QApplication.UnicodeUTF8)) self.menuAbout.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8)) self.menuEdit.setTitle(QtGui.QApplication.translate("MainWindow", "Edit", None, QtGui.QApplication.UnicodeUTF8)) - self.toolBar.setWindowTitle(QtGui.QApplication.translate("MainWindow", "toolBar", None, QtGui.QApplication.UnicodeUTF8)) + self.toolBar.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Toolbar", None, QtGui.QApplication.UnicodeUTF8)) self.actionOpen.setText(QtGui.QApplication.translate("MainWindow", "&Open", None, QtGui.QApplication.UnicodeUTF8)) self.actionOpen.setStatusTip(QtGui.QApplication.translate("MainWindow", "Open an existing file.", None, QtGui.QApplication.UnicodeUTF8)) self.actionOpen.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+O", None, QtGui.QApplication.UnicodeUTF8)) self.actionSave.setText(QtGui.QApplication.translate("MainWindow", "&Save", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSave.setStatusTip(QtGui.QApplication.translate("MainWindow", "Save the current opened file.", None, QtGui.QApplication.UnicodeUTF8)) + self.actionSave.setStatusTip(QtGui.QApplication.translate("MainWindow", "Save the current open file.", None, QtGui.QApplication.UnicodeUTF8)) self.actionSave.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+S", None, QtGui.QApplication.UnicodeUTF8)) self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "&Quit", None, QtGui.QApplication.UnicodeUTF8)) self.actionExit.setStatusTip(QtGui.QApplication.translate("MainWindow", "Close OpenTeacher.", None, QtGui.QApplication.UnicodeUTF8)) @@ -668,7 +668,7 @@ self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "&About", None, QtGui.QApplication.UnicodeUTF8)) self.actionAbout.setStatusTip(QtGui.QApplication.translate("MainWindow", "View information about OpenTeacher.", None, QtGui.QApplication.UnicodeUTF8)) self.actionSave_As.setText(QtGui.QApplication.translate("MainWindow", "Save &As", None, QtGui.QApplication.UnicodeUTF8)) - self.actionSave_As.setStatusTip(QtGui.QApplication.translate("MainWindow", "Save the current opened file under a different name.", None, QtGui.QApplication.UnicodeUTF8)) + self.actionSave_As.setStatusTip(QtGui.QApplication.translate("MainWindow", "Save the current open file under a different name.", None, QtGui.QApplication.UnicodeUTF8)) self.actionSave_As.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+Shift+S", None, QtGui.QApplication.UnicodeUTF8)) self.actionNew.setText(QtGui.QApplication.translate("MainWindow", "&New", None, QtGui.QApplication.UnicodeUTF8)) self.actionNew.setToolTip(QtGui.QApplication.translate("MainWindow", "New", None, QtGui.QApplication.UnicodeUTF8)) @@ -677,9 +677,9 @@ self.actionWRTS_Import.setText(QtGui.QApplication.translate("MainWindow", "WRTS (online)", None, QtGui.QApplication.UnicodeUTF8)) self.actionWRTS_Import.setStatusTip(QtGui.QApplication.translate("MainWindow", "Import a wordlist from your online WRTS-account.", None, QtGui.QApplication.UnicodeUTF8)) self.actionWRTS_Export.setText(QtGui.QApplication.translate("MainWindow", "WRTS (online)", None, QtGui.QApplication.UnicodeUTF8)) - self.actionWRTS_Export.setStatusTip(QtGui.QApplication.translate("MainWindow", "Export the current opened wordlist to your online WRTS-account.", None, QtGui.QApplication.UnicodeUTF8)) + self.actionWRTS_Export.setStatusTip(QtGui.QApplication.translate("MainWindow", "Export the current wordlist to your online WRTS-account.", None, QtGui.QApplication.UnicodeUTF8)) self.actionPrint.setText(QtGui.QApplication.translate("MainWindow", "Print", None, QtGui.QApplication.UnicodeUTF8)) - self.actionPrint.setStatusTip(QtGui.QApplication.translate("MainWindow", "Print the current opened file.", None, QtGui.QApplication.UnicodeUTF8)) + self.actionPrint.setStatusTip(QtGui.QApplication.translate("MainWindow", "Print the current open file.", None, QtGui.QApplication.UnicodeUTF8)) self.actionPrint.setShortcut(QtGui.QApplication.translate("MainWindow", "Ctrl+P", None, QtGui.QApplication.UnicodeUTF8)) self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8)) === modified file 'src/openteacher.py' --- src/openteacher.py 2010-11-13 12:36:09 +0000 +++ src/openteacher.py 2010-11-24 13:51:54 +0000 @@ -272,7 +272,7 @@ text = unicode(e) title = QtCore.QCoreApplication.translate("Settings", "Connection to WRTS failed") else: - text = QtCore.QCoreApplication.translate("Settings", "Connection to WRTS succeeded.") + text = QtCore.QCoreApplication.translate("Settings", "Connection to WRTS succeeded") title = QtCore.QCoreApplication.translate("Settings", "Connection to WRTS succeeded") QtGui.QMessageBox.information(self, title, text) @@ -301,7 +301,7 @@ #Tell the user the language changed. QtGui.QMessageBox.information(self, QtCore.QCoreApplication.translate("Settings", "Restart please"), - QtCore.QCoreApplication.translate("Settings", "You changed the language. In order to use the newly choosen language, you need to restart OpenTeacher.")) + QtCore.QCoreApplication.translate("Settings", "You changed the language. In order to use the newly selected language, you need to restart OpenTeacher.")) #Show 'overwrite'-dialogs askOverwrite = self.ui.askOverwriteCheckBox.isChecked() @@ -609,7 +609,7 @@ return #Stop the timer self._timer.stop() - #Clear the text in the widget to prevent it from being showed + #Clear the text in the widget to prevent it from being shown #when the old color is reset. self.widget.clear() #Reset the color @@ -933,7 +933,7 @@ self.checkEmpty() #Tell the user - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) are succesfully entered.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) were entered successfully.")) def remove(self): """This method removes all the selected rows.""" @@ -969,7 +969,7 @@ self.checkEmpty() #Tell the user everything went fine (well, it didn't crash :p) - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) are succesfully removed.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The word(s) were removed successfully.")) else: self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "No selection was detected.")) @@ -1166,7 +1166,7 @@ #the fade animation would play, which isn't only unneeded (unvisible), #but also can give problems if the user is switching tabs within the #fade duration to the repeat-tab. (Then the animation and the start - #button would be showed -> wrong.) + #button would be displayed -> wrong.) #Set focus to the right widget if self.LessonMode.TYPING == self.ui.questionType.currentIndex(): @@ -1233,7 +1233,7 @@ else: output += item[2:] correctLabel.setText(output + "]") - #If they don't look like each other, just the answer is showed. + #If they don't look like each other, just the answer is shown. else: correctLabel.setText("%s: %s" % (QtCore.QCoreApplication.translate("OpenTeacher", "Correct answer"), rightAnswer)) @@ -1523,7 +1523,7 @@ listChoiceDialog = self.setupDesignedDialog(gui.wrtsListChoice) #Get the wordList names from the internet, if there was an error connection, the error is - #showed to the user. Then the app returns, so the user can try again. + #shown to the user. Then the app returns, so the user can try again. try: parsedLists = self.wrtsConnection.lists except errors.WrtsConnectionError, e: @@ -1550,7 +1550,7 @@ self.showError(e) return - #Check for opened wordlist + #Check for open wordlist if not self.handleSaving(): return @@ -1560,7 +1560,7 @@ self.setUnsaved() self.checkEmpty() #Show the user that above all was a succes - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The wordlist from WRTS is succesfully imported.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The wordlist from WRTS was imported successfully.")) else: #Record to the terminal that the user aborted (the user doesn't really need to know that, he/she already does.) print errors.AbortedByUserError() @@ -1590,8 +1590,8 @@ return else: #No error occured, tell the user all went well. - title = QtCore.QCoreApplication.translate("OpenTeacher", "Exporting succesful") - text = QtCore.QCoreApplication.translate("OpenTeacher", "The word list has succesfully been exported to WRTS.") + title = QtCore.QCoreApplication.translate("OpenTeacher", "Export successful") + text = QtCore.QCoreApplication.translate("OpenTeacher", "Word list exported to WRTS.") QtGui.QMessageBox.information(self, title, text) self.statusBar().showMessage(text) @@ -1666,7 +1666,7 @@ #Reset the windowtitle self.setWindowTitle("OpenTeacher") #Tell the user everything went smooth. - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "A new file is succesfully created.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "New file created.")) def openFunc(self): """Function to handle opening files (with dialog, user side of it)""" @@ -1693,7 +1693,7 @@ self.showError(e) else: #Nothing weird happened, tell the user... - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The selected file is succesfully opened.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The selected file was opened successfully.")) else: #clicked cancel, record that to terminal for debugging purposes. print errors.AbortedByUserError() @@ -1821,7 +1821,7 @@ self.setWindowTitle("%s - OpenTeacher" % os.path.basename(self.saveFilename)) self.setSaved() #Tell the user saving was a succes. - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The file is succesfully saved.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "File saved.")) return True #exporting else: @@ -1883,7 +1883,7 @@ #Get the text as a string, and put it in a QTextDocument, which is printable by Qt. text = QtGui.QTextDocument(textContent.getText()) #Set the document title to 'OpenTeacher' (with the wordList title if one), it's - #showed in the printqueue. + #shown in the printqueue. if wordList.titleSet(): text.setMetaInformation(QtGui.QTextDocument.DocumentTitle, "OpenTeacher - %s" % wordList.title) else: @@ -1902,7 +1902,7 @@ if printdialog.exec_(): text.print_(printer) #Tell the user that he/she has to run to his/her printer. - self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The file is succesfully printed.")) + self.statusBar().showMessage(QtCore.QCoreApplication.translate("OpenTeacher", "The file was printed successfully.")) else: #Record to the terminal that the user canceled. print errors.AbortedByUserError()