Tkabber

2016-01-03  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/general/gpgme.tcl: Fixed simultaneous encrypting and signing.
	  Moved drawing of GPG icons for outgoing messages from
	  rewrite_outgoing_message_hook to draw_message_hook. Translate the
	  'This message is encrypted.' auxiliary message to the recipient
	  language instead of our own.

	* msgs/ca.msg, msgs/de.msg, msgs/eo.msg, msgs/es.msg, msgs/eu.msg,
	  msgs/fr.msg, msgs/nl.msg, msgs/pl.msg, msgs/pt.msg, msgs/ro.msg,
	  msgs/ru.msg, msgs/uk.msg, trans/ca.msg, trans/de.msg, trans/eo.msg,
	  trans/es.msg, trans/eu.msg, trans/fr.msg, trans/nl.msg, trans/pl.msg,
	  trans/pt.msg, trans/ro.msg, trans/ru.msg, trans/uk.msg: Moved the
	  'This message is encrypted.' message translation to the trans/
	  subdirectory.

2016-01-02  Sergei Golovan  <sgolovan@nes.ru>

	* plugins/chat/empty_body.tcl, plugins/chat/open_window.tcl,
	  plugins/general/xaddress.tcl: Adjusted priorities for the
	  draw_message_hook hook procedures.

2016-01-01  Sergei Golovan  <sgolovan@nes.ru>

::msgcat::mcset ca "Text" "Text"
::msgcat::mcset ca "Text Color" "Color del text"
::msgcat::mcset ca "Text status, which is set when Tkabber is moving in away\
        state." "Text d'estatus que s'assignarà quan Tkabber et marque com a\
        absent."
::msgcat::mcset ca "text undo" "desfer text"
::msgcat::mcset ca "Text:" "Text:"


::msgcat::mcset ca "this option has been set and saved." "aquesta opció ha\
        sigut definida i guardada."
::msgcat::mcset ca "this option is unchanged from its standard setting." "la\
        definició estàndard d'aquesta opció no ha sigut canviada."
::msgcat::mcset ca "Time" "Hora"
::msgcat::mcset ca "time %s%s:" "temps %s%s:"
::msgcat::mcset ca "time %s%s: %s" "temps %s%s: %s"

        senden"
::msgcat::mcset de "Send subscription request to %s" "Autorisierungs-Anfrage\
        an %s senden"
::msgcat::mcset de "Subject: " "Betreff: "
::msgcat::mcset de "Subscription request from %s" "Autorisierungs-Anfrage von\
        %s"
::msgcat::mcset de "Subscription request from:" "Autorisierungs-Anfrage von:"


::msgcat::mcset de "To: " "An: "

# .../muc.tcl
::msgcat::mcset de "\n\tAffiliation: %s" "\n\tZugehörigkeit: %s"
::msgcat::mcset de "\n\tJID: %s" "\n\tJID: %s"
::msgcat::mcset de "\nAlternative venue: %s" "\nAlternativer Treffpunkt: %s"
::msgcat::mcset de "\nReason is: %s" "\nGrund ist: %s"

::msgcat::mcset eo "Send subscription" "Sendu abono"
::msgcat::mcset eo "Send subscription to " "Sendu abono al "
::msgcat::mcset eo "Send subscription to %s" "Sendu abono al %s"
::msgcat::mcset eo "Sort" "Klasi"
::msgcat::mcset eo "Subscribe" "Abonu"
::msgcat::mcset eo "Subscribe request from" "Abonopeto de"
::msgcat::mcset eo "Subscribe request from %s" "Abonopeto de %s"


::msgcat::mcset eo "Toggle seen" "Kapabligi/Malkapabligi viditado (seen)"
::msgcat::mcset eo "Unsubscribe" "Malabonu"
::msgcat::mcset eo "Headlines"

# muc.tcl
::msgcat::mcset eo "Ban" "Malpermesu"
::msgcat::mcset eo "Configure" "decidu opciojn"

::msgcat::mcset es "the option is taken from config file." "opción leída del\
        fichero de configuración."
::msgcat::mcset es "The signature is good but has expired" "La firma es buena\
        pero ha expirado"
::msgcat::mcset es "The signature is good but the key has expired" "La firma\
        es buena pero la llave ha expirado"
::msgcat::mcset es "thirsty" "sediento"

::msgcat::mcset es "This message was forwarded by %s\n" "Este mensaje fue\
        reenviado por %s\n"
