Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][gajim_1.3] Update Translations
by Philipp Hörist 24 Apr '21

24 Apr '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: e85687a1 by Weblate at 2021-04-24T11:03:48+00:00 Update Translations - - - - - 4 changed files: - po/de.po - po/eo.po - po/fr.po - po/zh_CN.po Changes: ===================================== po/de.po ===================================== @@ -13,7 +13,7 @@ msgstr "" "Project-Id-Version: gajim 0.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-02-15 17:22+0000\n" +"PO-Revision-Date: 2021-04-01 06:04+0000\n" "Last-Translator: Daniel Brötzmann <mailtrash(a)posteo.de>\n" "Language-Team: German <https://translate.gajim.org/projects/gajim/1-3/de/>\n" "Language: de\n" @@ -1213,7 +1213,7 @@ msgstr "Im E-Mail-Programm öffnen" #: gajim/gui_menu_builder.py:758 msgid "Copy Location" -msgstr "Link-Adresse kopieren" +msgstr "Standort kopieren" #: gajim/gui_menu_builder.py:759 gajim/gtk/preferences.py:291 msgid "Show Location" @@ -2856,7 +2856,7 @@ msgstr "Kontaktbilder anzeigen" #: gajim/gtk/preferences.py:264 gajim/gtk/preferences.py:353 msgid "Show Status Message" -msgstr "Statusnachricht anzeigen" +msgstr "Statusnachrichten anzeigen" #: gajim/gtk/preferences.py:270 gajim/gtk/preferences.py:411 msgid "Sort Contacts by Status" @@ -5545,7 +5545,7 @@ msgstr "Telefonnr." #: gajim/gtk/profile.py:35 msgid "?profile:Organisation" -msgstr "?profile:Organisation" +msgstr "Organisation" #: gajim/gtk/profile.py:36 gajim/gtk/vcard_grid.py:41 msgid "?profile:Title" @@ -5649,7 +5649,7 @@ msgstr "Organisation" #: gajim/gtk/vcard_grid.py:44 msgid "?profile:Note" -msgstr "?profile:Notiz" +msgstr "Notiz" #: gajim/gtk/vcard_grid.py:51 msgid "Your public key or authentication certificate" @@ -5698,11 +5698,11 @@ msgstr "Weiblich" #: gajim/gtk/vcard_grid.py:113 msgid "?Gender:Other" -msgstr "?Gender:Andere" +msgstr "Andere" #: gajim/gtk/vcard_grid.py:114 msgid "?Gender:None" -msgstr "?Gender:Keins" +msgstr "Keins" #: gajim/gtk/vcard_grid.py:121 gajim/gtk/vcard_grid.py:428 msgid "Home" ===================================== po/eo.po ===================================== @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: gajim 0.10.1\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-01-20 20:26+0000\n" +"PO-Revision-Date: 2021-03-18 11:59+0000\n" "Last-Translator: Max Muster <c(a)zp1.net>\n" "Language-Team: Esperanto <https://translate.gajim.org/projects/gajim/1-3/eo/>" "\n" @@ -182,14 +182,12 @@ msgid "Remote contact stopped transfer" msgstr "Forigas kontakton el kontaktlisto" #: gajim/roster_window.py:1903 gajim/chat_control.py:1690 -#, fuzzy msgid "Error opening file" -msgstr "Eraro dum legado de dosiero:" +msgstr "Eraro dum malfermo de dosiero" #: gajim/roster_window.py:1968 -#, fuzzy msgid "Authorization sent" -msgstr "Permeso estas sendita" +msgstr "Rajtigo sendita" #: gajim/roster_window.py:1969 #, fuzzy, python-format @@ -232,24 +230,21 @@ msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?" #: gajim/roster_window.py:2201 msgid "_Always quit when closing Gajim" -msgstr "" +msgstr "_Ciam ĉesu fermi Gajim" #: gajim/roster_window.py:2204 gajim/roster_window.py:2299 #: gajim/roster_window.py:2340 gajim/data/gui/application_menu.ui:30 #: gajim/data/gui/systray_context_menu.ui:83 -#, fuzzy msgid "_Quit" -msgstr "_Eliri" +msgstr "_Lasu" #: gajim/roster_window.py:2292 -#, fuzzy msgid "Stop File Transfers" -msgstr "Dosieraj transmetoj" +msgstr "Stop Dosiero Translokigojn" #: gajim/roster_window.py:2293 -#, fuzzy msgid "You still have running file transfers" -msgstr "Nuligi dosiertransmeton" +msgstr "Vi ankoraŭ kurante dosiero translokigoj" #: gajim/roster_window.py:2294 msgid "" @@ -1566,11 +1561,11 @@ msgstr "_Malfari" #: gajim/chat_control_base.py:723 gajim/conversation_textview.py:417 msgid "_Clear" -msgstr "" +msgstr "_Klara" #: gajim/chat_control_base.py:728 msgid "Paste as quote" -msgstr "" +msgstr "Algluu kiel citaĵon" #: gajim/chat_control_base.py:767 #, fuzzy ===================================== po/fr.po ===================================== @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-02-01 22:12+0000\n" +"PO-Revision-Date: 2021-04-21 18:38+0000\n" "Last-Translator: pitchum <pitchum(a)gramaton.org>\n" "Language-Team: French <https://translate.gajim.org/projects/gajim/1-3/fr/>\n" "Language: fr\n" @@ -85,7 +85,7 @@ msgid "" "reusable. This operation may take a while." msgstr "" "Ceci est FORTEMENT DÉCONSEILLÉ SI GAJIM EST EN TRAIN DE FONCTIONNER.\n" -"Normalement la taille allouée a la base de donnée ne sera pas libérée, elle " +"Normalement la taille allouée à la base de donnée ne sera pas libérée, elle " "sera simplement ré-utilisable. Cette action pourrait prendre un certain " "temps." @@ -174,7 +174,7 @@ msgstr "Salons de discussion" #: gajim/roster_window.py:1901 gajim/chat_control.py:1688 msgid "Remote contact stopped transfer" -msgstr "Le contact distant à stoppé le transfert" +msgstr "Le contact a interrompu le transfert" #: gajim/roster_window.py:1903 gajim/chat_control.py:1690 msgid "Error opening file" @@ -191,12 +191,12 @@ msgstr "Désormais \"%s\" connaîtra votre état." #: gajim/roster_window.py:1987 msgid "Subscription request has been sent" -msgstr "La requête d’inscription a été envoyée" +msgstr "La demande d’inscription a été envoyée" #: gajim/roster_window.py:1988 #, python-format msgid "If \"%s\" accepts this request you will know their status." -msgstr "Si \"%s\" accepte cette requête vous connaîtrez son état." +msgstr "Si \"%s\" accepte cette demande vous connaîtrez son état." #: gajim/roster_window.py:2002 msgid "Authorization removed" @@ -242,7 +242,7 @@ msgid "" "If you quit now, the file(s) being transferred will be lost.\n" "Do you still want to quit?" msgstr "" -"Si vous quittez maintenant, le transfert de fichier(s) en cours sera " +"Si vous quittez maintenant, le transfert de fichiers en cours sera " "interrompu.\n" "Voulez-vous toujours quitter ?" @@ -259,9 +259,9 @@ msgid "" "Messages will only be available for reading them later if storing chat " "history is enabled and if the contact is in your contact list." msgstr "" -"Les messages ne seront disponibles pour une lecture ultérieure que si " -"l’archivage de l'historique est actif et si le contact est dans votre liste " -"de contact." +"Les messages ne seront disponibles pour une lecture ultérieure que si l’" +"archivage de l'historique est actif et si le contact est dans votre liste de " +"contacts." #: gajim/roster_window.py:2590 msgid "You have unread messages" @@ -269,7 +269,7 @@ msgstr "Vous avez des messages non lus" #: gajim/roster_window.py:2591 msgid "You must read them before removing this transport." -msgstr "Vous devez les lire avant de supprimer ce compte." +msgstr "Vous devez les lire avant de supprimer cette passerelle." #: gajim/roster_window.py:2594 #, python-format @@ -296,7 +296,7 @@ msgid "" "%s" msgstr "" "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette " -"passerelle.\n" +"passerelle :\n" "%s" #: gajim/roster_window.py:2607 @@ -321,7 +321,7 @@ msgstr "" #: gajim/roster_window.py:2666 msgid "_Do not ask again" -msgstr "_Ne plus me poser la question" +msgstr "_Ne plus me demander" #: gajim/roster_window.py:2669 gajim/chat_control.py:434 msgid "_Report Spam" @@ -356,7 +356,7 @@ msgstr "Général" #: gajim/roster_window.py:2715 msgid "Rename Group" -msgstr "_Renommer le Groupe" +msgstr "_Renommer le groupe" #: gajim/roster_window.py:2716 #, python-format @@ -374,7 +374,7 @@ msgstr "_Renommer" #: gajim/roster_window.py:2769 gajim/roster_window.py:2770 msgid "Remove Group" -msgstr "_Supprimer le Groupe" +msgstr "_Supprimer le groupe" #: gajim/roster_window.py:2771 #, python-format @@ -419,7 +419,7 @@ msgstr "" #: gajim/roster_window.py:3104 msgid "Do you want to continue?" -msgstr "Voulez vous continuer ?" +msgstr "Voulez-vous continuer ?" #: gajim/roster_window.py:3115 msgid "_I want this contact to know my status after removal" @@ -519,7 +519,7 @@ msgstr "Publier ce que j'écoute" #: gajim/roster_window.py:4467 msgid "Publish Location" -msgstr "Publier l'emplacement" +msgstr "Publier la géolocalisation" #: gajim/roster_window.py:4606 msgid "_Maximize All" @@ -544,7 +544,7 @@ msgstr "In_viter à" #: gajim/roster_window.py:4663 gajim/gui_menu_builder.py:471 msgid "_Rename…" -msgstr "Re_nommer …" +msgstr "Re_nommer…" #: gajim/roster_window.py:4669 gajim/gui_menu_builder.py:493 #: gajim/data/gui/contact_context_menu.ui:181 @@ -609,7 +609,7 @@ msgstr "Vous êtes désormais connu sous le nom de %s" #: gajim/privatechat_control.py:107 gajim/groupchat_control.py:1227 #, python-brace-format msgid "{nick} is now known as {new_nick}" -msgstr "{nick} est maintenant connu en tant que {new_nick}" +msgstr "{nick} est maintenant connu sous le nom de {new_nick}" #: gajim/privatechat_control.py:138 gajim/groupchat_control.py:1254 #, python-brace-format @@ -689,12 +689,12 @@ msgstr "Autorisation HTTP (%(method)s) pour %(url)s (ID : %(id)s)" #: gajim/gui_interface.py:173 msgid "Do you accept this request?" -msgstr "Acceptez vous sa requête ?" +msgstr "Acceptez-vous cette demande ?" #: gajim/gui_interface.py:175 #, python-format msgid "Do you accept this request (account: %s)?" -msgstr "Acceptez vous cette requête (compte : %s) ?" +msgstr "Acceptez-vous cette demande (compte : %s) ?" #: gajim/gui_interface.py:181 msgid "Authorization Request" @@ -721,7 +721,7 @@ msgstr "erreur en envoyant %(message)s ( %(error)s )" #: gajim/gui_interface.py:324 gajim/gtk/notification.py:189 msgid "Subscription request" -msgstr "Requête d'Inscription" +msgstr "Demande d'inscription" #: gajim/gui_interface.py:359 msgid "Authorization accepted" @@ -747,7 +747,7 @@ msgid "" "Do you want to remove them from your contact list?" msgstr "" "Vous verrez toujours ce contact hors-ligne.\n" -"Voulez vous le supprimer de votre liste de contacts ?" +"Voulez-vous le supprimer de votre liste de contacts ?" #: gajim/gui_interface.py:398 gajim/gtk/notification.py:190 msgid "Unsubscribed" @@ -800,7 +800,7 @@ msgstr "Enregistrer le mot de passe" #: gajim/gtk/notification.py:187 gajim/gtk/notification.py:279 #: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334 msgid "File Transfer Error" -msgstr "Erreur de Transfert de fichier" +msgstr "Erreur de transfert de fichiers" #: gajim/gui_interface.py:609 #, python-format @@ -810,7 +810,7 @@ msgstr "%s souhaite vous envoyer un fichier." #: gajim/gui_interface.py:611 gajim/gtk/notification.py:186 #: gajim/gtk/notification.py:276 gajim/gtk/filetransfer.py:485 msgid "File Transfer Request" -msgstr "Requête de transfert de fichier" +msgstr "Requête de transfert de fichiers" #: gajim/gui_interface.py:714 msgid "Remote Contact Stopped Transfer" @@ -828,17 +828,17 @@ msgstr "Erreur de certificat SSL" #: gajim/gui_interface.py:794 gajim/chat_control.py:1573 #: gajim/gtk/notification.py:187 gajim/gtk/notification.py:282 msgid "File Transfer Completed" -msgstr "Transfert de fichier terminé" +msgstr "Transfert de fichiers terminé" #: gajim/gui_interface.py:742 gajim/gui_interface.py:773 #: gajim/gui_interface.py:800 gajim/gtk/notification.py:188 #: gajim/gtk/notification.py:283 msgid "File Transfer Stopped" -msgstr "Transfert de fichier interrompu" +msgstr "Transfert de fichiers interrompu" #: gajim/gui_interface.py:746 msgid "File Transfer Failed" -msgstr "Échec du transfert de fichier" +msgstr "Échec du transfert de fichiers" #: gajim/gui_interface.py:769 #, python-format @@ -923,27 +923,27 @@ msgstr "Gajim : Console IPython" #: gajim/gui_interface.py:1998 msgid "Update Check" -msgstr "Vérification de Mise à Jour" +msgstr "Vérification de mise à jour" #: gajim/gui_interface.py:1999 msgid "Gajim Update Check" -msgstr "Vérification de Mise à Jour Gajim" +msgstr "Vérification de mise à jour pour Gajim" #: gajim/gui_interface.py:2000 msgid "Search for Gajim updates periodically?" -msgstr "Rechercher régulièrement des mises à jour pour Gajim ?" +msgstr "Vérifier régulièrement les mises à jour pour Gajim ?" #: gajim/gui_interface.py:2005 msgid "_Search Periodically" -msgstr "_Rechercher Régulièrement" +msgstr "_Rechercher régulièrement" #: gajim/gui_interface.py:2045 msgid "Update Available" -msgstr "Mise à Jour Disponible" +msgstr "Mise à jour disponible" #: gajim/gui_interface.py:2046 msgid "Gajim Update Available" -msgstr "Une Mise à Jour de Gajim est Disponible" +msgstr "Une mise à jour de Gajim est disponible" #: gajim/gui_interface.py:2047 #, python-format @@ -960,7 +960,7 @@ msgstr "Plus _tard" #: gajim/gui_interface.py:2054 msgid "_Update Now" -msgstr "_Mettre à Jour Maintenant" +msgstr "_Mettre à jour maintenant" #: gajim/gui_menu_builder.py:358 msgid "I would like to add you to my contact list" @@ -968,11 +968,11 @@ msgstr "Je souhaiterais vous ajouter à ma liste de contacts" #: gajim/gui_menu_builder.py:435 msgid "Send Single _Message…" -msgstr "Envoyer un _message simple …" +msgstr "Envoyer un _message simple…" #: gajim/gui_menu_builder.py:450 msgid "E_xecute Command…" -msgstr "_Exécuter une commande …" +msgstr "_Exécuter une commande…" #: gajim/gui_menu_builder.py:458 msgid "_Manage Transport" @@ -992,19 +992,19 @@ msgstr "Envoyer un fichier" #: gajim/gui_menu_builder.py:517 msgid "Upload File…" -msgstr "Envoyer un fichier …" +msgstr "Envoyer un fichier…" #: gajim/gui_menu_builder.py:518 msgid "Send File Directly…" -msgstr "Enregistrer un fichier directement …" +msgstr "Envoyer un fichier directement…" #: gajim/gui_menu_builder.py:520 gajim/gtk/accounts.py:734 msgid "Send Read Markers" -msgstr "Émettre les accusés de lecture" +msgstr "Envoyer les accusés de lecture" #: gajim/gui_menu_builder.py:521 gajim/gtk/accounts.py:710 msgid "Send Chatstate" -msgstr "Émettre le statut" +msgstr "Envoyer l'état" #: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:307 msgid "Invite Contacts…" @@ -1013,7 +1013,7 @@ msgstr "Inviter des contacts…" #: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:741 #: gajim/gui_menu_builder.py:768 gajim/gui_menu_builder.py:807 msgid "Add to Contact List…" -msgstr "Ajouter à la liste de contacts …" +msgstr "Ajouter à la liste de contacts…" #: gajim/gui_menu_builder.py:524 msgid "Block Contact…" @@ -1057,7 +1057,7 @@ msgstr "Gérer le salon" #: gajim/gui_menu_builder.py:579 msgid "Rename…" -msgstr "Renommer …" +msgstr "Renommer…" #: gajim/gui_menu_builder.py:580 msgid "Change Subject…" @@ -1077,7 +1077,7 @@ msgstr "Détruire…" #: gajim/gui_menu_builder.py:585 msgid "Change Nickname…" -msgstr "Modifier le pseudonyme…" +msgstr "Changer de pseudonyme…" #: gajim/gui_menu_builder.py:586 msgid "Request Voice" @@ -1164,12 +1164,12 @@ msgstr "_Ajouter un compte…" #: gajim/gui_menu_builder.py:690 msgid "_Modify Accounts…" -msgstr "_Modifier des comptes …" +msgstr "_Modifier des comptes…" #: gajim/gui_menu_builder.py:700 gajim/data/gui/account_context_menu.ui:79 #: gajim/data/gui/zeroconf_context_menu.ui:26 msgid "_Modify Account…" -msgstr "_Modifier le compte …" +msgstr "_Modifier le compte…" #: gajim/gui_menu_builder.py:704 gajim/gtk/accounts.py:51 msgid "Accounts" @@ -1207,11 +1207,11 @@ msgstr "Ouvrir le logiciel de courriel" #: gajim/gui_menu_builder.py:758 msgid "Copy Location" -msgstr "Copier l'emplacement" +msgstr "Copier la géolocalisation" #: gajim/gui_menu_builder.py:759 gajim/gtk/preferences.py:291 msgid "Show Location" -msgstr "Montrer l'emplacement" +msgstr "Afficher la géolocalisation" #: gajim/gui_menu_builder.py:764 msgid "Copy XMPP Address/Email" @@ -1259,7 +1259,7 @@ msgstr "Copier" #: gajim/chat_control.py:346 gajim/groupchat_control.py:348 msgid "Send File…" -msgstr "Envoyer un fichier …" +msgstr "Envoyer un fichier…" #: gajim/chat_control.py:348 gajim/groupchat_control.py:354 msgid "No File Transfer available" @@ -1395,7 +1395,7 @@ msgid "" "Voice Call" msgstr "" "\n" -"Discussion vocale" +"Audioconférence" #: gajim/chat_control.py:1666 msgid "_Reject" @@ -1403,12 +1403,12 @@ msgstr "_Rejeter" #: gajim/chat_control.py:1692 gajim/gtk/filetransfer.py:297 msgid "File transfer stopped" -msgstr "Transfert de fichier interrompu" +msgstr "Transfert de fichiers interrompu" #: gajim/chat_control.py:1697 gajim/gtk/filetransfer.py:275 #: gajim/gtk/filetransfer.py:284 msgid "File transfer cancelled" -msgstr "Transfert de fichier annulé" +msgstr "Transfert de fichiers annulé" #: gajim/chat_control.py:1698 msgid "Connection with peer cannot be established." @@ -1478,7 +1478,7 @@ msgstr "Avertissement" msgid "" "If you send a file to %s, your real XMPP address will be revealed." msgstr "" -"Si vous envoyer un fichier à %s, votre vrai adresse XMPP sera révélé." +"Si vous envoyez un fichier à %s, votre adresse XMPP sera révélée." #: gajim/chat_control_base.py:1368 msgid "_Continue" @@ -1551,9 +1551,9 @@ msgid "" "change status of account \"account\". If not specified, try to change status " "of all accounts that have \"sync with global status\" option set" msgstr "" -"Change l’état du compte « compte ». Si aucun n’est spécifié, essaye de " -"changer l’état de tous les compte qui ont l’option « synchroniser avec " -"l’état global » activée" +"Change l’état du compte « compte ». Si aucun n’est spécifié, essaie de " +"changer l’état de tous les comptes qui ont l’option « synchroniser avec l’" +"état global » activée" #: gajim/gajim_remote.py:108 msgid "Changes the priority of account(s)" @@ -1580,7 +1580,7 @@ msgstr "" msgid "" "Sends new chat message to a contact in the contact list. Account is optional." msgstr "" -"Envoie un message à un contact de la liste de contact. Le compte est " +"Envoie un message à un contact de la liste de contacts. Le compte est " "facultatif." #: gajim/gajim_remote.py:120 gajim/gajim_remote.py:130 @@ -1601,7 +1601,7 @@ msgstr "Si spécifié, le message sera envoyé en utilisant ce compte" msgid "" "Sends a chat message to someone on your contact list. Account is optional." msgstr "" -"Envoie un message à quelqu'un de votre liste de contact. Le compte est " +"Envoie un message à quelqu'un de votre liste de contacts. Le compte est " "optionnel." #: gajim/gajim_remote.py:131 @@ -1659,11 +1659,11 @@ msgstr "Enlever le contact de la liste" #: gajim/gajim_remote.py:171 msgid "if specified, contact is taken from the contact list of this account" -msgstr "Si spécifié, le contact est pris dans la liste de contact de ce compte" +msgstr "Si spécifié, le contact est pris dans la liste de contacts de ce compte" #: gajim/gajim_remote.py:178 msgid "Returns current status (the global one unless account is specified)" -msgstr "Renvoit l'état actuel (global à moins qu'un compte ne soit spécifié)" +msgstr "Renvoie l'état actuel (global à moins qu'un compte ne soit spécifié)" #: gajim/gajim_remote.py:185 msgid "" @@ -1678,7 +1678,7 @@ msgstr "Renvoie le nombre de messages non-lus" #: gajim/gajim_remote.py:197 msgid "Sends custom XML" -msgstr "Envoyer du XML personnalisé" +msgstr "Envoie du XML personnalisé" #: gajim/gajim_remote.py:199 msgid "XML to send" @@ -1689,7 +1689,7 @@ msgid "" "Account to which the XML will be sent; if not specified, XML will be sent to " "all accounts" msgstr "" -"Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé " +"Compte vers lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé " "à tous les comptes" #: gajim/gajim_remote.py:207 @@ -1706,7 +1706,7 @@ msgid "" "'%s' is not in your contact list.\n" "Please specify account for sending the message." msgstr "" -"'%s' n'est pas dans votre liste de contact.\n" +"'%s' n'est pas dans votre liste de contacts.\n" "Veuillez précisez avec quel compte envoyer le message." #: gajim/gajim_remote.py:256 @@ -1872,11 +1872,11 @@ msgstr "" #: gajim/vcard.py:398 msgid "There is no pending subscription request." -msgstr "Il n’y a aucune requête d’inscription en attente." +msgstr "Il n’y a aucune demande d’inscription en attente." #: gajim/vcard.py:403 gajim/vcard.py:453 gajim/vcard.py:549 msgid " resource with priority " -msgstr " ressource avec la priorité " +msgstr " ressource prioritaire " #: gajim/conversation_textview.py:65 msgid "Untrusted" @@ -1913,7 +1913,7 @@ msgstr "_Actions pour \"%s\"" #: gajim/conversation_textview.py:450 msgid "Read _Wikipedia Article" -msgstr "Lire l'Article _Wikipédia" +msgstr "Lire l'article _Wikipédia" #: gajim/conversation_textview.py:455 msgid "Look it up in _Dictionary" @@ -2012,16 +2012,16 @@ msgstr "Bannit %s" #: gajim/groupchat_control.py:684 msgid "Insert Nickname" -msgstr "Insérer un surnom" +msgstr "Insérer un pseudonyme" #: gajim/groupchat_control.py:775 gajim/groupchat_control.py:776 msgid "Voice Request" -msgstr "Requête de voix" +msgstr "Demande de la parole" #: gajim/groupchat_control.py:777 #, python-format msgid "%(nick)s from %(room_name)s requests voice" -msgstr "%(nick)s de %(room_name)s demande à parler" +msgstr "%(nick)s de %(room_name)s demande la parole" #: gajim/groupchat_control.py:781 msgid "_Approve" @@ -2082,11 +2082,11 @@ msgstr "Vous (%s) avez rejoint le salon de discussion" #: gajim/groupchat_control.py:1193 msgid "Any participant is allowed to see your full XMPP Address" msgstr "" -"N’importe quel occupant est autorisé à voir votre adresse XMPP complète" +"N’importe quel participant est autorisé à voir votre adresse XMPP complète" #: gajim/groupchat_control.py:1201 msgid "The server has assigned or modified your nickname in this group chat" -msgstr "Le serveur à défini ou modifié votre surnom dans ce salon" +msgstr "Le serveur à défini ou modifié votre pseudonyme dans ce salon" #: gajim/groupchat_control.py:1211 msgid "A new group chat has been created" @@ -2145,7 +2145,7 @@ msgstr "Vous avez été banni{actor}{reason}" #: gajim/groupchat_control.py:1360 gajim/groupchat_control.py:1423 msgid ": Affiliation changed" -msgstr ": Affiliation changée" +msgstr ": Affiliation modifiée" #: gajim/groupchat_control.py:1366 gajim/groupchat_control.py:1428 msgid ": Group chat configuration changed to members-only" @@ -2261,7 +2261,7 @@ msgstr "Formulaire invalide" #: gajim/dialog_messages.py:49 msgid "The form is not filled correctly." -msgstr "Le forumlaire n'est pas correctement rempli." +msgstr "Le formulaire n'est pas rempli correctement." #: gajim/dialog_messages.py:53 msgid "No Connection Available" @@ -2281,7 +2281,7 @@ msgid "" "The XMPP Address you entered is already in the list. Please choose another " "one." msgstr "" -"L'adresse XMPP que vous avez entré est déjà dans la liste. Veuillez en " +"L'adresse XMPP que vous avez entrée est déjà dans la liste. Veuillez en " "choisir une autre." #: gajim/dialog_messages.py:64 @@ -2378,7 +2378,7 @@ msgstr "Erreur lors de l’exécution de la commande !" #: gajim/command_system/implementation/execute.py:60 msgid "Execute expression inside a shell, show output" -msgstr "Éxecute une expression dans un shell, montre la sortie" +msgstr "Exécute une expression dans un shell, montre la sortie" #: gajim/command_system/implementation/execute.py:74 msgid "" @@ -2391,14 +2391,14 @@ msgstr "" #: gajim/command_system/implementation/execute.py:125 msgid "Execute expression inside a shell, send output" -msgstr "Éxecute une expression dans un shell, envoie la sortie" +msgstr "Exécute une expression dans un shell, envoie la sortie" #: gajim/command_system/implementation/standard.py:52 msgid "" "Show help on a given command or a list of available commands if -a is given" msgstr "" -"Montre l'aide sur une commande donnée ou une listre des commandes possibles " -"si -a est ajouté" +"Affiche l'aide concernant une commande ou une liste de commandes si -a est " +"ajouté" #: gajim/command_system/implementation/standard.py:81 msgid "Send a message to the contact" @@ -2415,7 +2415,7 @@ msgstr "Montre les messages enregistrés qui mentionnent le texte donné" #: gajim/command_system/implementation/standard.py:96 #, python-format msgid "%s: Nothing found" -msgstr "%s : rien de trouvé" +msgstr "%s : aucun résultat" #: gajim/command_system/implementation/standard.py:102 msgid "Limit must be an integer" @@ -2434,7 +2434,8 @@ msgstr "" " Définit l'état actuel\n" "\n" " L'état doit être l'une des valeurs suivantes :\n" -" online, away, chat, xa, dnd.\n" +" en-ligne (online), absent (away), discute (chat), xa, ne pas déranger " +"(dnd).\n" " " #: gajim/command_system/implementation/standard.py:145 @@ -2461,7 +2462,7 @@ msgstr "Envoyer une requête \"disco info\"" #: gajim/command_system/implementation/standard.py:192 #: gajim/command_system/implementation/standard.py:273 msgid "Clear the text window" -msgstr "Nettoie la fenêtre de conversation" +msgstr "Vider la fenêtre de conversation" #: gajim/command_system/implementation/standard.py:197 #: gajim/command_system/implementation/standard.py:425 @@ -2508,11 +2509,11 @@ msgstr "Envoie un message à ce contact qui attirera son attention" #: gajim/command_system/implementation/standard.py:278 msgid "Change your nickname in a group chat" -msgstr "Changer votre surnom dans un salon de discussion" +msgstr "Changer votre pseudonyme dans un salon de discussion" #: gajim/command_system/implementation/standard.py:283 msgid "Invalid nickname" -msgstr "Nom d'utilisateur invalide" +msgstr "Pseudonyme invalide" #: gajim/command_system/implementation/standard.py:290 msgid "Open a private chat window with a specified participant" @@ -2524,7 +2525,7 @@ msgstr "Ouvrir une fenêtre de conversation privée avec le participant spécifi #: gajim/command_system/implementation/standard.py:373 #: gajim/command_system/implementation/standard.py:385 msgid "Nickname not found" -msgstr "Surnom introuvable" +msgstr "Pseudonyme introuvable" #: gajim/command_system/implementation/standard.py:299 msgid "" @@ -2562,15 +2563,15 @@ msgid "" " " msgstr "" "\n" -" Bannir un utilisateur par son surnom ou son JID d'un salon de " +" Bannir un utilisateur par son pseudo ou son JID d'un salon de " "discussion\n" "\n" -" Si le surnom donné n'existe pas, il sera traité comme un JID.\n" +" Si le pseudonyme donné n'existe pas, il sera traité comme un JID.\n" " " #: gajim/command_system/implementation/standard.py:357 msgid "Kick user from group chat by nickname" -msgstr "Éjecter un utilisateur par son surnom d'un salon de discussion" +msgstr "Éjecter un utilisateur par son pseudonyme d'un salon de discussion" #: gajim/command_system/implementation/standard.py:366 msgid "" @@ -2606,7 +2607,7 @@ msgstr "Afficher les noms les tous les participants du salon" #: gajim/command_system/implementation/standard.py:415 msgid "Forbid a participant to send you public or private messages" -msgstr "Interdire un occupant de vous envoyer des messages publics ou privés" +msgstr "Interdire à un occupant de vous envoyer des messages publics ou privés" #: gajim/command_system/implementation/standard.py:420 msgid "Allow a participant to send you public or private messages" @@ -2618,7 +2619,7 @@ msgstr "Pseudonyme inconnu" #: gajim/command_system/implementation/custom.py:114 msgid "The same as using a doc-string, except it supports translation" -msgstr "Pareil qu'utiliser une doc-string, mais supporte la traduction" +msgstr "Identique à utiliser une doc-string, mais supporte la traduction" #: gajim/gtk/ssl_error_dialog.py:36 gajim/data/gui/ssl_error_dialog.ui:16 msgid "SSL Certificate Verification Error" @@ -2880,7 +2881,7 @@ msgstr "Afficher le bouton \"Envoyer\"" #: gajim/gtk/preferences.py:358 msgid "Show Chat State In Tabs" -msgstr "Afficher le statut dans les onglets" +msgstr "Afficher l'état dans les onglets" #: gajim/gtk/preferences.py:361 msgid "Show the contact’s chat state (e.g. typing) in the chat’s tab" @@ -2890,7 +2891,7 @@ msgstr "" #: gajim/gtk/preferences.py:365 msgid "Show Chat State In Banner" -msgstr "Afficher le statut dans la bannière" +msgstr "Afficher l'état dans la bannière" #: gajim/gtk/preferences.py:368 msgid "Show the contact’s chat state (e.g. typing) in the chats tab’s banner" @@ -3184,7 +3185,7 @@ msgstr "Vérifier mises à jour" #: gajim/gtk/preferences.py:997 gajim/common/config.py:241 msgid "Check for Gajim updates periodically" -msgstr "Vérifier régulièrement les mises à jour Gajim" +msgstr "Vérifier régulièrement les mises à jour de Gajim" #: gajim/gtk/preferences.py:1033 msgid "Debug Logging" @@ -3324,7 +3325,7 @@ msgstr "Erreur dans les préférences d'archivage" #: gajim/gtk/mam_preferences.py:110 msgid "Error received: {}" -msgstr "Erreur reçus : {}" +msgstr "Erreur reçue : {}" #: gajim/gtk/statusicon.py:198 msgid "_Change Status Message…" @@ -3354,7 +3355,7 @@ msgstr "Commencer/rejoindre une discussion" #: gajim/gtk/start_chat.py:285 gajim/gtk/start_chat.py:370 msgid "You can not join a group chat unless you are connected." msgstr "" -"Vous ne pouvez joindre un salon de discussion tant que vous n'êtes pas " +"Vous ne pouvez rejoindre un salon de discussion tant que vous n'êtes pas " "connecté." #: gajim/gtk/start_chat.py:634 gajim/gtk/groupchat_join.py:40 @@ -3421,19 +3422,19 @@ msgstr "Inviter un nouveau contact" #: gajim/gtk/themes.py:37 msgid "Chatstate Composing" -msgstr "Statut \"en train d'écrire\"" +msgstr "État \"en train d'écrire\"" #: gajim/gtk/themes.py:41 msgid "Chatstate Inactive" -msgstr "Statut \"inactif\"" +msgstr "État \"inactif\"" #: gajim/gtk/themes.py:45 msgid "Chatstate Gone" -msgstr "Statut \"parti\"" +msgstr "État \"absent\"" #: gajim/gtk/themes.py:49 msgid "Chatstate Paused" -msgstr "Statut \"en pause\"" +msgstr "État \"en pause\"" #: gajim/gtk/themes.py:53 msgid "Group Chat Tab New Directed Message" @@ -3589,7 +3590,7 @@ msgid "" "Do you want to delete this theme?" msgstr "" "C'est le thème que vous utilisez actuellement.\n" -"Voulez vous supprimer ce thème ?" +"Voulez-vous supprimer ce thème ?" #: gajim/gtk/themes.py:363 msgid "Delete Theme" @@ -3611,7 +3612,7 @@ msgstr "%(progress)s sur %(total)s" #: gajim/gtk/filetransfer_progress.py:130 #, python-format msgid "%(minutes)s min %(seconds)s sec" -msgstr "%(minutes)s min %(seconds)s sec" +msgstr "%(minutes)s mn %(seconds)s sec" #: gajim/gtk/add_contact.py:32 msgid "GG Number" @@ -3734,7 +3735,7 @@ msgstr "Ce serveur ne supporte pas la connexion anonyme." #: gajim/common/const.py:958 gajim/common/const.py:959 #: gajim/common/const.py:960 gajim/common/const.py:963 msgid "Authentication failed" -msgstr "Échec de l'authentification" +msgstr "Échec d'authentification" #: gajim/gtk/account_wizard.py:384 gajim/gtk/account_wizard.py:385 msgid "Signup not allowed" @@ -3833,8 +3834,8 @@ msgid "" "has invited you to a group chat.\n" "Do you want to join?" msgstr "" -"vous a intivé dans un salon de discussion.\n" -"Voulez-vous rejoindre ?" +"vous a invité dans un salon de discussion.\n" +"Voulez-vous le rejoindre ?" #: gajim/gtk/groupchat_invitation.py:75 gajim/gtk/discovery.py:1706 #: gajim/gtk/groupchat_join.py:68 gajim/data/gui/groupchat_control.ui:899 @@ -3947,7 +3948,7 @@ msgstr "Supprimer le compte" #: gajim/gtk/remove_account.py:180 msgid "This will remove your account from Gajim." -msgstr "Cela va supprimer votre compte de Gajim." +msgstr "Cela supprimera votre compte de Gajim." #: gajim/gtk/remove_account.py:189 #, python-format @@ -4026,7 +4027,7 @@ msgid "" msgstr "" "Le fichier %s a été reçu mais il semble avoir été endommagé lors du " "transfert.\n" -"Voulez-vous le re-télécharger de nouveau ?" +"Voulez-vous le télécharger à nouveau ?" #: gajim/gtk/filetransfer.py:341 msgid "_Download Again" @@ -4050,12 +4051,12 @@ msgid "" "A file with this name already exists and you do not have permission to " "overwrite it." msgstr "" -"Un fichier du même nom existe déjà et vous n’avez pas la permission de " +"Un fichier de même nom existe déjà et vous n’avez pas la permission de " "l’écraser." #: gajim/gtk/filetransfer.py:424 msgid "File Transfer Conflict" -msgstr "Conflit de transfert de fichier" +msgstr "Conflit de transfert de fichiers" #: gajim/gtk/filetransfer.py:425 msgid "File already exists" @@ -4266,7 +4267,7 @@ msgstr "Envoyer %s" #: gajim/gtk/single_message.py:183 #, python-format msgid "Received %s" -msgstr "%s Reçu" +msgstr "%s reçu" #: gajim/gtk/single_message.py:205 #, python-format @@ -4314,11 +4315,11 @@ msgstr "Tentative de changement de mot de passe..." #: gajim/gtk/change_password.py:55 gajim/gtk/change_password.py:56 msgid "Password Changed" -msgstr "Mot de passe changé" +msgstr "Mot de passe modifié" #: gajim/gtk/change_password.py:57 msgid "Your password has successfully been changed." -msgstr "Votre mot de passe a été changé avec succès." +msgstr "Votre mot de passe a été modifié avec succès." #: gajim/gtk/change_password.py:60 gajim/gtk/change_password.py:61 msgid "Password Change Failed" @@ -4424,11 +4425,11 @@ msgstr "Vous devez être connecté pour parcourir les services disponibles" #: gajim/gtk/discovery.py:610 #, python-format msgid "Service Discovery using account %s" -msgstr "Gestion des Services du compte %s" +msgstr "Gestion des services du compte %s" #: gajim/gtk/discovery.py:612 msgid "Service Discovery" -msgstr "Gestion des Services" +msgstr "Gestion des services" #: gajim/gtk/discovery.py:695 msgid "The service could not be found" @@ -4639,7 +4640,7 @@ msgstr "Semi-anonyme" #: gajim/gtk/groupchat_info.py:53 msgid "Only moderators can see your XMPP address" -msgstr "Seuls les modérateurs peuvent voir l’adresse XMPP" +msgstr "Seuls les modérateurs peuvent voir votre adresse XMPP" #: gajim/gtk/groupchat_info.py:56 msgid "?Group chat feature:Moderated" @@ -4908,7 +4909,7 @@ msgstr "Rétablir toutes les discussions à la valeur par défaut actuelle" #: gajim/gtk/accounts.py:722 msgid "Send Chatstate in Group Chats" -msgstr "Émettre le statut dans les salons de discussion" +msgstr "Envoyer l'état dans les chats de groupe" #: gajim/gtk/accounts.py:725 msgid "Default for group chats" @@ -5194,7 +5195,7 @@ msgstr "Version de PyGObject : %s" #: gajim/gtk/about.py:55 #, python-format msgid "python-nbxmpp Version: %s" -msgstr "python-nbxmpp Version : %s" +msgstr "Version de python-nbxmpp : %s" #: gajim/gtk/about.py:59 msgid "Current Developers" @@ -5214,7 +5215,7 @@ msgstr "Enfin et surtout" #: gajim/gtk/about.py:66 msgid "we would like to thank all the package maintainers." -msgstr "nous voulons remercier tous les mainteneurs de paquet." +msgstr "nous voudrions remercier tous les mainteneurs de paquets." #: gajim/gtk/about.py:67 msgid "Thanks" @@ -5278,14 +5279,14 @@ msgstr "Fonctionnalité indisponible sous Windows" #: gajim/gtk/features.py:97 msgid "Automatic Status" -msgstr "Statut automatique" +msgstr "État automatique" #: gajim/gtk/features.py:99 msgid "" "Enables Gajim to measure your computer's idle time in order to set your " "Status automatically" msgstr "" -"Autorise Gajim à mesurer le temps d’inactivité, afin de définir un statut " +"Autorise Gajim à mesurer le temps d’inactivité, afin de définir un état " "automatique" #: gajim/gtk/features.py:101 @@ -5507,7 +5508,7 @@ msgstr "Nom complet" #: gajim/gtk/profile.py:29 gajim/gtk/vcard_grid.py:35 #: gajim/data/gui/vcard_information_window.ui:770 msgid "Birthday" -msgstr "Date de Naissance" +msgstr "Date de naissance" #: gajim/gtk/profile.py:30 gajim/gtk/vcard_grid.py:36 msgid "Gender" @@ -5559,7 +5560,7 @@ msgstr "Choisissez un fichier à envoyer…" #: gajim/gtk/filechoosers.py:94 msgid "Choose Avatar…" -msgstr "Choisissez un Avatar…" +msgstr "Choisissez un avatar…" #: gajim/gtk/filechoosers.py:98 msgid "PNG files" @@ -5571,7 +5572,7 @@ msgstr "Fichiers JPEG" #: gajim/gtk/filechoosers.py:100 msgid "SVG files" -msgstr "Fichier SVG" +msgstr "Fichiers SVG" #: gajim/gtk/filechoosers.py:102 msgid "Images" @@ -5579,7 +5580,7 @@ msgstr "Images" #: gajim/gtk/filechoosers.py:139 msgid "Choose Archive" -msgstr "Choisissez une Archive" +msgstr "Choisissez une archive" #: gajim/gtk/filechoosers.py:141 msgid "ZIP files" @@ -5587,7 +5588,7 @@ msgstr "Fichier ZIP" #: gajim/gtk/filechoosers.py:146 msgid "Save File as…" -msgstr "Enregistrer le Fichier sous…" +msgstr "Enregistrer le fichier sous…" #: gajim/gtk/filechoosers.py:180 msgid "_Open" @@ -5822,7 +5823,7 @@ msgstr "Dehors" #: gajim/common/setting_values.py:325 msgid "I’m out enjoying life." -msgstr "Je suis sorti profiter de la vie." +msgstr "Je suis sorti·e profiter de la vie." #: gajim/common/setting_values.py:393 gajim/common/config.py:84 msgid "" @@ -5845,8 +5846,7 @@ msgstr "" #: gajim/common/setting_values.py:395 gajim/common/config.py:99 msgid "Treat * / _ pairs as possible formatting characters." -msgstr "" -"Traiter les paires de * / _ comme des éventuels caractères de formatage." +msgstr "Traiter les paires de * / _ comme d'éventuels caractères de formatage." #: gajim/common/setting_values.py:396 gajim/common/config.py:100 msgid "" @@ -5874,7 +5874,7 @@ msgstr "" #: gajim/common/setting_values.py:399 gajim/common/config.py:131 msgid "Place the contact list on the right in single window mode" -msgstr "Placer la liste de contact sur la droite dans le monde fenêtre unique" +msgstr "Placer la liste de contacts sur la droite dans le monde fenêtre unique" #: gajim/common/setting_values.py:400 gajim/common/config.py:137 msgid "" @@ -5980,7 +5980,7 @@ msgstr "" #: gajim/common/setting_values.py:419 gajim/common/config.py:159 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes." -msgstr "D'après le standard IEC, KiB = 1024 bytes, KB = 1000 bytes." +msgstr "D'après le standard IEC, KiB = 1024 octets, KB = 1000 octets." #: gajim/common/setting_values.py:421 gajim/common/config.py:161 msgid "Notify of events in the notification area." @@ -5992,7 +5992,7 @@ msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?" #: gajim/common/setting_values.py:423 gajim/common/config.py:167 msgid "Show tabbed notebook border in chat windows?" -msgstr "Afficher la bordure fenêtres de discussion à onglets ?" +msgstr "Afficher la bordure des blocs à onglets, dans les fenêtres de chat ?" #: gajim/common/setting_values.py:424 gajim/common/config.py:168 msgid "Show close button in tab?" @@ -6000,7 +6000,7 @@ msgstr "Afficher le bouton fermer sur l'onglet ?" #: gajim/common/setting_values.py:425 gajim/common/config.py:169 msgid "Preview new messages in notification popup?" -msgstr "Aperçu des nouveaux messages dans un popup ?" +msgstr "Aperçu des nouveaux messages dans une popup ?" #: gajim/common/setting_values.py:426 gajim/common/config.py:172 msgid "" @@ -6076,8 +6076,8 @@ msgid "" "Ctrl+Tab switches to the next composing tab when there are no tabs with " "messages pending." msgstr "" -"Ctrl+Tab bascule au prochain onglet en train de composer lorsqu'il n'y en a " -"pas d'autres avec des messages non lus." +"Ctrl+Tab bascule au prochain onglet en train d'écrire lorsqu'il n'y en a pas " +"d'autres avec des messages non lus." #: gajim/common/setting_values.py:443 gajim/common/config.py:200 msgid "" @@ -6111,8 +6111,9 @@ msgid "" "If enabled, Gajim will show both the number of online and total contacts in " "account rows as well as in group rows." msgstr "" -"Si cette case est cochée, Gajim montrera le nombre de contacts en ligne et " -"totaux sur les lignes de compte ainsi que de groupe." +"Si cette option est activée, Gajim affichera à la fois le nombre de contacts " +"en ligne et le nombre total de contacts dans les lignes de compte ainsi que " +"dans les lignes de groupe." #: gajim/common/setting_values.py:447 gajim/common/config.py:204 msgid "" @@ -6126,7 +6127,7 @@ msgstr "" msgid "Time of inactivity needed before the change status window closes down." msgstr "" "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se " -"faire." +"ferme." #: gajim/common/setting_values.py:449 gajim/common/config.py:206 msgid "" @@ -6154,7 +6155,7 @@ msgstr "" #: gajim/common/setting_values.py:452 gajim/common/config.py:218 msgid "STUN server to use when using Jingle" -msgstr "Serveur STUN a utiliser avec jingle" +msgstr "Serveur STUN à utiliser avec Jingle" #: gajim/common/setting_values.py:453 gajim/common/config.py:220 msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')." @@ -6170,11 +6171,11 @@ msgstr "" #: gajim/common/setting_values.py:455 gajim/common/config.py:224 msgid "If enabled, Gajim will execute XEP-0146 Commands." -msgstr "Si activé, Gajim exécutera les commandes de la XEP-0146." +msgstr "Si activé, Gajim exécutera les commandes de XEP-0146." #: gajim/common/setting_values.py:458 gajim/common/config.py:236 msgid "API Preferences. Possible values: 'http', 'iq'" -msgstr "API préférée. Valeurs possible : 'http', 'iq'" +msgstr "Préférences de l'API. Valeurs possibles : 'http', 'iq'" #: gajim/common/setting_values.py:459 gajim/common/config.py:237 msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)." @@ -6183,8 +6184,7 @@ msgstr "" #: gajim/common/setting_values.py:460 gajim/common/config.py:238 msgid "Width of group chat roster in pixel" -msgstr "" -"Largeur de la liste des participants des salons de discussion en pixels" +msgstr "Largeur en pixels de la liste des participants des salons de discussion" #: gajim/common/setting_values.py:461 gajim/common/config.py:239 msgid "Force Bookmark 2 usage" @@ -6433,7 +6433,7 @@ msgstr "Bonjour, je m'appelle $name." #: gajim/common/config.py:71 msgid "Play sound even when being busy." -msgstr "Jouer les sons quand vous êtes occupé⋅e." +msgstr "Jouer les sons même quand vous êtes occupé⋅e." #: gajim/common/config.py:73 msgid "Show only online and free for chat contacts in the contact list." @@ -6459,7 +6459,7 @@ msgstr "" #: gajim/common/config.py:79 msgid "Time in minutes, after which your status changes to not available." -msgstr "Temps en minutes après lequel votre état basculera non disponible." +msgstr "Temps en minutes après lequel votre état basculera à non disponible." #: gajim/common/config.py:80 msgid "$S (Not available: Idle more than $T min)" @@ -6490,7 +6490,7 @@ msgstr "" #: gajim/common/config.py:94 gajim/common/config.py:335 #: gajim/common/config.py:342 msgid "Language used for spell checking." -msgstr "Langue utilisée par le vérificateur orthographique." +msgstr "Langue utilisée pour la vérificateur orthographique." #: gajim/common/config.py:97 msgid "When enabled, ASCII emojis will be converted to graphical emojis." @@ -6536,7 +6536,7 @@ msgid "" "chat." msgstr "" "Paramètres par défaut : Montrer le message d’état pour chaque connexion ou " -"déconnexion au salon de discussion." +"déconnexion du salon de discussion." #: gajim/common/config.py:184 msgid "" @@ -6586,18 +6586,17 @@ msgid "" "(mailto and xmpp are handled separately)." msgstr "" "Schémas d'URI valides. Seuls les schémas dans cette liste seront acceptés " -"comment « vraies » URI. (mailto et xmpp sont gérés séparément)." +"comme « véritables » URI. (mailto et xmpp sont gérés séparément)." #: gajim/common/config.py:212 msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2." msgstr "" -"Fixe éventuellement le nombre d'image par seconde pour la sortie vidéo " -"jingle. Exemple : 10/1 ou 25/2." +"Fixe éventuellement le nombre d'images par seconde pour la sortie vidéo " +"Jingle. Exemple : 10/1 ou 25/2." #: gajim/common/config.py:213 msgid "Optionally resize Jingle output video. Example: 320x240." -msgstr "" -"Redimensionne éventuellement la sortie vidéo jingle. Exemple : 320x240." +msgstr "Redimensionne éventuellement la sortie vidéo Jingle. Exemple : 320x240." #: gajim/common/config.py:214 msgid "If enabled, you will see your webcam's video stream as well." @@ -6616,8 +6615,8 @@ msgid "" "If enabled, Gajim will display an icon to show that sent messages have been " "received by your contact." msgstr "" -"Si cette case est cochée, Gajim affichera un icône indiquant si les messages " -"envoyés ont été reçus par votre contact." +"Si activé, Gajim affichera un icône indiquant si les messages envoyés ont " +"été reçus par votre contact." #: gajim/common/config.py:223 msgid "" @@ -6635,16 +6634,16 @@ msgid "" "Maximum history in days we request from a public group chat archive. 0: As " "much as possible." msgstr "" -"Nombre maximum de jours d'historique demandé au serveur lorsqu’un salon " -"publique est rejoint. 0 : Autant que possible." +"Nombre de jours d'historique demandé au serveur lorsque l'on rejoint un " +"salon publique. 0 : Autant que possible." #: gajim/common/config.py:227 msgid "" "Maximum history in days we request from a private group chat archive. 0: As " "much as possible." msgstr "" -"Nombre maximum de jours d'historique demandé au serveur lorsqu'un salon " -"privé est rejoint. 0 : Autant que possible." +"Nombre de jours d'historique demandé au serveur lorsque l'on rejoint un " +"salon privé. 0 : Autant que possible." #: gajim/common/config.py:228 msgid "" @@ -6658,32 +6657,28 @@ msgstr "" msgid "" "If enabled, the contact row is colored according to the current chat state " "of the contact." -msgstr "" -"Si cette case est cochée, la ligne des contacts est colorée selon l’état de " -"discussion du contact." +msgstr "Si activé, la ligne des contacts est colorée selon l’état du contact." #: gajim/common/config.py:230 msgid "" "If enabled, the tab is colored according to the current chat state of the " "contact." -msgstr "" -"Si cette case est cochée, l’onglet est coloré selon l’état de discussion du " -"contact." +msgstr "Si activé, l’onglet est coloré selon l’état du contact." #: gajim/common/config.py:231 msgid "" "Shows a text in the banner that describes the current chat state of the " "contact." -msgstr "" -"Montre un texte dans la bannière indiquant l’état de discussion du contact." +msgstr "Affiche un texte dans la bannière indiquant l’état du contact." #: gajim/common/config.py:232 msgid "" "Chat state notifications that are sent to contacts. Possible values: all, " "composing_only, disabled" msgstr "" -"Notifications d'état qui sont envoyées au contacts. Peut être : all (tous), " -"composing_only (en train de composer seulement) ou disabled (désactivé)" +"Notifications d'état qui sont envoyées aux contacts. Peut être : \"tous\" " +"(all), \"seulement en train d'écrire\" (composing_only) ou \"désactivé\" " +"(disabled)" #: gajim/common/config.py:233 msgid "" @@ -6691,8 +6686,8 @@ msgid "" "'all', 'composing_only', 'disabled'" msgstr "" "Notifications d'état qui sont envoyées au salon de discussion. Peut être : " -"all (tous), composing_only (en train de composer seulement) ou disabled " -"(désactivé)" +"\"tous\" (all), \"seulement en train d'écrire\" (composing_only) ou " +"\"désactivé\" (disabled)" #: gajim/common/config.py:240 msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog" @@ -6702,7 +6697,7 @@ msgstr "" #: gajim/common/config.py:242 msgid "Date of the last update check" -msgstr "Date de la dernière vérification de mise à jour" +msgstr "Date de la dernière vérification des mises à jour" #: gajim/common/config.py:260 msgid "" @@ -6773,12 +6768,12 @@ msgstr "" msgid "" "Allow Gajim to send information about the operating system you are running." msgstr "" -"Si cette case est cochée, Gajim autorisera les autres à détecter le système " -"d'exploitation que vous utilisez." +"Autorise Gajim à envoyer des informations sur le système d'exploitation que " +"vous utilisez." #: gajim/common/config.py:304 msgid "Allow Gajim to send your local time." -msgstr "Autorise Gajim à envoyer votre heure." +msgstr "Autorise Gajim à envoyer votre heure locale." #: gajim/common/config.py:307 msgid "Message that is sent to contacts you want to add." @@ -6789,9 +6784,8 @@ msgid "" "If enabled, Gajim will send your local IP so your contact can connect to " "your machine for file transfers." msgstr "" -"Si cette case est cochée, Gajim enverra vos IPs publiques pour que vos " -"contacts puissent se connecter à votre machine pour les transferts de " -"fichiers." +"Si activé, Gajim enverra votre IP publique pour que vos contacts puissent se " +"connecter à votre machine pour les transferts de fichiers." #: gajim/common/config.py:309 msgid "" @@ -6799,7 +6793,7 @@ msgid "" "re-opened on next startup." msgstr "" "Liste d'adresses XMPP séparées par des espaces, pour lesquelles vous voulez " -"rouvrir la fenêtre de discussion au prochain démarrage." +"ré-ouvrir la fenêtre de discussion au prochain démarrage." #: gajim/common/config.py:311 msgid "" @@ -6818,8 +6812,9 @@ msgid "" "Chat state notifications that are sent to contacts. Possible values: 'all', " "'composing_only', 'disabled'" msgstr "" -"Notifications d'état qui sont envoyées aux contacts. Peut être \"all\", " -"\"composing_only\" ou \"disabled\"" +"Notifications d'état qui sont envoyées aux contacts. Peut être \"tous\" (all)" +", \"seulement en train d'écrire\" (composing_only) ou \"désactivé\" " +"(disabled)" #: gajim/common/config.py:339 msgid "The currently active encryption for that contact." @@ -6828,9 +6823,7 @@ msgstr "Chiffrement actuellement actif pour ce contact." #: gajim/common/config.py:343 msgid "" "If enabled, a notification is created for every message in this group chat." -msgstr "" -"Si cette case est cochée, une notification est émise pour chaque message de " -"ce salon." +msgstr "Si activé, une notification est émise pour chaque message de ce salon." #: gajim/common/config.py:344 msgid "" @@ -6859,8 +6852,8 @@ msgid "" "If enabled, the group chat is minimized into the contact list when closing " "it." msgstr "" -"Si cette case est cochée, le salon de discussion est réduit dans la liste de " -"contacts à la fermeture." +"Si activé, le salon de discussion est réduit dans la liste de contacts à la " +"fermeture." #: gajim/common/config.py:348 msgid "" @@ -6868,7 +6861,8 @@ msgid "" "'all', 'composing_only' or 'disabled'." msgstr "" "Notifications d'état qui sont envoyées au salon de discussion. Peut être " -"all, composing_only ou disabled." +"\"tous\" (all), \"seulement en train d'écrire\" (composing_only) ou " +"\"désactivé\" (disabled)." #: gajim/common/config.py:351 msgid "" @@ -6909,7 +6903,7 @@ msgid "" "Sound to play when a group chat message contains one of the words in " "'muc_highlight_words' or your nickname is mentioned." msgstr "" -"Son à jouer lorsqu'un message de salon contient un des mots de " +"Son émis lorsqu'un message de salon contient un des mots de " "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom." #: gajim/common/config.py:374 @@ -7068,14 +7062,14 @@ msgstr "Salon de discussion fermé" #: gajim/common/const.py:319 msgid "This message was encrypted with OTR and could not be decrypted." -msgstr "Ce message a été chiffre avec OTR et ne peux pas être déchiffré." +msgstr "Ce message a été chiffre avec OTR et ne peut pas être déchiffré." #: gajim/common/const.py:322 msgid "" "This message was encrypted with Legacy OpenPGP and could not be decrypted. " "You can install the PGP plugin to handle those messages." msgstr "" -"Ce message a été chiffre avec l'ancien OpenPGP et ne peux pas être " +"Ce message a été chiffré avec l'ancien OpenPGP et ne peut pas être " "déchiffré. Vous pouvez installer l'extension PGP pour gérer ces messages." #: gajim/common/const.py:326 @@ -7083,13 +7077,13 @@ msgid "" "This message was encrypted with OpenPGP for XMPP and could not be decrypted. " "You can install the OpenPGP plugin to handle those messages." msgstr "" -"Ce message a été chiffré avec OpenPGP et ne peux pas être déchiffré. Vous " +"Ce message a été chiffré avec OpenPGP et ne peut pas être déchiffré. Vous " "pouvez installer l'extension OpenPGP pour gérer ce genre de messages." #: gajim/common/const.py:330 #, python-format msgid "This message was encrypted with %s and could not be decrypted." -msgstr "Ce message a été chiffre avec %s et ne peux pas être déchiffré." +msgstr "Ce message a été chiffré avec %s et ne peut pas être déchiffré." #: gajim/common/const.py:337 msgid "Doing Chores" @@ -7157,11 +7151,11 @@ msgstr "Prend le petit-déjeuner" #: gajim/common/const.py:356 msgid "Having Dinner" -msgstr "Soupe" +msgstr "Dîne" #: gajim/common/const.py:357 msgid "Having Lunch" -msgstr "Dîne" +msgstr "Déjeune" #: gajim/common/const.py:359 msgid "Exercising" @@ -7209,7 +7203,7 @@ msgstr "Se toilette" #: gajim/common/const.py:371 msgid "At the Spa" -msgstr "À la station thermale" +msgstr "Au spa" #: gajim/common/const.py:372 msgid "Brushing Teeth" @@ -7305,7 +7299,7 @@ msgstr "Fume" #: gajim/common/const.py:399 msgid "Socializing" -msgstr "Se socialise" +msgstr "Socialise" #: gajim/common/const.py:400 msgid "Sunbathing" @@ -7365,7 +7359,7 @@ msgstr "En train" #: gajim/common/const.py:417 msgid "On a Trip" -msgstr "En séjour" +msgstr "En voyage" #: gajim/common/const.py:418 msgid "Walking" @@ -7397,7 +7391,7 @@ msgstr "Épaté⋅e" #: gajim/common/const.py:429 msgid "Amorous" -msgstr "Amoureux(se)" +msgstr "Amoureux/se" #: gajim/common/const.py:430 msgid "Angry" @@ -7409,7 +7403,7 @@ msgstr "Ennuyé⋅e" #: gajim/common/const.py:432 msgid "Anxious" -msgstr "Anxieux(se)" +msgstr "Anxieux/se" #: gajim/common/const.py:433 msgid "Aroused" @@ -7417,7 +7411,7 @@ msgstr "Excité⋅e" #: gajim/common/const.py:434 msgid "Ashamed" -msgstr "Honteux(se)" +msgstr "Honteux/se" #: gajim/common/const.py:435 msgid "Bored" @@ -7425,7 +7419,7 @@ msgstr "Ennuyé⋅e" #: gajim/common/const.py:436 msgid "Brave" -msgstr "Courageux(se)" +msgstr "Courageux/se" #: gajim/common/const.py:437 msgid "Calm" @@ -7449,7 +7443,7 @@ msgstr "Confus⋅e" #: gajim/common/const.py:442 msgid "Contemplative" -msgstr "Contemplatif(ve)" +msgstr "Contemplatif/ve" #: gajim/common/const.py:443 msgid "Contented" @@ -7457,7 +7451,7 @@ msgstr "Satisfait⋅e" #: gajim/common/const.py:444 msgid "Cranky" -msgstr "Grincheux(se)" +msgstr "Grincheux/se" #: gajim/common/const.py:445 msgid "Crazy" @@ -7465,11 +7459,11 @@ msgstr "Cinglé⋅e" #: gajim/common/const.py:446 msgid "Creative" -msgstr "Créatif(ve)" +msgstr "Créatif/ve" #: gajim/common/const.py:447 msgid "Curious" -msgstr "Curieux(se)" +msgstr "Curieux/se" #: gajim/common/const.py:448 msgid "Dejected" @@ -7501,7 +7495,7 @@ msgstr "Embarrassé⋅e" #: gajim/common/const.py:455 msgid "Envious" -msgstr "Envieux(se)" +msgstr "Envieux/se" #: gajim/common/const.py:456 msgid "Excited" @@ -7509,7 +7503,7 @@ msgstr "Excité⋅e" #: gajim/common/const.py:457 msgid "Flirtatious" -msgstr "Dragueur(se)" +msgstr "Dragueur/se" #: gajim/common/const.py:458 msgid "Frustrated" @@ -7525,7 +7519,7 @@ msgstr "En deuil" #: gajim/common/const.py:461 msgid "Grumpy" -msgstr "Grognon(ne)" +msgstr "Grognon/ne" #: gajim/common/const.py:462 msgid "Guilty" @@ -7533,11 +7527,11 @@ msgstr "Coupable" #: gajim/common/const.py:463 msgid "Happy" -msgstr "Heureux(se)" +msgstr "Heureux/se" #: gajim/common/const.py:464 msgid "Hopeful" -msgstr "optimiste" +msgstr "Optimiste" #: gajim/common/const.py:465 msgid "Hot" @@ -7565,11 +7559,11 @@ msgstr "Impressionné⋅e" #: gajim/common/const.py:471 msgid "In Awe" -msgstr "Craintif(ve)" +msgstr "Craintif/ve" #: gajim/common/const.py:472 msgid "In Love" -msgstr "Amoureux(se)" +msgstr "Amoureux/se" #: gajim/common/const.py:473 msgid "Indignant" @@ -7589,7 +7583,7 @@ msgstr "Invincible" #: gajim/common/const.py:477 msgid "Jealous" -msgstr "Jaloux(se)" +msgstr "Jaloux/se" #: gajim/common/const.py:478 msgid "Lonely" @@ -7601,7 +7595,7 @@ msgstr "Perdu⋅e" #: gajim/common/const.py:480 msgid "Lucky" -msgstr "Chanceux(se)" +msgstr "Chanceux/se" #: gajim/common/const.py:481 msgid "Mean" @@ -7613,7 +7607,7 @@ msgstr "Morose" #: gajim/common/const.py:483 msgid "Nervous" -msgstr "Nerveux(se)" +msgstr "Nerveux/se" #: gajim/common/const.py:484 msgid "Neutral" @@ -7817,7 +7811,7 @@ msgstr "Impossible d'obtenir le certificat de l'émetteur" #: gajim/common/const.py:541 msgid "Unable to get certificate CRL" -msgstr "Impossible d'obtenir un certificat CRL" +msgstr "Impossible d'obtenir la CRL" #: gajim/common/const.py:542 msgid "Unable to decrypt certificate's signature" @@ -7825,7 +7819,7 @@ msgstr "Impossible de déchiffrer la signature du certificat" #: gajim/common/const.py:543 msgid "Unable to decrypt CRL's signature" -msgstr "Impossible de déchiffrer la signature du CRL" +msgstr "Impossible de déchiffrer la signature de la CRL" #: gajim/common/const.py:544 msgid "Unable to decode issuer public key" @@ -7837,7 +7831,7 @@ msgstr "Échec de la signature du certificat" #: gajim/common/const.py:546 msgid "CRL signature failure" -msgstr "Échec de la signature CRL" +msgstr "Échec de la signature de la CRL" #: gajim/common/const.py:547 msgid "Certificate is not yet valid" @@ -7865,11 +7859,11 @@ msgstr "Erreur de format dans le champ notAfter du certificat" #: gajim/common/const.py:553 msgid "Format error in CRL's lastUpdate field" -msgstr "Erreur de format dans le champ lastUpdate du CRL" +msgstr "Erreur de format dans le champ lastUpdate de la CRL" #: gajim/common/const.py:554 msgid "Format error in CRL's nextUpdate field" -msgstr "Erreur de format dans le champ nextUpdate du CRL" +msgstr "Erreur de format dans le champ nextUpdate de la CRL" #: gajim/common/const.py:555 msgid "Out of memory" @@ -7885,7 +7879,7 @@ msgstr "Certificat auto-signé dans la chaîne de certificat" #: gajim/common/const.py:558 msgid "Unable to get local issuer certificate" -msgstr "Impossible de récupérer le certificat de l'émeteur local" +msgstr "Impossible de récupérer le certificat de l’émetteur local" #: gajim/common/const.py:559 msgid "Unable to verify the first certificate" @@ -7901,7 +7895,7 @@ msgstr "Certificat révoqué" #: gajim/common/const.py:562 msgid "Invalid CA certificate" -msgstr "Certificat CA invalide" +msgstr "Invalide CA du certificat" #: gajim/common/const.py:563 msgid "Path length constraint exceeded" @@ -7925,11 +7919,11 @@ msgstr "Décalage du sujet de l'émetteur" #: gajim/common/const.py:568 msgid "Authority and subject key identifier mismatch" -msgstr "Décalage dans les clés d'identification de l'authorité et du sujet" +msgstr "Décalage dans les clés d'identification de l’autorité et du sujet" #: gajim/common/const.py:569 msgid "Authority and issuer serial number mismatch" -msgstr "Décalage dans les numéros de série de l'authorité et du sujet" +msgstr "Décalage dans les numéros de série de l’autorité et du sujet" #: gajim/common/const.py:570 msgid "Key usage does not include certificate signing" @@ -7937,7 +7931,7 @@ msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat" #: gajim/common/const.py:571 msgid "Application verification failure" -msgstr "Echec de la vérification de l'application" +msgstr "Échec de la vérification de l'application" #: gajim/common/const.py:893 msgid "The signing certificate authority is not known" @@ -7977,7 +7971,7 @@ msgstr "Compte désactivé" #: gajim/common/const.py:956 msgid "Credentials expired" -msgstr "Identifiants expirés" +msgstr "Informations d'identification expirées" #: gajim/common/const.py:957 msgid "Encryption required" @@ -8041,7 +8035,7 @@ msgstr "Impossible de débloquer le port %d." #: gajim/common/zeroconf/connection_zeroconf.py:268 msgid "Please check if avahi/bonjour-daemon is running." -msgstr "Vérifiez si le démon avahi/bonjour est actif." +msgstr "Vérifiez SVP si le démon avahi/bonjour est actif." #: gajim/common/zeroconf/connection_zeroconf.py:362 #: gajim/common/zeroconf/connection_zeroconf.py:375 @@ -8091,7 +8085,7 @@ msgstr "Choisissez le type de présence et la description" #: gajim/common/modules/adhoc_commands.py:120 msgid "Free for chat" -msgstr "Disponible pour Discuter" +msgstr "Disponible pour discuter" #: gajim/common/modules/adhoc_commands.py:121 msgid "Online" @@ -8146,7 +8140,7 @@ msgstr "Fichier trop gros, la taille maximum autorisée est : %s" #: gajim/common/modules/httpupload.py:279 msgid "Encrypting file…" -msgstr "Chiffrement du fichier …" +msgstr "Chiffrement du fichier…" #: gajim/common/modules/httpupload.py:280 msgid "Requesting HTTP File Upload Slot…" @@ -10029,7 +10023,7 @@ msgstr "Musique :" #: gajim/data/gui/tooltip_roster_contact.ui:128 msgid "Location:" -msgstr "Emplacement :" +msgstr "Géolocalisation :" #: gajim/data/gui/tooltip_roster_contact.ui:193 msgid "Subscription:" ===================================== po/zh_CN.po ===================================== @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Gajim\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-01 17:44+0100\n" -"PO-Revision-Date: 2021-01-05 13:31+0000\n" -"Last-Translator: dalek <sleepy(a)nixnet.email>\n" +"PO-Revision-Date: 2021-03-24 08:08+0000\n" +"Last-Translator: Gajim_Translations.Chinese <translate.gajim(a)x2nj.top>\n" "Language-Team: Chinese (Simplified) <https://translate.gajim.org/projects/" "gajim/1-3/zh_Hans/>\n" "Language: zh_CN\n" @@ -32,11 +32,11 @@ msgstr "选项:" #: gajim/history_manager.py:82 msgid "Show this help message and exit" -msgstr "" +msgstr "显示此帮助信息并退出" #: gajim/history_manager.py:83 msgid "Choose folder for logfile" -msgstr "" +msgstr "选择保存日志文件的文件夹" #: gajim/history_manager.py:113 msgid "Cannot find history logs database" @@ -657,7 +657,7 @@ msgstr "完全分离配置文件（包括历史数据库和插件）" #: gajim/application.py:103 msgid "Print XML stanzas and other debug information" -msgstr "" +msgstr "打印XML字段和其他调试信息" #: gajim/application.py:110 #, fuzzy @@ -908,7 +908,7 @@ msgstr "收到消息的昵称颜色。" #: gajim/gui_interface.py:990 #, python-format msgid "%s is calling" -msgstr "" +msgstr "%s 正在呼叫" #: gajim/gui_interface.py:1071 gajim/gui_interface.py:1072 #, fuzzy @@ -1298,7 +1298,7 @@ msgstr "撤销成员" #: gajim/gui_menu_builder.py:887 msgid "Grant Voice" -msgstr "" +msgstr "授予麦克风权限" #: gajim/gui_menu_builder.py:890 #, fuzzy @@ -1349,20 +1349,20 @@ msgstr "连接" #: gajim/chat_control.py:811 gajim/data/gui/chat_control.ui:1185 msgid "Turn Camera on" -msgstr "" +msgstr "打开摄像头" #: gajim/chat_control.py:822 msgid "Calling (Video)…" -msgstr "" +msgstr "来电 (视频)…" #: gajim/chat_control.py:826 gajim/chat_control.py:834 #: gajim/chat_control.py:864 msgid "Turn Camera off" -msgstr "" +msgstr "关闭摄像头" #: gajim/chat_control.py:832 msgid "Incoming Call (Video)" -msgstr "" +msgstr "来电（视频）" #: gajim/chat_control.py:1020 #, python-format @@ -2436,21 +2436,21 @@ msgstr "缺失的\"联系人 JID\"参数" #: gajim/command_system/implementation/middleware.py:76 msgid "Error during command execution!" -msgstr "" +msgstr "命令执行过程中出错!" #: gajim/command_system/implementation/execute.py:60 msgid "Execute expression inside a shell, show output" -msgstr "" +msgstr "在shell中执行表达式，显示输出内容" #: gajim/command_system/implementation/execute.py:74 msgid "" "Command disabled. This command can be enabled by setting " "'command_system_execute' to True in ACE (Advanced Configuration Editor)." -msgstr "" +msgstr "命令已禁用。通过在ACE（高级配置编辑器）中设置'command_system_execute'字段为True，即可启用该命令。" #: gajim/command_system/implementation/execute.py:125 msgid "Execute expression inside a shell, send output" -msgstr "" +msgstr "在shell中执行表达式，发送输出" #: gajim/command_system/implementation/standard.py:52 msgid "" @@ -2468,7 +2468,7 @@ msgstr "发送操作（在第三人称）到当前聊天" #: gajim/command_system/implementation/standard.py:91 msgid "Show logged messages which mention given text" -msgstr "" +msgstr "显示提到指定文本的日志信息" #: gajim/command_system/implementation/standard.py:96 #, python-format @@ -2477,7 +2477,7 @@ msgstr "%s 未找到" #: gajim/command_system/implementation/standard.py:102 msgid "Limit must be an integer" -msgstr "" +msgstr "Limit 必须是一个整数" #: gajim/command_system/implementation/standard.py:127 msgid "" @@ -2488,10 +2488,16 @@ msgid "" " online, away, chat, xa, dnd.\n" " " msgstr "" +"\n" +" 设置当前状态\n" +"\n" +" 状态可以是下列选项之一：\n" +" 在线、离开、聊天、XA、DND。\n" +" " #: gajim/command_system/implementation/standard.py:145 msgid "Set the current status to away" -msgstr "" +msgstr "将当前状态设置为离开" #: gajim/command_system/implementation/standard.py:148 #: gajim/common/helpers.py:200 gajim/common/modules/adhoc_commands.py:122 @@ -2500,7 +2506,7 @@ msgstr "离开" #: gajim/command_system/implementation/standard.py:159 msgid "Set the current status to online" -msgstr "" +msgstr "将当前状态设置为在线" #: gajim/command_system/implementation/standard.py:162 msgid "Available" @@ -2526,11 +2532,11 @@ msgstr "向联系人发送文件" #: gajim/command_system/implementation/standard.py:201 #: gajim/command_system/implementation/standard.py:429 msgid "Command is not supported for zeroconf accounts" -msgstr "" +msgstr "zeroconf 账户不支持该命令" #: gajim/command_system/implementation/standard.py:205 msgid "Send DTMF sequence through an open voice chat" -msgstr "" +msgstr "通过开放的语音聊天发送 DTMF 序列" #: gajim/command_system/implementation/standard.py:208 #, fuzzy @@ -2544,7 +2550,7 @@ msgstr "%s 不是一个合法的日志级别" #: gajim/command_system/implementation/standard.py:218 msgid "Toggle Voice Chat" -msgstr "" +msgstr "切换语音聊天" #: gajim/command_system/implementation/standard.py:221 #, fuzzy @@ -2602,7 +2608,7 @@ msgstr "显示或更改聊天室主题" #: gajim/command_system/implementation/standard.py:318 msgid "Invite a user to a group chat for a reason" -msgstr "" +msgstr "邀请用户参加群聊的原因" #: gajim/command_system/implementation/standard.py:325 #, fuzzy @@ -2612,7 +2618,7 @@ msgstr "加入JID给出的聊天室" #: gajim/command_system/implementation/standard.py:335 msgid "" "Leave the group chat, optionally giving a reason, and close tab or window" -msgstr "" +msgstr "离开群聊，可选择给出一个理由，并关闭标签或窗口" #: gajim/command_system/implementation/standard.py:341 msgid "" @@ -2622,6 +2628,11 @@ msgid "" " If given nickname is not found it will be treated as a JID.\n" " " msgstr "" +"\n" +" 通过昵称或 JID 禁止用户进入群聊。\n" +"\n" +" 如果给定的昵称没有找到，将被视为JID。\n" +" " #: gajim/command_system/implementation/standard.py:357 #, fuzzy @@ -2681,7 +2692,7 @@ msgstr "为联系人 %s 输入新的昵称" #: gajim/command_system/implementation/custom.py:114 msgid "The same as using a doc-string, except it supports translation" -msgstr "" +msgstr "与使用 doc-string 相同，只是它支持翻译" #: gajim/gtk/ssl_error_dialog.py:36 gajim/data/gui/ssl_error_dialog.ui:16 #, fuzzy @@ -2704,7 +2715,7 @@ msgstr "未知的 SSL 错误: %d" #: gajim/gtk/avatar_selector.py:84 msgid "Select a picture or drop it here" -msgstr "" +msgstr "选择一张照片或在这里删除它" #: gajim/gtk/status_change.py:62 gajim/gtk/preferences.py:627 #: gajim/gtk/preferences.py:655 @@ -2724,7 +2735,7 @@ msgstr "没有选择密钥" #: gajim/gtk/status_change.py:382 msgid "No mood" -msgstr "" +msgstr "没心情" #: gajim/gtk/status_change.py:439 msgid "Overwrite" @@ -2777,11 +2788,11 @@ msgstr "未激活的" #: gajim/gtk/advanced_config.py:52 msgid "?config type:Boolean" -msgstr "" +msgstr "?配置类型:布尔" #: gajim/gtk/advanced_config.py:53 msgid "?config type:Integer" -msgstr "" +msgstr "?配置类型:整数" #: gajim/gtk/advanced_config.py:54 msgid "?config type:Text" View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e85687a194a11d9e98d66654d4716016… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e85687a194a11d9e98d66654d4716016… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 16 commits: Blocking: Adapt to nbxmpp changes
by Philipp Hörist 24 Apr '21

