icedove-1:31.7.0.deb1-1{,.nonprism1}: updating version

6 files changed, 220 insertions, 414 deletions

diff --git a/libre/icedove/PKGBUILD b/libre/icedove/PKGBUILD
index 0f2f95f04..d86927420 100644
--- a/libre/icedove/PKGBUILD
+++ b/libre/icedove/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.6.0
+_debver=31.7.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=2
+pkgrel=1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird."
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         mozconfig
         ${pkgname}.desktop
         ${pkgname}-install-dir.patch
-        vendor.js
-        rhbz-966424.patch)
+        vendor.js)
 options=(!emptydirs)
-sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc'
-            'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9'
+sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794'
+            '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
-            'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
+            '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
             '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
-            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr31"
@@ -59,6 +57,9 @@ prepare() {
       install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
   done
 
+  # We are doing it from sed commands
+  rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true
+
   quilt push -av
 
   # Fix paths on makefile
@@ -89,9 +90,6 @@ prepare() {
 
   cp "${srcdir}/mozconfig" .mozconfig
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
diff --git a/libre/icedove/icedove.desktop b/libre/icedove/icedove.desktop
index f39d5823c..1ba43e0b3 100644
--- a/libre/icedove/icedove.desktop
+++ b/libre/icedove/icedove.desktop
@@ -1,32 +1,5 @@
 [Desktop Entry]
 Name=Icedove
-Name[ast]=Veceru de corréu Icedove
-Name[ca]=Client de correu Icedove
-Name[cs]=Poštovní klient Icedove
-Name[da]=Icedove - e-post/nyhedsgruppe
-Name[de]=Icedove-E-Mail und -Nachrichten
-Name[el]=Ηλεκτρονική αλληλογραφία Icedove
-Name[es]=Cliente de correo Icedove
-Name[fi]=Icedove-sähköposti
-Name[fr]=Messagerie Icedove
-Name[gl]=Cliente de correo Icedove
-Name[he]=Icedove דוא״ל/חדשות
-Name[hr]=Icedove e-pošta/novosti
-Name[hu]=Icedove levelezőkliens
-Name[it]=Email Icedove
-Name[ja]=Icedove メールクライアント
-Name[ko]=Icedove
-Name[nl]=Icedove e-mail/nieuws
-Name[pl]=Klient poczty Icedove
-Name[pt_BR]=Cliente de E-mail Icedove
-Name[ru]=Почтовый клиент Icedove
-Name[sk]=Icedove - poštový klient
-Name[sv]=E-postklienten Icedove
-Name[ug]=Icedove ئېلخەت/خەۋەر
-Name[uk]=Поштова програма Icedove
-Name[vi]=Trình điện thư Icedove
-Name[zh_CN]=Icedove 邮件/新闻
-Name[zh_TW]=Icedove 郵件
 Comment=Send and receive mail with Icedove
 Comment[ast]=Lleer y escribir corréu electrónicu
 Comment[ca]=Llegiu i escriviu correu
@@ -82,164 +55,119 @@ GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Keywords=Email;E-mail;Newsgroup;Feed;RSS;
-Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS;
-Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS;
-Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS;
-Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS;
-Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben;
-Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα;
-Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS;
-Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte;
-Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire;
-Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
-Keywords[hr]=email;e-mail;e-pošta;pošta;RSS;
-Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS;
-Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS;
-Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS;
-Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove;
-Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post;
-Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды;
-Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS;
-Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка;
-Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư;
-Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器;
 Exec=icedove %u
 Terminal=false
-X-MultipleArgs=false
 Type=Application
 Icon=icedove
 Categories=Network;Email;
 MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
 StartupNotify=true
-Actions=Compose;Contacts;
+Actions=ComposeMessage;OpenAddressBook;
 
-[Desktop Action Compose]
-Name=Compose New Message
-Name[af]=Skryf 'n nuwe boodskap
-Name[ar]=حرر رسالة جديدة
-Name[ast]=Redactar un mensaxe nuevu
-Name[be]=Напісаць ліст
-Name[bg]=Ново писмо
-Name[bn]=নতুন বার্তা লিখুন
-Name[br]=Sevel ur gemennadenn nevez
-Name[bs]=Napiši novu poruku
-Name[ca]=Redacta un missatge nou
+[Desktop Action ComposeMessage]
+Name=Write new message
+Name[ar]=اكتب رسالة جديدة
+Name[ast]=Redactar mensaxe nuevu
+Name[be]=Напісаць новы ліст
+Name[bg]=Съставяне на ново съобщение
+Name[br]=Skrivañ ur gemennadenn nevez
+Name[ca]=Escriu un missatge nou
 Name[cs]=Napsat novou zprávu
-Name[cy]=Cyfansoddi Neges Newydd
-Name[da]=Skriv en ny besked
-Name[de]=Neue Nachricht erstellen
+Name[da]=Skriv en ny meddelelse
+Name[de]=Neue Nachricht verfassen
 Name[el]=Σύνταξη νέου μηνύματος
-Name[eo]=Redakti novan mesaĝon
-Name[es]=Redactar un mensaje nuevo
-Name[et]=Koosta uus sõnum
-Name[eu]=Mezu Berria Idatzi
-Name[fi]=Luo uusi viesti
-Name[fr]=Rédiger un nouveau courriel
-Name[gd]=Co-chuir Teachdaireachd Ùr
-Name[gl]=Redactar unha nova mensaxe
-Name[he]=חיבור הודעה חדשה
-Name[hi]=नया संदेश लिखें
-Name[hr]=Nova poruka
+Name[es_AR]=Escribir un nuevo mensaje
+Name[es_ES]=Redactar nuevo mensaje
+Name[et]=Kirjuta uus kiri
+Name[eu]=Idatzi mezu berria
+Name[fi]=Kirjoita uusi viesti
+Name[fr]=Rédiger un nouveau message
+Name[fy_NL]=Skriuw in nij berjocht
+Name[ga_IE]=Scríobh teachtaireacht nua
+Name[gd]=Sgrìobh teachdaireachd ùr
+Name[gl]=Escribir unha nova mensaxe
+Name[he]=כתיבת הודעה חדשה
+Name[hr]=Piši novu poruku
 Name[hu]=Új üzenet írása
-Name[hy]=Նամակ գրել
-Name[id]=Buat Pesan Baru
-Name[is]=Skrifa nýtt bréf
-Name[it]=Componi nuovo messaggio
-Name[ja]=新しいメッセージの作成
-Name[kk]=Жаңа хат жазу
-Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು
-Name[ko]=새 메시지 쓰기
-Name[ku]=Peyameke nû biafirînê
+Name[hy_AM]=Գրել նոր նամակ
+Name[is]=SKrifa nýjan póst
+Name[it]=Scrivi nuovo messaggio
+Name[ja]=新しいメッセージを作成する
+Name[ko]=새 메시지 작성
 Name[lt]=Rašyti naują laišką
-Name[lv]=Sacerēt jaunu vēstuli
-Name[mk]=Состави нова порака
-Name[ml]=പുതിയ സന്ദേശം രചിക്കുക
-Name[mr]=नवीन संदेश लिहा.
-Name[nb]=Skriv en ny melding
-Name[nl]=Nieuw bericht opstellen
-Name[nn]=Skriv ei ny melding
-Name[pl]=Utwórz nową wiadomość
-Name[pt]=Criar nova mensagem
-Name[pt_BR]=Compor nova mensagem
-Name[ro]=Compune un mesaj nou
-Name[ru]=Написать письмо
-Name[si]=නව පණිවිඩයක් අරඹන්න
-Name[sk]=Napísať novú správu
+Name[nb_NO]=Skriv ny melding
+Name[nl]=Nieuw bericht aanmaken
+Name[nn_NO]=Skriv ny melding
+Name[pl]=Nowa wiadomość
+Name[pt_BR]=Nova mensagem
+Name[pt_PT]=Escrever nova mensagem
+Name[rm]=Scriver in nov messadi
+Name[ro]=Scrie un mesaj nou
+Name[ru]=Создать новое сообщение
+Name[si]=නව ලිපියක් ලියන්න
+Name[sk]=Nová e-mailová správa
 Name[sl]=Sestavi novo sporočilo
-Name[sq]=Krijo Mesazh të Ri
-Name[sr]=Састави нову поруку
-Name[sv]=Skriv nytt meddelande
-Name[ta]=புதிய செய்தியை உருவாக்கு
-Name[te]=కొత్త సందేశాన్ని రచించు
-Name[th]=สร้างข้อความใหม่
-Name[tr]=Yeni İleti Oluştur
-Name[uk]=Написати нове повідомлення
-Name[zh_CN]=撰写新消息
-Name[zh_TW]=撰寫新郵件
+Name[sq]=Shkruani mesazh të ri
+Name[sr]=Писање нове поруке
+Name[sv_SE]=Skriv ett nytt meddelande
+Name[ta_LK]=புதிய செய்தியை எழுதுக
+Name[tr]=Yeni ileti yaz
+Name[uk]=Написати нового листа
+Name[vi]=Viết thư mới
+Name[zh_CN]=编写新消息
+Name[zh_TW]=寫一封新訊息
 Exec=icedove -compose
 
-[Desktop Action Contacts]
-Name=Contacts
-Name[af]=Kontakte
-Name[ar]=المتراسلين
-Name[ast]=Contautos
-Name[be]=Кантакты
-Name[bg]=Контакти
-Name[bn]=পরিচিতি সমূহ
-Name[br]=Darempredoù
-Name[bs]=Kontakti
-Name[ca]=Contactes
-Name[cs]=Kontakty
-Name[cy]=Cysylltiadau
-Name[da]=Kontakter
-Name[de]=Kontakte
-Name[el]=Επαφές
-Name[eo]=Kontaktoj
-Name[es]=Contactos
-Name[et]=Kontaktid
-Name[eu]=Kontaktuak
-Name[fi]=Yhteystiedot
-Name[fr]=Carnet d'adresses
-Name[gd]=Buntanasan
-Name[gl]=Contactos
-Name[he]=אנשי קשר
-Name[hi]=संपर्क
-Name[hr]=Kontakti
-Name[hu]=Névjegyek
-Name[hy]=Կապորդներ
-Name[id]=Kontak
-Name[is]=Tengiliðir
-Name[it]=Contatti
-Name[ja]=連絡先
-Name[kk]=Байланыс жазулары
-Name[kn]=ಸಂಪರ್ಕಗಳು
-Name[ko]=연락처
-Name[ku]=Tekilî
-Name[lt]=Kontaktai
-Name[lv]=Kontakti
-Name[mk]=Контакти
-Name[ml]=വിലാസങ്ങള്‍
-Name[mr]=संपर्क
-Name[nb]=Kontakter
-Name[nl]=Contacten
-Name[nn]=Kontaktar
-Name[pl]=Kontakty
-Name[pt]=Contactos
-Name[pt_BR]=Contatos
-Name[ro]=Contacte
-Name[ru]=Контакты
-Name[si]=සබඳතා
-Name[sk]=Kontakty
-Name[sl]=Stiki
-Name[sq]=Kontaktet
-Name[sr]=Контакти
-Name[sv]=Kontakter
-Name[ta]=தொடர்புகள்
-Name[te]=పరిచయాలు
-Name[th]=รายชื่อติดต่อ
-Name[tr]=Kişiler
-Name[uk]=Контакти
-Name[zh_CN]=联系人
-Name[zh_TW]=連絡人
+[Desktop Action OpenAddressBook]
+Name=Open address book
+Name[ar]=افتح دفتر العناوين
+Name[ast]=Abrir llibreta de direiciones
+Name[be]=Адкрыць адрасную кнігу
+Name[bg]=Отваряне на адресник
+Name[br]=Digeriñ ur c'harned chomlec'hioù
+Name[ca]=Obre la llibreta d'adreces
+Name[cs]=Otevřít Adresář
+Name[da]=Åbn adressebog
+Name[de]=Adressbuch öffnen
+Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων
+Name[es_AR]=Abrir libreta de direcciones
+Name[es_ES]=Abrir libreta de direcciones
+Name[et]=Ava aadressiraamat
+Name[eu]=Ireki helbide-liburua
+Name[fi]=Avaa osoitekirja
+Name[fr]=Ouvrir un carnet d'adresses
+Name[fy_NL]=Iepenje adresboek
+Name[ga_IE]=Oscail leabhar seoltaí
+Name[gd]=Fosgail leabhar-sheòlaidhean
+Name[gl]=Abrir a axenda de enderezos
+Name[he]=פתיחת ספר כתובות
+Name[hr]=Otvori adresar
+Name[hu]=Címjegyzék megnyitása
+Name[hy_AM]=Բացել Հասցեագիրքը
+Name[is]=Opna nafnaskrá
+Name[it]=Apri rubrica
+Name[ja]=アドレス帳を開く
+Name[ko]=주소록 열기
+Name[lt]=Atverti adresų knygą
+Name[nb_NO]=Åpne adressebok
+Name[nl]=Adresboek openen
+Name[nn_NO]=Opne adressebok
+Name[pl]=Książka adresowa
+Name[pt_BR]=Catálogo de endereços
+Name[pt_PT]=Abrir livro de endereços
+Name[rm]=Avrir il cudeschet d'adressas
+Name[ro]=Deschide agenda de contacte
+Name[ru]=Открыть адресную книгу
+Name[si]=ලිපින පොත විවෘත කරන්න
+Name[sk]=Otvoriť adresár
+Name[sl]=Odpri adressar
+Name[sq]=Hapni libër adresash
+Name[sr]=Отвори адресар
+Name[sv_SE]=Öppna adressboken
+Name[ta_LK]=முகவரி பத்தகத்தை திறக்க
+Name[tr]=Adres defterini aç
+Name[uk]=Відкрити адресну книгу
+Name[vi]=Mở sổ địa chỉ
+Name[zh_CN]=打开通讯录
+Name[zh_TW]=開啟通訊錄
 Exec=icedove -addressbook
diff --git a/libre/icedove/rhbz-966424.patch b/libre/icedove/rhbz-966424.patch
deleted file mode 100644
index c4c332e9e..000000000
--- a/libre/icedove/rhbz-966424.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
-   issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
-   var tokenNames = issuerCert.getAllTokenNames({});
- 
-   if (!tokenNames || !tokenNames.some(isBuiltinToken))
-     throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**
-  * This class implements nsIBadCertListener.  Its job is to prevent "bad cert"
-  * security dialogs from being shown to the user.  It is better to simply fail
-  * if the certificate is bad. See bug 304286.
-  *
-  * @param  aAllowNonBuiltInCerts (optional)
diff --git a/nonprism/icedove/PKGBUILD b/nonprism/icedove/PKGBUILD
index 3ef75b2fa..9db1e0a0d 100644
--- a/nonprism/icedove/PKGBUILD
+++ b/nonprism/icedove/PKGBUILD
@@ -3,7 +3,7 @@
 
 # We're getting this from Debian Sid
 _debname=icedove
-_debver=31.6.0
+_debver=31.7.0
 _debrel=deb1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 pkgname=${_debname}
 epoch=1
 pkgver=${_debver}.${_debrel}
-pkgrel=2.nonprism1
+pkgrel=1.nonprism1
 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
@@ -28,16 +28,14 @@ source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz"
         mozconfig
         ${pkgname}.desktop
         ${pkgname}-install-dir.patch
-        vendor.js
-        rhbz-966424.patch)
+        vendor.js)
 options=(!emptydirs)
