From 046e573df4c1e0e8b2ee54f375584c9f1c8332da Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 22 Jan 2022 19:24:42 +0100 Subject: [PATCH 1/8] Add tooltips to buttons with no text --- data/ui/message_list.glade | 4 ++++ data/ui/window.glade | 2 ++ 2 files changed, 6 insertions(+) diff --git a/data/ui/message_list.glade b/data/ui/message_list.glade index c7963d8c..b102273f 100644 --- a/data/ui/message_list.glade +++ b/data/ui/message_list.glade @@ -77,6 +77,7 @@ False True clear_selection_image + Clear selection @@ -93,6 +94,7 @@ False True go_prev_mention_image + Previous mention @@ -109,6 +111,7 @@ False True go_next_mention_image + Next mention @@ -125,6 +128,7 @@ False True go_bottom_image + Scroll to bottom diff --git a/data/ui/window.glade b/data/ui/window.glade index c5be82d4..3572ceb9 100644 --- a/data/ui/window.glade +++ b/data/ui/window.glade @@ -316,6 +316,7 @@ True insert_emoji_image none + Insert emoji False @@ -331,6 +332,7 @@ True send_image none + Send message False From 78053a147612a6c960b7e893bf9a9249cee4266b Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 22 Jan 2022 15:27:03 +0100 Subject: [PATCH 2/8] Silence assertion failure on '/part' I get this error in the console when using '/part' with no argument: ``` ** (srain:1402455): CRITICAL **: 15:14:11.703: get_quote_arg: assertion 'ptr && arg && next' failed ``` because `ptr` is NULL. This extra check avoids it. --- src/lib/command.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/lib/command.c b/src/lib/command.c index 46e7ae25..f63a89bd 100644 --- a/src/lib/command.c +++ b/src/lib/command.c @@ -444,6 +444,9 @@ static SrnRet srn_command_parse(SrnCommand *cmd, void *user_data){ /* Get arguments */ for (int i = 0; i < binding->argc; i++){ + if (!ptr){ + goto missing_arg; + } if (i != binding->argc - 1){ if (get_quote_arg(ptr, &cmd->argv[narg], &ptr) != SRN_OK){ goto missing_arg; @@ -454,9 +457,9 @@ static SrnRet srn_command_parse(SrnCommand *cmd, void *user_data){ } } narg++; - if (!ptr){ - goto missing_arg; - } + } + if (!ptr){ + goto missing_arg; } /* Debug output */ From c4a96cdb39c5e68116a48c57334537de7012a9f8 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sun, 23 Jan 2022 11:46:17 +0100 Subject: [PATCH 3/8] Remove unnecessary check --- src/lib/command.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/lib/command.c b/src/lib/command.c index f63a89bd..1c159132 100644 --- a/src/lib/command.c +++ b/src/lib/command.c @@ -458,9 +458,6 @@ static SrnRet srn_command_parse(SrnCommand *cmd, void *user_data){ } narg++; } - if (!ptr){ - goto missing_arg; - } /* Debug output */ { From 80dbda69284302ee8c0f0c06767a016f7cf3c6f8 Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sun, 23 Jan 2022 11:57:06 +0100 Subject: [PATCH 4/8] Silence "Unknown capability" warning on trailing ' ' (#349) * Silence "Unknown capability" warning on trailing ' ' This happens on "CAP ACK" from Ergo and UnrealIRCd. * Simplify previous commit, using g_strchomp --- src/core/app_irc_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/app_irc_event.c b/src/core/app_irc_event.c index 288db623..b6f97a3b 100644 --- a/src/core/app_irc_event.c +++ b/src/core/app_irc_event.c @@ -1029,7 +1029,7 @@ static void irc_event_cap(SircSession *sirc, const char *event, bool multiline; bool cap_end; const char *cap_event; - const char *rawcaps; + char *rawcaps; char **caps; SrnServer *srv; @@ -1049,6 +1049,7 @@ static void irc_event_cap(SircSession *sirc, const char *event, g_return_if_fail(count == 4); rawcaps = params[3]; } + rawcaps = g_strchomp(rawcaps); caps = g_strsplit(rawcaps, " ", 0); /* Process CAP event */ From 65ab9ca5f26de022edc2486992633252cac15c9f Mon Sep 17 00:00:00 2001 From: Val Lorentz Date: Sun, 23 Jan 2022 11:57:43 +0100 Subject: [PATCH 5/8] Add French translation (#351) * Add French translation Also fix a typo in one of the original messages. * Add myself to translator list --- po/LINGUAS | 1 + po/fr.po | 1222 +++++++++++++++++++++++++++++++++++++++ po/nl.po | 4 +- po/ru.po | 2 +- po/srain.pot | 2 +- po/uk.po | 4 +- po/zh_CN.po | 2 +- src/core/chat_command.c | 2 +- src/sui/sui_app.c | 1 + 9 files changed, 1232 insertions(+), 8 deletions(-) create mode 100644 po/fr.po diff --git a/po/LINGUAS b/po/LINGUAS index 7d707108..d7e17229 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -2,3 +2,4 @@ zh_CN ru nl uk +fr diff --git a/po/fr.po b/po/fr.po new file mode 100644 index 00000000..0648a02a --- /dev/null +++ b/po/fr.po @@ -0,0 +1,1222 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the Srain package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: Srain 1.1.1\n" +"Report-Msgid-Bugs-To: i@silverrainz.me\n" +"POT-Creation-Date: 2020-08-02 16:09+0800\n" +"PO-Revision-Date: 2022-01-22 20:35+0100\n" +"Last-Translator: \n" +"Language-Team: \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.4.2\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" + +#: ../src/core/app_ui_event.c:380 ../src/core/chat_command.c:352 +#, c-format +msgid "\"%1$s\" has ignored" +msgstr "« %1$s » est ignoré(e)" + +#: ../src/core/app_ui_event.c:383 ../src/core/chat_command.c:377 +#, c-format +msgid "\"%1$s\" has unignored" +msgstr "« %1$s » n'est plus ignoré(e)" + +#: ../src/core/chat_command.c:349 +#, c-format +msgid "\"%1$s\" is already ignored" +msgstr "« %1$s » est déjà ignoré(e)" + +#: ../src/core/chat_command.c:212 +#, c-format +msgid "%1$d available server(s):%2$s" +msgstr "%1$d serveur(s) disponible(s) :%2$s" + +#: ../src/core/app_irc_event.c:1618 +#, c-format +msgid "%1$s %2$s" +msgstr "%1$s %2$s" + +#: ../src/core/app_irc_event.c:1605 +#, c-format +msgid "%1$s %2$s %3$s" +msgstr "%1$s %2$s %3$s" + +#: ../src/sui/sui_message.c:455 +#, c-format +msgid "%1$s %2$s @ %3$s" +msgstr "%1$s %2$s @ %3$s" + +#: ../src/core/app_irc_event.c:1548 +#, c-format +msgid "%1$s <%2$s@%3$s> %4$s" +msgstr "%1$s <%2$s@%3$s> %4$s" + +#: ../src/sui/sui_message.c:510 +#, c-format +msgid "%1$s " +msgstr "%1$s " + +#: ../src/sui/sui_message.c:450 +#, c-format +msgid "%1$s @ %2$s" +msgstr "%1$s @ %2$s" + +#: ../src/core/app_irc_event.c:734 +#, c-format +msgid "%1$s are kicked by %2$s" +msgstr "%2$s a éjecté %1$s" + +#: ../src/core/app_irc_event.c:731 +#, c-format +msgid "%1$s are kicked by %2$s: %3$s" +msgstr "%2$s a éjecté %1$s : %3$s" + +#: ../src/core/app_irc_event.c:690 +#, c-format +msgid "" +"%1$s changed topic to:\n" +"\t%2$s" +msgstr "" +"%1$s a changé le topic :\n" +"\t%2$s" + +#: ../src/core/app_irc_event.c:686 +#, c-format +msgid "%1$s cleared topic" +msgstr "%1$s a effacé le topic" + +#: ../src/core/app_irc_event.c:506 +#, c-format +msgid "%1$s has joined" +msgstr "%1$s a rejoint" + +#: ../src/core/app_irc_event.c:540 +#, c-format +msgid "%1$s has left" +msgstr "%1$s est parti(e)" + +#: ../src/core/app_irc_event.c:538 +#, c-format +msgid "%1$s has left: %2$s" +msgstr "%1$s est parti(e) : %2$s" + +#: ../src/core/app_irc_event.c:452 +#, c-format +msgid "%1$s has quit" +msgstr "%1$s a quitté" + +#: ../src/core/app_irc_event.c:450 +#, c-format +msgid "%1$s has quit: %2$s" +msgstr "%1$s a quitté : %2$s" + +#: ../src/core/app_irc_event.c:877 +#, c-format +msgid "%1$s invites you into %2$s" +msgstr "%1$s vous invite à %2$s" + +#: ../src/core/app_irc_event.c:1561 +#, c-format +msgid "%1$s is a member of %2$s" +msgstr "%1$s est membre de %2$s" + +#: ../src/core/app_irc_event.c:1573 +#, c-format +msgid "%1$s is attached to %2$s at \"%3$s\"" +msgstr "%1$s se connecte au serveur %2$s à \"%3$s\"" + +#: ../src/core/app_irc_event.c:1795 +#, c-format +msgid "%1$s is away: %2$s" +msgstr "%1$s est absent(e) : %2$s" + +#: ../src/core/app_irc_event.c:1592 +#, c-format +msgid "%1$s is idle for %2$s seconds since %3$s" +msgstr "%1$s est inactif/ve depuis %2$s (dernière activité à %3$s)" + +#: ../src/core/app_irc_event.c:421 ../src/core/app_irc_event.c:426 +#, c-format +msgid "%1$s is now known as %2$s" +msgstr "%1$s est maintenant connu(e) sous le nom de %2$s" + +#: ../src/sui/sui_app.c:415 +#, c-format +msgid "" +"%1$s%2$s\n" +"Running against GTK+ %3$d.%4$d.%5$d" +msgstr "" +"%1$s%2$s\n" +"Fonctionnant sur GTK+ %3$d.%4$d.%5$d" + +#: ../src/core/app_irc_event.c:1669 ../src/core/app_irc_event.c:1689 +#, c-format +msgid "%1$s: %2$s" +msgstr "%1$s : %2$s" + +#: ../src/core/app_irc_event.c:1525 ../src/core/app_irc_event.c:1590 +msgid "%Y-%m-%d %T" +msgstr "%Y-%m-%d %T" + +#: ../data/ui/window.glade:320 +msgid "Welcome to Srain!" +msgstr "Bienvenue dans Srain !" + +#: ../src/core/chat_command.c:561 +#, c-format +msgid "A message has been sent to \"%1$s\"" +msgstr "Un message a été envoyé à \"%1$s\"" + +#: ../data/ui/app.glade:69 +msgid "About" +msgstr "À propos" + +#: ../src/sui/sui_app.c:437 +msgid "About Srain" +msgstr "À propos de Srain" + +#: ../src/core/app_irc_event.c:1110 +#, c-format +msgid "Acknowledged capabilities: %1$s" +msgstr "Capacités acceptées : %1$s" + +#: ../data/ui/connect_panel.glade:521 +msgid "Advanced Mode" +msgstr "Mode avancé" + +#: ../src/core/app.c:220 +msgid "All config reloaded" +msgstr "Configuration entièrement rechargée" + +#: ../src/core/app_ui_event.c:178 +msgid "Already reconnecting" +msgstr "Déjà reconnecté(e)" + +#: ../data/ui/config_panel.glade:122 +msgid "Appearance" +msgstr "Apparence" + +#: ../data/ui/config_panel.glade:141 +msgid "Application" +msgstr "Application" + +#: ../src/config/manager.c:99 +#, c-format +msgid "At line %1$d: %2$s" +msgstr "À la ligne %1$d : %2$s" + +#: ../src/core/app.c:321 ../src/core/app.c:325 ../src/core/server.c:283 +#: ../src/core/server.c:287 +#, c-format +msgid "Autorun command: %1$s" +msgstr "Commande automatique : %1$s" + +#: ../src/core/chat_command.c:770 +msgid "Available regex patterns:" +msgstr "Modèles de regex :" + +#: ../src/core/app_irc_event.c:1526 +#, c-format +msgid "By %1$s at %2$s" +msgstr "Par %1$s à %2$s" + +#: ../data/ui/connect_panel.glade:540 ../data/ui/join_panel.glade:401 +msgid "Cancel" +msgstr "Annuler" + +#: ../src/core/chat_command.c:181 +msgid "Cannot disconnect from a unconnected server" +msgstr "Impossible de se déconnecter d'un serveur sans y être connecté(e)" + +#: ../src/core/app_ui_event.c:251 ../src/core/chat_command.c:581 +msgid "Cannot send message directly to a server" +msgstr "Impossible d'envoyer un message directement à un serveur" + +#: ../data/ui/join_panel.glade:290 +msgid "Channel" +msgstr "Salon" + +#: ../src/config/password.c:190 +msgid "Channel password" +msgstr "Mot de passe du salon" + +#: ../data/ui/join_panel.glade:62 +msgid "Channel:" +msgstr "Salon :" + +#: ../src/sui/sui_prefs_dialog.c:165 +msgid "Configuration is reloaded" +msgstr "La configuration a été rechargée" + +#: ../data/ui/connect_panel.glade:554 ../data/ui/window.glade:88 +msgid "Connect" +msgstr "Connexion" + +#: ../src/core/app_irc_event.c:146 ../src/core/app_irc_event.c:152 +#, c-format +msgid "Connected to %1$s(%2$s:%3$d)" +msgstr "Connecté(e) à %1$s(%2$s:%3$d)" + +#: ../src/sui/sui_message.c:254 +msgid "Copy message" +msgstr "Copier le message" + +#: ../src/core/app_irc_event.c:283 ../src/core/app_irc_event.c:298 +#, c-format +msgid "Disconnected from %1$s(%2$s:%3$d): %4$s" +msgstr "Déconnecté(e) de %1$s(%2$s:%3$d) : %4$s" + +#: ../data/ui/connect_panel.glade:117 +msgid "Do not verify certificate" +msgstr "Ne pas vérifier le certificat" + +#: ../src/sui/sui_app.c:122 +msgid "Don't auto connect to servers" +msgstr "Ne pas se connecter automatiquement aux serveurs" + +#: ../src/core/app_irc_event.c:1335 +#, c-format +msgid "ERROR: %1$s" +msgstr "ERREUR : %1$s" + +#: ../src/core/app_irc_event.c:1867 ../src/core/app_irc_event.c:1963 +#, c-format +msgid "ERROR[%1$3d] %2$s" +msgstr "ERROR[%1$3d] %2$s" + +#: ../data/ui/config_panel.glade:81 +msgid "Enable CSD:" +msgstr "Activer CSD :" + +#: ../data/ui/config_panel.glade:77 +msgid "Enable Client-Side Decorations, this will take effect after restart." +msgstr "" +"Activer les Décorations Côté-Client, cela prendra effet après redémarrage." + +#: ../src/core/server_cap.c:211 +msgid "Enabled capabilities:" +msgstr "Activer les capacités :" + +#: ../src/core/app.c:76 ../src/core/app.c:84 ../src/core/app.c:298 +#: ../src/core/app.c:409 ../src/sui/sui_app.c:469 ../src/sui/sui_app.c:488 +#: ../src/sui/sui_app.c:527 ../src/sui/sui_common.c:134 +#: ../src/sui/sui_connect_panel.c:494 ../src/sui/sui_connect_panel.c:503 +#: ../src/sui/sui_connect_panel.c:541 ../src/sui/sui_connect_panel.c:550 +#: ../src/sui/sui_connect_panel.c:596 ../src/sui/sui_join_panel.c:314 +#: ../src/sui/sui_join_panel.c:369 ../src/sui/sui_join_panel.c:380 +#: ../src/sui/sui_join_panel.c:397 ../src/sui/sui_join_panel.c:436 +#: ../src/sui/sui_join_panel.c:442 ../src/sui/sui_misc_message.c:188 +#: ../src/sui/sui_prefs_dialog.c:162 +msgid "Error" +msgstr "Erreur" + +#: ../src/config/reader.c:228 +#, c-format +msgid "Error occurred while looking up channel password: %1$s" +msgstr "" +"Une erreur est survenue pendant la recherche du mot de passe du salon : %1$s" + +#: ../src/config/reader.c:143 +#, c-format +msgid "Error occurred while looking up server password: %1$s" +msgstr "" +"Une erreur est survenue pendant la recherche du mot de passe du serveur : " +"%1$s" + +#: ../src/config/reader.c:149 +#, c-format +msgid "Error occurred while looking up user password: %1$s" +msgstr "" +"Une erreur est survenue pendant la recherche du mot de passe de " +"l'utilisateur/trice : %1$s" + +#: ../src/config/reader.c:91 ../src/config/reader.c:97 +#, c-format +msgid "Error occurred while reading application config in %1$s: %2$s" +msgstr "" +"Une erreur est survenue pendant la lecture de la configuration de " +"l'application dans %1$s : %2$s" + +#: ../src/config/reader.c:212 ../src/config/reader.c:219 +#, c-format +msgid "Error occurred while reading chat config in %1$s: %2$s" +msgstr "" +"Une erreur est survenue pendant la lecture de la configuration du chat dans " +"%1$s : %2$s" + +#: ../src/config/reader.c:71 ../src/config/reader.c:77 +#, c-format +msgid "Error occurred while reading log config in %1$s: %2$s" +msgstr "" +"Une erreur est survenue pendant la lecture de la configuration de " +"l'historique dans %1$s : %2$s" + +#: ../src/config/reader.c:131 ../src/config/reader.c:137 +#, c-format +msgid "Error occurred while reading server config in %1$s: %2$s" +msgstr "" +"Une erreur est survenue pendant la lecture de la configuration du serveur " +"dans %1$s : %2$s" + +#: ../src/config/reader.c:111 ../src/config/reader.c:117 +#, c-format +msgid "Error occurred while reading server list config in %1$s: %2$s" +msgstr "" +"Une erreur est survenue pendant la lecture de la configuration de la liste " +"de serveurs dans %1$s : %2$s" + +#: ../src/sui/sui_url_previewer.c:553 +msgid "Exceed max content length" +msgstr "Dépassement de la longueur maximale du contenu" + +#: ../data/ui/app.glade:94 +msgid "Exit" +msgstr "Quitter" + +#: ../data/ui/config_panel.glade:107 +msgid "Expand message:" +msgstr "Dérouler le message :" + +#: ../src/core/app.c:296 +#, c-format +msgid "Failed to add chat \"%1$s\": %2$s" +msgstr "Impossible d'ajouter le chat « %1$s »: %2$s" + +#: ../src/core/chat_command.c:748 +#, c-format +msgid "Failed to add regex pattern \"%1$s\": %2$s" +msgstr "Impossible d'ajouter le modèle de regex « %1$s »: %2$s" + +#: ../src/core/app.c:407 ../src/core/app_url.c:119 +#, c-format +msgid "Failed to add server \"%1$s\": %2$s" +msgstr "Impossible d'ajouter le serveur « %1$s »: %2$s" + +#: ../src/sui/sui_theme.c:102 +#, c-format +msgid "Failed to apply theme from file \"%1$s\": %2$s" +msgstr "Impossible d'appliquer le thème du fichier « %1$s »: %2$s" + +#: ../src/core/chat_command.c:408 +#, c-format +msgid "Failed to attach pattern to chat \"%1$s\": %2$s" +msgstr "Impossible d'attacher le modèle au salon « %1$s »: %2$s" + +#: ../src/core/chat_command.c:838 +#, fuzzy, c-format +#| msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" +msgstr "" +"Impossible d'attacher le à l'utilisateur « %1$s » du salon « %2$s »: %3$s" + +#: ../src/core/server.c:149 +#, c-format +msgid "Failed to chat config \"%1$s\" of server config \"%2$s\": %3$s" +msgstr "Impossible de charger la config « %1$s » du serveur « %2$s »: %3$s" + +#: ../src/sui/sui_join_panel.c:378 +#, c-format +msgid "Failed to clear channel password: %1$s" +msgstr "Impossible d'effacer le mot de passe du salon : %1$s" + +#: ../src/sui/sui_connect_panel.c:501 +#, c-format +msgid "Failed to clear server password: %1$s" +msgstr "Impossible d'effacer le mot de passe du serveur : %1$s" + +#: ../src/sui/sui_connect_panel.c:548 +#, c-format +msgid "Failed to clear user password: 1$%s" +msgstr "Impossible d'effacer le mot de passe de l'utilisateur/trice : %1$s" + +#: ../src/core/app_irc_event.c:199 ../src/core/app_irc_event.c:214 +#, c-format +msgid "Failed to connect to %1$s(%2$s:%3$d): %4$s" +msgstr "Impossible de se connecter à %1$s(%2$s:%3$d) : %4$s" + +#: ../src/lib/path.c:301 +#, c-format +msgid "Failed to create chat logs directory: %1$s" +msgstr "Impossible de créer le dossier de l'historique de chat : %1$s" + +#: ../src/lib/path.c:281 +#, c-format +msgid "Failed to create user cache directory: %1$s" +msgstr "Impossible de créer le dossier de cache utilisateur/trice : %1$s" + +#: ../src/lib/path.c:261 +#, c-format +msgid "Failed to create user configuration directory: %1$s" +msgstr "" +"Impossible de créer le dossier de configuration de l'utilisateur/trice : %1$s" + +#: ../src/lib/path.c:271 +#, c-format +msgid "Failed to create user configuration file: %1$s" +msgstr "" +"Impossible de créer le fichier de configuration de l'utilisateur/trice : %1$s" + +#: ../src/lib/path.c:291 +#, c-format +msgid "Failed to create user data directory: %1$s" +msgstr "" +"Impossible de créer le dossier de données de l'utilisateur/trice : %1$s" + +#: ../src/core/chat_command.c:437 +#, c-format +msgid "Failed to dettach pattern from chat \"%1$s\": %2$s" +msgstr "Impossible de retirer le modèle du salon « %1$s » : %2$s" + +#: ../src/core/chat_command.c:883 +#, c-format +msgid "Failed to dettach pattern from user \"%1$s\": %2$s" +msgstr "Impossible de retirer le modèle de l'utilisateur « %1$s » : %2$s" + +#: ../src/core/chat_command.c:159 ../src/core/chat_command.c:293 +#, c-format +msgid "Failed to instantiate server \"%1$s\"" +msgstr "Impossible d'instancier le serveur « %1$s »" + +#: ../src/core/app_url.c:146 ../src/core/app_url.c:154 +#, c-format +msgid "Failed to join channel on server \"%1$s\": %2$s" +msgstr "Impossible de rejoindre un salon sur le serveur « %1$s » : %2$s" + +#: ../src/sui/sui_common.c:133 +#, c-format +msgid "Failed to open URL \"%1$s\": %2$s" +msgstr "Impossible d'ouvrir l'URL « %1$s » : %2$s" + +#: ../src/core/app_url.c:60 +#, c-format +msgid "Failed to parse \"%1$s\" as URL" +msgstr "Impossible d'interpréter « %1$s » comme un URL" + +#: ../src/core/app_ui_event.c:203 +#, c-format +msgid "Failed to quit from server: %1$s" +msgstr "Impossible de quitter le serveur : %1$s" + +#: ../src/config/manager.c:66 +#, c-format +msgid "Failed to read system configuration file: %1$s" +msgstr "Impossible de lire le fichier de configuration système : %1$s" + +#: ../src/config/manager.c:78 +#, c-format +msgid "Failed to read user configuration file: %1$s" +msgstr "" +"Impossible de lire le fichier de configuration de l'utilisateur/trice : %1$s" + +#: ../src/core/app_url.c:135 ../src/core/chat_command.c:169 +#: ../src/core/chat_command.c:306 +#, c-format +msgid "Failed to register on server \"%1$s\"" +msgstr "Impossible de s'enregistrer auprès du serveur « %1$s »" + +#: ../src/core/app.c:229 +#, c-format +msgid "Failed to reload application config: %1$s" +msgstr "Impossible de recharger la configuration de l'application : %1$s" + +#: ../src/sui/sui_prefs_dialog.c:160 +#, c-format +msgid "Failed to reload configuration: %s" +msgstr "Impossible de recharger la configuration : %s" + +#: ../src/core/app.c:224 +#, c-format +msgid "Failed to reload logger config: %1$s" +msgstr "Impossible de recharger la configuration de l'historique : %1$s" + +#: ../src/core/chat_command.c:761 +#, c-format +msgid "Failed to remove regex pattern \"%1$s\": %2$s" +msgstr "Impossible de retirer le modèle de regexp « %1$s » : %2$s" + +#: ../src/render/mention_renderer.c:94 +#: ../src/render/mirc_colorize_renderer.c:105 +#: ../src/render/mirc_strip_renderer.c:72 ../src/render/url_renderer.c:117 +#, c-format +msgid "Failed to render markup text: %1$s" +msgstr "Impossible d'afficher le texte formatté : %1$s" + +#: ../src/core/chat_command.c:586 +#, c-format +msgid "Failed to send action message: %1$s" +msgstr "Impossible d'envoyer le message d'action : %1$s" + +#: ../src/core/app_ui_event.c:261 +#, c-format +msgid "Failed to send message: %1$s" +msgstr "Impossible d'envoyer le message : %1$s" + +#: ../src/sui/sui_join_panel.c:367 +#, c-format +msgid "Failed to store channel password: %1$s" +msgstr "Impossible de stocker le mot de passe du salon : %1$s" + +#: ../src/sui/sui_connect_panel.c:492 +#, c-format +msgid "Failed to store server password: %1$s" +msgstr "Impossible de stocker le mot de passe du serveur : %1$s" + +#: ../src/sui/sui_connect_panel.c:539 +#, c-format +msgid "Failed to store user password: %1$s" +msgstr "Impossible de stocker le mot de passe utilisateur/trice : %1$s" + +#: ../src/sirc/sirc_config.c:66 +msgid "False" +msgstr "Faux" + +#: ../src/sui/sui_message.c:261 +msgid "Forward to..." +msgstr "Transférer à..." + +#: ../src/core/server_state.c:92 +msgid "" +"Hold on, srain is connecting to the server, please do not repeat the action" +msgstr "" +"Un instant, srain se connecte au serveur. Merci de ne pas répéter cette " +"action" + +#: ../src/sirc/sirc_config.c:37 +msgid "Invalid IRC config instance" +msgstr "Instance de configuration IRC invalide" + +#: ../src/sui/sui_config.c:84 +msgid "Invalid SuiBufferConfig instance" +msgstr "Instance de configuration SuiBufferConfig invalide" + +#: ../src/core/chat_config.c:38 +msgid "Invalid chat config instance" +msgstr "Instance de configuration du salon invalide" + +#: ../src/sirc/sirc_config.c:52 +#, c-format +msgid "Invalid encoding in IRC config: %1$s" +msgstr "Encodage invalide dans la configuration IRC :%1$s" + +#: ../src/lib/ret.c:112 +msgid "Invalid error id, maybe this error is removed because out of date" +msgstr "" +"Identificateur d'erreur invalide, il se peut que cette erreur ait été " +"retirée car elle n'est plus à jour" + +#: ../src/core/server_config.c:53 +msgid "Invalid server config instance" +msgstr "Instance de configuration de serveur invalide" + +#: ../data/ui/nick_menu.glade:50 +msgid "Invite to..." +msgstr "Inviter à..." + +#: ../src/core/app_irc_event.c:221 +#, c-format +msgid "" +"It seems that you connect to a TLS port(%1$d) without enable TLS connection, " +"try to enable it and reconnect" +msgstr "" +"Il semblerait que vous vous connectiez à un port TLS (%1$d) sans activer la " +"connexion TLS, essayez de l'activer et reconnectez-vous" + +#: ../data/ui/join_panel.glade:416 ../data/ui/window.glade:103 +msgid "Join" +msgstr "Rejoindre" + +#: ../data/ui/join_panel.glade:133 +msgid "Join Channel" +msgstr "Rejoindre un Salon" + +#: ../src/core/app_irc_event.c:1004 +#, c-format +msgid "Latency between %1$s: %2$lums" +msgstr "Latence avec %1$s : %2$lums" + +#: ../src/sirc/sirc.c:196 +msgid "Local connection closed" +msgstr "Connexion locale fermée" + +#: ../src/core/app_irc_event.c:1226 ../src/core/app_irc_event.c:1252 +#, c-format +msgid "Logging in with %1$s as %2$s..." +msgstr "Connexion à %1$s en temps que %2$s..." + +#: ../src/core/app_irc_event.c:377 +#, c-format +msgid "Logging in with %1$s..." +msgstr "Connexion à %1$s..." + +#: ../data/ui/connect_panel.glade:423 +msgid "Login certificate:" +msgstr "Certificat d'authentification :" + +#: ../data/ui/connect_panel.glade:351 +msgid "Login password:" +msgstr "Mot de passe d'authentification :" + +#: ../src/sui/sui_join_panel.c:286 +msgid "Match channel name" +msgstr "Chercher le nom du salon" + +#: ../data/ui/join_panel.glade:208 +msgid "Max users" +msgstr "Maximum d'utilisateurs/trices" + +#: ../src/sui/sui_message.c:461 +msgid "Message from unknown chat" +msgstr "Message d'un salon inconnu" + +#: ../src/core/chat_command.c:441 +#, c-format +msgid "Messages of chat \"%1$s\" are no longer filtered by pattern \"%2$s\"" +msgstr "" +"Les messages du salon « %1$s » ne seront plus filtrés par le modèle « %2$s »" + +#: ../src/core/chat_command.c:412 +#, c-format +msgid "Messages of chat \"%1$s\" will be filtered by pattern \"%2$s\"" +msgstr "Les messages du salon « %1$s » seront filtrés par le modèle « %2$s »" + +#: ../src/core/chat_command.c:887 +#, c-format +msgid "" +"Messages of user \"%1$s\" of chat \"%2$s\" are no longer rendered by pattern " +"\"%3$s\"" +msgstr "" +"Les messages de l'utilisateur « %1$s » du salon « %2$s » ne seront plus " +"filtrés par le modèle « %3$s »" + +#: ../src/core/chat_command.c:842 +#, c-format +msgid "" +"Messages of user \"%1$s\" of chat \"%2$s\" will be rendered by pattern \"%3$s" +"\"" +msgstr "" +"Les messages de l'utilisateur « %1$s » du salon « %2$s » seront filtrés par " +"le modèle « %3$s »" + +#: ../data/ui/join_panel.glade:237 +msgid "Min users" +msgstr "Minimum d'utilisateurs/trices" + +#: ../src/core/chat_command.c:240 +msgid "Missing argument " +msgstr "Argument manquant" + +#: ../src/lib/command.c:482 +#, c-format +msgid "Missing argument, expect %1$d, actually %2$d" +msgstr "Argument manquant, %1$d attendus, mais seulement %2$d présents" + +#: ../src/sui/sui_config.c:32 +#, c-format +msgid "Missing field in SuiApplicationConfig: %1$s" +msgstr "Champ manquant dans SuiApplicationConfig : %1$s" + +#: ../src/core/server_config.c:49 +#, c-format +msgid "Missing field in server config: %1$s" +msgstr "Champ manquant dans la configuration du serveur : %1$s" + +#: ../src/core/user_config.c:71 +#, c-format +msgid "Missing field in user config: %1$s" +msgstr "Champ manquant dans la configuration de l'utilisateur/trice : %1$s" + +#: ../src/lib/command.c:491 +#, c-format +msgid "Missing value for option %1$s" +msgstr "Valeur manquante pour l'option : %1$s" + +#: ../data/ui/connect_panel.glade:84 +msgid "Nickname:" +msgstr "Nick :" + +#: ../src/core/app_irc_event.c:1113 +msgid "No acknowledged capability" +msgstr "Aucune capacité activée" + +#: ../src/core/app_irc_event.c:1070 +msgid "No capability to be requested" +msgstr "Aucune capacité à négocier" + +#: ../src/core/app_irc_event.c:1103 +msgid "No new capability to be requested" +msgstr "Aucune nouvelle capacité à négocier" + +#: ../src/sui/sui_connect_panel.c:432 +msgid "No server selected" +msgstr "Aucun serveur sélectionné" + +#: ../src/core/app_irc_event.c:1484 +msgid "No topic is set" +msgstr "Aucun topic n'est défini" + +#: ../src/lib/path.c:316 +msgid "Not a directory" +msgstr "Pas un dossier" + +#: ../src/lib/path.c:335 +msgid "Not a regular file" +msgstr "Pas un fichier normal" + +#: ../src/sui/sui_prefs_dialog.c:165 +msgid "OK" +msgstr "Ok" + +#: ../src/sui/sui_app.c:131 +msgid "Open one or more IRC URLs" +msgstr "Ouvrir une ou des URLs IRC" + +#: ../data/ui/connect_panel.glade:485 ../data/ui/join_panel.glade:103 +msgid "Optional" +msgstr "Optionnel" + +#: ../data/ui/join_panel.glade:88 +msgid "Password:" +msgstr "Mot de passe :" + +#: ../src/core/chat_command.c:392 ../src/core/chat_command.c:812 +#, c-format +msgid "Pattern \"%1$s\" not found" +msgstr "Modèle « %1$s » introuvable" + +#: ../src/core/app_irc_event.c:248 +msgid "Ping time out" +msgstr "Ping timeout" + +#: ../src/sui/sui_join_panel.c:315 +msgid "Please connect to a server before joining any channel" +msgstr "Merci de vous connecter à un serveur avant de rejoindre un salon" + +#: ../src/sui/sui_join_panel.c:436 +msgid "Please connect to a server before searching any channel" +msgstr "Merci de vous connecter à un serveur avant de chercher un salon" + +#: ../data/ui/connect_panel.glade:106 +msgid "Quick Mode" +msgstr "Mode rapide" + +#: ../src/core/server_state.c:172 ../src/core/server_state.c:179 +msgid "Quitting the server" +msgstr "Quitter le serveur" + +#: ../src/core/app_irc_event.c:952 +#, c-format +msgid "Received CTCP %1$s request form %2$s" +msgstr "Reçu une requête CTCP %1$s de %2$s" + +#: ../src/core/app_irc_event.c:987 ../src/core/app_irc_event.c:1007 +#, c-format +msgid "Received CTCP %1$s response from %2$s: %3$s" +msgstr "Reçu une réponse CTCP %1$s de %2$s : %3$s" + +#: ../src/core/app_irc_event.c:948 +#, c-format +msgid "Received unsupported CTCP %1$s request form %2$s" +msgstr "Reçu une requête CTCP inconnue %1$s de %2$s" + +#: ../src/core/app_irc_event.c:992 +#, c-format +msgid "Received unsupported CTCP %1$s response form %2$s" +msgstr "Reçu une réponse CTCP inconnue %1$s de %2$s" + +#: ../src/core/app_ui_event.c:159 ../src/core/chat_command.c:188 +msgid "Reconnection stopped" +msgstr "Reconnexion arrêtée" + +#: ../src/core/chat_command.c:751 +#, c-format +msgid "Regex pattern \"%1$s\" has added" +msgstr "Modèle de regexp « %1$s » ajouté" + +#: ../src/core/chat_command.c:764 +#, c-format +msgid "Regex pattern \"%1$s\" has removed" +msgstr "Modèle de regexp « %1$s » retiré" + +#: ../data/ui/prefs_dialog.glade:107 +msgid "Reload Configuration" +msgstr "Recharger la configuration" + +#: ../data/ui/connect_panel.glade:375 +msgid "Remember login password" +msgstr "Se souvenir du mot de passe de connexion" + +#: ../data/ui/connect_panel.glade:495 ../data/ui/join_panel.glade:113 +msgid "Remember password" +msgstr "Se souvenir du mot de passe" + +#: ../src/sirc/sirc.c:209 +msgid "Remote connection closed" +msgstr "Connexion distante fermée" + +#: ../src/core/app_irc_event.c:1066 +#, c-format +msgid "Requesting capabilities: %1$s" +msgstr "Demande des capacités : %1$s" + +#: ../src/core/app_irc_event.c:1099 +#, c-format +msgid "Requesting new capabilities: %1$s" +msgstr "Demande de nouvelles capacités : %1$s" + +#: ../src/core/app_irc_event.c:1185 +msgid "SASL authentication is not supported on this server, login skipped" +msgstr "" +"L'authentification SASL n'est pas supporté par ce serveur, je saute " +"l'authentification" + +#: ../data/ui/join_panel.glade:383 +msgid "Search Channel" +msgstr "Chercher un salon" + +#: ../data/ui/connect_panel.glade:409 +msgid "Select a certificate file" +msgstr "Sélectionner un fichier certificat" + +#: ../data/ui/config_panel.glade:166 +msgid "Server" +msgstr "Serveur" + +#: ../src/core/app.c:266 +#, c-format +msgid "Server \"%1$s\" already exists" +msgstr "Le serveur « %1$s » existe déjà" + +#: ../src/core/app_irc_event.c:1063 +#, c-format +msgid "Server capabilities: %1$s" +msgstr "Capacités serveur : %1$s" + +#: ../src/core/app_irc_event.c:1167 +#, c-format +msgid "Server has deleted capabilities: %1$s" +msgstr "Le serveur a supprimé les capacités : %1$s" + +#: ../src/core/app_irc_event.c:1096 +#, c-format +msgid "Server has new capabilities: %1$s" +msgstr "Le serveur a de nouvelles capacités : %1$s" + +#: ../src/core/server_state.c:121 +msgid "Server is already connected" +msgstr "Déjà connecté(e) au serveur" + +#: ../src/core/server_state.c:77 +msgid "Server is already disconnected" +msgstr "Déjà déconnecté(e) du serveur" + +#: ../src/core/server_state.c:149 ../src/core/server_state.c:152 +#: ../src/core/server_state.c:155 ../src/core/server_state.c:158 +msgid "Server is disconnecting" +msgstr "Déconnexion du serveur" + +#: ../src/config/password.c:126 +msgid "Server password" +msgstr "Mot de passe du serveur" + +#: ../data/ui/connect_panel.glade:52 +msgid "Server:" +msgstr "Serveur :" + +#: ../data/ui/buffer_menu.glade:38 +msgid "Show _Topic" +msgstr "Afficher le _Topic" + +#: ../data/ui/buffer_menu.glade:44 +msgid "Show _User List" +msgstr "Afficher la Liste d'_Utilisateurs/trices" + +#: ../src/sui/sui_app.c:113 +msgid "Show version information" +msgstr "Afficher les informations de version" + +#: ../src/sui/sui_join_panel.c:487 ../src/sui/sui_join_panel.c:584 +#, c-format +msgid "Showing %1$d of %2$d channels" +msgstr "Afficher %1$d des %2$d salons" + +#: ../src/lib/ret.c:94 +msgid "Some error occurred" +msgstr "Une erreur est survenue" + +#: ../src/lib/command.c:150 +msgid "Sorry, command parsing failed, please report a bug to <" +msgstr "" +"Désolé, l'interprétation de la commande a échoué, veuillez signalé le " +"problème à <" + +#: ../data/ui/app.glade:115 ../data/ui/app.glade:116 +msgid "Srain" +msgstr "Srain" + +#: ../data/ui/prefs_dialog.glade:9 +msgid "Srain Preferences" +msgstr "Préférences de Srain" + +#: ../src/sirc/sirc_config.c:70 +#, c-format +msgid "TLS: %1$s, TLS verify certificate: %2$s, Encoding: %3$s" +msgstr "TLS : %1$s, vérification du certificat TLS : %2$s, encodage : %3$s" + +#: ../src/core/app_irc_event.c:381 +msgid "" +"The assigned nickname does not match the requested nickname, login skipped" +msgstr "Le nick ne correspond pas à celui demandé, je saute l'authentification" + +#: ../src/core/app_irc_event.c:1505 +#, c-format +msgid "" +"The topic of this channel is:\n" +"\t%1$s" +msgstr "" +"Le topic de ce salon est :\n" +"\t%1$s" + +#: ../data/ui/config_panel.glade:42 +msgid "Theme:" +msgstr "Thème :" + +#: ../src/lib/command.c:500 +#, c-format +msgid "Too many arguments, expect %1$d" +msgstr "Trop d'arguments, %1$d attendu(s)" + +#: ../src/lib/command.c:488 +#, c-format +msgid "Too many optional arguments (maximum allowed: %1$d)" +msgstr "Trop d'arguments optionnels, %1$d attendu(s)" + +#: ../data/ui/join_panel.glade:327 +msgid "Topic" +msgstr "Topic" + +#: ../src/sirc/sirc_config.c:65 +msgid "True" +msgstr "Vrai" + +#: ../src/core/app_irc_event.c:1399 +#, c-format +msgid "Trying nickname: \"%1$s\"..." +msgstr "Essai du nick : « %1$s »..." + +#: ../src/core/app_irc_event.c:203 ../src/core/app_irc_event.c:226 +#: ../src/core/app_irc_event.c:287 ../src/core/app_irc_event.c:302 +#, c-format +msgid "Trying reconnect to %1$s(%2$s:%3$d) after %4$.1lfs..." +msgstr "Tentative de reconnexion à %1$s(%2$s:%3$d) après %4$.1lfs..." + +#: ../src/core/app_irc_event.c:1836 +#, c-format +msgid "URL of %1$s is: %2$s" +msgstr "L'URL de %1$s est : %2$s" + +#: ../src/core/server_state.c:63 +#, c-format +msgid "Unallowed action: %1$s" +msgstr "Action interdite : %1$s" + +#: ../src/lib/command.c:329 +msgid "Unclosed single quotation" +msgstr "Guillemet ouverte mais non fermée" + +#: ../src/lib/command.c:140 +#, c-format +msgid "Unknown command: %1$s" +msgstr "Commande inconnue : %1$s" + +#: ../src/core/login_config.c:53 +msgid "Unknown login method" +msgstr "Méthode d'authentification inconnue" + +#: ../src/lib/command.c:485 +#, c-format +msgid "Unknown option %1$s" +msgstr "Option %1$s inconnue" + +#: ../src/core/chat_command.c:220 ../src/lib/command.c:494 +#, c-format +msgid "Unknown sub command: %1$s" +msgstr "Sous-commande %1$s inconnue" + +#: ../src/sui/sui_url_previewer.c:325 ../src/sui/sui_url_previewer.c:575 +msgid "Unsupported URL content type" +msgstr "Type de contenu de l'URL non supporté" + +#: ../src/core/app_url.c:67 +#, c-format +msgid "Unsupported protocol: %1$s" +msgstr "Protocole non supporté : %1$s" + +#: ../data/ui/connect_panel.glade:132 +msgid "Use secure connection" +msgstr "Utiliser une connexion sécurisée" + +#: ../data/ui/config_panel.glade:180 +msgid "User" +msgstr "Utilisateur/trice" + +#: ../src/core/app.c:146 +msgid "User config not found" +msgstr "Configuration utilisateur/trice non trouvée" + +#: ../src/config/password.c:257 +msgid "User password" +msgstr "Mot de passe d'utilisateur/trice" + +#: ../data/ui/join_panel.glade:309 +msgid "Users" +msgstr "Utilisateurs/trices" + +#: ../src/sui/sui_user_list.c:212 +#, c-format +msgid "" +"Users: %d, %d@,%d%%,%d+" +msgstr "" +"Membres : %d, %d@,%d" +"%%,%d+" + +#: ../src/core/app_irc_event.c:725 +#, c-format +msgid "You are kicked by %1$s" +msgstr "%1$s vous a éjecté(e)" + +#: ../src/core/app_irc_event.c:722 +#, c-format +msgid "You are kicked by %1$s: %2$s" +msgstr "%1$s vous a éjecté(e) %1$s : %2$s" + +#: ../src/core/app_irc_event.c:502 +#, c-format +msgid "You have joined the channel" +msgstr "Vous avez rejoint le salon" + +#: ../src/core/login_config.c:52 +#, c-format +msgid "You need to set the field %2$s in order to use login method %1$s" +msgstr "" +"Vous devez définir le champ %2$s pour utiliser la méthode d'authentification " +"%1$s" + +#: ../src/sui/sui_app.c:132 +msgid "[URL…]" +msgstr "[URL...]" + +#: ../data/ui/app.glade:22 +msgid "_About" +msgstr "À propos (_A)" + +#: ../data/ui/connect_panel.glade:169 +msgid "_Address:" +msgstr "_Addresse :" + +#: ../data/ui/config_panel.glade:217 +msgid "_Apply" +msgstr "_Appliquer" + +#: ../data/ui/config_panel.glade:203 ../data/ui/prefs_dialog.glade:29 +msgid "_Cancel" +msgstr "Annuler (_C)" + +#: ../data/ui/nick_menu.glade:41 +msgid "_Chat" +msgstr "Salon (_C)" + +#: ../data/ui/buffer_menu.glade:8 +msgid "_Close" +msgstr "Fermer (_C)" + +#: ../data/ui/buffer_menu.glade:14 +msgid "_Disconnect" +msgstr "Se _déconnecter" + +#: ../data/ui/app.glade:37 +msgid "_Exit" +msgstr "F_ermer" + +#: ../data/ui/nick_menu.glade:23 +msgid "_Ignore" +msgstr "_Ignorer" + +#: ../data/ui/nick_menu.glade:32 +msgid "_Kick" +msgstr "_Kicker" + +#: ../data/ui/buffer_menu.glade:26 +msgid "_Leave" +msgstr "Partir (_L)" + +#: ../data/ui/connect_panel.glade:450 +msgid "_Login method:" +msgstr "Méthode d'authentification (_L)" + +#: ../data/ui/connect_panel.glade:276 +msgid "_Nickname:" +msgstr "_Nick :" + +#: ../data/ui/config_panel.glade:231 ../data/ui/prefs_dialog.glade:43 +msgid "_OK" +msgstr "_OK" + +#: ../data/ui/connect_panel.glade:153 +msgid "_Password:" +msgstr "Mot de _passe :" + +#: ../data/ui/app.glade:13 ../data/ui/app.glade:55 +msgid "_Preferences" +msgstr "_Préférences" + +#: ../data/ui/url_previewer.glade:26 +msgid "_Preview" +msgstr "_Prévisualisation" + +#: ../data/ui/buffer_menu.glade:32 +msgid "_Quit" +msgstr "_Quitter" + +#: ../data/ui/buffer_menu.glade:20 +msgid "_Reconnect" +msgstr "Se _reconnecter" + +#: ../data/ui/prefs_dialog.glade:88 +msgid "_Reload" +msgstr "_Recharger" + +#: ../data/ui/connect_panel.glade:185 +msgid "_Server:" +msgstr "_Serveur :" + +#: ../data/ui/nick_menu.glade:14 +msgid "_Whois" +msgstr "_Whois" + +#: ../src/render/mention_renderer.c:85 +#, c-format +msgid "g_regex_new() failed: %1$s" +msgstr "g_regex_new() a échouté : %1$s" + +#: ../src/core/app_irc_event.c:577 ../src/core/app_irc_event.c:652 +#, c-format +msgid "mode %1$s %2$s by %3$s" +msgstr "mode %1$s %2$s par %3$s" + +#: ../src/config/reader.c:331 +#, c-format +msgid "server-list[%1$d] doesn't have a name" +msgstr "server-list[%1$d] n'a pas de nom" + +#: ../src/core/chat_command.c:374 +#, c-format +msgid "user \"%1$s\" not found" +msgstr "utilisateur/trice « %1$s » non trouvé(e)" diff --git a/po/nl.po b/po/nl.po index 2555a557..c78530b2 100644 --- a/po/nl.po +++ b/po/nl.po @@ -395,9 +395,9 @@ msgstr "Kan patroon niet bijvoegen aan '%1$s': %2$s" #: ../src/core/chat_command.c:838 #, c-format -msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" msgstr "" -"Kan patroon niet bijvoegen aan gebruiker '%1$s' in gesprek '%2$s': %2$s" +"Kan patroon niet bijvoegen aan gebruiker '%1$s' in gesprek '%2$s': %3$s" #: ../src/core/server.c:149 #, c-format diff --git a/po/ru.po b/po/ru.po index 44381199..c2a8aaf9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -400,7 +400,7 @@ msgstr "Не удалось добавить сервер \"%1$s\": %2$s" #: ../src/core/chat_command.c:838 #, fuzzy, c-format -msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" msgstr "Не удалось добавить сервер \"%1$s\": %2$s" #: ../src/core/server.c:149 diff --git a/po/srain.pot b/po/srain.pot index a9340e92..4940fc73 100644 --- a/po/srain.pot +++ b/po/srain.pot @@ -390,7 +390,7 @@ msgstr "" #: ../src/core/chat_command.c:838 #, c-format -msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" msgstr "" #: ../src/core/server.c:149 diff --git a/po/uk.po b/po/uk.po index 1ab7ca4a..127f3c7d 100644 --- a/po/uk.po +++ b/po/uk.po @@ -393,8 +393,8 @@ msgstr "Не вдалося застосувати шаблон до чату \" #: ../src/core/chat_command.c:838 #, c-format -msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" -msgstr "Не вдалося застосувати шаблон до користувача %1$s\" чату \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" +msgstr "Не вдалося застосувати шаблон до користувача %1$s\" чату \"%2$s\": %3$s" #: ../src/core/server.c:149 #, c-format diff --git a/po/zh_CN.po b/po/zh_CN.po index 8ceff799..0b87e58c 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -395,7 +395,7 @@ msgstr "无法添加服务器 \"%1$s\": %2$s" #: ../src/core/chat_command.c:838 #, fuzzy, c-format -msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s" +msgid "Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s" msgstr "无法添加服务器 \"%1$s\": %2$s" #: ../src/core/server.c:149 diff --git a/src/core/chat_command.c b/src/core/chat_command.c index 86db4bb2..4dc86566 100644 --- a/src/core/chat_command.c +++ b/src/core/chat_command.c @@ -835,7 +835,7 @@ SrnRet on_command_render(SrnCommand *cmd, void *user_data){ ret = srn_render_attach_pattern(extra_data, pattern); if (!RET_IS_OK(ret)) { - return RET_ERR(_("Failed to attach pattern to user %1$s\" of chat \"%2$s\": %2$s"), + return RET_ERR(_("Failed to attach pattern to user %1$s\" of chat \"%2$s\": %3$s"), srv_user->nick, chat->name, RET_MSG(ret)); } diff --git a/src/sui/sui_app.c b/src/sui/sui_app.c index 51044b7b..c1a95ab7 100644 --- a/src/sui/sui_app.c +++ b/src/sui/sui_app.c @@ -425,6 +425,7 @@ static void show_about_dialog(SuiApplication *self){ gtk_get_minor_version(), gtk_get_micro_version()); const char *translators = + "Val Lorentz (fr)\n" \ "Heimen Stoffels (nl)\n" \ "Artem Polishchuk (ru)\n" \ "Andrij Mizyk (uk)\n" \ From 3b4caae5c14a0a86c498cf300d03017a17ac0906 Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Thu, 10 Feb 2022 23:30:57 +0800 Subject: [PATCH 6/8] Doc(update): document debian offical package --- doc/install.rst | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/doc/install.rst b/doc/install.rst index 9fddf543..24f087f0 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -143,34 +143,13 @@ If you are the user of `Arch Linux CN Repository`_, try: Debian ~~~~~~ -There is no srain package in the official repository yet. - -Pre-built package -................. - -We provide pre-built deb package that you can get it from `Github release page`_. - -Build byself -............ - -Copy the debian folder on `srain-contrib`_ to srain folder. Then type following -command on your terminal: +Srain now in `offical repository of Debian`__: .. code-block:: console - $ dpkg-buildpackage -b -us -uc - -Note that the dependencies mentioned above also should be installed. The -details could be found on `debian/crontrol`_ file. - -Then install the package (replace package name with the name of your package): - -.. parsed-literal:: - - $ sudo apt-get install -f ../srain\_\ |release|-1_amd64.deb + # apt install srain -.. _srain-contrib: https://github.com/SrainApp/srain-contrib/tree/master/pack/ -.. _debian/crontrol: https://github.com/SrainApp/srain-contrib/blob/master/pack/debian/control +__ https://packages.debian.org/unstable/net/srain .. _install-packages-flatpak: From b8f50de2035c81e1ab269786d599dc3f29a707f7 Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Thu, 10 Feb 2022 23:31:33 +0800 Subject: [PATCH 7/8] Doc(update): changelog for 1.3.2 --- doc/changelog.rst | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/changelog.rst b/doc/changelog.rst index 40c9a8a0..1696dffb 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -30,6 +30,25 @@ Change Log .. _version-latest: +.. _version-1.3.2: + +2022-02-10 Version 1.3.2 +======================== + +- Features: + + - Add French translation (:pull:`351`), by @progval + +- Bug fixes: + + - Silence assertion failure on /part command (:pull:`348`), by @progval + - Silence "Unknown capability" warning on trailing whitespace (:pull:`349`), by @progval + +- Changes: + + - Add tooltips to buttons with no text(:pull:`350`), by @progval + - Srain is added to offical repository of Debian, see :ref:`install-packages-debian` for details + .. _version-1.3.1: 2021-12-18 Version 1.3.1 From 8d18aa19fb7c70a8e9849cddb345439669feac1b Mon Sep 17 00:00:00 2001 From: Shengyu Zhang Date: Thu, 10 Feb 2022 23:36:54 +0800 Subject: [PATCH 8/8] Script(update): bump version --- data/metainfo/srain.metainfo.xml.in.in | 3 +++ doc/conf.py | 4 ++-- meson.build | 2 +- src/meson.build | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/data/metainfo/srain.metainfo.xml.in.in b/data/metainfo/srain.metainfo.xml.in.in index 9aee11da..7ad998b9 100644 --- a/data/metainfo/srain.metainfo.xml.in.in +++ b/data/metainfo/srain.metainfo.xml.in.in @@ -68,6 +68,9 @@ + + https://doc.srain.im/en/latest/changelog.html#version-1-3-2 + https://doc.srain.im/en/latest/changelog.html#version-1-3-1 diff --git a/doc/conf.py b/doc/conf.py index 862b8463..b02a2153 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -47,7 +47,7 @@ # General information about the project. project = 'Srain' -copyright = '2021, Shengyu Zhang' +copyright = '2022, Shengyu Zhang' author = 'Shengyu Zhang' # The version info for the project you're documenting, acts as replacement for @@ -55,7 +55,7 @@ # built documents. # # The short X.Y version. -version = '1.3.1' +version = '1.3.2' # The full version, including alpha/beta/rc tags. release = version diff --git a/meson.build b/meson.build index 9437c9e0..9ccb4fa2 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project( 'srain', 'c', - version: '1.3.1', + version: '1.3.2', license: 'GPL3', meson_version: '>= 0.45.0' ) diff --git a/src/meson.build b/src/meson.build index a1e7afc5..fbeee6d8 100644 --- a/src/meson.build +++ b/src/meson.build @@ -11,7 +11,7 @@ meta_h.set_quoted('PACKAGE_WEBSITE', app_url) meta_h.set_quoted('PACKAGE_BUGREPORT', app_bugreport) meta_h.set_quoted('PACKAGE_AUTHOR', 'Shengyu Zhang') meta_h.set_quoted('PACKAGE_EMAIL', 'i@silverrainz.me') -meta_h.set_quoted('PACKAGE_COPYRIGHT_DATES', '2016 - 2021') +meta_h.set_quoted('PACKAGE_COPYRIGHT_DATES', '2016 - 2022') meta_h.set_quoted('PACKAGE_DATA_DIR', data_dir) meta_h.set_quoted('PACKAGE_CONFIG_DIR', sys_conf_dir)