24 Apr '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 55daca21 by lovetox at 2021-04-24T12:59:26+02:00 Blocking: Adapt to nbxmpp changes - - - - - 57bb504e by André Apitzsch at 2021-04-24T12:59:26+02:00 Only convert domain name to ASCII IDNA is about domain name only, so ignore username, password and port. Fixes #10010. - - - - - 7f6e32c0 by Daniel Brötzmann at 2021-04-24T12:59:26+02:00 Profile: Add translation hints for menu entries - - - - - 0808e881 by Daniel Brötzmann at 2021-04-24T12:59:26+02:00 DOAP: Add XEP-0106 - - - - - a7fdf4ac by lovetox at 2021-04-24T12:59:26+02:00 Blocking: Convert JID to string - - - - - 43cb6b90 by lovetox at 2021-04-24T12:59:26+02:00 Roster: Handle missing avatar_sha Fixes #10428 - - - - - c36bb0b9 by Daniel Brötzmann at 2021-04-24T12:59:26+02:00 MessageInputTextView: Remove custom placeholder - - - - - 1c830824 by Daniel Brötzmann at 2021-04-24T12:59:26+02:00 MessageInputTextView: Add focus borders - - - - - 2ffd9fdc by Daniel Brötzmann at 2021-04-24T12:59:26+02:00 MessageInputTextView: Improve style - - - - - 8e4c1501 by Ruslan Makhmatkhanov at 2021-04-24T12:59:26+02:00 Mention FreeBSD package in README - - - - - 4f9d45c7 by Ruslan Makhmatkhanov at 2021-04-24T12:59:26+02:00 Replace Windows line endings with Unix ones This change allows package maintainers to remove the dos2unix dependency in Gajim’s FreeBSD port. - - - - - c156135a by André Apitzsch at 2021-04-24T13:00:30+02:00 Flatpak: Update dependencies - - - - - 502bbd16 by Daniel Brötzmann at 2021-04-24T13:01:46+02:00 Accounts: Add account switch description - - - - - 7581cd38 by lovetox at 2021-04-24T13:01:46+02:00 Fix HtmlTextView test - - - - - 3f36ca8d by lovetox at 2021-04-24T13:01:46+02:00 Windows: Fix appveyor build - - - - - 61d14ba1 by lovetox at 2021-04-24T13:01:56+02:00 Remove unused path - - - - - 20 changed files: - README.md - appveyor.yml - data/gajim.doap - flatpak/org.gajim.Gajim.yaml - gajim/chat_control_base.py - gajim/common/configpaths.py - gajim/common/helpers.py - gajim/common/modules/blocking.py - gajim/common/modules/chatstates.py - gajim/common/modules/roster.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/accounts.py - gajim/gtk/blocking.py - gajim/gtk/message_input.py - gajim/gtk/profile.py - gajim/plugins/plugins_i18n.py - test/gtk/htmltextview.py Changes: ===================================== README.md ===================================== @@ -43,6 +43,7 @@ #### Packages - [Debian](https://packages.debian.org/stable/gajim) - [Fedora](https://apps.fedoraproject.org/packages/gajim) - [Ubuntu](https://packages.ubuntu.com/gajim) +- [FreeBSD](https://www.freshports.org/net-im/gajim/) #### Flatpak ===================================== appveyor.yml ===================================== @@ -24,6 +24,7 @@ install: - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman -Sydd --noconfirm filesystem" - bash -lc "pacman --needed --noconfirm -Su" build_script: ===================================== data/gajim.doap ===================================== @@ -233,6 +233,13 @@ <xmpp:version>1.1</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0106.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>1.1.1</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0107.html"/> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim runtime: org.gnome.Platform -runtime-version: '3.38' +runtime-version: '40' sdk: org.gnome.Sdk command: gajim finish-args: @@ -79,8 +79,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/66/6a/98e023b3d11537a5521902ac6b50d… - sha256: 1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c + url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438… + sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c - name: python3-asn1crypto buildsystem: simple @@ -94,11 +94,11 @@ modules: - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-2.10-py2.py3-none-any.whl + - pip3 install --prefix=/app idna-3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/a2/38/928ddce2273eaa564f6f50de91932… - sha256: b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 + url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987… + sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16 - name: python3-cryptography buildsystem: simple @@ -106,8 +106,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/b7/82/f7a4ddc1af185936c1e4fa000942f… - sha256: 7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6 + url: https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d5598… + sha256: 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed - name: python3-pyopenssl buildsystem: simple @@ -139,31 +139,43 @@ modules: - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install --prefix=/app SecretStorage-3.3.0-py3-none-any.whl + - pip3 install --prefix=/app SecretStorage-3.3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/63/a2/a6d9099b14eb5dbbb04fb722d2b53… - sha256: 5c36f6537a523ec5f969ef9fad61c98eb9e017bc601d811e53aa25bece64892f + url: https://files.pythonhosted.org/packages/d9/1e/29cd69fdac7391aa51510dfd42aa7… + sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.4.0-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/41/ad/6a4f1a124b325618a7fb758b885b6… - sha256: 102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 + url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7d… + sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 + + # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl + cleanup: + - /bin + sources: + - type: file + url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b2… + sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-22.0.1-py3-none-any.whl + - pip3 install --prefix=/app keyring-23.0.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/96/17/86e1e5b50dc14e5984a661dde2ed3… - sha256: 9f44660a5d4931bdc14c08a1d01ef30b18a7a8147380710d8c9f9531e1f6c3c0 + url: https://files.pythonhosted.org/packages/26/f9/41230ac47f738f1ba66676dc8d3b3… + sha256: 8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - name: python3-css-parser buildsystem: simple @@ -177,11 +189,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install --prefix=/app precis_i18n-1.0.2-py3-none-any.whl + - pip3 install --prefix=/app precis_i18n-1.0.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/13/f5/3a7485a32dd4422a2a78de744bea4… - sha256: c7d5a1f5667a6e7cb85db0a5a4ec8e1090eaeb6e189e8131a5ee238492d60445 + url: https://files.pythonhosted.org/packages/c1/28/0df691ebe7e28a68b839887ce81be… + sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45 # GSound dependency - name: libcanberra ===================================== gajim/chat_control_base.py ===================================== @@ -203,8 +203,8 @@ def __init__(self, parent_win, widget_name, contact, acct, self._on_message_textview_key_press_event) self.msg_textview.connect('populate-popup', self.on_msg_textview_populate_popup) - self.msg_textview.connect('text-changed', - self._on_message_tv_buffer_changed) + self.msg_textview.get_buffer().connect( + 'changed', self._on_message_tv_buffer_changed) # Send message button self.xml.send_message_button.set_action_name( @@ -217,6 +217,10 @@ def __init__(self, parent_win, widget_name, contact, acct, 'set_visible') self.msg_scrolledwindow = ScrolledWindow() + self.msg_scrolledwindow.set_margin_start(3) + self.msg_scrolledwindow.set_margin_end(3) + self.msg_scrolledwindow.get_style_context().add_class( + 'message-input-border') self.msg_scrolledwindow.add(self.msg_textview) self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) @@ -742,7 +746,6 @@ def on_msg_textview_populate_popup(self, _textview, menu): menu.show_all() def insert_as_quote(self, text: str) -> None: - self.msg_textview.remove_placeholder() text = '> ' + text.replace('\n', '\n> ') + '\n' message_buffer = self.msg_textview.get_buffer() message_buffer.insert_at_cursor(text) @@ -1060,7 +1063,7 @@ def _on_window_motion_notify(self, *args): con.get_module('Chatstate').set_mouse_activity( self.contact, self.msg_textview.has_text()) - def _on_message_tv_buffer_changed(self, textview, textbuffer): + def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() if self.parent_win is not None: self.parent_win.window.lookup_action( @@ -1072,7 +1075,7 @@ def _on_message_tv_buffer_changed(self, textview, textbuffer): con = app.connections[self.account] con.get_module('Chatstate').set_keyboard_activity(self.contact) - if not textview.has_text(): + if not has_text: con.get_module('Chatstate').set_chatstate_delayed(self.contact, Chatstate.ACTIVE) return @@ -1285,7 +1288,6 @@ def set_emoticon_popover(self): self._on_emoticon_button_clicked) def _on_emoticon_button_clicked(self, _widget): - self.msg_textview.remove_placeholder() # Present GTK emoji chooser (not cross platform compatible) self.msg_textview.emit('insert-emoji') self.xml.emoticons_button.set_property('active', False) ===================================== gajim/common/configpaths.py ===================================== @@ -206,7 +206,6 @@ def init(self): paths = [ # Data paths ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), - ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), ('PLUGINS_DOWNLOAD', 'plugins_download', PathLocation.CACHE, PathType.FOLDER), ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), ('MY_EMOTS', ===================================== gajim/common/helpers.py ===================================== @@ -140,11 +140,11 @@ def puny_encode_url(url): _url = '//' + _url try: o = urllib.parse.urlparse(_url) - p_loc = idn_to_ascii(o.netloc) + p_loc = idn_to_ascii(o.hostname) except Exception: log.debug('urlparse failed: %s', url) return False - return url.replace(o.netloc, p_loc) + return url.replace(o.hostname, p_loc) def parse_resource(resource): """ ===================================== gajim/common/modules/blocking.py ===================================== @@ -69,7 +69,7 @@ def get_blocking_list(self): raise_if_error(blocking_list) - self.blocked = blocking_list + self.blocked = list(blocking_list) app.nec.push_incoming_event(NetworkEvent('blocking', conn=self._con, changed=self.blocked)) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -237,8 +237,8 @@ def get_active_chatstate(self, contact: ContactT) -> Optional[str]: def block_chatstates(self, contact: ContactT, block: bool) -> None: # Block sending chatstates to a contact # Used for example if we cycle through the MUC nick list, which - # produces a lot of text-changed signals from the textview. This - # Would lead to sending ACTIVE -> COMPOSING -> ACTIVE ... + # produces a lot of buffer 'changed' signals from the input textview. + # This would lead to sending ACTIVE -> COMPOSING -> ACTIVE ... if block: self._blocked.append(contact.jid) else: ===================================== gajim/common/modules/roster.py ===================================== @@ -58,7 +58,7 @@ def load_roster(self): sub=item['subscription'], ask=item['ask'], groups=item['groups'], - avatar_sha=item['avatar_sha'])) + avatar_sha=item.get('avatar_sha'))) else: self._log.info('Database empty, reset roster version') app.settings.set_account_setting( ===================================== gajim/data/style/default-dark.css ===================================== @@ -41,9 +41,6 @@ .gajim-state-paused { color: rgb(20, 210, 160); } -.gajim-message-placeholder { - color: rgb(195, 195, 195); -} .gajim-msg-correcting text { background: rgb(100, 100, 50); } ===================================== gajim/data/style/default.css ===================================== @@ -41,9 +41,6 @@ .gajim-state-paused { color: rgb(20, 160, 120); } -.gajim-message-placeholder { - color: rgb(170, 170, 170); -} .gajim-msg-correcting text { background: rgb(240, 230, 170); } ===================================== gajim/data/style/gajim.css ===================================== @@ -30,6 +30,15 @@ .chatcontrol-separator {margin-bottom: 5px;} +.message-input-border { + border: 2px solid @theme_unfocused_bg_color; + border-radius: 4px; +} +.message-input-focus { + border: 2px solid @theme_selected_bg_color; + border-radius: 4px; +} + .link-button { min-height: 0px; } /* VCardWindow */ ===================================== gajim/groupchat_control.py ===================================== @@ -1915,7 +1915,6 @@ def _start_private_message(self, nick): return ctrl def append_nick_in_msg_textview(self, _widget, nick): - self.msg_textview.remove_placeholder() message_buffer = self.msg_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() ===================================== gajim/gtk/accounts.py ===================================== @@ -25,6 +25,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -482,11 +483,17 @@ def __init__(self, account): Gtk.IconSize.MENU) next_icon.get_style_context().add_class('insensitive-fg-color') + account_enabled = app.settings.get_account_setting( + self._account, 'active') self._switch = Gtk.Switch() - self._switch.set_active( - app.settings.get_account_setting(self._account, 'active')) + self._switch.set_active(account_enabled) self._switch.set_vexpand(False) + self._switch_state_label = Gtk.Label() + self._switch_state_label.set_xalign(1) + self._switch_state_label.set_valign(Gtk.Align.CENTER) + self._set_label(account_enabled) + if (self._account == app.ZEROCONF_ACC_NAME and not app.is_installed('ZEROCONF')): self._switch.set_active(False) @@ -502,6 +509,8 @@ def __init__(self, account): 'state-set', self._on_enable_switch, self._account) box.add(self._switch) + box.add(self._switch_state_label) + box.add(Gtk.Separator()) box.add(self._label) box.add(next_icon) self.add(box) @@ -519,12 +528,18 @@ def update_account_label(self): def enable_account(self, state): self._switch.set_state(state) + self._set_label(state) + + def _set_label(self, active): + text = Q_('?switch:On') if active else Q_('?switch:Off') + self._switch_state_label.set_text(text) def _on_enable_switch(self, switch, state, account): def _disable(): app.connections[account].change_status('offline', 'offline') app.interface.disable_account(account) switch.set_state(state) + self._set_label(state) old_state = app.settings.get_account_setting(account, 'active') if old_state == state: ===================================== gajim/gtk/blocking.py ===================================== @@ -76,7 +76,7 @@ def _on_blocking_list_received(self, task): self._prev_blocked_jids = set(blocking_list) self._ui.blocking_store.clear() for item in blocking_list: - self._ui.blocking_store.append((item,)) + self._ui.blocking_store.append((str(item),)) self._set_grid_state(True) self._disable_spinner() ===================================== gajim/gtk/message_input.py ===================================== @@ -20,14 +20,11 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gi.repository import GObject from gi.repository import Pango from nbxmpp.modules.misc import build_xhtml_body from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.const import StyleAttr from gajim.common.regex import LINK_REGEX from .util import scroll_to_end @@ -41,12 +38,7 @@ class MessageInputTextView(Gtk.TextView): Class for the message textview (where user writes new messages) for chat/groupchat windows """ - __gsignals__ = { - 'text-changed': (GObject.SignalFlags.RUN_LAST, None, (Gtk.TextBuffer,)) - } - UNDO_LIMIT = 20 - PLACEHOLDER = _('Write a message…') def __init__(self): Gtk.TextView.__init__(self) @@ -70,8 +62,6 @@ def __init__(self): # needed to know if we undid something self.undo_pressed = False - buffer_ = self.get_buffer() - buffer_.connect('changed', self._on_buffer_changed) self._last_text = '' self.begin_tags = {} @@ -80,11 +70,7 @@ def __init__(self): self.fonts_tags = [] self.other_tags = {} - color = app.css_config.get_value( - '.gajim-message-placeholder', StyleAttr.COLOR) - self.placeholder_tag = buffer_.create_tag('placeholder') - self.placeholder_tag.set_property('foreground', color) - + buffer_ = self.get_buffer() self.other_tags['bold'] = buffer_.create_tag('bold') self.other_tags['bold'].set_property('weight', Pango.Weight.BOLD) self.begin_tags['bold'] = '' @@ -105,10 +91,8 @@ def __init__(self): self.begin_tags['strike'] = strike self.end_tags['strike'] = '' - self.connect('paste-clipboard', self._paste_clipboard) self.connect_after('paste-clipboard', self._after_paste_clipboard) - self.connect('focus-in-event', self._on_grab_focus) - self.connect('grab-focus', self._on_grab_focus) + self.connect('focus-in-event', self._on_focus_in) self.connect('focus-out-event', self._on_focus_out) self.connect('destroy', self._on_destroy) @@ -123,15 +107,15 @@ def _on_destroy(self, *args): None, Gdk.DragAction.DEFAULT) - def _on_buffer_changed(self, *args): - text = self.get_text() - # Because of inserting and removing PLACEHOLDER text - # the signal becomes unreliable when determining if the user - # typed in new text. So we send our own signal depending on if - # there is real new text that is not the PLACEHOLDER - if text != self._last_text: - self.emit('text-changed', self.get_buffer()) - self._last_text = text + def _on_focus_in(self, _widget, _event): + scrolled = self.get_parent() + scrolled.get_style_context().add_class('message-input-focus') + return False + + def _on_focus_out(self, _widget, _event): + scrolled = self.get_parent() + scrolled.get_style_context().remove_class('message-input-focus') + return False def insert_text(self, text): self.get_buffer().insert_at_cursor(text) @@ -148,50 +132,19 @@ def has_text(self): buf = self.get_buffer() start, end = buf.get_bounds() text = buf.get_text(start, end, True) - return text not in (self.PLACEHOLDER, '') + return text != '' def get_text(self): - # gets the text if its not PLACEHOLDER buf = self.get_buffer() start, end = buf.get_bounds() text = self.get_buffer().get_text(start, end, True) - if text == self.PLACEHOLDER: - return '' return text - def is_placeholder(self): - buf = self.get_buffer() - start, end = buf.get_bounds() - text = buf.get_text(start, end, True) - return text == self.PLACEHOLDER - - def remove_placeholder(self): - if self.is_placeholder(): - self.get_buffer().set_text('') - self.toggle_speller(True) - - def _on_grab_focus(self, *args): - self.remove_placeholder() - - def _on_focus_out(self, *args): - buf = self.get_buffer() - start, end = buf.get_bounds() - text = buf.get_text(start, end, True) - if text == '': - buf.insert_with_tags( - start, self.PLACEHOLDER, self.placeholder_tag) - self.toggle_speller(False) - def toggle_speller(self, activate): if app.is_installed('GSPELL') and app.settings.get('use_speller'): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) - @staticmethod - def _paste_clipboard(textview): - if textview.is_placeholder(): - textview.get_buffer().set_text('') - @staticmethod def _after_paste_clipboard(textview): buffer_ = textview.get_buffer() @@ -429,7 +382,6 @@ def replace_char_at_iter(self, iter_, new_char): buffer_.insert(iter_, new_char) def insert_emoji(self, codepoint, pixbuf): - self.remove_placeholder() buffer_ = self.get_buffer() if buffer_.get_char_count(): # buffer contains text ===================================== gajim/gtk/profile.py ===================================== @@ -26,12 +26,12 @@ log = logging.getLogger('gajim.gui.profile') MENU_DICT = { - 'fn': _('Full Name'), + 'fn': Q_('?profile:Full Name'), 'bday': _('Birthday'), - 'gender': _('Gender'), - 'adr': _('Address'), + 'gender': Q_('?profile:Gender'), + 'adr': Q_('?profile:Address'), 'email': _('Email'), - 'impp': 'IM Address', + 'impp': Q_('?profile:IM Address'), 'tel': _('Phone No.'), 'org': Q_('?profile:Organisation'), 'title': Q_('?profile:Title'), ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -1,42 +1,42 @@ -# Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import locale -import gettext -from pathlib import Path - -from gajim.common import configpaths - -DOMAIN = 'gajim_plugins' -try: - plugin_user_dir = configpaths.get('PLUGINS_USER') -except KeyError: - # This allows to import the module for tests - print('No plugin translation path available') - plugin_user_dir = Path.cwd() - - -# python 3.7 gettext module does not support Path objects -plugins_locale_dir = str(plugin_user_dir / 'locale') - -try: - t = gettext.translation(DOMAIN, plugins_locale_dir) - _ = t.gettext -except OSError: - _ = gettext.gettext - -if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore +# Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com> +# +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import locale +import gettext +from pathlib import Path + +from gajim.common import configpaths + +DOMAIN = 'gajim_plugins' +try: + plugin_user_dir = configpaths.get('PLUGINS_USER') +except KeyError: + # This allows to import the module for tests + print('No plugin translation path available') + plugin_user_dir = Path.cwd() + + +# python 3.7 gettext module does not support Path objects +plugins_locale_dir = str(plugin_user_dir / 'locale') + +try: + t = gettext.translation(DOMAIN, plugins_locale_dir) + _ = t.gettext +except OSError: + _ = gettext.gettext + +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore ===================================== test/gtk/htmltextview.py ===================================== @@ -7,17 +7,22 @@ from gajim.common import app from gajim.common import configpaths configpaths.init() -from gajim.common.helpers import AdditionalDataDict + from gajim import gui gui.init('gtk') +from gajim.common.helpers import AdditionalDataDict + from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface + +app.settings = MagicMock() app.plugin_manager = MagicMock() app.logger = MagicMock() app.cert_store = MagicMock() +app.storage = MagicMock() app.interface = Interface() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1ff73830e4f4601766935bf9bc6c894… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/1ff73830e4f4601766935bf9bc6c894… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused path
by Philipp Hörist 24 Apr '21

