[geary/bug/7217-reconnect: 8/8] Merge branch 'master' into bug/7217-reconnect

[Jim Nelson <jnelson src gnome org>]

commit a0f911ed5509266b710e752322cfea88a0bbf1e4
Merge: ef669ed 0ca8e09
Author: Jim Nelson <jim yorba org>
Date:   Mon Nov 25 14:55:16 2013 -0800

    Merge branch 'master' into bug/7217-reconnect

 CMakeLists.txt         |    2 +-
 NEWS                   |    6 +
 debian/changelog       |    6 +
 geary.doap             |   31 +
 po/CMakeLists.txt      |   18 +-
 po/ca_ES.po            | 1518 ----------------------------------------------
 po/{el_GR.po => el.po} |    0
 po/es_419.po           | 1502 ----------------------------------------------
 po/es_ES.po            | 1515 ----------------------------------------------
 po/he.po               |   12 +-
 po/{hi_IN.po => hi.po} |    0
 po/{hu_HU.po => hu.po} |    0
 po/{ja_JP.po => ja.po} |    0
 po/{km_KH.po => km.po} |    0
 po/{ms_MY.po => ms.po} |    0
 po/{nl_NL.po => nl.po} |    0
 po/ro.po               |  583 ++++++++++---------
 po/ro_RO.po            | 1560 ------------------------------------------------
 18 files changed, 370 insertions(+), 6383 deletions(-)
---
diff --cc po/he.po
index ecf0577,971529e..d5235cd
--- a/po/he.po
+++ b/po/he.po
@@@ -13,10 -13,10 +13,10 @@@
  msgid ""
  msgstr ""
  "Project-Id-Version: geary-0.4.1\n"
 -"Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2013-11-25 16:31+0200\n"
 +"Report-Msgid-Bugs-To: http://redmine.yorba.org/projects/geary\n";
 +"POT-Creation-Date: 2013-09-20 12:16-0700\n"
- "PO-Revision-Date: 2013-09-24 18:10+0000\n"
- "Last-Translator: yoseforb <yoseforb gmail com>\n"
+ "PO-Revision-Date: 2013-11-25 16:34+0200\n"
+ "Last-Translator: Yosef Or Boczko <yoseforb gmail com>\n"
  "Language-Team: Hebrew (http://www.transifex.com/projects/p/geary/language/";
  "he/)\n"
  "Language: he\n"
@@@ -165,9 -165,9 +165,9 @@@ msgstr "לפני %d שעות
  #: ../../src/client/util/util-date.vala:167
  #, c-format
  msgid "%dm ago"
- msgstr "לפני %dm"
+ msgstr "לפני %d דקות"
  
 -#: ../../src/client/views/conversation-find-bar.vala:214
 +#: ../../src/client/views/conversation-find-bar.vala:222
  #, c-format
  msgid "%i matches"
  msgstr "%i התאמות"
@@@ -857,7 -858,8 +857,8 @@@ msgstr "ססמה
  msgid "Password:"
  msgstr "ססמה:"
  
 -#: ../../ui/composer.glade:100
 -msgctxt "Clipboard paste with rich text"
 +#: ../../ui/composer.glade:102
++#, fuzzy
  msgid "Paste _With Formatting"
  msgstr "הדבקה עם עי_צוב"
  
@@@ -1547,3 -1553,3 +1548,6 @@@ msgstr "
  "דוביקס <dovix2003 gmail com>\n"
  "ירון שהרבני <sh yaron gmail com>\n"
  "יוסף אור בוצ׳קו <yoseforb gmail com>"
++
++#~ msgid "SSL/TLS"
++#~ msgstr "SSL/TLS"