::msgcat::mcset es "This message was forwarded to %s" "Este mensaje se\
        reenvió a %s"
::msgcat::mcset es "This message was sent by %s\n" "Este mensaje fue enviado\
        por %s\n"
::msgcat::mcset es "Time" "Hora"

::msgcat::mcset eu "Send subscription" "Harpidetza bidali"
::msgcat::mcset eu "Send subscription to " "Nori bidali harpidetza "
::msgcat::mcset eu "Send subscription to %s" "Nori bidali harpidetza %s"
::msgcat::mcset eu "Sort" "Sailkatu"
::msgcat::mcset eu "Subscribe" "Harpidetu"
::msgcat::mcset eu "Subscribe request from" "Honen harpidetza eskaera"
::msgcat::mcset eu "Subscribe request from %s" "Honen harpidetza eskaera %s"

::msgcat::mcset eu "Toggle seen" "-ikusita- aktibatu/deskaktibatu"
::msgcat::mcset eu "Unsubscribe" "Harpidetza eten"

# muc.tcl
#::msgcat::mcset eu "Whois" ""
#::msgcat::mcset eu "Kick" ""
#::msgcat::mcset eu "Ban" ""

::msgcat::mcset fr "Send subscription to " "Envoyer un abonnement à "
::msgcat::mcset fr "Send subscription to %s" "Envoyer un abonnement à %s"
::msgcat::mcset fr "Sort" "Tri"
::msgcat::mcset fr "Subscribe" "S'abonner"
::msgcat::mcset fr "Subscribe request from" "Requête d'enregistrement de"
::msgcat::mcset fr "Subscribe request from %s" "Requête d'enregistrement de\
        %s"

::msgcat::mcset fr "Unsubscribe" "Se désabonner"
::msgcat::mcset ru "Toggle seen" "Вкл./выкл. отображение просмотренных"

# muc.tcl
::msgcat::mcset fr "Ban" "Exclure"
::msgcat::mcset fr "Kick" "Ejecter"
::msgcat::mcset fr "Whois" "Qui est-ce"

::msgcat::mcset nl "Send subscription to " "Autorisatie verzenden naar"
::msgcat::mcset nl "Send subscription to %s" "Autorisatie verzenden naar %s"
::msgcat::mcset nl "Single window" "Enkelvoudig venster"
::msgcat::mcset nl "Sort" "Sorteren"
::msgcat::mcset nl "Subscribe" "Autoriseren"
::msgcat::mcset nl "Subscribe request from" "Autorisatieaanvraag van"
::msgcat::mcset nl "Subscribe request from %s" "Autorisatieaanvraag van %s"

::msgcat::mcset nl "Unsubscribe" "Autorisatie ongedaan maken"

# muc.tcl
::msgcat::mcset nl "\n\tAffiliation: %s" "\n\tAfdeling: %s"
::msgcat::mcset nl "\n\tJID: %s" "\n\tJabber ID: %s"
::msgcat::mcset nl " by %s" " door %s"
::msgcat::mcset nl "%s has become available" "%s betrad de chatruimte"

::msgcat::mcset pl "Send subscription to: " "Prośba o subskrypcję do: "
::msgcat::mcset pl "Single window" "Jedno okno"
::msgcat::mcset pl "Subject: " "Temat: "
::msgcat::mcset pl "Subscribe" "Subskrybuj"
::msgcat::mcset pl "Subscription request from %s" "Prośba o subskrypcję od\
        %s"
::msgcat::mcset pl "Subscription request from:" "Prośba o subskrypcję od:"


::msgcat::mcset pl "To: " "Do: "
::msgcat::mcset pl "Toggle encryption" "GPG - włącz szyfrowanie wiadomości"
::msgcat::mcset pl "Toggle seen" "Zazanacz/Odznacz jako przeczytany"
::msgcat::mcset pl "Toggle signing" "GPG - włącz podpisywanie wiadomości"

# iface.tcl
::msgcat::mcset pl "%s SSL Certificate Info" "Informacje o certyfikacie SSL z\

::msgcat::mcset pt "Send subscription to " "Enviar subscrição a "
::msgcat::mcset pt "Send subscription to %s" "Enviar subscrição a %s"
::msgcat::mcset pt "Single window" "Uma janela"
::msgcat::mcset pt "Sort" "Ordenar"
::msgcat::mcset pt "Subscribe" "Subscrever"
::msgcat::mcset pt "Subscribe request from" "Subscrever pedido de"
::msgcat::mcset pt "Subscribe request from %s" "Subscrever pedido de %s"