-sha256sums=('9011da6632434d6ee991cc69f4e040a194d998ce3a04e5c3a05f21fc361124dc'
-            'ac73365adcccf126b97432cfd60828da667b2eb82512ae252cf577939d666fd9'
+sha256sums=('00ce17575690400e22e7ce21dc5b3b4f71092b7708ee9aad74448d1401da8794'
+            '04c30b4e72819b764bc463d36c39f55741d3e47ae994ba89fd14e63fe32c6561'
             '09a0041f7f12498d933284b3d3a44e19002515accaff767d145a8f404b79e86a'
-            'a0be56fc87f255804e00e7c85abbc4731ebdaa8938858f1f8ac47dd2f17c0b8b'
+            '0b0d25067c64c6b829c84e5259ffca978e3971f85acc8483f47bdbed5b0b5b6a'
             '24599eab8862476744fe1619a9a53a5b8cdcab30b3fc5767512f31d3529bd05d'
-            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec'
-            '746cb474c5a2c26fc474256e430e035e604b71b27df1003d4af85018fa263f4a')
+            'b44f0eb82dce8a02aa71f0eab4b0d820e5383f613becc62cc995aac8638b54ec')
 
 prepare() {
   export DEBIAN_BUILD="comm-esr31"
@@ -59,6 +57,9 @@ prepare() {
       install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png"
   done
 
+  # We are doing it from sed commands
+  rm -v debian/patches/fixes/vp8_impl.cc-backporting-naming-for-constants.patch || true
+
   quilt push -av
 
   # Fix paths on makefile
@@ -105,9 +106,6 @@ prepare() {
 
   cp "${srcdir}/mozconfig" .mozconfig
 
-  # https://bugs.archlinux.org/task/41689
-  patch -Np1 -d mozilla -i ../../rhbz-966424.patch
-
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
   sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure
diff --git a/nonprism/icedove/icedove.desktop b/nonprism/icedove/icedove.desktop
index f39d5823c..1ba43e0b3 100644
--- a/nonprism/icedove/icedove.desktop
+++ b/nonprism/icedove/icedove.desktop
@@ -1,32 +1,5 @@
 [Desktop Entry]
 Name=Icedove
-Name[ast]=Veceru de corréu Icedove
-Name[ca]=Client de correu Icedove
-Name[cs]=Poštovní klient Icedove
-Name[da]=Icedove - e-post/nyhedsgruppe
-Name[de]=Icedove-E-Mail und -Nachrichten
-Name[el]=Ηλεκτρονική αλληλογραφία Icedove
-Name[es]=Cliente de correo Icedove
-Name[fi]=Icedove-sähköposti
-Name[fr]=Messagerie Icedove
-Name[gl]=Cliente de correo Icedove
-Name[he]=Icedove דוא״ל/חדשות
-Name[hr]=Icedove e-pošta/novosti
-Name[hu]=Icedove levelezőkliens
-Name[it]=Email Icedove
-Name[ja]=Icedove メールクライアント
-Name[ko]=Icedove
-Name[nl]=Icedove e-mail/nieuws
-Name[pl]=Klient poczty Icedove
-Name[pt_BR]=Cliente de E-mail Icedove
-Name[ru]=Почтовый клиент Icedove
-Name[sk]=Icedove - poštový klient
-Name[sv]=E-postklienten Icedove
-Name[ug]=Icedove ئېلخەت/خەۋەر
-Name[uk]=Поштова програма Icedove
-Name[vi]=Trình điện thư Icedove
-Name[zh_CN]=Icedove 邮件/新闻
-Name[zh_TW]=Icedove 郵件
 Comment=Send and receive mail with Icedove
 Comment[ast]=Lleer y escribir corréu electrónicu
 Comment[ca]=Llegiu i escriviu correu
@@ -82,164 +55,119 @@ GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Keywords=Email;E-mail;Newsgroup;Feed;RSS;
-Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS;
-Keywords[ca]=Correu;Email;E-mail;Mailing;Llistes;Notícies;RSS;
-Keywords[cs]=Email;E-mail;Pošta;Elektronická pošta;Diskusní skupiny;Čtečka;RSS;
-Keywords[da]=Email;E-mail;Epost;E-post;E-brev;Newsgroup;Nyhedsgruppe;Nyhedskilde;Usenet;Feed;RSS;
-Keywords[de]=Mail;E-Mail;Newsgroup;Nachrichten;Feed;RSS;Post;News;Usenet;online;lesen;schreiben;
-Keywords[el]=Email;E-mail;Newsgroup;Feed;RSS;ημαιλ;Αλληλογραφία;Ροή;ΡΣΣ;Συζητήσεις;Γράμματα;
-Keywords[es]=Email;Correo electrónico;Noticias;Discusiones;Mensajes;Canales;RSS;
-Keywords[fi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;posti;sähköposti;maili;meili;Usenet;uutisryhmät;syöte;
-Keywords[fr]=Mails;Mels;E-Mails;Emails;Courriels;Courriers;Newsgroup;Feed;RSS;Poster;Icedove;Lire;Écrire;
-Keywords[he]=דוא"ל;דוא״ל;מייל;אי-מייל;אימייל;הודעות;מוזילה;תאנדרבירד;ת׳אנדרבירד;ת'אנדרבירד;ת׳אנדרברד;ת'אנדרברד;דואל;
-Keywords[hr]=email;e-mail;e-pošta;pošta;RSS;
-Keywords[hu]=Email;E-mail;Levél;Levelezés;Hírcsoport;Feed;Hírforrás;RSS;
-Keywords[it]=Email;Mail;Posta;Newsgroup;Feed;RSS;
-Keywords[is]=tölvupóstur;rafpóstur;fréttir;fréttahópar;samtöl;skilaboð;fréttastraumar;RSS;
-Keywords[ja]=Eメール;イーメール;mail;e-mail;email;メール;電子メール;ニュースグループ;ネットニュース;RSS;フィードリーダー;書く;読む;Icedove;
-Keywords[nl]=Email;E-mail;Newsgroup;Feed;RSS;Nieuwsgroep;Post;
-Keywords[ru]=Email;E-mail;Newsgroup;Feed;RSS;почта;письма;новости;фиды;
-Keywords[sk]=Email;E-mail;Elektronická pošta;Diskusné skupiny;Čítačka kanálov;RSS;
-Keywords[uk]=Email;E-mail;Newsgroup;Feed;RSS;пошта;новини;подачі;стрічка;
-Keywords[vi]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;Thư điện tử;Gửi thư;
-Keywords[zh_CN]=Mail;E-Mail;Email;Newsgroup;Feed;RSS;电子;邮件;新闻;Icedove;tb;雷鸟;电邮;邮箱;阅读器;
 Exec=icedove %u
 Terminal=false
-X-MultipleArgs=false
 Type=Application
 Icon=icedove
 Categories=Network;Email;
 MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
 StartupNotify=true
-Actions=Compose;Contacts;
+Actions=ComposeMessage;OpenAddressBook;
 
-[Desktop Action Compose]
-Name=Compose New Message
-Name[af]=Skryf 'n nuwe boodskap
-Name[ar]=حرر رسالة جديدة
-Name[ast]=Redactar un mensaxe nuevu
-Name[be]=Напісаць ліст
-Name[bg]=Ново писмо
-Name[bn]=নতুন বার্তা লিখুন
-Name[br]=Sevel ur gemennadenn nevez
-Name[bs]=Napiši novu poruku
-Name[ca]=Redacta un missatge nou
+[Desktop Action ComposeMessage]
+Name=Write new message
+Name[ar]=اكتب رسالة جديدة
+Name[ast]=Redactar mensaxe nuevu
+Name[be]=Напісаць новы ліст
+Name[bg]=Съставяне на ново съобщение
+Name[br]=Skrivañ ur gemennadenn nevez
+Name[ca]=Escriu un missatge nou
 Name[cs]=Napsat novou zprávu
-Name[cy]=Cyfansoddi Neges Newydd
-Name[da]=Skriv en ny besked
-Name[de]=Neue Nachricht erstellen
+Name[da]=Skriv en ny meddelelse
+Name[de]=Neue Nachricht verfassen
 Name[el]=Σύνταξη νέου μηνύματος
-Name[eo]=Redakti novan mesaĝon
-Name[es]=Redactar un mensaje nuevo
-Name[et]=Koosta uus sõnum
-Name[eu]=Mezu Berria Idatzi
-Name[fi]=Luo uusi viesti
-Name[fr]=Rédiger un nouveau courriel
-Name[gd]=Co-chuir Teachdaireachd Ùr
-Name[gl]=Redactar unha nova mensaxe
-Name[he]=חיבור הודעה חדשה
-Name[hi]=नया संदेश लिखें
-Name[hr]=Nova poruka
+Name[es_AR]=Escribir un nuevo mensaje
+Name[es_ES]=Redactar nuevo mensaje
+Name[et]=Kirjuta uus kiri
+Name[eu]=Idatzi mezu berria
+Name[fi]=Kirjoita uusi viesti
+Name[fr]=Rédiger un nouveau message
+Name[fy_NL]=Skriuw in nij berjocht
+Name[ga_IE]=Scríobh teachtaireacht nua
+Name[gd]=Sgrìobh teachdaireachd ùr
+Name[gl]=Escribir unha nova mensaxe
+Name[he]=כתיבת הודעה חדשה
+Name[hr]=Piši novu poruku
 Name[hu]=Új üzenet írása
-Name[hy]=Նամակ գրել
-Name[id]=Buat Pesan Baru
-Name[is]=Skrifa nýtt bréf
-Name[it]=Componi nuovo messaggio
-Name[ja]=新しいメッセージの作成
-Name[kk]=Жаңа хат жазу
-Name[kn]=ಹೊಸ ಸಂದೇಶವನ್ನು ಸಂಯೋಜಿಸು
-Name[ko]=새 메시지 쓰기
-Name[ku]=Peyameke nû biafirînê
+Name[hy_AM]=Գրել նոր նամակ
+Name[is]=SKrifa nýjan póst
+Name[it]=Scrivi nuovo messaggio
+Name[ja]=新しいメッセージを作成する
+Name[ko]=새 메시지 작성
 Name[lt]=Rašyti naują laišką
-Name[lv]=Sacerēt jaunu vēstuli
-Name[mk]=Состави нова порака
-Name[ml]=പുതിയ സന്ദേശം രചിക്കുക
-Name[mr]=नवीन संदेश लिहा.
-Name[nb]=Skriv en ny melding
-Name[nl]=Nieuw bericht opstellen
-Name[nn]=Skriv ei ny melding
-Name[pl]=Utwórz nową wiadomość
-Name[pt]=Criar nova mensagem
-Name[pt_BR]=Compor nova mensagem
-Name[ro]=Compune un mesaj nou
-Name[ru]=Написать письмо
-Name[si]=නව පණිවිඩයක් අරඹන්න
-Name[sk]=Napísať novú správu
+Name[nb_NO]=Skriv ny melding
+Name[nl]=Nieuw bericht aanmaken
+Name[nn_NO]=Skriv ny melding
+Name[pl]=Nowa wiadomość
+Name[pt_BR]=Nova mensagem
+Name[pt_PT]=Escrever nova mensagem
+Name[rm]=Scriver in nov messadi
+Name[ro]=Scrie un mesaj nou
+Name[ru]=Создать новое сообщение
+Name[si]=නව ලිපියක් ලියන්න
+Name[sk]=Nová e-mailová správa
 Name[sl]=Sestavi novo sporočilo
-Name[sq]=Krijo Mesazh të Ri
-Name[sr]=Састави нову поруку
-Name[sv]=Skriv nytt meddelande
-Name[ta]=புதிய செய்தியை உருவாக்கு
-Name[te]=కొత్త సందేశాన్ని రచించు
-Name[th]=สร้างข้อความใหม่
-Name[tr]=Yeni İleti Oluştur
-Name[uk]=Написати нове повідомлення
-Name[zh_CN]=撰写新消息
-Name[zh_TW]=撰寫新郵件
+Name[sq]=Shkruani mesazh të ri
+Name[sr]=Писање нове поруке
+Name[sv_SE]=Skriv ett nytt meddelande
+Name[ta_LK]=புதிய செய்தியை எழுதுக
+Name[tr]=Yeni ileti yaz
+Name[uk]=Написати нового листа
+Name[vi]=Viết thư mới
+Name[zh_CN]=编写新消息
+Name[zh_TW]=寫一封新訊息
 Exec=icedove -compose
 
-[Desktop Action Contacts]
-Name=Contacts
-Name[af]=Kontakte
-Name[ar]=المتراسلين
-Name[ast]=Contautos
-Name[be]=Кантакты
-Name[bg]=Контакти
-Name[bn]=পরিচিতি সমূহ
-Name[br]=Darempredoù
-Name[bs]=Kontakti
-Name[ca]=Contactes
-Name[cs]=Kontakty
-Name[cy]=Cysylltiadau
-Name[da]=Kontakter
-Name[de]=Kontakte
-Name[el]=Επαφές
-Name[eo]=Kontaktoj
-Name[es]=Contactos
-Name[et]=Kontaktid
-Name[eu]=Kontaktuak
-Name[fi]=Yhteystiedot
-Name[fr]=Carnet d'adresses
-Name[gd]=Buntanasan
-Name[gl]=Contactos
-Name[he]=אנשי קשר
-Name[hi]=संपर्क
-Name[hr]=Kontakti
-Name[hu]=Névjegyek
-Name[hy]=Կապորդներ
-Name[id]=Kontak
-Name[is]=Tengiliðir
-Name[it]=Contatti
-Name[ja]=連絡先
-Name[kk]=Байланыс жазулары
-Name[kn]=ಸಂಪರ್ಕಗಳು
-Name[ko]=연락처
-Name[ku]=Tekilî
-Name[lt]=Kontaktai
-Name[lv]=Kontakti
-Name[mk]=Контакти
-Name[ml]=വിലാസങ്ങള്‍
-Name[mr]=संपर्क
-Name[nb]=Kontakter
-Name[nl]=Contacten
-Name[nn]=Kontaktar
-Name[pl]=Kontakty
-Name[pt]=Contactos
-Name[pt_BR]=Contatos
-Name[ro]=Contacte
-Name[ru]=Контакты
-Name[si]=සබඳතා
-Name[sk]=Kontakty
-Name[sl]=Stiki
-Name[sq]=Kontaktet
-Name[sr]=Контакти
-Name[sv]=Kontakter
-Name[ta]=தொடர்புகள்
-Name[te]=పరిచయాలు
-Name[th]=รายชื่อติดต่อ
-Name[tr]=Kişiler
-Name[uk]=Контакти
-Name[zh_CN]=联系人
-Name[zh_TW]=連絡人
+[Desktop Action OpenAddressBook]
+Name=Open address book
+Name[ar]=افتح دفتر العناوين
+Name[ast]=Abrir llibreta de direiciones
+Name[be]=Адкрыць адрасную кнігу
+Name[bg]=Отваряне на адресник
+Name[br]=Digeriñ ur c'harned chomlec'hioù
+Name[ca]=Obre la llibreta d'adreces
+Name[cs]=Otevřít Adresář
+Name[da]=Åbn adressebog
+Name[de]=Adressbuch öffnen
+Name[el]=Άνοιγμα ευρετηρίου διευθύνσεων
+Name[es_AR]=Abrir libreta de direcciones
+Name[es_ES]=Abrir libreta de direcciones
+Name[et]=Ava aadressiraamat
+Name[eu]=Ireki helbide-liburua
+Name[fi]=Avaa osoitekirja
+Name[fr]=Ouvrir un carnet d'adresses
+Name[fy_NL]=Iepenje adresboek
+Name[ga_IE]=Oscail leabhar seoltaí
+Name[gd]=Fosgail leabhar-sheòlaidhean
+Name[gl]=Abrir a axenda de enderezos
+Name[he]=פתיחת ספר כתובות
+Name[hr]=Otvori adresar
+Name[hu]=Címjegyzék megnyitása
+Name[hy_AM]=Բացել Հասցեագիրքը
+Name[is]=Opna nafnaskrá
+Name[it]=Apri rubrica
+Name[ja]=アドレス帳を開く
+Name[ko]=주소록 열기
+Name[lt]=Atverti adresų knygą
+Name[nb_NO]=Åpne adressebok
+Name[nl]=Adresboek openen
+Name[nn_NO]=Opne adressebok
+Name[pl]=Książka adresowa
+Name[pt_BR]=Catálogo de endereços
+Name[pt_PT]=Abrir livro de endereços
+Name[rm]=Avrir il cudeschet d'adressas
+Name[ro]=Deschide agenda de contacte
+Name[ru]=Открыть адресную книгу
+Name[si]=ලිපින පොත විවෘත කරන්න
+Name[sk]=Otvoriť adresár
+Name[sl]=Odpri adressar
+Name[sq]=Hapni libër adresash
+Name[sr]=Отвори адресар
+Name[sv_SE]=Öppna adressboken
+Name[ta_LK]=முகவரி பத்தகத்தை திறக்க
+Name[tr]=Adres defterini aç
+Name[uk]=Відкрити адресну книгу
+Name[vi]=Mở sổ địa chỉ
+Name[zh_CN]=打开通讯录
+Name[zh_TW]=開啟通訊錄
 Exec=icedove -addressbook
diff --git a/nonprism/icedove/rhbz-966424.patch b/nonprism/icedove/rhbz-966424.patch
deleted file mode 100644
index c4c332e9e..000000000
--- a/nonprism/icedove/rhbz-966424.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/toolkit/modules/CertUtils.jsm
-+++ b/toolkit/modules/CertUtils.jsm
-@@ -170,17 +170,19 @@ this.checkCert =
-   issuerCert = issuerCert.QueryInterface(Ci.nsIX509Cert3);
-   var tokenNames = issuerCert.getAllTokenNames({});
- 
-   if (!tokenNames || !tokenNames.some(isBuiltinToken))
-     throw new Ce(certNotBuiltInErr, Cr.NS_ERROR_ABORT);
- }
- 
- function isBuiltinToken(tokenName) {
--  return tokenName == "Builtin Object Token";
-+  return tokenName == "Builtin Object Token" ||
-+         tokenName == "Default Trust" ||
-+         tokenName == "System Trust";
- }
- 
- /**
-  * This class implements nsIBadCertListener.  Its job is to prevent "bad cert"
-  * security dialogs from being shown to the user.  It is better to simply fail
-  * if the certificate is bad. See bug 304286.
-  *
-  * @param  aAllowNonBuiltInCerts (optional)