--- a/cmdopts.diff Wed May 15 13:32:42 2013 +0300
+++ b/cmdopts.diff Wed Nov 12 23:04:36 2014 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 1b0b563a81e6425da07c1da7ea4f947c4f3326cb
+# Parent 7a77fde8f7eea66ad121440646e1ffb63ad82749
[work-in-progress] Unified command option parsing
* complete change of commands.h interface
@@ -40,9 +40,9 @@
* misc:
* fix help for /buffer date
-diff -r 1b0b563a81e6 mcabber/doc/HOWTO_commands.mdwn
+diff -r 7a77fde8f7ee mcabber/doc/HOWTO_commands.mdwn
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/mcabber/doc/HOWTO_commands.mdwn Wed May 15 12:48:30 2013 +0300
++++ b/mcabber/doc/HOWTO_commands.mdwn Thu Aug 22 00:44:41 2013 +0300
@@ -0,0 +1,977 @@
+
+**New commands interface for MCabber**
@@ -1021,9 +1021,9 @@
+add your argument type to built-in types.
+
+<!-- vim: se ts=4 sw=4 et filetype=markdown tw=80: -->
-diff -r 1b0b563a81e6 mcabber/doc/help/cs/hlp_buffer.txt
---- a/mcabber/doc/help/cs/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/cs/hlp_buffer.txt
+--- a/mcabber/doc/help/cs/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/cs/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Přesune se o [n] řádků nahoru (výchozí: polovina obrazovky).
/buffer down [n]
@@ -1033,18 +1033,18 @@
Přesune se na první řádek po datu [datum] (formát: "RRRR-mm-dd").
/buffer % n
Přesune se na procentuální pozici n%.
-diff -r 1b0b563a81e6 mcabber/doc/help/cs/hlp_del.txt
---- a/mcabber/doc/help/cs/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/cs/hlp_del.txt
+--- a/mcabber/doc/help/cs/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/cs/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Smaže aktuální kontakt ze seznamu kontaktů (rosteru) a zruší povolení oznamování o stavu daného kontaktu (autorizaci) na obou stranách.
-diff -r 1b0b563a81e6 mcabber/doc/help/cs/hlp_move.txt
---- a/mcabber/doc/help/cs/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/cs/hlp_move.txt
+--- a/mcabber/doc/help/cs/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/cs/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [skupina]
@@ -1053,9 +1053,9 @@
Přesune aktuální kontakt do požadované skupiny. Není-li skupina zadána, přesune se kontakt do výchozí skupiny. Pokud skupina neexistuje, automaticky se založí.
+You can select other buddy that current using options --jid and --name.
Tip: V módu rozhovoru lze použít "/roster alternate" pro skok na přesunutý kontakt.
-diff -r 1b0b563a81e6 mcabber/doc/help/cs/hlp_rename.txt
---- a/mcabber/doc/help/cs/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/cs/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/cs/hlp_rename.txt
+--- a/mcabber/doc/help/cs/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/cs/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME jméno
@@ -1065,9 +1065,9 @@
+Přejmenuje aktuálního uživatele nebo skupinu na 'jméno'.
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/de/hlp_buffer.txt
---- a/mcabber/doc/help/de/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/de/hlp_buffer.txt
+--- a/mcabber/doc/help/de/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/de/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Scrollt den Puffer um n Zeilen hoch. Gibt man keine Zahl an, scrollt er um einen halben Bildschirm
/buffer down [n]
@@ -1077,18 +1077,18 @@
Springe zu der ersten Zeile nach dem Datum, welches im Format "JJJJ-mm-tt" anstatt [date] angegeben werden muss
/buffer % n
Springe zur Position "n" im Chatpuffer
-diff -r 1b0b563a81e6 mcabber/doc/help/de/hlp_del.txt
---- a/mcabber/doc/help/de/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/de/hlp_del.txt
+--- a/mcabber/doc/help/de/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/de/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Löscht den gerade ausgewählten Buddy vom Roster. Außerdem werden die automatischen Presence Benachrichtigungen vom/zum Buddy gestoppt.
-diff -r 1b0b563a81e6 mcabber/doc/help/de/hlp_move.txt
---- a/mcabber/doc/help/de/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/de/hlp_move.txt
+--- a/mcabber/doc/help/de/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/de/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,6 +1,7 @@
- /MOVE [groupname]
@@ -1098,9 +1098,9 @@
+You can select other buddy that current using options --jid and --name.
Tipp: Wenn der Chatmodus aktiviert ist, kannst du "/roster alternate" benutzen um zu dem gerade bewegten Buddy zu springen.
-diff -r 1b0b563a81e6 mcabber/doc/help/de/hlp_rename.txt
---- a/mcabber/doc/help/de/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/de/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/de/hlp_rename.txt
+--- a/mcabber/doc/help/de/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/de/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME name
@@ -1110,9 +1110,9 @@
+Setzt den Namen des gerade ausgewählten Buddys bzw. der ausgewählten Gruppe auf "name".
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/en/hlp_buffer.txt
---- a/mcabber/doc/help/en/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/en/hlp_buffer.txt
+--- a/mcabber/doc/help/en/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/en/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Scroll the buffer up [n] lines (default: half a screen)
/buffer down [n]
@@ -1122,9 +1122,9 @@
Jump to the first line after the specified [date] in the chat buffer (date format: "YYYY-mm-dd")
/buffer % n
Jump to position %n of the buddy chat buffer
-diff -r 1b0b563a81e6 mcabber/doc/help/en/hlp_del.txt
---- a/mcabber/doc/help/en/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/en/hlp_del.txt
+--- a/mcabber/doc/help/en/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/en/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
@@ -1132,9 +1132,9 @@
-Delete the current buddy from our roster, unsubscribe from its presence notification and unsubscribe it from ours.
+Delete the current buddy or one, specified with [jid] from our roster, unsubscribe from its presence notification and unsubscribe it from ours.
-diff -r 1b0b563a81e6 mcabber/doc/help/en/hlp_move.txt
---- a/mcabber/doc/help/en/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/en/hlp_move.txt
+--- a/mcabber/doc/help/en/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/en/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [groupname]
@@ -1143,9 +1143,9 @@
Move the current buddy to the requested group. If no group is specified, then the buddy is moved to the default group. If the group "groupname" doesn't exist, it is created.
+You can select other buddy that current using options --jid and --name.
Tip: if the chatmode is enabled, you can use "/roster alternate" to jump to the moved buddy.
-diff -r 1b0b563a81e6 mcabber/doc/help/en/hlp_rename.txt
---- a/mcabber/doc/help/en/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/en/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/en/hlp_rename.txt
+--- a/mcabber/doc/help/en/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/en/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME name
@@ -1155,9 +1155,9 @@
+Rename the current buddy or group to the given "newname".
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/fr/hlp_buffer.txt
---- a/mcabber/doc/help/fr/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/fr/hlp_buffer.txt
+--- a/mcabber/doc/help/fr/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/fr/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Défile vers le haut de [n] lignes (par défaut un demi écran)
/buffer down [n]
@@ -1167,18 +1167,18 @@
Va à la première ligne après la [date] dans le tampon actuel (format: "aaaa-mm-jj")
/buffer % n
Va à la position n% du tampon
-diff -r 1b0b563a81e6 mcabber/doc/help/fr/hlp_del.txt
---- a/mcabber/doc/help/fr/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/fr/hlp_del.txt
+--- a/mcabber/doc/help/fr/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/fr/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Supprime le contact sélectionné du roster, supprime notre abonnement à ses notifications de présence et supprime son abonnement aux nôtres.
-diff -r 1b0b563a81e6 mcabber/doc/help/fr/hlp_move.txt
---- a/mcabber/doc/help/fr/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/fr/hlp_move.txt
+--- a/mcabber/doc/help/fr/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/fr/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [groupname]
@@ -1187,9 +1187,9 @@
Déplace le contact sélectionné vers le groupe spécifié. Si aucun groupe n'est donné, le contact est déplacé vers le groupe par défaut. Si le groupe "groupname" n'existe pas, il est créé.
+You can select other buddy that current using options --jid and --name.
Astuce : si le mode discussion (chatmode) est activé, vous pouvez utiliser "/roster alternate" pour vous positionner sur le contact que vous venez de déplacer.
-diff -r 1b0b563a81e6 mcabber/doc/help/fr/hlp_rename.txt
---- a/mcabber/doc/help/fr/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/fr/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/fr/hlp_rename.txt
+--- a/mcabber/doc/help/fr/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/fr/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME nom
@@ -1199,9 +1199,9 @@
+Renomme le contact/groupe sélectionné avec le "nom" spécifié.
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/it/hlp_buffer.txt
---- a/mcabber/doc/help/it/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/it/hlp_buffer.txt
+--- a/mcabber/doc/help/it/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/it/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Fa scorrere indietro il buffer di [n] linee (default: metà schermo)
/buffer down [n]
@@ -1211,18 +1211,18 @@
Salta alla prima linea successiva alla [data] specificata nel buffer di chat (formato della data: "YYYY-mm-dd")
/buffer % n
Salta alla posizione %n del buffer di chat corrente
-diff -r 1b0b563a81e6 mcabber/doc/help/it/hlp_del.txt
---- a/mcabber/doc/help/it/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/it/hlp_del.txt
+--- a/mcabber/doc/help/it/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/it/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Elimina il contatto corrente dal roster, cancellando la sottoscrizione alle reciproche notifiche della propria presenza.
-diff -r 1b0b563a81e6 mcabber/doc/help/it/hlp_move.txt
---- a/mcabber/doc/help/it/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/it/hlp_move.txt
+--- a/mcabber/doc/help/it/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/it/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [gruppo]
@@ -1231,9 +1231,9 @@
Muove il contatto corrente nel gruppo richiesto. Se non viene specificato alcun gruppo, il contatto viene spostato nel gruppo si default. Se il gruppo "gruppo" non esiste, viene creato.
+You can select other buddy that current using options --jid and --name.
Trucco: se la modalità chat è abilitata, puoi usare "/roster alternate" per spostarti sul contatto appena mosso.
-diff -r 1b0b563a81e6 mcabber/doc/help/it/hlp_rename.txt
---- a/mcabber/doc/help/it/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/it/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/it/hlp_rename.txt
+--- a/mcabber/doc/help/it/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/it/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME nome
@@ -1243,9 +1243,9 @@
+Rinomina il contatto od il gruppo correnti usando "nome".
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/nl/hlp_buffer.txt
---- a/mcabber/doc/help/nl/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/nl/hlp_buffer.txt
+--- a/mcabber/doc/help/nl/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/nl/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Scroll de buffer [n] regels omhoog (standaard: een half scherm)
/buffer down [n]
@@ -1255,18 +1255,18 @@
Spring naar de eerste regel na de aangeduide [datum] in de chat buffer (datum formaat: "YYYY-mm-dd")
/buffer % n
Spring naar positie %n in de buddy chat buffer
-diff -r 1b0b563a81e6 mcabber/doc/help/nl/hlp_del.txt
---- a/mcabber/doc/help/nl/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/nl/hlp_del.txt
+--- a/mcabber/doc/help/nl/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/nl/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Verwijder de actieve buddy uit ons roster, en zet het wederzijds toezenden van status veranderingen stop.
-diff -r 1b0b563a81e6 mcabber/doc/help/nl/hlp_move.txt
---- a/mcabber/doc/help/nl/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/nl/hlp_move.txt
+--- a/mcabber/doc/help/nl/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/nl/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [groepsnaam]
@@ -1275,9 +1275,9 @@
Verplaats de actieve buddy naar de aangegeven groep. Indien geen groep werd gespecificeerd wordt buddy verplaatst naar de standaard groep. Indien de groep "groepsnaam" niet bestaat, wordt die eerst aangemaakt.
+You can select other buddy that current using options --jid and --name.
Tip: indien chatmode actief is, kun je "/roster alternate" gebruiken om direct naar de verplaatste buddy te springen.
-diff -r 1b0b563a81e6 mcabber/doc/help/nl/hlp_rename.txt
---- a/mcabber/doc/help/nl/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/nl/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/nl/hlp_rename.txt
+--- a/mcabber/doc/help/nl/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/nl/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME naam
@@ -1287,18 +1287,18 @@
+Hernoem de actieve buddy of groep in de aangegeven "naam".
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/pl/hlp_del.txt
---- a/mcabber/doc/help/pl/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/pl/hlp_del.txt
+--- a/mcabber/doc/help/pl/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/pl/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
+ /DEL [-n|--dryrun] [jid]
Usuwa aktualnie zaznaczoną osobę z rostera, usuwa subskrypcję powiadomienia dostępności u danej osoby oraz u nas.
-diff -r 1b0b563a81e6 mcabber/doc/help/pl/hlp_move.txt
---- a/mcabber/doc/help/pl/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/pl/hlp_move.txt
+--- a/mcabber/doc/help/pl/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/pl/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [nazwa grupy]
@@ -1307,9 +1307,9 @@
Przenosi aktualną osobę do grupy "nazwa grupy". Jeśli nie podano nazwy grupy, wtedy osoba jest przenoszona do grupy domyślnej. Jeśli grupa "nazwa grupy" nie istnieje, zostaje utworzona.
+You can select other buddy that current using options --jid and --name.
Podpowiedź: jeśli jest włączony tryb czatu, możesz użyć "/roster alternate" aby skoczyć do przeniesionej osoby.
-diff -r 1b0b563a81e6 mcabber/doc/help/pl/hlp_rename.txt
---- a/mcabber/doc/help/pl/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/pl/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/pl/hlp_rename.txt
+--- a/mcabber/doc/help/pl/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/pl/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME nazwa
@@ -1319,9 +1319,9 @@
+Zmienia nazwę aktualnej osoby lub grupy na "nazwa".
+If --reset is specified, "newname" is ignored and name will be reset to default - jid or username.
+Optionally you can use one of --jid, --group or --name to select object, different from current.
-diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_buffer.txt
---- a/mcabber/doc/help/ru/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/ru/hlp_buffer.txt
+--- a/mcabber/doc/help/ru/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/ru/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Перемещает на [n] строк вверх в буфере (истории переписки) (по умолчанию: половина экрана)
/buffer down [n]
@@ -1331,9 +1331,9 @@
Перемещает в первой строке после определенной даты [date] в буфере (истории переписки) (формат даты: "год-месяц-день", для примера "2006-01-01")
/buffer % n
Перемещает на позицию %n в текущем буфере (истории переписки)
-diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_del.txt
---- a/mcabber/doc/help/ru/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/ru/hlp_del.txt
+--- a/mcabber/doc/help/ru/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/ru/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
@@ -1341,9 +1341,9 @@
-Удаляет текущего пользователя из списка контактов, отключает уведомления о его статусе и отключает уведомления пользователя о вашем статусе.
+Удаляет текущего пользователя (или указанного с помощью jid) из списка контактов, отключает уведомления о его статусе и отключает уведомление пользователя о вашем статусе.
-diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_move.txt
---- a/mcabber/doc/help/ru/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/ru/hlp_move.txt
+--- a/mcabber/doc/help/ru/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/ru/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,6 +1,7 @@
- /MOVE [groupname]
@@ -1353,9 +1353,9 @@
+С помощью параметров --jid и --name можно перемещать контакты, отличные от текущего.
Полезно: Если включен режим чата (chatmode), Вы можете использовать "/roster alternate" для перехода к перемещенному пользователю.
-diff -r 1b0b563a81e6 mcabber/doc/help/ru/hlp_rename.txt
---- a/mcabber/doc/help/ru/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/ru/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/ru/hlp_rename.txt
+--- a/mcabber/doc/help/ru/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/ru/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME name
@@ -1365,9 +1365,9 @@
+Переименовывает текущего пользователя или группу в заданное имя "newname".
+Если указан параметр --reset, "newname" игнорируется, а имя сбрасывается (mcabber будет отображать JID или имя пользователя по умолчанию).
+Для указания обьекта, отличного от текущего, можно использовать опции --jid, --group и --name.
-diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_buffer.txt
---- a/mcabber/doc/help/uk/hlp_buffer.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_buffer.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/uk/hlp_buffer.txt
+--- a/mcabber/doc/help/uk/hlp_buffer.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/uk/hlp_buffer.txt Thu Aug 22 00:44:41 2013 +0300
@@ -25,7 +25,7 @@
Посунути буфер вверх на n рядків (якщо не вказано - пів екрану).
/buffer down [n]
@@ -1377,9 +1377,9 @@
Перейти до першого повідомлення після дати (дата вигляду РРРР-ММ-ДД).
/buffer % процент
Перейти до вказаної у процентах позиції.
-diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_del.txt
---- a/mcabber/doc/help/uk/hlp_del.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_del.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/uk/hlp_del.txt
+--- a/mcabber/doc/help/uk/hlp_del.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/uk/hlp_del.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,4 @@
- /DEL
@@ -1387,9 +1387,9 @@
-Потерти поточний контакт зі списку. На додачу відписатися від його повідомлень про статус і відписати його від ваших.
+Потерти поточний контакт (або контакт, що має вказаний jid) зі списку. Також відписатися від його сповіщень про статус і відписати його від ваших.
-diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_move.txt
---- a/mcabber/doc/help/uk/hlp_move.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_move.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/uk/hlp_move.txt
+--- a/mcabber/doc/help/uk/hlp_move.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/uk/hlp_move.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,5 +1,6 @@
- /MOVE [група]
@@ -1399,9 +1399,9 @@
+Переносить поточний контакт до вказаної групи. Якщо групу не вказати контакт опиниться у головній групі. Якщо групи не існує, її буде створено.
+За допомогою опцій --jid та --name можна перемістити контакт, відмінний від поточного.
Примітка: в режимі розмови можна використати "/roster alternate", щоб перейти до нового місця контакту контакту.
-diff -r 1b0b563a81e6 mcabber/doc/help/uk/hlp_rename.txt
---- a/mcabber/doc/help/uk/hlp_rename.txt Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/doc/help/uk/hlp_rename.txt Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/doc/help/uk/hlp_rename.txt
+--- a/mcabber/doc/help/uk/hlp_rename.txt Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/doc/help/uk/hlp_rename.txt Thu Aug 22 00:44:41 2013 +0300
@@ -1,4 +1,6 @@
- /RENAME ім'я
@@ -1410,9 +1410,9 @@
Змінює прізвисько поточного контакту або назву групи.
+За допомогою параметра --reset можна повернути контакту типову назву. При цьому нове ім’я (якщо вказане) ігнорується.
+Опції --jid, --group та --name дозволяють перейменовувати об’єкти, відмінні від поточного.
-diff -r 1b0b563a81e6 mcabber/mcabber/commands.c
---- a/mcabber/mcabber/commands.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/commands.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/commands.c
+--- a/mcabber/mcabber/commands.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/commands.c Thu Aug 22 00:44:41 2013 +0300
@@ -19,7 +19,7 @@
* USA
*/
@@ -1470,10 +1470,10 @@
+ def_clear,
+ def_info,
+ def_rename,
-+ def_move; // 15
++ def_move, // 15
+ def_set,
+ def_alias,
-+ def_bind,
++ def_bind;
+#if 0
+ def_connect,
+ def_disconnect,
@@ -6528,9 +6528,9 @@
+#endif
/* vim: set expandtab cindent cinoptions=>2\:2(0 sw=2 ts=2: For Vim users... */
-diff -r 1b0b563a81e6 mcabber/mcabber/commands.h
---- a/mcabber/mcabber/commands.h Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/commands.h Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/commands.h
+--- a/mcabber/mcabber/commands.h Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/commands.h Thu Aug 22 00:44:41 2013 +0300
@@ -5,32 +5,394 @@
#include <mcabber/config.h>
@@ -6946,9 +6946,9 @@
#endif /* __MCABBER_COMMANDS_H__ */
-diff -r 1b0b563a81e6 mcabber/mcabber/hooks.c
---- a/mcabber/mcabber/hooks.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/hooks.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/hooks.c
+--- a/mcabber/mcabber/hooks.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/hooks.c Thu Aug 22 00:44:41 2013 +0300
@@ -638,10 +638,9 @@
scr_LogPrint(LPRINT_LOGNORM, "Running hook-post-connect...");
@@ -6975,9 +6975,9 @@
g_free(cmdline);
}
-diff -r 1b0b563a81e6 mcabber/mcabber/roster.c
---- a/mcabber/mcabber/roster.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/roster.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/roster.c
+--- a/mcabber/mcabber/roster.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/roster.c Thu Aug 22 00:44:41 2013 +0300
@@ -1586,13 +1586,14 @@
// Look for a buddy whose name or jid contains string.
// Search begins at current_buddy; if no match is found in the the buddylist,
@@ -7016,9 +7016,9 @@
if (found)
return buddy;
}
-diff -r 1b0b563a81e6 mcabber/mcabber/screen.c
---- a/mcabber/mcabber/screen.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/screen.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/screen.c
+--- a/mcabber/mcabber/screen.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/screen.c Thu Aug 22 00:44:41 2013 +0300
@@ -3630,7 +3630,7 @@
{
scr_check_auto_away(TRUE);
@@ -7086,9 +7086,9 @@
g_free(cmdline);
return 0;
}
-diff -r 1b0b563a81e6 mcabber/mcabber/settings.c
---- a/mcabber/mcabber/settings.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/settings.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/settings.c
+--- a/mcabber/mcabber/settings.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/settings.c Thu Aug 22 00:44:41 2013 +0300
@@ -183,28 +183,12 @@
if ((*line == '\n') || (*line == '\0') || (*line == '#'))
continue;
@@ -7123,9 +7123,9 @@
}
g_free(buf);
fclose(fp);
-diff -r 1b0b563a81e6 mcabber/mcabber/xmpp_iq.c
---- a/mcabber/mcabber/xmpp_iq.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/mcabber/xmpp_iq.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/mcabber/xmpp_iq.c
+--- a/mcabber/mcabber/xmpp_iq.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/mcabber/xmpp_iq.c Thu Aug 22 00:44:41 2013 +0300
@@ -71,20 +71,20 @@
struct adhoc_status {
char *name; // the name used by adhoc
@@ -7172,9 +7172,9 @@
lm_message_node_set_attribute(command, "status", "completed");
lm_message_node_add_dataform_result(command,
"Status has been changed");
-diff -r 1b0b563a81e6 mcabber/modules/beep/beep.c
---- a/mcabber/modules/beep/beep.c Wed Mar 13 16:11:16 2013 +0200
-+++ b/mcabber/modules/beep/beep.c Wed May 15 12:48:30 2013 +0300
+diff -r 7a77fde8f7ee mcabber/modules/beep/beep.c
+--- a/mcabber/modules/beep/beep.c Sat Jul 13 21:05:39 2013 +0300
++++ b/mcabber/modules/beep/beep.c Thu Aug 22 00:44:41 2013 +0300
@@ -31,6 +31,7 @@
static void beep_init (void);