summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--po/cs.po46
-rw-r--r--po/es.po46
-rw-r--r--po/fr.po46
-rw-r--r--po/weechat.pot46
-rw-r--r--src/gui/curses/gui-display.c14
-rw-r--r--weechat/po/cs.po46
-rw-r--r--weechat/po/es.po46
-rw-r--r--weechat/po/fr.po46
-rw-r--r--weechat/po/weechat.pot46
-rw-r--r--weechat/src/gui/curses/gui-display.c14
10 files changed, 190 insertions, 206 deletions
diff --git a/po/cs.po b/po/cs.po
index a8ba64723..9f42a3b5f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:55+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1406,14 +1406,14 @@ msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1425,8 +1425,8 @@ msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s špatné parametry pro příkaz \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
@@ -1436,13 +1436,13 @@ msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompilováno na %s %s\n"
@@ -2257,64 +2257,64 @@ msgstr "Změnil se den na %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "bajtů"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "Kb"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "Mb"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "Gb"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<serverů>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(pryč)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[nepřipojen] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Aktivní: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Zpoždění: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-VÍCE-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Akceptovat"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Storno"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Odebrat"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
diff --git a/po/es.po b/po/es.po
index 1664ac099..7e2653818 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:55+0100\n"
"Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1418,15 +1418,15 @@ msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
"%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1438,8 +1438,8 @@ msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
@@ -1449,13 +1449,13 @@ msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
@@ -2280,64 +2280,64 @@ msgstr "Da cambiado a %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "bytes"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "KB"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "MB"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "GB"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<servidores>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(ausente)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[no conectado] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-MS-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Aceptar"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Cancelar"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Eliminar"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
diff --git a/po/fr.po b/po/fr.po
index dc239cfc9..11e5c8f32 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:57+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1414,8 +1414,8 @@ msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
@@ -1423,7 +1423,7 @@ msgstr ""
"canal\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1435,8 +1435,8 @@ msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s paramtres invalides pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1447,13 +1447,13 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de crer la fentre prive \"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compil le %s %s\n"
@@ -2277,64 +2277,64 @@ msgstr "Jour chang: %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s le lag est lev, dconnexion du serveur...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "octets"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "Ko"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "Mo"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "Go"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<serveurs>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(absent)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[non connect] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-PLUS-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Accepter"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Annuler"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Retirer"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
diff --git a/po/weechat.pot b/po/weechat.pot
index 7017b71e3..9c9cb82d5 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1301,14 +1301,14 @@ msgstr ""
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1320,8 +1320,8 @@ msgstr ""
msgid "%s wrong arguments for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1331,13 +1331,13 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr ""
@@ -2117,64 +2117,64 @@ msgstr ""
msgid "%s lag is high, disconnecting from server...\n"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr ""
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr ""
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr ""
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr ""
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr ""
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr ""
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr ""
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr ""
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr ""
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr ""
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr ""
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c
index fe077972c..4f8ece500 100644
--- a/src/gui/curses/gui-display.c
+++ b/src/gui/curses/gui-display.c
@@ -1231,7 +1231,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
int read_marker_x, read_marker_y;
int word_start_offset, word_end_offset;
int word_length_with_spaces, word_length;
- int skip_spaces;
char *ptr_data, *ptr_end_offset, *next_char, *prev_char;
char *ptr_style, saved_char;
@@ -1273,7 +1272,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
ptr_data = line->data;
while (ptr_data && ptr_data[0])
{
- skip_spaces = 0;
gui_get_word_info (window,
ptr_data,
&word_start_offset,
@@ -1284,9 +1282,9 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
if (word_length > 0)
{
- /* spaces + word too long for current line */
+ /* spaces + word too long for current line but ok for next line */
if ((window->win_chat_cursor_x + word_length_with_spaces > window->win_chat_width)
- && (word_length < window->win_chat_width - line->length_align))
+ && (word_length <= window->win_chat_width - line->length_align))
{
gui_display_new_line (window, num_lines, count,
&lines_displayed, simulate);
@@ -1306,11 +1304,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
ptr_data += word_start_offset;
}
- /* word is exactly remaining width => we'll skip next leading spaces for next line */
- if (word_length == window->win_chat_width -
- ((window->win_chat_cursor_x == 0) ? line->length_align : window->win_chat_cursor_x))
- skip_spaces = 1;
-
/* display word */
gui_display_word (window, line, ptr_data,
ptr_end_offset,
@@ -1325,8 +1318,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
if (*(ptr_data - 1) == '\0')
ptr_data = NULL;
- /* skip leading spaces? */
- if (skip_spaces)
+ if (window->win_chat_cursor_x == 0)
{
while (ptr_data && (ptr_data[0] == ' '))
{
diff --git a/weechat/po/cs.po b/weechat/po/cs.po
index a8ba64723..9f42a3b5f 100644
--- a/weechat/po/cs.po
+++ b/weechat/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:55+0100\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1406,14 +1406,14 @@ msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1425,8 +1425,8 @@ msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s špatné parametry pro příkaz \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
@@ -1436,13 +1436,13 @@ msgstr "%s \"%s\" příkaz nemůže být spuštěn v okně serveru\n"
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s nemohu vytvořít nové soukromé okno\"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, kompilováno na %s %s\n"
@@ -2257,64 +2257,64 @@ msgstr "Změnil se den na %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "bajtů"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "Kb"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "Mb"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "Gb"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<serverů>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(pryč)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[nepřipojen] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Aktivní: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Zpoždění: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-VÍCE-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Akceptovat"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Storno"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Odebrat"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Pročistit staré DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Zavřít DCC pohled"
diff --git a/weechat/po/es.po b/weechat/po/es.po
index 1664ac099..7e2653818 100644
--- a/weechat/po/es.po
+++ b/weechat/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:55+0100\n"
"Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1418,15 +1418,15 @@ msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
"%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1438,8 +1438,8 @@ msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
@@ -1449,13 +1449,13 @@ msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n"
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compilado en %s %s\n"
@@ -2280,64 +2280,64 @@ msgstr "Da cambiado a %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "bytes"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "KB"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "MB"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "GB"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<servidores>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(ausente)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[no conectado] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-MS-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Aceptar"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Cancelar"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Eliminar"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Purgar los viejos DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Cerrar la vista DCC"
diff --git a/weechat/po/fr.po b/weechat/po/fr.po
index dc239cfc9..11e5c8f32 100644
--- a/weechat/po/fr.po
+++ b/weechat/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat 0.1.7-cvs\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: 2005-11-29 08:57+0100\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1414,8 +1414,8 @@ msgstr "%s impossible de trouver le pseudo pour envoyer le message\n"
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
@@ -1423,7 +1423,7 @@ msgstr ""
"canal\n"
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1435,8 +1435,8 @@ msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n"
msgid "%s wrong arguments for \"%s\" command\n"
msgstr "%s paramtres invalides pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1447,13 +1447,13 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n"
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr "%s impossible de crer la fentre prive \"%s\"\n"
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr "%s, compil le %s %s\n"
@@ -2277,64 +2277,64 @@ msgstr "Jour chang: %s\n"
msgid "%s lag is high, disconnecting from server...\n"
msgstr "%s le lag est lev, dconnexion du serveur...\n"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr "octets"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr "Ko"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr "Mo"
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr "Go"
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr "<serveurs>"
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr "(absent)"
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr "[non connect] "
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr "Act: "
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr "Lag: %.1f"
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr "-PLUS-"
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr " [A] Accepter"
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr " [C] Annuler"
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr " [R] Retirer"
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr " [P] Purger anciens DCC"
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr " [Q] Fermer la vue DCC"
diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot
index 7017b71e3..9c9cb82d5 100644
--- a/weechat/po/weechat.pot
+++ b/weechat/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2005-11-29 08:55+0100\n"
+"POT-Creation-Date: 2005-11-29 17:13+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1301,14 +1301,14 @@ msgstr ""
#: src/irc/irc-send.c:358 src/irc/irc-send.c:386 src/irc/irc-send.c:577
#: src/irc/irc-send.c:610 src/irc/irc-send.c:643 src/irc/irc-send.c:691
#: src/irc/irc-send.c:727 src/irc/irc-send.c:794 src/irc/irc-send.c:851
-#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1308 src/irc/irc-send.c:1787
-#: src/irc/irc-send.c:1901
+#: src/irc/irc-send.c:1205 src/irc/irc-send.c:1335 src/irc/irc-send.c:1814
+#: src/irc/irc-send.c:1928
#, c-format
msgid "%s \"%s\" command can only be executed in a channel window\n"
msgstr ""
#: src/irc/irc-send.c:489 src/irc/irc-send.c:501 src/irc/irc-send.c:519
-#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1281 src/irc/irc-send.c:1813
+#: src/irc/irc-send.c:1183 src/irc/irc-send.c:1308 src/irc/irc-send.c:1840
#: src/common/command.c:1380 src/common/command.c:1865
#: src/common/command.c:2001
#, c-format
@@ -1320,8 +1320,8 @@ msgstr ""
msgid "%s wrong arguments for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1356
-#: src/irc/irc-send.c:1370 src/irc/irc-send.c:1714
+#: src/irc/irc-send.c:985 src/irc/irc-send.c:1053 src/irc/irc-send.c:1383
+#: src/irc/irc-send.c:1397 src/irc/irc-send.c:1741
#, c-format
msgid "%s \"%s\" command can not be executed on a server window\n"
msgstr ""
@@ -1331,13 +1331,13 @@ msgstr ""
msgid "%s nick \"%s\" not found for \"%s\" command\n"
msgstr ""
-#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1466 src/irc/irc-recv.c:1230
+#: src/irc/irc-send.c:1153 src/irc/irc-send.c:1493 src/irc/irc-recv.c:1230
#: src/irc/irc-recv.c:2042 src/irc/irc-recv.c:2132
#, c-format
msgid "%s cannot create new private window \"%s\"\n"
msgstr ""
-#: src/irc/irc-send.c:1866
+#: src/irc/irc-send.c:1893
#, c-format
msgid "%s, compiled on %s %s\n"
msgstr ""
@@ -2117,64 +2117,64 @@ msgstr ""
msgid "%s lag is high, disconnecting from server...\n"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "bytes"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Kb"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Mb"
msgstr ""
-#: src/gui/curses/gui-display.c:1486
+#: src/gui/curses/gui-display.c:1478
msgid "Gb"
msgstr ""
-#: src/gui/curses/gui-display.c:1944
+#: src/gui/curses/gui-display.c:1936
msgid "<servers>"
msgstr ""
-#: src/gui/curses/gui-display.c:1956
+#: src/gui/curses/gui-display.c:1948
msgid "(away)"
msgstr ""
-#: src/gui/curses/gui-display.c:2090
+#: src/gui/curses/gui-display.c:2082
msgid "[not connected] "
msgstr ""
-#: src/gui/curses/gui-display.c:2100
+#: src/gui/curses/gui-display.c:2092
msgid "Act: "
msgstr ""
-#: src/gui/curses/gui-display.c:2188
+#: src/gui/curses/gui-display.c:2180
#, c-format
msgid "Lag: %.1f"
msgstr ""
-#: src/gui/curses/gui-display.c:2204
+#: src/gui/curses/gui-display.c:2196
msgid "-MORE-"
msgstr ""
-#: src/gui/curses/gui-display.c:2382
+#: src/gui/curses/gui-display.c:2369
msgid " [A] Accept"
msgstr ""
-#: src/gui/curses/gui-display.c:2383 src/gui/curses/gui-display.c:2387
+#: src/gui/curses/gui-display.c:2370 src/gui/curses/gui-display.c:2374
msgid " [C] Cancel"
msgstr ""
-#: src/gui/curses/gui-display.c:2392
+#: src/gui/curses/gui-display.c:2379
msgid " [R] Remove"
msgstr ""
-#: src/gui/curses/gui-display.c:2396
+#: src/gui/curses/gui-display.c:2383
msgid " [P] Purge old DCC"
msgstr ""
-#: src/gui/curses/gui-display.c:2397
+#: src/gui/curses/gui-display.c:2384
msgid " [Q] Close DCC view"
msgstr ""
diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c
index fe077972c..4f8ece500 100644
--- a/weechat/src/gui/curses/gui-display.c
+++ b/weechat/src/gui/curses/gui-display.c
@@ -1231,7 +1231,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
int read_marker_x, read_marker_y;
int word_start_offset, word_end_offset;
int word_length_with_spaces, word_length;
- int skip_spaces;
char *ptr_data, *ptr_end_offset, *next_char, *prev_char;
char *ptr_style, saved_char;
@@ -1273,7 +1272,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
ptr_data = line->data;
while (ptr_data && ptr_data[0])
{
- skip_spaces = 0;
gui_get_word_info (window,
ptr_data,
&word_start_offset,
@@ -1284,9 +1282,9 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
if (word_length > 0)
{
- /* spaces + word too long for current line */
+ /* spaces + word too long for current line but ok for next line */
if ((window->win_chat_cursor_x + word_length_with_spaces > window->win_chat_width)
- && (word_length < window->win_chat_width - line->length_align))
+ && (word_length <= window->win_chat_width - line->length_align))
{
gui_display_new_line (window, num_lines, count,
&lines_displayed, simulate);
@@ -1306,11 +1304,6 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
ptr_data += word_start_offset;
}
- /* word is exactly remaining width => we'll skip next leading spaces for next line */
- if (word_length == window->win_chat_width -
- ((window->win_chat_cursor_x == 0) ? line->length_align : window->win_chat_cursor_x))
- skip_spaces = 1;
-
/* display word */
gui_display_word (window, line, ptr_data,
ptr_end_offset,
@@ -1325,8 +1318,7 @@ gui_display_line (t_gui_window *window, t_gui_line *line, int count, int simulat
if (*(ptr_data - 1) == '\0')
ptr_data = NULL;
- /* skip leading spaces? */
- if (skip_spaces)
+ if (window->win_chat_cursor_x == 0)
{
while (ptr_data && (ptr_data[0] == ' '))
{