[gnome-panel/gnome-3-8: 25/25] Merge translations from master into gnome-3-8

[Philipp Kaluza <phk src gnome org>]

commit 2368eb3d3144b6532acc8a13aaf8c23b12365fe5
Merge: 104ca23 dcd5dca
Author: Philipp Kaluza <phk src gnome org>
Date:   Tue Sep 30 08:51:07 2014 +0200

    Merge translations from master into gnome-3-8
    
    Conflicts:
        po/es.po
        po/hi.po
        po/hu.po
        po/id.po
        po/pt_BR.po

 gnome-panel.doap       |    2 -
 help/clock/Makefile.am |    2 +-
 help/clock/hu/hu.po    |  797 ++++++++++++++++++++++++++++++++++++++++++++++++
 help/fish/Makefile.am  |    2 +-
 help/fish/hu/hu.po     |  520 +++++++++++++++++++++++++++++++
 po/as.po               |  282 +++++++++++------
 po/bn_IN.po            |  319 +++++++++++++-------
 po/es.po               |    6 +-
 po/gu.po               |   54 ++--
 po/hi.po               |    8 +-
 po/hu.po               |    4 +-
 po/id.po               |    8 +-
 po/kn.po               |  260 ++++++++++------
 po/mr.po               |  302 ++++++++++++-------
 po/nb.po               |   21 +-
 po/or.po               |  297 ++++++++++++------
 po/pt_BR.po            |    4 +-
 po/ru.po               |   26 +-
 po/ta.po               |  337 ++++++++++++++-------
 po/te.po               |  333 +++++++++++++-------
 20 files changed, 2770 insertions(+), 814 deletions(-)
---
diff --cc po/id.po
index c810b46,22800a4..e86ae16
--- a/po/id.po
+++ b/po/id.po
@@@ -11,11 -11,11 +11,11 @@@
  # Andika Triwidada <andika gmail com>, 2011, 2013, 2014.
  msgid ""
  msgstr ""
 -"Project-Id-Version: gnome-panel master\n"
 +"Project-Id-Version: gnome-panel gnome-3-8\n"
  "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
  "panel&keywords=I18N+L10N&component=general\n"
- "POT-Creation-Date: 2014-09-04 19:18+0000\n"
- "PO-Revision-Date: 2014-09-05 08:43+0700\n"
+ "POT-Creation-Date: 2014-09-04 19:19+0000\n"
+ "PO-Revision-Date: 2014-09-05 08:13+0700\n"
  "Last-Translator: Andika Triwidada <andika gmail com>\n"
  "Language-Team: Indonesian <gnome i15n org>\n"
  "Language: id\n"