core: update translations

2026-06-12 14:14:48 +02:00 · 2018-03-19 21:50:21 +01:00
parent 8582f281f2
commit 671ffbe352
19 changed files with 310 additions and 271 deletions
@@ -74,7 +74,7 @@ Beispiele:
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
@@ -86,60 +86,62 @@ Beispiele:
         get <property>
         <number>|-|+|<name>

-    list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-     add: öffnet einen neuen Buffer (dieser kann mit "/buffer close" oder "q" in der Eingabezeile, beendet werden)
-   clear: leert den Inhalt des Buffers (entweder durch Angabe der entsprechenden Nummer des Buffers oder "-merged " für zusammengefügte Buffer oder "-all" für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht)
-    move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1); "-" = auf erste Position verschieben, "+" = auf letzte Position + 1 verschieben
-    swap: tauscht zwei Buffer miteinander aus (bei Angabe von nur einem Buffer (Buffernummer/-name), wird der aktuelle Buffer mit dem angegebenen Buffer getauscht)
-   cycle: springt in einer Schleife von einem Buffer zum nächsten, die in einer Liste angegeben werden
-   merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht eine Zusammenfügung von zwei Buffer
-         (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden)
- unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen
-    hide: versteckt einen Buffer
-  unhide: macht Buffer wieder sichtbar
-renumber: Buffer werden um nummeriert (Einstellung weechat.look.buffer_auto_renumber muss deaktiviert sein)
-   close: Buffer schließen (Nummer oder Bereich ist optional)
-  notify: setzt den Status der Benachrichtigung für den aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung:
-            none: keine Benachrichtigung
-       highlight: Benachrichtigung bei hervorgehobenen Nachrichten (Highlights)
-         message: Benachrichtigung bei Nachrichten von Usern + Highlights
-             all: Benachrichtigung bei allen Nachrichten
-           reset: Benachrichtigung auf Standardwert zurück setzen (all)
-localvar: zeigt die lokalen Variablen für den aktuellen Buffer an
-     set: setzt eine Eigenschaft für den aktuellen Buffer
-     get: zeigt eine Eigenschaft für den aktuellen Buffer an
-  number: wechselt von einem Buffer zu einem anderen, mögliche Optionen:
-          '+': relativer Sprung um 'n'-Buffer
-          '-': relativer Sprung, um 'n'-Buffer
-          '*': wechselt zum Buffer mit der Nummer 'n'; nutzt die interne Einstellung "weechat.look.jump_current_to_previous_buffer"
-       -: springt zum ersten Buffer
-       +: springt zum letzten Buffer
-    name: wechselt zum Buffer mit dem angegebenen Namen (Name muss nicht vollständig sein!)
+    list: list buffers (without argument, this list is displayed)
+     add: add a new buffer (it can be closed with "/buffer close" or input "q")
+   clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer)
+    move: move buffer in the list (may be relative, for example -1); "-" = move to first buffer number, "+" = move to last buffer number + 1
+    swap: swap two buffers (swap with current buffer if only one number/name given)
+   cycle: jump loop between a list of buffers
+   merge: merge current buffer to another buffer (chat area will be mix of both buffers)
+          (by default ctrl-x switches between merged buffers)
+ unmerge: unmerge buffer from other buffers which have same number
+    hide: hide the buffer
+  unhide: unhide the buffer
+renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off)
+   close: close buffer (number/range or name is optional)
+  notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not:
+               none: never
+          highlight: for highlights only
+            message: for messages from users + highlights
+                all: all messages
+              reset: reset to default value (all)
+localvar: display local variables for current buffer
+     set: set a property for current buffer
+     get: display a property of current buffer
+  number: jump to buffer by number, possible prefix:
+          '+': relative jump, add number to current
+          '-': relative jump, sub number to current
+          '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer"
+       -: jump to first buffer number
+       +: jump to last buffer number
+    name: jump to buffer by (partial) name

-Beispiele:
-  leert den aktuellen Buffer:
+Examples:
+  clear current buffer:
    /buffer clear
