From 35d24fa93d8f3cf4ced4fe0f8f0ff1d863c8e854 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Thu, 10 Dec 2009 16:32:57 +0000
Subject: [PATCH] SVN_MERGE

Merged revisions 1058568,1058637,1058673,1059156,1059857,1059987,1060047,1060071,1060076,1060244,1060398-1060399,1060415,1060429,1060452,1060617,1060712,1060733-1060734,1060763-1060765 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

................
  r1058568 | skelly | 2009-12-04 18:37:03 +0100 (Fri, 04 Dec 2009) | 3 lines

  Check in the latest kreparentingproxymodel.

  This implements support for rowsRemoved among other things now.
................
  r1058637 | tokoe | 2009-12-04 21:52:47 +0100 (Fri, 04 Dec 2009) | 2 lines

  SVN_SILENT krazy fixes
................
  r1058673 | djarvie | 2009-12-04 23:14:39 +0100 (Fri, 04 Dec 2009) | 2 lines

  Change date format in dialogue
................
  r1059156 | golnazn | 2009-12-05 23:34:43 +0100 (Sat, 05 Dec 2009) | 1 line

  BUG:#216909: Add support of <pre> tags in the post editor.
................
  r1059857 | lueck | 2009-12-07 16:00:39 +0100 (Mon, 07 Dec 2009) | 2 lines

  extract messages + load the catalog
  CCMAIL:kde-i18n-doc@kde.org
................
  r1059987 | tmcguire | 2009-12-07 21:53:36 +0100 (Mon, 07 Dec 2009) | 3 lines

  Protect against event loop reentrancy.
  Fixes crash on startup due to the ContactSearchJob
................
  r1060047 | cgiboudeaux | 2009-12-08 00:16:13 +0100 (Tue, 08 Dec 2009) | 1 line

  We now require Boost 1.34.0
................
  r1060071 | djarvie | 2009-12-08 01:43:14 +0100 (Tue, 08 Dec 2009) | 2 lines

  Bug 217456: fix date-only alarms triggering repeatedly at high frequency.
................
  r1060076 | djarvie | 2009-12-08 01:56:05 +0100 (Tue, 08 Dec 2009) | 2 lines

  Fix date-only alarms in akonadi resource
................
  r1060244 | scripty | 2009-12-08 11:53:04 +0100 (Tue, 08 Dec 2009) | 1 line

  SVN_SILENT made messages (.desktop file)
................
  r1060398 | nlecureuil | 2009-12-08 20:48:03 +0100 (Tue, 08 Dec 2009) | 3 lines

  Fix crash when KTimetracker is in Kontact
  BUG:217721
................
  r1060399 | nlecureuil | 2009-12-08 20:56:26 +0100 (Tue, 08 Dec 2009) | 5 lines

  Allow "new task" button to work when KTimeTracker is embeded in Kontact
  and no document already exists

  BUG:212725
................
  r1060415 | winterz | 2009-12-08 22:17:13 +0100 (Tue, 08 Dec 2009) | 21 lines

  Recorded merge of revisions 1060413 via svnmerge from
  https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

  ................
    r1060413 | winterz | 2009-12-08 16:13:06 -0500 (Tue, 08 Dec 2009) | 14 lines

    Merged revisions 1060410 via svnmerge from
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

    ........
      r1060410 | winterz | 2009-12-08 16:04:46 -0500 (Tue, 08 Dec 2009) | 7 lines

      merge SVN commit 1060407 by winterz from trunk:

      Don't assert when adding a new Journal with attendees.
      Looks like I'm adding a new string, but I'm not: I'm reusing a string from 4.3

      MERGE: e4 (already in trunk)
    ........
  ................
................
  r1060429 | djarvie | 2009-12-08 23:09:30 +0100 (Tue, 08 Dec 2009) | 1 line

  Remove warning
................
  r1060452 | pokrzywka | 2009-12-09 01:14:13 +0100 (Wed, 09 Dec 2009) | 1 line

  added Boost_INCLUDEDIRS to some plugins which require boost::shared_ptr indirectly
................
  r1060617 | scripty | 2009-12-09 12:42:13 +0100 (Wed, 09 Dec 2009) | 1 line

  SVN_SILENT made messages (.desktop file)
