diff --git a/src/config.c b/src/config.c
index 7678a208d..e012f4487 100644
--- a/src/config.c
+++ b/src/config.c
@@ -74,16 +74,16 @@ t_config_option weechat_options_look[] =
     N_("set title for terminal window (curses GUI) with name & version"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_set_title, NULL, NULL },
-  { "look_startup_logo", N_("display " WEECHAT_NAME " logo at startup"),
-    N_("display " WEECHAT_NAME " logo at startup"),
+  { "look_startup_logo", N_("display WeeChat logo at startup"),
+    N_("display WeeChat logo at startup"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_startup_logo, NULL, NULL },
-  { "look_startup_version", N_("display " WEECHAT_NAME " version at startup"),
-    N_("display " WEECHAT_NAME " version at startup"),
+  { "look_startup_version", N_("display WeeChat version at startup"),
+    N_("display WeeChat version at startup"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_startup_version, NULL, NULL },
-  { "look_weechat_slogan", N_(WEECHAT_NAME "slogan"),
-    N_(WEECHAT_NAME "slogan (if empty, slogan is not used)"),
+  { "look_weechat_slogan", N_("WeeChat slogan"),
+    N_("WeeChat slogan (if empty, slogan is not used)"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "the geekest IRC client!", NULL, NULL, &cfg_look_weechat_slogan, NULL },
   { "look_color_nicks", N_("display nick names with different colors"),
@@ -340,7 +340,7 @@ t_config_option weechat_options_log[] =
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_log_auto_private, NULL, NULL },
   { "log_path", N_("path for log files"),
-    N_("path for " WEECHAT_NAME " log files"),
+    N_("path for WeeChat log files"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "~/.weechat/logs/", NULL, NULL, &cfg_log_path, NULL },
   { "log_name", N_("name for log files"),
@@ -449,7 +449,7 @@ t_config_option weechat_options_server[] =
     OPTION_TYPE_STRING, 0, 0, 0,
     "", NULL, NULL, &(cfg_server.name), NULL },
   { "server_autoconnect", N_("automatically connect to server"),
-    N_("automatically connect to server when " WEECHAT_NAME " is starting"),
+    N_("automatically connect to server when WeeChat is starting"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &(cfg_server.autoconnect), NULL, NULL },
   { "server_address", N_("server address or hostname"),
diff --git a/src/irc/irc-commands.c b/src/irc/irc-commands.c
index f70bc2730..9f04540c7 100644
--- a/src/irc/irc-commands.c
+++ b/src/irc/irc-commands.c
@@ -124,7 +124,7 @@ t_irc_command irc_commands[] =
     N_("user/password: used to get privileges on current IRC server"),
     2, 2, 1, irc_cmd_send_oper, NULL, NULL },
   { "part", N_("leave a channel"),
-    N_("[channel[,channel]]"), N_("channel: channel name to join"),
+    N_("[channel[,channel]]"), N_("channel: channel name to leave"),
     0, MAX_ARGS, 1, NULL, irc_cmd_send_part, irc_cmd_recv_part },
   { "ping", N_("ping server"),
     N_("server1 [server2]"),
diff --git a/weechat/src/config.c b/weechat/src/config.c
index 7678a208d..e012f4487 100644
--- a/weechat/src/config.c
+++ b/weechat/src/config.c
@@ -74,16 +74,16 @@ t_config_option weechat_options_look[] =
     N_("set title for terminal window (curses GUI) with name & version"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_set_title, NULL, NULL },
-  { "look_startup_logo", N_("display " WEECHAT_NAME " logo at startup"),
-    N_("display " WEECHAT_NAME " logo at startup"),
+  { "look_startup_logo", N_("display WeeChat logo at startup"),
+    N_("display WeeChat logo at startup"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_startup_logo, NULL, NULL },
-  { "look_startup_version", N_("display " WEECHAT_NAME " version at startup"),
-    N_("display " WEECHAT_NAME " version at startup"),
+  { "look_startup_version", N_("display WeeChat version at startup"),
+    N_("display WeeChat version at startup"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_look_startup_version, NULL, NULL },
-  { "look_weechat_slogan", N_(WEECHAT_NAME "slogan"),
-    N_(WEECHAT_NAME "slogan (if empty, slogan is not used)"),
+  { "look_weechat_slogan", N_("WeeChat slogan"),
+    N_("WeeChat slogan (if empty, slogan is not used)"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "the geekest IRC client!", NULL, NULL, &cfg_look_weechat_slogan, NULL },
   { "look_color_nicks", N_("display nick names with different colors"),
@@ -340,7 +340,7 @@ t_config_option weechat_options_log[] =
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &cfg_log_auto_private, NULL, NULL },
   { "log_path", N_("path for log files"),
-    N_("path for " WEECHAT_NAME " log files"),
+    N_("path for WeeChat log files"),
     OPTION_TYPE_STRING, 0, 0, 0,
     "~/.weechat/logs/", NULL, NULL, &cfg_log_path, NULL },
   { "log_name", N_("name for log files"),
@@ -449,7 +449,7 @@ t_config_option weechat_options_server[] =
     OPTION_TYPE_STRING, 0, 0, 0,
     "", NULL, NULL, &(cfg_server.name), NULL },
   { "server_autoconnect", N_("automatically connect to server"),
-    N_("automatically connect to server when " WEECHAT_NAME " is starting"),
+    N_("automatically connect to server when WeeChat is starting"),
     OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE,
     NULL, NULL, &(cfg_server.autoconnect), NULL, NULL },
   { "server_address", N_("server address or hostname"),
diff --git a/weechat/src/irc/irc-commands.c b/weechat/src/irc/irc-commands.c
index f70bc2730..9f04540c7 100644
--- a/weechat/src/irc/irc-commands.c
+++ b/weechat/src/irc/irc-commands.c
@@ -124,7 +124,7 @@ t_irc_command irc_commands[] =
     N_("user/password: used to get privileges on current IRC server"),
     2, 2, 1, irc_cmd_send_oper, NULL, NULL },
   { "part", N_("leave a channel"),
-    N_("[channel[,channel]]"), N_("channel: channel name to join"),
+    N_("[channel[,channel]]"), N_("channel: channel name to leave"),
     0, MAX_ARGS, 1, NULL, irc_cmd_send_part, irc_cmd_recv_part },
   { "ping", N_("ping server"),
     N_("server1 [server2]"),