::msgcat::mcset pt "Toggle seen" "Activar/Desactivar Visibilidade"
::msgcat::mcset pt "Unsubscribe" "Remover subscrição"

# muc.tcl
::msgcat::mcset pt "\n\tAffiliation: %s" "\n\tAfiliação: %s"
::msgcat::mcset pt "\n\tJID: %s" "\n\tJID: %s"
::msgcat::mcset pt " by %s" " por %s"

::msgcat::mcset ro "Send subscription to " "Trimite subscriere lui"
::msgcat::mcset ro "Send subscription to %s" "Trimite subscriere lui %s"
::msgcat::mcset ro "Sort" "Sortare"
::msgcat::mcset ro "Subscribe" "Subscrie"
::msgcat::mcset ro "Subscribe request from" "Cerere de subscriere de la"
::msgcat::mcset ro "Subscribe request from %s" "Cerere de subscriere de la\
        %s"

::msgcat::mcset ro "Toggle seen" "Comută seen"
::msgcat::mcset ro "Unsubscribe" "Şterge subscrierea"

# muc.tcl
::msgcat::mcset ro "Ban" "Interzice access"
::msgcat::mcset ro "Configure" "Configureaz"
::msgcat::mcset ro "Destroy" "Distruge"

::msgcat::mcset ru "The room isn't joined yet" "Присоединение к комнате еще\
        не завершено"
::msgcat::mcset ru "The signature is good but has expired" "Подпись\
        допустимая, но её срок истёк"
::msgcat::mcset ru "The signature is good but the key has expired" "Подпись\
        допустимая, но срок ключа истёк"
::msgcat::mcset ru "thirsty" "хочу пить"

::msgcat::mcset ru "This message was forwarded by %s\n" "Это сообщение\
        переслал %s\n"
::msgcat::mcset ru "This message was forwarded to %s" "Это сообщение было\
        переслано %s"
::msgcat::mcset ru "This message was sent by %s\n" "Это сообщение было\
        отправлено %s\n"
::msgcat::mcset ru "Time" "Время"

        встановлений, але не збережений для наступних сесій."
::msgcat::mcset uk "the option is taken from config file." "параметр взято з\
        файлу налаштувань"
::msgcat::mcset uk "The signature is good but has expired" "Підпис\
        допустимий, але його строк дії закінчився"
::msgcat::mcset uk "The signature is good but the key has expired" "Підпис\
        допустимий, але строк дії ключа закінчився"

::msgcat::mcset uk "This message was forwarded by %s\n" "Це повідомлення\
        переслав %s\n"
::msgcat::mcset uk "This message was forwarded to %s" "Це повідомлення було\
        переслано %s"
::msgcat::mcset uk "This message was sent by %s\n" "Це повідомлення було\
        переслано %s\n"
::msgcat::mcset uk "Time" "Час"

# Draw icons aside encrypted messages even if no GPG support

proc ::ssj::draw_encrypted {chatid from type body x} {
    variable NS

    set chatw [chat::chat_win $chatid]

    if {![hook::is_flag rewrite_outgoing_message_hook encrypted]} {
        $chatw image create end -image gpg/encrypted

        hook::set_flag rewrite_outgoing_message_hook encrypted
    } else {
        foreach xe $x {
            ::xmpp::xml::split $xe tag xmlns attrs cdata subels

            if {$xmlns ne $NS(encrypted)} {
                continue
            }

            if {$cdata eq "" || [info commands ::ssj::encrypted:input] eq ""} {
                $chatw image create end -image gpg/badencrypted
            } else {
                # We already deciphered it in rewrite_message_hook
                $chatw image create end -image gpg/encrypted
            }
            break
        }
    }
}

hook::add draw_message_hook ::ssj::draw_encrypted 5

#############################################################################

proc ::ssj::process_x_encrypted {rowvar bodyvar f x xlib from id type replyP} {
    variable NS
    upvar 2 $rowvar row
    upvar 2 $bodyvar body

            hook::run gpg_input_error_hook $xlib $from $what $message
        }
    }

    return [array get params]
}

# ::ssj::signed:output --
#
# Result:
#       "" if signing is disabled for the given JID
#       'Armored signature' if signing is enabled and succeeded
#       Error if something went wrong