................
  r1060712 | winterz | 2009-12-09 19:28:34 +0100 (Wed, 09 Dec 2009) | 19 lines

  Blocked revisions 1060710 via svnmerge

  ................
    r1060710 | winterz | 2009-12-09 13:27:11 -0500 (Wed, 09 Dec 2009) | 13 lines

    Merged revisions 1060708 via svnmerge from
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

    ........
      r1060708 | winterz | 2009-12-09 13:23:56 -0500 (Wed, 09 Dec 2009) | 6 lines

      fix my previous commit for
      "Don't assert when adding a new Journal with attendees."

      I put the fix in the wrong place.  This will teach me not to merge by-hand.
      MERGE: e4
    ........
  ................
................
  r1060733 | tokoe | 2009-12-09 20:37:58 +0100 (Wed, 09 Dec 2009) | 2 lines

  Abort application if Akonadi couldn't be started
................
  r1060734 | tokoe | 2009-12-09 20:38:29 +0100 (Wed, 09 Dec 2009) | 2 lines

  Abort application if Akonadi couldn't be started
................
  r1060763 | otrichet | 2009-12-09 21:34:19 +0100 (Wed, 09 Dec 2009) | 3 lines

  Use the spell checker configuration of KNode instead of the global one.

  BUG: 207767
................
  r1060764 | otrichet | 2009-12-09 21:34:26 +0100 (Wed, 09 Dec 2009) | 1 line

  useless code
................
  r1060765 | otrichet | 2009-12-09 21:34:33 +0100 (Wed, 09 Dec 2009) | 3 lines

  Remember if automatic spell checking is enabled or not

  BUG: 123720
................

svn path=/branches/work/akonadi-ports/kdepim/; revision=1061100
---
 KMail.desktop                   | 2 ++
 application_octetstream.desktop | 3 +++
 dbusmail.desktop                | 2 ++
 kmail.notifyrc                  | 5 +++++
 kmail_config_accounts.desktop   | 2 ++
 kmail_config_appearance.desktop | 2 ++
 kmail_config_composer.desktop   | 2 ++
 kmail_config_identity.desktop   | 2 ++
 kmail_config_misc.desktop       | 4 +++-
 kmail_config_security.desktop   | 2 ++
 kmail_view.desktop              | 1 +
 main.cpp                        | 6 +++++-
 12 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/KMail.desktop b/KMail.desktop
index 594fb3e2f..c254fcd4f 100644
--- a/KMail.desktop
+++ b/KMail.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=KMail
 Name[af]=KMail
+Name[ar]=برنامج البريد KMail
 Name[be]=KMail
 Name[bg]=KMail
 Name[br]=KMail
@@ -69,6 +70,7 @@ Icon=kmail
 X-DocPath=kmail/index.html
 GenericName=Mail Client
 GenericName[af]=E-pos kliënt
+GenericName[ar]=عميل البريد
 GenericName[be]=Паштовы кліент
 GenericName[bg]=Пощенски клиент
 GenericName[br]=Kliant postel
diff --git a/application_octetstream.desktop b/application_octetstream.desktop
index 12b126d6f..117c6c178 100644
--- a/application_octetstream.desktop
+++ b/application_octetstream.desktop
@@ -1,5 +1,7 @@
 [Misc]
 Name=Application Octet Stream
+Name[ar]=تطبيق ثماني الدفق
+Name[ca]=Aplicació Octet Stream
 Name[cs]=Aplikace octetstream
 Name[da]=Programmet Octet Stream
 Name[de]=Application Octet Stream
@@ -31,6 +33,7 @@ Name[zh_CN]=应用程序 Octet 数据流
 Name[zh_TW]=Application/Octet-Stream
 Comment=A bodypart formatter plugin for application/octet-stream
 Comment[af]='n Inprop module wat die lyf gedeelte vir 'application/octet-stream' formateer
+Comment[ar]=ملحق منسق جزء الجسم لتطبيق/دفق ثماني
 Comment[bg]=Приставка за форматиране на двоични данни
 Comment[ca]=Un connector formatador del cos per application/octet-stream
 Comment[cs]=Modul formátovače těla pro application/octet-stream
diff --git a/dbusmail.desktop b/dbusmail.desktop
index c7904b7a6..1904e77e4 100644
--- a/dbusmail.desktop
+++ b/dbusmail.desktop
@@ -2,6 +2,8 @@
 Type=ServiceType
 X-KDE-ServiceType=DBUS/Mailer
 Comment=Mail program with a D-Bus interface