24 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5c2b0f53 by lovetox at 2021-04-24T12:23:10+02:00 Remove unused path - - - - - 1 changed file: - gajim/common/configpaths.py Changes: ===================================== gajim/common/configpaths.py ===================================== @@ -206,7 +206,6 @@ def init(self): paths = [ # Data paths ('LOG_DB', 'logs.db', PathLocation.DATA, PathType.FILE), - ('MY_CACERTS', 'cacerts.pem', PathLocation.DATA, PathType.FILE), ('PLUGINS_DOWNLOAD', 'plugins_download', PathLocation.CACHE, PathType.FOLDER), ('PLUGINS_USER', 'plugins', PathLocation.DATA, PathType.FOLDER), ('MY_EMOTS', View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c2b0f53bdb38c0f8c47b48cf58f4b89… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c2b0f53bdb38c0f8c47b48cf58f4b89… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Revert "Windows: Add Workaround for #10342"
by Philipp Hörist 21 Apr '21

21 Apr '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 1ff73830 by Philipp Hörist at 2021-04-21T20:37:27+02:00 Revert "Windows: Add Workaround for #10342" This reverts commit 3334790a15ff4664894f5f19bd60e01760d3f120 - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -171,9 +171,6 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): # find the translation # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus # doesn't retain other region settings like LC_TIME - - # See https://gitlab.gnome.org/GNOME/pygobject/-/issues/442 - LANG = 'en' os.environ['LANGUAGE'] = LANG except Exception as error: print('Failed to determine default language', file=sys.stderr) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ff73830e4f4601766935bf9bc6c8942… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1ff73830e4f4601766935bf9bc6c8942… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Revert "Windows: Add Workaround for #10342"
by Philipp Hörist 21 Apr '21

21 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c7f95b5 by Philipp Hörist at 2021-04-21T20:34:11+02:00 Revert "Windows: Add Workaround for #10342" This reverts commit 3334790a15ff4664894f5f19bd60e01760d3f120 - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -171,9 +171,6 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): # find the translation # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus # doesn't retain other region settings like LC_TIME - - # See https://gitlab.gnome.org/GNOME/pygobject/-/issues/442 - LANG = 'en' os.environ['LANGUAGE'] = LANG except Exception as error: print('Failed to determine default language', file=sys.stderr) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c7f95b5bac18dd8b0bcbfb222fb2272… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c7f95b5bac18dd8b0bcbfb222fb2272… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add Jump to bottom button
by Daniel Brötzmann 20 Apr '21