proc ::ssj::signed:output {xlib data args} {
    variable ctx
    variable options
    variable warnings
    variable gpg_error_id

    if {[llength $args] == 0} {

    debugmsg ssj "DECRYPT: $xlib; $from; $result"

    array set params $result
    return $params(plaintext)
}

# ::ssj::encrypted:output --
#
# Result:
#       "" if encrypting is disabled for the given JID
#       'enciphered data' if encrypting is enabled and succeeded
#       error if something went wrong

proc ::ssj::encrypted:output {xlib data to} {
    variable ctx
    variable e4me
    variable j2k
    variable options
    variable gpg_error_id
    variable groupchat_encrypt

    upvar 2 $vto to
    upvar 2 $vtype type
    upvar 2 $vbody body
    upvar 2 $vx x

    if {![info exists body]} return

    set newbody $body
    foreach tag {encrypted signed} {
        if {[catch {ssj::${tag}:output $xlib $body $to} cdata]} {
            debugmsg ssj "ssj::${tag}:output: $cdata"

            # Disable sending the message
            hook::unset_flag rewrite_outgoing_message_hook send

            return
        }

        if {$cdata ne ""} {
            lappend x [::xmpp::xml::create x -xmlns $NS($tag) -cdata $cdata]

            hook::unset_flag rewrite_outgoing_message_hook $tag

            if {$tag eq "encrypted"} {
                if {$type eq "groupchat"} {
                    set newbody "This message is encrypted."
                } else {
                    set lang [get_jid_presence_info lang $xlib $to]
                    set newbody [::trans::trans $lang "This message is encrypted."]
                }
            }
        }
    }
    set body $newbody

    return
}

hook::add rewrite_outgoing_message_hook ::ssj::sign_encrypt_body

































#############################################################################

proc ::ssj::userinfo {tab xlib jid editable} {
    variable signed

    if {$editable} return

proc ::ssj::draw_signed {chatid from type body x} {
    variable NS
    variable signedid

    set chatw [chat::chat_win $chatid]

    if {![hook::is_flag rewrite_outgoing_message_hook signed]} {
        $chatw image create end -image gpg/signed

        hook::set_flag rewrite_outgoing_message_hook signed
    } else {
        foreach xe $x {
            ::xmpp::xml::split $xe tag xmlns attrs cdata subels

            if {$tag ne "" || $xmlns ne $NS(signed)} continue



            incr signedid
            set xlib [chat::get_xlib $chatid]
            catch {
                set lb $chatw.signed$signedid
                $chatw window create end \
                      -window [signed:Label $lb $xlib $from $attrs]
                $lb configure -background [get_conf $chatw -background]
            }
        }
    }
}

hook::add draw_message_hook ::ssj::draw_signed 5.2

###############################################################################

proc ::ssj::chat_window_button {chatid type} {
    variable groupchat_encrypt
    variable signed
    variable options

# ca.msg --
#
#       Catalan messages for replying to other client queries.
#
# Author: Luis Peralta <peralta @ aditel . org>
# Revised by: Carles Bellver <bellverc @ cent . uji . es>

::trans::trset ca "This message is encrypted." "Aquest missatge està\
        xifrat."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

::trans::trset de "File not found" "Datei nicht gefunden"

# .../plugins/filetransfer/jidlink.tcl
::trans::trset de "File transfer is refused" "Datei-Übertragung verweigert"

# .../plugins/filetransfer/si.tcl
::trans::trset de "Stream ID is in use" "'Stream'-ID wird benutzt"

# .../plugins/general/gpgme.tcl
::trans::trset de "This message is encrypted." "Diese Nachricht ist\
        verschlüsselt."

# .../plugins/general/remote.tcl
::trans::trset de "%s at %s" "%s an %s"
::trans::trset de "%s: %s chat message(s)" "%s: %s Chat-Nachricht(en)"
::trans::trset de "%s: %s groupchat message(s)" \
        "%s: %s Konferenz-Nachricht(en)"
::trans::trset de "%s: %s headline message(s)" \

# eo.msg --
#
#       Esperanto messages for replying to other client queries.
#
# Author: Mike Mintz <mikem@jabber.org> <http://www.mikemintz.com/>

::trans::trset eo "This message is encrypted." "Tiu ĉi mesaĝo estas\
        ĉifrita."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

::trans::trset es "Status was changed successfully" \
        "El estado se cambió correctamente"
::trans::trset es "Status" "Estado"
::trans::trset es "Stream ID has not been negotiated" \
        "Stream ID no ha sido negociado"
::trans::trset es "Stream ID is in use" "Stream ID está en uso"
::trans::trset es "There are no unread messages" "No hay mensajes sin leer"
::trans::trset es "This message is encrypted." "Este mensaje está cifrado."
::trans::trset es "Unavailable" "Desconectado"
::trans::trset es "Unexpected packet sequence number" \
        "Número de secuencia de paquete no esperado"
::trans::trset es "Unread messages were forwarded successfully" \
        "Los mensajes sin leer fueron redireccionados correctamente"

# vim:ft=tcl:ts=8:sw=4:sts=4:et

# eu.msg --
#
#       Basque messages for replying to other client queries.
#
# Author: Euskalerria.org <jalgitalki@euskalerria.org>
# http://www.euskalerria.org/jalgitalki
# JID: jalgitalki@jalgitalki.euskalerria.org

::trans::trset eu "This message is encrypted." "Mezu hau enkriptatuta dago."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

# fr.msg --
#
#       French messages for replying to other client queries.
#
# Author: Vincent Ricard <coding@magicninja.org>

::trans::trset fr "This message is encrypted." "Ce message est crypté."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

# nl.msg --
#
#       Dutch messages for replying to other client queries.
#
# Author: Sander Devrieze <s (.) devrieze (A.T) pandora (. )be>

::trans::trset nl "This message is encrypted." "Dit bericht is versleuteld."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

# pl.msg --
#
#       Polish messages for replying to other client queries.
#
# Author: Irek Chmielowiec <irek.ch@gmail.com>

# plugins/general/gpgme.tcl
::trans::trset pl "This message is encrypted." "Ta wiadomość jest\
        zaszyfrowana."

# plugins/general/remote.tcl
::trans::trset pl "Change status" "Zmień status"
::trans::trset pl "Change Status" "Zmiana statusu"
::trans::trset pl "Choose chats or groupchats from which you want to forward\
        messages" "Wybierz rozmowy i konferencje"
::trans::trset pl "Choose groupchats you want to leave" \

# pt.msg --
#
#       Portuguese messages for replying to other client queries.
#
# Author: Miguel <maiguel @ netvisao . pt>

::trans::trset pt "This message is encrypted." "Esta mensagem está cifrada."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

# ro.msg --
#
#       Romanian messages for replying to other client queries.
#
# Author: Adrian Rapa (e-mail & JID: adrian@dtedu.net)

::trans::trset ro "This message is encrypted." "Acest mesaj e codat."

# vim:ft=tcl:ts=8:sw=4:sts=4:et

::trans::trset ru "%s: %s unknown message(s)" \
        "%s: %s сообщений неизвестного типа"
::trans::trset ru "Status" "Статус"
::trans::trset ru "Status was changed successfully" "Статус изменен успешно"
::trans::trset ru "Stream ID has not been negotiated" "ID потока не согласован"
::trans::trset ru "Stream ID is in use" "ID потока уже используется"
::trans::trset ru "There are no unread messages" "Непрочитанных сообщений нет"
::trans::trset ru "This message is encrypted." "Это сообщение зашифровано."
::trans::trset ru "Unexpected packet sequence number" \
        "Неожиданный номер последовательности пакетов"
::trans::trset ru "Unread messages were forwarded successfully" \
        "Непрочитанные сообщения пересланы успешно"
::trans::trset ru "Available" "Доступен"
::trans::trset ru "Free to chat" "Свободен для разговора"
::trans::trset ru "Away" "Отошёл"
::trans::trset ru "Extended away" "Отошёл давно"
::trans::trset ru "Do not disturb" "Не беспокоить"
::trans::trset ru "Unavailable" "Недоступен"
::trans::trset ru "Current rooms" "Текущие комнаты"

# vim:ft=tcl:ts=8:sw=4:sts=4:et

::trans::trset uk "Available" "Доступний"
::trans::trset uk "Free to chat" "Вільний для розмови"
::trans::trset uk "Away" "Відійшов"
::trans::trset uk "Extended away" "Давно відійшов"
::trans::trset uk "Do not disturb" "Не турбувати"
::trans::trset uk "Unavailable" "Недоступний"
::trans::trset uk "Current rooms" "Поточні кімнати"
::trans::trset uk "This message is encrypted." "Це повідомлення зашифроване."

# vim:ft=tcl:ts=8:sw=4:sts=4:et