[pan2: 268/268] Merge branch 'new_master'



commit 77077407bf9e43a2cc80da32262097a7c7a100cd
Merge: b4f5ef0 b787824
Author: Heinrich MÃller <henmull src gnome org>
Date:   Mon Jan 2 16:33:12 2012 +0100

    Merge branch 'new_master'
    
    Conflicts:
    	po/es.po

 INSTALL                                    |  243 +-
 README                                     |   21 +-
 TODO                                       |  199 -
 configure.in                               |   91 +-
 pan.cbp                                    |  819 ++++
 pan.png                                    |  Bin 4909 -> 3897 bytes
 pan/data-impl/Makefile.am                  |    6 +-
 pan/data-impl/add-server.cc                |   26 +-
 pan/data-impl/article-filter.cc            |    4 +-
 pan/data-impl/article-filter.h             |    1 +
 pan/data-impl/data-impl.cc                 |  104 +
 pan/data-impl/data-impl.h                  |  107 +-
 pan/data-impl/headers-test.cc              |   12 +-
 pan/data-impl/headers.cc                   |   15 +-
 pan/data-impl/my-tree.cc                   |  160 +-
 pan/data-impl/profiles.cc                  |   36 +-
 pan/data-impl/rules-filter.cc              |  111 +
 pan/data-impl/rules-filter.h               |   61 +
 pan/data-impl/server.cc                    |  189 +-
 pan/data-impl/speed-test-load-group.cc     |    2 +-
 pan/data-impl/task-archive.cc              |    2 +-
 pan/data-impl/xover.cc                     |    2 +
 pan/data/Makefile.am                       |   31 +-
 pan/data/article-cache.cc                  |   18 +-
 pan/data/article-cache.h                   |    9 +-
 pan/data/article.cc                        |    9 +
 pan/data/cert-store.cc                     |  368 ++
 pan/data/cert-store.h                      |  162 +
 pan/data/data.cc                           |    2 +-
 pan/data/data.h                            |  109 +-
 pan/data/encode-cache.cc                   |  257 ++
 pan/data/encode-cache.h                    |  122 +
 pan/data/server-info.h                     |   18 +
 pan/general/Makefile.am                    |   35 +-
 pan/general/debug.cc                       |    2 +
 pan/general/debug.h                        |   12 +-
 pan/general/file-util.cc                   |   29 +-
 pan/general/file-util.h                    |    5 +
 pan/general/log.cc                         |   13 +-
 pan/general/log.h                          |   10 +
 pan/general/macros.h                       |    3 +
 pan/general/progress.cc                    |    2 +
 pan/general/worker-pool.cc                 |    1 +
 pan/gui/Makefile.am                        |   13 +-
 pan/gui/actions.cc                         |   78 +-
 pan/gui/actions.h                          |    2 +-
 pan/gui/body-pane.cc                       |  352 ++-
 pan/gui/body-pane.h                        |   54 +-
 pan/gui/dl-headers-ui.cc                   |    4 +-
 pan/gui/dl-headers-ui.h                    |    2 +-
 pan/gui/e-action-combo-box.h               |    5 +-
 pan/gui/e-charset-combo-box.c              |    2 +-
 pan/gui/e-charset.h                        |    2 +-
 pan/gui/e-cte-dialog.c                     |  142 +
 pan/gui/e-cte-dialog.h                     |   15 +
 pan/gui/group-pane.cc                      |   21 +-
 pan/gui/group-pane.h                       |    2 +-
 pan/gui/group-prefs-dialog.cc              |   60 +-
 pan/gui/group-prefs-dialog.h               |   14 +-
 pan/gui/{gtk_compat.h => gtk-compat.h}     |   49 +-
 pan/gui/gui.cc                             |  432 ++-
 pan/gui/gui.h                              |   55 +-
 pan/gui/header-pane.cc                     |  170 +-
 pan/gui/header-pane.h                      |   24 +-
 pan/gui/hig.cc                             |    7 +-
 pan/gui/hig.h                              |    2 +-
 pan/gui/log-ui.cc                          |  140 +-
 pan/gui/log-ui.h                           |    6 +-
 pan/gui/my-valgrind.sh                     |    2 +-
 pan/gui/pan-file-entry.cc                  |    4 +-
 pan/gui/pan-file-entry.h                   |    2 +-
 pan/gui/pan-tree.h                         |   10 +-
 pan/gui/pan-ui.h                           |    7 +
 pan/gui/pan.cc                             |  377 ++-
 pan/gui/pan.ui.h                           |   26 +-
 pan/gui/post-ui.cc                         | 1397 ++++++-
 pan/gui/post-ui.h                          |  154 +-
 pan/gui/post.ui.h                          |   27 +-
 pan/gui/prefs-ui.cc                        |  126 +-
 pan/gui/prefs-ui.h                         |    6 +-
 pan/gui/prefs.cc                           |   19 +
 pan/gui/prefs.h                            |   10 +-
 pan/gui/profiles-dialog.cc                 |  107 +-
 pan/gui/profiles-dialog.h                  |   19 +-
 pan/gui/progress-view.cc                   |   11 +-
 pan/gui/progress-view.h                    |    4 +-
 pan/gui/save-attach-ui.cc                  |  320 ++
 pan/gui/save-attach-ui.h                   |   82 +
 pan/gui/save-ui.cc                         |   15 +-
 pan/gui/save-ui.h                          |    4 +-
 pan/gui/score-add-ui.cc                    |   46 +-
 pan/gui/score-add-ui.h                     |    4 +-
 pan/gui/score-view-ui.cc                   |   16 +-
 pan/gui/score-view-ui.h                    |    2 +-
 pan/gui/server-ui.cc                       |  466 +++-
 pan/gui/server-ui.h                        |   20 +-
 pan/gui/task-pane.cc                       |  329 ++-
 pan/gui/task-pane.h                        |   24 +-
 pan/gui/taskpane.ui.h                      |   18 +
 pan/gui/xface.c                            |  267 +-
 pan/icons/Makefile.am                      |   15 +-
 pan/icons/icon_article_read.png            |  Bin 489 -> 748 bytes
 pan/icons/icon_article_unread.png          |  Bin 438 -> 593 bytes
 pan/icons/icon_binary_complete.png         |  Bin 269 -> 861 bytes
 pan/icons/icon_binary_complete_read.png    |  Bin 221 -> 834 bytes
 pan/icons/icon_binary_incomplete.png       |  Bin 268 -> 875 bytes
 pan/icons/icon_binary_incomplete_read.png  |  Bin 223 -> 834 bytes
 pan/icons/icon_by_me.png                   |  Bin 351 -> 270 bytes
 pan/icons/icon_by_others.png               |  Bin 402 -> 2065 bytes
 pan/icons/icon_cert.png                    |  Bin 0 -> 689 bytes
 pan/icons/icon_compose_followup.png        |  Bin 668 -> 2062 bytes
 pan/icons/icon_compose_post.png            |  Bin 642 -> 1579 bytes
 pan/icons/icon_disk.png                    |  Bin 237 -> 718 bytes
 pan/icons/icon_filter.png                  |  Bin 483 -> 1621 bytes
 pan/icons/icon_filter_only_attachments.png |  Bin 417 -> 1477 bytes
 pan/icons/icon_filter_only_cached.png      |  Bin 542 -> 1375 bytes
 pan/icons/icon_filter_only_me.png          |  Bin 585 -> 1204 bytes
 pan/icons/icon_filter_only_unread.png      |  Bin 621 -> 1243 bytes
 pan/icons/icon_filter_only_watched.png     |  Bin 400 -> 1438 bytes
 pan/icons/icon_get_dialog.png              |  Bin 339 -> 1136 bytes
 pan/icons/icon_get_flagged.png             |  Bin 659 -> 1128 bytes
 pan/icons/icon_get_selected.png            |  Bin 423 -> 1070 bytes
 pan/icons/icon_get_subscribed.png          |  Bin 568 -> 1327 bytes
 pan/icons/icon_mozilla_frown.png           |  Bin 1002 -> 836 bytes
 pan/icons/icon_mozilla_smile.png           |  Bin 1008 -> 816 bytes
 pan/icons/icon_mozilla_surprised.png       |  Bin 1029 -> 834 bytes
 pan/icons/icon_mozilla_tongueout.png       |  Bin 1008 -> 872 bytes
 pan/icons/icon_mozilla_wink.png            |  Bin 1042 -> 825 bytes
 pan/icons/icon_pan.png                     |  Bin 4909 -> 3897 bytes
 pan/icons/icon_pan_about_logo.png          |  Bin 2203 -> 9327 bytes
 pan/icons/icon_pan_about_logo.xcf          |  Bin 0 -> 22316 bytes
 pan/icons/icon_pan_logo.png                |  Bin 4373 -> 17058 bytes
 pan/icons/icon_pan_logo.xcf                |  Bin 0 -> 78119 bytes
 pan/icons/icon_plain.png                   |  Bin 0 -> 687 bytes
 pan/icons/icon_read_group.png              |  Bin 541 -> 1230 bytes
 pan/icons/icon_read_less.png               |  Bin 361 -> 863 bytes
 pan/icons/icon_read_more.png               |  Bin 354 -> 851 bytes
 pan/icons/icon_read_unread_article.png     |  Bin 590 -> 1385 bytes
 pan/icons/icon_read_unread_thread.png      |  Bin 568 -> 1542 bytes
 pan/icons/icon_score.png                   |  Bin 228 -> 1991 bytes
 pan/icons/icon_search_pulldown.png         |  Bin 1318 -> 2041 bytes
 pan/icons/icon_sig_fail.png                |  Bin 0 -> 1777 bytes
 pan/icons/icon_sig_ok.png                  |  Bin 0 -> 1759 bytes
 pan/icons/icon_status_active.png           |  Bin 0 -> 1824 bytes
 pan/icons/icon_status_error.png            |  Bin 0 -> 1772 bytes
 pan/icons/icon_status_idle.png             |  Bin 0 -> 1481 bytes
 pan/icons/icon_status_new_articles.png     |  Bin 0 -> 1590 bytes
 pan/icons/icon_status_offline.png          |  Bin 0 -> 1945 bytes
 pan/icons/icon_status_online.png           |  Bin 0 -> 1783 bytes
 pan/icons/icon_status_queue_empty.png      |  Bin 0 -> 1704 bytes
 pan/icons/icon_tabbar.png                  |  Bin 0 -> 1616 bytes
 pan/tasks/Makefile.am                      |   42 +-
 pan/tasks/decoder.cc                       |   24 +-
 pan/tasks/decoder.h                        |    6 +-
 pan/tasks/encoder.cc                       |  292 ++
 pan/tasks/encoder.h                        |  111 +
 pan/tasks/nntp-pool.cc                     |   43 +-
 pan/tasks/nntp-pool.h                      |   26 +-
 pan/tasks/nntp.cc                          |  152 +-
 pan/tasks/nntp.h                           |   82 +-
 pan/tasks/nzb-test.cc                      |    4 +-
 pan/tasks/nzb.cc                           |  145 +-
 pan/tasks/nzb.h                            |   13 +-
 pan/tasks/queue.cc                         |  157 +-
 pan/tasks/queue.h                          |   37 +-
 pan/tasks/socket-impl-gio.cc               |  131 +-
 pan/tasks/socket-impl-gio.h                |   12 +-
 pan/tasks/socket-impl-main.cc              |  158 +
 pan/tasks/socket-impl-main.h               |  155 +
 pan/tasks/socket-impl-openssl.cc           |  845 ++++
 pan/tasks/socket-impl-openssl.h            |  114 +
 pan/tasks/socket.h                         |    9 +-
 pan/tasks/task-article.cc                  |   46 +-
 pan/tasks/task-article.h                   |   20 +-
 pan/tasks/task-groups.cc                   |    3 +-
 pan/tasks/task-groups.h                    |    5 +-
 pan/tasks/task-post.cc                     |   11 +-
 pan/tasks/task-upload.cc                   |  466 +++
 pan/tasks/task-upload.h                    |  171 +
 pan/tasks/task-weak-ordering.h             |   19 +-
 pan/tasks/task-xover.cc                    |   47 +-
 pan/tasks/task-xover.h                     |    4 +
 pan/tasks/task-xoverinfo.cc                |  208 +
 pan/tasks/task-xoverinfo.h                 |   90 +
 pan/tasks/task.cc                          |   30 +-
 pan/tasks/task.h                           |   30 +-
 pan/tasks/upload-queue.cc                  |  180 +
 pan/tasks/upload-queue.h                   |  109 +
 pan/usenet-utils/Makefile.am               |   54 +-
 pan/usenet-utils/MersenneTwister.h         |  461 +++
 pan/usenet-utils/blowfish.cc               |  229 ++
 pan/usenet-utils/blowfish.h                |   79 +
 pan/usenet-utils/blowfish_cyphers.h        |  268 ++
 pan/usenet-utils/filter-info.cc            |    1 +
 pan/usenet-utils/filter-info.h             |    2 +-
 pan/usenet-utils/gpg.cc                    |  136 +
 pan/usenet-utils/gpg.h                     |  136 +
 pan/usenet-utils/message-check.cc          |   32 +-
 pan/usenet-utils/message-check.h           |    5 +-
 pan/usenet-utils/mime-utils.cc             |  904 ++++--
 pan/usenet-utils/mime-utils.h              |   55 +-
 pan/usenet-utils/rules-info.cc             |  115 +
 pan/usenet-utils/rules-info.h              |   88 +
 pan/usenet-utils/ssl-utils.h               |  249 ++
 pan/usenet-utils/text-massager-test.cc     |  920 +++--
 pan/usenet-utils/text-massager.cc          |   38 +-
 pan/usenet-utils/text-massager.h           |    2 +-
 pan/usenet-utils/url-find.cc               |    6 +-
 po/am.po                                   | 3126 +++++++++-------
 po/ar.po                                   | 1846 ++++++---
 po/az.po                                   | 2937 +++++++++------
 po/bg.po                                   | 1955 +++++++---
 po/ca.po                                   | 1951 ++++++----
 po/cs.po                                   | 1855 ++++++----
 po/da.po                                   | 1675 ++++++---
 po/dz.po                                   | 2706 +++++++++-----
 po/el.po                                   | 3964 +++++++++++--------
 po/en_CA.po                                | 3277 ++++++++++------
 po/en_GB.po                                | 2026 +++++++----
 po/eo.po                                   | 1609 ++++++---
 po/es.po                                   | 1678 ++++++---
 po/et.po                                   | 3798 +++++++++++--------
 po/eu.po                                   | 1804 ++++++---
 po/fi.po                                   | 1956 +++++++---
 po/fr.po                                   | 1736 ++++++---
 po/ga.po                                   | 3197 +++++++++-------
 po/gl.po                                   | 3594 ++++++++++-------
 po/hr.po                                   | 3709 +++++++++++--------
 po/hu.po                                   | 3649 +++++++++++--------
 po/it.po                                   | 3651 +++++++++++-------
 po/ja.po                                   | 5735 +++++++++++++++++++++++++---
 po/ko.po                                   | 3678 +++++++++++--------
 po/lt.po                                   | 3585 ++++++++++-------
 po/lv.po                                   | 3663 +++++++++++--------
 po/ms.po                                   | 3690 +++++++++++--------
 po/nb.po                                   | 1963 +++++++---
 po/nl.po                                   | 3716 +++++++++++--------
 po/oc.po                                   | 1893 +++++++---
 po/pl.po                                   | 3701 +++++++++++--------
 po/pt.po                                   | 1900 ++++++---
 po/pt_BR.po                                | 2841 +++++++++------
 po/ro.po                                   | 3693 +++++++++++--------
 po/ru.po                                   | 5480 ++++++++++++++++++++------
 po/sk.po                                   | 3719 +++++++++++--------
 po/sq.po                                   | 3683 +++++++++++--------
 po/sr.po                                   | 3699 +++++++++++--------
 po/sr Latn po                              | 3685 +++++++++++--------
 po/sv.po                                   | 2220 ++++++++----
 po/tr.po                                   | 3710 +++++++++++--------
 po/uk.po                                   | 3688 +++++++++++--------
 po/vi.po                                   | 2164 +++++++----
 po/zh_CN.po                                | 1891 ++++++----
 po/zh_TW.po                                | 3679 +++++++++++--------
 uulib/uudeview.h                           |   29 +-
 uulib/uuencode.c                           | 3128 ++++++++++------
 uulib/uulib.c                              |   32 +-
 uulib/uunconc.c                            |   46 +-
 uulib/uuscan.c                             |   70 +-
 258 files changed, 102329 insertions(+), 53145 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]