20 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a024992a by wurstsalat at 2021-04-20T20:49:18+02:00 Add Jump to bottom button - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a024992ab39c440f792a7d1a7b944b8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a024992ab39c440f792a7d1a7b944b8d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Make Correction Work again
by Philipp Hörist 19 Apr '21

19 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3e598a4f by lovetox at 2021-04-19T21:47:00+02:00 Make Correction Work again - - - - - afe01954 by lovetox at 2021-04-19T21:47:37+02:00 Handle disconnect and resume-failed inside modules - - - - - 11 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/modules/mam.py - gajim/common/modules/muc.py - gajim/common/styling.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/client.py ===================================== @@ -182,9 +182,9 @@ def _create_client(self): def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') + self.notify('resume-failed') app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) - self.get_module('Chatstate').enabled = False def _on_resume_successful(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) @@ -278,11 +278,9 @@ def _on_password(password): self.notify('state-changed', SimpleClientState.RESUME_IN_PREGRESS) else: - self.get_module('Chatstate').enabled = False app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) self._after_disconnect() - self.get_module('Contacts').reset_presence() self.notify('state-changed', SimpleClientState.DISCONNECTED) def _after_disconnect(self): @@ -305,12 +303,9 @@ def _on_connection_failed(self, _client, _signal_name): def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) - self.get_module('MUC').reset_state() self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_server_items() - self.get_module('Chatstate').enabled = True - self.get_module('MAM').reset_state() def _on_stanza_sent(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-sent', ===================================== gajim/common/helpers.py ===================================== @@ -1210,10 +1210,13 @@ def multi_connect(self, signal_dict): self.connect_signal(signal_name, func) def notify(self, signal_name, *args, qualifiers=None, **kwargs): + signal_callbacks = self._callbacks.get(signal_name) + if signal_callbacks is None: + return + if self._log is not None: self._log.info('Signal: %s', signal_name) - signal_callbacks = self._callbacks.get(signal_name, {}) callbacks = signal_callbacks.get(qualifiers, []) for func in list(callbacks): if func() is None: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -29,7 +29,6 @@ from nbxmpp.const import Chatstate as State from gi.repository import GLib -from gajim.common import app from gajim.common.structs import OutgoingMessage from gajim.common.modules.base import BaseModule @@ -44,7 +43,7 @@ def ensure_enabled(func): @wraps(func) def func_wrapper(self, *args, **kwargs): - if not self.enabled: + if not self._enabled: return None return func(self, *args, **kwargs) return func_wrapper @@ -76,14 +75,22 @@ def __init__(self, con: ConnectionT) -> None: self._blocked = [] # type: List[str] self._enabled = False - @property - def enabled(self): - return self._enabled + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) - @enabled.setter - def enabled(self, value): + def _on_client_resume_failed(self, _client, _signal_name): + self._set_enabled(False) + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._set_enabled(False) + elif state.is_connected: + self._set_enabled(True) + + def _set_enabled(self, value): if self._enabled == value: return + self._log.info('Chatstate module %s', 'enabled' if value else 'disabled') self._enabled = value @@ -93,10 +100,7 @@ def enabled(self, value): 2, self._check_last_interaction) else: self.cleanup() - self._chatstates = {} - self._last_keyboard_activity = {} - self._last_mouse_activity = {} - self._blocked = [] + self._con.get_module('Contacts').force_chatstate_update() @ensure_enabled def _presence_received(self, @@ -171,23 +175,7 @@ def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: if new_chatstate is not None: if self._chatstates.get(jid) != new_chatstate: contact = self._get_contact(jid) - - # if contact is None: - # room, nick = app.get_room_and_nick_from_fjid(jid) - # contact = app.contacts.get_gc_contact( - # self._account, room, nick) - # if contact is not None: - # contact = contact.as_contact() - # else: - # # Contact not found, maybe we left the group chat - # # or the contact was removed from the roster - # self._log.info( - # 'Contact %s not found, reset chatstate', jid) - # self._chatstates.pop(jid, None) - # self._last_mouse_activity.pop(jid, None) - # self._last_keyboard_activity.pop(jid, None) - # continue - self.set_chatstate(contact, new_chatstate) + self.set_chatstate(contact, new_chatstate) return GLib.SOURCE_CONTINUE @@ -332,12 +320,19 @@ def remove_delay_timeout(self, contact): def remove_all_delay_timeouts(self): for timeout in self._delay_timeout_ids.values(): GLib.source_remove(timeout) - self._delay_timeout_ids = {} + self._delay_timeout_ids.clear() def cleanup(self): self.remove_all_delay_timeouts() if self._timeout_id is not None: GLib.source_remove(self._timeout_id) + self._timeout_id = None + + self._chatstates.clear() + self._remote_chatstate.clear() + self._last_keyboard_activity.clear() + self._last_mouse_activity.clear() + self._blocked = [] def get_instance(*args: Any, **kwargs: Any) -> Tuple[Chatstate, str]: ===================================== gajim/common/modules/contacts.py ===================================== @@ -47,6 +47,15 @@ def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) self._contacts = {} + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) + + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_presence() + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_presence() def add_contact(self, jid, groupchat=False): if isinstance(jid, str): @@ -90,12 +99,16 @@ def get_contacts_with_domain(self, domain): contacts.append(contact) return contacts - def reset_presence(self): + def _reset_presence(self): for contact in self._contacts.values(): if contact.is_groupchat or contact.is_pm_contact: continue contact.update_presence(UNKNOWN_PRESENCE) + def force_chatstate_update(self): + for contact in self._contacts.values(): + contact.force_chatstate_update() + class CommonContact(Observable): def __init__(self, logger, jid, account): @@ -103,6 +116,8 @@ def __init__(self, logger, jid, account): self._jid = jid self._account = account + self._resources = {} + def _module(self, name): return app.get_client(self._account).get_module(name) @@ -135,6 +150,10 @@ def is_groupchat(self): def is_pm_contact(self): return False + def force_chatstate_update(self): + for contact in self._resources.values(): + contact.notify('chatstate-update') + class BareContact(CommonContact): def __init__(self, logger, jid, account): @@ -142,7 +161,6 @@ def __init__(self, logger, jid, account): self.settings = ContactSettings(account, str(jid)) - self._resources = {} self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') def add_resource(self, resource): @@ -320,8 +338,6 @@ def __init__(self, logger, jid, account): self.settings = GroupChatSettings(account, str(jid)) - self._resources = {} - @property def is_groupchat(self): return True ===================================== gajim/common/modules/mam.py ===================================== @@ -68,6 +68,9 @@ def __init__(self, con): # Holds archive jids where catch up was successful self._catch_up_finished = [] + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) + def pass_disco(self, info): if Namespace.MAM_2 not in info.features: return @@ -80,7 +83,14 @@ def pass_disco(self, info): account=self._account, feature=Namespace.MAM_2)) - def reset_state(self): + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_state() + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_state() + + def _reset_state(self): self._mam_query_ids.clear() self._catch_up_finished.clear() ===================================== gajim/common/modules/muc.py ===================================== @@ -30,12 +30,10 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config -from gajim.common.helpers import event_filter from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData from gajim.common.structs import MUCPresenceData @@ -109,6 +107,8 @@ def __init__(self, con): self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', + self._on_client_resume_failed) self._rejoin_muc = set() self._join_timeouts = {} @@ -117,6 +117,14 @@ def __init__(self, con): self._joined_users = defaultdict(dict) self._mucs = {} + + def _on_resume_failed(self, _client, _signal_name): + self._reset_presence() + + def _on_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_presence() + @property def supported(self): return self._muc_service_jid is not None @@ -158,7 +166,13 @@ def _set_muc_state(self, room_jid, state): contact = self._get_contact(room_jid, groupchat=True) contact.notify('state-changed') - def reset_state(self): + def _reset_state(self): + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) + + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + for muc in self._mucs.values(): self._joined_users.pop(muc.jid, None) self._set_muc_state(muc.jid, MUCJoinedState.NOT_JOINED) @@ -808,13 +822,10 @@ def invite(self, room, jid, reason=None, continue_=False): def _on_client_state_changed(self, _client, _signal_name, state): if state.is_disconnected: - for room_jid in list(self._rejoin_timeouts.keys()): - self._remove_rejoin_timeout(room_jid) - - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) + self._reset_state() - self.reset_state() + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_state() def get_instance(*args, **kwargs): ===================================== gajim/common/styling.py ===================================== @@ -127,6 +127,7 @@ class StrikeSpan(StyleObject): @dataclass class ParsingResult: + text: str blocks: list @@ -144,7 +145,7 @@ def process(text, nested=False): result = process(block.unquote(), nested=True) block.blocks = result.blocks - return ParsingResult(blocks) + return ParsingResult(text, blocks) def _parse_blocks(text, nested): ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -24,8 +24,15 @@ def __init__(self, account): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self._account = account - def add_content(self, blocks): - for block in blocks: + self._content = None + + def get_content(self): + return self._content + + def add_content(self, content): + self.clear() + self._content = content + for block in content.blocks: if block.name == 'plain': widget = PlainWidget(self._account) widget.add_content(block) @@ -40,8 +47,13 @@ def add_content(self, blocks): if block.name == 'quote': message_widget = MessageWidget(self._account) - message_widget.add_content(block.blocks) + message_widget.add_content(block) widget = QuoteWidget(self._account) widget.attach_message_widget(message_widget) self.add(widget) continue + + self.show_all() + + def clear(self): + self.foreach(self.remove) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -60,7 +60,7 @@ def __init__(self, result = process(text) message_widget = MessageWidget(account) - message_widget.add_content(result.blocks) + message_widget.add_content(result) self.grid.attach(message_widget, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -82,8 +82,8 @@ def __init__(self, 'conversation-mention-highlight') result = process(text) - message_widget = MessageWidget(account) - message_widget.add_content(result.blocks) + self._message_widget = MessageWidget(account) + self._message_widget.add_content(result) self._meta_box = Gtk.Box(spacing=6) self._meta_box.pack_start( @@ -129,7 +129,7 @@ def __init__(self, avatar_placeholder.add(self._avatar_surface) bottom_box = Gtk.Box(spacing=6) - bottom_box.add(message_widget) + bottom_box.add(self._message_widget) bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) @@ -214,21 +214,15 @@ def set_receipt(self): def set_displayed(self): self._has_displayed = True - def set_correction(self, message_id, text, other_text_tags, kind, name, - additional_data=None): - self._corrections.append(self.textview.get_text()) - self.textview.clear() + def set_correction(self, text, message_id): + self._corrections.append(self._message_widget.get_content().text) + result = process(text) + self._message_widget.add_content(result) + self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - name=name, - additional_data=additional_data) - corrections = '\n'.join(line for line in self._corrections) corrections = reduce_chars_newlines( corrections, max_chars=150, max_lines=10) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -150,14 +150,7 @@ def add_message(self, history_mode=self._history_mode) else: if correct_id: - self.correct_message( - correct_id, - message_id, - text, - other_text_tags, - kind, - name, - additional_data=additional_data) + self.correct_message(correct_id, message_id, text) return avatar = self._get_avatar(kind, name) @@ -371,13 +364,10 @@ def scroll_to_end(self, force=False): if self.autoscroll or force: GLib.idle_add(scroll_to_end, self.get_parent().get_parent()) - def correct_message(self, correct_id, message_id, text, - other_text_tags, kind, name, additional_data=None): + def correct_message(self, correct_id, message_id, text): message_row = self._get_row_by_message_id(correct_id) if message_row is not None: - message_row.set_correction( - message_id, text, other_text_tags, kind, name, - additional_data=additional_data) + message_row.set_correction(text, message_id) message_row.set_merged(False) def show_receipt(self, id_): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43c93338dd2716c01472a468eb368ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43c93338dd2716c01472a468eb368ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix some things
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 43c93338 by lovetox at 2021-04-18T23:09:16+02:00 Fix some things - - - - - 2 changed files: - gajim/chat_control.py - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -48,7 +48,6 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import geo_provider_from_location from gajim.common.helpers import open_file -from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import PEPEventType @@ -1191,7 +1190,6 @@ def _on_client_state_changed(self, _client, _signal_name, state): self.msg_textview.set_sensitive(state.is_connected) self.msg_textview.set_editable(state.is_connected) - print(state) self._update_avatar() self.update_toolbar() self.draw_banner() ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -50,7 +50,7 @@ def __init__(self, account): self._textview = CodeTextview() self._scrolled = Gtk.ScrolledWindow() self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, - Gtk.PolicyType.AUTOMATIC) + Gtk.PolicyType.NEVER) self._scrolled.set_hexpand(True) self._scrolled.set_vexpand(True) self._scrolled.set_propagate_natural_height(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/43c93338dd2716c01472a468eb368ffa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/43c93338dd2716c01472a468eb368ffa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Refactor Observable
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7425ad59 by lovetox at 2021-04-18T23:01:45+02:00 Refactor Observable - - - - - cf93e345 by lovetox at 2021-04-18T23:01:45+02:00 Add SimpleClientState - - - - - e5527d7b by lovetox at 2021-04-18T23:01:45+02:00 Refactor active/inactive Control state - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/client.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -114,6 +114,10 @@ def __init__(self, parent_win, jid, acct, session, resource=None): self.toggle_emoticons() + if self._type == ControlType.CHAT: + self._client.connect_signal('state-changed', + self._on_client_state_changed) + if not app.settings.get('hide_chat_banner'): self.xml.banner_eventbox.set_no_show_all(False) @@ -1183,13 +1187,14 @@ def _on_convert_to_gc_menuitem_activate(self, _widget): """ dialogs.TransformChatToMUC(self.account, [self.contact.jid]) - def got_connected(self): - ChatControlBase.got_connected(self) - self.draw_banner() - self.update_actions() + def _on_client_state_changed(self, _client, _signal_name, state): + self.msg_textview.set_sensitive(state.is_connected) + self.msg_textview.set_editable(state.is_connected) - def got_disconnected(self): - ChatControlBase.got_disconnected(self) + print(state) + self._update_avatar() + self.update_toolbar() + self.draw_banner() self.update_actions() def _on_presence_received(self, event): ===================================== gajim/chat_control_base.py ===================================== @@ -251,7 +251,6 @@ def __init__(self, parent_win, widget_name, jid, acct, # pylint: disable=line-too-long self.register_events([ - ('our-show', ged.GUI1, self._on_our_show), ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), ('ping-error', ged.GUI1, self._nec_ping), @@ -448,15 +447,6 @@ def remove_session(self, session): self.session.control = None self.session = None - def _on_our_show(self, event): - if event.show == 'connecting': - return - - if event.show == 'offline': - self.got_disconnected() - else: - self.got_connected() - def _nec_ping(self, obj): raise NotImplementedError @@ -686,6 +676,8 @@ def shutdown(self): app.plugin_manager.remove_gui_extension_point( 'chat_control_base_update_toolbar', self) + self._client.disconnect_all_from_obj(self) + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) @@ -1523,18 +1515,6 @@ def scroll_messages(self, direction, msg_buf, msg_type): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) - def got_connected(self): - self.msg_textview.set_sensitive(True) - self.msg_textview.set_editable(True) - self.update_toolbar() - - def got_disconnected(self): - self.msg_textview.set_sensitive(False) - self.msg_textview.set_editable(False) - self.conversation_view.grab_focus() - - self.update_toolbar() - class ScrolledWindow(Gtk.ScrolledWindow): def __init__(self, *args, **kwargs): ===================================== gajim/common/client.py ===================================== @@ -28,12 +28,14 @@ from gajim.common import helpers from gajim.common import modules from gajim.common.const import ClientState +from gajim.common.const import SimpleClientState from gajim.common.structs import UNKNOWN_PRESENCE from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_idle_status_message +from gajim.common.helpers import Observable from gajim.common.idle import Monitor from gajim.common.i18n import _ @@ -45,8 +47,9 @@ log = logging.getLogger('gajim.client') -class Client: +class Client(Observable): def __init__(self, account): + Observable.__init__(self, log) self._client = None self._account = account self.name = account @@ -199,6 +202,8 @@ def _on_resume_successful(self, _client, _signal_name): account=self._account, show=self._status)) + self.notify('state-changed', SimpleClientState.CONNECTED) + def _set_client_available(self): self._set_state(ClientState.AVAILABLE) app.nec.push_incoming_event(NetworkEvent('account-connected', @@ -270,18 +275,19 @@ def _on_password(password): self._schedule_reconnect() app.nec.push_incoming_event( NetworkEvent('our-show', account=self._account, show='error')) + self.notify('state-changed', SimpleClientState.RESUME_IN_PREGRESS) else: self.get_module('Chatstate').enabled = False app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) self._after_disconnect() + self.get_module('Contacts').reset_presence() + self.notify('state-changed', SimpleClientState.DISCONNECTED) def _after_disconnect(self): self._disable_reconnect_timer() - self.get_module('VCardAvatars').avatar_advertised = False - app.proxy65_manager.disconnect(self._client) self.get_module('Bytestream').remove_all_transfers() @@ -291,9 +297,6 @@ def _after_disconnect(self): self._destroy_client = False self._create_client() - jid = self.get_own_jid() - contact = self.get_module('Contacts').get_contact(jid) - contact.update_presence(UNKNOWN_PRESENCE) app.nec.push_incoming_event(NetworkEvent('account-disconnected', account=self._account)) @@ -440,6 +443,8 @@ def _finish_connect(self): self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() + self.notify('state-changed', SimpleClientState.CONNECTED) + # Inform GUI we just signed in app.nec.push_incoming_event(NetworkEvent( 'signed-in', account=self._account, conn=self)) @@ -624,6 +629,7 @@ def _screensaver_state_changed(application, _param): Monitor.set_extended_away(active) def cleanup(self): + self.disconnect_signals() self._destroyed = True if Monitor.is_available(): Monitor.disconnect(self._idle_handler_id) ===================================== gajim/common/const.py ===================================== @@ -274,6 +274,24 @@ def is_available(self): return self == ClientState.AVAILABLE +class SimpleClientState(Enum): + DISCONNECTED = 'disconnected' + CONNECTED = 'connected' + RESUME_IN_PREGRESS = 'resume-in-progress' + + @property + def is_disconnected(self): + return self == SimpleClientState.DISCONNECTED + + @property + def is_connected(self): + return self == SimpleClientState.CONNECTED + + @property + def is_resume_in_progress(self): + return self == SimpleClientState.RESUME_IN_PREGRESS + + class JingleState(Enum): NULL = 'stop' CONNECTING = 'connecting' ===================================== gajim/common/helpers.py ===================================== @@ -1183,7 +1183,7 @@ def __init__(self, log_=None): def disconnect_signals(self): self._callbacks = defaultdict(lambda: defaultdict(list)) - def disconnect(self, object_): + def disconnect_all_from_obj(self, object_): for signal_name, qualifiers in self._callbacks.items(): for qualifier, handlers in qualifiers.items(): for handler in list(handlers): @@ -1191,7 +1191,10 @@ def disconnect(self, object_): if func is None or func.__self__ is object_: self._callbacks[signal_name][qualifier].remove(handler) - def connect(self, signal_name, func, qualifiers=None): + def disconnect(self, *args): + self.disconnect_all_from_obj(*args) + + def connect_signal(self, signal_name, func, qualifiers=None): if not inspect.ismethod(func): raise ValueError('Only bound methods allowed') @@ -1199,9 +1202,12 @@ def connect(self, signal_name, func, qualifiers=None): self._callbacks[signal_name][qualifiers].append(weak_func) + def connect(self, *args, **kwargs): + self.connect_signal(*args, **kwargs) + def multi_connect(self, signal_dict): for signal_name, func in signal_dict.items(): - self.connect(signal_name, func) + self.connect_signal(signal_name, func) def notify(self, signal_name, *args, qualifiers=None, **kwargs): if self._log is not None: ===================================== gajim/common/modules/contacts.py ===================================== @@ -90,6 +90,12 @@ def get_contacts_with_domain(self, domain): contacts.append(contact) return contacts + def reset_presence(self): + for contact in self._contacts.values(): + if contact.is_groupchat or contact.is_pm_contact: + continue + contact.update_presence(UNKNOWN_PRESENCE) + class CommonContact(Observable): def __init__(self, logger, jid, account): ===================================== gajim/common/modules/muc.py ===================================== @@ -107,10 +107,8 @@ def __init__(self, con): priority=49) ] - self.register_events([ - ('account-disconnected', ged.CORE, self._on_account_disconnected), - # ('signed-in', ged.GUI1, self._on_signed_in), - ]) + self._con.connect_signal('state-changed', + self._on_client_state_changed) self._rejoin_muc = set() self._join_timeouts = {} @@ -461,7 +459,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('destroyed', properties) + room.notify('room-destroyed', properties) return if properties.is_nickname_changed: @@ -517,7 +515,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): if properties.is_muc_self_presence and properties.is_kicked: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('kicked', properties) + room.notify('room-kicked', properties) status_codes = properties.muc_status_codes or [] if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: self._start_rejoin_timeout(room_jid) @@ -808,13 +806,15 @@ def invite(self, room, jid, reason=None, continue_=False): return self._nbxmpp('MUC').invite(room, jid, reason, password, continue_, type_) - @event_filter(['account']) - def _on_account_disconnected(self, _event): - for room_jid in list(self._rejoin_timeouts.keys()): - self._remove_rejoin_timeout(room_jid) + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + + self.reset_state() def get_instance(*args, **kwargs): ===================================== gajim/groupchat_control.py ===================================== @@ -49,6 +49,7 @@ from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.i18n import _ from gajim.common.const import MUCJoinedState @@ -92,6 +93,9 @@ def __init__(self, parent_win, jid, muc_data, acct): jid, acct) + self._client.connect_signal('state-changed', + self._on_client_state_changed) + self.force_non_minimizable = False self.is_anonymous = True @@ -193,9 +197,7 @@ def __init__(self, parent_win, jid, muc_data, acct): ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), ]) - self.is_connected = False - # disable win, we are not connected yet - ChatControlBase.got_disconnected(self) + self._set_control_inactive() # Stack self.xml.stack.show_all() @@ -241,31 +243,13 @@ def _connect_contact_signals(self): def _on_muc_state_changed(self, _contact, _signal_name): state = self.contact.state if state == MUCJoinedState.JOINED: - self.roster.initial_draw() - - self.is_connected = True - ChatControlBase.got_connected(self) - - self.xml.formattings_button.set_sensitive(True) - - self.conversation_view.update_avatars() - - self.update_actions() + self._set_control_active() elif state == MUCJoinedState.NOT_JOINED: + self._set_control_inactive() - self.xml.formattings_button.set_sensitive(False) - - self.roster.enable_sort(False) - self.roster.clear() - - self.is_connected = False - ChatControlBase.got_disconnected(self) - - self._client.get_module('Chatstate').remove_delay_timeout( - self.contact) - - self.update_actions() + def _on_client_state_changed(self, _client, _signal_name, state): + pass @property def _muc_data(self): @@ -914,12 +898,6 @@ def _on_room_config_changed(self, _contact, _signal_name, properties): for change in changes: self.add_info_message(change) - def _on_our_show(self, event): - client = app.get_client(event.account) - if (event.show == 'offline' and - not client.state.is_reconnect_scheduled): - self.got_disconnected() - @event_filter(['account']) def _nec_ping(self, event): if not event.contact.is_groupchat: @@ -946,14 +924,30 @@ def is_connected(self) -> bool: def is_connected(self, value: bool) -> None: app.gc_connected[self.account][self.room_jid] = value - def got_disconnected(self): + def _set_control_active(self): + self.xml.formattings_button.set_sensitive(True) + self.msg_textview.set_sensitive(True) + self.msg_textview.set_editable(True) + + self.roster.initial_draw() + + self.is_connected = True + + self.xml.formattings_button.set_sensitive(True) + + self.conversation_view.update_avatars() + + self.update_actions() + + def _set_control_inactive(self): self.xml.formattings_button.set_sensitive(False) + self.msg_textview.set_sensitive(False) + self.msg_textview.set_editable(False) self.roster.enable_sort(False) self.roster.clear() self.is_connected = False - ChatControlBase.got_disconnected(self) self._client.get_module('Chatstate').remove_delay_timeout(self.contact) @@ -998,7 +992,6 @@ def _on_user_joined(self, _contact, _signal_name, user_contact, properties): self.update_actions() def _on_room_config_finished(self, _contact, _signal_name): - self.got_connected() self._show_page('groupchat') self.add_info_message(_('A new group chat has been created')) @@ -1164,11 +1157,6 @@ def _on_room_kicked(self, _contact, _signal_name, properties): message = message.format(actor=actor, reason=reason) self.add_info_message(message) - self.got_disconnected() - - # Update Actions - self.update_actions() - def _on_user_left(self, _contact, _signal_name, user_contact, properties): status_codes = properties.muc_status_codes or [] nick = user_contact.name @@ -1225,7 +1213,6 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): self.add_info_message(message) def _on_room_joined(self, _contact, _signal_name): - self.got_connected() self._show_page('groupchat') def _on_room_password_required(self, _contact, _signal_name, _properties): @@ -1263,8 +1250,6 @@ def _on_room_destroyed(self, _contact, _signal_name, properties): 'instead: xmpp:%s?join') % str(alternate) self.add_info_message(join_message) - self.got_disconnected() - self._client.get_module('Bookmarks').remove(self.room_jid) if self._wait_for_destruction: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a5a8b4b10ed5c071cebec6df8a03f4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a5a8b4b10ed5c071cebec6df8a03f4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] CodeWidget: Add header and styling
by Daniel Brötzmann 18 Apr '21

18 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a5a8b4b1 by wurstsalat at 2021-04-18T15:34:51+02:00 CodeWidget: Add header and styling - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -88,6 +88,20 @@ font-size: small; font-weight: bold; } +.code-widget { + border: 1px solid @borders; + border-radius: 4px; +} +.code-widget-header { + background-color: alpha(@insensitive_fg_color, 0.4); + padding: 0 6px; +} +.code-widget-header label { + font-size: small; +} +.code-widget-header button { + padding: 0; +} .link-button { min-height: 0px; } ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -12,34 +12,77 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging + import gi gi.require_version('GtkSource', '4') from gi.repository import GObject +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GtkSource +from gajim.common.i18n import _ + +log = logging.getLogger('gajim.gui.conversation.code_widget') + class CodeWidget(Gtk.Box): def __init__(self, account): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) + self.get_style_context().add_class('code-widget') self._account = account + header = Gtk.Box() + header.set_spacing(6) + header.get_style_context().add_class('code-widget-header') + self._lang_label = Gtk.Label() + header.add(self._lang_label) + + copy_button = Gtk.Button.new_from_icon_name( + 'edit-copy-symbolic', Gtk.IconSize.MENU) + copy_button.set_tooltip_text(_('Copy code snippet')) + copy_button.connect('clicked', self._on_copy) + header.add(copy_button) + self.add(header) + self._textview = CodeTextview() - # self._scrolled = Gtk.ScrolledWindow() - # self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, - # Gtk.PolicyType.AUTOMATIC) - # self._scrolled.set_hexpand(True) - # self._scrolled.set_vexpand(True) - # self._scrolled.set_propagate_natural_height(True) - # self._scrolled.set_max_content_height(400) - # self._scrolled.add(self._textview) + self._scrolled = Gtk.ScrolledWindow() + self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, + Gtk.PolicyType.AUTOMATIC) + self._scrolled.set_hexpand(True) + self._scrolled.set_vexpand(True) + self._scrolled.set_propagate_natural_height(True) + self._scrolled.set_max_content_height(400) + self._scrolled.add(self._textview) + + self.add(self._scrolled) - self.add(self._textview) + def _on_copy(self, _button): + text = self._textview.get_code() + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(text, -1) def add_content(self, block): - self._textview.print_code(block) + code, lang = self._prepare_code(block.text) + lang_name = self._textview.set_language(lang) + if lang is None: + self._lang_label.set_text(_('Code snippet')) + else: + self._lang_label.set_text(_('Code snippet (%s)') % lang_name) + + self._textview.print_code(code) + + @staticmethod + def _prepare_code(text): + code_start = text.partition('\n')[0] + lang = None + if len(code_start) > 3: + lang = code_start[3:] + + code = text.partition('\n')[2][:-4] + return code, lang class CodeTextview(GtkSource.View): @@ -51,9 +94,21 @@ def __init__(self): self._source_manager = GtkSource.LanguageManager.get_default() - def print_code(self, block): + def set_language(self, language_string): + if language_string is None: + lang = self._source_manager.get_language('python3') + else: + lang = self._source_manager.get_language(language_string) + log.debug('Code snippet lang: %s', lang.get_name()) + self.get_buffer().set_language(lang) + return lang.get_name() + + def get_code(self): buffer_ = self.get_buffer() - lang = self._source_manager.get_language('python3') - buffer_.set_language(lang) + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def print_code(self, code): self.set_show_line_numbers(True) - buffer_.insert(buffer_.get_start_iter(), block.text) + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), code) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5a8b4b10ed5c071cebec6df8a03f4b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5a8b4b10ed5c071cebec6df8a03f4b6… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2021