-  verschiebt Buffer auf Position 5:
+  move buffer to number 5:
    /buffer move 5
-  tauscht Buffer 1 und 3:
+  swap buffer 1 with 3:
    /buffer swap 1 3
-  tauscht Buffer #weechat und den aktuellen Buffer:
+  swap buffer #weechat with current buffer:
    /buffer swap #weechat
-  springt in einer Schleife zu den Buffern #chan1, #chan2, #chan3:
+  jump on #chan1, #chan2, #chan3 and loop:
    /buffer cycle #chan1 #chan2 #chan3
-  verbindet Buffer mit dem Core-Buffer:
+  merge with core buffer:
    /buffer merge 1
-  trennt Buffer voneinander:
+  merge with #weechat buffer:
+    /buffer merge #weechat
+  unmerge buffer:
    /buffer unmerge
-  schließt aktuellen Buffer:
+  close current buffer:
    /buffer close
-  schließt Buffer 5 bis 7:
+  close buffers 5 to 7:
    /buffer close 5-7
-  wechselt zum Buffer: #weechat:
+  jump to #weechat:
    /buffer #weechat
-  wechselt zum nächsten Buffer:
+  jump to next buffer:
    /buffer +1
-  springt zum letzten Buffer:
+  jump to last buffer number:
    /buffer +
 ----

@@ -74,7 +74,7 @@ Examples:
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
@@ -129,6 +129,8 @@ Examples:
    /buffer cycle #chan1 #chan2 #chan3
  merge with core buffer:
    /buffer merge 1
+  merge with #weechat buffer:
+    /buffer merge #weechat
  unmerge buffer:
    /buffer unmerge
  close current buffer:
@@ -74,7 +74,7 @@ Exemples :
         move <nombre>|-|+
         swap <nombre1>|<nom1> [<nombre2>|<nom2>]
         cycle <nombre>|<nom> [<nombre>|<nom>...]
-         merge <nombre>
+         merge <nombre>|<nom>
         unmerge [<nombre>|-all]
         hide [<nombre>|<nom>|-all [<nombre>|<nom>...]]
         unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]]
@@ -129,6 +129,8 @@ Exemples :
    /buffer cycle #canal1 #canal2 #canal3
  mélanger avec le tampon core :
    /buffer merge 1
+  mélanger avec le tampon #weechat :
+    /buffer merge #weechat
  détacher le tampon :
    /buffer unmerge
  fermer le tampon courant :
@@ -74,7 +74,7 @@ Examples:
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
@@ -129,6 +129,8 @@ Examples:
    /buffer cycle #chan1 #chan2 #chan3
  merge with core buffer:
    /buffer merge 1
+  merge with #weechat buffer:
+    /buffer merge #weechat
  unmerge buffer:
    /buffer unmerge
  close current buffer:
@@ -74,7 +74,7 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態
         move <number>|-|+
         swap <number1>|<name1> [<number2>|<name2>]
         cycle <number>|<name> [<number>|<name>...]
-         merge <number>
+         merge <number>|<name>
         unmerge [<number>|-all]
         hide [<number>|<name>|-all [<number>|<name>...]]
         unhide [<number>|<name>|-all [<number>|<name>...]]
@@ -86,60 +86,62 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態
         get <property>
         <number>|-|+|<name>

