irc: add option irc.look.pv_buffer: automatically merge private buffers (optionally by server) (task #11924)

11 files changed, 55 insertions, 13 deletions

diff --git a/po/cs.po b/po/cs.po
index 81e8ed584..49e680d46 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-16 17:49+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5907,6 +5907,10 @@ msgstr ""
 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 "
diff --git a/po/de.po b/po/de.po
index e8ca07485..5db2a65bd 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -6480,6 +6480,10 @@ msgstr ""
 msgid "merge server buffers"
 msgstr "Server-Buffer zusammenfügen"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "Server-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 "
diff --git a/po/es.po b/po/es.po
index a8b31f242..85ea080db 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6127,6 +6127,10 @@ msgstr ""
 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 "
diff --git a/po/fr.po b/po/fr.po
index afba37d81..2876e04af 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
-"PO-Revision-Date: 2013-03-17 14:32+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
+"PO-Revision-Date: 2013-03-17 22:02+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -6302,7 +6302,10 @@ msgstr ""
 "strftime pour le format de date/heure)"
 
 msgid "merge server buffers"
-msgstr "mélange des tampons de serveur"
+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 "
diff --git a/po/hu.po b/po/hu.po
index 9b1d3ee65..ef6a3059b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-16 17:50+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5469,6 +5469,10 @@ msgstr ""
 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 "
diff --git a/po/it.po b/po/it.po
index f991b947f..ac6af2d6c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6130,6 +6130,10 @@ msgstr ""
 msgid "merge server buffers"
 msgstr "unisci i buffer dei server"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "unisci i buffer dei 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 "
diff --git a/po/ja.po b/po/ja.po
index e8cbe585d..197837a4a 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.1-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2013-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -6088,6 +6088,10 @@ msgstr ""
 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 "
diff --git a/po/pl.po b/po/pl.po
index 1ee7225ed..399882b58 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -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-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -6213,6 +6213,10 @@ msgstr ""
 msgid "merge server buffers"
 msgstr "połącz bufory serwerów"
 
+#, fuzzy
+msgid "merge private buffers"
+msgstr "połącz bufory serwerów"
+
 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 "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f16464e6..c06eba288 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -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-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-17 08:20+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5647,6 +5647,10 @@ msgstr ""
 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 "
diff --git a/po/ru.po b/po/ru.po
index b5550755e..1d8f3e736 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -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-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\n"
 "PO-Revision-Date: 2013-03-16 17:50+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -5491,6 +5491,10 @@ msgstr ""
 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 "
diff --git a/po/weechat.pot b/po/weechat.pot
index a2e4bec59..c614a2faa 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-03-17 13:00+0100\n"
+"POT-Creation-Date: 2013-03-17 22:01+0100\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"
@@ -4753,6 +4753,9 @@ 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 "