+Comment[ar]=برنامج البريد بواجهة D-Bus
+Comment[ca]=Un programa de correu amb una interfície D-Bus
 Comment[cs]=Poštvní program s DBUS rozhraním
 Comment[da]=E-mail-program med en D-BUS-grænseflade
 Comment[de]=E-Mail-Programm mit D-Bus-Schnittstelle
diff --git a/kmail.notifyrc b/kmail.notifyrc
index a79709959..448ae797c 100644
--- a/kmail.notifyrc
+++ b/kmail.notifyrc
@@ -2,6 +2,7 @@
 IconName=kmail
 Comment=KMail
 Comment[af]=KMail
+Comment[ar]=برنامج البريد KMail
 Comment[bg]=KMail
 Comment[br]=KMail
 Comment[ca]=KMail
@@ -61,6 +62,7 @@ Comment[zh_TW]=KMail 郵件軟體
 
 [Event/mail-check-error]
 Name=Error While Checking Mail
+Name[ca]=Error en comprovar el correu
 Name[en_GB]=Error While Checking Mail
 Name[es]=Error al comprobar el correo
 Name[et]=Viga kirjade kontrollimisel
@@ -78,6 +80,7 @@ Name[uk]=Помилка під час спроби отримання пошти
 Name[x-test]=xxError While Checking Mailxx
 Name[zh_TW]=檢查郵件時發生錯誤
 Comment=There was an error while checking for new mail
+Comment[ca]=S'ha produït un error en comprovar el coreu nou
 Comment[en_GB]=There was an error while checking for new mail
 Comment[es]=Ha ocurrido un error mientras se comprobaba el correo nuevo
 Comment[et]=Uute kirjade kontrollimisel tekkis viga
@@ -99,6 +102,7 @@ Action=Popup
 [Event/new-mail-arrived]
 Name=New Mail Arrived
 Name[af]=Nuwe pos het gearriveer
+Name[ar]=وصل بريد جديد
 Name[br]=Deuet eo ur postel nevez
 Name[ca]=Ha arribat correu nou
 Name[cs]=Přišla nová pošta
@@ -152,6 +156,7 @@ Name[zh_CN]=新邮件到达
 Name[zh_TW]=新郵件抵達
 Comment=New mail arrived
 Comment[af]=Nuwe pos het gearriveer
+Comment[ar]=وصل بريد جديد
 Comment[br]=Deuet eo ur postel nevez
 Comment[ca]=Ha arribat correu nou
 Comment[cs]=Přišla nová pošta
diff --git a/kmail_config_accounts.desktop b/kmail_config_accounts.desktop
index b25c033ee..cca4df5c3 100644
--- a/kmail_config_accounts.desktop
+++ b/kmail_config_accounts.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=200
 
 Name=Accounts
 Name[af]=Rekeninge
+Name[ar]=الحِسابات
 Name[be]=Рахункі
 Name[bg]=Сметки
 Name[br]=Kontoù
@@ -75,6 +76,7 @@ Name[zh_CN]=账户
 Name[zh_TW]=帳號
 Comment=Setup for Sending and Receiving Messages
 Comment[af]=Opstel vir die stuur en ontvang van boodskappe
+Comment[ar]=تهيئة إرسال و إستقبال الرسائل
 Comment[bg]=Настройки на мрежата, сървърите и сметките
 Comment[ca]=Configuració per enviar i rebre missatges
 Comment[cs]=Nastavení odesílání a přijímání zpráv
diff --git a/kmail_config_appearance.desktop b/kmail_config_appearance.desktop
index b6133abeb..7c398e97b 100644
--- a/kmail_config_appearance.desktop
+++ b/kmail_config_appearance.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=300
 
 Name=Appearance
 Name[af]=Appearance
+Name[ar]=المظهر
 Name[be]=Вонкавы выгляд
 Name[bg]=Външен вид
 Name[br]=Neuziadur
@@ -76,6 +77,7 @@ Name[zh_CN]=外观
 Name[zh_TW]=外觀
 Comment=Customize Visual Appearance
 Comment[af]=Pasmaak die visuele voorkoms
+Comment[ar]=تخصيص المظهر المرئي
 Comment[bg]=Настройки на външния вид
 Comment[ca]=Personalitza l'aparença visual
 Comment[cs]=Nastavení vzhledu
