core: sort config options by name in sources

12 files changed, 4014 insertions, 4014 deletions

diff --git a/po/cs.po b/po/cs.po
index 426e4ea3e..50941a4e3 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-06-10 09:13+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2847,12 +2847,6 @@ msgstr ""
 msgid "display a vertical separator between windows"
 msgstr ""
 
-#, fuzzy
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr "barva pozadí děliče oken (při rozdělení)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "barva textu pro '+' při posouvání polí"
 
@@ -2862,65 +2856,23 @@ msgstr "barva pro text rozhovoru"
 msgid "background color for chat"
 msgstr "barva pozadí pro rozhovor"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-
-msgid ""
-"text color for chat when line is inactive (buffer is merged with other "
-"buffers and is not selected)"
-msgstr ""
+msgid "text color for buffer names"
+msgstr "barva textu pro jeméno bufferu"
 
-msgid "text color for time in chat window"
-msgstr "barva času v okně rozhovoru"
+msgid "text color for channel names"
+msgstr "barva textu pro jméno kanálu"
 
-msgid "text color for time delimiters"
-msgstr "barva textu děličů času"
+msgid "text color for delimiters"
+msgstr "barva textu pro děliče v infobaru"
 
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when line is inactive (buffer is merged with other "
+"buffers and is not selected)"
 msgstr ""
-"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se "
-"stejným číslem)"
 
-#, fuzzy
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se "
-"stejným číslem)"
-
-msgid "text color for error prefix"
-msgstr "barva textu pro prefix chyby"
-
-msgid "text color for network prefix"
-msgstr "barva textu pro prefix sítě"
-
-msgid "text color for action prefix"
-msgstr "barva textu pro prefix akce"
-
-msgid "text color for join prefix"
-msgstr "barva textu pro join prefix"
-
-msgid "text color for quit prefix"
-msgstr "barva textu pro quit prefix"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "barva textu pro '+' při příliš dlouhém prefixu"
-
-msgid "text color for suffix (after prefix)"
-msgstr "barva textu pro suffix (po prefixu)"
-
-msgid "text color for buffer names"
-msgstr "barva textu pro jeméno bufferu"
-
-msgid "text color for server names"
-msgstr "barva textu pro jeméno serveru"
-
-msgid "text color for channel names"
-msgstr "barva textu pro jméno kanálu"
 
 msgid "text color for nicks in chat window"
 msgstr "barva textu přezdívky v okně rozhovoru"
@@ -2939,13 +2891,6 @@ msgstr ""
 "barva prefixu přezdívky (prefix je uživatelský řetězec před přezdívkou)"
 
 #, fuzzy
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr "barva přípony přezdívky (přípona je uživatelský řetězec za přezdívkou)"
-
-msgid "text color for local nick in chat window"
-msgstr "barva textu pro lokální přezdívku v okně rozhovoru"
-
-#, fuzzy
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "barva textu pro nepřipojené přezdíveky"
 
@@ -2960,11 +2905,12 @@ msgstr "barva pozadí pro zvýrazněný prefix"
 msgid "text color for other nick in private buffer"
 msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
 
-msgid "text color for hostnames"
-msgstr "barva textu jména hosta"
+msgid "text color for local nick in chat window"
+msgstr "barva textu pro lokální přezdívku v okně rozhovoru"
 
-msgid "text color for delimiters"
-msgstr "barva textu pro děliče v infobaru"
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "barva přípony přezdívky (přípona je uživatelský řetězec za přezdívkou)"
 
 msgid "text color for highlighted prefix"
 msgstr "barva textu pro zvýrazněný prefix"
@@ -2972,12 +2918,54 @@ msgstr "barva textu pro zvýrazněný prefix"
 msgid "background color for highlighted prefix"
 msgstr "barva pozadí pro zvýrazněný prefix"
 
+msgid "text color for hostnames"
+msgstr "barva textu jména hosta"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se "
+"stejným číslem)"
+
+#, fuzzy
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"barva textu pro jméno bufferu (před prefixem, při spojení vice bufferů se "
+"stejným číslem)"
+
+msgid "text color for error prefix"
+msgstr "barva textu pro prefix chyby"
+
+msgid "text color for network prefix"
+msgstr "barva textu pro prefix sítě"
+
+msgid "text color for action prefix"
+msgstr "barva textu pro prefix akce"
+
+msgid "text color for join prefix"
+msgstr "barva textu pro join prefix"
+
+msgid "text color for quit prefix"
+msgstr "barva textu pro quit prefix"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "barva textu pro '+' při příliš dlouhém prefixu"
+
+msgid "text color for suffix (after prefix)"
+msgstr "barva textu pro suffix (po prefixu)"
+
 msgid "text color for unread data marker"
 msgstr "barva textu pro značku nepřečtených dat"
 
 msgid "background color for unread data marker"
 msgstr "barva pozadí pro značku nepřečtených dat"
 
+msgid "text color for server names"
+msgstr "barva textu pro jeméno serveru"
+
 #, fuzzy
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)"
@@ -2988,48 +2976,66 @@ msgstr "barva textu pro značku na řádcích, kde je nalezen hledaný text"
 msgid "background color for marker on lines where text sought is found"
 msgstr "barva pozadí pro značku na řádcích, kde je nalezen hledaný text"
 
+msgid "text color for time in chat window"
+msgstr "barva času v okně rozhovoru"
+
+msgid "text color for time delimiters"
+msgstr "barva textu děličů času"
+
 msgid "text color for values"
 msgstr "barva textu pro hodnoty"
 
-msgid "text color for current buffer number in status bar"
-msgstr "barva textu pro aktuální číslo bufferu ve stavovém řádku"
+msgid "text color for actions in input line"
+msgstr "barva textu pro akce ve vstupní řádce"
 
-msgid "text color for current buffer name in status bar"
-msgstr "barva textu pro aktuální jméno bufferu ve stavovém řádku"
+msgid "text color for unsuccessful text search in input line"
+msgstr "barva textu pro nepovedené hledání textu ve vstupní rádce"
 
+#, fuzzy
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
-msgstr ""
-"barva textu pro aktuální jméno bufferu ve stavovém řádku, pokud jsou data "
-"zabezpečeny protokolem jako je SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
+msgstr "barva pozadí děliče oken (při rozdělení)"
 
-msgid "text color for filter indicator in status bar"
-msgstr "barva textu pro indikátor filtru ve stavovém řádku"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr "barva textu pro počet zpráv se zvýrazněním v hostlistu (stavový řádek)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "barva textu pro buffer s novými zprávami (status bar)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr "barva textu pro počet zpráv v hotlistu (stavový řádek)"
 
-msgid "text color for buffer with private message (status bar)"
-msgstr "barva textu pro buffer se soukromou zprávou (status bar)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr "barva textu pro počet soukromých zpráv v hostlistu (stavový řádek)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "barva textu pro buffer se zvýrazněním (stavový řádek)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "barva textu pro buffer s novými zprávami (status bar)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "barva textu pro buffer s novými daty (ne zprávami) (status bar)"
 
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr "barva textu pro počet zpráv v hotlistu (stavový řádek)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "barva textu pro buffer se soukromou zprávou (status bar)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr "barva textu pro počet soukromých zpráv v hostlistu (stavový řádek)"
+msgid "text color for filter indicator in status bar"
+msgstr "barva textu pro indikátor filtru ve stavovém řádku"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "barva textu pro počet zpráv se zvýrazněním v hostlistu (stavový řádek)"
+msgid "text color for current buffer name in status bar"
+msgstr "barva textu pro aktuální jméno bufferu ve stavovém řádku"
 
-msgid "text color for count of other messages in hotlist (status bar)"
-msgstr "barva textu pro počet ostatních zpráv v hostlistu (stavový řádek)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr ""
+"barva textu pro aktuální jméno bufferu ve stavovém řádku, pokud jsou data "
+"zabezpečeny protokolem jako je SSL"
+
+msgid "text color for current buffer number in status bar"
+msgstr "barva textu pro aktuální číslo bufferu ve stavovém řádku"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "barva textu pro buffer s novými daty (status bar)"
@@ -3037,18 +3043,12 @@ msgstr "barva textu pro buffer s novými daty (status bar)"
 msgid "text color for time (status bar)"
 msgstr "barva textu pro čas (stavový řádek)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "barva textu pro nepovedené hledání textu ve vstupní rádce"
-
-msgid "text color for actions in input line"
-msgstr "barva textu pro akce ve vstupní řádce"
+msgid "text color for away nicknames"
+msgstr "barva textu pro nepřítomné přezdíveky"
 
 msgid "text color for groups in nicklist"
 msgstr "barva textu pro skupiny v seznamu přezdívek"
 
-msgid "text color for away nicknames"
-msgstr "barva textu pro nepřítomné přezdíveky"
-
 msgid "text color for offline nicknames"
 msgstr "barva textu pro nepřipojené přezdíveky"
 
@@ -3102,6 +3102,9 @@ msgstr ""
 "částečně doplňovat argumenty příkazů (zastavit pokud je nalezeno více "
 "argumentů začínající stejným prefixem)"
 
+msgid "display count for each partial completion in bar item"
+msgstr "zobrazit počet každého částečného doplnění v položce pole"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3109,11 +3112,12 @@ msgstr ""
 "částečně doplňovat vnější příkazy (zastavit pokud je nalezeno více slov "
 "začínajících stejnými písmeny)"
 
-msgid "display count for each partial completion in bar item"
-msgstr "zobrazit počet každého částečného doplnění v položce pole"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
+msgstr ""
+"maximální počet příkazů, který zobrazit jako výchozí v seznamu historie (0 = "
+"nekonečno)"
 
 #, fuzzy
 msgid ""
@@ -3121,6 +3125,9 @@ msgid ""
 "1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
 msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "maximální počet uživatelských příkazů v historii (0 = nekonečně)"
 
@@ -3128,13 +3135,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr ""
 "maximální počet navštívených bufferů uchovaných v paměti (0 = nekonečně)"
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"maximální počet příkazů, který zobrazit jako výchozí v seznamu historie (0 = "
-"nekonečno)"
-
 #, fuzzy
 msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
@@ -5957,76 +5957,6 @@ msgstr ""
 "časový formát pro \"time\" položku panelu (viz. man strftime pro specifikaci "
 "data/času)"
 
-msgid "merge server buffers"
-msgstr "spojit buffery serverů"
-
-#, fuzzy
-msgid "merge private buffers"
-msgstr "spojit buffery serverů"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"vynutit pozici nového kanálu v seznamu bufferů (none = výchozí pozice (měl "
-"by být poslední buffer), next = aktuální buffer + 1, near_server = za "
-"posledním kanálem/pv serveru)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"vynutit pozici nového soukroméno bufferu v seznamu bufferů (none = výchozí "
-"pozice (měl by být poslední buffer), next = aktuální buffer + 1, near_server "
-"= za posledním kanálem/pv serveru)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice"
-
-#, fuzzy
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"vynutit barvu u některých přezdívek: hash spočítaný z přezdívky pro nalezení "
-"barvy nebude použit pro tyto přezdívky (formát je: \"přezdívka1:barva1;"
-"přezdívka2:barva2\")"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"znaky zastavující výpočet barvy přezdívky ze znaků přezdívky (alespoň jeden "
-"mimo tento list musí být v řetězci před zastavením) (example: přezdívka \"|"
-"nick|away\" s \"|\" ve znacích vrátí barvu přezdívky \"|nick\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6068,24 +5998,6 @@ msgstr ""
 "zobrazit v soukromém okně zprávu po tom co se uživatel vráti (po odpojení od "
 "serveru)"
 
-msgid "display server away message in away bar item"
-msgstr "zobrazit zprávu nepřítomnosti na serveru v položce nepřítomnosti pole"
-
-#, fuzzy
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"schovat klíč kanálu pokud jsou zobrazeny módy v \"buffer_name\" položce "
-"panelu (toto schová všechny argumenty módů kanálu pokud je +k nastaveno na "
-"kanálu)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "zobrazovat předponu přezdívky v položce pole \"input_prompt\""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6123,9 +6035,27 @@ msgstr ""
 "čárkami oddělený seznam tagů pro zprávy, které mohou vyprodukovat zvýraznění "
 "(obvykle jakákoliv zpráva od jiného uživatele, ne zprávy serveru,...)"
 
+msgid "display server away message in away bar item"
+msgstr "zobrazit zprávu nepřítomnosti na serveru v položce nepřítomnosti pole"
+
+#, fuzzy
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"schovat klíč kanálu pokud jsou zobrazeny módy v \"buffer_name\" položce "
+"panelu (toto schová všechny argumenty módů kanálu pokud je +k nastaveno na "
+"kanálu)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr "jméno položky pole, kde je IRC server zobrazen (pro stavový řádek)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "zobrazovat módy přezdívky v položce pole \"input_prompt\""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "zobrazovat předponu přezdívky v položce pole \"input_prompt\""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6134,11 +6064,74 @@ msgstr ""
 "soukromý buffer není nalezen"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"vynutit pozici nového kanálu v seznamu bufferů (none = výchozí pozice (měl "
+"by být poslední buffer), next = aktuální buffer + 1, near_server = za "
+"posledním kanálem/pv serveru)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"vynutit pozici nového soukroméno bufferu v seznamu bufferů (none = výchozí "
+"pozice (měl by být poslední buffer), next = aktuální buffer + 1, near_server "
+"= za posledním kanálem/pv serveru)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
+#, fuzzy
+msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"vynutit barvu u některých přezdívek: hash spočítaný z přezdívky pro nalezení "
+"barvy nebude použit pro tyto přezdívky (formát je: \"přezdívka1:barva1;"
+"přezdívka2:barva2\")"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"znaky zastavující výpočet barvy přezdívky ze znaků přezdívky (alespoň jeden "
+"mimo tento list musí být v řetězci před zastavením) (example: přezdívka \"|"
+"nick|away\" s \"|\" ve znacích vrátí barvu přezdívky \"|nick\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr "zobrazit mezeru pokud mód přezdívkz není (částečný)op/voice"
+
 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
@@ -6166,6 +6159,10 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "zavřít buffer, když je na kanálu spuštěn /part"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "spojit buffery serverů"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6173,6 +6170,9 @@ msgstr ""
 "počet čistých zpráv uložených v paměti při zavření bufferu s čistými daty "
 "(zprávy budou zobrazeny při otevření bufferu s čistými daty)"
 
+msgid "merge server buffers"
+msgstr "spojit buffery serverů"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6195,20 +6195,39 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr "povolit chytrý filter pro \"part\" a \"quit\" zprávy"
-
 #. TRANSLATORS: please do not translate "nick"
 #, fuzzy
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr "povolit chytrý filter pro \"nick\" zprávy"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr "povolit chytrý filter pro \"part\" a \"quit\" zprávy"
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "ořezávat barvy z tématu rozhovoru (použito pouze při zobrazování titulku "
 "bufferu)"
 
+msgid "color for nick in input bar"
+msgstr "barva přezdívky ve vstupním poli"
+
+msgid "color for away item"
+msgstr "barva položek, které jsou pryč"
+
+msgid "color for channel modes, near channel name"
+msgstr "barva módů kanálu, blízko jména kanálu"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"barva ukazatele lagu, při počítání (pokud není od serveru obdrženo pong, pak "
+"se lag zvětšuje)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr "barva ukazatele lagu, pokud bylo od serveru obdrženo pong"
+
 msgid "color for text in join messages"
 msgstr "barva textu vezprávách připojení"
 
@@ -6242,34 +6261,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "barva textu \"Notice\" v upozorněních"
 
-msgid "color for nick in input bar"
-msgstr "barva přezdívky ve vstupním poli"
-
-msgid "color for away item"
-msgstr "barva položek, které jsou pryč"
-
-msgid "color for channel modes, near channel name"
-msgstr "barva módů kanálu, blízko jména kanálu"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"barva ukazatele lagu, při počítání (pokud není od serveru obdrženo pong, pak "
-"se lag zvětšuje)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr "barva ukazatele lagu, pokud bylo od serveru obdrženo pong"
-
 msgid "color for reason in part/quit messages"
 msgstr "barva textu důvodu ve zprávách odchodu/ukončení"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "barva pro staré téma rozhovoru kanálu (když se téma změní)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "barva pro nové téma rozhovoru kanálu (když se téma změní)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "barva pro staré téma rozhovoru kanálu (když se téma změní)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7335,13 +7335,13 @@ msgstr ""
 "bufferu (0 = žádný zpětný log)"
 
 #, fuzzy
-msgid "color for backlog lines"
-msgstr "barva položek, které jsou pryč"
-
-#, fuzzy
 msgid "color for line ending the backlog"
 msgstr "barva přezdívky ve vstupním poli"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "barva položek, které jsou pryč"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7353,17 +7353,10 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 
-msgid "use only lower case for log filenames"
-msgstr "používat pouze malé písmena ve jménech logovacích souborů"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"cesta pro logovací soubory WeeChat; \"%h\" na záčátku řetězce je nahrazeno "
-"domácím adresářem WeeChat (\"~/.weechat\" je výchozí); jsou povoleny "
-"specifikátory data (viz. man strftime)"
+"zapsat informační řádek do logovacího souboru při spuštění nebo skončení pro "
+"buffer"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7376,6 +7369,24 @@ msgstr ""
 "cesty je použito nastavení \"path\"); jsou dovoleny i lokální proměnné "
 "bufferu; jsou povoleny specifikátory data (viz. man strftime)"
 
+msgid "use only lower case for log filenames"
+msgstr "používat pouze malé písmena ve jménech logovacích souborů"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"cesta pro logovací soubory WeeChat; \"%h\" na záčátku řetězce je nahrazeno "
+"domácím adresářem WeeChat (\"~/.weechat\" je výchozí); jsou povoleny "
+"specifikátory data (viz. man strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7383,22 +7394,11 @@ msgstr ""
 "nahrazovací znak pro speciální znaky ve jménu souboru vytvářeného pomocí "
 "masky (například dělič adresářů)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"zapsat informační řádek do logovacího souboru při spuštění nebo skončení pro "
-"buffer"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "časová známka použita v logovacích souborech (použijte manuálovou stránku "
 "strftime pro spcifikátory data/času)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-
 msgid "list of logger buffers"
 msgstr "seznam logovacích bufferů"
 
@@ -8022,18 +8022,6 @@ msgstr "automaticky otevřít buffer přesměrování, když připojuje nový kl
 msgid "text color for client description"
 msgstr "barva textu děličů času"
 
-#, fuzzy
-msgid "text color in relay buffer"
-msgstr "barva textu pro jeméno bufferu"
-
-#, fuzzy
-msgid "background color in relay buffer"
-msgstr "barva pozadí pro značku nepřečtených dat"
-
-#, fuzzy
-msgid "text color of selected line in relay buffer"
-msgstr "barva textu řádku vybraného klienta"
-
 msgid "text color for \"connecting\" status"
 msgstr "barva textu pro status \"připojuji\""
 
@@ -8049,6 +8037,18 @@ msgstr "barva textu pro status \"autentizace selhala\""
 msgid "text color for \"disconnected\" status"
 msgstr "barva textu pro status \"odpojen\""
 
+#, fuzzy
+msgid "text color in relay buffer"
+msgstr "barva textu pro jeméno bufferu"
+
+#, fuzzy
+msgid "background color in relay buffer"
+msgstr "barva pozadí pro značku nepřečtených dat"
+
+#, fuzzy
+msgid "text color of selected line in relay buffer"
+msgstr "barva textu řádku vybraného klienta"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8096,16 +8096,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
-
-#, fuzzy
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
 "year)"
 msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
 
+#, fuzzy
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr "maximální počet řádků v historii bufferu (0 = nekonečně)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -8890,25 +8890,25 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "color for status \"popular\" (\"*\")"
-msgstr "barva textu pro čas (stavový řádek)"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr ""
-
-#, fuzzy
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "barva textu pro čas (stavový řádek)"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
+#, fuzzy
+msgid "color for status \"popular\" (\"*\")"
+msgstr "barva textu pro čas (stavový řádek)"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr ""
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr ""
 
@@ -8917,75 +8917,75 @@ msgid "text color in script buffer"
 msgstr "barva textu pro jeméno bufferu"
 
 #, fuzzy
-msgid "text color of dates in script buffer"
-msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
+msgid "background color in script buffer"
+msgstr "barva pozadí pro rozhovor"
 
 #, fuzzy
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of description in script buffer"
-msgstr "barva textu řádku vybraného klienta"
+msgid "text color of dates in script buffer"
+msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
 
 #, fuzzy
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of tags in script buffer"
-msgstr "barva textu pro jeméno bufferu"
-
-#, fuzzy
-msgid "text color of version in script buffer"
-msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
+msgid "text color of description in script buffer"
+msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of version loaded in script buffer"
-msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
+msgid "text color of description for selected line in script buffer"
+msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "background color in script buffer"
-msgstr "barva pozadí pro rozhovor"
+msgid "text color of extension in script buffer"
+msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color for selected line in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of description for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of extension for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of script name for selected line in script buffer"
-msgstr "barva textu řádku vybraného klienta"
+msgid "text color of tags in script buffer"
+msgstr "barva textu pro jeméno bufferu"
 
 #, fuzzy
 msgid "text color of tags for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "text color of version for selected line in script buffer"
-msgstr "barva textu řádku vybraného klienta"
+msgid "text color of version in script buffer"
+msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
+
+#, fuzzy
+msgid "text color of version loaded in script buffer"
+msgstr "barva textu pro jiné přezdívky v soukromém bufferu"
 
 #, fuzzy
 msgid "text color of version loaded for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 #, fuzzy
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr "barva textu řádku vybraného klienta"
 
 msgid ""
@@ -9301,18 +9301,6 @@ msgstr ""
 msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr "velikost ukazatele průběhu ve znacích (0 pro vypnutí ukazatele)"
 
-#, fuzzy
-msgid "text color in xfer buffer"
-msgstr "barva textu pro jeméno bufferu"
-
-#, fuzzy
-msgid "background color in xfer buffer"
-msgstr "barva pozadí pro rozhovor"
-
-#, fuzzy
-msgid "text color of selected line in xfer buffer"
-msgstr "barva textu řádku vybraného klienta"
-
 msgid "text color for \"waiting\" status"
 msgstr "barva textu pro status \"čekám\""
 
@@ -9328,8 +9316,17 @@ msgstr "barva textu pro status \"selhalo\""
 msgid "text color for \"aborted\" status"
 msgstr "barva textu pro status \"zušeno\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "časový limit pro xfer požadavek (v sekundách)"
+#, fuzzy
+msgid "text color in xfer buffer"
+msgstr "barva textu pro jeméno bufferu"
+
+#, fuzzy
+msgid "background color in xfer buffer"
+msgstr "barva pozadí pro rozhovor"
+
+#, fuzzy
+msgid "text color of selected line in xfer buffer"
+msgstr "barva textu řádku vybraného klienta"
 
 msgid "block size for sending packets, in bytes"
 msgstr "velikost bloku pro posílání paketů, v bytech"
@@ -9338,6 +9335,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "nečekat na ACK při odesílání souboru"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"IP nebo DNS adresa použitá pro posílání souborů/rozhovorů (pokud je prázdné "
+"použije se lokální IP)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9350,39 +9354,25 @@ msgstr ""
 "root)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"IP nebo DNS adresa použitá pro posílání souborů/rozhovorů (pokud je prázdné "
-"použije se lokální IP)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "rychlostní limit pro posílání souboru, v kilobytech za sekundu (0 znamená "
 "žádný limit)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"cesta pro zápis příchozích souborů (\"%h\" bude nahrazeno domácím adresářem "
-"WeeChat, \"~/.weechat\" je výchozí)"
+msgid "timeout for xfer request (in seconds)"
+msgstr "časový limit pro xfer požadavek (v sekundách)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"cesta pro čtení souborů při posílání (pokud není zadána cesta uživatelem) "
-"(\"%h\" bude nahrazeno domácím adresářem WeeChat, \"~/.weechat\" je výchozí)"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "automaticky akceptovat požadavek o rozhovor (používejte opatrně!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
-"použít vzdálenou přezdívku jako prefix lokálního souboru při přijímání "
-"souboru"
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "automaticky akceptovat příchozí soubory (používejte opatrně!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "konvertovat mezery na podtržítka při odesílání souborů"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -9395,17 +9385,27 @@ msgstr ""
 "automaticky obnovit přenos souboru pokud bylo ztraceno spojení se vzdáleným "
 "hostem"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "automaticky akceptovat příchozí soubory (používejte opatrně!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "konvertovat mezery na podtržítka při odesílání souborů"
 
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "automaticky akceptovat požadavek o rozhovor (používejte opatrně!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"cesta pro zápis příchozích souborů (\"%h\" bude nahrazeno domácím adresářem "
+"WeeChat, \"~/.weechat\" je výchozí)"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+"cesta pro čtení souborů při posílání (pokud není zadána cesta uživatelem) "
+"(\"%h\" bude nahrazeno domácím adresářem WeeChat, \"~/.weechat\" je výchozí)"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
+"použít vzdálenou přezdívku jako prefix lokálního souboru při přijímání "
+"souboru"
 
 msgid "list of xfer"
 msgstr "seznam xfer"
diff --git a/po/de.po b/po/de.po
index 6b07f4476..7c51a88d9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 22:20+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -3231,13 +3231,6 @@ msgstr ""
 "ist die Option aktiviert dann wird eine vertikale Trennlinie zwischen "
 "Fenstern gezeichnet"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-"Farbe der Trennlinie von Fenstern (bei Fenster geteilt sind) und Bars (wie z."
-"B. Nicklist)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "Farbe des '+' beim Scrollen von Info-Bars"
 
@@ -3247,11 +3240,14 @@ msgstr "Farbe des Chat-Textes"
 msgid "background color for chat"
 msgstr "Hintergrundfarbe des Chats"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"Textfarbe für Chat wenn das Fenster inaktiv ist (betrifft nicht das aktuell "
-"ausgewählte Fenster)"
+msgid "text color for buffer names"
+msgstr "Textfarbe für den Namen des Buffers"
+
+msgid "text color for channel names"
+msgstr "Farbe für den Channel-Namen"
+
+msgid "text color for delimiters"
+msgstr "Farbe der Infobar-Trennzeichen"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3260,56 +3256,11 @@ msgstr ""
 "Textfarbe für inaktive Zeilen im Chatfenster (Buffer wurde mit anderen "
 "Buffern zusammengefügt und der Buffer ist nicht aktiv)"
 
-msgid "text color for time in chat window"
-msgstr "Textfarbe der Zeit im Chatfenster"
-
-msgid "text color for time delimiters"
-msgstr "Farbe in der das Trennzeichen für die Uhrzeit dargestellt werden soll"
-
-msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"Textfarbe des Buffer-Namens (vor dem Präfix, wenn mehrere Buffer mit der "
-"selben Nummer zusammengefügt worden sind)"
-
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"Textfarbe für den inaktiven Namen des Buffer (vor dem Präfix, falls mehrere "
-"Buffer zu einem zusammengefügt worden sind und der Buffer nicht ausgewählt "
-"ist)"
-
-msgid "text color for error prefix"
-msgstr "Textfarbe für Fehler-Präfix"
-
-msgid "text color for network prefix"
-msgstr "Textfarbe für Netzwerk-Präfix"
-
-msgid "text color for action prefix"
-msgstr "Textfarbe für Action-Präfix"
-
-msgid "text color for join prefix"
-msgstr "Textfarbe für Join-Präfix"
-
-msgid "text color for quit prefix"
-msgstr "Textfarbe für Quit-Präfix"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "Farbe des '+' Zeichens, falls Präfix zu lang sein sollte"
-
-msgid "text color for suffix (after prefix)"
-msgstr "Textfarbe für den Suffix (senkrechter Strich)"
-
-msgid "text color for buffer names"
-msgstr "Textfarbe für den Namen des Buffers"
-
-msgid "text color for server names"
-msgstr "Textfarbe für den Namen des Servers"
-
-msgid "text color for channel names"
-msgstr "Farbe für den Channel-Namen"
+"Textfarbe für Chat wenn das Fenster inaktiv ist (betrifft nicht das aktuell "
+"ausgewählte Fenster)"
 
 msgid "text color for nicks in chat window"
 msgstr "Farbe für Nicks im Chat-Fenster"
@@ -3326,12 +3277,6 @@ msgstr ""
 msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr "Farbe für den Nick-Präfix (Zeichenkette die vor dem Nick steht)"
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr "Farbe für den Nick-Suffix (Zeichenkette die nach dem Nick steht)"
-
-msgid "text color for local nick in chat window"
-msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr ""
 "Textfarbe für Nicks im Buffer die Offline sind (dies betrifft Nicks, die "
@@ -3349,11 +3294,11 @@ msgstr ""
 msgid "text color for other nick in private buffer"
 msgstr "Farbe des anderen Nicknamens in einem privaten Buffer"
 
-msgid "text color for hostnames"
-msgstr "Textfarbe für Host-Namen"
+msgid "text color for local nick in chat window"
+msgstr "Textfarbe für den eigenen Nicknamen, im lokalen Chat-Fenster"
 
-msgid "text color for delimiters"
-msgstr "Farbe der Infobar-Trennzeichen"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "Farbe für den Nick-Suffix (Zeichenkette die nach dem Nick steht)"
 
 msgid "text color for highlighted prefix"
 msgstr "Textfarbe für Highlight-Präfix"
@@ -3361,12 +3306,54 @@ msgstr "Textfarbe für Highlight-Präfix"
 msgid "background color for highlighted prefix"
 msgstr "Hintergrundfarbe für Highlight-Präfix"
 
+msgid "text color for hostnames"
+msgstr "Textfarbe für Host-Namen"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"Textfarbe des Buffer-Namens (vor dem Präfix, wenn mehrere Buffer mit der "
+"selben Nummer zusammengefügt worden sind)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"Textfarbe für den inaktiven Namen des Buffer (vor dem Präfix, falls mehrere "
+"Buffer zu einem zusammengefügt worden sind und der Buffer nicht ausgewählt "
+"ist)"
+
+msgid "text color for error prefix"
+msgstr "Textfarbe für Fehler-Präfix"
+
+msgid "text color for network prefix"
+msgstr "Textfarbe für Netzwerk-Präfix"
+
+msgid "text color for action prefix"
+msgstr "Textfarbe für Action-Präfix"
+
+msgid "text color for join prefix"
+msgstr "Textfarbe für Join-Präfix"
+
+msgid "text color for quit prefix"
+msgstr "Textfarbe für Quit-Präfix"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "Farbe des '+' Zeichens, falls Präfix zu lang sein sollte"
+
+msgid "text color for suffix (after prefix)"
+msgstr "Textfarbe für den Suffix (senkrechter Strich)"
+
 msgid "text color for unread data marker"
 msgstr "Farbe in der das Lesezeichen dargestellt werden soll"
 
 msgid "background color for unread data marker"
 msgstr "Hintergrundfarbe für das Lesezeichen"
 
+msgid "text color for server names"
+msgstr "Textfarbe für den Namen des Servers"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "Textfarbe in der die Schlagwörter, die nach der jeweiligen Nachricht "
@@ -3379,57 +3366,77 @@ msgstr "Farbe zur Hervorhebung des gesuchten Textes in einer Zeile"
 msgid "background color for marker on lines where text sought is found"
 msgstr "Hintergrundfarbe zur Hervorhebung des gesuchten Textes in einer Zeile"
 
+msgid "text color for time in chat window"
+msgstr "Textfarbe der Zeit im Chatfenster"
+
+msgid "text color for time delimiters"
+msgstr "Farbe in der das Trennzeichen für die Uhrzeit dargestellt werden soll"
+
 msgid "text color for values"
 msgstr "Farbe für Werte"
 
-msgid "text color for current buffer number in status bar"
-msgstr "Farbe des aktuellen Channels in der Statuszeile"
+msgid "text color for actions in input line"
+msgstr ""
+"Textfarbe in der Eingabezeile bei Aktivität (z.B. beim Einfügen von Zeilen)"
 
-msgid "text color for current buffer name in status bar"
-msgstr "Farbe des aktuellen Buffer-Namens in der Statuszeile"
+msgid "text color for unsuccessful text search in input line"
+msgstr "Textfarbe in der Eingabezeile bei einer erfolglosen Textsuche"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"Farbe in der der aktuelle Buffer-Name in der Statuszeile angezeigt werden "
-"soll, sofern die Verbindung durch ein Protokoll, zum Beispiel, SSL geschützt "
-"ist"
-
-msgid "text color for filter indicator in status bar"
-msgstr "Farbe des Filterkennzeichens in der Statuszeile"
-
-msgid "text color for buffer with new messages (status bar)"
-msgstr "Farbe eines Buffers der neue Nachrichten enthält (Statusbar)"
-
-msgid "text color for buffer with private message (status bar)"
-msgstr "Farbe eines Bufffers mit privater Nachricht (Statusbar)"
-
-msgid "text color for buffer with highlight (status bar)"
-msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)"
+"Farbe der Trennlinie von Fenstern (bei Fenster geteilt sind) und Bars (wie z."
+"B. Nicklist)"
 
-msgid "text color for buffer with new data (not messages) (status bar)"
-msgstr "Farbe eines Buffers mit neuen Daten (keine Nachrichten) (Statusbar)"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr ""
+"Farbe für die Anzahl der Highlight-Nachrichten die in der Hotlist "
+"dargestellt werden (Statusbar)"
 
 msgid "text color for count of messages in hotlist (status bar)"
 msgstr ""
 "Farbe für die Anzahl der Nachrichten die in der Hotlist dargestellt werden "
 "(Statusbar)"
 
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr ""
+"Farbe für die Anzahl aller anderen Nachrichten die in der Hotlist "
+"dargestellt werden (Statusbar)"
+
 msgid "text color for count of private messages in hotlist (status bar)"
 msgstr ""
 "Farbe für die Anzahl der privaten Nachrichten die in der Hotlist dargestellt "
 "werden (Statusbar)"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr ""
-"Farbe für die Anzahl der Highlight-Nachrichten die in der Hotlist "
-"dargestellt werden (Statusbar)"
+msgid "text color for buffer with highlight (status bar)"
+msgstr "Farbe eines Buffers mit Highlight-Nachricht (Statusbar)"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid "text color for buffer with new messages (status bar)"
+msgstr "Farbe eines Buffers der neue Nachrichten enthält (Statusbar)"
+
+msgid "text color for buffer with new data (not messages) (status bar)"
+msgstr "Farbe eines Buffers mit neuen Daten (keine Nachrichten) (Statusbar)"
+
+msgid "text color for buffer with private message (status bar)"
+msgstr "Farbe eines Bufffers mit privater Nachricht (Statusbar)"
+
+msgid "text color for filter indicator in status bar"
+msgstr "Farbe des Filterkennzeichens in der Statuszeile"
+
+msgid "text color for current buffer name in status bar"
+msgstr "Farbe des aktuellen Buffer-Namens in der Statuszeile"
+
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"Farbe für die Anzahl aller anderen Nachrichten die in der Hotlist "
-"dargestellt werden (Statusbar)"
+"Farbe in der der aktuelle Buffer-Name in der Statuszeile angezeigt werden "
+"soll, sofern die Verbindung durch ein Protokoll, zum Beispiel, SSL geschützt "
+"ist"
+
+msgid "text color for current buffer number in status bar"
+msgstr "Farbe des aktuellen Channels in der Statuszeile"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "Farbe eines Buffers mit neuen Daten (Statusbar)"
@@ -3437,19 +3444,12 @@ msgstr "Farbe eines Buffers mit neuen Daten (Statusbar)"
 msgid "text color for time (status bar)"
 msgstr "Textfarbe für die Uhrzeit (Statusbar)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "Textfarbe in der Eingabezeile bei einer erfolglosen Textsuche"
-
-msgid "text color for actions in input line"
-msgstr ""
-"Textfarbe in der Eingabezeile bei Aktivität (z.B. beim Einfügen von Zeilen)"
+msgid "text color for away nicknames"
+msgstr "Textfarbe von abwesenden Nicknamen"
 
 msgid "text color for groups in nicklist"
 msgstr "Textfarbe für Gruppen in Nickliste"
 
-msgid "text color for away nicknames"
-msgstr "Textfarbe von abwesenden Nicknamen"
-
 msgid "text color for offline nicknames"
 msgstr "Textfarbe von Nicknamen die Offline sind"
 
@@ -3508,6 +3508,11 @@ msgstr ""
 "teilweise Vervollständigung von Befehls-Argumenten (bricht ab, falls zu "
 "viele Befehle mit dem selben Präfix beginnen)"
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+"Zeigt bei einer teilweisen Vervollständigung die Anzahl der jeweiligen "
+"Möglichkeiten in der Bar-Item an"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3515,15 +3520,12 @@ msgstr ""
 "teilweise Vervollständigung von externen Befehlen (bricht ab, falls zu viele "
 "Befehle mit dem selben Buchstaben beginnen)"
 
-msgid "display count for each partial completion in bar item"
-msgstr ""
-"Zeigt bei einer teilweisen Vervollständigung die Anzahl der jeweiligen "
-"Möglichkeiten in der Bar-Item an"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
-"maximale Anzahl an Zeilen im Verlaufsspeicher. Dies gilt pro Buffer (0: "
-"keine Zeilenbegrenzung)"
+"Wert für die maximale Anzahl der angezeigten Befehle im Verlaufsspeicher, "
+"die mittels /history angezeigt werden (0: unbegrenzt)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3533,6 +3535,11 @@ msgstr ""
 "Buffer, gehalten werden sollen (0 = unbegrenzt, Beispiele: 1440 = einen Tag, "
 "10080 = eine Woche, 43200 = einen Monat, 525600 = ein Jahr)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr ""
+"maximale Anzahl an Zeilen im Verlaufsspeicher. Dies gilt pro Buffer (0: "
+"keine Zeilenbegrenzung)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "maximale Anzahl an Befehlen im Verlaufsspeicher (0: kein Begrenzung)"
 
@@ -3542,13 +3549,6 @@ msgstr ""
 "sollen"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"Wert für die maximale Anzahl der angezeigten Befehle im Verlaufsspeicher, "
-"die mittels /history angezeigt werden (0: unbegrenzt)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr ""
@@ -6535,97 +6535,6 @@ msgstr ""
 "Format für die Zeitanzeige die bei einer CTCP TIME Anfrage zurückgesendet "
 "wird (siehe man strftime für Platzhalter für das Datum und die Uhrzeit)"
 
-msgid "merge server buffers"
-msgstr "Server-Buffer zusammenfügen"
-
-msgid "merge private buffers"
-msgstr "private Buffer zusammenfügen"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"ein neu geöffneter Channel wird auf eine Position gezwungen (none = "
-"standardmäßige Position (sollte der letzte Buffer in der Liste sein), next = "
-"aktueller Buffer + 1, near_server = nach dem letztem Channel/privaten Buffer "
-"des jeweiligen Servers)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"ein neuer privater Buffer wird auf eine Position gezwungen (none = "
-"standardmäßige Position (sollte der letzte Buffer in der Liste sein), next = "
-"aktueller Buffer + 1, near_server = nach dem letztem Channel/privaten Buffer "
-"des jeweiligen Servers)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-"vor dem Nick wird der entsprechende Nickmodus (op, voice,...) angezeigt "
-"(none = Funktion ist deaktiviert, prefix = wird nur im Präfix angezeigt "
-"(Standardeinstellung), action = wird nur in action Nachrichten angezeigt, "
-"both = im Präfix und in action Nachrichten)"
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-"es wird ein Leerzeichen anstelle eines Nickmodus verwendet, falls kein "
-"Nickmodus ((half)op/voice [@%+]) vorhanden ist"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"erzwingt für einen Nick eine spezielle Farbe. Die standardmäßig, mittels "
-"Streuwertfunktion aus dem Nicknamen, generierte Nickfarbe findet für diese "
-"Nicks keine Anwendung (Format:\"Nick1:Farbe1;Nick2:Farbe2\"). Zuerst wird "
-"beim Nicknamen nach Groß- und Kleinschreibung unterschieden. Sollte der Nick "
-"nicht gefunden werden, findet keine Unterscheidung mehr statt. Somit ist es "
-"möglich die Nicks, in dieser Option, ausschließlich in Kleinschrift zu "
-"schreiben"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-"Gibt an welcher Hash-Algorithmus zur Farbauswahl für Nicks genutzt werden "
-"soll: djb2 = Variante des djb2 (Position der Buchstaben innerhalb des Nicks "
-"werden berücksichtigt: Anagramme eines Nick erhalten eine andere Farbe), sum "
-"= hier ist nur die Anzahl der Buchstaben maßgeblich"
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für "
-"einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im "
-"Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit "
-"eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname "
-"lautet \"|nick|abwesend\" wobei das Zeichen \"|\" ignoriert werden soll. Die "
-"Farbe für den Nicknamen wird nun für \"|nick\" anstelle von \"|nick|abwesend"
-"\" erstellt)"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-"intelligente Vervollständigung für Nicks (es wird zuerst mit den letzten "
-"Rednern vervollständigt): speakers = alle Redner (einschließlich "
-"Highlights), speakers_highlight = nur Redner die eine Highlight Nachricht "
-"geschrieben haben"
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6673,23 +6582,6 @@ msgstr ""
 "es wird bei einer privaten Unterhaltung eine Mitteilung ausgegeben falls der "
 "User wieder zurück ist (falls der User sich beim Server abgemeldet hat)"
 
-msgid "display server away message in away bar item"
-msgstr "Abwesenheitsnachricht in der Away-Bar-Item anzeigen"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"der Channel-Schlüssel wird nicht im Channel Modus angezeigt (diese Option "
-"unterdrückt alle Channel-Modi falls der Modus für den Channel auf +k gesetzt "
-"wurde)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "zeigt Nick-Modi in \"input_prompt\" Bar-Item"
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "der Nick-Präfix wird in \"input_prompt\" Bar-Item angezeigt"
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6755,10 +6647,27 @@ msgstr ""
 "hervorheben sollen (Highlight) (normalerweise trifft dies auf jede Nachricht "
 "eines Users zu, ausgenommen Nachrichten vom Server,..)"
 
+msgid "display server away message in away bar item"
+msgstr "Abwesenheitsnachricht in der Away-Bar-Item anzeigen"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"der Channel-Schlüssel wird nicht im Channel Modus angezeigt (diese Option "
+"unterdrückt alle Channel-Modi falls der Modus für den Channel auf +k gesetzt "
+"wurde)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 "Name der Bar-Item in dem der IRC Server angezeigt wird (für Status-Bar)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "zeigt Nick-Modi in \"input_prompt\" Bar-Item"
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "der Nick-Präfix wird in \"input_prompt\" Bar-Item angezeigt"
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6767,6 +6676,26 @@ msgstr ""
 "Buffer nicht gefunden wird"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"ein neu geöffneter Channel wird auf eine Position gezwungen (none = "
+"standardmäßige Position (sollte der letzte Buffer in der Liste sein), next = "
+"aktueller Buffer + 1, near_server = nach dem letztem Channel/privaten Buffer "
+"des jeweiligen Servers)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"ein neuer privater Buffer wird auf eine Position gezwungen (none = "
+"standardmäßige Position (sollte der letzte Buffer in der Liste sein), next = "
+"aktueller Buffer + 1, near_server = nach dem letztem Channel/privaten Buffer "
+"des jeweiligen Servers)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
@@ -6777,6 +6706,71 @@ msgstr ""
 "\"nickserv,nickbot\""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"erzwingt für einen Nick eine spezielle Farbe. Die standardmäßig, mittels "
+"Streuwertfunktion aus dem Nicknamen, generierte Nickfarbe findet für diese "
+"Nicks keine Anwendung (Format:\"Nick1:Farbe1;Nick2:Farbe2\"). Zuerst wird "
+"beim Nicknamen nach Groß- und Kleinschreibung unterschieden. Sollte der Nick "
+"nicht gefunden werden, findet keine Unterscheidung mehr statt. Somit ist es "
+"möglich die Nicks, in dieser Option, ausschließlich in Kleinschrift zu "
+"schreiben"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+"Gibt an welcher Hash-Algorithmus zur Farbauswahl für Nicks genutzt werden "
+"soll: djb2 = Variante des djb2 (Position der Buchstaben innerhalb des Nicks "
+"werden berücksichtigt: Anagramme eines Nick erhalten eine andere Farbe), sum "
+"= hier ist nur die Anzahl der Buchstaben maßgeblich"
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"Zeichen die genutzt werden sollen damit bei der Generierung der Farbe für "
+"einen Nicknamen abgebrochen wird. Es muss mindestens ein Zeichen im "
+"Nicknamen enthalten sein der nicht in dieser Liste aufgeführt wird, damit "
+"eine Farbe für den Nicknamen erstellt werden kann (Beispiel: Der Nickname "
+"lautet \"|nick|abwesend\" wobei das Zeichen \"|\" ignoriert werden soll. Die "
+"Farbe für den Nicknamen wird nun für \"|nick\" anstelle von \"|nick|abwesend"
+"\" erstellt)"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+"intelligente Vervollständigung für Nicks (es wird zuerst mit den letzten "
+"Rednern vervollständigt): speakers = alle Redner (einschließlich "
+"Highlights), speakers_highlight = nur Redner die eine Highlight Nachricht "
+"geschrieben haben"
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+"vor dem Nick wird der entsprechende Nickmodus (op, voice,...) angezeigt "
+"(none = Funktion ist deaktiviert, prefix = wird nur im Präfix angezeigt "
+"(Standardeinstellung), action = wird nur in action Nachrichten angezeigt, "
+"both = im Präfix und in action Nachrichten)"
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+"es wird ein Leerzeichen anstelle eines Nickmodus verwendet, falls kein "
+"Nickmodus ((half)op/voice [@%+]) vorhanden ist"
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 "zeigt Notizen als private Nachricht an (wird die \"auto\" Option verwendet "
@@ -6805,6 +6799,9 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "schließt den Buffer wenn \"/part\" im Channel ausgeführt wird"
 
+msgid "merge private buffers"
+msgstr "private Buffer zusammenfügen"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6813,6 +6810,9 @@ msgstr ""
 "der RAW-Daten-Buffer geschlossen ist (die Nachrichten werden umgehend "
 "angezeigt sobald der RAW-Daten-Buffer geöffnet wird)"
 
+msgid "merge server buffers"
+msgstr "Server-Buffer zusammenfügen"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6843,22 +6843,44 @@ msgstr ""
 "Änderungen am Topic oder falls der Nick gewechselt wird (0 = deaktiviert: "
 "join-Mitteilungen bleiben verborgen)"
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr ""
-"aktiviert einen intelligenten Filter für \"part\" und \"quit\" Nachrichten"
-
 #. TRANSLATORS: please do not translate "nick"
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr ""
 "aktiviert einen intelligenten Filter für \"nick\" Nachrichten (Änderungen "
 "des Nick)"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr ""
+"aktiviert einen intelligenten Filter für \"part\" und \"quit\" Nachrichten"
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "Farben werden im Channel-Thema entfernt (wird nur genutzt wenn der Buffer-"
 "Titel angezeigt wird)"
 
+msgid "color for nick in input bar"
+msgstr "Farbe des eigenen Nicknamens in der Eingabezeile"
+
+msgid "color for away item"
+msgstr "Farbe des Abwesenheit-Textes in der Eingabezeile"
+
+msgid "color for channel modes, near channel name"
+msgstr "Farbe der Channel-Modes (neben dem Channelnamen)"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"Farbe in der die Anzeige für die Verzögerung (Lag) dargestellt werden soll, "
+"sobald auf Antwort gewartet wird (\"pong\" wurde vom Server nicht empfangen "
+"und die Verzögerungszeit wird erhöht)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr ""
+"Farbe in der die Anzeige für die Verzögerung (Lag) dargestellt werden soll, "
+"sobald ein \"pong\" vom Server empfangen wurde"
+
 msgid "color for text in join messages"
 msgstr ""
 "Textfarbe in der die Meldungen für das Betreten eines Channels angezeigt "
@@ -6904,41 +6926,19 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "Farbe des \"Notice\"-Textes in Notizen"
 
-msgid "color for nick in input bar"
-msgstr "Farbe des eigenen Nicknamens in der Eingabezeile"
-
-msgid "color for away item"
-msgstr "Farbe des Abwesenheit-Textes in der Eingabezeile"
-
-msgid "color for channel modes, near channel name"
-msgstr "Farbe der Channel-Modes (neben dem Channelnamen)"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"Farbe in der die Anzeige für die Verzögerung (Lag) dargestellt werden soll, "
-"sobald auf Antwort gewartet wird (\"pong\" wurde vom Server nicht empfangen "
-"und die Verzögerungszeit wird erhöht)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-"Farbe in der die Anzeige für die Verzögerung (Lag) dargestellt werden soll, "
-"sobald ein \"pong\" vom Server empfangen wurde"
-
 msgid "color for reason in part/quit messages"
 msgstr ""
 "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden "
 "soll"
 
-msgid "color for old channel topic (when topic is changed)"
+msgid "color for new channel topic (when topic is changed)"
 msgstr ""
-"Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das "
+"Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das "
 "Thema des Channels geändert wurde"
 
-msgid "color for new channel topic (when topic is changed)"
+msgid "color for old channel topic (when topic is changed)"
 msgstr ""
-"Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das "
+"Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das "
 "Thema des Channels geändert wurde"
 
 msgid ""
@@ -8046,12 +8046,12 @@ msgstr ""
 "maximale Anzahl der letzten Zeilen die aus der Protokolldatei dargestellt "
 "werden sollen, sobald ein Buffer geöffnet wird (0 = kein Darstellung)"
 
-msgid "color for backlog lines"
-msgstr "Textfarbe in der der Verlaufsspeicher dargestellt werden soll"
-
 msgid "color for line ending the backlog"
 msgstr "Farbe für die letzte Zeile im Verlaufsspeicher"
 
+msgid "color for backlog lines"
+msgstr "Textfarbe in der der Verlaufsspeicher dargestellt werden soll"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -8066,17 +8066,10 @@ msgstr ""
 "= Protokolldatei wird unmittelbar gesichert, nachdem eine neue Zeile "
 "dargestellt wurde)"
 
-msgid "use only lower case for log filenames"
-msgstr "Protokolldateien werden ausschließlich in Kleinschreibung erstellt"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"Pfad für WeeChat Protokolldateien; \"%h\" wird durch das WeeChat Verzeichnis "
-"ersetzt (Standardpfad: \"~/.weechat\"); eine Datumsspezifikation ist "
-"zulässig (siehe: man strftime)"
+"fügt eine Information in die Protokoll-Datei ein, wenn die Protokollierung "
+"gestartet oder beendet wird"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -8089,6 +8082,24 @@ msgstr ""
 "wird um vollständige Verzeichnisstrukturen zu erstellen); lokale Buffer "
 "Variablen und Datumsspezifikationen (siehe: man strftime) sind zulässig"
 
+msgid "use only lower case for log filenames"
+msgstr "Protokolldateien werden ausschließlich in Kleinschreibung erstellt"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr "Text, der vor dem Nick geschrieben werden soll, Beispiel: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr "Text, der nach dem Nick geschrieben werden soll, Beispiel: \"<\""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"Pfad für WeeChat Protokolldateien; \"%h\" wird durch das WeeChat Verzeichnis "
+"ersetzt (Standardpfad: \"~/.weechat\"); eine Datumsspezifikation ist "
+"zulässig (siehe: man strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -8096,22 +8107,11 @@ msgstr ""
 "Ersatzzeichen für Dateinamen, falls der Dateiname Sonderzeichen beinhaltet "
 "(z.B. das Trennzeichen bei Verzeichnissen \"/\")"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"fügt eine Information in die Protokoll-Datei ein, wenn die Protokollierung "
-"gestartet oder beendet wird"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "Zeitstempel in Protokoll-Datei nutzen (siehe man strftime für Platzhalter "
 "für das Datum und die Uhrzeit)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr "Text, der vor dem Nick geschrieben werden soll, Beispiel: \"<\""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr "Text, der nach dem Nick geschrieben werden soll, Beispiel: \"<\""
-
 msgid "list of logger buffers"
 msgstr "Auflistung der protokollierten Buffer"
 
@@ -8748,15 +8748,6 @@ msgstr ""
 msgid "text color for client description"
 msgstr "Textfarbe für Client-Beschreibung"
 
-msgid "text color in relay buffer"
-msgstr "Textfarbe in Relay-Buffer"
-
-msgid "background color in relay buffer"
-msgstr "Hintergrundfarbe in Relay-Buffer"
-
-msgid "text color of selected line in relay buffer"
-msgstr "Textfarbe für selektierte Zeile in Relay-Buffer"
-
 msgid "text color for \"connecting\" status"
 msgstr "Textfarbe für Status: \"verbinde\""
 
@@ -8772,6 +8763,15 @@ msgstr "Textfarbe für Status: \"Authentifizierung gescheitert\""
 msgid "text color for \"disconnected\" status"
 msgstr "Textfarbe für Status: \"Verbindung getrennt\""
 
+msgid "text color in relay buffer"
+msgstr "Textfarbe in Relay-Buffer"
+
+msgid "background color in relay buffer"
+msgstr "Hintergrundfarbe in Relay-Buffer"
+
+msgid "text color of selected line in relay buffer"
+msgstr "Textfarbe für selektierte Zeile in Relay-Buffer"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8837,11 +8837,6 @@ msgstr ""
 "\"(?-i)\" dem Origin vorangestellt werden), Beispiele: \"^http://(www\\.)?"
 "example\\.(com|org)\""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"maximale Anzahl an Zeilen im Verlaufsspeicher. Dies gilt für jeden IRC "
-"Channel (0: keine Zeilenbegrenzung)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8851,6 +8846,11 @@ msgstr ""
 "IRC Channel gehalten werden sollen (0 = unbegrenzt, Beispiele: 1440 = einen "
 "Tag, 10080 = eine Woche, 43200 = einen Monat, 525600 = ein Jahr)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"maximale Anzahl an Zeilen im Verlaufsspeicher. Dies gilt für jeden IRC "
+"Channel (0: keine Zeilenbegrenzung)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 "Verlaufsspeicher anzeigen, beginnend mit dem Client der zuletzt beendet wurde"
@@ -9769,97 +9769,97 @@ msgstr ""
 "werden. Andernfalls können Aktionen nur über die Eingabezeile durchgeführt "
 "werden: i,r..."
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "Farbe in der der Status \"empfohlen\" (\"*\") dargestellt werden soll"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr ""
-"Farbe in der der Status \"installiert\" (\"i\") dargestellt werden soll"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "Farbe in der der Status \"autoloaded\" (\"a\") dargestellt werden soll"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "Farbe in der der Status \"halten\" (\"H\") dargestellt werden soll"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "Farbe in der der Status \"laufend\" (\"r\") dargestellt werden soll"
+msgid "color for status \"installed\" (\"i\")"
+msgstr ""
+"Farbe in der der Status \"installiert\" (\"i\") dargestellt werden soll"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "Farbe in der der Status \"obsolete\" (\"N\") dargestellt werden soll"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "Farbe in der der Status \"empfohlen\" (\"*\") dargestellt werden soll"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "Farbe in der der Status \"laufend\" (\"r\") dargestellt werden soll"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "Farbe in der der Status \"unbekannt\" (\"?\") dargestellt werden soll"
 
 msgid "text color in script buffer"
 msgstr "Textfarbe im Skript-Buffer"
 
+msgid "background color in script buffer"
+msgstr "Hintergrundfarbe im Skript-Buffer"
+
+msgid "background color for selected line in script buffer"
+msgstr "Hintergrundfarbe"
+
 msgid "text color of dates in script buffer"
 msgstr "Textfarbe für das Datum im Skript-Buffer"
 
+msgid "text color of dates for selected line in script buffer"
+msgstr ""
+"Textfarbe für das Datum, im Skript Buffer, wenn die Zeile angewählt wird"
+
 msgid "text color of delimiters in script buffer"
 msgstr "Textfarbe für das Trennzeichen im Skript-Buffer"
 
 msgid "text color of description in script buffer"
 msgstr "Textfarbe für die Beschreibung im Skript-Buffer"
 
-msgid "text color of extension in script buffer"
-msgstr "Textfarbe für die Erweiterung im Skript-Buffer"
-
-msgid "text color of script name in script buffer"
-msgstr "Textfarbe für den Namen des Skriptes im Skript-Buffer"
-
-msgid "text color of tags in script buffer"
-msgstr "Textfarbe für die Schlagwörter im Skript-Buffer"
-
-msgid "text color of version in script buffer"
-msgstr "Textfarbe für die Version im Skript-Buffer"
-
-msgid "text color of version loaded in script buffer"
-msgstr "Textfarbe für die geladene Version im Skript-Buffer"
-
-msgid "background color in script buffer"
-msgstr "Hintergrundfarbe im Skript-Buffer"
-
-msgid "text color for selected line in script buffer"
-msgstr "Textfarbe für den Auswahlbalken im Skript-Buffer"
-
-msgid "text color of dates for selected line in script buffer"
-msgstr ""
-"Textfarbe für das Datum, im Skript Buffer, wenn die Zeile angewählt wird"
-
 msgid "text color of description for selected line in script buffer"
 msgstr ""
 "Textfarbe für die Beschreibung des Skriptes, im Skript Buffer, wenn die "
 "Zeile angewählt wird"
 
+msgid "text color of extension in script buffer"
+msgstr "Textfarbe für die Erweiterung im Skript-Buffer"
+
 msgid "text color of extension for selected line in script buffer"
 msgstr ""
 "Textfarbe für die Dateierweiterung, im Skript Buffer, wenn die Zeile "
 "angewählt wird"
 
+msgid "text color of script name in script buffer"
+msgstr "Textfarbe für den Namen des Skriptes im Skript-Buffer"
+
 msgid "text color of script name for selected line in script buffer"
 msgstr ""
 "Textfarbe für den Namen des Skriptes, im Skript Buffer, wenn die Zeile "
 "angewählt wird"
 
+msgid "text color for selected line in script buffer"
+msgstr "Textfarbe für den Auswahlbalken im Skript-Buffer"
+
+msgid "text color of tags in script buffer"
+msgstr "Textfarbe für die Schlagwörter im Skript-Buffer"
+
 msgid "text color of tags for selected line in script buffer"
 msgstr ""
 "Textfarbe für die Schlagwörter, im Skript Buffer, wenn die Zeile angewählt "
 "wird"
 
-msgid "text color of version for selected line in script buffer"
-msgstr ""
-"Textfarbe für die Version des Skriptes, im Skript Buffer, wenn die Zeile "
-"angewählt wird"
+msgid "text color of version in script buffer"
+msgstr "Textfarbe für die Version im Skript-Buffer"
+
+msgid "text color of version loaded in script buffer"
+msgstr "Textfarbe für die geladene Version im Skript-Buffer"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 "Textfarbe für die Versionsanzeige des geladenen Skriptes, im Skript Buffer, "
 "wenn die Zeile angewählt wird"
 
-msgid "background color for selected line in script buffer"
-msgstr "Hintergrundfarbe"
+msgid "text color of version for selected line in script buffer"
+msgstr ""
+"Textfarbe für die Version des Skriptes, im Skript Buffer, wenn die Zeile "
+"angewählt wird"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -10188,15 +10188,6 @@ msgstr ""
 "Größe des Fortschrittsbalkens, in Zeichen (0, falls Fortschrittsbalken "
 "deaktiviert sein soll)"
 
-msgid "text color in xfer buffer"
-msgstr "Textfarbe in xfer Buffer"
-
-msgid "background color in xfer buffer"
-msgstr "Hintergrundfarbe des xfer Buffer"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "Textfarbe für selektierte Zeile in xfer Buffer"
-
 msgid "text color for \"waiting\" status"
 msgstr "Textfarbe für Status: \"wartend\""
 
@@ -10212,8 +10203,14 @@ msgstr "Textfarbe für Status: \"fehlgeschlagen\""
 msgid "text color for \"aborted\" status"
 msgstr "Textfarbe für Status: \"abgebrochen\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "Zeitüberschreitung bei Transferanfrage (in Sekunden)"
+msgid "text color in xfer buffer"
+msgstr "Textfarbe in xfer Buffer"
+
+msgid "background color in xfer buffer"
+msgstr "Hintergrundfarbe des xfer Buffer"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "Textfarbe für selektierte Zeile in xfer Buffer"
 
 msgid "block size for sending packets, in bytes"
 msgstr "Blockgröße für versendete Pakete (in Bytes)"
@@ -10223,6 +10220,13 @@ msgstr ""
 "beim Versenden von Daten wird nicht auf ein Bestätigungssignal (ACK) gewartet"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"IP- oder DNS-Adresse für ausgehenden Datentransfer/Chat (falls kein Wert "
+"angegeben ist, wird die IP des lokalen Interfaces benutzt)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -10235,42 +10239,29 @@ msgstr ""
 "\" kann auf den Port-Bereich unter 1024 zugreifen)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"IP- oder DNS-Adresse für ausgehenden Datentransfer/Chat (falls kein Wert "
-"angegeben ist, wird die IP des lokalen Interfaces benutzt)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "Begrenzt die Übertragungsgeschwindigkeit beim Versenden, in Kilobytes pro "
 "Sekunde (0 = keine Begrenzung)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"Pfad in welchem die ankommenden Dateien gespeichert werden (\"%h\" wird "
-"durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: \"~/.weechat\")"
+msgid "timeout for xfer request (in seconds)"
+msgstr "Zeitüberschreitung bei Transferanfrage (in Sekunden)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"Pfad in welchem sich die Quelldatei befindet (falls vom Anwender kein Pfad "
-"angegeben wurde) (\"%h\" wird durch das WeeChat Verzeichnis ersetzt, "
-"Standardverzeichnis: \"~/.weechat\")"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "eine Chat-Anfrage wird automatisch akzeptiert (Vorsicht!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
-"beim Empfang von Dateien wird der Nickname des Versenders dem Dateinamen "
-"vorangestellt"
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "eine Datenübertragung wird automatisch angenommen (Vorsicht!)"
 
-msgid "convert spaces to underscores when sending files"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
 msgstr ""
-"beim Versenden von Dateien werden Leerzeichen im Dateinamen durch einen "
-"Unterstrich ersetzt"
+"durch Kommata getrennte Liste von Nicks deren Chat- und Transferanfragen "
+"automatisch akzeptiert werden. Format : \"server.nick\" (für einen "
+"speziellen Server) oder \"nick\" (global, für alle Server); Beispiel: "
+"\"freenode.FlashCode,andrew\""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -10283,21 +10274,30 @@ msgstr ""
 "falls eine Verbindung getrennt wurde, dann wird eine abgebrochene "
 "Übertragungen automatisch fortsetzt"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "eine Datenübertragung wird automatisch angenommen (Vorsicht!)"
+msgid "convert spaces to underscores when sending files"
+msgstr ""
+"beim Versenden von Dateien werden Leerzeichen im Dateinamen durch einen "
+"Unterstrich ersetzt"
 
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "eine Chat-Anfrage wird automatisch akzeptiert (Vorsicht!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"Pfad in welchem die ankommenden Dateien gespeichert werden (\"%h\" wird "
+"durch das WeeChat Verzeichnis ersetzt, Standardverzeichnis: \"~/.weechat\")"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
-"durch Kommata getrennte Liste von Nicks deren Chat- und Transferanfragen "
-"automatisch akzeptiert werden. Format : \"server.nick\" (für einen "
-"speziellen Server) oder \"nick\" (global, für alle Server); Beispiel: "
-"\"freenode.FlashCode,andrew\""
+"Pfad in welchem sich die Quelldatei befindet (falls vom Anwender kein Pfad "
+"angegeben wurde) (\"%h\" wird durch das WeeChat Verzeichnis ersetzt, "
+"Standardverzeichnis: \"~/.weechat\")"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
+msgstr ""
+"beim Empfang von Dateien wird der Nickname des Versenders dem Dateinamen "
+"vorangestellt"
 
 msgid "list of xfer"
 msgstr "Transferliste"
diff --git a/po/es.po b/po/es.po
index d80903e6f..64bd01406 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 15:57+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3025,11 +3025,6 @@ msgstr "muestra un separador horizontal entre ventanas"
 msgid "display a vertical separator between windows"
 msgstr "muestra un separador vertical entre ventanas"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-
 msgid "text color for '+' when scrolling bars"
 msgstr "color del '+' cuando se desplaza las barras"
 
@@ -3039,11 +3034,14 @@ msgstr "color para el texto de la conversación"
 msgid "background color for chat"
 msgstr "color de fondo para el área de conversación"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"color para la charla cuando la ventana está inactiva (no es la ventana "
-"seleccionada)"
+msgid "text color for buffer names"
+msgstr "color para los nombres de los buffers"
+
+msgid "text color for channel names"
+msgstr "color para los nombres de los canales"
+
+msgid "text color for delimiters"
+msgstr "color para los delimitadores"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3052,56 +3050,11 @@ msgstr ""
 "color para la charla cuando la línea es inactiva (cuando el buffer está "
 "fusionado con otros buffers y no está seleccionado)"
 
-msgid "text color for time in chat window"
-msgstr "color para la hora en la ventana de conversación"
-
-msgid "text color for time delimiters"
-msgstr "color para los delimitadores de la hora"
-
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"color del texto para el nombre del buffer (antes del prefijo, cuando varios "
-"buffers está fusionados con el mismo número)"
-
-msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"color del texto para el nombre del buffer inactivo (antes del prefijo, "
-"cuando varios buffers está fusionados con el mismo número y si el buffer no "
-"está seleccionado)"
-
-msgid "text color for error prefix"
-msgstr "color para el prefijo de error"
-
-msgid "text color for network prefix"
-msgstr "color para el prefijo de red"
-
-msgid "text color for action prefix"
-msgstr "color para el prefijo de acción"
-
-msgid "text color for join prefix"
-msgstr "color para el prefijo de unión"
-
-msgid "text color for quit prefix"
-msgstr "color para el prefijo de salida"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "color para el '+' cuando el prefijo es muy largo"
-
-msgid "text color for suffix (after prefix)"
-msgstr "color para el sufijo (después del prefijo)"
-
-msgid "text color for buffer names"
-msgstr "color para los nombres de los buffers"
-
-msgid "text color for server names"
-msgstr "color para los nombres de los servidores"
-
-msgid "text color for channel names"
-msgstr "color para los nombres de los canales"
+"color para la charla cuando la ventana está inactiva (no es la ventana "
+"seleccionada)"
 
 msgid "text color for nicks in chat window"
 msgstr "color para los apodos en la ventana de conversación"
@@ -3119,14 +3072,6 @@ msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
 "color del prefijo del apodo (el prefijo es el texto mostrado antes del apodo)"
 
-#, fuzzy
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"color del sufijo del apodo (el sufijo es el texto mostrado después del apodo)"
-
-msgid "text color for local nick in chat window"
-msgstr "color para el apodo propio en la ventana de conversación"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "color para apodos desconectados (ya no están en la lista de apodos)"
 
@@ -3139,11 +3084,13 @@ msgstr "color de fondo para apodos desconectados con realces"
 msgid "text color for other nick in private buffer"
 msgstr "color para el otro apodo en una conversación privada"
 
-msgid "text color for hostnames"
-msgstr "color para los hostnames"
+msgid "text color for local nick in chat window"
+msgstr "color para el apodo propio en la ventana de conversación"
 
-msgid "text color for delimiters"
-msgstr "color para los delimitadores"
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"color del sufijo del apodo (el sufijo es el texto mostrado después del apodo)"
 
 msgid "text color for highlighted prefix"
 msgstr "color para el prefijo con realce"
@@ -3151,12 +3098,54 @@ msgstr "color para el prefijo con realce"
 msgid "background color for highlighted prefix"
 msgstr "color de fondo para el prefijo con realce"
 
+msgid "text color for hostnames"
+msgstr "color para los hostnames"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"color del texto para el nombre del buffer (antes del prefijo, cuando varios "
+"buffers está fusionados con el mismo número)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"color del texto para el nombre del buffer inactivo (antes del prefijo, "
+"cuando varios buffers está fusionados con el mismo número y si el buffer no "
+"está seleccionado)"
+
+msgid "text color for error prefix"
+msgstr "color para el prefijo de error"
+
+msgid "text color for network prefix"
+msgstr "color para el prefijo de red"
+
+msgid "text color for action prefix"
+msgstr "color para el prefijo de acción"
+
+msgid "text color for join prefix"
+msgstr "color para el prefijo de unión"
+
+msgid "text color for quit prefix"
+msgstr "color para el prefijo de salida"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "color para el '+' cuando el prefijo es muy largo"
+
+msgid "text color for suffix (after prefix)"
+msgstr "color para el sufijo (después del prefijo)"
+
 msgid "text color for unread data marker"
 msgstr "color para el marcador de datos sin leer"
 
 msgid "background color for unread data marker"
 msgstr "color de fondo para el marcador de datos sin leer"
 
+msgid "text color for server names"
+msgstr "color para los nombres de los servidores"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "color para las etiquetas de mensaje (mostrados con el comando /debug tags)"
@@ -3170,55 +3159,72 @@ msgstr ""
 "color de fondo del marcador en las líneas donde el texto buscado es "
 "encontrado"
 
+msgid "text color for time in chat window"
+msgstr "color para la hora en la ventana de conversación"
+
+msgid "text color for time delimiters"
+msgstr "color para los delimitadores de la hora"
+
 msgid "text color for values"
 msgstr "color para los valores"
 
-msgid "text color for current buffer number in status bar"
-msgstr "color para el número del buffer actual en la barra de estado"
+msgid "text color for actions in input line"
+msgstr "color para acciones en la línea de entrada"
 
-msgid "text color for current buffer name in status bar"
-msgstr "color para el nombre del buffer actual en la barra de estado"
+msgid "text color for unsuccessful text search in input line"
+msgstr "color para una búsqueda fallida en la línea de entrada"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"color para el nombre del buffer actual en la barra de estado, si los datos "
-"están protegidos con un protocolo como SSL"
 
-msgid "text color for filter indicator in status bar"
-msgstr "color para el indicador de filtro en la barra de estado"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr ""
+"color para el contador de mensajes resaltados en la lista de actividad "
+"(barra de estado)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "color para un buffer con mensajes nuevos (barra de estado)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr ""
+"color para el contador de mensajes en la lista de actividad (barra de estado)"
 
-msgid "text color for buffer with private message (status bar)"
-msgstr "color para un buffer con un mensaje privado (barra de estado)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr ""
+"color para el contador de otros mensajes en la lista de actividad (barra de "
+"estado)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr ""
+"color para el contador de mensajes privados en la lista de actividad (barra "
+"de estado)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "color para una buffer con texto resaltado (barra de estado)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "color para un buffer con mensajes nuevos (barra de estado)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "color para un buffer con nuevos datos (no mensajes) (barra de estado)"
 
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr ""
-"color para el contador de mensajes en la lista de actividad (barra de estado)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "color para un buffer con un mensaje privado (barra de estado)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr ""
-"color para el contador de mensajes privados en la lista de actividad (barra "
-"de estado)"
+msgid "text color for filter indicator in status bar"
+msgstr "color para el indicador de filtro en la barra de estado"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr ""
-"color para el contador de mensajes resaltados en la lista de actividad "
-"(barra de estado)"
+msgid "text color for current buffer name in status bar"
+msgstr "color para el nombre del buffer actual en la barra de estado"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"color para el contador de otros mensajes en la lista de actividad (barra de "
-"estado)"
+"color para el nombre del buffer actual en la barra de estado, si los datos "
+"están protegidos con un protocolo como SSL"
+
+msgid "text color for current buffer number in status bar"
+msgstr "color para el número del buffer actual en la barra de estado"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "color para un buffer con nuevos datos (barra de estado)"
@@ -3226,18 +3232,12 @@ msgstr "color para un buffer con nuevos datos (barra de estado)"
 msgid "text color for time (status bar)"
 msgstr "color para el texto de la hora (en la barra de estado)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "color para una búsqueda fallida en la línea de entrada"
-
-msgid "text color for actions in input line"
-msgstr "color para acciones en la línea de entrada"
+msgid "text color for away nicknames"
+msgstr "color para apodos ausentes"
 
 msgid "text color for groups in nicklist"
 msgstr "color para grupos en la lista de apodos"
 
-msgid "text color for away nicknames"
-msgstr "color para apodos ausentes"
-
 msgid "text color for offline nicknames"
 msgstr "color para apodos desconectados"
 
@@ -3293,6 +3293,9 @@ msgstr ""
 "autocompletar parcialmente argumentos de comandos (se detiene cuando varios "
 "argumentos empiezan con el mismo prefijo)"
 
+msgid "display count for each partial completion in bar item"
+msgstr "mostrar contador para cada completado parcial en la barra"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3300,11 +3303,12 @@ msgstr ""
 "autocompletar parcialmente comandos externos (se detiene cuando varias "
 "palabras empiezan con las mismas letras)"
 
-msgid "display count for each partial completion in bar item"
-msgstr "mostrar contador para cada completado parcial en la barra"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "número máximo de líneas para cada buffer (0 = ilimitado)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
+msgstr ""
+"número máximo de comandos para mostrar por defecto en el listado del "
+"historial (0 = ilimitado)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3313,6 +3317,9 @@ msgstr ""
 "número máximo de minutos en el historial por buffer (0 = ilimitado, "
 "ejemplos: 1440 = un día, 10080 = una semana, 43200 = un mes, 525600 = un año)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "número máximo de líneas para cada buffer (0 = ilimitado)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "número máximo de comandos en el historial (0 = ilimitado)"
 
@@ -3320,13 +3327,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr "número máximo de buffers visitados en memoria"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"número máximo de comandos para mostrar por defecto en el listado del "
-"historial (0 = ilimitado)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr ""
@@ -6182,79 +6182,6 @@ msgstr ""
 "formato de hora usado en respuesta al mensaje CTCP TIME (consultar man "
 "strftime para las especificaciones de fecha/hora)"
 
-msgid "merge server buffers"
-msgstr "unir buffers de los servidores"
-
-#, fuzzy
-msgid "merge private buffers"
-msgstr "unir buffers de los servidores"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"fuerza la posición de nuevos canales en la lista de buffers (none = posición "
-"predeterminada (último buffer), next = buffer actual + 1, near_server = "
-"después del último canal/privado del server)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"fuerza la posición de nuevos privados en la lista de buffers (none = "
-"posición  predeterminada (último buffer), next = buffer actual + 1, "
-"near_server = después del último canal/privado del server)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-"mostrar un espacio si el modo de usuario esta activado pero el usuario no "
-"tiene modo (no es op, voz, ...)"
-
-#, fuzzy
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"fuerza color para algunos apodos: hash calculado con el apodo para encontrar "
-"el color no se utilizará para los siguientes apodos (el formato es: \"apodo1:"
-"color1;apodo2:color2\"); búsquedas de apodos son exactamente igual que en "
-"minúsculas, así que es posible usar minúsculas para apodos con esta opción"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"caracteres para usar como delimitador cuando se computa el color de un apodo "
-"(al menos un carácter fuera de esta lista debe estar en el apodo) (ejemplo: "
-"el apodo \"|apodo|ausente\" con \"|\" en esta opción retornaría el color del "
-"apodo \"|apodo\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6295,22 +6222,6 @@ msgstr ""
 "mostrar un mensaje en privado cuando el usuario esta de vuelta (después de "
 "salir del servidor)"
 
-msgid "display server away message in away bar item"
-msgstr "mostrar mensaje de ausencia en el elemento de barra \"away\""
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"ocultar la clave del canal en los modos de canal (esto ocultará todos los "
-"argumentos de los modos si +k es usado en el canal)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "mostrar el prefijo del apodo en el elemento de barra \"input_prompt\""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6370,11 +6281,27 @@ msgstr ""
 "realzados (usualmente cualquier mensaje de otro usuario, no mensajes del "
 "servidor...)"
 
+msgid "display server away message in away bar item"
+msgstr "mostrar mensaje de ausencia en el elemento de barra \"away\""
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"ocultar la clave del canal en los modos de canal (esto ocultará todos los "
+"argumentos de los modos si +k es usado en el canal)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 "nombre del elemento de barra donde el servidor IRC es mostrado (para la "
 "barra de estado)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "mostrar los modos del apodo en el elemento de barra \"input_prompt\""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "mostrar el prefijo del apodo en el elemento de barra \"input_prompt\""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6383,11 +6310,77 @@ msgstr ""
 "privado y no hay un buffer privado disponible"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"fuerza la posición de nuevos canales en la lista de buffers (none = posición "
+"predeterminada (último buffer), next = buffer actual + 1, near_server = "
+"después del último canal/privado del server)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"fuerza la posición de nuevos privados en la lista de buffers (none = "
+"posición  predeterminada (último buffer), next = buffer actual + 1, "
+"near_server = después del último canal/privado del server)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
+#, fuzzy
+msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"fuerza color para algunos apodos: hash calculado con el apodo para encontrar "
+"el color no se utilizará para los siguientes apodos (el formato es: \"apodo1:"
+"color1;apodo2:color2\"); búsquedas de apodos son exactamente igual que en "
+"minúsculas, así que es posible usar minúsculas para apodos con esta opción"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"caracteres para usar como delimitador cuando se computa el color de un apodo "
+"(al menos un carácter fuera de esta lista debe estar en el apodo) (ejemplo: "
+"el apodo \"|apodo|ausente\" con \"|\" en esta opción retornaría el color del "
+"apodo \"|apodo\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+"mostrar un espacio si el modo de usuario esta activado pero el usuario no "
+"tiene modo (no es op, voz, ...)"
+
 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
@@ -6415,6 +6408,10 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "cerrar el buffer cuando /part es usado en un canal"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "unir buffers de los servidores"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6422,6 +6419,9 @@ msgstr ""
 "número de mensajes brutos a mantener en memoria cuando el buffer de datos en "
 "bruto está cerrado (los mensajes serán mostrados cuando sea abra este buffer)"
 
+msgid "merge server buffers"
+msgstr "unir buffers de los servidores"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6446,20 +6446,39 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr "habilitar el filtro inteligente para mensajes \"part\" y \"quit\""
-
 #. TRANSLATORS: please do not translate "nick"
 #, fuzzy
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr "habilitar el filtro inteligente para mensajes \"nick\""
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr "habilitar el filtro inteligente para mensajes \"part\" y \"quit\""
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "remover colores en el tema (usado solamente cuando se esté mostrando el "
 "buffer de título)"
 
+msgid "color for nick in input bar"
+msgstr "color para el apodo en la barra de entrada"
+
+msgid "color for away item"
+msgstr "color para el texto \"ausente\" en al barra de entrada"
+
+msgid "color for channel modes, near channel name"
+msgstr "color para los modos del canal, junto al nombre del canal"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"color del indicador de lag, cuando el conteo aumenta (no se recibió el pong "
+"del servidor)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr "color del indicador de lag, cuando se recibió el pong del servidor"
+
 msgid "color for text in join messages"
 msgstr "color para el texto en mensajes de unión"
 
@@ -6501,34 +6520,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "color para el texto \"Aviso\" en los mensajes de aviso"
 
-msgid "color for nick in input bar"
-msgstr "color para el apodo en la barra de entrada"
-
-msgid "color for away item"
-msgstr "color para el texto \"ausente\" en al barra de entrada"
-
-msgid "color for channel modes, near channel name"
-msgstr "color para los modos del canal, junto al nombre del canal"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"color del indicador de lag, cuando el conteo aumenta (no se recibió el pong "
-"del servidor)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr "color del indicador de lag, cuando se recibió el pong del servidor"
-
 msgid "color for reason in part/quit messages"
 msgstr "color para el mensaje de salida/abandono"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "color para el tema antiguo del canal (cuando se cambia el tema)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "color para el nuevo tema del canal (cuando se cambia el tema)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "color para el tema antiguo del canal (cuando se cambia el tema)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7601,12 +7601,12 @@ msgstr ""
 "máximo número de líneas a mostrar del registro cuando se crea un buffer "
 "nuevo (0 = no mostrar nada)"
 
-msgid "color for backlog lines"
-msgstr "color para las líneas del último registro"
-
 msgid "color for line ending the backlog"
 msgstr "color para el final de línea del último registro"
 
+msgid "color for backlog lines"
+msgstr "color para las líneas del último registro"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7620,17 +7620,10 @@ msgstr ""
 "número de segundos entre escritura de los archivos de registro (0 = escribir "
 "los archivos inmediatamente por cada línea)"
 
-msgid "use only lower case for log filenames"
-msgstr "usar solamente minúsculas para el nombre de los archivos"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"ruta para los registros de WeeChat; \"%h\" al principio de la cadena será "
-"reemplazado por el directorio raíz de WeeChat (\"~/.weechat\" por defecto); "
-"especificadores de fecha son permitidos (ver man strftime)"
+"escribir una línea informativa en el registro cuando el registro empieza o "
+"termina en un buffer"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7644,6 +7637,24 @@ msgstr ""
 "puede usar variables locales de buffer; especificadores de fecha son "
 "permitidos (ver man strftime)"
 
+msgid "use only lower case for log filenames"
+msgstr "usar solamente minúsculas para el nombre de los archivos"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"ruta para los registros de WeeChat; \"%h\" al principio de la cadena será "
+"reemplazado por el directorio raíz de WeeChat (\"~/.weechat\" por defecto); "
+"especificadores de fecha son permitidos (ver man strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7651,22 +7662,11 @@ msgstr ""
 "carácter de reemplazo para caracteres especiales en el nombre de archivo "
 "construido desde una máscara (como el delimitador de directorios)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"escribir una línea informativa en el registro cuando el registro empieza o "
-"termina en un buffer"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "formato de hora en el registro (ver el manual de strftime para los "
 "especificadores de fecha/hora)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-
 msgid "list of logger buffers"
 msgstr "lista de buffers con registro"
 
@@ -8285,15 +8285,6 @@ msgstr ""
 msgid "text color for client description"
 msgstr "color del texto para la descripción del cliente"
 
-msgid "text color in relay buffer"
-msgstr "color del texto en el buffer del repetidor"
-
-msgid "background color in relay buffer"
-msgstr "color de fondo en el buffer del repetidor"
-
-msgid "text color of selected line in relay buffer"
-msgstr "color del texto de la línea seleccionada en el buffer del repetidor"
-
 msgid "text color for \"connecting\" status"
 msgstr "color para el estado \"conectando\""
 
@@ -8309,6 +8300,15 @@ msgstr "color para el estado \"falló la autenticación\""
 msgid "text color for \"disconnected\" status"
 msgstr "color para el estado \"desconectado\""
 
+msgid "text color in relay buffer"
+msgstr "color del texto en el buffer del repetidor"
+
+msgid "background color in relay buffer"
+msgstr "color de fondo en el buffer del repetidor"
+
+msgid "text color of selected line in relay buffer"
+msgstr "color del texto de la línea seleccionada en el buffer del repetidor"
+
 # why is case insensitive important? ips use numbers and urls are case insensible.
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
@@ -8363,10 +8363,6 @@ msgid ""
 "\\.)?example\\.(com|org)\""
 msgstr ""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"número máximo de líneas del registro por cada canal IRC (0 = ilimitado)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8375,6 +8371,10 @@ msgstr ""
 "número máximo de minutos en el historial por canal IRC (0 = ilimitado, "
 "ejemplos: 1440 = un día, 10080 = una semana, 43200 = un mes, 525600 = un año)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"número máximo de líneas del registro por cada canal IRC (0 = ilimitado)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -9147,94 +9147,94 @@ msgid ""
 "alt+r = remove, ...); if disabled, only the input is allowed: i, r, ..."
 msgstr ""
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "color para el estado \"popular\" (\"*\")"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr "color para el estado \"instalado\" (\"i\")"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "color para el estado \"autocargado\" (\"a\")"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "color para el estado \"retenido\" (\"H\")"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "color para el estado \"corriendo\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
+msgstr "color para el estado \"instalado\" (\"i\")"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "color para el estado \"obsoleto\" (\"N\")"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "color para el estado \"popular\" (\"*\")"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "color para el estado \"corriendo\" (\"r\")"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "color para el estado \"desconocido\" (\"?\")"
 
 msgid "text color in script buffer"
 msgstr "color del texto en el buffer de scripts"
 
+msgid "background color in script buffer"
+msgstr "color de fondo en el buffer de scripts"
+
+msgid "background color for selected line in script buffer"
+msgstr "color de fondo para la línea seleccionada en el buffer de scripts"
+
 msgid "text color of dates in script buffer"
 msgstr "color del texto de las fechas en el buffer de scripts"
 
+msgid "text color of dates for selected line in script buffer"
+msgstr ""
+"color del texto para la fecha, en línea seleccionada del buffer de scripts"
+
 msgid "text color of delimiters in script buffer"
 msgstr "color del texto de los delimitadores en el buffer de scripts"
 
 msgid "text color of description in script buffer"
 msgstr "color del texto de la descripción en el buffer de scripts"
 
-msgid "text color of extension in script buffer"
-msgstr "color del texto para la extensión del script en el buffer de scripts"
-
-msgid "text color of script name in script buffer"
-msgstr "color del texto para el nombre del script en el buffer de scripts"
-
-msgid "text color of tags in script buffer"
-msgstr "color del texto para las etiquetas en el buffer de scripts"
-
-msgid "text color of version in script buffer"
-msgstr "color del texto para la versión en el buffer de scripts"
-
-msgid "text color of version loaded in script buffer"
-msgstr "color del texto de la versión cargada en el buffer de scripts"
-
-msgid "background color in script buffer"
-msgstr "color de fondo en el buffer de scripts"
-
-msgid "text color for selected line in script buffer"
-msgstr "color del texto para la línea seleccionada en el buffer de scripts"
-
-msgid "text color of dates for selected line in script buffer"
-msgstr ""
-"color del texto para la fecha, en línea seleccionada del buffer de scripts"
-
 msgid "text color of description for selected line in script buffer"
 msgstr ""
 "color del texto para la descripción, en línea seleccionada del buffer de "
 "scripts"
 
+msgid "text color of extension in script buffer"
+msgstr "color del texto para la extensión del script en el buffer de scripts"
+
 msgid "text color of extension for selected line in script buffer"
 msgstr ""
 "color del texto de la extensión, en línea seleccionada del buffer de scripts"
 
+msgid "text color of script name in script buffer"
+msgstr "color del texto para el nombre del script en el buffer de scripts"
+
 msgid "text color of script name for selected line in script buffer"
 msgstr ""
 "color del texto para el nombre del script, en línea seleccionada del buffer "
 "de scripts"
 
+msgid "text color for selected line in script buffer"
+msgstr "color del texto para la línea seleccionada en el buffer de scripts"
+
+msgid "text color of tags in script buffer"
+msgstr "color del texto para las etiquetas en el buffer de scripts"
+
 msgid "text color of tags for selected line in script buffer"
 msgstr ""
 "color del texto para las etiquetas, en línea seleccionada del buffer de "
 "scripts"
 
-msgid "text color of version for selected line in script buffer"
-msgstr ""
-"color del texto de la versión, en línea seleccionada del buffer de scripts"
+msgid "text color of version in script buffer"
+msgstr "color del texto para la versión en el buffer de scripts"
+
+msgid "text color of version loaded in script buffer"
+msgstr "color del texto de la versión cargada en el buffer de scripts"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 "color del texto de la versión cargada, en línea seleccionada del buffer de "
 "scripts"
 
-msgid "background color for selected line in script buffer"
-msgstr "color de fondo para la línea seleccionada en el buffer de scripts"
+msgid "text color of version for selected line in script buffer"
+msgstr ""
+"color del texto de la versión, en línea seleccionada del buffer de scripts"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -9553,15 +9553,6 @@ msgstr ""
 "tamaño de la barra de progreso, en caracteres (si es 0, la barra es "
 "desactivada)"
 
-msgid "text color in xfer buffer"
-msgstr "color del texto en el buffer xfer"
-
-msgid "background color in xfer buffer"
-msgstr "color del fondo en el buffer xfer"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "color del texto de la línea seleccionada en el buffer xfer"
-
 msgid "text color for \"waiting\" status"
 msgstr "color de texto para el estado \"esperando\""
 
@@ -9577,9 +9568,14 @@ msgstr "color de texto para el estado \"falló\""
 msgid "text color for \"aborted\" status"
 msgstr "color de texto para el estado \"abortado\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr ""
-"tiempo máximo de espera para una petición de transferencia (en segundos)"
+msgid "text color in xfer buffer"
+msgstr "color del texto en el buffer xfer"
+
+msgid "background color in xfer buffer"
+msgstr "color del fondo en el buffer xfer"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "color del texto de la línea seleccionada en el buffer xfer"
 
 msgid "block size for sending packets, in bytes"
 msgstr "tamaño de bloque para enviar paquetes, en bytes"
@@ -9588,6 +9584,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "no esperar por el ACK al enviar un archivo"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"dirección IP o DNS usado para enviar archivos/charlas (si está vacío, se "
+"utiliza la IP de interfaz local)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9600,39 +9603,27 @@ msgstr ""
 "puertos menores que 1024)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"dirección IP o DNS usado para enviar archivos/charlas (si está vacío, se "
-"utiliza la IP de interfaz local)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "límite de velocidad al enviar archivos, en kb/s (0 significa sin límite)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+msgid "timeout for xfer request (in seconds)"
 msgstr ""
-"ruta para guardar archivos entrantes (\"%h\" será reemplazado por el "
-"directorio raíz de WeeChat, \"~/.weechat\" por defecto)"
+"tiempo máximo de espera para una petición de transferencia (en segundos)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgid "automatically accept chat requests (use carefully!)"
 msgstr ""
-"ruta para buscar archivos a enviar (cuando no es especificado por el "
-"usuario) (\"%h\" será reemplazado por el directorio raíz de WeeChat, \"~/."
-"weechat\" por defecto)"
+"aceptar automáticamente peticiones de conversación (¡utilizar con "
+"precaución!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
-"cuando se esté recibiendo un archivo, prefijar el apodo remoto en el nombre "
-"del archivo local"
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "aceptar automáticamente archivos entrantes (¡utilizar con precaución!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "convertir los espacios a guiones bajos cuando se envían los archivos"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -9644,19 +9635,28 @@ msgstr ""
 "continuar automáticamente la transferencia si se pierde la conexión con la "
 "máquina remota"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "aceptar automáticamente archivos entrantes (¡utilizar con precaución!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "convertir los espacios a guiones bajos cuando se envían los archivos"
 
-msgid "automatically accept chat requests (use carefully!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
 msgstr ""
-"aceptar automáticamente peticiones de conversación (¡utilizar con "
-"precaución!)"
+"ruta para guardar archivos entrantes (\"%h\" será reemplazado por el "
+"directorio raíz de WeeChat, \"~/.weechat\" por defecto)"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
+"ruta para buscar archivos a enviar (cuando no es especificado por el "
+"usuario) (\"%h\" será reemplazado por el directorio raíz de WeeChat, \"~/."
+"weechat\" por defecto)"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
+msgstr ""
+"cuando se esté recibiendo un archivo, prefijar el apodo remoto en el nombre "
+"del archivo local"
 
 msgid "list of xfer"
 msgstr "lista de transferencias"
diff --git a/po/fr.po b/po/fr.po
index 9c771de06..fce9b7d37 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-05 18:10+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3127,13 +3127,6 @@ msgstr "afficher un séparateur horizontal entre les fenêtres"
 msgid "display a vertical separator between windows"
 msgstr "afficher un séparateur vertical entre les fenêtres"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-"couleur pour les séparateurs de fenêtres (quand divisé) et les séparateurs à "
-"côté des barres (comme la liste de pseudos)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "couleur du texte pour les '+' lors du défilement des barres"
 
@@ -3143,11 +3136,14 @@ msgstr "couleur du texte pour la discussion"
 msgid "background color for chat"
 msgstr "couleur du fond pour la discussion"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"couleur du texte pour la discussion lorsque la fenêtre n'est pas active (pas "
-"la fenêtre sélectionnée)"
+msgid "text color for buffer names"
+msgstr "couleur du texte pour le nom des tampons"
+
+msgid "text color for channel names"
+msgstr "couleur du texte pour le nom des canaux"
+
+msgid "text color for delimiters"
+msgstr "couleur du texte pour les délimiteurs"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3156,56 +3152,11 @@ msgstr ""
 "couleur du texte pour la discussion lorsque la ligne est inactive (tampon "
 "mélangé avec d'autres tampons et non sélectionné)"
 
-msgid "text color for time in chat window"
-msgstr "couleur du texte pour l'heure dans la fenêtre de discussion"
-
-msgid "text color for time delimiters"
-msgstr "couleur du texte pour les délimiteurs de l'heure"
-
-msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"couleur du texte pour le nom du tampon (avant le préfixe, quand plusieurs "
-"tampons sont mélangés avec le même numéro)"
-
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"couleur du texte pour le nom du tampon inactif (avant le préfixe, quand "
-"plusieurs tampons sont mélangés avec le même numéro et si le tampon n'est "
-"pas sélectionné)"
-
-msgid "text color for error prefix"
-msgstr "couleur du texte pour le préfixe d'erreur"
-
-msgid "text color for network prefix"
-msgstr "couleur du texte pour le préfixe réseau"
-
-msgid "text color for action prefix"
-msgstr "couleur du texte pour le préfixe d'action"
-
-msgid "text color for join prefix"
-msgstr "couleur du texte pour le préfixe d'arrivée"
-
-msgid "text color for quit prefix"
-msgstr "couleur du texte pour le préfixe de départ"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "couleur du texte pour les '+' lorsque le préfixe est trop long"
-
-msgid "text color for suffix (after prefix)"
-msgstr "couleur du texte pour le suffixe (après le préfixe)"
-
-msgid "text color for buffer names"
-msgstr "couleur du texte pour le nom des tampons"
-
-msgid "text color for server names"
-msgstr "couleur du texte pour le nom des serveurs"
-
-msgid "text color for channel names"
-msgstr "couleur du texte pour le nom des canaux"
+"couleur du texte pour la discussion lorsque la fenêtre n'est pas active (pas "
+"la fenêtre sélectionnée)"
 
 msgid "text color for nicks in chat window"
 msgstr "couleur du texte pour les pseudos dans la fenêtre de discussion"
@@ -3224,14 +3175,6 @@ msgstr ""
 "couleur pour le préfixe du pseudo (chaîne affichée avant le pseudo dans le "
 "préfixe)"
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"couleur pour le suffixe du pseudo (chaîne affichée après le pseudo dans le "
-"préfixe)"
-
-msgid "text color for local nick in chat window"
-msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr ""
 "couleur du texte pour un pseudo déconnecté (qui n'est plus dans la liste de "
@@ -3246,11 +3189,13 @@ msgstr "couleur du fond pour un pseudo déconnecté avec highlight"
 msgid "text color for other nick in private buffer"
 msgstr "couleur du texte pour l'autre pseudo dans le tampon privée"
 
-msgid "text color for hostnames"
-msgstr "couleur du texte pour les noms d'hôtes"
+msgid "text color for local nick in chat window"
+msgstr "couleur du texte pour le pseudo local dans la fenêtre de discussion"
 
-msgid "text color for delimiters"
-msgstr "couleur du texte pour les délimiteurs"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"couleur pour le suffixe du pseudo (chaîne affichée après le pseudo dans le "
+"préfixe)"
 
 msgid "text color for highlighted prefix"
 msgstr "couleur du texte pour le préfixe surligné (highlight)"
@@ -3258,12 +3203,54 @@ msgstr "couleur du texte pour le préfixe surligné (highlight)"
 msgid "background color for highlighted prefix"
 msgstr "couleur du fond pour le préfixe surligné (highlight)"
 
+msgid "text color for hostnames"
+msgstr "couleur du texte pour les noms d'hôtes"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"couleur du texte pour le nom du tampon (avant le préfixe, quand plusieurs "
+"tampons sont mélangés avec le même numéro)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"couleur du texte pour le nom du tampon inactif (avant le préfixe, quand "
+"plusieurs tampons sont mélangés avec le même numéro et si le tampon n'est "
+"pas sélectionné)"
+
+msgid "text color for error prefix"
+msgstr "couleur du texte pour le préfixe d'erreur"
+
+msgid "text color for network prefix"
+msgstr "couleur du texte pour le préfixe réseau"
+
+msgid "text color for action prefix"
+msgstr "couleur du texte pour le préfixe d'action"
+
+msgid "text color for join prefix"
+msgstr "couleur du texte pour le préfixe d'arrivée"
+
+msgid "text color for quit prefix"
+msgstr "couleur du texte pour le préfixe de départ"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "couleur du texte pour les '+' lorsque le préfixe est trop long"
+
+msgid "text color for suffix (after prefix)"
+msgstr "couleur du texte pour le suffixe (après le préfixe)"
+
 msgid "text color for unread data marker"
 msgstr "couleur du texte pour le marqueur de données non lues"
 
 msgid "background color for unread data marker"
 msgstr "couleur du fond pour le marqueur de données non lues"
 
+msgid "text color for server names"
+msgstr "couleur du texte pour le nom des serveurs"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "couleur du texte pour les étiquettes après les messages (affichées avec la "
@@ -3279,60 +3266,81 @@ msgstr ""
 "couleur du fond pour le marqueur sur les lignes où le texte demandé est "
 "trouvé"
 
+msgid "text color for time in chat window"
+msgstr "couleur du texte pour l'heure dans la fenêtre de discussion"
+
+msgid "text color for time delimiters"
+msgstr "couleur du texte pour les délimiteurs de l'heure"
+
 msgid "text color for values"
 msgstr "couleur du texte pour les valeurs"
 
-msgid "text color for current buffer number in status bar"
-msgstr ""
-"couleur du texte pour le numéro du tampon courant dans la barre de statut"
+msgid "text color for actions in input line"
+msgstr "couleur du texte pour les actions dans la ligne de saisie"
 
-msgid "text color for current buffer name in status bar"
-msgstr "couleur du texte pour le nom du tampon courant dans la barre de statut"
+msgid "text color for unsuccessful text search in input line"
+msgstr ""
+"couleur du texte pour la recherche infructueuse de texte dans la ligne de "
+"saisie"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"couleur du texte pour le nom du tampon courant dans la barre de statut, si "
-"les données sont sécurisées avec un protocole tel que SSL"
+"couleur pour les séparateurs de fenêtres (quand divisé) et les séparateurs à "
+"côté des barres (comme la liste de pseudos)"
 
-msgid "text color for filter indicator in status bar"
-msgstr "couleur du texte pour l'indicateur de filtrage dans la barre de statut"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr ""
+"couleur du texte pour le nombre de highlights dans la hotlist (barre de "
+"statut)"
 
-msgid "text color for buffer with new messages (status bar)"
+msgid "text color for count of messages in hotlist (status bar)"
 msgstr ""
-"couleur du texte pour un tampon avec de nouveaux messages (barre de statut)"
+"couleur du texte pour le nombre de messages dans la hotlist (barre de statut)"
 
-msgid "text color for buffer with private message (status bar)"
+msgid "text color for count of other messages in hotlist (status bar)"
 msgstr ""
-"couleur du texte pour un tampon avec un message privé (barre de statut)"
+"couleur du texte pour le nombre d'autres messages dans la hotlist (barre de "
+"statut)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr ""
+"couleur du texte pour le nombre de messages privés dans la hotlist (barre de "
+"statut)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "couleur du texte pour un tampon avec un highlight (barre de statut)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr ""
+"couleur du texte pour un tampon avec de nouveaux messages (barre de statut)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 "couleur du texte pour un tampon avec des nouvelles données (pas des "
 "messages) (barre de statut)"
 
-msgid "text color for count of messages in hotlist (status bar)"
+msgid "text color for buffer with private message (status bar)"
 msgstr ""
-"couleur du texte pour le nombre de messages dans la hotlist (barre de statut)"
+"couleur du texte pour un tampon avec un message privé (barre de statut)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr ""
-"couleur du texte pour le nombre de messages privés dans la hotlist (barre de "
-"statut)"
+msgid "text color for filter indicator in status bar"
+msgstr "couleur du texte pour l'indicateur de filtrage dans la barre de statut"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
+msgid "text color for current buffer name in status bar"
+msgstr "couleur du texte pour le nom du tampon courant dans la barre de statut"
+
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"couleur du texte pour le nombre de highlights dans la hotlist (barre de "
-"statut)"
+"couleur du texte pour le nom du tampon courant dans la barre de statut, si "
+"les données sont sécurisées avec un protocole tel que SSL"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid "text color for current buffer number in status bar"
 msgstr ""
-"couleur du texte pour le nombre d'autres messages dans la hotlist (barre de "
-"statut)"
+"couleur du texte pour le numéro du tampon courant dans la barre de statut"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr ""
@@ -3341,20 +3349,12 @@ msgstr ""
 msgid "text color for time (status bar)"
 msgstr "couleur du texte pour l'heure (barre de statut)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr ""
-"couleur du texte pour la recherche infructueuse de texte dans la ligne de "
-"saisie"
-
-msgid "text color for actions in input line"
-msgstr "couleur du texte pour les actions dans la ligne de saisie"
+msgid "text color for away nicknames"
+msgstr "couleur du texte pour les pseudos absents"
 
 msgid "text color for groups in nicklist"
 msgstr "couleur du texte pour les groupes dans la liste des pseudos"
 
-msgid "text color for away nicknames"
-msgstr "couleur du texte pour les pseudos absents"
-
 msgid "text color for offline nicknames"
 msgstr "couleur du texte pour les pseudos déconnectés"
 
@@ -3409,6 +3409,10 @@ msgstr ""
 "complète partiellement les paramètres de commande (stoppe quand plusieurs "
 "paramètres trouvés commencent par les mêmes lettres)"
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+"afficher le compteur pour chaque complétion partielle dans l'objet de barre"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3416,13 +3420,12 @@ msgstr ""
 "complète partiellement en dehors des commandes (stoppe quand plusieurs mots "
 "trouvés commencent par les mêmes lettres)"
 
-msgid "display count for each partial completion in bar item"
-msgstr ""
-"afficher le compteur pour chaque complétion partielle dans l'objet de barre"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
-"nombre maximum de lignes dans l'historique par tampon (0 = sans limite)"
+"nombre maximum de commandes à afficher par défaut dans le listing "
+"d'historique (0 = sans limite)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3432,6 +3435,10 @@ msgstr ""
 "exemples: 1440 = une journée, 10080 = une semaine, 43200 = un mois, 525600 = "
 "une année)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr ""
+"nombre maximum de lignes dans l'historique par tampon (0 = sans limite)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 "nombre maximum de commandes utilisateur dans l'historique (0 = sans limite)"
@@ -3440,13 +3447,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr "nombre maximum de tampons visités à garder en mémoire"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"nombre maximum de commandes à afficher par défaut dans le listing "
-"d'historique (0 = sans limite)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr ""
@@ -6366,88 +6366,6 @@ msgstr ""
 "format de date/heure utilisé pour la réponse au message CTCP TIME (voir man "
 "strftime pour le format de date/heure)"
 
-msgid "merge server buffers"
-msgstr "mélanger les tampons de serveur"
-
-msgid "merge private buffers"
-msgstr "mélanger les tampons privés"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"force la position du nouveau canal dans la liste des tampons (none = "
-"position par défaut (devrait être le dernier tampon), next = tampon courant "
-"+ 1, near_server = après le dernier canal/privé du serveur)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"force la position du nouveau privé dans la liste des tampons (none = "
-"position par défaut (devrait être le dernier tampon), next = tampon courant "
-"+ 1, near_server = après le dernier canal/privé du serveur)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-"afficher le mode du pseudo (op, voice, ...) avant le pseudo (none = jamais, "
-"prefix = dans le préfixe seulement, action = dans les messages d'action "
-"seulement, both = préfixe + messages d'actions)"
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-"afficher un espace si le mode du pseudo est activé mais que le pseudo n'a "
-"pas de mode (pas op, voice, ...)"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"force la couleur pour certains pseudos: le hash calculé avec le pseudo pour "
-"trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "
-"\"pseudo1:couleur1;pseudo2:couleur2\"); la recherche de pseudos s'effectue "
-"avec la casse exacte puis en minuscules, donc il est possible d'utiliser "
-"uniquement des minuscules pour les pseudos dans cette option"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-"algorithme de hash utilisé pour trouver la couleur du pseudo: djb2 = "
-"variante de djb2 (la position des lettres compte: les anagrammes d'un pseudo "
-"ont une couleur différente), sum = somme des lettres"
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"caractères utilisés pour l'arrêt dans le pseudo lors du calcul de la couleur "
-"avec les lettres du pseudo (au moins un caractère en dehors de cette liste "
-"doit être dans la chaîne avant de s'arrêter) (exemple: le pseudo \"|nick|away"
-"\" avec \"|\" dans les caractères retournera la couleur du pseudo \"|nick\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-"complétion intelligente pour les pseudos (complète d'abord avec les "
-"personnes qui ont parlé récemment): speakers = tous ceux qui ont parlé "
-"(incluant les highlights), speakers_highlights = seulement ceux qui ont "
-"parlé avec un highlight"
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6493,23 +6411,6 @@ msgstr ""
 "afficher un message en privé lorsque l'utilisateur est de retour (après "
 "avoir quitté le serveur)"
 
-msgid "display server away message in away bar item"
-msgstr ""
-"afficher le message d'absence du serveur dans l'objet de barre d'absence"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"cacher la clé du canal (cela cachera tous les paramètres des modes du canal "
-"si le mode +k est défini sur le canal)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "affiche le préfixe du pseudo dans l'objet de barre \"input_prompt\""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6572,11 +6473,28 @@ msgstr ""
 "par des virgules, typiquement tout message venant d'un autre utilisateur, "
 "pas les messages du serveur, ...)"
 
+msgid "display server away message in away bar item"
+msgstr ""
+"afficher le message d'absence du serveur dans l'objet de barre d'absence"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"cacher la clé du canal (cela cachera tous les paramètres des modes du canal "
+"si le mode +k est défini sur le canal)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 "nom de l'objet de barre où est affiché le serveur IRC (pour la barre de "
 "statut)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "affiche les modes du pseudo dans l'objet de barre \"input_prompt\""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "affiche le préfixe du pseudo dans l'objet de barre \"input_prompt\""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6585,6 +6503,24 @@ msgstr ""
 "\"private\" et que le tampon privé n'est pas trouvé"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"force la position du nouveau canal dans la liste des tampons (none = "
+"position par défaut (devrait être le dernier tampon), next = tampon courant "
+"+ 1, near_server = après le dernier canal/privé du serveur)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"force la position du nouveau privé dans la liste des tampons (none = "
+"position par défaut (devrait être le dernier tampon), next = tampon courant "
+"+ 1, near_server = après le dernier canal/privé du serveur)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
@@ -6595,6 +6531,64 @@ msgstr ""
 "exemple: \"nickserv|nickbot\""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"force la couleur pour certains pseudos: le hash calculé avec le pseudo pour "
+"trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "
+"\"pseudo1:couleur1;pseudo2:couleur2\"); la recherche de pseudos s'effectue "
+"avec la casse exacte puis en minuscules, donc il est possible d'utiliser "
+"uniquement des minuscules pour les pseudos dans cette option"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+"algorithme de hash utilisé pour trouver la couleur du pseudo: djb2 = "
+"variante de djb2 (la position des lettres compte: les anagrammes d'un pseudo "
+"ont une couleur différente), sum = somme des lettres"
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"caractères utilisés pour l'arrêt dans le pseudo lors du calcul de la couleur "
+"avec les lettres du pseudo (au moins un caractère en dehors de cette liste "
+"doit être dans la chaîne avant de s'arrêter) (exemple: le pseudo \"|nick|away"
+"\" avec \"|\" dans les caractères retournera la couleur du pseudo \"|nick\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+"complétion intelligente pour les pseudos (complète d'abord avec les "
+"personnes qui ont parlé récemment): speakers = tous ceux qui ont parlé "
+"(incluant les highlights), speakers_highlights = seulement ceux qui ont "
+"parlé avec un highlight"
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+"afficher le mode du pseudo (op, voice, ...) avant le pseudo (none = jamais, "
+"prefix = dans le préfixe seulement, action = dans les messages d'action "
+"seulement, both = préfixe + messages d'actions)"
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+"afficher un espace si le mode du pseudo est activé mais que le pseudo n'a "
+"pas de mode (pas op, voice, ...)"
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 "afficher les notices comme des messages privés (si auto, utilise le tampon "
@@ -6623,6 +6617,9 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "fermer le tampon lorsque /part est exécuté sur un canal"
 
+msgid "merge private buffers"
+msgstr "mélanger les tampons privés"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6631,6 +6628,9 @@ msgstr ""
 "données brutes est fermé (ces messages seront affichés lors de l'ouverture "
 "du tampon des données brutes)"
 
+msgid "merge server buffers"
+msgstr "mélanger les tampons de serveur"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6659,21 +6659,41 @@ msgstr ""
 "à jour du topic), le \"join\" est démasqué, tout comme les changements de "
 "pseudo après ce \"join\" (0 = désactiver: ne jamais démasquer un \"join\")"
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr "activer le filtre intelligent pour les messages \"part\" et \"quit\""
-
 #. TRANSLATORS: please do not translate "nick"
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr ""
 "activer le filtre intelligent pour les messages \"nick\" (changements de "
 "pseudo)"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr "activer le filtre intelligent pour les messages \"part\" et \"quit\""
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "supprimer les couleurs dans le titre (utilisé seulement lors de l'affichage "
 "du titre du tampon)"
 
+msgid "color for nick in input bar"
+msgstr "couleur du pseudo dans la barre de saisie"
+
+msgid "color for away item"
+msgstr "couleur pour l'objet away"
+
+msgid "color for channel modes, near channel name"
+msgstr "couleur pour les modes du canal, à côté du nom du canal"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"couleur pour l'indicateur de lag, lorsque le décompte est en cours (pong non "
+"reçu du serveur, le lag augmente)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr ""
+"couleur pour l'indicateur de lag, lorsque le pong a été reçu du serveur"
+
 msgid "color for text in join messages"
 msgstr "couleur pour le texte dans les messages join"
 
@@ -6716,35 +6736,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "couleur pour le texte \"Notice\" dans les notices"
 
-msgid "color for nick in input bar"
-msgstr "couleur du pseudo dans la barre de saisie"
-
-msgid "color for away item"
-msgstr "couleur pour l'objet away"
-
-msgid "color for channel modes, near channel name"
-msgstr "couleur pour les modes du canal, à côté du nom du canal"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"couleur pour l'indicateur de lag, lorsque le décompte est en cours (pong non "
-"reçu du serveur, le lag augmente)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-"couleur pour l'indicateur de lag, lorsque le pong a été reçu du serveur"
-
 msgid "color for reason in part/quit messages"
 msgstr "couleur pour la raison dans les messages part/quit"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "couleur pour l'ancien titre du canal (lorsque le titre est changé)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "couleur pour le nouveau titre du canal (lorsque le titre est changé)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "couleur pour l'ancien titre du canal (lorsque le titre est changé)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7816,12 +7816,12 @@ msgstr ""
 "nombre maximum de lignes à afficher du fichier de log lors de l'ouverture du "
 "tampon (0 = ne rien afficher)"
 
-msgid "color for backlog lines"
-msgstr "couleur pour les lignes de l'historique"
-
 msgid "color for line ending the backlog"
 msgstr "couleur pour la ligne de fin de l'historique"
 
+msgid "color for backlog lines"
+msgstr "couleur pour les lignes de l'historique"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7836,17 +7836,10 @@ msgstr ""
 "(0 = écrire immédiatement dans les fichiers de log pour chaque ligne "
 "affichée)"
 
-msgid "use only lower case for log filenames"
-msgstr "utiliser seulement des minuscules dans le nom des fichiers de log"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"chemin pour les fichiers de log WeeChat; \"%h\" au début de la chaîne est "
-"remplacé par le répertoire de base WeeChat (par défaut: \"~/.weechat\"); les "
-"caractères de formatage de date sont autorisés (voir man strftime)"
+"écrire une ligne d'information dans le fichier log quand le log démarre ou "
+"se termine pour un tampon"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7860,6 +7853,26 @@ msgstr ""
 "fichier); les variables locales du tampon sont permises; les caractères de "
 "formatage de date sont autorisés (voir man strftime)"
 
+msgid "use only lower case for log filenames"
+msgstr "utiliser seulement des minuscules dans le nom des fichiers de log"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+"texte à écrire avant le pseudo dans le préfixe du message, par exemple: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+"texte à écrire après le pseudo dans le préfixe du message, par exemple: \">\""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"chemin pour les fichiers de log WeeChat; \"%h\" au début de la chaîne est "
+"remplacé par le répertoire de base WeeChat (par défaut: \"~/.weechat\"); les "
+"caractères de formatage de date sont autorisés (voir man strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7867,24 +7880,11 @@ msgstr ""
 "caractère de remplacement dans le nom de fichier construit avec le masque "
 "(comme le délimiteur de répertoire)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"écrire une ligne d'information dans le fichier log quand le log démarre ou "
-"se termine pour un tampon"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "format de date/heure utilisé dans les fichiers log (voir man strftime pour "
 "le format de date/heure)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-"texte à écrire avant le pseudo dans le préfixe du message, par exemple: \"<\""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-"texte à écrire après le pseudo dans le préfixe du message, par exemple: \">\""
-
 msgid "list of logger buffers"
 msgstr "liste des enregistreurs de tampons (loggers)"
 
@@ -8521,15 +8521,6 @@ msgstr ""
 msgid "text color for client description"
 msgstr "couleur du texte pour la description du client"
 
-msgid "text color in relay buffer"
-msgstr "couleur du texte dans le tampon relay"
-
-msgid "background color in relay buffer"
-msgstr "couleur du fond dans le tampon relay"
-
-msgid "text color of selected line in relay buffer"
-msgstr "couleur du texte pour la ligne sélectionnée dans le tampon relay"
-
 msgid "text color for \"connecting\" status"
 msgstr "couleur du texte pour le statut \"connexion\""
 
@@ -8545,6 +8536,15 @@ msgstr "couleur du texte pour le statut \"échec auth\""
 msgid "text color for \"disconnected\" status"
 msgstr "couleur du texte pour le statut \"déconnecté\""
 
+msgid "text color in relay buffer"
+msgstr "couleur du texte dans le tampon relay"
+
+msgid "background color in relay buffer"
+msgstr "couleur du fond dans le tampon relay"
+
+msgid "text color of selected line in relay buffer"
+msgstr "couleur du texte pour la ligne sélectionnée dans le tampon relay"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8607,10 +8607,6 @@ msgstr ""
 "(insensible à la casse, utilisez \"(?-i)\" en début de chaîne pour la rendre "
 "insensible à la casse), exemple: \"^http://(www\\.)?example\\.(com|org)\""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"nombre maximum de lignes dans l'historique par canal IRC (0 = sans limite)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8620,6 +8616,10 @@ msgstr ""
 "exemples: 1440 = une journée, 10080 = une semaine, 43200 = un mois, 525600 = "
 "une année)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"nombre maximum de lignes dans l'historique par canal IRC (0 = sans limite)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr "afficher l'historique en démarrant à la dernière déconnexion du client"
 
@@ -9509,97 +9509,97 @@ msgstr ""
 "sur les scripts (alt+i = installer, alt+r = supprimer, ...); si désactivé, "
 "seule l'entrée est autorisée: i, r, ..."
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "couleur du statut \"populaire\" (\"*\")"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr "couleur du statut \"installé\" (\"i\")"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "couleur du statut \"chargé auto\" (\"a\")"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "couleur du statut \"figé\" (\"H\")"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "couleur du statut \"chargé\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
+msgstr "couleur du statut \"installé\" (\"i\")"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "couleur du statut \"obsolète\" (\"N\")"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "couleur du statut \"populaire\" (\"*\")"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "couleur du statut \"chargé\" (\"r\")"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "couleur du statut \"inconnu\" (\"?\")"
 
 msgid "text color in script buffer"
 msgstr "couleur du texte dans le tampon script"
 
-msgid "text color of dates in script buffer"
-msgstr "couleur du texte pour les dates dans le tampon script"
-
-msgid "text color of delimiters in script buffer"
-msgstr "couleur du texte pour les délimiteurs dans le tampon script"
-
-msgid "text color of description in script buffer"
-msgstr "couleur du texte pour la description dans le tampon script"
-
-msgid "text color of extension in script buffer"
-msgstr "couleur du texte pour l'extension dans le tampon script"
-
-msgid "text color of script name in script buffer"
-msgstr "couleur du texte pour le nom du script dans le tampon script"
-
-msgid "text color of tags in script buffer"
-msgstr "couleur du texte pour les étiquettes dans le tampon script"
-
-msgid "text color of version in script buffer"
-msgstr "couleur du texte pour la version dans le tampon script"
-
-msgid "text color of version loaded in script buffer"
-msgstr "couleur du texte pour la version chargée dans le tampon script"
-
 msgid "background color in script buffer"
 msgstr "couleur du fond dans le tampon script"
 
-msgid "text color for selected line in script buffer"
-msgstr "couleur du texte pour la ligne sélectionnée dans le tampon script"
+msgid "background color for selected line in script buffer"
+msgstr "couleur du fond pour la ligne sélectionnée dans le tampon script"
+
+msgid "text color of dates in script buffer"
+msgstr "couleur du texte pour les dates dans le tampon script"
 
 msgid "text color of dates for selected line in script buffer"
 msgstr ""
 "couleur du texte pour les dates de la ligne sélectionnée dans le tampon "
 "script"
 
+msgid "text color of delimiters in script buffer"
+msgstr "couleur du texte pour les délimiteurs dans le tampon script"
+
+msgid "text color of description in script buffer"
+msgstr "couleur du texte pour la description dans le tampon script"
+
 msgid "text color of description for selected line in script buffer"
 msgstr ""
 "couleur du texte pour la description de la ligne sélectionnée dans le tampon "
 "script"
 
+msgid "text color of extension in script buffer"
+msgstr "couleur du texte pour l'extension dans le tampon script"
+
 msgid "text color of extension for selected line in script buffer"
 msgstr ""
 "couleur du texte pour l'extension de la ligne sélectionnée dans le tampon "
 "script"
 
+msgid "text color of script name in script buffer"
+msgstr "couleur du texte pour le nom du script dans le tampon script"
+
 msgid "text color of script name for selected line in script buffer"
 msgstr ""
 "couleur du texte pour le nom du script de la ligne sélectionnée dans le "
 "tampon script"
 
+msgid "text color for selected line in script buffer"
+msgstr "couleur du texte pour la ligne sélectionnée dans le tampon script"
+
+msgid "text color of tags in script buffer"
+msgstr "couleur du texte pour les étiquettes dans le tampon script"
+
 msgid "text color of tags for selected line in script buffer"
 msgstr ""
 "couleur du texte pour les étiquettes de la ligne sélectionnée dans le tampon "
 "script"
 
-msgid "text color of version for selected line in script buffer"
-msgstr ""
-"couleur du texte pour la version de la ligne sélectionnée dans le tampon "
-"script"
+msgid "text color of version in script buffer"
+msgstr "couleur du texte pour la version dans le tampon script"
+
+msgid "text color of version loaded in script buffer"
+msgstr "couleur du texte pour la version chargée dans le tampon script"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 "couleur du texte pour la version chargée de la ligne sélectionnée dans le "
 "tampon script"
 
-msgid "background color for selected line in script buffer"
-msgstr "couleur du fond pour la ligne sélectionnée dans le tampon script"
+msgid "text color of version for selected line in script buffer"
+msgstr ""
+"couleur du texte pour la version de la ligne sélectionnée dans le tampon "
+"script"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -9925,15 +9925,6 @@ msgstr ""
 "taille de la barre de progression, en caractères (si 0, la barre de "
 "progression est désactivée)"
 
-msgid "text color in xfer buffer"
-msgstr "couleur du texte dans le tampon xfer"
-
-msgid "background color in xfer buffer"
-msgstr "couleur du fond dans le tampon xfer"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "couleur du texte pour la ligne sélectionnée dans le tampon xfer"
-
 msgid "text color for \"waiting\" status"
 msgstr "couleur du texte pour le statut \"en attente\""
 
@@ -9949,8 +9940,14 @@ msgstr "couleur du texte pour le statut \"échoué\""
 msgid "text color for \"aborted\" status"
 msgstr "couleur du texte pour le statut \"interrompu\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "délai d'attente pour la requête xfer (en secondes)"
+msgid "text color in xfer buffer"
+msgstr "couleur du texte dans le tampon xfer"
+
+msgid "background color in xfer buffer"
+msgstr "couleur du fond dans le tampon xfer"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "couleur du texte pour la ligne sélectionnée dans le tampon xfer"
 
 msgid "block size for sending packets, in bytes"
 msgstr "taille de bloc pour les paquets envoyés, en octets"
@@ -9959,6 +9956,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "n'attend pas les accusés de réception lors de l'envoi de fichier"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"adresse IP ou DNS utilisée pour envoyer les fichiers/discussions (si non "
+"renseigné, l'interface IP locale est utilisée)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9972,40 +9976,33 @@ msgstr ""
 "1024)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"adresse IP ou DNS utilisée pour envoyer les fichiers/discussions (si non "
-"renseigné, l'interface IP locale est utilisée)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "limitation de vitesse pour l'envoi des fichiers, en kilo-octets par seconde "
 "(0 signifie pas de limite)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"chemin où écrire les fichiers reçus (\"%h\" sera remplacé par le répertoire "
-"de base WeeChat, par défaut: \"~/.weechat\")"
+msgid "timeout for xfer request (in seconds)"
+msgstr "délai d'attente pour la requête xfer (en secondes)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgid "automatically accept chat requests (use carefully!)"
 msgstr ""
-"chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par "
-"l'utilisateur) (\"%h\" sera remplacé par le répertoire de base WeeChat, par "
-"défaut: \"~/.weechat\")"
+"accepte automatiquement les demandes de discussion (à utiliser avec "
+"précaution !)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
+msgid "automatically accept incoming files (use carefully!)"
 msgstr ""
-"utiliser le pseudo distant comme préfixe dans le nom de fichier local lors "
-"de la réception d'un fichier"
+"accepte automatiquement les demandes d'envoi de fichiers (à utiliser avec "
+"précaution !)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
+"liste de pseudos (séparés par des virgules) pour lesquels les demandes "
+"d'envoi de fichiers et de discussion sont automatiquement acceptées; le "
+"format est \"serveur.pseudo\" (pour un serveur spécifique) ou \"pseudo"
+"\" (pour tous les serveurs); exemple: \"freenode.FlashCode,andrew\""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -10017,25 +10014,28 @@ msgstr ""
 "continuer automatiquement les transferts de fichiers si la connexion avec "
 "l'hôte a été perdue"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr ""
-"accepte automatiquement les demandes d'envoi de fichiers (à utiliser avec "
-"précaution !)"
+msgid "convert spaces to underscores when sending files"
+msgstr "convertir les espaces en underscores lors d'envoi de fichiers"
 
-msgid "automatically accept chat requests (use carefully!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
 msgstr ""
-"accepte automatiquement les demandes de discussion (à utiliser avec "
-"précaution !)"
+"chemin où écrire les fichiers reçus (\"%h\" sera remplacé par le répertoire "
+"de base WeeChat, par défaut: \"~/.weechat\")"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
-"liste de pseudos (séparés par des virgules) pour lesquels les demandes "
-"d'envoi de fichiers et de discussion sont automatiquement acceptées; le "
-"format est \"serveur.pseudo\" (pour un serveur spécifique) ou \"pseudo"
-"\" (pour tous les serveurs); exemple: \"freenode.FlashCode,andrew\""
+"chemin pour lire les fichiers envoyés (quand aucun chemin n'est spécifié par "
+"l'utilisateur) (\"%h\" sera remplacé par le répertoire de base WeeChat, par "
+"défaut: \"~/.weechat\")"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
+msgstr ""
+"utiliser le pseudo distant comme préfixe dans le nom de fichier local lors "
+"de la réception d'un fichier"
 
 msgid "list of xfer"
 msgstr "liste des xfer"
diff --git a/po/hu.po b/po/hu.po
index 327776b2b..3b52e38d1 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 15:57+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2456,12 +2456,6 @@ msgid "display a vertical separator between windows"
 msgstr ""
 
 #, fuzzy
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr "ablakelválasztó színe (ha meg van osztva)"
-
-#, fuzzy
 msgid "text color for '+' when scrolling bars"
 msgstr "a '+' jel színe téma görgetésekor"
 
@@ -2473,74 +2467,28 @@ msgstr "üzenetek színe"
 msgid "background color for chat"
 msgstr "nevek háttere"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-
-msgid ""
-"text color for chat when line is inactive (buffer is merged with other "
-"buffers and is not selected)"
-msgstr ""
+#, fuzzy
+msgid "text color for buffer names"
+msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color for time in chat window"
-msgstr "idő színe a beszédablakban"
+msgid "text color for channel names"
+msgstr "szobanevek színe az eseményekben"
 
 #, fuzzy
-msgid "text color for time delimiters"
+msgid "text color for delimiters"
 msgstr "információs pult határolóinak színe"
 
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when line is inactive (buffer is merged with other "
+"buffers and is not selected)"
 msgstr ""
 
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
 
 #, fuzzy
-msgid "text color for error prefix"
-msgstr "belépési nyíl színe"
-
-#, fuzzy
-msgid "text color for network prefix"
-msgstr "belépési nyíl színe"
-
-#, fuzzy
-msgid "text color for action prefix"
-msgstr "kilépési nyíl színe"
-
-#, fuzzy
-msgid "text color for join prefix"
-msgstr "belépési nyíl színe"
-
-#, fuzzy
-msgid "text color for quit prefix"
-msgstr "kilépési nyíl színe"
-
-#, fuzzy
-msgid "text color for '+' when prefix is too long"
-msgstr "a '+' jel színe téma görgetésekor"
-
-#, fuzzy
-msgid "text color for suffix (after prefix)"
-msgstr "belépési nyíl színe"
-
-#, fuzzy
-msgid "text color for buffer names"
-msgstr "szerver nevének színe"
-
-#, fuzzy
-msgid "text color for server names"
-msgstr "szerver nevének színe"
-
-#, fuzzy
-msgid "text color for channel names"
-msgstr "szobanevek színe az eseményekben"
-
-#, fuzzy
 msgid "text color for nicks in chat window"
 msgstr "idő színe a beszédablakban"
 
@@ -2555,14 +2503,6 @@ msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
 
 #, fuzzy
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr "névkiegészítés után beszúrt szöveg"
-
-#, fuzzy
-msgid "text color for local nick in chat window"
-msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
-
-#, fuzzy
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "távollevő felhasználók nevének színe"
 
@@ -2579,12 +2519,12 @@ msgid "text color for other nick in private buffer"
 msgstr "másik fél nevének színe privát beszélgetésben"
 
 #, fuzzy
-msgid "text color for hostnames"
-msgstr "gépnevek színe"
+msgid "text color for local nick in chat window"
+msgstr "a név előtt megjelenítendő szöveg a beszédablakban"
 
 #, fuzzy
-msgid "text color for delimiters"
-msgstr "információs pult határolóinak színe"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "névkiegészítés után beszúrt szöveg"
 
 #, fuzzy
 msgid "text color for highlighted prefix"
@@ -2595,6 +2535,48 @@ msgid "background color for highlighted prefix"
 msgstr "címsor háttere"
 
 #, fuzzy
+msgid "text color for hostnames"
+msgstr "gépnevek színe"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+
+#, fuzzy
+msgid "text color for error prefix"
+msgstr "belépési nyíl színe"
+
+#, fuzzy
+msgid "text color for network prefix"
+msgstr "belépési nyíl színe"
+
+#, fuzzy
+msgid "text color for action prefix"
+msgstr "kilépési nyíl színe"
+
+#, fuzzy
+msgid "text color for join prefix"
+msgstr "belépési nyíl színe"
+
+#, fuzzy
+msgid "text color for quit prefix"
+msgstr "kilépési nyíl színe"
+
+#, fuzzy
+msgid "text color for '+' when prefix is too long"
+msgstr "a '+' jel színe téma görgetésekor"
+
+#, fuzzy
+msgid "text color for suffix (after prefix)"
+msgstr "belépési nyíl színe"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "olvasatlan adat jelölő színe"
 
@@ -2603,6 +2585,10 @@ msgid "background color for unread data marker"
 msgstr "olvasatlan adat jelölő háttere"
 
 #, fuzzy
+msgid "text color for server names"
+msgstr "szerver nevének színe"
+
+#, fuzzy
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
 
@@ -2615,58 +2601,80 @@ msgid "background color for marker on lines where text sought is found"
 msgstr "szövegbeviteli mező színe"
 
 #, fuzzy
+msgid "text color for time in chat window"
+msgstr "idő színe a beszédablakban"
+
+#, fuzzy
+msgid "text color for time delimiters"
+msgstr "információs pult határolóinak színe"
+
+#, fuzzy
 msgid "text color for values"
 msgstr "üzenetek színe"
 
 #, fuzzy
-msgid "text color for current buffer number in status bar"
-msgstr "aktuális szoba színe a státuszsorban"
+msgid "text color for actions in input line"
+msgstr "kilépési nyíl színe"
 
 #, fuzzy
-msgid "text color for current buffer name in status bar"
-msgstr "aktuális szoba színe a státuszsorban"
+msgid "text color for unsuccessful text search in input line"
+msgstr "információs pult határolóinak színe"
 
 #, fuzzy
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
-msgstr "aktuális szoba színe a státuszsorban"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
+msgstr "ablakelválasztó színe (ha meg van osztva)"
 
 #, fuzzy
-msgid "text color for filter indicator in status bar"
-msgstr "aktuális szoba színe a státuszsorban"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
 
 #, fuzzy
-msgid "text color for buffer with new messages (status bar)"
-msgstr "új üzenetet tartalmazó ablak színe (státuszsor)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
 
 #, fuzzy
-msgid "text color for buffer with private message (status bar)"
-msgstr "személyes üzenetet tartalmazó ablak színe (státuszsor)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+
+#, fuzzy
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
 
 #, fuzzy
 msgid "text color for buffer with highlight (status bar)"
 msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
 
 #, fuzzy
+msgid "text color for buffer with new messages (status bar)"
+msgstr "új üzenetet tartalmazó ablak színe (státuszsor)"
+
+#, fuzzy
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "új adatot tartalmazó ablak színe (nem üzenetek) (státuszsor)"
 
 #, fuzzy
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "személyes üzenetet tartalmazó ablak színe (státuszsor)"
 
 #, fuzzy
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+msgid "text color for filter indicator in status bar"
+msgstr "aktuális szoba színe a státuszsorban"
 
 #, fuzzy
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+msgid "text color for current buffer name in status bar"
+msgstr "aktuális szoba színe a státuszsorban"
 
 #, fuzzy
-msgid "text color for count of other messages in hotlist (status bar)"
-msgstr "kiemelt üzenetet tartalmazó ablak színe (státuszsor)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "aktuális szoba színe a státuszsorban"
+
+#, fuzzy
+msgid "text color for current buffer number in status bar"
+msgstr "aktuális szoba színe a státuszsorban"
 
 #, fuzzy
 msgid "text color for buffer with new data (status bar)"
@@ -2677,22 +2685,14 @@ msgid "text color for time (status bar)"
 msgstr "státuszsor színe"
 
 #, fuzzy
-msgid "text color for unsuccessful text search in input line"
-msgstr "információs pult határolóinak színe"
-
-#, fuzzy
-msgid "text color for actions in input line"
-msgstr "kilépési nyíl színe"
+msgid "text color for away nicknames"
+msgstr "távollevő felhasználók nevének színe"
 
 #, fuzzy
 msgid "text color for groups in nicklist"
 msgstr "név színe"
 
 #, fuzzy
-msgid "text color for away nicknames"
-msgstr "távollevő felhasználók nevének színe"
-
-#, fuzzy
 msgid "text color for offline nicknames"
 msgstr "távollevő felhasználók nevének színe"
 
@@ -2735,23 +2735,30 @@ msgid ""
 "with same prefix)"
 msgstr ""
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
 msgstr ""
 
-msgid "display count for each partial completion in bar item"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
+"megjeleníthető parancsok maximális száma előzmények listázásakor ( 0 = "
+"korlátlan)"
 
 #, fuzzy
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of minutes in history per buffer (0 = unlimited, examples: "
+"1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
 msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
 #, fuzzy
-msgid ""
-"maximum number of minutes in history per buffer (0 = unlimited, examples: "
-"1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
 msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
@@ -2764,13 +2771,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"megjeleníthető parancsok maximális száma előzmények listázásakor ( 0 = "
-"korlátlan)"
-
 #, fuzzy
 msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
@@ -5513,64 +5513,6 @@ msgid ""
 "time specifiers)"
 msgstr ""
 
-#, fuzzy
-msgid "merge server buffers"
-msgstr "pufferek kezelése"
-
-#, fuzzy
-msgid "merge private buffers"
-msgstr "pufferek kezelése"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -5613,21 +5555,6 @@ msgstr "privát beszélgetésben a másik fél távollétét csak egyszer jelezz
 msgid "display a message in private when user is back (after quit on server)"
 msgstr ""
 
-#, fuzzy
-msgid "display server away message in away bar item"
-msgstr "privát beszélgetésben a másik fél távollétét csak egyszer jelezze"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr ""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr ""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -5663,20 +5590,85 @@ msgid ""
 "(usually any message from another user, not server messages,..)"
 msgstr ""
 
+#, fuzzy
+msgid "display server away message in away bar item"
+msgstr "privát beszélgetésben a másik fél távollétét csak egyszer jelezze"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr ""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
 msgstr ""
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
+msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr "szóköz megjelenítése, ha a mód nem (fél)operátor/voice"
+
 #, fuzzy
 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
@@ -5697,11 +5689,19 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "pufferek kezelése"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""
 
+#, fuzzy
+msgid "merge server buffers"
+msgstr "pufferek kezelése"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -5723,19 +5723,39 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr ""
-
 #. TRANSLATORS: please do not translate "nick"
 #, fuzzy
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr "új üzenetet tartalmazó ablak színe"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr ""
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 
 #, fuzzy
+msgid "color for nick in input bar"
+msgstr "nevek színe"
+
+#, fuzzy
+msgid "color for away item"
+msgstr "távollevő felhasználók nevének színe"
+
+#, fuzzy
+msgid "color for channel modes, near channel name"
+msgstr "szobanevek színe az eseményekben"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr ""
+
+#, fuzzy
 msgid "color for text in join messages"
 msgstr "új üzenetet tartalmazó ablak színe"
 
@@ -5767,33 +5787,13 @@ msgid "color for text \"Notice\" in notices"
 msgstr "új üzenetet tartalmazó ablak színe"
 
 #, fuzzy
-msgid "color for nick in input bar"
-msgstr "nevek színe"
-
-#, fuzzy
-msgid "color for away item"
-msgstr "távollevő felhasználók nevének színe"
-
-#, fuzzy
-msgid "color for channel modes, near channel name"
-msgstr "szobanevek színe az eseményekben"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-
-#, fuzzy
 msgid "color for reason in part/quit messages"
 msgstr "alapértelmezett kilépő üzenet"
 
-msgid "color for old channel topic (when topic is changed)"
+msgid "color for new channel topic (when topic is changed)"
 msgstr ""
 
-msgid "color for new channel topic (when topic is changed)"
+msgid "color for old channel topic (when topic is changed)"
 msgstr ""
 
 msgid ""
@@ -6820,13 +6820,13 @@ msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
 #, fuzzy
-msgid "color for backlog lines"
-msgstr "távollevő felhasználók nevének színe"
-
-#, fuzzy
 msgid "color for line ending the backlog"
 msgstr "nevek színe"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "távollevő felhasználók nevének színe"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -6836,9 +6836,25 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 
+msgid "write information line in log file when log starts or ends for a buffer"
+msgstr ""
+
+msgid ""
+"default file name mask for log files (format is \"directory/to/file\" or "
+"\"file\", without first \"/\" because \"path\" option is used to build "
+"complete path to file); local buffer variables are permitted; date "
+"specifiers are permitted (see man strftime)"
+msgstr ""
+
 msgid "use only lower case for log filenames"
 msgstr ""
 
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
 #, fuzzy
 msgid ""
 "path for WeeChat log files; \"%h\" at beginning of string is replaced by "
@@ -6849,29 +6865,13 @@ msgstr ""
 "könyvtára, alapértelmezésben ~/.weechat, kerül)"
 
 msgid ""
-"default file name mask for log files (format is \"directory/to/file\" or "
-"\"file\", without first \"/\" because \"path\" option is used to build "
-"complete path to file); local buffer variables are permitted; date "
-"specifiers are permitted (see man strftime)"
-msgstr ""
-
-msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
 msgstr ""
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-
 #, fuzzy
 msgid "list of logger buffers"
 msgstr "a pufferek időbélyege"
@@ -7487,18 +7487,6 @@ msgid "text color for client description"
 msgstr "információs pult határolóinak színe"
 
 #, fuzzy
-msgid "text color in relay buffer"
-msgstr "szerver nevének színe"
-
-#, fuzzy
-msgid "background color in relay buffer"
-msgstr "olvasatlan adat jelölő háttere"
-
-#, fuzzy
-msgid "text color of selected line in relay buffer"
-msgstr "szerver nevének színe"
-
-#, fuzzy
 msgid "text color for \"connecting\" status"
 msgstr "\"connecting\" dcc státusz színe"
 
@@ -7518,6 +7506,18 @@ msgstr "\"failed\" dcc státusz színe"
 msgid "text color for \"disconnected\" status"
 msgstr "\"connecting\" dcc státusz színe"
 
+#, fuzzy
+msgid "text color in relay buffer"
+msgstr "szerver nevének színe"
+
+#, fuzzy
+msgid "background color in relay buffer"
+msgstr "olvasatlan adat jelölő háttere"
+
+#, fuzzy
+msgid "text color of selected line in relay buffer"
+msgstr "szerver nevének színe"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -7560,11 +7560,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
-
-#, fuzzy
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -7572,6 +7567,11 @@ msgid ""
 msgstr ""
 "felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
 
+#, fuzzy
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"felhasználói parancsok maximális száma az előzményekben (0 = korlátlan)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -8337,25 +8337,25 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "color for status \"popular\" (\"*\")"
-msgstr "státuszsor színe"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr ""
-
-#, fuzzy
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "státuszsor színe"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
+#, fuzzy
+msgid "color for status \"popular\" (\"*\")"
+msgstr "státuszsor színe"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr ""
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr ""
 
@@ -8364,59 +8364,55 @@ msgid "text color in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of dates in script buffer"
-msgstr "másik fél nevének színe privát beszélgetésben"
+msgid "background color in script buffer"
+msgstr "nevek háttere"
 
 #, fuzzy
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of description in script buffer"
-msgstr "szerver nevének színe"
+msgid "text color of dates in script buffer"
+msgstr "másik fél nevének színe privát beszélgetésben"
 
 #, fuzzy
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of tags in script buffer"
+msgid "text color of description in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of version in script buffer"
-msgstr "másik fél nevének színe privát beszélgetésben"
-
-#, fuzzy
-msgid "text color of version loaded in script buffer"
-msgstr "másik fél nevének színe privát beszélgetésben"
+msgid "text color of description for selected line in script buffer"
+msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "background color in script buffer"
-msgstr "nevek háttere"
+msgid "text color of extension in script buffer"
+msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color for selected line in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of description for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of extension for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of script name for selected line in script buffer"
+msgid "text color of tags in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
@@ -8424,15 +8420,19 @@ msgid "text color of tags for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "text color of version for selected line in script buffer"
-msgstr "szerver nevének színe"
+msgid "text color of version in script buffer"
+msgstr "másik fél nevének színe privát beszélgetésben"
+
+#, fuzzy
+msgid "text color of version loaded in script buffer"
+msgstr "másik fél nevének színe privát beszélgetésben"
 
 #, fuzzy
 msgid "text color of version loaded for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 #, fuzzy
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr "szerver nevének színe"
 
 msgid ""
@@ -8755,18 +8755,6 @@ msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 
 #, fuzzy
-msgid "text color in xfer buffer"
-msgstr "szerver nevének színe"
-
-#, fuzzy
-msgid "background color in xfer buffer"
-msgstr "nevek háttere"
-
-#, fuzzy
-msgid "text color of selected line in xfer buffer"
-msgstr "szerver nevének színe"
-
-#, fuzzy
 msgid "text color for \"waiting\" status"
 msgstr "\"waiting\" dcc státusz színe"
 
@@ -8787,8 +8775,16 @@ msgid "text color for \"aborted\" status"
 msgstr "\"aborted\" dcc státusz színe"
 
 #, fuzzy
-msgid "timeout for xfer request (in seconds)"
-msgstr "dcc kérések időkorlátja (másodpercben)"
+msgid "text color in xfer buffer"
+msgstr "szerver nevének színe"
+
+#, fuzzy
+msgid "background color in xfer buffer"
+msgstr "nevek háttere"
+
+#, fuzzy
+msgid "text color of selected line in xfer buffer"
+msgstr "szerver nevének színe"
 
 #, fuzzy
 msgid "block size for sending packets, in bytes"
@@ -8799,6 +8795,12 @@ msgstr "nem vár ACK válaszra fájl küldésekor"
 
 #, fuzzy
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr "kimenő dcc forgalom IP/DNS-címe (ha üres, a helyi interfész IP-címe)"
+
+#, fuzzy
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -8808,37 +8810,27 @@ msgstr ""
 "használja (NAT esetén hasznos) (szintaxis: egyetlen port, pl. 5000 vagy egy "
 "port intervallum, pl. 5000-5015, üresen hagyva tetszőleges port)"
 
-#, fuzzy
-msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr "kimenő dcc forgalom IP/DNS-címe (ha üres, a helyi interfész IP-címe)"
-
 msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 
 #, fuzzy
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
-"könyvtára, alapértelmezésben ~/.weechat, kerül)"
+msgid "timeout for xfer request (in seconds)"
+msgstr "dcc kérések időkorlátja (másodpercben)"
 
 #, fuzzy
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
-"könyvtára, alapértelmezésben ~/.weechat, kerül)"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "dcc beszélgetések automatikus fogadása (óvatosan használja!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
+#, fuzzy
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "dcc beszélgetések automatikus fogadása (óvatosan használja!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "szóközök alulvonássá alakítása küldéskor"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
 
 #, fuzzy
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
@@ -8852,18 +8844,26 @@ msgstr ""
 "dcc adatátvitel automatikus felépítése, ha megszakad a kapcsolat a távoli "
 "géppel"
 
-#, fuzzy
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "dcc beszélgetések automatikus fogadása (óvatosan használja!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "szóközök alulvonássá alakítása küldéskor"
 
 #, fuzzy
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "dcc beszélgetések automatikus fogadása (óvatosan használja!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
+"könyvtára, alapértelmezésben ~/.weechat, kerül)"
 
+#, fuzzy
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+"modulok elérési útvonala ('%h' helyére automatikusan a WeeChat saját  "
+"könyvtára, alapértelmezésben ~/.weechat, kerül)"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
 
 #, fuzzy
diff --git a/po/it.po b/po/it.po
index e001e59c1..43ebf7a94 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-06-14 19:39-0300\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3081,13 +3081,6 @@ msgstr "mostra un separatore orizzontale tra le finestre"
 msgid "display a vertical separator between windows"
 msgstr "mostra un separatore verticale tra le finestre"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-"colore per i separatori delle finestre (quando divise) e dei separatori tra "
-"le barre (come la lista nick)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "colore del testo '+' allo scorrimento delle barre"
 
@@ -3097,11 +3090,14 @@ msgstr "colore del testo per la chat"
 msgid "background color for chat"
 msgstr "colore di sfondo per la chat"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"colore del testo per la chat quando la finestra è inattiva (nessuna finestra "
-"attiva selezionata)"
+msgid "text color for buffer names"
+msgstr "colore del testo per i nomi dei buffer"
+
+msgid "text color for channel names"
+msgstr "colore del testo per i nomi dei canali"
+
+msgid "text color for delimiters"
+msgstr "colore del testo per i delimitatori"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3110,55 +3106,11 @@ msgstr ""
 "colore del testo per la chat quando la riga è inattiva (il buffer è unito "
 "con altri buffer e non è selezionato)"
 
-msgid "text color for time in chat window"
-msgstr "colore del testo per l'orario nella finestra di chat"
-
-msgid "text color for time delimiters"
-msgstr "colore del testo per i delimitator dell'orario"
-
-msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"colore del testo per il nome del buffer (prima del prefisso, quando più "
-"buffer sono uniti con lo stesso nome)"
-
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"colore del testo per il nome del buffer inattivo (prima del prefisso, quando "
-"più buffer sono uniti con lo stesso numero e il buffer non è selezionato)"
-
-msgid "text color for error prefix"
-msgstr "colore del testo per il prefisso di errore"
-
-msgid "text color for network prefix"
-msgstr "colore del testo per il prefisso di rete"
-
-msgid "text color for action prefix"
-msgstr "colore del testo per il prefisso di azione"
-
-msgid "text color for join prefix"
-msgstr "colore del testo per il prefisso di entrata"
-
-msgid "text color for quit prefix"
-msgstr "colore del testo per il prefisso di uscita"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "colore del testo per '+' quando il prefisso è troppo lungo"
-
-msgid "text color for suffix (after prefix)"
-msgstr "colore del testo per il suffisso (dopo il prefisso)"
-
-msgid "text color for buffer names"
-msgstr "colore del testo per i nomi dei buffer"
-
-msgid "text color for server names"
-msgstr "colore del testo per i nomi dei server"
-
-msgid "text color for channel names"
-msgstr "colore del testo per i nomi dei canali"
+"colore del testo per la chat quando la finestra è inattiva (nessuna finestra "
+"attiva selezionata)"
 
 msgid "text color for nicks in chat window"
 msgstr "colore del testo per i nick nella finestra di chat"
@@ -3176,14 +3128,6 @@ msgstr ""
 "colore per il prefisso del nick (stringa visualizzata prima del nick nel "
 "prefisso)"
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"colore per il prefisso del nick (stringa visualizzata dopo il nick nel "
-"prefisso)"
-
-msgid "text color for local nick in chat window"
-msgstr "colore del testo per il nick locale nella finestra di chat"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "colore del testo per i nick non in linea (non più in lista nick)"
 
@@ -3196,11 +3140,13 @@ msgstr "colore di sfondo per i nick non in linea con highlight"
 msgid "text color for other nick in private buffer"
 msgstr "colore del testo per gli altri nick nel buffer privato"
 
-msgid "text color for hostnames"
-msgstr "colore del testo per i nomi host"
+msgid "text color for local nick in chat window"
+msgstr "colore del testo per il nick locale nella finestra di chat"
 
-msgid "text color for delimiters"
-msgstr "colore del testo per i delimitatori"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"colore per il prefisso del nick (stringa visualizzata dopo il nick nel "
+"prefisso)"
 
 msgid "text color for highlighted prefix"
 msgstr "colore del testo per il prefisso di notifica"
@@ -3208,12 +3154,53 @@ msgstr "colore del testo per il prefisso di notifica"
 msgid "background color for highlighted prefix"
 msgstr "colore di sfondo per il prefisso di notifica"
 
+msgid "text color for hostnames"
+msgstr "colore del testo per i nomi host"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"colore del testo per il nome del buffer (prima del prefisso, quando più "
+"buffer sono uniti con lo stesso nome)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"colore del testo per il nome del buffer inattivo (prima del prefisso, quando "
+"più buffer sono uniti con lo stesso numero e il buffer non è selezionato)"
+
+msgid "text color for error prefix"
+msgstr "colore del testo per il prefisso di errore"
+
+msgid "text color for network prefix"
+msgstr "colore del testo per il prefisso di rete"
+
+msgid "text color for action prefix"
+msgstr "colore del testo per il prefisso di azione"
+
+msgid "text color for join prefix"
+msgstr "colore del testo per il prefisso di entrata"
+
+msgid "text color for quit prefix"
+msgstr "colore del testo per il prefisso di uscita"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "colore del testo per '+' quando il prefisso è troppo lungo"
+
+msgid "text color for suffix (after prefix)"
+msgstr "colore del testo per il suffisso (dopo il prefisso)"
+
 msgid "text color for unread data marker"
 msgstr "colore del testo per l'evidenziatore di dati non letti"
 
 msgid "background color for unread data marker"
 msgstr "colore di sfondo per l'evidenziatore di dati non letti"
 
+msgid "text color for server names"
+msgstr "colore del testo per i nomi dei server"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "colore del testo per i tago dopo i messaggi (mostrati con il comando /debug "
@@ -3225,58 +3212,77 @@ msgstr "colore del testo per l'evidenziatore sulle righe per il testo trovato"
 msgid "background color for marker on lines where text sought is found"
 msgstr "colore di sfondo per l'evidenziatore sulle righe per il testo trovato"
 
+msgid "text color for time in chat window"
+msgstr "colore del testo per l'orario nella finestra di chat"
+
+msgid "text color for time delimiters"
+msgstr "colore del testo per i delimitator dell'orario"
+
 msgid "text color for values"
 msgstr "colore del testo per i valori"
 
-msgid "text color for current buffer number in status bar"
-msgstr ""
-"colore del testo per il numero del buffer corrente nella barra di stato"
+msgid "text color for actions in input line"
+msgstr "colore del testo per le azioni sulla riga di input"
 
-msgid "text color for current buffer name in status bar"
-msgstr "colore del testo per il nome del buffer corrente nella barra di stato"
+msgid "text color for unsuccessful text search in input line"
+msgstr "colore del testo per la ricerca del testo fallita nella riga di input"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"colore del testo per il nome del buffer corrente nella barra di stato, se i "
-"dati sono messi al sicuro con un protocollo come SSL"
+"colore per i separatori delle finestre (quando divise) e dei separatori tra "
+"le barre (come la lista nick)"
 
-msgid "text color for filter indicator in status bar"
-msgstr "colore del testo per l'indicatore di filtro nella barra di stato"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi di notifica nella hotlist "
+"(barra di stato)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "colore del testo per il buffer con nuovi messaggi (barra di stato)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi nella hotlist (barra di stato)"
 
-msgid "text color for buffer with private message (status bar)"
+msgid "text color for count of other messages in hotlist (status bar)"
 msgstr ""
-"colore del testo per il buffer con un messaggio privato (barra di stato)"
+"colore del testo per il conteggio di altri messaggi nella hotlist (barra di "
+"stato)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr ""
+"colore del testo per il conteggio dei messaggi privati nella hotlist (barra "
+"di stato)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "colore del testo per il buffer con notifica (barra di stato)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "colore del testo per il buffer con nuovi messaggi (barra di stato)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 "colore del testo per il buffer con nuovi dati (non messaggi) (barra di stato)"
 
-msgid "text color for count of messages in hotlist (status bar)"
+msgid "text color for buffer with private message (status bar)"
 msgstr ""
-"colore del testo per il conteggio dei messaggi nella hotlist (barra di stato)"
+"colore del testo per il buffer con un messaggio privato (barra di stato)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr ""
-"colore del testo per il conteggio dei messaggi privati nella hotlist (barra "
-"di stato)"
+msgid "text color for filter indicator in status bar"
+msgstr "colore del testo per l'indicatore di filtro nella barra di stato"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
+msgid "text color for current buffer name in status bar"
+msgstr "colore del testo per il nome del buffer corrente nella barra di stato"
+
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"colore del testo per il conteggio dei messaggi di notifica nella hotlist "
-"(barra di stato)"
+"colore del testo per il nome del buffer corrente nella barra di stato, se i "
+"dati sono messi al sicuro con un protocollo come SSL"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid "text color for current buffer number in status bar"
 msgstr ""
-"colore del testo per il conteggio di altri messaggi nella hotlist (barra di "
-"stato)"
+"colore del testo per il numero del buffer corrente nella barra di stato"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "colore del testo per il buffer con nuovi dati (barra di stato)"
@@ -3284,18 +3290,12 @@ msgstr "colore del testo per il buffer con nuovi dati (barra di stato)"
 msgid "text color for time (status bar)"
 msgstr "colore del testo per l'ora (barra di stato)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "colore del testo per la ricerca del testo fallita nella riga di input"
-
-msgid "text color for actions in input line"
-msgstr "colore del testo per le azioni sulla riga di input"
+msgid "text color for away nicknames"
+msgstr "colore del testo per i nick assenti"
 
 msgid "text color for groups in nicklist"
 msgstr "colore del testo per i gruppi nella lista nick"
 
-msgid "text color for away nicknames"
-msgstr "colore del testo per i nick assenti"
-
 msgid "text color for offline nicknames"
 msgstr "colore del testo per i nick non in linea"
 
@@ -3350,6 +3350,10 @@ msgstr ""
 "completa parzialmente gli argomenti dei comandi (arresta quando vengono "
 "trovati più argomenti con lo stesso prefisso)"
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+"mostra contatore per ogni completamento parziale nella barra degli oggetti"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3357,13 +3361,12 @@ msgstr ""
 "completa parzialmente comandi esterni (arresta quando vengono trovate più "
 "parole che iniziano con le stesse lettere)"
 
-msgid "display count for each partial completion in bar item"
-msgstr ""
-"mostra contatore per ogni completamento parziale nella barra degli oggetti"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
-"numero massimo di righe nella cronologia per buffer (0 = nessun limite)"
+"numero massimo predefinito di comandi da visualizzare nella cronologia (0 = "
+"nessun limite)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3373,6 +3376,10 @@ msgstr ""
 "esempi: 1440 = un giorno, 10000 = una settimana; 43200 = un mese, 525600 = "
 "un anno)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr ""
+"numero massimo di righe nella cronologia per buffer (0 = nessun limite)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "numero massimo di comandi utente nella cronologia (0 = nessun limite)"
 
@@ -3380,13 +3387,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr "numero massimo di buffer visitati da memorizzare"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"numero massimo predefinito di comandi da visualizzare nella cronologia (0 = "
-"nessun limite)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr ""
@@ -6243,74 +6243,6 @@ msgstr ""
 "formato dell'ora in risposta al messaggio CTCP TIME (consultare man strftime "
 "per gli specificatori data/ora)"
 
-msgid "merge server buffers"
-msgstr "unisci i buffer dei server"
-
-msgid "merge private buffers"
-msgstr "unisci i buffer privati"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"forza la posizione del nuovo canale nell'elenco dei buffer (none = posizione "
-"predefinita (dovrebbe essere l'ultimo buffer), next = buffer corrente + 1, "
-"near_server = dopo l'ultimo canale/privato del server)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"forza la posizione del nuovo buffer privato nell'elenco dei buffer (none = "
-"posizione predefinita (dovrebbe essere l'ultimo buffer), next = buffer "
-"corrente + 1, near_server = dopo l'ultimo canale/privato del server)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"caratteri usati per interrompere il calcolo del colore con le lettere del "
-"nick (almeno un carattere al di fuori di questa lista deve essere nella "
-"lista prima di interromperlo) (esempio: nick \"|nick|away\" con \"|\" nei "
-"caratteri restituisce il colore del nick \"|nick\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-"completamento intelligente per i nick (completa il primo con gli ultimi a "
-"parlare sul canale): speakers = tutti i nick (notifiche comprese), "
-"speakers_highlight = solo i nick con le notifiche"
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6356,22 +6288,6 @@ msgstr ""
 "mostra un messaggio in privato quando l'utente è tornato (dopo l'uscita dal "
 "server)"
 
-msgid "display server away message in away bar item"
-msgstr "mostra il messaggio di assenza del server nell'elemento barra di away"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"nasconde la chiave del canale (l'opzione nasconde gli argomenti di tutte le "
-"modalità canale se +k è impostato sul canale)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "visualizza il prefisso del nick nell'elemento barra \"input_prompt\""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6434,11 +6350,27 @@ msgstr ""
 "notifiche (di solito qualsiasi messaggio da altri utenti, non quelli dal "
 "server...)"
 
+msgid "display server away message in away bar item"
+msgstr "mostra il messaggio di assenza del server nell'elemento barra di away"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"nasconde la chiave del canale (l'opzione nasconde gli argomenti di tutte le "
+"modalità canale se +k è impostato sul canale)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 "nome dell'elemento barra dove è mostrato il server IRC (per la barra di "
 "stato)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "visualizza le modalità nick nell'elemento barra \"input_prompt\""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "visualizza il prefisso del nick nell'elemento barra \"input_prompt\""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6447,12 +6379,74 @@ msgstr ""
 "destinazione è privata ed il buffer privato non viene trovato"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"forza la posizione del nuovo canale nell'elenco dei buffer (none = posizione "
+"predefinita (dovrebbe essere l'ultimo buffer), next = buffer corrente + 1, "
+"near_server = dopo l'ultimo canale/privato del server)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"forza la posizione del nuovo buffer privato nell'elenco dei buffer (none = "
+"posizione predefinita (dovrebbe essere l'ultimo buffer), next = buffer "
+"corrente + 1, near_server = dopo l'ultimo canale/privato del server)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"caratteri usati per interrompere il calcolo del colore con le lettere del "
+"nick (almeno un carattere al di fuori di questa lista deve essere nella "
+"lista prima di interromperlo) (esempio: nick \"|nick|away\" con \"|\" nei "
+"caratteri restituisce il colore del nick \"|nick\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+"completamento intelligente per i nick (completa il primo con gli ultimi a "
+"parlare sul canale): speakers = tutti i nick (notifiche comprese), "
+"speakers_highlight = solo i nick con le notifiche"
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 "visualizza notifiche come messaggi privati (se automatico, usa il buffer "
@@ -6481,6 +6475,9 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "chiude buffer quando viene digitato /part nel canale"
 
+msgid "merge private buffers"
+msgstr "unisci i buffer privati"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6489,6 +6486,9 @@ msgstr ""
 "viene chiuso (i messaggi verranno visualizzati all'apertura del buffer dei "
 "dati raw)"
 
+msgid "merge server buffers"
+msgstr "unisci i buffer dei server"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6514,21 +6514,41 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
+#. TRANSLATORS: please do not translate "nick"
+msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgstr "abilita filtro smart per i messaggi \"nick\" (cambio nick)"
+
 #. TRANSLATORS: please do not translate "part" and "quit"
 msgid "enable smart filter for \"part\" and \"quit\" messages"
 msgstr ""
 "abilita filtro smart per i messaggi \"part\" (uscita) e \"quit "
 "(disconnessione)"
 
-#. TRANSLATORS: please do not translate "nick"
-msgid "enable smart filter for \"nick\" messages (nick changes)"
-msgstr "abilita filtro smart per i messaggi \"nick\" (cambio nick)"
-
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "elimina colori nell'argomento (usato solo quando mostrato il titolo del "
 "buffer)"
 
+msgid "color for nick in input bar"
+msgstr "colore per il nick nella riga di input"
+
+msgid "color for away item"
+msgstr "colore per l'elemento assenza"
+
+msgid "color for channel modes, near channel name"
+msgstr "colore per le modalità dei canali, vicino ai nomi dei canali"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"colore per l'indicatore del lag, durante il conteggio (pong non ricevuto dal "
+"server, lag in aumento)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr ""
+"colore per l'indicatore di ritardo, quando il pong viene ricevuto dal server"
+
 msgid "color for text in join messages"
 msgstr "colore per il testo nei messaggi di entrata"
 
@@ -6570,35 +6590,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "colore per il testo \"Notifica\" nelle notifiche"
 
-msgid "color for nick in input bar"
-msgstr "colore per il nick nella riga di input"
-
-msgid "color for away item"
-msgstr "colore per l'elemento assenza"
-
-msgid "color for channel modes, near channel name"
-msgstr "colore per le modalità dei canali, vicino ai nomi dei canali"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"colore per l'indicatore del lag, durante il conteggio (pong non ricevuto dal "
-"server, lag in aumento)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-"colore per l'indicatore di ritardo, quando il pong viene ricevuto dal server"
-
 msgid "color for reason in part/quit messages"
 msgstr "colore per il motivo nei messaggi di uscita/abbandono"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "colore del precedente argomento del canale (quando viene cambiato)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "colore del nuovo argomento del canale (quando viene cambiato)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "colore del precedente argomento del canale (quando viene cambiato)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7662,12 +7662,12 @@ msgstr ""
 "numero massimo di righe da visualizzare dal file di log alla creazione di un "
 "nuovo buffer (0 = nessuna cronologia)"
 
-msgid "color for backlog lines"
-msgstr "colore per la cronologia"
-
 msgid "color for line ending the backlog"
 msgstr "colore per la riga finale nella cronologia"
 
+msgid "color for backlog lines"
+msgstr "colore per la cronologia"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7681,17 +7681,10 @@ msgstr ""
 "numero di secondi tra il flush (scrittura) dei file di log (0 = scrive sui "
 "file di log immediatamente per ogni riga stampata)"
 
-msgid "use only lower case for log filenames"
-msgstr "usare solo lettere minuscole per i nomi dei file di log"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"path per i file di log di WeeChat: \"%h\" all'inizio della stringa viene "
-"sostituito dalla directory home di WeeChat (predefinita è \"~/.weechat); "
-"sono ammessi gli specificatori di data (consultare man strftime)"
+"scrive una riga informativa nel file di log quando il log inizia o termina "
+"per un buffer"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7705,6 +7698,26 @@ msgstr ""
 "del buffer locale; sono ammessi gli specificatori di data (consultare man "
 "strftime)"
 
+msgid "use only lower case for log filenames"
+msgstr "usare solo lettere minuscole per i nomi dei file di log"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+"testo da scrivere prima del nick nel prefisso del messaggo, esempio: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+"testo da scrivere dopo il nick nel prefisso del messaggo, esempio: \"<\""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"path per i file di log di WeeChat: \"%h\" all'inizio della stringa viene "
+"sostituito dalla directory home di WeeChat (predefinita è \"~/.weechat); "
+"sono ammessi gli specificatori di data (consultare man strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7712,24 +7725,11 @@ msgstr ""
 "carattere di sostituzione per i caratteri speciali nei nomi dei file salvati "
 "con la mask (come il delimitatore di directory)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"scrive una riga informativa nel file di log quando il log inizia o termina "
-"per un buffer"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "data e ora usati nei file di log (consultare man strftime per gli "
 "specificatori di data/ora)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-"testo da scrivere prima del nick nel prefisso del messaggo, esempio: \"<\""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-"testo da scrivere dopo il nick nel prefisso del messaggo, esempio: \"<\""
-
 msgid "list of logger buffers"
 msgstr "elenco dei buffer logger"
 
@@ -8363,15 +8363,6 @@ msgstr ""
 msgid "text color for client description"
 msgstr "colore del testo per la descrizione del client"
 
-msgid "text color in relay buffer"
-msgstr "colore del testo nei buffer relay"
-
-msgid "background color in relay buffer"
-msgstr "colore di sfondo nel buffer relay"
-
-msgid "text color of selected line in relay buffer"
-msgstr "colore del testo della riga selezionata nel buffer relay"
-
 msgid "text color for \"connecting\" status"
 msgstr "colore del testo per lo status \"connessione in corso\""
 
@@ -8387,6 +8378,15 @@ msgstr "colore del testo per lo status \"autenticazione fallita\""
 msgid "text color for \"disconnected\" status"
 msgstr "colore del testo per lo status \"disconnesso\""
 
+msgid "text color in relay buffer"
+msgstr "colore del testo nei buffer relay"
+
+msgid "background color in relay buffer"
+msgstr "colore di sfondo nel buffer relay"
+
+msgid "text color of selected line in relay buffer"
+msgstr "colore del testo della riga selezionata nel buffer relay"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8444,10 +8444,6 @@ msgid ""
 "\\.)?example\\.(com|org)\""
 msgstr ""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"numero massimo di righe nella cronologia per canale IRC (0 = nessun limite)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8457,6 +8453,10 @@ msgstr ""
 "esempi: 1440 = un giorno, 10000 = una settimana; 43200 = un mese, 525600 = "
 "un anno)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"numero massimo di righe nella cronologia per canale IRC (0 = nessun limite)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr "mostra la cronologia a partire dall'ultima disconnessione del client"
 
@@ -9242,95 +9242,95 @@ msgid ""
 "alt+r = remove, ...); if disabled, only the input is allowed: i, r, ..."
 msgstr ""
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "colore per lo status \"popolare\" (\"*\")"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr "colore per lo status \"installato\" (\"i\")"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "colore per lo status \"caricato automaticamente\" (\"a\")"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "colore per lo status \"bloccato\" (\"H\")"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "colore per lo status \"in esecuzione\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
+msgstr "colore per lo status \"installato\" (\"i\")"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "colore per lo status \"obsoleto\" (\"N\")"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "colore per lo status \"popolare\" (\"*\")"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "colore per lo status \"in esecuzione\" (\"r\")"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "colore per lo status \"sconosciuto\" (\"?\")"
 
 msgid "text color in script buffer"
 msgstr "colore del testo nel buffer degli script"
 
+msgid "background color in script buffer"
+msgstr "colore di sfondo nel buffer degli script"
+
+msgid "background color for selected line in script buffer"
+msgstr "colore di sfondo per la riga selezionata nel buffer degli script"
+
 msgid "text color of dates in script buffer"
 msgstr "colore del testo delle date nel buffer degli script"
 
+msgid "text color of dates for selected line in script buffer"
+msgstr ""
+"colore del testo delle date per la riga selezionata nel buffer degli script"
+
 msgid "text color of delimiters in script buffer"
 msgstr "colore del testo dei delimitatori nel buffer degli script"
 
 msgid "text color of description in script buffer"
 msgstr "colore del testo della descrizione nel buffer degli script"
 
-msgid "text color of extension in script buffer"
-msgstr "colore del testo dell'estensione nel buffer degli script"
-
-msgid "text color of script name in script buffer"
-msgstr "colore del testo del nome dello script nel buffer degli script"
-
-msgid "text color of tags in script buffer"
-msgstr "colore del testo dei tag nel buffer degli script"
-
-msgid "text color of version in script buffer"
-msgstr "colore del testo della versione nel buffer degli script"
-
-msgid "text color of version loaded in script buffer"
-msgstr "colore del testo della versione caricata nel buffer degli script"
-
-msgid "background color in script buffer"
-msgstr "colore di sfondo nel buffer degli script"
-
-msgid "text color for selected line in script buffer"
-msgstr "colore del testo della riga selezionata nel buffer degli script"
-
-msgid "text color of dates for selected line in script buffer"
-msgstr ""
-"colore del testo delle date per la riga selezionata nel buffer degli script"
-
 msgid "text color of description for selected line in script buffer"
 msgstr ""
 "colore del testo della descrizione per la riga selezionata nel buffer degli "
 "script"
 
+msgid "text color of extension in script buffer"
+msgstr "colore del testo dell'estensione nel buffer degli script"
+
 msgid "text color of extension for selected line in script buffer"
 msgstr ""
 "colore del testo dell'estensione per la riga selezionata nel buffer degli "
 "script"
 
+msgid "text color of script name in script buffer"
+msgstr "colore del testo del nome dello script nel buffer degli script"
+
 msgid "text color of script name for selected line in script buffer"
 msgstr ""
 "colore del testo del nome dello script per la riga selezionata nel buffer "
 "degli script"
 
+msgid "text color for selected line in script buffer"
+msgstr "colore del testo della riga selezionata nel buffer degli script"
+
+msgid "text color of tags in script buffer"
+msgstr "colore del testo dei tag nel buffer degli script"
+
 msgid "text color of tags for selected line in script buffer"
 msgstr ""
 "colore del testo dei tag per la riga selezionata nel buffer degli script"
 
-msgid "text color of version for selected line in script buffer"
-msgstr ""
-"colore del testo della versione per la riga selezionata nel buffer degli "
-"script"
+msgid "text color of version in script buffer"
+msgstr "colore del testo della versione nel buffer degli script"
+
+msgid "text color of version loaded in script buffer"
+msgstr "colore del testo della versione caricata nel buffer degli script"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 "colore del testo della versione attiva per la riga selezionata nel buffer "
 "degli script"
 
-msgid "background color for selected line in script buffer"
-msgstr "colore di sfondo per la riga selezionata nel buffer degli script"
+msgid "text color of version for selected line in script buffer"
+msgstr ""
+"colore del testo della versione per la riga selezionata nel buffer degli "
+"script"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -9645,15 +9645,6 @@ msgstr ""
 msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr "dimensione barra di avanzamento, in caratteri (se 0, è disabilitata)"
 
-msgid "text color in xfer buffer"
-msgstr "colore del testo nel buffer xfer"
-
-msgid "background color in xfer buffer"
-msgstr "colore di sfondo del buffer xfer"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "colore della riga selezionata nel buffer xfer"
-
 msgid "text color for \"waiting\" status"
 msgstr "colore del testo per lo status \"in attesa\""
 
@@ -9669,8 +9660,14 @@ msgstr "colore del testo per lo status \"fallito\""
 msgid "text color for \"aborted\" status"
 msgstr "colore del testo per lo status \"annullato\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "timeout per la richiesta xfer (in secondi)"
+msgid "text color in xfer buffer"
+msgstr "colore del testo nel buffer xfer"
+
+msgid "background color in xfer buffer"
+msgstr "colore di sfondo del buffer xfer"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "colore della riga selezionata nel buffer xfer"
 
 msgid "block size for sending packets, in bytes"
 msgstr "dimensione blocco per l'invio dei pacchetti, in byte"
@@ -9679,6 +9676,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "non attendere ACK all'invio del file"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"Indirizzo IP o DNS per l'invio di file/chat (se vuoto, verrà usata "
+"l'interfaccia IP locale)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9691,38 +9695,25 @@ msgstr ""
 "solo per root)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"Indirizzo IP o DNS per l'invio di file/chat (se vuoto, verrà usata "
-"l'interfaccia IP locale)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "limite di velocità per l'invio dei file, in kb per secondo (0 vuol dire "
 "senza limite)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"path per il salvataggio dei file in arrivo (\"%h\" sarà sostituito dalla "
-"home di WeeChat, \"~/.weechat come predefinita)"
+msgid "timeout for xfer request (in seconds)"
+msgstr "timeout per la richiesta xfer (in secondi)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"path per la lettura dei file da inviare (quando non specificato dall'utente) "
-"(\"%h\" sarà sostituito dalla home di WeeChat, \"~/.weechat come predefinita)"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "accetta automaticamente le richieste di chat (usare con cautela!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
-"usa il nick remoto come prefisso nel nome del file locale alla ricezione"
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "accetta automaticamente i file in arrivo (usare con cautela!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "converti gli spazi in underscore all'invio dei file"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -9734,17 +9725,26 @@ msgstr ""
 "riprende automaticamente il trasferimento dei file se la connessione "
 "all'host viene perduta"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "accetta automaticamente i file in arrivo (usare con cautela!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "converti gli spazi in underscore all'invio dei file"
 
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "accetta automaticamente le richieste di chat (usare con cautela!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"path per il salvataggio dei file in arrivo (\"%h\" sarà sostituito dalla "
+"home di WeeChat, \"~/.weechat come predefinita)"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+"path per la lettura dei file da inviare (quando non specificato dall'utente) "
+"(\"%h\" sarà sostituito dalla home di WeeChat, \"~/.weechat come predefinita)"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
+"usa il nick remoto come prefisso nel nome del file locale alla ricezione"
 
 msgid "list of xfer"
 msgstr "elenco di xfer"
diff --git a/po/ja.po b/po/ja.po
index 435612748..79ff52b36 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 16:02+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -3027,12 +3027,6 @@ msgstr "ウィンドウ間に水平セパレータを表示"
 msgid "display a vertical separator between windows"
 msgstr "ウィンドウ間に垂直セパレータを表示"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-"ウィンドウセパレータ (分割時) とバーセパレータ (ニックネームリスト等) の色"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "バーをスクロールする際の '+' のテキスト色"
 
@@ -3042,11 +3036,14 @@ msgstr "チャットのテキスト色"
 msgid "background color for chat"
 msgstr "チャットの背景色"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"ウィンドウへのフォーカスがなくなった場合 (選択されていないウィンドウ) の"
-"チャットのテキスト色"
+msgid "text color for buffer names"
+msgstr "バッファ名のテキスト色"
+
+msgid "text color for channel names"
+msgstr "チャンネル名のテキスト色"
+
+msgid "text color for delimiters"
+msgstr "区切りのテキスト色"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3055,55 +3052,11 @@ msgstr ""
 "行へのフォーカスがなくなった場合の (バッファが他のバッファとマージされていて"
 "選択されていない場合の) のチャットのテキスト色"
 
-msgid "text color for time in chat window"
-msgstr "チャットウィンドウ内の時間のテキスト色"
-
-msgid "text color for time delimiters"
-msgstr "時間区切りのテキスト色"
-
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"バッファ名のテキスト色 (多くのバッファが同じ番号を持つものにマージされている"
-"場合は、プレフィックスの前)"
-
-msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"非アクティブバッファ名のテキスト色 (多くのバッファが同じ番号を持つものにマー"
-"ジされ、バッファが選択されていない場合は、プレフィックスの前)"
-
-msgid "text color for error prefix"
-msgstr "エラープレフィックスのテキスト色"
-
-msgid "text color for network prefix"
-msgstr "ネットワークプレフィックスのテキスト色"
-
-msgid "text color for action prefix"
-msgstr "アクションプレフィックスのテキスト色"
-
-msgid "text color for join prefix"
-msgstr "join プレフィックスのテキスト色"
-
-msgid "text color for quit prefix"
-msgstr "quit プレフィックスのテキスト色"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "プレフィックスが長すぎる場合の '+' のテキスト色"
-
-msgid "text color for suffix (after prefix)"
-msgstr "サフィックスのテキスト色 (プレフィックスの後ろ)"
-
-msgid "text color for buffer names"
-msgstr "バッファ名のテキスト色"
-
-msgid "text color for server names"
-msgstr "サーバ名のテキスト色"
-
-msgid "text color for channel names"
-msgstr "チャンネル名のテキスト色"
+"ウィンドウへのフォーカスがなくなった場合 (選択されていないウィンドウ) の"
+"チャットのテキスト色"
 
 msgid "text color for nicks in chat window"
 msgstr "チャットウィンドウ内のニックネームのテキスト色"
@@ -3121,14 +3074,6 @@ msgstr ""
 "ニックネームプレフィックスの色 (プレフィックス中のニックネームの前に表示され"
 "る文字列)"
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"ニックネームサフィックスの色 (プレフィックス中のニックネームの後に表示される"
-"文字列)"
-
-msgid "text color for local nick in chat window"
-msgstr "チャットウィンドウ内のローカルニックネームのテキスト色"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr ""
 "オフラインのニックネームのテキスト色 (ニックネームリストにも表示されない)"
@@ -3142,11 +3087,13 @@ msgstr "ハイライトされたオフラインのニックネームの背景色
 msgid "text color for other nick in private buffer"
 msgstr "プライベートバッファ内の他のニックネームのテキスト色"
 
-msgid "text color for hostnames"
-msgstr "ホスト名のテキスト色"
+msgid "text color for local nick in chat window"
+msgstr "チャットウィンドウ内のローカルニックネームのテキスト色"
 
-msgid "text color for delimiters"
-msgstr "区切りのテキスト色"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"ニックネームサフィックスの色 (プレフィックス中のニックネームの後に表示される"
+"文字列)"
 
 msgid "text color for highlighted prefix"
 msgstr "ハイライトされたプレフィックスのテキスト色"
@@ -3154,12 +3101,53 @@ msgstr "ハイライトされたプレフィックスのテキスト色"
 msgid "background color for highlighted prefix"
 msgstr "ハイライトされたプレフィックスの背景色"
 
+msgid "text color for hostnames"
+msgstr "ホスト名のテキスト色"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"バッファ名のテキスト色 (多くのバッファが同じ番号を持つものにマージされている"
+"場合は、プレフィックスの前)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"非アクティブバッファ名のテキスト色 (多くのバッファが同じ番号を持つものにマー"
+"ジされ、バッファが選択されていない場合は、プレフィックスの前)"
+
+msgid "text color for error prefix"
+msgstr "エラープレフィックスのテキスト色"
+
+msgid "text color for network prefix"
+msgstr "ネットワークプレフィックスのテキスト色"
+
+msgid "text color for action prefix"
+msgstr "アクションプレフィックスのテキスト色"
+
+msgid "text color for join prefix"
+msgstr "join プレフィックスのテキスト色"
+
+msgid "text color for quit prefix"
+msgstr "quit プレフィックスのテキスト色"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "プレフィックスが長すぎる場合の '+' のテキスト色"
+
+msgid "text color for suffix (after prefix)"
+msgstr "サフィックスのテキスト色 (プレフィックスの後ろ)"
+
 msgid "text color for unread data marker"
 msgstr "未読データマーカーのテキスト色"
 
 msgid "background color for unread data marker"
 msgstr "未読データマーカーの背景色"
 
+msgid "text color for server names"
+msgstr "サーバ名のテキスト色"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr "メッセージの後ろのタグのテキスト色 (/debug tags コマンドで表示)"
 
@@ -3169,51 +3157,69 @@ msgstr "テキスト検索にヒットした行のマーカーのテキスト色
 msgid "background color for marker on lines where text sought is found"
 msgstr "テキスト検索にヒットした行のマーカーの背景色"
 
+msgid "text color for time in chat window"
+msgstr "チャットウィンドウ内の時間のテキスト色"
+
+msgid "text color for time delimiters"
+msgstr "時間区切りのテキスト色"
+
 msgid "text color for values"
 msgstr "値のテキスト色"
 
-msgid "text color for current buffer number in status bar"
-msgstr "ステータスバーの現在のバッファ番号のテキスト色"
+msgid "text color for actions in input line"
+msgstr "入力がアクションの場合のテキスト色"
 
-msgid "text color for current buffer name in status bar"
-msgstr "ステータスバーの現在のバッファ名のテキスト色"
+msgid "text color for unsuccessful text search in input line"
+msgstr "入力行のテキスト検索に失敗した場合のテキスト色"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"SSL などでセキュリティプロトコルを使っている場合のステータスバーの現在のバッ"
-"ファ名のテキスト色、"
+"ウィンドウセパレータ (分割時) とバーセパレータ (ニックネームリスト等) の色"
 
-msgid "text color for filter indicator in status bar"
-msgstr "ステータスバーのフィルタ表示のテキスト色"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr "ホットリスト内のハイライトメッセージ数のテキスト色 (ステータスバー)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "新しいメッセージを受け取ったバッファのテキスト色 (ステータスバー)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr "ホットリスト内のメッセージ数のテキスト色 (ステータスバー)"
 
-msgid "text color for buffer with private message (status bar)"
-msgstr ""
-"プライベートメッセージを受けとったバッファのテキスト色 (ステータスバー)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr "ホットリスト内のその他のメッセージ数のテキスト色 (ステータスバー)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr "ホットリスト内のプライベートメッセージ数のテキスト色 (ステータスバー)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "ハイライトメッセージを受け取ったバッファのテキスト色 (ステータスバー)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "新しいメッセージを受け取ったバッファのテキスト色 (ステータスバー)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 "新しいデータ (メッセージ以外) を受け取ったバッファのテキスト色 (ステータス"
 "バー)"
 
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr "ホットリスト内のメッセージ数のテキスト色 (ステータスバー)"
+msgid "text color for buffer with private message (status bar)"
+msgstr ""
+"プライベートメッセージを受けとったバッファのテキスト色 (ステータスバー)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr "ホットリスト内のプライベートメッセージ数のテキスト色 (ステータスバー)"
+msgid "text color for filter indicator in status bar"
+msgstr "ステータスバーのフィルタ表示のテキスト色"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "ホットリスト内のハイライトメッセージ数のテキスト色 (ステータスバー)"
+msgid "text color for current buffer name in status bar"
+msgstr "ステータスバーの現在のバッファ名のテキスト色"
 
-msgid "text color for count of other messages in hotlist (status bar)"
-msgstr "ホットリスト内のその他のメッセージ数のテキスト色 (ステータスバー)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr ""
+"SSL などでセキュリティプロトコルを使っている場合のステータスバーの現在のバッ"
+"ファ名のテキスト色、"
+
+msgid "text color for current buffer number in status bar"
+msgstr "ステータスバーの現在のバッファ番号のテキスト色"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "新しいデータを受け取ったバッファのテキスト色 (ステータスバー)"
@@ -3221,18 +3227,12 @@ msgstr "新しいデータを受け取ったバッファのテキスト色 (ス�
 msgid "text color for time (status bar)"
 msgstr "時間のテキスト色 (ステータスバー)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "入力行のテキスト検索に失敗した場合のテキスト色"
-
-msgid "text color for actions in input line"
-msgstr "入力がアクションの場合のテキスト色"
+msgid "text color for away nicknames"
+msgstr "離席状態のニックネームのテキスト色"
 
 msgid "text color for groups in nicklist"
 msgstr "ニックネームリスト内のグループのテキスト色"
 
-msgid "text color for away nicknames"
-msgstr "離席状態のニックネームのテキスト色"
-
 msgid "text color for offline nicknames"
 msgstr "オフラインのニックネームのテキスト色"
 
@@ -3285,17 +3285,20 @@ msgstr ""
 "コマンド引数での部分補完 (同じプレフィックスを持つ多くの引数が見つかった場合"
 "は止める)"
 
+msgid "display count for each partial completion in bar item"
+msgstr "バーアイテム内の部分補完数を表示"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
 msgstr ""
 "コマンド外での部分補完 (同じ文字を含む多くのコマンドが見つかった場合は止め)"
 
-msgid "display count for each partial completion in bar item"
-msgstr "バーアイテム内の部分補完数を表示"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "バッファ毎の履歴行数 (0 = 制限無し)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
+msgstr ""
+"履歴をリストアップする際にデフォルトで表示するコマンドの最大数 (0 = 制限無し)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3304,6 +3307,9 @@ msgstr ""
 "バッファ毎の履歴の保存時間 (分) (0 = 制限無し、例: 1440 = 一日、10080 = 一週"
 "間、43200 = 一ヶ月、525600 = 一年間)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "バッファ毎の履歴行数 (0 = 制限無し)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "履歴に保存するユーザコマンド数 (0 = 制限無し)"
 
@@ -3311,12 +3317,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr "メモリに保存する観覧バッファの数"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"履歴をリストアップする際にデフォルトで表示するコマンドの最大数 (0 = 制限無し)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr "リモートホストへの接続タイムアウト時間 (秒単位) (子プロセスが行う)"
@@ -6142,84 +6142,6 @@ msgstr ""
 "CTCP TIME メッセージに対する応答に利用される時間フォーマット (日付/時間指定子"
 "は strftime の man を参照)"
 
-msgid "merge server buffers"
-msgstr "サーババッファをマージ"
-
-msgid "merge private buffers"
-msgstr "プライベートバッファをマージ"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"バッファリスト内で新しいチャンネルの位置を固定 (none = デフォルトの位置 (一番"
-"後ろのバッファ)、next = 現在のバッファ番号 + 1、near_server = サーバの一番後"
-"ろのチャンネル/プライベートバッファ)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"バッファリスト内で新しいプライベートバッファの位置を固定 (none = デフォルトの"
-"位置 (一番後ろのバッファ)、next = 現在のバッファ番号 + 1、near_server = サー"
-"バの一番後ろのチャンネル/プライベートバッファ)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-"ニックネームの前にニックネームモード (オペレータ、voice 権) を表示する (none "
-"= 表示しない、prefix = プレフィックスだけに表示 (デフォルト)、action = アク"
-"ションメッセージだけに表示、both = プレフィックスとアクションメッセージの両方"
-"に表示)"
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-"ニックネームモードが有効でニックネームモードを持っていない (オペレータでな"
-"い、voice 権がない) 場合にはこれを空白で表示する"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"一部のニックネームでニックネーム色を強制する: ニックネームから計算されるハッ"
-"シュを元にした色を利用しない (フォーマット: \"nick1:color1;nick2:color2\"); "
-"ニックネームの検索はまず大文字小文字が区別された状態で行われ、そのあとに小文"
-"字で行われます。このため、このオプションのニックネーム部分を小文字だけで書く"
-"事もできます"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"ニックネーム内の色計算に使用する部分を制限する文字 (このリストに含まれない文"
-"字が、このリストの文字の前に少なくとも一つ以上含まれなければいけない) (例: "
-"\"|\" を設定した場合、\"|nick|away\" はニックネーム \"|nick\" と同じ色になる)"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-"ニックネームのスマート補完 (発言日時の新しいものから順にニックネームを補完): "
-"speakers = すべてのニックネーム (ハイライトされたニックネームを含む)、"
-"speakers_highlights = ハイライトされたニックネームのみ"
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6265,22 +6187,6 @@ msgstr ""
 "ユーザが戻ったら、プライベートウィンドウにメッセージを表示 (サーバとの切断を"
 "挟んで)"
 
-msgid "display server away message in away bar item"
-msgstr "サーバの離席メッセージを離席バーアイテムに表示"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"チャンネルモードに含まれるチャンネルキーを隠す (チャンネルにモード +k が設定"
-"されていた場合、全てのチャンネルモード引数を隠す)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "\"input_prompt\" バーアイテムではニックネームモードを表示"
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "\"input_prompt\" バーアイテムではニックネームプレフィックスを表示"
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6336,9 +6242,25 @@ msgstr ""
 "ハイライトされるメッセージにつけられたタグのコンマ区切りリスト (通例、他の"
 "ユーザからの任意のメッセージ、サーバメッセージをのぞく、...)"
 
+msgid "display server away message in away bar item"
+msgstr "サーバの離席メッセージを離席バーアイテムに表示"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"チャンネルモードに含まれるチャンネルキーを隠す (チャンネルにモード +k が設定"
+"されていた場合、全てのチャンネルモード引数を隠す)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr "IRC サーバが表示されるバーアイテムの名前 (ステータスバー用)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "\"input_prompt\" バーアイテムではニックネームモードを表示"
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "\"input_prompt\" バーアイテムではニックネームプレフィックスを表示"
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6347,6 +6269,24 @@ msgstr ""
 "オプション用のデフォルトのターゲットバッファ"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"バッファリスト内で新しいチャンネルの位置を固定 (none = デフォルトの位置 (一番"
+"後ろのバッファ)、next = 現在のバッファ番号 + 1、near_server = サーバの一番後"
+"ろのチャンネル/プライベートバッファ)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"バッファリスト内で新しいプライベートバッファの位置を固定 (none = デフォルトの"
+"位置 (一番後ろのバッファ)、next = 現在のバッファ番号 + 1、near_server = サー"
+"バの一番後ろのチャンネル/プライベートバッファ)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
@@ -6356,6 +6296,60 @@ msgstr ""
 "ワードを隠すために使います、例: \"nickserv,nickbot\""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"一部のニックネームでニックネーム色を強制する: ニックネームから計算されるハッ"
+"シュを元にした色を利用しない (フォーマット: \"nick1:color1;nick2:color2\"); "
+"ニックネームの検索はまず大文字小文字が区別された状態で行われ、そのあとに小文"
+"字で行われます。このため、このオプションのニックネーム部分を小文字だけで書く"
+"事もできます"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"ニックネーム内の色計算に使用する部分を制限する文字 (このリストに含まれない文"
+"字が、このリストの文字の前に少なくとも一つ以上含まれなければいけない) (例: "
+"\"|\" を設定した場合、\"|nick|away\" はニックネーム \"|nick\" と同じ色になる)"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+"ニックネームのスマート補完 (発言日時の新しいものから順にニックネームを補完): "
+"speakers = すべてのニックネーム (ハイライトされたニックネームを含む)、"
+"speakers_highlights = ハイライトされたニックネームのみ"
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+"ニックネームの前にニックネームモード (オペレータ、voice 権) を表示する (none "
+"= 表示しない、prefix = プレフィックスだけに表示 (デフォルト)、action = アク"
+"ションメッセージだけに表示、both = プレフィックスとアクションメッセージの両方"
+"に表示)"
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+"ニックネームモードが有効でニックネームモードを持っていない (オペレータでな"
+"い、voice 権がない) 場合にはこれを空白で表示する"
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 "notice をプライベートメッセージとして表示 (auto の場合、プライベートバッファ"
@@ -6382,6 +6376,9 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "/part を実行した場合にバッファを閉じる"
 
+msgid "merge private buffers"
+msgstr "プライベートバッファをマージ"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6389,6 +6386,9 @@ msgstr ""
 "生データバッファが閉じられた時にメモリに保存する生メッセージの数 (生データ"
 "バッファを開いたときに表示されるメッセージ)"
 
+msgid "merge server buffers"
+msgstr "サーババッファをマージ"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6417,19 +6417,38 @@ msgstr ""
 "ニックネームを変更したら、参加メッセージのマスクが外れます (0 = 無効: 参加"
 "メッセージは必ずマスクされます)"
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr "\"part\" と \"quit\" メッセージのスマートフィルタを有効化"
-
 #. TRANSLATORS: please do not translate "nick"
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr ""
 "\"nick\" メッセージに対するスマートフィルタを有効化 (ニックネームの変更通知)"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr "\"part\" と \"quit\" メッセージのスマートフィルタを有効化"
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 "トピックにつけられた色を無効化 (バッファタイルに表示される場合のみ利用)"
 
+msgid "color for nick in input bar"
+msgstr "インプットバーのニックネームに使う色"
+
+msgid "color for away item"
+msgstr "離席アイテムに使う色"
+
+msgid "color for channel modes, near channel name"
+msgstr "チャンネル名付近のチャンネルモードに使う色"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"カウント中の遅延インジケータの色 (pong がサーバから返らない場合、遅延は増加す"
+"る)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr "pong がサーバから返った場合の、遅延インジケータの色"
+
 msgid "color for text in join messages"
 msgstr "参加メッセージの色"
 
@@ -6470,34 +6489,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "notices に含まれるテキスト \"Notice\" の色"
 
-msgid "color for nick in input bar"
-msgstr "インプットバーのニックネームに使う色"
-
-msgid "color for away item"
-msgstr "離席アイテムに使う色"
-
-msgid "color for channel modes, near channel name"
-msgstr "チャンネル名付近のチャンネルモードに使う色"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"カウント中の遅延インジケータの色 (pong がサーバから返らない場合、遅延は増加す"
-"る)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr "pong がサーバから返った場合の、遅延インジケータの色"
-
 msgid "color for reason in part/quit messages"
 msgstr "退出/終了メッセージに含まれる理由の色"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "古いチャンネルトピックの色 (トピックが変更されたとき)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "新しいチャンネルトピックの色 (トピックが変更されたとき)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "古いチャンネルトピックの色 (トピックが変更されたとき)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7547,12 +7547,12 @@ msgid ""
 msgstr ""
 "新規バッファの作成時にログファイルから表示する行の最大数 (0 = バックログ無し)"
 
-msgid "color for backlog lines"
-msgstr "バックログ行の色"
-
 msgid "color for line ending the backlog"
 msgstr "バックログの最終行の色"
 
+msgid "color for backlog lines"
+msgstr "バックログ行の色"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7566,16 +7566,8 @@ msgstr ""
 "ログファイルをフラッシュする間隔の秒数 (0 = 行が表示されたらすぐにログファイ"
 "ルに書き込み)"
 
-msgid "use only lower case for log filenames"
-msgstr "ログファイル名に小文字だけを使う"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
-msgstr ""
-"WeeChat ログファイルのパス; 文字列最初の \"%h\" は WeeChat ホーム (デフォルト"
-"では \"~/.weechat\") に置換; 日付指定子を使える (strftime の man を参照)"
+msgid "write information line in log file when log starts or ends for a buffer"
+msgstr "バッファのログ保存の開始時と終了時にログファイルへ情報行を書き込む"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7588,6 +7580,23 @@ msgstr ""
 "完全なパスを作るために使われる); ローカルバッファ変数が使える; 日付指定子を使"
 "える (strftime の man を参照)"
 
+msgid "use only lower case for log filenames"
+msgstr "ログファイル名に小文字だけを使う"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr "ニックネームの前に書くテキスト (メッセージプレフィックス)、例: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr "ニックネームの後に書くテキスト (メッセージプレフィックス)、例: \">\""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"WeeChat ログファイルのパス; 文字列最初の \"%h\" は WeeChat ホーム (デフォルト"
+"では \"~/.weechat\") に置換; 日付指定子を使える (strftime の man を参照)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7595,19 +7604,10 @@ msgstr ""
 "マスクと一緒に使われたときのファイル名に含まれる特殊文字に対応する置換文字 "
 "(ディレクトリ区切りのようなもの)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr "バッファのログ保存の開始時と終了時にログファイルへ情報行を書き込む"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "ログファイルで使用するタイムスタンプ (日付/時間指定子は strftime の man 参照)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr "ニックネームの前に書くテキスト (メッセージプレフィックス)、例: \"<\""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr "ニックネームの後に書くテキスト (メッセージプレフィックス)、例: \">\""
-
 msgid "list of logger buffers"
 msgstr "logger バッファのリスト"
 
@@ -8231,15 +8231,6 @@ msgstr "新しいクライアントが接続したらリレーバッファを自
 msgid "text color for client description"
 msgstr "クライアント説明用のテキスト色"
 
-msgid "text color in relay buffer"
-msgstr "リレーバッファ内のテキスト色"
-
-msgid "background color in relay buffer"
-msgstr "リレーバッファ内の背景色"
-
-msgid "text color of selected line in relay buffer"
-msgstr "リレーバッファ内の選択行のテキスト色"
-
 msgid "text color for \"connecting\" status"
 msgstr "\"接続中\" 状態のテキスト色"
 
@@ -8255,6 +8246,15 @@ msgstr "\"認証失敗\" 状態のテキスト色"
 msgid "text color for \"disconnected\" status"
 msgstr "\"接続切断\" 状態のテキスト色"
 
+msgid "text color in relay buffer"
+msgstr "リレーバッファ内のテキスト色"
+
+msgid "background color in relay buffer"
+msgstr "リレーバッファ内の背景色"
+
+msgid "text color of selected line in relay buffer"
+msgstr "リレーバッファ内の選択行のテキスト色"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8312,9 +8312,6 @@ msgstr ""
 "い、\"(?-i)\" を先頭に置くと大文字小文字を区別する)、例: \"^http://(www\\.)?"
 "example\\.(com|org)\""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr "IRC チャンネルごとのバックログの最大行数 (0 = 制限無し)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8323,6 +8320,9 @@ msgstr ""
 "IRC チャンネルごとのバックログの最大時間 (分) (0 = 制限無し、例: 1440 = 1 "
 "日、10080 = 1 週間、43200 = 1 ヶ月、525600 = 1 年間)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr "IRC チャンネルごとのバックログの最大行数 (0 = 制限無し)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr "最後にクライアントを切断した以降のバックログを表示"
 
@@ -9205,83 +9205,83 @@ msgstr ""
 "使ってください (alt+i = インストール、alt+r = 削除、...); これができない場"
 "合、単一のキーを試してください: i、r、..."
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "\"人気\" 状態 (\"*\") に対応する色"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr "\"インストール済み\" 状態 (\"i\") に対応する色"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "\"自動ロード\" 状態 (\"a\") に対応する色"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "\"ホールド\" 状態 (\"H\") に対応する色"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "\"実行中\" 状態 (\"r\") に対応する色"
+msgid "color for status \"installed\" (\"i\")"
+msgstr "\"インストール済み\" 状態 (\"i\") に対応する色"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "\"アップデートが必要\" 状態 (\"N\") に対応する色"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "\"人気\" 状態 (\"*\") に対応する色"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "\"実行中\" 状態 (\"r\") に対応する色"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "\"未定義\" 状態 (\"?\") に対応する色"
 
 msgid "text color in script buffer"
 msgstr "スクリプトバッファのテキスト色"
 
+msgid "background color in script buffer"
+msgstr "スクリプトバッファ内の背景色"
+
+msgid "background color for selected line in script buffer"
+msgstr "スクリプトバッファ内の選択行の背景色"
+
 msgid "text color of dates in script buffer"
 msgstr "スクリプトバッファ内の日付のテキスト色"
 
+msgid "text color of dates for selected line in script buffer"
+msgstr "スクリプトバッファ内の日付が選択された場合のテキスト色"
+
 msgid "text color of delimiters in script buffer"
 msgstr "スクリプトバッファ内の区切り文字のテキスト色"
 
 msgid "text color of description in script buffer"
 msgstr "スクリプトバッファ内の説明のテキスト色"
 
+msgid "text color of description for selected line in script buffer"
+msgstr "スクリプトバッファ内の説明が選択された場合のテキスト色"
+
 msgid "text color of extension in script buffer"
 msgstr "スクリプトバッファ内の拡張子のテキスト色"
 
+msgid "text color of extension for selected line in script buffer"
+msgstr "スクリプトバッファ内の拡張子が選択された場合のテキスト色"
+
 msgid "text color of script name in script buffer"
 msgstr "スクリプトバッファ内のスクリプト名のテキスト色"
 
-msgid "text color of tags in script buffer"
-msgstr "スクリプトバッファ内のタグのテキスト色"
-
-msgid "text color of version in script buffer"
-msgstr "スクリプトバッファ内のバージョンのテキスト色"
-
-msgid "text color of version loaded in script buffer"
-msgstr "スクリプトバッファ内のロード済みバージョンのテキスト色"
-
-msgid "background color in script buffer"
-msgstr "スクリプトバッファ内の背景色"
+msgid "text color of script name for selected line in script buffer"
+msgstr "スクリプトバッファ内のスクリプト名が選択された場合のテキスト色"
 
 msgid "text color for selected line in script buffer"
 msgstr "スクリプトバッファ内の選択行のテキスト色"
 
-msgid "text color of dates for selected line in script buffer"
-msgstr "スクリプトバッファ内の日付が選択された場合のテキスト色"
-
-msgid "text color of description for selected line in script buffer"
-msgstr "スクリプトバッファ内の説明が選択された場合のテキスト色"
-
-msgid "text color of extension for selected line in script buffer"
-msgstr "スクリプトバッファ内の拡張子が選択された場合のテキスト色"
-
-msgid "text color of script name for selected line in script buffer"
-msgstr "スクリプトバッファ内のスクリプト名が選択された場合のテキスト色"
+msgid "text color of tags in script buffer"
+msgstr "スクリプトバッファ内のタグのテキスト色"
 
 msgid "text color of tags for selected line in script buffer"
 msgstr "スクリプトバッファ内のタグが選択された場合のテキスト色"
 
-msgid "text color of version for selected line in script buffer"
-msgstr "スクリプトバッファ内のバージョンが選択された場合のテキスト色"
+msgid "text color of version in script buffer"
+msgstr "スクリプトバッファ内のバージョンのテキスト色"
+
+msgid "text color of version loaded in script buffer"
+msgstr "スクリプトバッファ内のロード済みバージョンのテキスト色"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr "スクリプトバッファ内のロード済みバージョンが選択された場合のテキスト色"
 
-msgid "background color for selected line in script buffer"
-msgstr "スクリプトバッファ内の選択行の背景色"
+msgid "text color of version for selected line in script buffer"
+msgstr "スクリプトバッファ内のバージョンが選択された場合のテキスト色"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -9604,15 +9604,6 @@ msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 "プログレスバーのサイズ、文字数単位 (0 の場合、プログレスバーを使わない)"
 
-msgid "text color in xfer buffer"
-msgstr "xfer バッファのテキスト色"
-
-msgid "background color in xfer buffer"
-msgstr "xfer バッファの背景色"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "xfer バッファで選択された行のテキスト色"
-
 msgid "text color for \"waiting\" status"
 msgstr "\"接続待ち\" 状態のテキスト色"
 
@@ -9628,8 +9619,14 @@ msgstr "\"失敗\" 状態のテキスト色"
 msgid "text color for \"aborted\" status"
 msgstr "\"中止\" 状態のテキスト色"
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "xfer 要求のタイムアウト (秒単位)"
+msgid "text color in xfer buffer"
+msgstr "xfer バッファのテキスト色"
+
+msgid "background color in xfer buffer"
+msgstr "xfer バッファの背景色"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "xfer バッファで選択された行のテキスト色"
 
 msgid "block size for sending packets, in bytes"
 msgstr "送信パケットのブロックサイズ、バイト単位"
@@ -9638,6 +9635,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "ファイル送信時に肯定応答を待たない"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"ファイル/チャットの送信に使う IP か DNS アドレス (空の場合、ローカルインター"
+"フェイス IP を使う)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9649,15 +9653,38 @@ msgstr ""
 "えないため、1024 以上のポート番号を使うことを推奨)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
+"speed limit for sending files, in kilo-bytes by second (0 means no limit)"
+msgstr "ファイル送信の速度制限、1 秒あたりのキロバイトで指定 (0 は制限無し)"
+
+msgid "timeout for xfer request (in seconds)"
+msgstr "xfer 要求のタイムアウト (秒単位)"
+
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "チャット要求を自動的に許可 (注意して使用!)"
+
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "ファイルを自動的に受信 (注意して使用!)"
+
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
 msgstr ""
-"ファイル/チャットの送信に使う IP か DNS アドレス (空の場合、ローカルインター"
-"フェイス IP を使う)"
+"ファイルやチャットの受け入れを自動的に許可するニックネームのコンマ区切りリス"
+"ト; フォーマットは \"server.nick\" (サーバを特定する場合) または \"nick\" (す"
+"べてのサーバ); 例: \"freenode.FlashCode,andrew\""
+
+msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
+msgstr ""
+"既に存在する場合、受信ファイルをリネームする (\".1\"、\".2\"、...を追加)"
 
 msgid ""
-"speed limit for sending files, in kilo-bytes by second (0 means no limit)"
-msgstr "ファイル送信の速度制限、1 秒あたりのキロバイトで指定 (0 は制限無し)"
+"automatically resume file transfer if connection with remote host is lost"
+msgstr ""
+"リモートホストとの接続が切れた場合、自動的にファイル転送をリジュームする"
+
+msgid "convert spaces to underscores when sending files"
+msgstr "ファイルの送信時にスペースをアンダースコアに変換"
 
 msgid ""
 "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
@@ -9678,33 +9705,6 @@ msgstr ""
 "ファイルを受信する際にローカルファイル名のプレフィックスとしてリモートニック"
 "ネームを使用"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "ファイルの送信時にスペースをアンダースコアに変換"
-
-msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
-msgstr ""
-"既に存在する場合、受信ファイルをリネームする (\".1\"、\".2\"、...を追加)"
-
-msgid ""
-"automatically resume file transfer if connection with remote host is lost"
-msgstr ""
-"リモートホストとの接続が切れた場合、自動的にファイル転送をリジュームする"
-
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "ファイルを自動的に受信 (注意して使用!)"
-
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "チャット要求を自動的に許可 (注意して使用!)"
-
-msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
-msgstr ""
-"ファイルやチャットの受け入れを自動的に許可するニックネームのコンマ区切りリス"
-"ト; フォーマットは \"server.nick\" (サーバを特定する場合) または \"nick\" (す"
-"べてのサーバ); 例: \"freenode.FlashCode,andrew\""
-
 msgid "list of xfer"
 msgstr "xfer のリスト"
 
diff --git a/po/pl.po b/po/pl.po
index c4c388b02..0b057c55e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 15:37+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3102,13 +3102,6 @@ msgstr "wyświetl poziomy separator pomiędzy oknami"
 msgid "display a vertical separator between windows"
 msgstr "wyświetl pionowy separator pomiędzy oknami"
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-"kolor tła dla separatorów (kiedy podzielone) i separatorów obok pasków (jak "
-"lista nicków)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "kolor '+' przy przewijaniu pasków"
 
@@ -3118,11 +3111,14 @@ msgstr "kolor tekstu czatu"
 msgid "background color for chat"
 msgstr "kolor tła czatu"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-"kolor tekstu dla rozmowy, kiedy okno jest nieaktywne (obecnie nie wybrane "
-"okno)"
+msgid "text color for buffer names"
+msgstr "kolor nazw buforów"
+
+msgid "text color for channel names"
+msgstr "kolor nazw kanałów"
+
+msgid "text color for delimiters"
+msgstr "kolor separatorów"
 
 msgid ""
 "text color for chat when line is inactive (buffer is merged with other "
@@ -3131,56 +3127,11 @@ msgstr ""
 "kolor tekstu dla rozmowy, kiedy linia nie jest aktywna (bufor jest połączony "
 "z innymi i nie został wybrany)"
 
-msgid "text color for time in chat window"
-msgstr "kolor czasu w oknie czatu"
-
-msgid "text color for time delimiters"
-msgstr "kolor separatora czasu"
-
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
-msgstr ""
-"kolor nazwy bufora (przed przedrostkiem, kiedy wiele buforów jest "
-"połączonych)"
-
-msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
-"kolor tekstu dla nazwy nieaktywnego bufora (przed przedrostkiem, kiedy wiele "
-"buforów jest połączonych z tym samym numerem, oraz jeśli bufor nie jest "
-"wybrany)"
-
-msgid "text color for error prefix"
-msgstr "kolor przedrostka błędu"
-
-msgid "text color for network prefix"
-msgstr "kolor przedrostka sieci"
-
-msgid "text color for action prefix"
-msgstr "kolor przedrostka akcji"
-
-msgid "text color for join prefix"
-msgstr "kolor przedrostka wejścia na kanał"
-
-msgid "text color for quit prefix"
-msgstr "kolor przedrostka wyjścia z IRC"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "kolor '+' dla za długich przedrostków"
-
-msgid "text color for suffix (after prefix)"
-msgstr "kolor przyrostka (po przedrostku)"
-
-msgid "text color for buffer names"
-msgstr "kolor nazw buforów"
-
-msgid "text color for server names"
-msgstr "kolor nazw serwerów"
-
-msgid "text color for channel names"
-msgstr "kolor nazw kanałów"
+"kolor tekstu dla rozmowy, kiedy okno jest nieaktywne (obecnie nie wybrane "
+"okno)"
 
 msgid "text color for nicks in chat window"
 msgstr "kolor nicków w oknie rozmowy"
@@ -3198,14 +3149,6 @@ msgstr ""
 "kolor przedrostka nicka (przedrostek to ciąg wyświetlany przed nickiem w "
 "prafiksie)"
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"kolor przyrostka nicka (przyrostek to ciąg wyświetlany za nickiem w "
-"prefiksie)"
-
-msgid "text color for local nick in chat window"
-msgstr "kolor lokalnego nicka w oknie rozmowy"
-
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "kolor dla nieobecnych nicków (nie znajdujących się na liście nicków)"
 
@@ -3218,11 +3161,13 @@ msgstr "kolor tła dla nieobecnych nicków z podświetleniem"
 msgid "text color for other nick in private buffer"
 msgstr "kolor innego nicka w prywatnym buforze"
 
-msgid "text color for hostnames"
-msgstr "kolor nazw hostów"
+msgid "text color for local nick in chat window"
+msgstr "kolor lokalnego nicka w oknie rozmowy"
 
-msgid "text color for delimiters"
-msgstr "kolor separatorów"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"kolor przyrostka nicka (przyrostek to ciąg wyświetlany za nickiem w "
+"prefiksie)"
 
 msgid "text color for highlighted prefix"
 msgstr "kolor przedrostka podświetlenia"
@@ -3230,12 +3175,54 @@ msgstr "kolor przedrostka podświetlenia"
 msgid "background color for highlighted prefix"
 msgstr "kolor tła przedrostka podświetlenia"
 
+msgid "text color for hostnames"
+msgstr "kolor nazw hostów"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"kolor nazwy bufora (przed przedrostkiem, kiedy wiele buforów jest "
+"połączonych)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+"kolor tekstu dla nazwy nieaktywnego bufora (przed przedrostkiem, kiedy wiele "
+"buforów jest połączonych z tym samym numerem, oraz jeśli bufor nie jest "
+"wybrany)"
+
+msgid "text color for error prefix"
+msgstr "kolor przedrostka błędu"
+
+msgid "text color for network prefix"
+msgstr "kolor przedrostka sieci"
+
+msgid "text color for action prefix"
+msgstr "kolor przedrostka akcji"
+
+msgid "text color for join prefix"
+msgstr "kolor przedrostka wejścia na kanał"
+
+msgid "text color for quit prefix"
+msgstr "kolor przedrostka wyjścia z IRC"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "kolor '+' dla za długich przedrostków"
+
+msgid "text color for suffix (after prefix)"
+msgstr "kolor przyrostka (po przedrostku)"
+
 msgid "text color for unread data marker"
 msgstr "kolor znacznika nieprzeczytanych wiadomości"
 
 msgid "background color for unread data marker"
 msgstr "kolor tła znacznika nieprzeczytanych wiadomości"
 
+msgid "text color for server names"
+msgstr "kolor nazw serwerów"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "kolor tekstu dla tagów po wiadomościach (wyświetlanych za pomocą komendy /"
@@ -3247,50 +3234,69 @@ msgstr "kolor znacznika linii, w których znaleziono szukany tekst"
 msgid "background color for marker on lines where text sought is found"
 msgstr "kolor tła znacznika linii, w których znaleziono szukany tekst"
 
+msgid "text color for time in chat window"
+msgstr "kolor czasu w oknie czatu"
+
+msgid "text color for time delimiters"
+msgstr "kolor separatora czasu"
+
 msgid "text color for values"
 msgstr "kolor wyświetlania wartości"
 
-msgid "text color for current buffer number in status bar"
-msgstr "kolor numeru obecnego bufora w pasku statusu"
+msgid "text color for actions in input line"
+msgstr "kolor akcji w wprowadzonej linii"
 
-msgid "text color for current buffer name in status bar"
-msgstr "kolor nazwy obecnego bufora w pasku statusu"
+msgid "text color for unsuccessful text search in input line"
+msgstr "kolor nieudanego wyszukiwania tekstu w wprowadzonej linii"
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
-"kolor nazwy obecnego bufora w pasku statusu, jeśli połączenie jest "
-"szyfrowane np poprzez SSL"
+"kolor tła dla separatorów (kiedy podzielone) i separatorów obok pasków (jak "
+"lista nicków)"
 
-msgid "text color for filter indicator in status bar"
-msgstr "kolor wskaźnika filtru w pasku statusu"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr "kolor tekstu dla licznika podświetleń w hotliście (pasek statusu)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "kolor bufora z nowymi wiadomościami (pasek statusu)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr "kolor tekstu dla licznika wiadomości w hotliście (pasek statusu)"
 
-msgid "text color for buffer with private message (status bar)"
-msgstr "kolor bufora z prywatną wiadomością (pasek statusu)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr ""
+"kolor tekstu dla licznika innych wiadomości w hotliście (pasek statusu)"
+
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr ""
+"kolor tekstu dla licznika prywatnych wiadomości w hotliście (pasek statusu)"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "kolor bufora z podświetleniem (pasek statusu)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "kolor bufora z nowymi wiadomościami (pasek statusu)"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "kolor bufora z nowymi zdarzeniami (nie wiadomościami) (pasek statusu)"
 
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr "kolor tekstu dla licznika wiadomości w hotliście (pasek statusu)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "kolor bufora z prywatną wiadomością (pasek statusu)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr ""
-"kolor tekstu dla licznika prywatnych wiadomości w hotliście (pasek statusu)"
+msgid "text color for filter indicator in status bar"
+msgstr "kolor wskaźnika filtru w pasku statusu"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "kolor tekstu dla licznika podświetleń w hotliście (pasek statusu)"
+msgid "text color for current buffer name in status bar"
+msgstr "kolor nazwy obecnego bufora w pasku statusu"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"kolor tekstu dla licznika innych wiadomości w hotliście (pasek statusu)"
+"kolor nazwy obecnego bufora w pasku statusu, jeśli połączenie jest "
+"szyfrowane np poprzez SSL"
+
+msgid "text color for current buffer number in status bar"
+msgstr "kolor numeru obecnego bufora w pasku statusu"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "kolor bufora z nowymi zdarzeniami (pasek statusu)"
@@ -3298,18 +3304,12 @@ msgstr "kolor bufora z nowymi zdarzeniami (pasek statusu)"
 msgid "text color for time (status bar)"
 msgstr "kolor czasu (pasek statusu)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "kolor nieudanego wyszukiwania tekstu w wprowadzonej linii"
-
-msgid "text color for actions in input line"
-msgstr "kolor akcji w wprowadzonej linii"
+msgid "text color for away nicknames"
+msgstr "kolor nicków ze statusem nieobecności"
 
 msgid "text color for groups in nicklist"
 msgstr "kolor grup na liście nicków"
 
-msgid "text color for away nicknames"
-msgstr "kolor nicków ze statusem nieobecności"
-
 msgid "text color for offline nicknames"
 msgstr "kolor dla nieobecnych nicków"
 
@@ -3364,6 +3364,9 @@ msgstr ""
 "częściowe dopełnienie argumentów komend (zatrzymaj, gdy wiele argumentów "
 "zaczyna się jednakowym przedrostkiem)"
 
+msgid "display count for each partial completion in bar item"
+msgstr "wyświetlaj ilość wszystkich częściowych dopełnień w elemencie paska"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3371,11 +3374,12 @@ msgstr ""
 "częściowe dopełnienie zewnętrznych komend (zatrzymaj, kiedy wiele słów "
 "zaczyna się takimi samymi literami)"
 
-msgid "display count for each partial completion in bar item"
-msgstr "wyświetlaj ilość wszystkich częściowych dopełnień w elemencie paska"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "maksymalna ilość linii w historii każdego bufora (0 = bez ograniczeń)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
+msgstr ""
+"maksymalna ilość komend domyślnie wyświetlanych w listingu historii (0 = bez "
+"ograniczeń)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3384,6 +3388,9 @@ msgstr ""
 "maksymalna ilość minut w historii każdego bufora (0 = bez ograniczeń, "
 "przykłady: 1440 = dzień, 10080 = tydzień, 43200 = miesiąc, 525600 = rok)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "maksymalna ilość linii w historii każdego bufora (0 = bez ograniczeń)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "maksymalna ilość komend użytkownika w historii (0 = bez ograniczeń)"
 
@@ -3391,13 +3398,6 @@ msgid "maximum number of visited buffers to keep in memory"
 msgstr "maksymalna ilość odwiedzonych buforów trzymana w pamięci"
 
 msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"maksymalna ilość komend domyślnie wyświetlanych w listingu historii (0 = bez "
-"ograniczeń)"
-
-msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
 "process)"
 msgstr ""
@@ -6268,83 +6268,6 @@ msgstr ""
 "format czasu używany w odpowiedzi na wiadomość CTCP TIME (zobacz man "
 "strftime dla specyfikatorów daty/czasu)"
 
-msgid "merge server buffers"
-msgstr "połącz bufory serwerów"
-
-msgid "merge private buffers"
-msgstr "połącz bufory prywatne"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"wymusza pozycję nowych kanałów na liście buforów (none = domyślna pozycja "
-"(powinien być to ostatni bufor), next = obecny bufor + 1, near_server = po "
-"ostatnim kanale/pv serwera)"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"wymusza pozycję nowych prywatnych wiadomości na liście buforów (none = "
-"domyślna pozycja (powinien być to ostatni bufor), next = obecny bufor + 1, "
-"near_server = po ostatnim kanale/pv serwera)"
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-"wyświetlaj atrybuty nicku (op, voice, ...) przed nickiem (none = nigdy, "
-"prefix = tylko prefiks (domyślnie), action = w wiadomości akcji, both = "
-"prefiks + wiadomość akcji)"
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-"wyświetl spację jeśli wyświetlanie atrybutów dla nicków jest włączone, ale "
-"nick nie ma atrybutu (brak opa, voice, ...)"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"wymusza kolory dla niektórych nicków: hash połączony z nickiem w celu "
-"znalezienia koloru nie zostanie użyty dla tych nicków (format: \"nick1:"
-"kolor1;nick2:kolor2\"); wyszukiwanie nicków odbywa się na zasadzie "
-"dopasowania porównania dokładnego, następnie z małych liter, jest więc "
-"możliwe używanie tylko małych liter w tej opcji"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"znaki używane do zatrzymania odczytywania koloru nicka (przynajmniej jeden "
-"znak poza tą listą musi się znajdować przed zatrzymaniem) (przykład: nick \"|"
-"nick|away\" ze znakami \"|\" zwróci kolor nicka \"|nick\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-"inteligentne dopełnianie nicków (dopełnia najpierw ostatnimi rozmówcami): "
-"speakers = wszyscy rozmówcy (włączając podświetlenia), speakers_highlights = "
-"tylko rozmówcy z podświetleniem"
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -6389,22 +6312,6 @@ msgstr ""
 msgid "display a message in private when user is back (after quit on server)"
 msgstr "pokaż prywatną wiadomość, kiedy użytkownik wróci na serwer"
 
-msgid "display server away message in away bar item"
-msgstr "wyświetla wiadomość o nieobecności dla serwera w elemencie paska"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-"ukrywa klucz kanału w trybach kanału (ukryje to wszystkie atrybuty kanału "
-"jeśli na kanale ustawione jest +k)"
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr "wyświetl przedrostek nicka w elemencie paska \"input_prompt\""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -6464,9 +6371,25 @@ msgstr ""
 "podświetlenie (zazwyczaj dowolna wiadomość od innego użytkownika,  nie "
 "wiadomość od serwera...)"
 
+msgid "display server away message in away bar item"
+msgstr "wyświetla wiadomość o nieobecności dla serwera w elemencie paska"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+"ukrywa klucz kanału w trybach kanału (ukryje to wszystkie atrybuty kanału "
+"jeśli na kanale ustawione jest +k)"
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr "nazwa paska, w którym wyświetlany jest serwer IRC (dla paska stanu)"
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr "wyświetl atrybuty nicka w elemencie paska \"input_prompt\""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr "wyświetl przedrostek nicka w elemencie paska \"input_prompt\""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
@@ -6475,6 +6398,24 @@ msgstr ""
 "odnaleziono tego prywatnego bufora"
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"wymusza pozycję nowych kanałów na liście buforów (none = domyślna pozycja "
+"(powinien być to ostatni bufor), next = obecny bufor + 1, near_server = po "
+"ostatnim kanale/pv serwera)"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"wymusza pozycję nowych prywatnych wiadomości na liście buforów (none = "
+"domyślna pozycja (powinien być to ostatni bufor), next = obecny bufor + 1, "
+"near_server = po ostatnim kanale/pv serwera)"
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
@@ -6485,6 +6426,59 @@ msgstr ""
 "nickbot\""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"wymusza kolory dla niektórych nicków: hash połączony z nickiem w celu "
+"znalezienia koloru nie zostanie użyty dla tych nicków (format: \"nick1:"
+"kolor1;nick2:kolor2\"); wyszukiwanie nicków odbywa się na zasadzie "
+"dopasowania porównania dokładnego, następnie z małych liter, jest więc "
+"możliwe używanie tylko małych liter w tej opcji"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"znaki używane do zatrzymania odczytywania koloru nicka (przynajmniej jeden "
+"znak poza tą listą musi się znajdować przed zatrzymaniem) (przykład: nick \"|"
+"nick|away\" ze znakami \"|\" zwróci kolor nicka \"|nick\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+"inteligentne dopełnianie nicków (dopełnia najpierw ostatnimi rozmówcami): "
+"speakers = wszyscy rozmówcy (włączając podświetlenia), speakers_highlights = "
+"tylko rozmówcy z podświetleniem"
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+"wyświetlaj atrybuty nicku (op, voice, ...) przed nickiem (none = nigdy, "
+"prefix = tylko prefiks (domyślnie), action = w wiadomości akcji, both = "
+"prefiks + wiadomość akcji)"
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+"wyświetl spację jeśli wyświetlanie atrybutów dla nicków jest włączone, ale "
+"nick nie ma atrybutu (brak opa, voice, ...)"
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 "wyświetlaj powiadomienia jako prywatne wiadomości (jeśli auto, używa "
@@ -6513,6 +6507,9 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "zamyka bufor, kiedy na kanale wykonamy /part"
 
+msgid "merge private buffers"
+msgstr "połącz bufory prywatne"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
@@ -6521,6 +6518,9 @@ msgstr ""
 "jest bufor nieprzetworzonych danych (wiadomości zostaną wyświetlone po "
 "otworzeniu dla nich bufora)"
 
+msgid "merge server buffers"
+msgstr "połącz bufory serwerów"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -6551,17 +6551,36 @@ msgstr ""
 "podobnie jak zmiany nicków po jego wejściu (0 = wyłączone: nigdy nie "
 "odmaskowuj)"
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr "włącza inteligentne filtrowanie dla wiadomości \"part\" oraz \"quit\""
-
 #. TRANSLATORS: please do not translate "nick"
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr "włącza mądre filtrowanie dla wiadomości \"nick\" (zmiana nicka)"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr "włącza inteligentne filtrowanie dla wiadomości \"part\" oraz \"quit\""
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr "usuń kolory w tematach (używane przy wyświetlaniu tytułu bufora)"
 
+msgid "color for nick in input bar"
+msgstr "kolor nicka w pasku danych wejściowych"
+
+msgid "color for away item"
+msgstr "kolor elementu nieobecności"
+
+msgid "color for channel modes, near channel name"
+msgstr "kolor trybów kanału, przy nazwie kanału"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+"kolor wskaźnika opóźnienia, podczas naliczania (pong nie otrzymany od "
+"serwera, lag rośnie)"
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr "kolor wskaźnika opóźnienia, kiedy otrzymamy pong od serwera"
+
 msgid "color for text in join messages"
 msgstr "kolor tekstu w wiadomościach o wejściu na kanał"
 
@@ -6603,34 +6622,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr "kolor tekstu \"Notice\" w podświetleniach"
 
-msgid "color for nick in input bar"
-msgstr "kolor nicka w pasku danych wejściowych"
-
-msgid "color for away item"
-msgstr "kolor elementu nieobecności"
-
-msgid "color for channel modes, near channel name"
-msgstr "kolor trybów kanału, przy nazwie kanału"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-"kolor wskaźnika opóźnienia, podczas naliczania (pong nie otrzymany od "
-"serwera, lag rośnie)"
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr "kolor wskaźnika opóźnienia, kiedy otrzymamy pong od serwera"
-
 msgid "color for reason in part/quit messages"
 msgstr "kolor tekstu powodu opuszczenia kanału/wyjścia z IRC"
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "kolor starego tematu kanału (kiedy temat został zmieniony)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "kolor nowego tematu kanału (kiedy temat został zmieniony)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "kolor starego tematu kanału (kiedy temat został zmieniony)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7692,12 +7692,12 @@ msgstr ""
 "maksymalna ilość linii wyświetlana z logu podczas tworzenia nowego bufora (0 "
 "= bez historii)"
 
-msgid "color for backlog lines"
-msgstr "kolor linii backloga"
-
 msgid "color for line ending the backlog"
 msgstr "kolor linii kończącej backloga"
 
+msgid "color for backlog lines"
+msgstr "kolor linii backloga"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7711,17 +7711,10 @@ msgstr ""
 "ilość sekund pomiędzy zapisywaniem plików z logami (0 = zapisuj pliki "
 "natychmiast po pojawieniu sie każdej nowej linii)"
 
-msgid "use only lower case for log filenames"
-msgstr "używaj tylko małych liter dla nazw plików z logami"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"ścieżka do plików z logami WeeChat; \"%h\" na początku ciągu zostanie "
-"zastąpione przez katalog domowy WeeChat (domyślnie \"~/.weechat\"); "
-"określenia dla daty są dozwolone (zobacz man  strftime)"
+"zapisuje informacje w pliku z logami o rozpoczęciu i zakończeniu logowania "
+"buforu"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7734,6 +7727,25 @@ msgstr ""
 "stworzenia kompletnej ścieżki do pliku); lokalne zmienne buforów dozwolone; "
 "określenia dla daty są dozwolone (zobacz man  strftime)"
 
+msgid "use only lower case for log filenames"
+msgstr "używaj tylko małych liter dla nazw plików z logami"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+"tekst wyświetlany przed nickiem w przedrostku wiadomości, przykład: \"<\""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr "tekst wyświetlany za nickiem w przedrostku wiadomości, przykład: \">\""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"ścieżka do plików z logami WeeChat; \"%h\" na początku ciągu zostanie "
+"zastąpione przez katalog domowy WeeChat (domyślnie \"~/.weechat\"); "
+"określenia dla daty są dozwolone (zobacz man  strftime)"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7741,23 +7753,11 @@ msgstr ""
 "znak zastępczy dla znaków specjalnych w plikach stworzonych przy użyciu "
 "maski (jak separator katalogów)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"zapisuje informacje w pliku z logami o rozpoczęciu i zakończeniu logowania "
-"buforu"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "format czasu użyty w plikach z logami (zobacz man strftime dla "
 "specyfikatorów daty/czasu)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-"tekst wyświetlany przed nickiem w przedrostku wiadomości, przykład: \"<\""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr "tekst wyświetlany za nickiem w przedrostku wiadomości, przykład: \">\""
-
 msgid "list of logger buffers"
 msgstr "lista logowanych buforów"
 
@@ -8381,15 +8381,6 @@ msgstr "automatycznie otwiera bufor kiedy podłącza się nowy klient"
 msgid "text color for client description"
 msgstr "kolor tekstu dla opisu klienta"
 
-msgid "text color in relay buffer"
-msgstr "kolor tekstu w buforze pośrednika"
-
-msgid "background color in relay buffer"
-msgstr "kolor tła w buforze pośrednika"
-
-msgid "text color of selected line in relay buffer"
-msgstr "kolor tekstu zaznaczonej linii w buforze pośrednika"
-
 msgid "text color for \"connecting\" status"
 msgstr "kolor statusu \"connecting\""
 
@@ -8405,6 +8396,15 @@ msgstr "kolor statusu \"authentication failed\""
 msgid "text color for \"disconnected\" status"
 msgstr "kolor statusu \"disconnected\""
 
+msgid "text color in relay buffer"
+msgstr "kolor tekstu w buforze pośrednika"
+
+msgid "background color in relay buffer"
+msgstr "kolor tła w buforze pośrednika"
+
+msgid "text color of selected line in relay buffer"
+msgstr "kolor tekstu zaznaczonej linii w buforze pośrednika"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -8467,11 +8467,6 @@ msgstr ""
 "wielość znaków będzie miała znaczenie), przykład: \"^http://(www\\.)?przykład"
 "\\.(com|org)\""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-"maksymalna ilość linii w historii każdego bufora dla kanału IRC (0 = bez "
-"ograniczeń)"
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -8481,6 +8476,11 @@ msgstr ""
 "ograniczeń, przykłady: 1440 = dzień, 10080 = tydzień, 43200 = miesiąc, "
 "525600 = rok)"
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+"maksymalna ilość linii w historii każdego bufora dla kanału IRC (0 = bez "
+"ograniczeń)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr "wyświetlaj backlog zaczynając od ostatniego rozłączenia klienta"
 
@@ -9362,84 +9362,84 @@ msgstr ""
 "zainstaluj, alt+r = usuń, ...); jeśli wyłączone dozwolone jest tylko "
 "wprowadzanie: i, r, ..."
 
-msgid "color for status \"popular\" (\"*\")"
-msgstr "kolor dla statusu \"popularny\" (\"*\")"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr "kolor dla statusu \"zainstalowany\" (\"i\")"
-
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "kolor dla statusu \"automatycznie ładowany\" (\"a\")"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr "kolor dla statusu  \"wstrzymany\" (\"H\")"
 
-msgid "color for status \"running\" (\"r\")"
-msgstr "kolor dla statusu  \"uruchomiony\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
+msgstr "kolor dla statusu \"zainstalowany\" (\"i\")"
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr "kolor dla statusu  \"przestarzały\" (\"N\")"
 
+msgid "color for status \"popular\" (\"*\")"
+msgstr "kolor dla statusu \"popularny\" (\"*\")"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr "kolor dla statusu  \"uruchomiony\" (\"r\")"
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr "kolor dla statusu  \"nieznany\" (\"?\")"
 
 msgid "text color in script buffer"
 msgstr "kolor tekstu w buforze skryptów"
 
+msgid "background color in script buffer"
+msgstr "kolor tła w buforze skryptów"
+
+msgid "background color for selected line in script buffer"
+msgstr "kolor tła dla zaznaczonej linii w buforze skryptów"
+
 msgid "text color of dates in script buffer"
 msgstr "kolor dat w buforze skryptów"
 
+msgid "text color of dates for selected line in script buffer"
+msgstr "kolor daty w zaznaczonej linii w buforze skryptów"
+
 msgid "text color of delimiters in script buffer"
 msgstr "kolor ograniczników w buforze skryptów"
 
 msgid "text color of description in script buffer"
 msgstr "kolor opisu w buforze skryptów"
 
+msgid "text color of description for selected line in script buffer"
+msgstr "kolor opisu w zaznaczonej linii w buforze skryptów"
+
 msgid "text color of extension in script buffer"
 msgstr "kolor rozszerzenia w buforze skryptów"
 
+msgid "text color of extension for selected line in script buffer"
+msgstr "kolor rozszerzenia w zaznaczonej linii w buforze skryptów"
+
 msgid "text color of script name in script buffer"
 msgstr "kolor nazwy skryptu w buforze skryptów"
 
-msgid "text color of tags in script buffer"
-msgstr "kolor tagów w buforze skryptów"
-
-msgid "text color of version in script buffer"
-msgstr "kolor wersji w buforze skryptów"
-
-msgid "text color of version loaded in script buffer"
-msgstr "kolor wersji załadowanego skryptu w buforze skryptów"
-
-msgid "background color in script buffer"
-msgstr "kolor tła w buforze skryptów"
+msgid "text color of script name for selected line in script buffer"
+msgstr "kolor nazwy skryptu w zaznaczonej linii w buforze skryptów"
 
 msgid "text color for selected line in script buffer"
 msgstr "kolor tekstu w zaznaczonej linii w buforze skryptów"
 
-msgid "text color of dates for selected line in script buffer"
-msgstr "kolor daty w zaznaczonej linii w buforze skryptów"
-
-msgid "text color of description for selected line in script buffer"
-msgstr "kolor opisu w zaznaczonej linii w buforze skryptów"
-
-msgid "text color of extension for selected line in script buffer"
-msgstr "kolor rozszerzenia w zaznaczonej linii w buforze skryptów"
-
-msgid "text color of script name for selected line in script buffer"
-msgstr "kolor nazwy skryptu w zaznaczonej linii w buforze skryptów"
+msgid "text color of tags in script buffer"
+msgstr "kolor tagów w buforze skryptów"
 
 msgid "text color of tags for selected line in script buffer"
 msgstr "kolor tagów w zaznaczonej linii w buforze skryptów"
 
-msgid "text color of version for selected line in script buffer"
-msgstr "kolor wersji w zaznaczonej linii w buforze skryptów"
+msgid "text color of version in script buffer"
+msgstr "kolor wersji w buforze skryptów"
+
+msgid "text color of version loaded in script buffer"
+msgstr "kolor wersji załadowanego skryptu w buforze skryptów"
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 "kolor załadowanej wersji skryptu w zaznaczonej linii w buforze skryptów"
 
-msgid "background color for selected line in script buffer"
-msgstr "kolor tła dla zaznaczonej linii w buforze skryptów"
+msgid "text color of version for selected line in script buffer"
+msgstr "kolor wersji w zaznaczonej linii w buforze skryptów"
 
 msgid ""
 "autoload scripts installed (make a link in \"autoload\" directory to script "
@@ -9760,15 +9760,6 @@ msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 "rozmiar paska postępu, w znakach (jeśli 0 pasek postępu zostanie wyłączony)"
 
-msgid "text color in xfer buffer"
-msgstr "kolor tekstu w buforze xfer"
-
-msgid "background color in xfer buffer"
-msgstr "kolor tła w buforze xfer"
-
-msgid "text color of selected line in xfer buffer"
-msgstr "kolor tekstu zaznaczonej linii w buforze xfer"
-
 msgid "text color for \"waiting\" status"
 msgstr "kolor statusu \"waiting\""
 
@@ -9784,8 +9775,14 @@ msgstr "kolor statusu \"failed\""
 msgid "text color for \"aborted\" status"
 msgstr "kolor statusu \"aborted\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "czas oczekiwania na żądanie xfer (w sekundach)"
+msgid "text color in xfer buffer"
+msgstr "kolor tekstu w buforze xfer"
+
+msgid "background color in xfer buffer"
+msgstr "kolor tła w buforze xfer"
+
+msgid "text color of selected line in xfer buffer"
+msgstr "kolor tekstu zaznaczonej linii w buforze xfer"
 
 msgid "block size for sending packets, in bytes"
 msgstr "rozmiar bloku dla wysyłanych pakietów, w bajtach"
@@ -9794,6 +9791,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "nie czeka na potwierdzenie podczas wysyłania pliku"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"adres IP lub DNS użyty do wysłania pliku/rozmowy (jeśli pusty zostanie użyty "
+"adres IP lokalnego interfejsu)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -9806,38 +9810,29 @@ msgstr ""
 "przez roota)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"adres IP lub DNS użyty do wysłania pliku/rozmowy (jeśli pusty zostanie użyty "
-"adres IP lokalnego interfejsu)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "limit prędkości wysyłania plików, w kilobajtach na sekundę (0 oznacza brak "
 "limitu)"
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"ścieżka do zapisywania pobieranych plików (\"%h\" zostanie zastąpione "
-"katalogiem domowym WeeChat - domyślnie \"~/.weechat\")"
+msgid "timeout for xfer request (in seconds)"
+msgstr "czas oczekiwania na żądanie xfer (w sekundach)"
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"ścieżka dla odczytu plików podczas wysyłania (jeśli nie zostanie podana "
-"przez użytkownika) (\"%h\" zostanie zastąpione katalogiem domowym WeeChat - "
-"domyślnie \"~/.weechat\")"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "automatycznie akceptuj prośby o rozmowę (ostrożnie!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr "użyj nicku nadawcy jako przedrostka w nazwie odebranego pliku"
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "automatycznie akceptuj pliki przychodzące (ostrożnie!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "zamień spacje na podkreślenia wysyłając plik"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
+"oddzielona przecinkami lista nicków, od których przychodzące pliki i rozmowy "
+"są automatycznie akceptowane; format to \"serwer.nick\" (dla konkretnego "
+"serwera) lub \"nick\" (dla wszystkich serwerów; przykład \"freenode."
+"FlashCode,andrew\""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
 msgstr ""
@@ -9848,21 +9843,26 @@ msgid ""
 "automatically resume file transfer if connection with remote host is lost"
 msgstr "automatycznie wznów przesył po utracie połączenia"
 
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "automatycznie akceptuj pliki przychodzące (ostrożnie!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "zamień spacje na podkreślenia wysyłając plik"
 
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "automatycznie akceptuj prośby o rozmowę (ostrożnie!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"ścieżka do zapisywania pobieranych plików (\"%h\" zostanie zastąpione "
+"katalogiem domowym WeeChat - domyślnie \"~/.weechat\")"
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
 msgstr ""
-"oddzielona przecinkami lista nicków, od których przychodzące pliki i rozmowy "
-"są automatycznie akceptowane; format to \"serwer.nick\" (dla konkretnego "
-"serwera) lub \"nick\" (dla wszystkich serwerów; przykład \"freenode."
-"FlashCode,andrew\""
+"ścieżka dla odczytu plików podczas wysyłania (jeśli nie zostanie podana "
+"przez użytkownika) (\"%h\" zostanie zastąpione katalogiem domowym WeeChat - "
+"domyślnie \"~/.weechat\")"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
+msgstr "użyj nicku nadawcy jako przedrostka w nazwie odebranego pliku"
 
 msgid "list of xfer"
 msgstr "lista xfer"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d2ec4d0bf..80362ec12 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-06-10 09:19+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2932,12 +2932,6 @@ msgstr ""
 msgid "display a vertical separator between windows"
 msgstr ""
 
-#, fuzzy
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr "cor de fundo para separadores de janelas (quando divididas)"
-
 msgid "text color for '+' when scrolling bars"
 msgstr "cor de texto para '+' quando estiver rolando barras"
 
@@ -2947,63 +2941,24 @@ msgstr "cor de texto para conversa"
 msgid "background color for chat"
 msgstr "cor de fundo para conversa"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-
-msgid ""
-"text color for chat when line is inactive (buffer is merged with other "
-"buffers and is not selected)"
-msgstr ""
+msgid "text color for buffer names"
+msgstr "cor do texto para nomes de buffer"
 
-msgid "text color for time in chat window"
-msgstr "cor do texto do tempo em janelas de conversa"
+msgid "text color for channel names"
+msgstr "cor do texto para nomes de canal"
 
-msgid "text color for time delimiters"
-msgstr "cor do texto para delimitadores de tempo"
+msgid "text color for delimiters"
+msgstr "cor de texto para delimitadores"
 
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when line is inactive (buffer is merged with other "
+"buffers and is not selected)"
 msgstr ""
-"cor de texto para nome de buffer (antes do prefixo, quando muitos buffers "
-"são mesclados com o mesmo número)"
 
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
 
-msgid "text color for error prefix"
-msgstr "cor do texto para o prefixo de erro"
-
-msgid "text color for network prefix"
-msgstr "cor do texto para prefixo de rede"
-
-msgid "text color for action prefix"
-msgstr "cor de texto para o prefixo de ação"
-
-msgid "text color for join prefix"
-msgstr "cor de texto para o prefixo de join"
-
-msgid "text color for quit prefix"
-msgstr "cor de texto para o prefixo de saída"
-
-msgid "text color for '+' when prefix is too long"
-msgstr "cor de texto para '+' whando o prefixo é muito longo"
-
-msgid "text color for suffix (after prefix)"
-msgstr "cor do texto para sufixos (depois do prefixo)"
-
-msgid "text color for buffer names"
-msgstr "cor do texto para nomes de buffer"
-
-msgid "text color for server names"
-msgstr "cor do texto para nomes de servidor"
-
-msgid "text color for channel names"
-msgstr "cor do texto para nomes de canal"
-
 msgid "text color for nicks in chat window"
 msgstr "cor do texto para apelidos na janela de conversa"
 
@@ -3022,15 +2977,6 @@ msgstr ""
 "antes de um apelido)"
 
 #, fuzzy
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr ""
-"cor para o sufixo do apelido (o sufixo é uma string customizada exibida "
-"depois de um apelido)"
-
-msgid "text color for local nick in chat window"
-msgstr "cor de texto para apelido local na janela de conversa"
-
-#, fuzzy
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "cor de texto para apelidos desconectados"
 
@@ -3045,11 +2991,14 @@ msgstr "cor de fundo para prefixo de destacado"
 msgid "text color for other nick in private buffer"
 msgstr "cor de texto para outros apelidos em buffers privados"
 
-msgid "text color for hostnames"
-msgstr "cor de texto para hostnames"
+msgid "text color for local nick in chat window"
+msgstr "cor de texto para apelido local na janela de conversa"
 
-msgid "text color for delimiters"
-msgstr "cor de texto para delimitadores"
+#, fuzzy
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr ""
+"cor para o sufixo do apelido (o sufixo é uma string customizada exibida "
+"depois de um apelido)"
 
 msgid "text color for highlighted prefix"
 msgstr "cor de texto para prefixo de destacado"
@@ -3057,12 +3006,51 @@ msgstr "cor de texto para prefixo de destacado"
 msgid "background color for highlighted prefix"
 msgstr "cor de fundo para prefixo de destacado"
 
+msgid "text color for hostnames"
+msgstr "cor de texto para hostnames"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"cor de texto para nome de buffer (antes do prefixo, quando muitos buffers "
+"são mesclados com o mesmo número)"
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+
+msgid "text color for error prefix"
+msgstr "cor do texto para o prefixo de erro"
+
+msgid "text color for network prefix"
+msgstr "cor do texto para prefixo de rede"
+
+msgid "text color for action prefix"
+msgstr "cor de texto para o prefixo de ação"
+
+msgid "text color for join prefix"
+msgstr "cor de texto para o prefixo de join"
+
+msgid "text color for quit prefix"
+msgstr "cor de texto para o prefixo de saída"
+
+msgid "text color for '+' when prefix is too long"
+msgstr "cor de texto para '+' whando o prefixo é muito longo"
+
+msgid "text color for suffix (after prefix)"
+msgstr "cor do texto para sufixos (depois do prefixo)"
+
 msgid "text color for unread data marker"
 msgstr "cor de texto para marcador de dados não lidos"
 
 msgid "background color for unread data marker"
 msgstr "cor de fundo para marcador de dados não lidos"
 
+msgid "text color for server names"
+msgstr "cor do texto para nomes de servidor"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 "cor de texto para marcadores de mensagens (mostrados com o comando /debug "
@@ -3075,56 +3063,74 @@ msgstr ""
 msgid "background color for marker on lines where text sought is found"
 msgstr "background color for marker on lines where text sought is found"
 
+msgid "text color for time in chat window"
+msgstr "cor do texto do tempo em janelas de conversa"
+
+msgid "text color for time delimiters"
+msgstr "cor do texto para delimitadores de tempo"
+
 msgid "text color for values"
 msgstr "cor de texto para valores"
 
-msgid "text color for current buffer number in status bar"
-msgstr "cor de texto para o número do buffer atual na barra de status"
+msgid "text color for actions in input line"
+msgstr "cor de texto para ações de linha de entrada"
 
-msgid "text color for current buffer name in status bar"
-msgstr "cor de texto para o nome do buffer atual na barra de status"
+msgid "text color for unsuccessful text search in input line"
+msgstr "cor de texto para busca mal sucedida na linha de entrada"
 
+#, fuzzy
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
+msgstr "cor de fundo para separadores de janelas (quando divididas)"
+
+msgid "text color for count of highlight messages in hotlist (status bar)"
 msgstr ""
-"cor de texto para o nome do buffer atual na barra de status, se os dados "
-"estão seguros com um protocolo como SSL"
+"cor de texto para contagem de mensagens destacadas na lista de atividade "
+"(barra de status)"
 
-msgid "text color for filter indicator in status bar"
-msgstr "cor de texto para indicador de filtro na barra de status"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr ""
+"cor de texto para contagem de mensagens na lista de ativdade (barra de "
+"status)"
 
-msgid "text color for buffer with new messages (status bar)"
-msgstr "cor de texto apra indicador de filtro na barra de status"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr ""
+"cor de texto para contagem de outras mensagens na lista de atividade (barra "
+"de status)"
 
-msgid "text color for buffer with private message (status bar)"
-msgstr "cor de texto para buffer com mensagens privadas (barra de status)"
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr ""
+"cor de texto para contagem de mensagens privadas na barra de mensagens "
+"(barra de status"
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr "cor de texto para buffer com destaque (barra de status)"
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr "cor de texto apra indicador de filtro na barra de status"
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "cor de texto para buffer com destaque (barra de status)"
 
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr ""
-"cor de texto para contagem de mensagens na lista de ativdade (barra de "
-"status)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "cor de texto para buffer com mensagens privadas (barra de status)"
 
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr ""
-"cor de texto para contagem de mensagens privadas na barra de mensagens "
-"(barra de status"
+msgid "text color for filter indicator in status bar"
+msgstr "cor de texto para indicador de filtro na barra de status"
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr ""
-"cor de texto para contagem de mensagens destacadas na lista de atividade "
-"(barra de status)"
+msgid "text color for current buffer name in status bar"
+msgstr "cor de texto para o nome do buffer atual na barra de status"
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
-"cor de texto para contagem de outras mensagens na lista de atividade (barra "
-"de status)"
+"cor de texto para o nome do buffer atual na barra de status, se os dados "
+"estão seguros com um protocolo como SSL"
+
+msgid "text color for current buffer number in status bar"
+msgstr "cor de texto para o número do buffer atual na barra de status"
 
 msgid "text color for buffer with new data (status bar)"
 msgstr "cor de texto para buffer com novos dados (barra de status)"
@@ -3132,18 +3138,12 @@ msgstr "cor de texto para buffer com novos dados (barra de status)"
 msgid "text color for time (status bar)"
 msgstr "cor de texto para o tempo (barra de status)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr "cor de texto para busca mal sucedida na linha de entrada"
-
-msgid "text color for actions in input line"
-msgstr "cor de texto para ações de linha de entrada"
+msgid "text color for away nicknames"
+msgstr "cor de texto para apelidos ausentes"
 
 msgid "text color for groups in nicklist"
 msgstr "cor de texto para gropos na lista de apelidos"
 
-msgid "text color for away nicknames"
-msgstr "cor de texto para apelidos ausentes"
-
 msgid "text color for offline nicknames"
 msgstr "cor de texto para apelidos desconectados"
 
@@ -3197,6 +3197,9 @@ msgstr ""
 "completa parcialmente argumentos de comandos (para quando são encontrados "
 "muitos argumentos começando com o mesmo prefixo)"
 
+msgid "display count for each partial completion in bar item"
+msgstr "mostra contagem para cada completação parcial em um item de barra"
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
@@ -3204,11 +3207,12 @@ msgstr ""
 "completa parcialmente comandos externos (para quando são encontradas muitas "
 "palavras com as mesmas letras)"
 
-msgid "display count for each partial completion in bar item"
-msgstr "mostra contagem para cada completação parcial em um item de barra"
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "número máximo de linhas no histórico por buffer (0 = ilimitado)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
+msgstr ""
+"número máximo de comandos para mostrar por padrão na listagem de histórico "
+"(0 = ilimitado)"
 
 msgid ""
 "maximum number of minutes in history per buffer (0 = unlimited, examples: "
@@ -3217,19 +3221,15 @@ msgstr ""
 "número máximo de minutos no histórico por buffer (0 = ilimitado, exemplos: "
 "1440 = um dia, 10080 = uma semana, 43200 = um mês, 525600 = um ano)"
 
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "número máximo de linhas no histórico por buffer (0 = ilimitado)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "número máximo de comandos de usuário no histórico (0 = ilimitado)"
 
 msgid "maximum number of visited buffers to keep in memory"
 msgstr "número máximo de buffers visitados a serem mantidos em memória"
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"número máximo de comandos para mostrar por padrão na listagem de histórico "
-"(0 = ilimitado)"
-
 # better not translate handshake
 #, fuzzy
 msgid ""
@@ -5697,74 +5697,6 @@ msgstr ""
 "formato de tempo para o item de barra \"time\" (veja man strftime para "
 "especificadores de data/tempo)"
 
-msgid "merge server buffers"
-msgstr "mesclar buffers de servidores"
-
-#, fuzzy
-msgid "merge private buffers"
-msgstr "mesclar buffers de servidores"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-"forçar posição de novo canal na lista de buffers (none = posição padrão "
-"(deve ser o último buffer), next = buffer atual + 1, near_server = depois do "
-"último canal/privado do servidor"
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr "mostra espaço se o modo do apelido não é (half)op/voice"
-
-#, fuzzy
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-"forçar cor para alguns apelidos: hash computado com apelido para encontar "
-"cor não será utilizado para estes apelidos (formato: \"apelido1:cor1;"
-"apelido2:cor2\")"
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-"caracteres utilizados para parar no apelido quando estiver computando cor "
-"com letras do apelido (no mínimo um caractere fora desta lista deve estar na "
-"string antes de parar) (exemplo: apelido \"|apelido|ausente\" with \"|\" nos "
-"caracteres retornarão cor do apelido \"|apelido\")"
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -5803,20 +5735,6 @@ msgstr ""
 msgid "display a message in private when user is back (after quit on server)"
 msgstr ""
 
-msgid "display server away message in away bar item"
-msgstr ""
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr ""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr ""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -5852,20 +5770,95 @@ msgid ""
 "(usually any message from another user, not server messages,..)"
 msgstr ""
 
+msgid "display server away message in away bar item"
+msgstr ""
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr ""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
 msgstr ""
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+"forçar posição de novo canal na lista de buffers (none = posição padrão "
+"(deve ser o último buffer), next = buffer atual + 1, near_server = depois do "
+"último canal/privado do servidor"
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
+#, fuzzy
+msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+"forçar cor para alguns apelidos: hash computado com apelido para encontar "
+"cor não será utilizado para estes apelidos (formato: \"apelido1:cor1;"
+"apelido2:cor2\")"
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+"caracteres utilizados para parar no apelido quando estiver computando cor "
+"com letras do apelido (no mínimo um caractere fora desta lista deve estar na "
+"string antes de parar) (exemplo: apelido \"|apelido|ausente\" with \"|\" nos "
+"caracteres retornarão cor do apelido \"|apelido\")"
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr "mostra espaço se o modo do apelido não é (half)op/voice"
+
 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
@@ -5885,11 +5878,18 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr "fechar buffer quando o comando /part é executado em um canal"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "mesclar buffers de servidores"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""
 
+msgid "merge server buffers"
+msgstr "mesclar buffers de servidores"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -5910,15 +5910,32 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
+#. TRANSLATORS: please do not translate "nick"
+msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgstr ""
+
 #. TRANSLATORS: please do not translate "part" and "quit"
 msgid "enable smart filter for \"part\" and \"quit\" messages"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "nick"
-msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 
-msgid "strip colors in topic (used only when displaying buffer title)"
+msgid "color for nick in input bar"
+msgstr "cor para o apelido na barra de entrada"
+
+msgid "color for away item"
+msgstr ""
+
+msgid "color for channel modes, near channel name"
+msgstr "cor para os modos de canal, próximo ao nome do canal"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+
+msgid "color for lag indicator, when pong has been received from server"
 msgstr ""
 
 msgid "color for text in join messages"
@@ -5949,32 +5966,15 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr ""
 
-msgid "color for nick in input bar"
-msgstr "cor para o apelido na barra de entrada"
-
-msgid "color for away item"
-msgstr ""
-
-msgid "color for channel modes, near channel name"
-msgstr "cor para os modos de canal, próximo ao nome do canal"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-
 msgid "color for reason in part/quit messages"
 msgstr ""
 
-msgid "color for old channel topic (when topic is changed)"
-msgstr "cor para o tópico antigo do canal (quando o tópico é alterado)"
-
 msgid "color for new channel topic (when topic is changed)"
 msgstr "cor para o novo tópico do canal (quando o tópico é alterado)"
 
+msgid "color for old channel topic (when topic is changed)"
+msgstr "cor para o tópico antigo do canal (quando o tópico é alterado)"
+
 msgid ""
 "get an alternate nick when the nick is already used on server: add some \"_"
 "\" until the nick has a length of 9, and then replace last char (or the two "
@@ -7009,13 +7009,13 @@ msgstr ""
 "novo buffer for criado (0 = sem backlog)"
 
 #, fuzzy
-msgid "color for backlog lines"
-msgstr "cor de texto para valores"
-
-#, fuzzy
 msgid "color for line ending the backlog"
 msgstr "cor para o apelido na barra de entrada"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "cor de texto para valores"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -7029,17 +7029,10 @@ msgstr ""
 "número de segundos entre a gravação dos arquivos de registro (0 = escrever "
 "no arquivo de registro imediatamente para cada linha impressa)"
 
-msgid "use only lower case for log filenames"
-msgstr "usar somente letras minúsculas para nomes de arquivo de registro"
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
-"diretório para arquivos de registro do WeeChat; \"%h\" no início da string "
-"será substituído pelo diretório do WeeChat (\"~/.weechat\" por padrão); "
-"especificadores de data são permitidos (veja \"man strftime\")"
+"escrever linha de informação no arquivo de registro quando o registro "
+"começar ou terminar para um buffer"
 
 msgid ""
 "default file name mask for log files (format is \"directory/to/file\" or "
@@ -7052,6 +7045,24 @@ msgstr ""
 "construir o caminho completo até o arquivo); variáveis de buffer local são "
 "permitidas; especificadores de data são permitidos (veja \"man strftime\")"
 
+msgid "use only lower case for log filenames"
+msgstr "usar somente letras minúsculas para nomes de arquivo de registro"
+
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
+msgstr ""
+"diretório para arquivos de registro do WeeChat; \"%h\" no início da string "
+"será substituído pelo diretório do WeeChat (\"~/.weechat\" por padrão); "
+"especificadores de data são permitidos (veja \"man strftime\")"
+
 msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
@@ -7059,22 +7070,11 @@ msgstr ""
 "caractere de substituição para caracteres especiais em nome de arquivo feito "
 "com máscara (como delimitador de diretório)"
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-"escrever linha de informação no arquivo de registro quando o registro "
-"começar ou terminar para um buffer"
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 "marca de tempo utilizada nos arquivos de registro (veja \"man strftime\" "
 "para especificadores de data/tempo)"
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-
 msgid "list of logger buffers"
 msgstr "lista de buffers de registro"
 
@@ -7656,18 +7656,6 @@ msgstr ""
 msgid "text color for client description"
 msgstr "cor do texto para delimitadores de tempo"
 
-#, fuzzy
-msgid "text color in relay buffer"
-msgstr "cor do texto para nomes de buffer"
-
-#, fuzzy
-msgid "background color in relay buffer"
-msgstr "cor de fundo para marcador de dados não lidos"
-
-#, fuzzy
-msgid "text color of selected line in relay buffer"
-msgstr "cor do texto da linha do cliente selecionada"
-
 msgid "text color for \"connecting\" status"
 msgstr "cor do texto para o status \"conectando\""
 
@@ -7684,6 +7672,18 @@ msgid "text color for \"disconnected\" status"
 msgstr "cor do texto para o status \"desconectado\""
 
 #, fuzzy
+msgid "text color in relay buffer"
+msgstr "cor do texto para nomes de buffer"
+
+#, fuzzy
+msgid "background color in relay buffer"
+msgstr "cor de fundo para marcador de dados não lidos"
+
+#, fuzzy
+msgid "text color of selected line in relay buffer"
+msgstr "cor do texto da linha do cliente selecionada"
+
+#, fuzzy
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -7735,10 +7735,6 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr "número máximo de linhas no histórico por buffer (0 = ilimitado)"
-
-#, fuzzy
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
@@ -7747,6 +7743,10 @@ msgstr ""
 "número máximo de minutos no histórico por buffer (0 = ilimitado, exemplos: "
 "1440 = um dia, 10080 = uma semana, 43200 = um mês, 525600 = um ano)"
 
+#, fuzzy
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr "número máximo de linhas no histórico por buffer (0 = ilimitado)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -8512,25 +8512,25 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "color for status \"popular\" (\"*\")"
-msgstr "cor de texto para o tempo (barra de status)"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr ""
-
-#, fuzzy
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "cor de texto para o tempo (barra de status)"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
+#, fuzzy
+msgid "color for status \"popular\" (\"*\")"
+msgstr "cor de texto para o tempo (barra de status)"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr ""
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr ""
 
@@ -8539,75 +8539,75 @@ msgid "text color in script buffer"
 msgstr "cor do texto para nomes de buffer"
 
 #, fuzzy
-msgid "text color of dates in script buffer"
-msgstr "cor de texto para outros apelidos em buffers privados"
+msgid "background color in script buffer"
+msgstr "cor de fundo para conversa"
 
 #, fuzzy
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of description in script buffer"
-msgstr "cor do texto da linha do cliente selecionada"
+msgid "text color of dates in script buffer"
+msgstr "cor de texto para outros apelidos em buffers privados"
 
 #, fuzzy
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of tags in script buffer"
-msgstr "cor do texto para nomes de buffer"
-
-#, fuzzy
-msgid "text color of version in script buffer"
-msgstr "cor de texto para outros apelidos em buffers privados"
+msgid "text color of description in script buffer"
+msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of version loaded in script buffer"
-msgstr "cor de texto para outros apelidos em buffers privados"
+msgid "text color of description for selected line in script buffer"
+msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "background color in script buffer"
-msgstr "cor de fundo para conversa"
+msgid "text color of extension in script buffer"
+msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color for selected line in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of description for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of extension for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of script name for selected line in script buffer"
-msgstr "cor do texto da linha do cliente selecionada"
+msgid "text color of tags in script buffer"
+msgstr "cor do texto para nomes de buffer"
 
 #, fuzzy
 msgid "text color of tags for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "text color of version for selected line in script buffer"
-msgstr "cor do texto da linha do cliente selecionada"
+msgid "text color of version in script buffer"
+msgstr "cor de texto para outros apelidos em buffers privados"
+
+#, fuzzy
+msgid "text color of version loaded in script buffer"
+msgstr "cor de texto para outros apelidos em buffers privados"
 
 #, fuzzy
 msgid "text color of version loaded for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 #, fuzzy
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr "cor do texto da linha do cliente selecionada"
 
 msgid ""
@@ -8930,18 +8930,6 @@ msgstr ""
 "tamanho da barra de progresso, em carateres (se 0, a barra de progresso é "
 "desabilitada)"
 
-#, fuzzy
-msgid "text color in xfer buffer"
-msgstr "cor do texto para nomes de buffer"
-
-#, fuzzy
-msgid "background color in xfer buffer"
-msgstr "cor de fundo para conversa"
-
-#, fuzzy
-msgid "text color of selected line in xfer buffer"
-msgstr "cor do texto da linha do cliente selecionada"
-
 msgid "text color for \"waiting\" status"
 msgstr "cor do texto para o status \"esperando\""
 
@@ -8957,8 +8945,17 @@ msgstr "cor do texto para o status \"falhou\""
 msgid "text color for \"aborted\" status"
 msgstr "cor do texto para o status \"abortado\""
 
-msgid "timeout for xfer request (in seconds)"
-msgstr "limite de tempo para requisição de transferência (em segundos)"
+#, fuzzy
+msgid "text color in xfer buffer"
+msgstr "cor do texto para nomes de buffer"
+
+#, fuzzy
+msgid "background color in xfer buffer"
+msgstr "cor de fundo para conversa"
+
+#, fuzzy
+msgid "text color of selected line in xfer buffer"
+msgstr "cor do texto da linha do cliente selecionada"
 
 msgid "block size for sending packets, in bytes"
 msgstr "tamanho do bloco de dado para enviar pacotes, em bytes"
@@ -8967,6 +8964,13 @@ msgid "does not wait for ACK when sending file"
 msgstr "não esperar por ACK quando enviar arquivo"
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"Endereço IP ou DNS usado para enviar arquivos/chats (se vazio, interface "
+"local IP é usada)"
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -8979,18 +8983,39 @@ msgstr ""
 "somente o root pode utilizar portas inferiores a 1024)"
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"Endereço IP ou DNS usado para enviar arquivos/chats (se vazio, interface "
-"local IP é usada)"
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 "taxa máxima de transferência para enviar arquivos, em kilo-bytes por segundo "
 "(0 significa ilimitado)"
 
+msgid "timeout for xfer request (in seconds)"
+msgstr "limite de tempo para requisição de transferência (em segundos)"
+
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "aceitar automaticamente requisições de chat (use com cuidado!)"
+
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "aceitar automaticamente arquivos enviados a mim (use com cuidado!)"
+
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
+
+msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
+msgstr ""
+"renomear arquivos recebidos se nome já existir (adiciona \".1\", \".2\", ...)"
+
+msgid ""
+"automatically resume file transfer if connection with remote host is lost"
+msgstr ""
+"Retomar automaticamente a transferência de arquivo se a conexão com o "
+"remetente foi perdida"
+
+msgid "convert spaces to underscores when sending files"
+msgstr "converter espaços para underscores (_) quando enviar arquivos"
+
 msgid ""
 "path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
 "\"~/.weechat\" by default)"
@@ -9011,31 +9036,6 @@ msgstr ""
 "usar apelido do remetente como prefixo em arquivos locais quando receber "
 "arquivo"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "converter espaços para underscores (_) quando enviar arquivos"
-
-msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
-msgstr ""
-"renomear arquivos recebidos se nome já existir (adiciona \".1\", \".2\", ...)"
-
-msgid ""
-"automatically resume file transfer if connection with remote host is lost"
-msgstr ""
-"Retomar automaticamente a transferência de arquivo se a conexão com o "
-"remetente foi perdida"
-
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "aceitar automaticamente arquivos enviados a mim (use com cuidado!)"
-
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "aceitar automaticamente requisições de chat (use com cuidado!)"
-
-msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
-msgstr ""
-
 msgid "list of xfer"
 msgstr "lista de transferência"
 
diff --git a/po/ru.po b/po/ru.po
index 5f64ffee9..d04fa9409 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-07-02 16:02+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2487,12 +2487,6 @@ msgid "display a vertical separator between windows"
 msgstr ""
 
 #, fuzzy
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr "цвет разделителей окна (при разбитом экране)"
-
-#, fuzzy
 msgid "text color for '+' when scrolling bars"
 msgstr "цвет '+' при прокрутке топика"
 
@@ -2504,74 +2498,28 @@ msgstr "цвет чата"
 msgid "background color for chat"
 msgstr "фон ников"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
-msgstr ""
-
-msgid ""
-"text color for chat when line is inactive (buffer is merged with other "
-"buffers and is not selected)"
-msgstr ""
+#, fuzzy
+msgid "text color for buffer names"
+msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color for time in chat window"
-msgstr "цвет времени в окне чата"
+msgid "text color for channel names"
+msgstr "цвет имён при действиях"
 
 #, fuzzy
-msgid "text color for time delimiters"
+msgid "text color for delimiters"
 msgstr "цвет разделителей информационной панели"
 
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when line is inactive (buffer is merged with other "
+"buffers and is not selected)"
 msgstr ""
 
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
 
 #, fuzzy
-msgid "text color for error prefix"
-msgstr "цвет стрелки захода на канал (префикс)"
-
-#, fuzzy
-msgid "text color for network prefix"
-msgstr "цвет стрелки захода на канал (префикс)"
-
-#, fuzzy
-msgid "text color for action prefix"
-msgstr "цвет стрелки покидания/выхода (префикс)"
-
-#, fuzzy
-msgid "text color for join prefix"
-msgstr "цвет стрелки захода на канал (префикс)"
-
-#, fuzzy
-msgid "text color for quit prefix"
-msgstr "цвет стрелки покидания/выхода (префикс)"
-
-#, fuzzy
-msgid "text color for '+' when prefix is too long"
-msgstr "цвет '+' при прокрутке топика"
-
-#, fuzzy
-msgid "text color for suffix (after prefix)"
-msgstr "цвет стрелки захода на канал (префикс)"
-
-#, fuzzy
-msgid "text color for buffer names"
-msgstr "цвет названия сервера"
-
-#, fuzzy
-msgid "text color for server names"
-msgstr "цвет названия сервера"
-
-#, fuzzy
-msgid "text color for channel names"
-msgstr "цвет имён при действиях"
-
-#, fuzzy
 msgid "text color for nicks in chat window"
 msgstr "цвет времени в окне чата"
 
@@ -2586,14 +2534,6 @@ msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
 
 #, fuzzy
-msgid "color for nick suffix (string displayed after nick in prefix)"
-msgstr "строка, вставляемая после автодополнения ника"
-
-#, fuzzy
-msgid "text color for local nick in chat window"
-msgstr "текст, который отображать до ника в окне чата"
-
-#, fuzzy
 msgid "text color for offline nick (not in nicklist any more)"
 msgstr "цвет отошедших ников"
 
@@ -2610,12 +2550,12 @@ msgid "text color for other nick in private buffer"
 msgstr "цвет ника собеседника в окне привата"
 
 #, fuzzy
-msgid "text color for hostnames"
-msgstr "цвет hostname"
+msgid "text color for local nick in chat window"
+msgstr "текст, который отображать до ника в окне чата"
 
 #, fuzzy
-msgid "text color for delimiters"
-msgstr "цвет разделителей информационной панели"
+msgid "color for nick suffix (string displayed after nick in prefix)"
+msgstr "строка, вставляемая после автодополнения ника"
 
 #, fuzzy
 msgid "text color for highlighted prefix"
@@ -2626,6 +2566,48 @@ msgid "background color for highlighted prefix"
 msgstr "цвет фона заголовка"
 
 #, fuzzy
+msgid "text color for hostnames"
+msgstr "цвет hostname"
+
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
+msgstr ""
+
+#, fuzzy
+msgid "text color for error prefix"
+msgstr "цвет стрелки захода на канал (префикс)"
+
+#, fuzzy
+msgid "text color for network prefix"
+msgstr "цвет стрелки захода на канал (префикс)"
+
+#, fuzzy
+msgid "text color for action prefix"
+msgstr "цвет стрелки покидания/выхода (префикс)"
+
+#, fuzzy
+msgid "text color for join prefix"
+msgstr "цвет стрелки захода на канал (префикс)"
+
+#, fuzzy
+msgid "text color for quit prefix"
+msgstr "цвет стрелки покидания/выхода (префикс)"
+
+#, fuzzy
+msgid "text color for '+' when prefix is too long"
+msgstr "цвет '+' при прокрутке топика"
+
+#, fuzzy
+msgid "text color for suffix (after prefix)"
+msgstr "цвет стрелки захода на канал (префикс)"
+
+#, fuzzy
 msgid "text color for unread data marker"
 msgstr "цвет маркера непрочитанных сообщений"
 
@@ -2634,6 +2616,10 @@ msgid "background color for unread data marker"
 msgstr "фон маркера непрочитанных сообщений"
 
 #, fuzzy
+msgid "text color for server names"
+msgstr "цвет названия сервера"
+
+#, fuzzy
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
 
@@ -2646,58 +2632,80 @@ msgid "background color for marker on lines where text sought is found"
 msgstr "цвет вводимого текста"
 
 #, fuzzy
+msgid "text color for time in chat window"
+msgstr "цвет времени в окне чата"
+
+#, fuzzy
+msgid "text color for time delimiters"
+msgstr "цвет разделителей информационной панели"
+
+#, fuzzy
 msgid "text color for values"
 msgstr "цвет чата"
 
 #, fuzzy
-msgid "text color for current buffer number in status bar"
-msgstr "цвет текущего канала в строке состояния"
+msgid "text color for actions in input line"
+msgstr "цвет действий в поле ввода"
 
 #, fuzzy
-msgid "text color for current buffer name in status bar"
-msgstr "цвет текущего канала в строке состояния"
+msgid "text color for unsuccessful text search in input line"
+msgstr "цвет разделителей информационной панели"
 
 #, fuzzy
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
-msgstr "цвет текущего канала в строке состояния"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
+msgstr "цвет разделителей окна (при разбитом экране)"
 
 #, fuzzy
-msgid "text color for filter indicator in status bar"
-msgstr "цвет текущего канала в строке состояния"
+msgid "text color for count of highlight messages in hotlist (status bar)"
+msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
 
 #, fuzzy
-msgid "text color for buffer with new messages (status bar)"
-msgstr "color for window with new messages (в строке состояния)"
+msgid "text color for count of messages in hotlist (status bar)"
+msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
 
 #, fuzzy
-msgid "text color for buffer with private message (status bar)"
-msgstr "цвет окна с личными сообщениями (в строке состояния)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+
+#, fuzzy
+msgid "text color for count of private messages in hotlist (status bar)"
+msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
 
 #, fuzzy
 msgid "text color for buffer with highlight (status bar)"
 msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
 
 #, fuzzy
+msgid "text color for buffer with new messages (status bar)"
+msgstr "color for window with new messages (в строке состояния)"
+
+#, fuzzy
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr "цвет окна с новыми данными (но не сообщениями) (в строке состояния)"
 
 #, fuzzy
-msgid "text color for count of messages in hotlist (status bar)"
-msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+msgid "text color for buffer with private message (status bar)"
+msgstr "цвет окна с личными сообщениями (в строке состояния)"
 
 #, fuzzy
-msgid "text color for count of private messages in hotlist (status bar)"
-msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+msgid "text color for filter indicator in status bar"
+msgstr "цвет текущего канала в строке состояния"
 
 #, fuzzy
-msgid "text color for count of highlight messages in hotlist (status bar)"
-msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+msgid "text color for current buffer name in status bar"
+msgstr "цвет текущего канала в строке состояния"
 
 #, fuzzy
-msgid "text color for count of other messages in hotlist (status bar)"
-msgstr "цвет окна с подсвеченным сообщением (в строке состояния)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr "цвет текущего канала в строке состояния"
+
+#, fuzzy
+msgid "text color for current buffer number in status bar"
+msgstr "цвет текущего канала в строке состояния"
 
 #, fuzzy
 msgid "text color for buffer with new data (status bar)"
@@ -2708,22 +2716,14 @@ msgid "text color for time (status bar)"
 msgstr "цвет строки состояния"
 
 #, fuzzy
-msgid "text color for unsuccessful text search in input line"
-msgstr "цвет разделителей информационной панели"
-
-#, fuzzy
-msgid "text color for actions in input line"
-msgstr "цвет действий в поле ввода"
+msgid "text color for away nicknames"
+msgstr "цвет отошедших ников"
 
 #, fuzzy
 msgid "text color for groups in nicklist"
 msgstr "цвет ника"
 
 #, fuzzy
-msgid "text color for away nicknames"
-msgstr "цвет отошедших ников"
-
-#, fuzzy
 msgid "text color for offline nicknames"
 msgstr "цвет отошедших ников"
 
@@ -2766,17 +2766,20 @@ msgid ""
 "with same prefix)"
 msgstr ""
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
 msgstr ""
 
-msgid "display count for each partial completion in bar item"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
-
-#, fuzzy
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
-msgstr "максимальное количество команд в истории (0 = не ограничено)"
+"максимальное количество отображаемых команд в листинге истории (0 = не "
+"ограничено)"
 
 #, fuzzy
 msgid ""
@@ -2784,6 +2787,10 @@ msgid ""
 "1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
+#, fuzzy
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgstr "максимальное количество команд в истории (0 = не ограничено)"
+
 msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
@@ -2791,13 +2798,6 @@ msgstr "максимальное количество команд в истор
 msgid "maximum number of visited buffers to keep in memory"
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
-msgstr ""
-"максимальное количество отображаемых команд в листинге истории (0 = не "
-"ограничено)"
-
 #, fuzzy
 msgid ""
 "timeout (in seconds) for connection to a remote host (made in a child "
@@ -5537,64 +5537,6 @@ msgid ""
 "time specifiers)"
 msgstr ""
 
-#, fuzzy
-msgid "merge server buffers"
-msgstr "управление буферами"
-
-#, fuzzy
-msgid "merge private buffers"
-msgstr "управление буферами"
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr "оставлять пробел, если ник не op/voice"
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -5637,21 +5579,6 @@ msgstr "отображать уведомление об отсутствии е
 msgid "display a message in private when user is back (after quit on server)"
 msgstr ""
 
-#, fuzzy
-msgid "display server away message in away bar item"
-msgstr "отображать уведомление об отсутствии единожды в привате"
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr ""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr ""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -5687,20 +5614,85 @@ msgid ""
 "(usually any message from another user, not server messages,..)"
 msgstr ""
 
+#, fuzzy
+msgid "display server away message in away bar item"
+msgstr "отображать уведомление об отсутствии единожды в привате"
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr ""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
 msgstr ""
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
+msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+#, fuzzy
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr "оставлять пробел, если ник не op/voice"
+
 #, fuzzy
 msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
@@ -5721,11 +5713,19 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "управление буферами"
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""
 
+#, fuzzy
+msgid "merge server buffers"
+msgstr "управление буферами"
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -5747,19 +5747,39 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "part" and "quit"
-msgid "enable smart filter for \"part\" and \"quit\" messages"
-msgstr ""
-
 #. TRANSLATORS: please do not translate "nick"
 #, fuzzy
 msgid "enable smart filter for \"nick\" messages (nick changes)"
 msgstr "цвет  текущего окна с сообщениями"
 
+#. TRANSLATORS: please do not translate "part" and "quit"
+msgid "enable smart filter for \"part\" and \"quit\" messages"
+msgstr ""
+
 msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 
 #, fuzzy
+msgid "color for nick in input bar"
+msgstr "цвет ников"
+
+#, fuzzy
+msgid "color for away item"
+msgstr "цвет отошедших ников"
+
+#, fuzzy
+msgid "color for channel modes, near channel name"
+msgstr "цвет имён при действиях"
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+
+msgid "color for lag indicator, when pong has been received from server"
+msgstr ""
+
+#, fuzzy
 msgid "color for text in join messages"
 msgstr "цвет  текущего окна с сообщениями"
 
@@ -5791,33 +5811,13 @@ msgid "color for text \"Notice\" in notices"
 msgstr "цвет  текущего окна с сообщениями"
 
 #, fuzzy
-msgid "color for nick in input bar"
-msgstr "цвет ников"
-
-#, fuzzy
-msgid "color for away item"
-msgstr "цвет отошедших ников"
-
-#, fuzzy
-msgid "color for channel modes, near channel name"
-msgstr "цвет имён при действиях"
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-
-#, fuzzy
 msgid "color for reason in part/quit messages"
 msgstr "сообщение о выходе по-умолчанию"
 
-msgid "color for old channel topic (when topic is changed)"
+msgid "color for new channel topic (when topic is changed)"
 msgstr ""
 
-msgid "color for new channel topic (when topic is changed)"
+msgid "color for old channel topic (when topic is changed)"
 msgstr ""
 
 msgid ""
@@ -6849,13 +6849,13 @@ msgid ""
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
 #, fuzzy
-msgid "color for backlog lines"
-msgstr "цвет отошедших ников"
-
-#, fuzzy
 msgid "color for line ending the backlog"
 msgstr "цвет ников"
 
+#, fuzzy
+msgid "color for backlog lines"
+msgstr "цвет отошедших ников"
+
 msgid ""
 "automatically save content of buffers to files (unless a buffer disables log)"
 msgstr ""
@@ -6865,9 +6865,25 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 
+msgid "write information line in log file when log starts or ends for a buffer"
+msgstr ""
+
+msgid ""
+"default file name mask for log files (format is \"directory/to/file\" or "
+"\"file\", without first \"/\" because \"path\" option is used to build "
+"complete path to file); local buffer variables are permitted; date "
+"specifiers are permitted (see man strftime)"
+msgstr ""
+
 msgid "use only lower case for log filenames"
 msgstr ""
 
+msgid "text to write before nick in prefix of message, example: \"<\""
+msgstr ""
+
+msgid "text to write after nick in prefix of message, example: \">\""
+msgstr ""
+
 #, fuzzy
 msgid ""
 "path for WeeChat log files; \"%h\" at beginning of string is replaced by "
@@ -6878,29 +6894,13 @@ msgstr ""
 "умолчанию - ~/.weechat)"
 
 msgid ""
-"default file name mask for log files (format is \"directory/to/file\" or "
-"\"file\", without first \"/\" because \"path\" option is used to build "
-"complete path to file); local buffer variables are permitted; date "
-"specifiers are permitted (see man strftime)"
-msgstr ""
-
-msgid ""
 "replacement char for special chars in filename built with mask (like "
 "directory delimiter)"
 msgstr ""
 
-msgid "write information line in log file when log starts or ends for a buffer"
-msgstr ""
-
 msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 
-msgid "text to write before nick in prefix of message, example: \"<\""
-msgstr ""
-
-msgid "text to write after nick in prefix of message, example: \">\""
-msgstr ""
-
 #, fuzzy
 msgid "list of logger buffers"
 msgstr "время в буферах"
@@ -7516,18 +7516,6 @@ msgid "text color for client description"
 msgstr "цвет разделителей информационной панели"
 
 #, fuzzy
-msgid "text color in relay buffer"
-msgstr "цвет названия сервера"
-
-#, fuzzy
-msgid "background color in relay buffer"
-msgstr "фон маркера непрочитанных сообщений"
-
-#, fuzzy
-msgid "text color of selected line in relay buffer"
-msgstr "цвет названия сервера"
-
-#, fuzzy
 msgid "text color for \"connecting\" status"
 msgstr "цвет \"соединения\" в окне DCC"
 
@@ -7547,6 +7535,18 @@ msgstr "цвет \"неудачных\" в окне DCC"
 msgid "text color for \"disconnected\" status"
 msgstr "цвет \"соединения\" в окне DCC"
 
+#, fuzzy
+msgid "text color in relay buffer"
+msgstr "цвет названия сервера"
+
+#, fuzzy
+msgid "background color in relay buffer"
+msgstr "фон маркера непрочитанных сообщений"
+
+#, fuzzy
+msgid "text color of selected line in relay buffer"
+msgstr "цвет названия сервера"
+
 msgid ""
 "regular expression with IPs allowed to use relay (case insensitive, use \"(?-"
 "i)\" at beginning to make it case sensitive); if IPv6 is enabled and that "
@@ -7589,16 +7589,16 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr "максимальное количество команд в истории (0 = не ограничено)"
-
-#, fuzzy
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
 "year)"
 msgstr "максимальное количество команд в истории (0 = не ограничено)"
 
+#, fuzzy
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr "максимальное количество команд в истории (0 = не ограничено)"
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -8363,25 +8363,25 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "color for status \"popular\" (\"*\")"
-msgstr "цвет строки состояния"
-
-msgid "color for status \"installed\" (\"i\")"
-msgstr ""
-
-#, fuzzy
 msgid "color for status \"autoloaded\" (\"a\")"
 msgstr "цвет строки состояния"
 
 msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
 msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
+#, fuzzy
+msgid "color for status \"popular\" (\"*\")"
+msgstr "цвет строки состояния"
+
+msgid "color for status \"running\" (\"r\")"
+msgstr ""
+
 msgid "color for status \"unknown\" (\"?\")"
 msgstr ""
 
@@ -8390,59 +8390,55 @@ msgid "text color in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of dates in script buffer"
-msgstr "цвет ника собеседника в окне привата"
+msgid "background color in script buffer"
+msgstr "фон ников"
 
 #, fuzzy
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of description in script buffer"
-msgstr "цвет названия сервера"
+msgid "text color of dates in script buffer"
+msgstr "цвет ника собеседника в окне привата"
 
 #, fuzzy
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of tags in script buffer"
+msgid "text color of description in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of version in script buffer"
-msgstr "цвет ника собеседника в окне привата"
-
-#, fuzzy
-msgid "text color of version loaded in script buffer"
-msgstr "цвет ника собеседника в окне привата"
+msgid "text color of description for selected line in script buffer"
+msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "background color in script buffer"
-msgstr "фон ников"
+msgid "text color of extension in script buffer"
+msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color for selected line in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of description for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of extension for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of script name for selected line in script buffer"
+msgid "text color of tags in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
@@ -8450,15 +8446,19 @@ msgid "text color of tags for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "text color of version for selected line in script buffer"
-msgstr "цвет названия сервера"
+msgid "text color of version in script buffer"
+msgstr "цвет ника собеседника в окне привата"
+
+#, fuzzy
+msgid "text color of version loaded in script buffer"
+msgstr "цвет ника собеседника в окне привата"
 
 #, fuzzy
 msgid "text color of version loaded for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 #, fuzzy
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr "цвет названия сервера"
 
 msgid ""
@@ -8774,18 +8774,6 @@ msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 
 #, fuzzy
-msgid "text color in xfer buffer"
-msgstr "цвет названия сервера"
-
-#, fuzzy
-msgid "background color in xfer buffer"
-msgstr "фон ников"
-
-#, fuzzy
-msgid "text color of selected line in xfer buffer"
-msgstr "цвет названия сервера"
-
-#, fuzzy
 msgid "text color for \"waiting\" status"
 msgstr "цвет \"ожидания\" в окне DCC"
 
@@ -8806,8 +8794,16 @@ msgid "text color for \"aborted\" status"
 msgstr "цвет \"отменённых\" в окне DCC"
 
 #, fuzzy
-msgid "timeout for xfer request (in seconds)"
-msgstr "таймаут запросов dcc-соединений (в секундах)"
+msgid "text color in xfer buffer"
+msgstr "цвет названия сервера"
+
+#, fuzzy
+msgid "background color in xfer buffer"
+msgstr "фон ников"
+
+#, fuzzy
+msgid "text color of selected line in xfer buffer"
+msgstr "цвет названия сервера"
 
 #, fuzzy
 msgid "block size for sending packets, in bytes"
@@ -8818,6 +8814,14 @@ msgstr "не ожидать ACK при отправке файла"
 
 #, fuzzy
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+"IP адрес или домен, используемый для исходящих DCC соединений (пустое "
+"значение означает текущий IP адрес)"
+
+#, fuzzy
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -8827,39 +8831,27 @@ msgstr ""
 "(полезно для NAT) (синтаксис: определённый порт, например 5000, или интервал "
 "портов, например 5000-5015, пустое значение означает любой порт)"
 
-#, fuzzy
-msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-"IP адрес или домен, используемый для исходящих DCC соединений (пустое "
-"значение означает текущий IP адрес)"
-
 msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 
 #, fuzzy
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
-msgstr ""
-"путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
-"умолчанию - ~/.weechat)"
+msgid "timeout for xfer request (in seconds)"
+msgstr "таймаут запросов dcc-соединений (в секундах)"
 
 #, fuzzy
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
-msgstr ""
-"путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
-"умолчанию - ~/.weechat)"
+msgid "automatically accept chat requests (use carefully!)"
+msgstr "автоматически подтверждать dcc-чат (используйте осторожно!)"
 
-msgid "use remote nick as prefix in local filename when receiving a file"
-msgstr ""
+#, fuzzy
+msgid "automatically accept incoming files (use carefully!)"
+msgstr "автоматически подтверждать dcc-чат (используйте осторожно!)"
 
-msgid "convert spaces to underscores when sending files"
-msgstr "заменять пробелы знаками подчёркивания при отправке файлов"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+msgstr ""
 
 #, fuzzy
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
@@ -8874,18 +8866,26 @@ msgstr ""
 "автоматически продолжать DCC передачу если соединение с удалённым хостом "
 "было утеряно"
 
-#, fuzzy
-msgid "automatically accept incoming files (use carefully!)"
-msgstr "автоматически подтверждать dcc-чат (используйте осторожно!)"
+msgid "convert spaces to underscores when sending files"
+msgstr "заменять пробелы знаками подчёркивания при отправке файлов"
 
 #, fuzzy
-msgid "automatically accept chat requests (use carefully!)"
-msgstr "автоматически подтверждать dcc-чат (используйте осторожно!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
+msgstr ""
+"путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
+"умолчанию - ~/.weechat)"
 
+#, fuzzy
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+"путь поиска pluginов ('%h' заменяется на домашний каталог WeeChat, по "
+"умолчанию - ~/.weechat)"
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
 
 #, fuzzy
diff --git a/po/tr.po b/po/tr.po
index 787523d4a..b0f57a7a4 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.2-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-06-28 13:51+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2195,11 +2195,6 @@ msgstr ""
 msgid "display a vertical separator between windows"
 msgstr ""
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-
 msgid "text color for '+' when scrolling bars"
 msgstr ""
 
@@ -2209,8 +2204,13 @@ msgstr "sohbet için metin rengi"
 msgid "background color for chat"
 msgstr "sohbet için arkaplan rengi"
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
+msgid "text color for buffer names"
+msgstr ""
+
+msgid "text color for channel names"
+msgstr "kanal isimleri için metin rengi"
+
+msgid "text color for delimiters"
 msgstr ""
 
 msgid ""
@@ -2218,92 +2218,78 @@ msgid ""
 "buffers and is not selected)"
 msgstr ""
 
-msgid "text color for time in chat window"
-msgstr "sohbet penceresindeki zaman için metin rengi"
-
-msgid "text color for time delimiters"
-msgstr ""
-
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
 
+msgid "text color for nicks in chat window"
+msgstr "sohbet penceresindeki rumuzlar için metin rengi"
+
+#. TRANSLATORS: please do not translate "lightred:blue"
 msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+"text color for nicks (comma separated list of colors, background is allowed "
+"with format: \"fg:bg\", for example: \"lightred:blue\")"
 msgstr ""
 
-msgid "text color for error prefix"
+msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
 
-msgid "text color for network prefix"
+msgid "text color for offline nick (not in nicklist any more)"
 msgstr ""
 
-msgid "text color for action prefix"
+msgid "text color for offline nick with highlight"
 msgstr ""
 
-msgid "text color for join prefix"
+msgid "background color for offline nick with highlight"
 msgstr ""
 
-msgid "text color for quit prefix"
+msgid "text color for other nick in private buffer"
 msgstr ""
 
-msgid "text color for '+' when prefix is too long"
-msgstr ""
+msgid "text color for local nick in chat window"
+msgstr "sohbet penceresindeki yerel rumuz için metin rengi"
 
-msgid "text color for suffix (after prefix)"
+msgid "color for nick suffix (string displayed after nick in prefix)"
 msgstr ""
 
-msgid "text color for buffer names"
+msgid "text color for highlighted prefix"
 msgstr ""
 
-msgid "text color for server names"
-msgstr "sunucu isimleri için metin rengi"
-
-msgid "text color for channel names"
-msgstr "kanal isimleri için metin rengi"
-
-msgid "text color for nicks in chat window"
-msgstr "sohbet penceresindeki rumuzlar için metin rengi"
-
-#. TRANSLATORS: please do not translate "lightred:blue"
-msgid ""
-"text color for nicks (comma separated list of colors, background is allowed "
-"with format: \"fg:bg\", for example: \"lightred:blue\")"
+msgid "background color for highlighted prefix"
 msgstr ""
 
-msgid "color for nick prefix (string displayed before nick in prefix)"
+msgid "text color for hostnames"
 msgstr ""
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
 msgstr ""
 
-msgid "text color for local nick in chat window"
-msgstr "sohbet penceresindeki yerel rumuz için metin rengi"
-
-msgid "text color for offline nick (not in nicklist any more)"
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
 msgstr ""
 
-msgid "text color for offline nick with highlight"
+msgid "text color for error prefix"
 msgstr ""
 
-msgid "background color for offline nick with highlight"
+msgid "text color for network prefix"
 msgstr ""
 
-msgid "text color for other nick in private buffer"
+msgid "text color for action prefix"
 msgstr ""
 
-msgid "text color for hostnames"
+msgid "text color for join prefix"
 msgstr ""
 
-msgid "text color for delimiters"
+msgid "text color for quit prefix"
 msgstr ""
 
-msgid "text color for highlighted prefix"
+msgid "text color for '+' when prefix is too long"
 msgstr ""
 
-msgid "background color for highlighted prefix"
+msgid "text color for suffix (after prefix)"
 msgstr ""
 
 msgid "text color for unread data marker"
@@ -2312,6 +2298,9 @@ msgstr ""
 msgid "background color for unread data marker"
 msgstr ""
 
+msgid "text color for server names"
+msgstr "sunucu isimleri için metin rengi"
+
 msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 
@@ -2321,45 +2310,62 @@ msgstr ""
 msgid "background color for marker on lines where text sought is found"
 msgstr ""
 
+msgid "text color for time in chat window"
+msgstr "sohbet penceresindeki zaman için metin rengi"
+
+msgid "text color for time delimiters"
+msgstr ""
+
 msgid "text color for values"
 msgstr "değerler için metin rengi"
 
-msgid "text color for current buffer number in status bar"
+msgid "text color for actions in input line"
 msgstr ""
 
-msgid "text color for current buffer name in status bar"
+msgid "text color for unsuccessful text search in input line"
 msgstr ""
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
 
-msgid "text color for filter indicator in status bar"
+msgid "text color for count of highlight messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with new messages (status bar)"
+msgid "text color for count of messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with private message (status bar)"
+msgid "text color for count of other messages in hotlist (status bar)"
+msgstr ""
+
+msgid "text color for count of private messages in hotlist (status bar)"
 msgstr ""
 
 msgid "text color for buffer with highlight (status bar)"
 msgstr ""
 
+msgid "text color for buffer with new messages (status bar)"
+msgstr ""
+
 msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 
-msgid "text color for count of messages in hotlist (status bar)"
+msgid "text color for buffer with private message (status bar)"
 msgstr ""
 
-msgid "text color for count of private messages in hotlist (status bar)"
+msgid "text color for filter indicator in status bar"
 msgstr ""
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
+msgid "text color for current buffer name in status bar"
 msgstr ""
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
+msgstr ""
+
+msgid "text color for current buffer number in status bar"
 msgstr ""
 
 msgid "text color for buffer with new data (status bar)"
@@ -2368,18 +2374,12 @@ msgstr ""
 msgid "text color for time (status bar)"
 msgstr "zaman için metin rengi (durum çubuğu)"
 
-msgid "text color for unsuccessful text search in input line"
-msgstr ""
-
-msgid "text color for actions in input line"
-msgstr ""
+msgid "text color for away nicknames"
+msgstr "uzaktaki kullanıcı isimleri için metin rengi"
 
 msgid "text color for groups in nicklist"
 msgstr ""
 
-msgid "text color for away nicknames"
-msgstr "uzaktaki kullanıcı isimleri için metin rengi"
-
 msgid "text color for offline nicknames"
 msgstr ""
 
@@ -2421,15 +2421,17 @@ msgid ""
 "with same prefix)"
 msgstr ""
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
 msgstr ""
 
-msgid "display count for each partial completion in bar item"
-msgstr ""
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
 
 msgid ""
@@ -2437,15 +2439,13 @@ msgid ""
 "1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
 msgstr ""
 
-msgid "maximum number of user commands in history (0 = unlimited)"
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
 msgstr ""
 
-msgid "maximum number of visited buffers to keep in memory"
+msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
+msgid "maximum number of visited buffers to keep in memory"
 msgstr ""
 
 msgid ""
@@ -4829,61 +4829,6 @@ msgid ""
 "time specifiers)"
 msgstr ""
 
-msgid "merge server buffers"
-msgstr ""
-
-msgid "merge private buffers"
-msgstr ""
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -4922,20 +4867,6 @@ msgstr ""
 msgid "display a message in private when user is back (after quit on server)"
 msgstr ""
 
-msgid "display server away message in away bar item"
-msgstr ""
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr ""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr ""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -4971,21 +4902,84 @@ msgid ""
 "(usually any message from another user, not server messages,..)"
 msgstr ""
 
+msgid "display server away message in away bar item"
+msgstr ""
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr ""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
 msgstr ""
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 
@@ -5004,11 +4998,17 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
+msgid "merge private buffers"
+msgstr ""
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""
 
+msgid "merge server buffers"
+msgstr ""
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -5029,15 +5029,32 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
+#. TRANSLATORS: please do not translate "nick"
+msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgstr ""
+
 #. TRANSLATORS: please do not translate "part" and "quit"
 msgid "enable smart filter for \"part\" and \"quit\" messages"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "nick"
-msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 
-msgid "strip colors in topic (used only when displaying buffer title)"
+msgid "color for nick in input bar"
+msgstr ""
+
+msgid "color for away item"
+msgstr "uzakta öğesi için renk"
+
+msgid "color for channel modes, near channel name"
+msgstr ""
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+
+msgid "color for lag indicator, when pong has been received from server"
 msgstr ""
 
 msgid "color for text in join messages"
@@ -5068,30 +5085,13 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr ""
 
-msgid "color for nick in input bar"
-msgstr ""
-
-msgid "color for away item"
-msgstr "uzakta öğesi için renk"
-
-msgid "color for channel modes, near channel name"
-msgstr ""
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-
 msgid "color for reason in part/quit messages"
 msgstr "ayrılma/çıkış iletisindeki sebep için renk"
 
-msgid "color for old channel topic (when topic is changed)"
+msgid "color for new channel topic (when topic is changed)"
 msgstr ""
 
-msgid "color for new channel topic (when topic is changed)"
+msgid "color for old channel topic (when topic is changed)"
 msgstr ""
 
 msgid ""
@@ -6054,10 +6054,10 @@ msgid ""
 "= no backlog)"
 msgstr ""
 
-msgid "color for backlog lines"
+msgid "color for line ending the backlog"
 msgstr ""
 
-msgid "color for line ending the backlog"
+msgid "color for backlog lines"
 msgstr ""
 
 msgid ""
@@ -6069,13 +6069,7 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 
-msgid "use only lower case for log filenames"
-msgstr ""
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
 
 msgid ""
@@ -6085,21 +6079,27 @@ msgid ""
 "specifiers are permitted (see man strftime)"
 msgstr ""
 
-msgid ""
-"replacement char for special chars in filename built with mask (like "
-"directory delimiter)"
+msgid "use only lower case for log filenames"
 msgstr ""
 
-msgid "write information line in log file when log starts or ends for a buffer"
+msgid "text to write before nick in prefix of message, example: \"<\""
 msgstr ""
 
-msgid "timestamp used in log files (see man strftime for date/time specifiers)"
+msgid "text to write after nick in prefix of message, example: \">\""
 msgstr ""
 
-msgid "text to write before nick in prefix of message, example: \"<\""
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
 msgstr ""
 
-msgid "text to write after nick in prefix of message, example: \">\""
+msgid ""
+"replacement char for special chars in filename built with mask (like "
+"directory delimiter)"
+msgstr ""
+
+msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 
 msgid "list of logger buffers"
@@ -6645,28 +6645,28 @@ msgstr ""
 msgid "text color for client description"
 msgstr "istemci açıklaması için metin rengi"
 
-msgid "text color in relay buffer"
+msgid "text color for \"connecting\" status"
 msgstr ""
 
-msgid "background color in relay buffer"
+msgid "text color for \"waiting authentication\" status"
 msgstr ""
 
-msgid "text color of selected line in relay buffer"
+msgid "text color for \"connected\" status"
 msgstr ""
 
-msgid "text color for \"connecting\" status"
+msgid "text color for \"authentication failed\" status"
 msgstr ""
 
-msgid "text color for \"waiting authentication\" status"
+msgid "text color for \"disconnected\" status"
 msgstr ""
 
-msgid "text color for \"connected\" status"
+msgid "text color in relay buffer"
 msgstr ""
 
-msgid "text color for \"authentication failed\" status"
+msgid "background color in relay buffer"
 msgstr ""
 
-msgid "text color for \"disconnected\" status"
+msgid "text color of selected line in relay buffer"
 msgstr ""
 
 msgid ""
@@ -6710,15 +6710,15 @@ msgid ""
 "\\.)?example\\.(com|org)\""
 msgstr ""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
 "year)"
 msgstr ""
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -7437,22 +7437,22 @@ msgid ""
 "alt+r = remove, ...); if disabled, only the input is allowed: i, r, ..."
 msgstr ""
 
-msgid "color for status \"popular\" (\"*\")"
+msgid "color for status \"autoloaded\" (\"a\")"
 msgstr ""
 
-msgid "color for status \"installed\" (\"i\")"
+msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"autoloaded\" (\"a\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
-msgid "color for status \"held\" (\"H\")"
+msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"popular\" (\"*\")"
 msgstr ""
 
-msgid "color for status \"obsolete\" (\"N\")"
+msgid "color for status \"running\" (\"r\")"
 msgstr ""
 
 msgid "color for status \"unknown\" (\"?\")"
@@ -7461,58 +7461,58 @@ msgstr ""
 msgid "text color in script buffer"
 msgstr ""
 
-msgid "text color of dates in script buffer"
+msgid "background color in script buffer"
 msgstr ""
 
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr ""
 
-msgid "text color of description in script buffer"
+msgid "text color of dates in script buffer"
 msgstr ""
 
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr ""
 
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr ""
 
-msgid "text color of tags in script buffer"
+msgid "text color of description in script buffer"
 msgstr ""
 
-msgid "text color of version in script buffer"
+msgid "text color of description for selected line in script buffer"
 msgstr ""
 
-msgid "text color of version loaded in script buffer"
+msgid "text color of extension in script buffer"
 msgstr ""
 
-msgid "background color in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr ""
 
-msgid "text color for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr ""
 
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr ""
 
-msgid "text color of description for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr ""
 
-msgid "text color of extension for selected line in script buffer"
+msgid "text color of tags in script buffer"
 msgstr ""
 
-msgid "text color of script name for selected line in script buffer"
+msgid "text color of tags for selected line in script buffer"
 msgstr ""
 
-msgid "text color of tags for selected line in script buffer"
+msgid "text color of version in script buffer"
 msgstr ""
 
-msgid "text color of version for selected line in script buffer"
+msgid "text color of version loaded in script buffer"
 msgstr ""
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr ""
 
 msgid ""
@@ -7805,15 +7805,6 @@ msgstr ""
 msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 
-msgid "text color in xfer buffer"
-msgstr ""
-
-msgid "background color in xfer buffer"
-msgstr ""
-
-msgid "text color of selected line in xfer buffer"
-msgstr ""
-
 msgid "text color for \"waiting\" status"
 msgstr ""
 
@@ -7829,7 +7820,13 @@ msgstr ""
 msgid "text color for \"aborted\" status"
 msgstr ""
 
-msgid "timeout for xfer request (in seconds)"
+msgid "text color in xfer buffer"
+msgstr ""
+
+msgid "background color in xfer buffer"
+msgstr ""
+
+msgid "text color of selected line in xfer buffer"
 msgstr ""
 
 msgid "block size for sending packets, in bytes"
@@ -7839,6 +7836,11 @@ msgid "does not wait for ACK when sending file"
 msgstr ""
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -7846,28 +7848,22 @@ msgid ""
 msgstr ""
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+msgid "timeout for xfer request (in seconds)"
 msgstr ""
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgid "automatically accept chat requests (use carefully!)"
 msgstr ""
 
-msgid "use remote nick as prefix in local filename when receiving a file"
+msgid "automatically accept incoming files (use carefully!)"
 msgstr ""
 
-msgid "convert spaces to underscores when sending files"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
 msgstr ""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
@@ -7877,16 +7873,20 @@ msgid ""
 "automatically resume file transfer if connection with remote host is lost"
 msgstr ""
 
-msgid "automatically accept incoming files (use carefully!)"
+msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-msgid "automatically accept chat requests (use carefully!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
 msgstr ""
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
 
 msgid "list of xfer"
diff --git a/po/weechat.pot b/po/weechat.pot
index 647c9ca3e..767e1a0ef 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-07-05 18:09+0200\n"
+"POT-Creation-Date: 2013-07-11 19:51+0200\n"
 "PO-Revision-Date: 2013-02-14 18:20+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2202,11 +2202,6 @@ msgstr ""
 msgid "display a vertical separator between windows"
 msgstr ""
 
-msgid ""
-"color for window separators (when split) and separators beside bars (like "
-"nicklist)"
-msgstr ""
-
 msgid "text color for '+' when scrolling bars"
 msgstr ""
 
@@ -2216,177 +2211,182 @@ msgstr ""
 msgid "background color for chat"
 msgstr ""
 
-msgid ""
-"text color for chat when window is inactive (not current selected window)"
+msgid "text color for buffer names"
 msgstr ""
 
-msgid ""
-"text color for chat when line is inactive (buffer is merged with other "
-"buffers and is not selected)"
+msgid "text color for channel names"
 msgstr ""
 
-msgid "text color for time in chat window"
+msgid "text color for delimiters"
 msgstr ""
 
-msgid "text color for time delimiters"
+msgid ""
+"text color for chat when line is inactive (buffer is merged with other "
+"buffers and is not selected)"
 msgstr ""
 
 msgid ""
-"text color for buffer name (before prefix, when many buffers are merged with "
-"same number)"
+"text color for chat when window is inactive (not current selected window)"
 msgstr ""
 
-msgid ""
-"text color for inactive buffer name (before prefix, when many buffers are "
-"merged with same number and if buffer is not selected)"
+msgid "text color for nicks in chat window"
 msgstr ""
 
-msgid "text color for error prefix"
+#. TRANSLATORS: please do not translate "lightred:blue"
+msgid ""
+"text color for nicks (comma separated list of colors, background is allowed "
+"with format: \"fg:bg\", for example: \"lightred:blue\")"
 msgstr ""
 
-msgid "text color for network prefix"
+msgid "color for nick prefix (string displayed before nick in prefix)"
 msgstr ""
 
-msgid "text color for action prefix"
+msgid "text color for offline nick (not in nicklist any more)"
 msgstr ""
 
-msgid "text color for join prefix"
+msgid "text color for offline nick with highlight"
 msgstr ""
 
-msgid "text color for quit prefix"
+msgid "background color for offline nick with highlight"
 msgstr ""
 
-msgid "text color for '+' when prefix is too long"
+msgid "text color for other nick in private buffer"
 msgstr ""
 
-msgid "text color for suffix (after prefix)"
+msgid "text color for local nick in chat window"
 msgstr ""
 
-msgid "text color for buffer names"
+msgid "color for nick suffix (string displayed after nick in prefix)"
 msgstr ""
 
-msgid "text color for server names"
+msgid "text color for highlighted prefix"
 msgstr ""
 
-msgid "text color for channel names"
+msgid "background color for highlighted prefix"
 msgstr ""
 
-msgid "text color for nicks in chat window"
+msgid "text color for hostnames"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "lightred:blue"
 msgid ""
-"text color for nicks (comma separated list of colors, background is allowed "
-"with format: \"fg:bg\", for example: \"lightred:blue\")"
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
 msgstr ""
 
-msgid "color for nick prefix (string displayed before nick in prefix)"
+msgid ""
+"text color for inactive buffer name (before prefix, when many buffers are "
+"merged with same number and if buffer is not selected)"
 msgstr ""
 
-msgid "color for nick suffix (string displayed after nick in prefix)"
+msgid "text color for error prefix"
 msgstr ""
 
-msgid "text color for local nick in chat window"
+msgid "text color for network prefix"
 msgstr ""
 
-msgid "text color for offline nick (not in nicklist any more)"
+msgid "text color for action prefix"
 msgstr ""
 
-msgid "text color for offline nick with highlight"
+msgid "text color for join prefix"
 msgstr ""
 
-msgid "background color for offline nick with highlight"
+msgid "text color for quit prefix"
 msgstr ""
 
-msgid "text color for other nick in private buffer"
+msgid "text color for '+' when prefix is too long"
 msgstr ""
 
-msgid "text color for hostnames"
+msgid "text color for suffix (after prefix)"
 msgstr ""
 
-msgid "text color for delimiters"
+msgid "text color for unread data marker"
 msgstr ""
 
-msgid "text color for highlighted prefix"
+msgid "background color for unread data marker"
 msgstr ""
 
-msgid "background color for highlighted prefix"
+msgid "text color for server names"
 msgstr ""
 
-msgid "text color for unread data marker"
+msgid "text color for tags after messages (displayed with command /debug tags)"
 msgstr ""
 
-msgid "background color for unread data marker"
+msgid "text color for marker on lines where text sought is found"
 msgstr ""
 
-msgid "text color for tags after messages (displayed with command /debug tags)"
+msgid "background color for marker on lines where text sought is found"
 msgstr ""
 
-msgid "text color for marker on lines where text sought is found"
+msgid "text color for time in chat window"
 msgstr ""
 
-msgid "background color for marker on lines where text sought is found"
+msgid "text color for time delimiters"
 msgstr ""
 
 msgid "text color for values"
 msgstr ""
 
-msgid "text color for current buffer number in status bar"
+msgid "text color for actions in input line"
 msgstr ""
 
-msgid "text color for current buffer name in status bar"
+msgid "text color for unsuccessful text search in input line"
 msgstr ""
 
 msgid ""
-"text color for current buffer name in status bar, if data are secured with a "
-"protocol like SSL"
+"color for window separators (when split) and separators beside bars (like "
+"nicklist)"
 msgstr ""
 
-msgid "text color for filter indicator in status bar"
+msgid "text color for count of highlight messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with new messages (status bar)"
+msgid "text color for count of messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with private message (status bar)"
+msgid "text color for count of other messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with highlight (status bar)"
+msgid "text color for count of private messages in hotlist (status bar)"
 msgstr ""
 
-msgid "text color for buffer with new data (not messages) (status bar)"
+msgid "text color for buffer with highlight (status bar)"
 msgstr ""
 
-msgid "text color for count of messages in hotlist (status bar)"
+msgid "text color for buffer with new messages (status bar)"
 msgstr ""
 
-msgid "text color for count of private messages in hotlist (status bar)"
+msgid "text color for buffer with new data (not messages) (status bar)"
 msgstr ""
 
-msgid "text color for count of highlight messages in hotlist (status bar)"
+msgid "text color for buffer with private message (status bar)"
 msgstr ""
 
-msgid "text color for count of other messages in hotlist (status bar)"
+msgid "text color for filter indicator in status bar"
 msgstr ""
 
-msgid "text color for buffer with new data (status bar)"
+msgid "text color for current buffer name in status bar"
 msgstr ""
 
-msgid "text color for time (status bar)"
+msgid ""
+"text color for current buffer name in status bar, if data are secured with a "
+"protocol like SSL"
 msgstr ""
 
-msgid "text color for unsuccessful text search in input line"
+msgid "text color for current buffer number in status bar"
 msgstr ""
 
-msgid "text color for actions in input line"
+msgid "text color for buffer with new data (status bar)"
 msgstr ""
 
-msgid "text color for groups in nicklist"
+msgid "text color for time (status bar)"
 msgstr ""
 
 msgid "text color for away nicknames"
 msgstr ""
 
+msgid "text color for groups in nicklist"
+msgstr ""
+
 msgid "text color for offline nicknames"
 msgstr ""
 
@@ -2428,15 +2428,17 @@ msgid ""
 "with same prefix)"
 msgstr ""
 
+msgid "display count for each partial completion in bar item"
+msgstr ""
+
 msgid ""
 "partially complete outside commands (stop when many words found begin with "
 "same letters)"
 msgstr ""
 
-msgid "display count for each partial completion in bar item"
-msgstr ""
-
-msgid "maximum number of lines in history per buffer (0 = unlimited)"
+msgid ""
+"maximum number of commands to display by default in history listing (0 = "
+"unlimited)"
 msgstr ""
 
 msgid ""
@@ -2444,15 +2446,13 @@ msgid ""
 "1440 = one day, 10080 = one week, 43200 = one month, 525600 = one year)"
 msgstr ""
 
-msgid "maximum number of user commands in history (0 = unlimited)"
+msgid "maximum number of lines in history per buffer (0 = unlimited)"
 msgstr ""
 
-msgid "maximum number of visited buffers to keep in memory"
+msgid "maximum number of user commands in history (0 = unlimited)"
 msgstr ""
 
-msgid ""
-"maximum number of commands to display by default in history listing (0 = "
-"unlimited)"
+msgid "maximum number of visited buffers to keep in memory"
 msgstr ""
 
 msgid ""
@@ -4794,61 +4794,6 @@ msgid ""
 "time specifiers)"
 msgstr ""
 
-msgid "merge server buffers"
-msgstr ""
-
-msgid "merge private buffers"
-msgstr ""
-
-msgid ""
-"force position of new channel in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"force position of new private in list of buffers (none = default position "
-"(should be last buffer), next = current buffer + 1, near_server = after last "
-"channel/pv of server)"
-msgstr ""
-
-msgid ""
-"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
-"prefix only (default), action = in action messages only, both = prefix + "
-"action messages)"
-msgstr ""
-
-msgid ""
-"display a space if nick mode is enabled but nick has no mode (not op, "
-"voice, ...)"
-msgstr ""
-
-msgid ""
-"force color for some nicks: hash computed with nickname to find color will "
-"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
-"up for nicks is with exact case then lower case, so it's possible to use "
-"only lower case for nicks in this option"
-msgstr ""
-
-msgid ""
-"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
-"(position of letters matters: anagrams of a nick have different color), sum "
-"= sum of letters"
-msgstr ""
-
-msgid ""
-"chars used to stop in nick when computing color with letters of nick (at "
-"least one char outside this list must be in string before stopping) "
-"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
-"\"|nick\")"
-msgstr ""
-
-msgid ""
-"smart completion for nicks (completes first with last speakers): speakers = "
-"all speakers (including highlights), speakers_highlights = only speakers "
-"with highlight"
-msgstr ""
-
 msgid ""
 "display message when (un)marking as away (off: do not display/send anything, "
 "local: display locally, channel: send action to channels)"
@@ -4887,20 +4832,6 @@ msgstr ""
 msgid "display a message in private when user is back (after quit on server)"
 msgstr ""
 
-msgid "display server away message in away bar item"
-msgstr ""
-
-msgid ""
-"hide channel key in channel modes (this will hide all channel modes "
-"arguments if mode +k is set on channel)"
-msgstr ""
-
-msgid "display nick modes in \"input_prompt\" bar item"
-msgstr ""
-
-msgid "display nick prefix in \"input_prompt\" bar item"
-msgstr ""
-
 msgid ""
 "comma separated list of words to highlight in server buffers (case "
 "insensitive, use \"(?-i)\" at beginning of words to make them case "
@@ -4936,21 +4867,84 @@ msgid ""
 "(usually any message from another user, not server messages,..)"
 msgstr ""
 
+msgid "display server away message in away bar item"
+msgstr ""
+
+msgid ""
+"hide channel key in channel modes (this will hide all channel modes "
+"arguments if mode +k is set on channel)"
+msgstr ""
+
 msgid "name of bar item where IRC server is displayed (for status bar)"
 msgstr ""
 
+msgid "display nick modes in \"input_prompt\" bar item"
+msgstr ""
+
+msgid "display nick prefix in \"input_prompt\" bar item"
+msgstr ""
+
 msgid ""
 "default target buffer for msgbuffer options when target is private and that "
 "private buffer is not found"
 msgstr ""
 
 msgid ""
+"force position of new channel in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
+"force position of new private in list of buffers (none = default position "
+"(should be last buffer), next = current buffer + 1, near_server = after last "
+"channel/pv of server)"
+msgstr ""
+
+msgid ""
 "comma separated list of nicks for which passwords will be hidden when a "
 "message is sent, for example to hide password in message displayed by \"/msg "
 "nickserv identify password\", example: \"nickserv,nickbot\""
 msgstr ""
 
 msgid ""
+"force color for some nicks: hash computed with nickname to find color will "
+"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); look "
+"up for nicks is with exact case then lower case, so it's possible to use "
+"only lower case for nicks in this option"
+msgstr ""
+
+msgid ""
+"hash algorithm used to find the color for a nick: djb2 = variant of djb2 "
+"(position of letters matters: anagrams of a nick have different color), sum "
+"= sum of letters"
+msgstr ""
+
+msgid ""
+"chars used to stop in nick when computing color with letters of nick (at "
+"least one char outside this list must be in string before stopping) "
+"(example: nick \"|nick|away\" with \"|\" in chars will return color of nick "
+"\"|nick\")"
+msgstr ""
+
+msgid ""
+"smart completion for nicks (completes first with last speakers): speakers = "
+"all speakers (including highlights), speakers_highlights = only speakers "
+"with highlight"
+msgstr ""
+
+msgid ""
+"display nick mode (op, voice, ...) before nick (none = never, prefix = in "
+"prefix only (default), action = in action messages only, both = prefix + "
+"action messages)"
+msgstr ""
+
+msgid ""
+"display a space if nick mode is enabled but nick has no mode (not op, "
+"voice, ...)"
+msgstr ""
+
+msgid ""
 "display notices as private messages (if auto, use private buffer if found)"
 msgstr ""
 
@@ -4969,11 +4963,17 @@ msgstr ""
 msgid "close buffer when /part is issued on a channel"
 msgstr ""
 
+msgid "merge private buffers"
+msgstr ""
+
 msgid ""
 "number of raw messages to save in memory when raw data buffer is closed "
 "(messages will be displayed when opening raw data buffer)"
 msgstr ""
 
+msgid "merge server buffers"
+msgstr ""
+
 msgid ""
 "filter join/part/quit/nick messages for a nick if not speaking for some "
 "minutes on channel (you must create a filter on tag \"irc_smart_filter\")"
@@ -4994,15 +4994,32 @@ msgid ""
 "never unmask a join)"
 msgstr ""
 
+#. TRANSLATORS: please do not translate "nick"
+msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgstr ""
+
 #. TRANSLATORS: please do not translate "part" and "quit"
 msgid "enable smart filter for \"part\" and \"quit\" messages"
 msgstr ""
 
-#. TRANSLATORS: please do not translate "nick"
-msgid "enable smart filter for \"nick\" messages (nick changes)"
+msgid "strip colors in topic (used only when displaying buffer title)"
 msgstr ""
 
-msgid "strip colors in topic (used only when displaying buffer title)"
+msgid "color for nick in input bar"
+msgstr ""
+
+msgid "color for away item"
+msgstr ""
+
+msgid "color for channel modes, near channel name"
+msgstr ""
+
+msgid ""
+"color for lag indicator, when counting (pong not received from server, lag "
+"is increasing)"
+msgstr ""
+
+msgid "color for lag indicator, when pong has been received from server"
 msgstr ""
 
 msgid "color for text in join messages"
@@ -5033,30 +5050,13 @@ msgstr ""
 msgid "color for text \"Notice\" in notices"
 msgstr ""
 
-msgid "color for nick in input bar"
-msgstr ""
-
-msgid "color for away item"
-msgstr ""
-
-msgid "color for channel modes, near channel name"
-msgstr ""
-
-msgid ""
-"color for lag indicator, when counting (pong not received from server, lag "
-"is increasing)"
-msgstr ""
-
-msgid "color for lag indicator, when pong has been received from server"
-msgstr ""
-
 msgid "color for reason in part/quit messages"
 msgstr ""
 
-msgid "color for old channel topic (when topic is changed)"
+msgid "color for new channel topic (when topic is changed)"
 msgstr ""
 
-msgid "color for new channel topic (when topic is changed)"
+msgid "color for old channel topic (when topic is changed)"
 msgstr ""
 
 msgid ""
@@ -6024,10 +6024,10 @@ msgid ""
 "= no backlog)"
 msgstr ""
 
-msgid "color for backlog lines"
+msgid "color for line ending the backlog"
 msgstr ""
 
-msgid "color for line ending the backlog"
+msgid "color for backlog lines"
 msgstr ""
 
 msgid ""
@@ -6039,13 +6039,7 @@ msgid ""
 "immediately for each line printed)"
 msgstr ""
 
-msgid "use only lower case for log filenames"
-msgstr ""
-
-msgid ""
-"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
-"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
-"man strftime)"
+msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
 
 msgid ""
@@ -6055,21 +6049,27 @@ msgid ""
 "specifiers are permitted (see man strftime)"
 msgstr ""
 
-msgid ""
-"replacement char for special chars in filename built with mask (like "
-"directory delimiter)"
+msgid "use only lower case for log filenames"
 msgstr ""
 
-msgid "write information line in log file when log starts or ends for a buffer"
+msgid "text to write before nick in prefix of message, example: \"<\""
 msgstr ""
 
-msgid "timestamp used in log files (see man strftime for date/time specifiers)"
+msgid "text to write after nick in prefix of message, example: \">\""
 msgstr ""
 
-msgid "text to write before nick in prefix of message, example: \"<\""
+msgid ""
+"path for WeeChat log files; \"%h\" at beginning of string is replaced by "
+"WeeChat home (\"~/.weechat\" by default); date specifiers are permitted (see "
+"man strftime)"
 msgstr ""
 
-msgid "text to write after nick in prefix of message, example: \">\""
+msgid ""
+"replacement char for special chars in filename built with mask (like "
+"directory delimiter)"
+msgstr ""
+
+msgid "timestamp used in log files (see man strftime for date/time specifiers)"
 msgstr ""
 
 msgid "list of logger buffers"
@@ -6616,28 +6616,28 @@ msgstr ""
 msgid "text color for client description"
 msgstr ""
 
-msgid "text color in relay buffer"
+msgid "text color for \"connecting\" status"
 msgstr ""
 
-msgid "background color in relay buffer"
+msgid "text color for \"waiting authentication\" status"
 msgstr ""
 
-msgid "text color of selected line in relay buffer"
+msgid "text color for \"connected\" status"
 msgstr ""
 
-msgid "text color for \"connecting\" status"
+msgid "text color for \"authentication failed\" status"
 msgstr ""
 
-msgid "text color for \"waiting authentication\" status"
+msgid "text color for \"disconnected\" status"
 msgstr ""
 
-msgid "text color for \"connected\" status"
+msgid "text color in relay buffer"
 msgstr ""
 
-msgid "text color for \"authentication failed\" status"
+msgid "background color in relay buffer"
 msgstr ""
 
-msgid "text color for \"disconnected\" status"
+msgid "text color of selected line in relay buffer"
 msgstr ""
 
 msgid ""
@@ -6681,15 +6681,15 @@ msgid ""
 "\\.)?example\\.(com|org)\""
 msgstr ""
 
-msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
-msgstr ""
-
 msgid ""
 "maximum number of minutes in backlog per IRC channel (0 = unlimited, "
 "examples: 1440 = one day, 10080 = one week, 43200 = one month, 525600 = one "
 "year)"
 msgstr ""
 
+msgid "maximum number of lines in backlog per IRC channel (0 = unlimited)"
+msgstr ""
+
 msgid "display backlog starting from last client disconnect"
 msgstr ""
 
@@ -7404,22 +7404,22 @@ msgid ""
 "alt+r = remove, ...); if disabled, only the input is allowed: i, r, ..."
 msgstr ""
 
-msgid "color for status \"popular\" (\"*\")"
+msgid "color for status \"autoloaded\" (\"a\")"
 msgstr ""
 
-msgid "color for status \"installed\" (\"i\")"
+msgid "color for status \"held\" (\"H\")"
 msgstr ""
 
-msgid "color for status \"autoloaded\" (\"a\")"
+msgid "color for status \"installed\" (\"i\")"
 msgstr ""
 
-msgid "color for status \"held\" (\"H\")"
+msgid "color for status \"obsolete\" (\"N\")"
 msgstr ""
 
-msgid "color for status \"running\" (\"r\")"
+msgid "color for status \"popular\" (\"*\")"
 msgstr ""
 
-msgid "color for status \"obsolete\" (\"N\")"
+msgid "color for status \"running\" (\"r\")"
 msgstr ""
 
 msgid "color for status \"unknown\" (\"?\")"
@@ -7428,58 +7428,58 @@ msgstr ""
 msgid "text color in script buffer"
 msgstr ""
 
-msgid "text color of dates in script buffer"
+msgid "background color in script buffer"
 msgstr ""
 
-msgid "text color of delimiters in script buffer"
+msgid "background color for selected line in script buffer"
 msgstr ""
 
-msgid "text color of description in script buffer"
+msgid "text color of dates in script buffer"
 msgstr ""
 
-msgid "text color of extension in script buffer"
+msgid "text color of dates for selected line in script buffer"
 msgstr ""
 
-msgid "text color of script name in script buffer"
+msgid "text color of delimiters in script buffer"
 msgstr ""
 
-msgid "text color of tags in script buffer"
+msgid "text color of description in script buffer"
 msgstr ""
 
-msgid "text color of version in script buffer"
+msgid "text color of description for selected line in script buffer"
 msgstr ""
 
-msgid "text color of version loaded in script buffer"
+msgid "text color of extension in script buffer"
 msgstr ""
 
-msgid "background color in script buffer"
+msgid "text color of extension for selected line in script buffer"
 msgstr ""
 
-msgid "text color for selected line in script buffer"
+msgid "text color of script name in script buffer"
 msgstr ""
 
-msgid "text color of dates for selected line in script buffer"
+msgid "text color of script name for selected line in script buffer"
 msgstr ""
 
-msgid "text color of description for selected line in script buffer"
+msgid "text color for selected line in script buffer"
 msgstr ""
 
-msgid "text color of extension for selected line in script buffer"
+msgid "text color of tags in script buffer"
 msgstr ""
 
-msgid "text color of script name for selected line in script buffer"
+msgid "text color of tags for selected line in script buffer"
 msgstr ""
 
-msgid "text color of tags for selected line in script buffer"
+msgid "text color of version in script buffer"
 msgstr ""
 
-msgid "text color of version for selected line in script buffer"
+msgid "text color of version loaded in script buffer"
 msgstr ""
 
 msgid "text color of version loaded for selected line in script buffer"
 msgstr ""
 
-msgid "background color for selected line in script buffer"
+msgid "text color of version for selected line in script buffer"
 msgstr ""
 
 msgid ""
@@ -7772,15 +7772,6 @@ msgstr ""
 msgid "size of progress bar, in chars (if 0, progress bar is disabled)"
 msgstr ""
 
-msgid "text color in xfer buffer"
-msgstr ""
-
-msgid "background color in xfer buffer"
-msgstr ""
-
-msgid "text color of selected line in xfer buffer"
-msgstr ""
-
 msgid "text color for \"waiting\" status"
 msgstr ""
 
@@ -7796,7 +7787,13 @@ msgstr ""
 msgid "text color for \"aborted\" status"
 msgstr ""
 
-msgid "timeout for xfer request (in seconds)"
+msgid "text color in xfer buffer"
+msgstr ""
+
+msgid "background color in xfer buffer"
+msgstr ""
+
+msgid "text color of selected line in xfer buffer"
 msgstr ""
 
 msgid "block size for sending packets, in bytes"
@@ -7806,6 +7803,11 @@ msgid "does not wait for ACK when sending file"
 msgstr ""
 
 msgid ""
+"IP or DNS address used for sending files/chats (if empty, local interface IP "
+"is used)"
+msgstr ""
+
+msgid ""
 "restricts outgoing files/chats to use only ports in the given range (useful "
 "for NAT) (syntax: a single port, ie. 5000 or a port range, ie. 5000-5015, "
 "empty value means any port, it's recommended to use ports greater than 1024, "
@@ -7813,28 +7815,22 @@ msgid ""
 msgstr ""
 
 msgid ""
-"IP or DNS address used for sending files/chats (if empty, local interface IP "
-"is used)"
-msgstr ""
-
-msgid ""
 "speed limit for sending files, in kilo-bytes by second (0 means no limit)"
 msgstr ""
 
-msgid ""
-"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
-"\"~/.weechat\" by default)"
+msgid "timeout for xfer request (in seconds)"
 msgstr ""
 
-msgid ""
-"path for reading files when sending (when no path is specified by user) (\"%h"
-"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgid "automatically accept chat requests (use carefully!)"
 msgstr ""
 
-msgid "use remote nick as prefix in local filename when receiving a file"
+msgid "automatically accept incoming files (use carefully!)"
 msgstr ""
 
-msgid "convert spaces to underscores when sending files"
+msgid ""
+"comma-separated list of nicks for which the incoming files and chats are "
+"automatically accepted; format is \"server.nick\" (for a specific server) or "
+"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
 msgstr ""
 
 msgid "rename incoming files if already exists (add \".1\", \".2\", ...)"
@@ -7844,16 +7840,20 @@ msgid ""
 "automatically resume file transfer if connection with remote host is lost"
 msgstr ""
 
-msgid "automatically accept incoming files (use carefully!)"
+msgid "convert spaces to underscores when sending files"
 msgstr ""
 
-msgid "automatically accept chat requests (use carefully!)"
+msgid ""
+"path for writing incoming files (\"%h\" will be replaced by WeeChat home, "
+"\"~/.weechat\" by default)"
 msgstr ""
 
 msgid ""
-"comma-separated list of nicks for which the incoming files and chats are "
-"automatically accepted; format is \"server.nick\" (for a specific server) or "
-"\"nick\" (for all servers); example: \"freenode.FlashCode,andrew\""
+"path for reading files when sending (when no path is specified by user) (\"%h"
+"\" will be replaced by WeeChat home, \"~/.weechat\" by default)"
+msgstr ""
+
+msgid "use remote nick as prefix in local filename when receiving a file"
 msgstr ""
 
 msgid "list of xfer"