-    list: バッファをリストアップ (引数無しの場合、このリストが表示されます)
-     add: 新しいバッファを追加 (バッファを閉じるには "/buffer close" または "q" を使ってください)
-   clear: バッファの内容を削除 (number はバッファ番号、マージバッファに対しては -merged、全てのバッファに対しては -all、何も無ければ現在のバッファ)
-    move: リストにバッファを移動 (相対指定も可能、例えば -1); "-" = 最初のバッファ番号に移動、"+" = 最後のバッファ番号 + 1 に移動
-    swap: 2 つのバッファを入れ替え (現在のバッファと引数で与えた番号/名称で指定されるバッファを入れ替える)
-   cycle: 指定したバッファ間でバッファを循環させる
-   merge: 現在のバッファを他のバッファにマージ (2 つのバッファのチャットエリアが一緒になります)
-          (デフォルトでは ctrl-x でマージバッファの切り替え)
- unmerge: 同じ番号を持つ他のバッファとのマージを解除
-    hide: バッファを隠す
-  unhide: バッファを隠すことを止める
-renumber: バッファを記憶 (weechat.look.buffer_auto_renumber オプションがオフの場合にのみ有効)
-   close: バッファを閉じる (番号/範囲または名前は任意)
-  notify: 現在のバッファの通知レベルを設定: このレベルでバッファがホットリストに追加されるかどうかを定義します:
-               none: 通知しない
-          highlight: ハイライトがあった場合のみ通知
-            message: ユーザからのメッセージとハイライトがあった場合に通知
-                all: 全てのメッセージを通知
-              reset: デフォルトの値 (all) にリセット
-localvar: 現在のバッファのローカル変数を表示
-     set: 現在のバッファのプロパティを設定
-     get: 現在のバッファのプロパティを表示
-  number: 番号でバッファ移動、可能なプレフィックス:
-          '+': 相対移動、現在の番号に数を足す
-          '-': 相対移動、現在の番号から数を引く
-          '*': 番号に移動、オプション "weechat.look.jump_current_to_previous_buffer" が使われる
-       -: 最初のバッファ番号に移動
-       +: 最後のバッファ番号に移動
-    name: バッファ名 (一部) でバッファに移動
+    list: list buffers (without argument, this list is displayed)
+     add: add a new buffer (it can be closed with "/buffer close" or input "q")
+   clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer)
+    move: move buffer in the list (may be relative, for example -1); "-" = move to first buffer number, "+" = move to last buffer number + 1
+    swap: swap two buffers (swap with current buffer if only one number/name given)
+   cycle: jump loop between a list of buffers
+   merge: merge current buffer to another buffer (chat area will be mix of both buffers)
+          (by default ctrl-x switches between merged buffers)
+ unmerge: unmerge buffer from other buffers which have same number
+    hide: hide the buffer
+  unhide: unhide the buffer
+renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off)
+   close: close buffer (number/range or name is optional)
+  notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not:
+               none: never
+          highlight: for highlights only
+            message: for messages from users + highlights
+                all: all messages
+              reset: reset to default value (all)
+localvar: display local variables for current buffer
+     set: set a property for current buffer
+     get: display a property of current buffer
+  number: jump to buffer by number, possible prefix:
+          '+': relative jump, add number to current
+          '-': relative jump, sub number to current
+          '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer"
+       -: jump to first buffer number
+       +: jump to last buffer number
+    name: jump to buffer by (partial) name

-例:
-  現在のバッファの内容を消去:
+Examples:
+  clear current buffer:
    /buffer clear
-  バッファを 5 番に移動:
+  move buffer to number 5:
    /buffer move 5
-  バッファ 1 番と 3 番を入れ替え:
+  swap buffer 1 with 3:
    /buffer swap 1 3
-  現在のバッファと #weechat バッファを入れ替え:
+  swap buffer #weechat with current buffer:
    /buffer swap #weechat
-  #chan1、#chan2、#chan3 に移動してそれを繰り返す:
+  jump on #chan1, #chan2, #chan3 and loop:
    /buffer cycle #chan1 #chan2 #chan3
-  コアバッファとマージ:
+  merge with core buffer:
    /buffer merge 1
-  バッファマージの解除:
+  merge with #weechat buffer:
+    /buffer merge #weechat
+  unmerge buffer:
    /buffer unmerge
-  現在のバッファを閉じる:
+  close current buffer:
    /buffer close
-  バッファ番号 5 から 7 を閉じる:
+  close buffers 5 to 7:
    /buffer close 5-7
-  #weechat バッファに移動:
+  jump to #weechat:
    /buffer #weechat
