[jabref] 409/459: Merge tag 'upstream/2.10_beta2+ds'

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository jabref.

commit b7141ceb174cb3aaa89203ba6f08aae8774d52b0
Merge: ecdb86d 0947be7
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Jun 21 18:30:38 2013 +0200

    Merge tag 'upstream/2.10_beta2+ds'
    
    Upstream version 2.10~beta2+ds

 build.xml                                          |    3 +-
 src/java/net/sf/jabref/BasePanel.java              |    7 +-
 src/java/net/sf/jabref/EntryEditor.java            |   23 +
 src/java/net/sf/jabref/FileTab.java                |    8 +-
 .../net/sf/jabref/FindUnlinkedFilesDialog.java     |    5 +-
 src/java/net/sf/jabref/GUIGlobals.java             |    3 +-
 src/java/net/sf/jabref/Globals.java                |   18 +-
 src/java/net/sf/jabref/JabRefPreferences.java      |    4 +-
 src/java/net/sf/jabref/Util.java                   |    4 +-
 src/java/net/sf/jabref/external/PushToWinEdt.java  |    2 +-
 .../sf/jabref/gui/DatabasePropertiesDialog.java    |   20 +-
 .../net/sf/jabref/gui/GroupAddRemoveDialog.java    |  179 +-
 src/resource/IntegrityMessage_ru.properties        |   10 +-
 src/resource/JabRef_da.properties                  |  105 +-
 src/resource/JabRef_de.properties                  |    5 +-
 src/resource/JabRef_en.properties                  |    4 +-
 src/resource/JabRef_es.properties                  |   60 +-
 src/resource/JabRef_fr.properties                  |   14 +-
 src/resource/JabRef_in.properties                  |    3 +-
 src/resource/JabRef_it.properties                  |    3 +-
 src/resource/JabRef_ja.properties                  |    3 +-
 src/resource/JabRef_nl.properties                  |    4 +-
 src/resource/JabRef_no.properties                  |    6 +-
 src/resource/JabRef_pt_BR.properties               |    3 +-
 src/resource/JabRef_ru.properties                  | 3051 ++++++++++----------
 src/resource/JabRef_tr.properties                  |   79 +-
 src/resource/JabRef_vi.properties                  |    4 +-
 src/resource/JabRef_zh.properties                  |    3 +-
 src/resource/Menu_da.properties                    |    2 +
 src/resource/Menu_de.properties                    |    6 +-
 src/resource/Menu_en.properties                    |    4 +-
 src/resource/Menu_es.properties                    |    2 +
 src/resource/Menu_fr.properties                    |    3 +
 src/resource/Menu_in.properties                    |    2 +
 src/resource/Menu_it.properties                    |    2 +
 src/resource/Menu_ja.properties                    |    2 +
 src/resource/Menu_nl.properties                    |    2 +
 src/resource/Menu_no.properties                    |    3 +
 src/resource/Menu_pt_BR.properties                 |    2 +
 src/resource/Menu_ru.properties                    |  252 +-
 src/resource/Menu_tr.properties                    |    2 +
 src/resource/Menu_vi.properties                    |    2 +
 src/resource/Menu_zh.properties                    |    2 +
 src/txt/CHANGELOG                                  |    6 +
 src/txt/README                                     |    4 +-
 src/windows/nsis/installer_languages/russian.nsh   |   33 +
 src/windows/nsis/setup.nsi                         |    9 +-
 47 files changed, 2078 insertions(+), 1895 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git