diff --git a/kmail_config_composer.desktop b/kmail_config_composer.desktop
index 792f5abe5..7eb05da28 100644
--- a/kmail_config_composer.desktop
+++ b/kmail_config_composer.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=400
 
 Name=Composer
 Name[af]=Composer
+Name[ar]=المؤلف
 Name[bg]=Редактор
 Name[br]=Skridaozer
 Name[ca]=Editor
@@ -70,6 +71,7 @@ Name[x-test]=xxComposerxx
 Name[zh_CN]=撰写器
 Name[zh_TW]=編寫器
 Comment=Message Composer Settings
+Comment[ar]=إعدادات مؤلف الرسائل
 Comment[ca]=Arranjament de l'editor de missatges
 Comment[cs]=Nastavení editoru zpráv
 Comment[da]=Indstiling af brevskriver
diff --git a/kmail_config_identity.desktop b/kmail_config_identity.desktop
index f00b32c20..7595ba73a 100644
--- a/kmail_config_identity.desktop
+++ b/kmail_config_identity.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=100
 
 Name=Identities
 Name[af]=Identities
+Name[ar]=الهويات
 Name[be]=Увасабленні
 Name[bg]=Самоличност
 Name[br]=Anvelezhioù
@@ -74,6 +75,7 @@ Name[zh_CN]=身份
 Name[zh_TW]=身份
 Comment=Manage Identities
 Comment[af]=Bestuur identiteite
+Comment[ar]=أدِر الهويات
 Comment[be]=Кіраванне увасабленнямі
 Comment[bg]=Настройки на самоличността
 Comment[br]=Merañ an anvelezhioù
diff --git a/kmail_config_misc.desktop b/kmail_config_misc.desktop
index 0d64471b4..7674c3063 100644
--- a/kmail_config_misc.desktop
+++ b/kmail_config_misc.desktop
@@ -14,10 +14,11 @@ X-KDE-Weight=600
 
 Name=Misc
 Name[af]=Allerlei
+Name[ar]=متفرقات
 Name[be]=Рознае
 Name[bg]=Разни
 Name[br]=A bep seurt
-Name[ca]=Varis
+Name[ca]=Miscel·lània
 Name[cs]=Různé
 Name[cy]=Amrywiol
 Name[da]=Diverse
@@ -73,6 +74,7 @@ Name[zh_CN]=杂项
 Name[zh_TW]=其他
 Comment=Settings that don't fit elsewhere
 Comment[af]=Opstelling wat nêrens anders pas nie
+Comment[ar]=الإعدادات التي لا تندرج في أي مكان آخر
 Comment[bg]=Разни настройки
 Comment[ca]=Opcions que no van bé enlloc
 Comment[cs]=Nastavení nehodící se jinam
diff --git a/kmail_config_security.desktop b/kmail_config_security.desktop
index 7054dc8a9..4773320c7 100644
--- a/kmail_config_security.desktop
+++ b/kmail_config_security.desktop
@@ -14,6 +14,7 @@ X-KDE-Weight=500
 
 Name=Security
 Name[af]=Sekuriteit
+Name[ar]=الأمن
 Name[be]=Бяспека
 Name[bg]=Сигурност
 Name[br]=Surentez
@@ -76,6 +77,7 @@ Name[zh_CN]=安全
 Name[zh_TW]=安全性
 Comment=Security & Privacy Settings
 Comment[af]=Sekuriteit en provaatheid opstelling
+Comment[ar]= إعدادات الأمن و الخصوصية
 Comment[be]=Настаўленні бяспекі і прыватнасці
 Comment[bg]=Настройки на сигурността
 Comment[br]=Kefluniadur surentez ar buhez prevez
diff --git a/kmail_view.desktop b/kmail_view.desktop
index df73e4287..01407af28 100644
--- a/kmail_view.desktop
+++ b/kmail_view.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=KMail view
+Name[ar]=عرض KMail 
 Name[ca]=Vista del KMail
 Name[cs]=KMail pohled
 Name[da]=KMail-visning
diff --git a/main.cpp b/main.cpp
index aa80a288e..922d1a1c9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -144,7 +144,11 @@ int main(int argc, char *argv[])
   app.setEventLoopReached();
   app.delayedInstanceCreation();
 
-  Akonadi::Control::start( kmkernel->getKMMainWidget() );
+  if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
+    //TODO: add message box after string freeze
+    kWarning() << "Unable to start Akonadi server, exit application";
+    return 1;
+  }
   // Go!
   int ret = qApp->exec();
   // clean up