-  次のバッファに移動:
+  jump to next buffer:
    /buffer +1
-  最後のバッファ番号に移動:
+  jump to last buffer number:
    /buffer +
 ----

@@ -69,77 +69,79 @@ Przykłady:

 ----
 /buffer  list
-         add [-free] [-switch] <nazwa>
-         clear [<numer>|<nazwa>|-merged|-all [<numer>|<nazwa>...]]
-         move <numer>|-|+
-         swap <numer1>|<nazwa1> [<numer2>|<nazwa2>]
-         cycle <numer>|<nazwa> [<numer>|<nazwa>...]
-         merge <numer>
-         unmerge [<numer>|-all]
-         hide [<numer>|<nazwa>|-all [<numer>|<nazwa>...]]
-         unhide [<numer>|<nazwa>|-all [<numer>|<nazwa>...]]
-         renumer [<numer1> [<numer2> [<start>]]]
-         close [<n1>[-<n2>]|<nazwa>]
-         notify <poziom>
+         add [-free] [-switch] <name>
+         clear [<number>|<name>|-merged|-all [<number>|<name>...]]
+         move <number>|-|+
+         swap <number1>|<name1> [<number2>|<name2>]
+         cycle <number>|<name> [<number>|<name>...]
+         merge <number>|<name>
+         unmerge [<number>|-all]
+         hide [<number>|<name>|-all [<number>|<name>...]]
+         unhide [<number>|<name>|-all [<number>|<name>...]]
+         renumber [<number1> [<number2> [<start>]]]
+         close [<n1>[-<n2>]|<name>]
+         notify <level>
         localvar
-         set <opcja> [<value>]
-         get <opcja>
-         <numer>|-|+|<nazwa>
+         set <property> [<value>]
+         get <property>
+         <number>|-|+|<name>

-    list: wyświetla listę buforów (bez podania argumenty wyświetlana jest ta lista)
-     add: dodaje nowy bufor (może zotać zamknięty komendą "/buffer close" albo "q")
-   clear: czyści zawartość bufora (numer bufora, -merged dla połączonych buforów, -all dla wszystkich buforów, lub nic dla obecnego bufora)
-    move: przesuwa bufor na liście (może być względne, np -1); "-" = przesuwa na pierwszy numer, "+" = przesuwa na ostatni numer bufora +1
-    swap: zamienia miejscami dwa bufory (zamienia z obecnym buforem, jeśli podano tylko jeden numer/nazwę)
-   cycle: przełącza w pętli między listą buforów
-   merge: łączy obecny bufor z innym (obszar rozmowy zostanie pomieszany między oba bufory)
-          (domyślnie ctrl-x przełącza pomiędzy połączonymi buforami)
- unmerge: odłącza bufor od innych mających taki sam numer
-    hide: ukrywa bufor
-  unhide: przywraca ukryty bufor
-renumber: zmienia numer bufora (działa tylko, jeśli opcja weechat.look.buffer_auto_renumber jest wyłączona)
-   close: zamyka bufor (numer/przedział są opcjonalne)
-  notify: ustawia poziom powiadomień dla obecnego bufora: ten poziom określa czy bufor zostanie dodany do hotlisty czy nie:
-               none: nigdy
-          highlight: tylko dla higlightów
-            message: wiadomości od użytkowników + highlighty
-                all: wszystkie wiadomości
-              reset: przywraca wartości domyślne (all)
-localvar: wyświetla zmienne lokalne obecnego bufora
-     set: ustawia właściwość obecnego bufora
-     get: wyświetla właściwości obecnego bufora
-  numer: przechodzi do bufora o numerze, dostępne prefiksy:
-          '+': przejście względne, dodaje numer do obecnego
-          '-': przejście względne, odejmuje numer od obecnego
-          '*': przejście do numeru, używając opcji "weechat.look.jump_current_to_previous_buffer"
-       -: przejście do pierwszego bufora
-       +: przejście do ostatniego bufora
-    nazwa: przejście do bufora o (częściowej) nazwie
+    list: list buffers (without argument, this list is displayed)
+     add: add a new buffer (it can be closed with "/buffer close" or input "q")
+   clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer)
+    move: move buffer in the list (may be relative, for example -1); "-" = move to first buffer number, "+" = move to last buffer number + 1
+    swap: swap two buffers (swap with current buffer if only one number/name given)
+   cycle: jump loop between a list of buffers
+   merge: merge current buffer to another buffer (chat area will be mix of both buffers)
+          (by default ctrl-x switches between merged buffers)
+ unmerge: unmerge buffer from other buffers which have same number
+    hide: hide the buffer
+  unhide: unhide the buffer
+renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off)
+   close: close buffer (number/range or name is optional)
+  notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not:
+               none: never
+          highlight: for highlights only
+            message: for messages from users + highlights
+                all: all messages
+              reset: reset to default value (all)
+localvar: display local variables for current buffer
+     set: set a property for current buffer
+     get: display a property of current buffer
+  number: jump to buffer by number, possible prefix:
+          '+': relative jump, add number to current
+          '-': relative jump, sub number to current
+          '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer"
+       -: jump to first buffer number
+       +: jump to last buffer number
+    name: jump to buffer by (partial) name

