[Pkg-privacy-commits] [vidalia] 126/160: Merge tag 'upstream/0.2.21'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository vidalia.

commit c7cb8e82ebfd72271916c263f345d4bc57911ab8
Merge: 5e7cdcc eadf5c6
Author: Dererk <dererk at debian.org>
Date:   Sun Jan 27 10:05:22 2013 -0300

    Merge tag 'upstream/0.2.21'
    
    Upstream version 0.2.21

 CHANGELOG                                          |   10 +
 CMakeLists.txt                                     |    2 +-
 src/torcontrol/RouterDescriptor.cpp                |    7 +-
 src/vidalia/MainWindow.cpp                         |   15 +-
 src/vidalia/i18n/po/bg/vidalia_bg.po               |   57 +-
 src/vidalia/i18n/po/cs/vidalia_cs.po               |  109 +-
 src/vidalia/i18n/po/el/vidalia_el.po               |   27 +-
 src/vidalia/i18n/po/fr/vidalia_fr.po               |   23 +-
 src/vidalia/i18n/po/he/vidalia_he.po               |  966 +++++-----
 src/vidalia/i18n/po/id/vidalia_id.po               |   25 +-
 src/vidalia/i18n/po/it/vidalia_it.po               |  111 +-
 src/vidalia/i18n/po/ja/vidalia_ja.po               |  418 ++---
 src/vidalia/i18n/po/ko/qt_ko.po                    |   13 +-
 src/vidalia/i18n/po/ko/vidalia_ko.po               |  110 +-
 .../i18n/po/{ko/qt_ko.po => ko_KR/qt_ko_KR.po}     |   93 +-
 src/vidalia/i18n/po/lt/qt_lt.po                    |  171 +-
 src/vidalia/i18n/po/lv/qt_lv.po                    |  173 +-
 src/vidalia/i18n/po/lv/vidalia_lv.po               | 1904 ++++++++++----------
 src/vidalia/i18n/po/my/vidalia_my.po               | 1216 ++++++-------
 src/vidalia/i18n/po/nl/qt_nl.po                    |   31 +-
 src/vidalia/i18n/po/nl/vidalia_nl.po               |   11 +-
 src/vidalia/i18n/po/pt/vidalia_pt.po               |  109 +-
 src/vidalia/i18n/po/ro/vidalia_ro.po               |  121 +-
 src/vidalia/i18n/po/ru/vidalia_ru.po               |   37 +-
 src/vidalia/i18n/po/templates/qt.pot               |   26 +-
 src/vidalia/i18n/po/templates/vidalia.pot          |  452 +++--
 src/vidalia/i18n/po/tr/vidalia_tr.po               |   19 +-
 src/vidalia/i18n/po/zh_CN/qt_zh_CN.po              |   11 +-
 src/vidalia/i18n/po/zh_CN/vidalia_zh_CN.po         |  248 +--
 src/vidalia/network/NetViewer.cpp                  |    7 +
 src/vidalia/network/RouterDescriptorView.cpp       |    8 +-
 31 files changed, 3355 insertions(+), 3175 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/vidalia.git