diff --git a/res/i18n/ts/fr_FR.ts b/res/i18n/ts/fr_FR.ts index 14d36601c0b5d49bd3043b5c146715d305ea6ca5..edcecfe2aa61ba3be3d5df19eb6b03b69763847e 100644 --- a/res/i18n/ts/fr_FR.ts +++ b/res/i18n/ts/fr_FR.ts @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="2.0" language="fr_FR" sourcelanguage="en"> +<TS version="2.1" language="fr_FR" sourcelanguage="en"> <context> <name>@default</name> <message> @@ -1030,47 +1030,47 @@ Revoking your UID can only success if it is not already validated by the network <context> <name>MainWindow</name> <message> - <location filename="../../ui/mainwindow.ui" line="147"/> + <location filename="../../ui/mainwindow.ui" line="148"/> <source>Account</source> <translation>Compte</translation> </message> <message> <location filename="../../ui/mainwindow.ui" line="61"/> <source>Contacts</source> - <translation>Contacts</translation> + <translation type="obsolete">Contacts</translation> </message> <message> <location filename="../../ui/mainwindow.ui" line="75"/> <source>Actions</source> - <translation>Actions</translation> + <translation type="obsolete">Actions</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="87"/> + <location filename="../../ui/mainwindow.ui" line="88"/> <source>Manage accounts</source> <translation>Gérer les comptes</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="92"/> + <location filename="../../ui/mainwindow.ui" line="93"/> <source>Configure trustable nodes</source> <translation>Configurer les noeuds de confiance</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="117"/> + <location filename="../../ui/mainwindow.ui" line="118"/> <source>Send a message</source> <translation>Envoyer un message</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="122"/> + <location filename="../../ui/mainwindow.ui" line="123"/> <source>Send money</source> <translation>Envoyer de l'argent</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="127"/> + <location filename="../../ui/mainwindow.ui" line="128"/> <source>Remove contact</source> <translation>Supprimer un contact</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="137"/> + <location filename="../../ui/mainwindow.ui" line="138"/> <source>Save</source> <translation>Sauvegarder</translation> </message> @@ -1171,62 +1171,62 @@ Revoking your UID can only success if it is not already validated by the network <translation>&Ouvrir</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="65"/> + <location filename="../../ui/mainwindow.ui" line="63"/> <source>&Contacts</source> <translation>&Contacts</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="97"/> + <location filename="../../ui/mainwindow.ui" line="98"/> <source>&Add a contact</source> <translation>&Ajouter un compte</translation> </message> <message> <location filename="../../ui/mainwindow.ui" line="132"/> <source>&Add</source> - <translation>&Ajouter</translation> + <translation type="obsolete">&Ajouter</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="142"/> + <location filename="../../ui/mainwindow.ui" line="143"/> <source>&Quit</source> <translation>&Quitter</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="152"/> + <location filename="../../ui/mainwindow.ui" line="153"/> <source>&Transfer money</source> <translation>&Transférer de la monnaie</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="157"/> + <location filename="../../ui/mainwindow.ui" line="158"/> <source>&Configure</source> <translation>&Configurer</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="162"/> + <location filename="../../ui/mainwindow.ui" line="163"/> <source>&Import</source> <translation>&Importer</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="167"/> + <location filename="../../ui/mainwindow.ui" line="168"/> <source>&Export</source> <translation>&Exporter</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="172"/> + <location filename="../../ui/mainwindow.ui" line="173"/> <source>&Certification</source> <translation>&Certification</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="177"/> + <location filename="../../ui/mainwindow.ui" line="178"/> <source>&Set as default</source> <translation>&Par défaut</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="182"/> + <location filename="../../ui/mainwindow.ui" line="183"/> <source>A&bout</source> <translation>A &propos</translation> </message> <message> - <location filename="../../ui/mainwindow.ui" line="187"/> + <location filename="../../ui/mainwindow.ui" line="188"/> <source>&Preferences</source> <translation>&Préférences</translation> </message> @@ -1235,6 +1235,21 @@ Revoking your UID can only success if it is not already validated by the network <source>Please get the latest release {version}</source> <translation>Veuillez télécharger la dernière version {version}</translation> </message> + <message> + <location filename="../../ui/mainwindow.ui" line="41"/> + <source>Fi&le</source> + <translation>&Fichier</translation> + </message> + <message> + <location filename="../../ui/mainwindow.ui" line="77"/> + <source>&Help</source> + <translation>&Aide</translation> + </message> + <message> + <location filename="../../ui/mainwindow.ui" line="133"/> + <source>&Add account</source> + <translation>&Ajouter un compte</translation> + </message> </context> <context> <name>MemberDialog</name> diff --git a/res/ui/mainwindow.ui b/res/ui/mainwindow.ui index 5e41ed4606d2642e88799369a8614970f70bf05d..ae7c8d64c803928d585229cfdf542d113a365620 100644 --- a/res/ui/mainwindow.ui +++ b/res/ui/mainwindow.ui @@ -36,9 +36,9 @@ <height>29</height> </rect> </property> - <widget class="QMenu" name="menu_account"> + <widget class="QMenu" name="menu_file"> <property name="title"> - <string>Account</string> + <string>Fi&le</string> </property> <widget class="QMenu" name="menu_change_account"> <property name="title"> @@ -47,18 +47,16 @@ </widget> <addaction name="action_add_account"/> <addaction name="menu_change_account"/> - <addaction name="action_configure_parameters"/> <addaction name="separator"/> <addaction name="action_export"/> <addaction name="action_import"/> <addaction name="separator"/> <addaction name="actionPreferences"/> - <addaction name="actionAbout"/> <addaction name="action_quit"/> </widget> - <widget class="QMenu" name="menu_contacts"> + <widget class="QMenu" name="menu_account"> <property name="title"> - <string>Contacts</string> + <string>Account</string> </property> <widget class="QMenu" name="menu_contacts_list"> <property name="title"> @@ -66,20 +64,23 @@ </property> <addaction name="separator"/> </widget> + <addaction name="action_configure_parameters"/> + <addaction name="separator"/> + <addaction name="actionCertification"/> + <addaction name="actionTransfer_money"/> <addaction name="separator"/> <addaction name="action_add_a_contact"/> <addaction name="menu_contacts_list"/> </widget> - <widget class="QMenu" name="menu_actions"> + <widget class="QMenu" name="menu_help"> <property name="title"> - <string>Actions</string> + <string>&Help</string> </property> - <addaction name="actionTransfer_money"/> - <addaction name="actionCertification"/> + <addaction name="actionAbout"/> </widget> + <addaction name="menu_file"/> <addaction name="menu_account"/> - <addaction name="menu_contacts"/> - <addaction name="menu_actions"/> + <addaction name="menu_help"/> </widget> <widget class="QStatusBar" name="statusbar"/> <action name="actionManage_accounts"> @@ -129,7 +130,7 @@ </action> <action name="action_add_account"> <property name="text"> - <string>&Add</string> + <string>&Add account</string> </property> </action> <action name="action_save"> diff --git a/src/cutecoin/core/net/network.py b/src/cutecoin/core/net/network.py index a4fbb5d1fff0f3a5e05999c3fa119a83e9c69e38..32602d00be232c4ac90ff9f491561d834aace8dc 100644 --- a/src/cutecoin/core/net/network.py +++ b/src/cutecoin/core/net/network.py @@ -1,5 +1,5 @@ ''' -Created on 24 févr. 2015 +Created on 24 feb. 2015 @author: inso ''' @@ -13,10 +13,10 @@ from ..watching.watcher import Watcher class Network(Watcher): - ''' + """ A network is managing nodes polling and crawling of a given community. - ''' + """ nodes_changed = pyqtSignal() new_block_mined = pyqtSignal(int) stopped_perpetual_crawling = pyqtSignal() diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py index e3c314eaf6b91f5436978fc1c2e108a95cffb7ce..bb6538959b08a474760630a2bea8bdf115bb0109 100644 --- a/src/cutecoin/gui/mainwindow.py +++ b/src/cutecoin/gui/mainwindow.py @@ -337,8 +337,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.currencies_tabwidget.hide() self.homescreen.show() self.setWindowTitle(self.tr("CuteCoin {0}").format(__version__)) - self.menu_contacts.setEnabled(False) - self.menu_actions.setEnabled(False) + self.menu_account.setEnabled(False) self.action_configure_parameters.setEnabled(False) self.action_set_as_default.setEnabled(False) self.combo_referential.setEnabled(False) @@ -357,9 +356,8 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.combo_referential.setEnabled(True) self.combo_referential.blockSignals(False) self.combo_referential.setCurrentText(self.app.preferences['ref']) - self.menu_contacts.setEnabled(True) + self.menu_account.setEnabled(True) self.action_configure_parameters.setEnabled(True) - self.menu_actions.setEnabled(True) self.setWindowTitle(self.tr("CuteCoin {0} - Account : {1}").format(__version__, self.app.current_account.name)) diff --git a/src/cutecoin/models/community.py b/src/cutecoin/models/community.py index 81b8fbd05c43e93acbf239984ebe09c319f91fbf..61a239b902c28a67a99101cff5eefdeeb3914094 100644 --- a/src/cutecoin/models/community.py +++ b/src/cutecoin/models/community.py @@ -1,5 +1,5 @@ ''' -Created on 5 févr. 2014 +Created on 5 fevr. 2014 @author: inso '''