-Przykłady:
-  czyści zawartość obecnego bufora:
+Examples:
+  clear current buffer:
    /buffer clear
-  przenosi bufor na numer 5:
+  move buffer to number 5:
    /buffer move 5
-  zamienia bufor 1 z 3:
+  swap buffer 1 with 3:
    /buffer swap 1 3
-  zamienia bufor #weechat z obecnym buforem:
+  swap buffer #weechat with current buffer:
    /buffer swap #weechat
-  przełączajw pętli między #chan1, #chan2, #chan3:
+  jump on #chan1, #chan2, #chan3 and loop:
    /buffer cycle #chan1 #chan2 #chan3
-  łączy z głównym buforem:
+  merge with core buffer:
    /buffer merge 1
-  odłącza bufory:
+  merge with #weechat buffer:
+    /buffer merge #weechat
+  unmerge buffer:
    /buffer unmerge
-  zamyka obecny bufor:
+  close current buffer:
    /buffer close
-  zamyka bufory od 5 do 7:
+  close buffers 5 to 7:
    /buffer close 5-7
-  przechodzi do #weechat:
+  jump to #weechat:
    /buffer #weechat
-  przechodzi do następnego bufora:
+  jump to next buffer:
    /buffer +1
-  przechodzi do ostatniego bufora:
+  jump to last buffer number:
    /buffer +
 ----

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1182,11 +1182,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge "
 "[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set "
@@ -1245,6 +1245,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-03-17 08:03+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -1207,15 +1207,16 @@ msgstr ""
 msgid "manage buffers"
 msgstr "Buffer verwalten"

+#, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
@@ -1226,6 +1227,7 @@ msgstr ""
 "notify <level> || localvar || set <property> [<value>] || get <property> || "
 "<number>|-|+|<name>"

+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "     add: add a new buffer (it can be closed with \"/buffer close\" or input "
@@ -1278,6 +1280,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1178,11 +1178,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nombre>|-merged|-all] || move|merge <número> ||  "
 "swap<número1>|<nombre1> [<número2>|<nombre2>] || unmerge [<número>|-all] || "
@@ -1242,6 +1242,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
-"PO-Revision-Date: 2018-03-16 20:14+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
+"PO-Revision-Date: 2018-03-19 21:49+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -1187,20 +1187,20 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <nom> || clear [<nombre>|<nom>|-merged|-all "
 "[<nombre>|<nom>...]] || move <nombre>|-|+ || swap <nombre1>|<nom1> "
 "[<nombre2>|<nom2>] || cycle <nombre>|<nom> [<nombre>|<nom>...] || merge "
-"<nombre> || unmerge [<nombre>|-all] || hide [<nombre>|<nom>|-all [<nombre>|"
-"<nom>...]] || unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || renumber "
-"<nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>] || notify "
-"<niveau> || localvar || set <propriété> [<valeur>] || get <propriété> || "
-"<nombre>|<nom>"
+"<nombre>|<nom> || unmerge [<nombre>|-all] || hide [<nombre>|<nom>|-all "
+"[<nombre>|<nom>...]] || unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || "
+"renumber <nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>] || "
+"notify <niveau> || localvar || set <propriété> [<valeur>] || get <propriété> "
+"|| <nombre>|<nom>"

 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
@@ -1254,6 +1254,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -1322,6 +1324,8 @@ msgstr ""
 "    /buffer cycle #canal1 #canal2 #canal3\n"
 "  mélanger avec le tampon core :\n"
 "    /buffer merge 1\n"
+"  mélanger avec le tampon #weechat :\n"
+"    /buffer merge #weechat\n"
 "  détacher le tampon :\n"
 "    /buffer unmerge\n"
 "  fermer le tampon courant :\n"
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-01-06 13:50+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1152,11 +1152,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""

 #, fuzzy
@@ -1212,6 +1212,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1156,11 +1156,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || swap "
 "<numero1>|<nome1> [<numero2>|<nome2>] || unmerge [<numero>|-all] || close "
@@ -1220,6 +1220,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-03-17 09:00+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -1162,15 +1162,16 @@ msgstr ""
 msgid "manage buffers"
 msgstr "バッファの管理"

+#, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
@@ -1181,6 +1182,7 @@ msgstr ""
 "notify <level> || localvar || set <property> [<value>] || get <property> || "
 "<number>|-|+|<name>"

+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "     add: add a new buffer (it can be closed with \"/buffer close\" or input "
@@ -1233,6 +1235,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-03-17 18:00+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <>\n"
@@ -30,8 +30,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10"
-" || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 2.0\n"

 msgid "any string"
@@ -188,8 +188,8 @@ msgid ""
 "                           (by default in headless mode WeeChat is blocking "
 "and does not run in background)\n"
 msgstr ""
-"                           (domyślnie w trybie bez interfejsu WeeChat nie"
-" uruchamia się w tle)\n"
+"                           (domyślnie w trybie bez interfejsu WeeChat nie "
+"uruchamia się w tle)\n"

 #, c-format
 msgid "Error: missing argument for \"%s\" option\n"
@@ -1190,15 +1190,16 @@ msgstr ""
 msgid "manage buffers"
 msgstr "zarządzaj buforami"

+#, fuzzy
 msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || add [-free] [-switch] <nazwa> || clear [<numer>|<nazwa>|-merged|-all "
 "[<numer>|<nazwa>...]] || move <numer>|-|+ || swap <numer1>|<nazwa1> "
@@ -1209,6 +1210,7 @@ msgstr ""
 "notify <poziom> || localvar || set <opcja> [<value>] || get <opcja> || "
 "<numer>|-|+|<nazwa>"

+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "     add: add a new buffer (it can be closed with \"/buffer close\" or input "
@@ -1261,6 +1263,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -6219,8 +6223,8 @@ msgstr ""
 "zostanie znaleziony zostanie utworzony nowy bufor o nazwie \"exec.exec.xxx"
 "\")\n"
 "      -l: wyświetl lokalnie wyście z komendy w buforze (domyślne)\n"
-"      -o: wyślij wyjście z komendy do bufora (nie kompatybilne z opcjami"
-" -bg/-pipe/-hsignal)\n"
+"      -o: wyślij wyjście z komendy do bufora (nie kompatybilne z opcjami -"
+"bg/-pipe/-hsignal)\n"
 "     -oc: wysyła wyjście komendy do bufora i wykonuje komendy (linie "
 "zaczynające się od \"/\" lub własnego znaku komendy) (nie kompatybilne z "
 "opcjami -bg/-pipe/-hsignal)\n"
@@ -9082,8 +9086,8 @@ msgstr ""
 "SHA-256, 20 znaków dla SHA-1 (mało bezpieczne, nie zalecane); wiele skrótów "
 "można oddzielić przecinkami; jeśli ta opcja jest ustawiona, certyfikat NIE "
 "jest dalej sprawdzany (opcja \"ssl_verify\") (uwaga: zawartość jest "
-"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci "
+"${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"

 msgid "check that the SSL connection is fully trusted"
 msgstr "sprawdź czy połączenie ssl jest w pełni zaufane"
@@ -9094,8 +9098,8 @@ msgid ""
 "the server name)"
 msgstr ""
 "hasło dla serwera (uwaga: zawartość jest przetwarzana zobacz /help eval; "
-"opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz "
-"${server} jest zastępowany nazwą serwera)"
+"opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server} "
+"jest zastępowany nazwą serwera)"

 #. TRANSLATORS: please keep words "client capabilities" between brackets if translation is different (see fr.po)
 msgid ""
@@ -9128,10 +9132,9 @@ msgid ""
 "name)"
 msgstr ""
 "nazwa użytkownika dla uwierzytelniania SASL; ta opcja nie jest używana dla "
-"mechanizmu \"external\"  (uwaga: zawartość jest przetwarzana, zobacz /help"
-" eval; "
-"opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server} "
-"jest zastępowany nazwą serwera)"
+"mechanizmu \"external\"  (uwaga: zawartość jest przetwarzana, zobacz /help "
+"eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz "
+"${server} jest zastępowany nazwą serwera)"

 msgid ""
 "password for SASL authentication; this option is not used for mechanisms "
@@ -9141,8 +9144,8 @@ msgid ""
 msgstr ""
 "hasło dla uwierzytelniania SASL; ta opcja nie jest używana dla mechanizmów "
 "\"ecdsa-nist256p-challenge\" oraz \"external\"  (uwaga: zawartość jest "
-"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci "
+"${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "file with ECC private key for mechanism \"ecdsa-nist256p-challenge\" (\"%h\" "
@@ -9182,10 +9185,9 @@ msgid ""
 "see /help eval; server options are evaluated with ${irc_server.xxx} and "
 "${server} is replaced by the server name)"
 msgstr ""
-"nicki do użycia na serwerze (oddzielone przecinkiem) (uwaga: "
-"zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać"
-" użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"nicki do użycia na serwerze (oddzielone przecinkiem) (uwaga: zawartość jest "
+"przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w postaci "
+"${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "get an alternate nick when all the declared nicks are already used on "
@@ -9203,21 +9205,18 @@ msgid ""
 "server options are evaluated with ${irc_server.xxx} and ${server} is "
 "replaced by the server name)"
 msgstr ""
-"nazwa użytkownika używana na serwerze (uwaga: zawartość jest przetwarzana"
-" zobacz /help eval; "
-"opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz ${server}"
-" jest zastępowany nazwą serwera)"
+"nazwa użytkownika używana na serwerze (uwaga: zawartość jest przetwarzana "
+"zobacz /help eval; opcje serwera mogą zostać użytego w postaci ${irc_server."
+"xxx} oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "real name to use on server (note: content is evaluated, see /help eval; "
 "server options are evaluated with ${irc_server.xxx} and ${server} is "
 "replaced by the server name)"
 msgstr ""
-"real name używany na serwerze (uwaga: zawartość jest przetwarzana zobacz"
-" /help "
-"eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} oraz"
-" ${server} "
-"jest zastępowany nazwą serwera)"
+"real name używany na serwerze (uwaga: zawartość jest przetwarzana zobacz /"
+"help eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} "
+"oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "custom local hostname/IP for server (optional, if empty local hostname is "
@@ -9238,8 +9237,8 @@ msgstr ""
 "komend oraz automatycznym wejściem na kanały; przykłady \"+R\" (w celu "
 "ustawienia trybu \"R\"), \"+R-i\" (w celu utawienia trbu \"R\" i zdjęcia "
 "trybu \"i\"); zobacz /help mode dla pełnej lity składni (uwaga: zawartość "
-"jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać użytego w "
+"postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "command(s) to run after connection to server and before auto-join of "
@@ -9253,8 +9252,8 @@ msgstr ""
 "wejściem na kanały (wiele komend powinno zostać oddzielone \";\", użyj \"\\;"
 "\" dla średnika, specjalne zmienne $nick, $channel oraz $server są "
 "zastępowane ich wartościami) (uwaga: zawartość jest przetwarzana, zobacz /"
-"help eval; opcje serwera mogą zostać użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"help eval; opcje serwera mogą zostać użytego w postaci ${irc_server.xxx} "
+"oraz ${server} jest zastępowany nazwą serwera)"

 msgid ""
 "delay (in seconds) after execution of command and before auto-join of "
@@ -9279,9 +9278,9 @@ msgstr ""
 "muszą znajdować się na początku listy, wszystkie hasła muszą zostać podane "
 "po kanałach (oddzielone spacją) (przykład: \"#kanał1,#kanał2,#kanał3 hasło1,"
 "hasło2\", gdzie #kanał1 i #kanał2 wymagają odpowiednio hasło1 i hasło2) "
-"(zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać"
-" użytego "
-"w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą serwera)"
+"(zawartość jest przetwarzana, zobacz /help eval; opcje serwera mogą zostać "
+"użytego w postaci ${irc_server.xxx} oraz ${server} jest zastępowany nazwą "
+"serwera)"

 msgid ""
 "automatically rejoin channels after kick; you can define a buffer local "
@@ -11116,10 +11115,9 @@ msgid ""
 "flush (see man fsync); this is slower but should prevent any data loss in "
 "case of power failure during the save of log file"
 msgstr ""
-"użyj fsync do synchronizacji plików z logami z zewnętrznym nośnikiem (zobacz"
-" man "
-"fsync); jest to wolniejsze ale powinno zapobiec utracie danych w przypadku "
-"zaniku napięcia podczas zapisu plików z logami"
+"użyj fsync do synchronizacji plików z logami z zewnętrznym nośnikiem (zobacz "
+"man fsync); jest to wolniejsze ale powinno zapobiec utracie danych w "
+"przypadku zaniku napięcia podczas zapisu plików z logami"

 msgid "write information line in log file when log starts or ends for a buffer"
 msgstr ""
@@ -13925,4 +13923,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s"
 #, c-format
 msgid "%s%s: unable to connect: unexpected error (%d)"
 msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)"
-
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -1181,11 +1181,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all [<número>|<nome>...]] || move "
 "<número>|-|+ || swap <número1>|<nome1> [<número2>|<nome2>] || cycle <número>|"
@@ -1248,6 +1248,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-02-05 21:30+0100\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1199,11 +1199,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""
 "list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap "
 "<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close "
@@ -1264,6 +1264,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2018-01-06 13:50+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1173,11 +1173,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""

 #, fuzzy
@@ -1233,6 +1233,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2017-06-26 23:33+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1043,11 +1043,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""

 msgid ""
@@ -1102,6 +1102,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2018-03-16 20:13+0100\n"
+"POT-Creation-Date: 2018-03-19 21:48+0100\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -1047,11 +1047,11 @@ msgid ""
 "list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
 "[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
 "[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
-"<number> || unmerge [<number>|-all] || hide [<number>|<name>|-all [<number>|"
-"<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] || "
-"renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || "
-"notify <level> || localvar || set <property> [<value>] || get <property> || "
-"<number>|-|+|<name>"
+"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
+"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
+"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
+"|| notify <level> || localvar || set <property> [<value>] || get <property> "
+"|| <number>|-|+|<name>"
 msgstr ""

 msgid ""
@@ -1106,6 +1106,8 @@ msgid ""
 "    /buffer cycle #chan1 #chan2 #chan3\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
+"  merge with #weechat buffer:\n"
+"    /buffer merge #weechat\n"
 "  unmerge buffer:\n"
 "    /buffer unmerge\n"
 "  close current buffer:\n"