Merge branch 'master' into routing

Conflicts:
	lib/base.php

3rdparty/Sabre/CalDAV/CalendarQueryValidator.php

@@ -304,28 +304,29 @@ class Sabre_CalDAV_CalendarQueryValidator {
                         // one is the first to trigger. Based on this, we can
                         // determine if we can 'give up' expanding events.
                         $firstAlarm = null;
-                        foreach($expandedEvent->VALARM as $expandedAlarm) {
+                        if ($expandedEvent->VALARM !== null) {
+                            foreach($expandedEvent->VALARM as $expandedAlarm) {
 
-                            $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
-                            if ($expandedAlarm->isInTimeRange($start, $end)) {
-                                return true;
-                            }
+                                $effectiveTrigger = $expandedAlarm->getEffectiveTriggerTime();
+                                if ($expandedAlarm->isInTimeRange($start, $end)) {
+                                    return true;
+                                }
 
-                            if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
-                                // This is an alarm with a non-relative trigger
-                                // time, likely created by a buggy client. The
-                                // implication is that every alarm in this
-                                // recurring event trigger at the exact same
-                                // time. It doesn't make sense to traverse
-                                // further.
-                            } else {
-                                // We store the first alarm as a means to
-                                // figure out when we can stop traversing.
-                                if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
-                                    $firstAlarm = $effectiveTrigger;
+                                if ((string)$expandedAlarm->TRIGGER['VALUE'] === 'DATE-TIME') {
+                                    // This is an alarm with a non-relative trigger
+                                    // time, likely created by a buggy client. The
+                                    // implication is that every alarm in this
+                                    // recurring event trigger at the exact same
+                                    // time. It doesn't make sense to traverse
+                                    // further.
+                                } else {
+                                    // We store the first alarm as a means to
+                                    // figure out when we can stop traversing.
+                                    if (!$firstAlarm || $effectiveTrigger < $firstAlarm) {
+                                        $firstAlarm = $effectiveTrigger;
+                                    }
                                 }
                             }
-
                         }
                         if (is_null($firstAlarm)) {
                             // No alarm was found.

3rdparty/Sabre/CalDAV/Plugin.php

@@ -728,7 +728,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
             throw new Sabre_DAV_Exception_BadRequest('The Recipient: header must be specified when making POST requests');
         }
 
-        if (!preg_match('/^mailto:(.*)@(.*)$/', $originator)) {
+        if (!preg_match('/^mailto:(.*)@(.*)$/i', $originator)) {
             throw new Sabre_DAV_Exception_BadRequest('Originator must start with mailto: and must be valid email address');
         }
         $originator = substr($originator,7);
@@ -737,7 +737,7 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
         foreach($recipients as $k=>$recipient) {
 
             $recipient = trim($recipient);
-            if (!preg_match('/^mailto:(.*)@(.*)$/', $recipient)) { 
+            if (!preg_match('/^mailto:(.*)@(.*)$/i', $recipient)) {
                 throw new Sabre_DAV_Exception_BadRequest('Recipients must start with mailto: and must be valid email address');
             }
             $recipient = substr($recipient, 7);
@@ -785,9 +785,10 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
         }
 
         if (in_array($method, array('REQUEST','REPLY','ADD','CANCEL')) && $componentType==='VEVENT') {
-            $this->iMIPMessage($originator, $recipients, $vObject);
+            $result = $this->iMIPMessage($originator, $recipients, $vObject);
             $this->server->httpResponse->sendStatus(200);
-            $this->server->httpResponse->sendBody('Messages sent');
+            $this->server->httpResponse->setHeader('Content-Type','application/xml');
+            $this->server->httpResponse->sendBody($this->generateScheduleResponse($result));
         } else {
             throw new Sabre_DAV_Exception_NotImplemented('This iTIP method is currently not implemented');
         }
@@ -797,17 +798,82 @@ class Sabre_CalDAV_Plugin extends Sabre_DAV_ServerPlugin {
     /**
      * Sends an iMIP message by email.
      *
+     * This method must return an array with status codes per recipient.
+     * This should look something like:
+     *
+     * array(
+     *    'user1@example.org' => '2.0;Success'
+     * )
+     *
+     * Formatting for this status code can be found at:
+     * https://tools.ietf.org/html/rfc5545#section-3.8.8.3
+     *
+     * A list of valid status codes can be found at:
+     * https://tools.ietf.org/html/rfc5546#section-3.6
+     *
      * @param string $originator
      * @param array $recipients
      * @param Sabre_VObject_Component $vObject
-     * @return void
+     * @return array
      */
     protected function iMIPMessage($originator, array $recipients, Sabre_VObject_Component $vObject) {
 
         if (!$this->imipHandler) {
-            throw new Sabre_DAV_Exception_NotImplemented('No iMIP handler is setup on this server.');
+            $resultStatus = '5.2;This server does not support this operation';
+        } else {
+            $this->imipHandler->sendMessage($originator, $recipients, $vObject);
+            $resultStatus = '2.0;Success';
         }
-        $this->imipHandler->sendMessage($originator, $recipients, $vObject); 
+
+        $result = array();
+        foreach($recipients as $recipient) {
+            $result[$recipient] = $resultStatus;
+        }
+
+        return $result;
+
+
+    }
+
+    /**
+     * Generates a schedule-response XML body
+     *
+     * The recipients array is a key->value list, containing email addresses
+     * and iTip status codes. See the iMIPMessage method for a description of
+     * the value.
+     *
+     * @param array $recipients
+     * @return string
+     */
+    public function generateScheduleResponse(array $recipients) {
+
+        $dom = new DOMDocument('1.0','utf-8');
+        $dom->formatOutput = true;
+        $xscheduleResponse = $dom->createElement('cal:schedule-response');
+        $dom->appendChild($xscheduleResponse);
+
+        foreach($this->server->xmlNamespaces as $namespace=>$prefix) {
+
+            $xscheduleResponse->setAttribute('xmlns:' . $prefix, $namespace);
+
+        }
+
+        foreach($recipients as $recipient=>$status) {
+            $xresponse = $dom->createElement('cal:response');
+
+            $xrecipient = $dom->createElement('cal:recipient');
+            $xrecipient->appendChild($dom->createTextNode($recipient));
+            $xresponse->appendChild($xrecipient);
+
+            $xrequestStatus = $dom->createElement('cal:request-status');
+            $xrequestStatus->appendChild($dom->createTextNode($status));
+            $xresponse->appendChild($xrequestStatus);
+
+            $xscheduleResponse->appendChild($xresponse);
+
+        }
+
+        return $dom->saveXML();
 
     }
 

3rdparty/Sabre/CalDAV/Version.php

@@ -14,7 +14,7 @@ class Sabre_CalDAV_Version {
     /**
      * Full version number
      */
-    const VERSION = '1.6.3';
+    const VERSION = '1.6.4';
 
     /**
      * Stability : alpha, beta, stable

3rdparty/Sabre/CardDAV/Plugin.php

@@ -154,7 +154,10 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
                     $val = stream_get_contents($val);
 
                 // Taking out \r to not screw up the xml output
-                $returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+                //$returnedProperties[200][$addressDataProp] = str_replace("\r","", $val);
+                // The stripping of \r breaks the Mail App in OSX Mountain Lion
+                // this is fixed in master, but not backported. /Tanghus
+                $returnedProperties[200][$addressDataProp] = $val;
 
             }
         }

3rdparty/Sabre/DAV/Locks/Plugin.php

@@ -292,7 +292,10 @@ class Sabre_DAV_Locks_Plugin extends Sabre_DAV_ServerPlugin {
             $this->server->tree->getNodeForPath($uri);
 
             // We need to call the beforeWriteContent event for RFC3744
-            $this->server->broadcastEvent('beforeWriteContent',array($uri));
+            // Edit: looks like this is not used, and causing problems now.
+            //
+            // See Issue 222
+            // $this->server->broadcastEvent('beforeWriteContent',array($uri));
 
         } catch (Sabre_DAV_Exception_NotFound $e) {
 

3rdparty/Sabre/DAV/Version.php

@@ -14,7 +14,7 @@ class Sabre_DAV_Version {
     /**
      * Full version number
      */
-    const VERSION = '1.6.3';
+    const VERSION = '1.6.4';
 
     /**
      * Stability : alpha, beta, stable

3rdparty/Sabre/HTTP/BasicAuth.php

@@ -46,7 +46,7 @@ class Sabre_HTTP_BasicAuth extends Sabre_HTTP_AbstractAuth {
 
         if (strpos(strtolower($auth),'basic')!==0) return false;
 
-        return explode(':', base64_decode(substr($auth, 6)));
+        return explode(':', base64_decode(substr($auth, 6)),2);
 
     }
 

3rdparty/Sabre/HTTP/Version.php

@@ -14,7 +14,7 @@ class Sabre_HTTP_Version {
     /**
      * Full version number
      */
-    const VERSION = '1.6.2';
+    const VERSION = '1.6.4';
 
     /**
      * Stability : alpha, beta, stable

3rdparty/Sabre/VObject/Component/VEvent.php

@@ -42,14 +42,15 @@ class Sabre_VObject_Component_VEvent extends Sabre_VObject_Component {
 
         $effectiveStart = $this->DTSTART->getDateTime();
         if (isset($this->DTEND)) {
+
+            // The DTEND property is considered non inclusive. So for a 3 day
+            // event in july, dtstart and dtend would have to be July 1st and
+            // July 4th respectively.
+            //
+            // See:
+            // http://tools.ietf.org/html/rfc5545#page-54
             $effectiveEnd = $this->DTEND->getDateTime();
-            // If this was an all-day event, we should just increase the
-            // end-date by 1. Otherwise the event will last until the second
-            // the date changed, by increasing this by 1 day the event lasts
-            // all of the last day as well.
-            if ($this->DTSTART->getDateType() == Sabre_VObject_Element_DateTime::DATE) {
-                $effectiveEnd->modify('+1 day');
-            }
+
         } elseif (isset($this->DURATION)) {
             $effectiveEnd = clone $effectiveStart;
             $effectiveEnd->add( Sabre_VObject_DateTimeParser::parseDuration($this->DURATION) );

3rdparty/Sabre/VObject/RecurrenceIterator.php

@@ -337,6 +337,8 @@ class Sabre_VObject_RecurrenceIterator implements Iterator {
             $this->endDate = clone $this->startDate;
             if (isset($this->baseEvent->DURATION)) {
                 $this->endDate->add(Sabre_VObject_DateTimeParser::parse($this->baseEvent->DURATION->value));
+            } elseif ($this->baseEvent->DTSTART->getDateType()===Sabre_VObject_Property_DateTime::DATE) {
+                $this->endDate->modify('+1 day');
             }
         }
         $this->currentDate = clone $this->startDate;
@@ -561,7 +563,7 @@ class Sabre_VObject_RecurrenceIterator implements Iterator {
      */
     public function fastForward(DateTime $dt) {
 
-        while($this->valid() && $this->getDTEnd() < $dt) {
+        while($this->valid() && $this->getDTEnd() <= $dt) {
             $this->next();
         }
 
@@ -823,9 +825,40 @@ class Sabre_VObject_RecurrenceIterator implements Iterator {
      */
     protected function nextYearly() {
 
+        $currentMonth = $this->currentDate->format('n');
+        $currentYear = $this->currentDate->format('Y');
+        $currentDayOfMonth = $this->currentDate->format('j');
+
+        // No sub-rules, so we just advance by year
         if (!$this->byMonth) {
+
+            // Unless it was a leap day!
+            if ($currentMonth==2 && $currentDayOfMonth==29) {
+
+                $counter = 0;
+                do {
+                    $counter++;
+                    // Here we increase the year count by the interval, until
+                    // we hit a date that's also in a leap year.
+                    //
+                    // We could just find the next interval that's dividable by
+                    // 4, but that would ignore the rule that there's no leap
+                    // year every year that's dividable by a 100, but not by
+                    // 400. (1800, 1900, 2100). So we just rely on the datetime
+                    // functions instead.
+                    $nextDate = clone $this->currentDate;
+                    $nextDate->modify('+ ' . ($this->interval*$counter) . ' years');
+                } while ($nextDate->format('n')!=2);
+                $this->currentDate = $nextDate;
+
+                return;
+
+            }
+
+            // The easiest form
             $this->currentDate->modify('+' . $this->interval . ' years');
             return;
+
         }
 
         $currentMonth = $this->currentDate->format('n');
@@ -877,8 +910,8 @@ class Sabre_VObject_RecurrenceIterator implements Iterator {
 
         } else {
 
-            // no byDay or byMonthDay, so we can just loop through the
-            // months.
+            // These are the 'byMonth' rules, if there are no byDay or
+            // byMonthDay sub-rules.
             do {
 
                 $currentMonth++;
@@ -888,6 +921,7 @@ class Sabre_VObject_RecurrenceIterator implements Iterator {
                 }
             } while (!in_array($currentMonth, $this->byMonth));
             $this->currentDate->setDate($currentYear, $currentMonth, $currentDayOfMonth);
+
             return;
 
         }

3rdparty/Sabre/VObject/Version.php

@@ -14,7 +14,7 @@ class Sabre_VObject_Version {
     /**
      * Full version number
      */
-    const VERSION = '1.3.3';
+    const VERSION = '1.3.4';
 
     /**
      * Stability : alpha, beta, stable

apps/admin_audit/appinfo/info.xml

@@ -5,6 +5,7 @@
 	<version>0.1</version>
 	<licence>AGPL</licence>
 	<author>Bart Visscher</author>
-	<require>2</require>
+	<require>4</require>
 	<description>Audit user actions in Owncloud</description>
+	<shipped>true</shipped>
 </info>

apps/bookmarks/ajax/addBookmark.php

@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();

apps/bookmarks/ajax/delBookmark.php

@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();

apps/bookmarks/ajax/editBookmark.php

@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();

apps/bookmarks/ajax/recordClick.php

@@ -21,11 +21,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');

apps/bookmarks/ajax/updateList.php

@@ -22,11 +22,6 @@
 * 
 */
 
-//no apps or filesystem
-$RUNTIME_NOSETUPFS=true;
-
- 
-
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');

apps/bookmarks/l10n/bg_BG.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Отметки",
+"unnamed" => "неозаглавено",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Завлачете това в лентата с отметки на браузъра си и го натискайте, когато искате да отметнете бързо някоя страница:",
+"Read later" => "Отмятане",
+"Address" => "Адрес",
+"Title" => "Заглавие",
+"Tags" => "Етикети",
+"Save bookmark" => "Запис на отметката",
+"You have no bookmarks" => "Нямате отметки",
+"Bookmarklet <br />" => "Бутон за отметки <br />"
+);

apps/bookmarks/l10n/ca.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Adreces d'interès",
+"unnamed" => "sense nom",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrossegueu-ho al navegador i feu-hi un clic quan volgueu marcar ràpidament una adreça d'interès:",
+"Read later" => "Llegeix més tard",
+"Address" => "Adreça",
+"Title" => "Títol",
+"Tags" => "Etiquetes",
+"Save bookmark" => "Desa l'adreça d'interès",
+"You have no bookmarks" => "No teniu adreces d'interès",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);

apps/bookmarks/l10n/de.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Lesezeichen",
+"unnamed" => "unbenannt",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ziehe dies zu deinen Browser-Lesezeichen und klicke es, wenn du eine Website schnell den Lesezeichen hinzufügen willst.",
+"Read later" => "Später lesen",
+"Address" => "Adresse",
+"Title" => "Title",
+"Tags" => "Tags",
+"Save bookmark" => "Lesezeichen speichern",
+"You have no bookmarks" => "Du hast keine Lesezeichen",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);

apps/bookmarks/l10n/el.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Σελιδοδείκτες",
+"unnamed" => "ανώνυμο",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Σύρετε αυτό στους σελιδοδείκτες του περιηγητή σας και κάντε κλικ επάνω του, όταν θέλετε να προσθέσετε σύντομα μια ιστοσελίδα ως σελιδοδείκτη:",
+"Read later" => "Ανάγνωση αργότερα",
+"Address" => "Διεύθυνση",
+"Title" => "Τίτλος",
+"Tags" => "Ετικέτες",
+"Save bookmark" => "Αποθήκευση σελιδοδείκτη",
+"You have no bookmarks" => "Δεν έχετε σελιδοδείκτες",
+"Bookmarklet <br />" => "Εφαρμογίδιο Σελιδοδεικτών <br />"
+);

apps/bookmarks/l10n/eo.php

@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Legosignoj",
+"unnamed" => "nenomita",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Ŝovu tion ĉi al la legosignoj de via TTT-legilo kaj klaku ĝin, se vi volas rapide legosignigi TTT-paĝon:",
+"Read later" => "Legi poste",
+"Address" => "Adreso",
+"Title" => "Titolo",
+"Tags" => "Etikedoj",
+"Save bookmark" => "Konservi legosignon",
+"You have no bookmarks" => "Vi havas neniun legosignon"
+);

apps/bookmarks/l10n/es.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Marcadores",
+"unnamed" => "sin nombre",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Arrastra desde aquí a los marcadores de tu navegador, y haz clic cuando quieras marcar una página web rápidamente:",
+"Read later" => "Leer después",
+"Address" => "Dirección",
+"Title" => "Título",
+"Tags" => "Etiquetas",
+"Save bookmark" => "Guardar marcador",
+"You have no bookmarks" => "No tienes marcadores",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);

apps/bookmarks/l10n/et_EE.php

@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Järjehoidjad",
+"unnamed" => "nimetu",
+"Read later" => "Loe hiljem",
+"Address" => "Aadress",
+"Title" => "Pealkiri",
+"Tags" => "Sildid",
+"Save bookmark" => "Salvesta järjehoidja",
+"You have no bookmarks" => "Sul pole järjehoidjaid"
+);

apps/bookmarks/l10n/fi_FI.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Kirjanmerkit",
+"unnamed" => "nimetön",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Vedä tämä selaimesi kirjanmerkkipalkkiin ja napsauta sitä, kun haluat lisätä kirjanmerkin nopeasti:",
+"Read later" => "Lue myöhemmin",
+"Address" => "Osoite",
+"Title" => "Otsikko",
+"Tags" => "Tunnisteet",
+"Save bookmark" => "Tallenna kirjanmerkki",
+"You have no bookmarks" => "Sinulla ei ole kirjanmerkkejä",
+"Bookmarklet <br />" => "Kirjanmerkitsin <br />"
+);

apps/bookmarks/l10n/fr.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Favoris",
+"unnamed" => "sans titre",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Glissez ceci dans les favoris de votre navigateur, et cliquer dessus lorsque vous souhaitez ajouter la page en cours à vos marques-pages :",
+"Read later" => "Lire plus tard",
+"Address" => "Adresse",
+"Title" => "Titre",
+"Tags" => "Étiquettes",
+"Save bookmark" => "Sauvegarder le favori",
+"You have no bookmarks" => "Vous n'avez aucun favori",
+"Bookmarklet <br />" => "Gestionnaire de favoris <br />"
+);

apps/bookmarks/l10n/it.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Segnalibri",
+"unnamed" => "senza nome",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Quando vuoi creare rapidamente un segnalibro, trascinalo sui segnalibri del browser e fai clic su di esso:",
+"Read later" => "Leggi dopo",
+"Address" => "Indirizzo",
+"Title" => "Titolo",
+"Tags" => "Tag",
+"Save bookmark" => "Salva segnalibro",
+"You have no bookmarks" => "Non hai segnalibri",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);

apps/bookmarks/l10n/sl.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Zaznamki",
+"unnamed" => "neimenovano",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Povlecite to povezavo med zaznamke v vašem brskalniku in jo, ko želite ustvariti zaznamek trenutne strani, preprosto kliknite:",
+"Read later" => "Preberi kasneje",
+"Address" => "Naslov",
+"Title" => "Ime",
+"Tags" => "Oznake",
+"Save bookmark" => "Shrani zaznamek",
+"You have no bookmarks" => "Nimate zaznamkov",
+"Bookmarklet <br />" => "Bookmarklet <br />"
+);

apps/bookmarks/l10n/sv.php

@@ -0,0 +1,12 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Bokmärken",
+"unnamed" => "namnlös",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Dra till din webbläsares bokmärken och klicka på det när du vill bokmärka en webbsida snabbt:",
+"Read later" => "Läs senare",
+"Address" => "Adress",
+"Title" => "Titel",
+"Tags" => "Taggar",
+"Save bookmark" => "Spara bokmärke",
+"You have no bookmarks" => "Du har inga bokmärken",
+"Bookmarklet <br />" => "Skriptbokmärke <br />"
+);

apps/calendar/ajax/calendar/overview.php

@@ -5,8 +5,6 @@
  * later.
  * See the COPYING-README file.
  */ 
-
- 
 $l10n = OC_L10N::get('calendar');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');

apps/calendar/appinfo/app.php

@@ -33,5 +33,4 @@ OCP\App::addNavigationEntry( array(
   'href' => OCP\Util::linkTo( 'calendar', 'index.php' ),
   'icon' => OCP\Util::imagePath( 'calendar', 'icon.svg' ),
   'name' => $l->t('Calendar')));
-OCP\App::registerPersonal('calendar', 'settings');
 OC_Search::registerProvider('OC_Search_Provider_Calendar');

apps/calendar/appinfo/remote.php

@@ -21,10 +21,13 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $caldavBackend    = new OC_Connector_Sabre_CalDAV();
 
 // Root nodes
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$collection->disableListing = true; // Disable listening
+
 $nodes = array( 
-	new Sabre_CalDAV_Principal_Collection($principalBackend),
+	$collection, 
 	new Sabre_CalDAV_CalendarRootNode($principalBackend, $caldavBackend),
-);
+	);
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);
@@ -35,5 +38,6 @@ $server->addPlugin(new Sabre_CalDAV_Plugin());
 $server->addPlugin(new Sabre_DAVACL_Plugin());
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
 $server->addPlugin(new Sabre_CalDAV_ICSExportPlugin());
+
 // And off we go!
 $server->exec();

apps/calendar/calendar.php

@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownClouddev at georgswebsite.de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+$l10n = OC_L10N::get('calendar');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('calendar');
+$tmpl = new OCP\Template('calendar', 'part.choosecalendar');
+$tmpl->printpage();

apps/calendar/css/style.css

@@ -19,7 +19,7 @@
 
 #loading { display: none;margin: 0;padding:0;margin-top:5px;}
 
-#calendar_holder {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
+#fullcalendar {position: relative;bottom: 0; right: 0; left: 0; top: 3em;}
 .fc-content{padding:2px 4px;}
 #listview {margin: 0; padding: 10px; background: #EEEEEE;}
 #listview #more_before, #listview #more_after {border: 1px solid #1a1a1a; width:25em;padding: 3px;text-align: center;}
@@ -133,3 +133,12 @@ padding:0 8px 2px;
 line-height:1.2;
 margin-bottom:4px;
 }
+
+#choosecalendar a.settings{
+	margin-top: 25px;
+	margin-right: 10px;
+}
+
+#fullcalendar{
+	overflow: scroll;
+}

apps/calendar/index.php

@@ -5,8 +5,6 @@
  * later.
  * See the COPYING-README file.
  */
-
- 
 OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
@@ -24,8 +22,17 @@ foreach($calendars as $calendar){
 	}
 }
 
-$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true');
-$eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_r', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable' => 'false');
+$events_baseURL = OCP\Util::linkTo('calendar', 'ajax/events.php');
+$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_rw',
+		'backgroundColor' => '#1D2D44',
+		'borderColor' => '#888',
+		'textColor' => 'white',
+		'editable'=>'true');
+$eventSources[] = array('url' => $events_baseURL.'?calendar_id=shared_r',
+		'backgroundColor' => '#1D2D44',
+		'borderColor' => '#888',
+		'textColor' => 'white',
+		'editable' => 'false');
 
 OCP\Util::emitHook('OC_Calendar', 'getSources', array('sources' => &$eventSources));
 $categories = OC_Calendar_App::getCategoryOptions();

apps/calendar/js/calendar.js

@@ -18,7 +18,7 @@ Calendar={
 		startEventDialog:function(){
 			Calendar.UI.loading(false);
 			$('.tipsy').remove();
-			$('#calendar_holder').fullCalendar('unselect');
+			$('#fullcalendar').fullCalendar('unselect');
 			Calendar.UI.lockTime();
 			$( "#from" ).datepicker({
 				dateFormat : 'dd-mm-yy'
@@ -88,7 +88,7 @@ Calendar={
 			$.post(url, post, function(data){
 					Calendar.UI.loading(false);
 					if(data.status == 'success'){
-						$('#calendar_holder').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
+						$('#fullcalendar').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
 						$('#event').dialog('destroy').remove();
 					} else {
 						$('#errorbox').html(t('calendar', 'Deletion failed'));
@@ -133,7 +133,7 @@ Calendar={
 					} else
 					if(data.status == 'success'){
 						$('#event').dialog('destroy').remove();
-						$('#calendar_holder').fullCalendar('refetchEvents');
+						$('#fullcalendar').fullCalendar('refetchEvents');
 					}
 				},"json");
 		},
@@ -148,7 +148,7 @@ Calendar={
 					console.log("Event moved successfully");
 				}else{
 					revertFunc();
-					$('#calendar_holder').fullCalendar('refetchEvents');
+					$('#fullcalendar').fullCalendar('refetchEvents');
 				}
 			});
 		},
@@ -163,7 +163,7 @@ Calendar={
 					console.log("Event resized successfully");
 				}else{
 					revertFunc();
-					$('#calendar_holder').fullCalendar('refetchEvents');
+					$('#fullcalendar').fullCalendar('refetchEvents');
 				}
 			});
 		},
@@ -239,11 +239,11 @@ Calendar={
 				doc_height = $(document).height(),
 				win_height = $(window).height();
 			if(direction == 'down' && win_height == (doc_height - scroll)){
-				$('#calendar_holder').fullCalendar('next');
+				$('#fullcalendar').fullCalendar('next');
 				$(document).scrollTop(0);
 				event.preventDefault();
 			}else if (direction == 'top' && scroll == 0) {
-				$('#calendar_holder').fullCalendar('prev');
+				$('#fullcalendar').fullCalendar('prev');
 				$(document).scrollTop(win_height);
 				event.preventDefault();
 			}
@@ -398,9 +398,9 @@ Calendar={
 					if (data.status == 'success'){
 						checkbox.checked = data.active == 1;
 						if (data.active == 1){
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
 						}else{
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
 						}
 					}
 				  });
@@ -426,10 +426,10 @@ Calendar={
 					  function(data) {
 						if (data.status == 'success'){
 							var url = 'ajax/events.php?calendar_id='+calid;
-							$('#calendar_holder').fullCalendar('removeEventSource', url);
+							$('#fullcalendar').fullCalendar('removeEventSource', url);
 							$('#choosecalendar_dialog').dialog('destroy').remove();
 							Calendar.UI.Calendar.overview();
-							$('#calendar_holder').fullCalendar('refetchEvents');
+							$('#fullcalendar').fullCalendar('refetchEvents');
 						}
 					  });
 				}
@@ -456,8 +456,8 @@ Calendar={
 					function(data){
 						if(data.status == 'success'){
 							$(button).closest('tr').prev().html(data.page).show().next().remove();
-							$('#calendar_holder').fullCalendar('removeEventSource', data.eventSource.url);
-							$('#calendar_holder').fullCalendar('addEventSource', data.eventSource);
+							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
+							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
 							if (calendarid == 'new'){
 								$('#choosecalendar_dialog > table:first').append('<tr><td colspan="6"><a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="' + newcalendar + '"></a></td></tr>');
 							}
@@ -504,7 +504,7 @@ Calendar={
 			idtype: '',
 			activation:function(object,owner,id){
 				$.post(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
-				$('#calendar_holder').fullCalendar('refetchEvents');
+				$('#fullcalendar').fullCalendar('refetchEvents');
 			},
 			dropdown:function(userid, calid){
 				$('.calendar_share_dropdown').remove();
@@ -612,7 +612,7 @@ Calendar={
 					console.log('The drop-import feature is not supported in your browser :(');
 					return false;
 				}
-				droparea = document.getElementById('calendar_holder');
+				droparea = document.getElementById('fullcalendar');
 				droparea.ondrop = function(e){
 					e.preventDefault();
 					Calendar.UI.Drop.drop(e);
@@ -626,7 +626,7 @@ Calendar={
 					reader = new FileReader();
 					reader.onload = function(event){
 						Calendar.UI.Drop.import(event.target.result);
-						$('#calendar_holder').fullCalendar('refetchEvents');
+						$('#fullcalendar').fullCalendar('refetchEvents');
 					}
 					reader.readAsDataURL(file);
 				}
@@ -634,7 +634,7 @@ Calendar={
 			import:function(data){
 				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
 					if(result.status == 'success'){
-						$('#calendar_holder').fullCalendar('addEventSource', result.eventSource);
+						$('#fullcalendar').fullCalendar('addEventSource', result.eventSource);
 						$('#notification').html(result.message);
 						$('#notification').slideDown();
 						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
@@ -647,7 +647,11 @@ Calendar={
 				});
 			}
 		}
-	}
+	},
+	Settings:{
+		//
+	},
+	
 }
 $.fullCalendar.views.list = ListView;
 function ListView(element, calendar) {
@@ -815,7 +819,7 @@ function ListView(element, calendar) {
 }
 $(document).ready(function(){
 	Calendar.UI.initScroll();
-	$('#calendar_holder').fullCalendar({
+	$('#fullcalendar').fullCalendar({
 		header: false,
 		firstDay: firstDay,
 		editable: true,
@@ -851,10 +855,10 @@ $(document).ready(function(){
 			}
 			Calendar.UI.setViewActive(view.name);
 			if (view.name == 'agendaWeek') {
-				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 0.1);
+				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 0.1);
 			}
 			else {
-				$('#calendar_holder').fullCalendar('option', 'aspectRatio', 1.35);
+				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 1.35);
 			}
 		},
 		columnFormat: {
@@ -888,7 +892,7 @@ $(document).ready(function(){
 		changeYear: true,
 		showButtonPanel: true,
 		beforeShow: function(input, inst) {
-			var calendar_holder = $('#calendar_holder');
+			var calendar_holder = $('#fullcalendar');
 			var date = calendar_holder.fullCalendar('getDate');
 			inst.input.datepicker('setDate', date);
 			inst.input.val(calendar_holder.fullCalendar('getView').title);
@@ -896,30 +900,36 @@ $(document).ready(function(){
 		},
 		onSelect: function(value, inst) {
 			var date = inst.input.datepicker('getDate');
-			$('#calendar_holder').fullCalendar('gotoDate', date);
+			$('#fullcalendar').fullCalendar('gotoDate', date);
 		}
 	});
 	fillWindow($('#content'));
 	OCCategories.changed = Calendar.UI.categoriesChanged;
 	OCCategories.app = 'calendar';
 	$('#oneweekview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'agendaWeek');
+		$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
 	});
 	$('#onemonthview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'month');
+		$('#fullcalendar').fullCalendar('changeView', 'month');
 	});
 	$('#listview_radio').click(function(){
-		$('#calendar_holder').fullCalendar('changeView', 'list');
+		$('#fullcalendar').fullCalendar('changeView', 'list');
 	});
 	$('#today_input').click(function(){
-		$('#calendar_holder').fullCalendar('today');
+		$('#fullcalendar').fullCalendar('today');
 	});
 	$('#datecontrol_left').click(function(){
-		$('#calendar_holder').fullCalendar('prev');
+		$('#fullcalendar').fullCalendar('prev');
 	});
 	$('#datecontrol_right').click(function(){
-		$('#calendar_holder').fullCalendar('next');
+		$('#fullcalendar').fullCalendar('next');
 	});
 	Calendar.UI.Share.init();
 	Calendar.UI.Drop.init();
+	$('#choosecalendar .generalsettings').on('click keydown', function() {
+		OC.appSettings({appid:'calendar', loadJS:true, cache:false});
+	});
+	$('#choosecalendar .calendarsettings').on('click keydown', function() {
+		OC.appSettings({appid:'calendar', loadJS:true, cache:false, scriptName:'calendar.php'});
+	});
 });

apps/calendar/js/settings.js

@@ -1,11 +1,7 @@
 $(document).ready(function(){
 	$('#timezone').change( function(){
-		OC.msg.startSaving('#calendar .msg')
-		// Serialize the data
 		var post = $( '#timezone' ).serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){
-			//OC.msg.finishedSaving('#calendar .msg', data);
-		});
+		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){return;});
 		return false;
 	});
 	$('#timezone').chosen();
@@ -52,6 +48,7 @@ $(document).ready(function(){
 		});
 	});
 	calendarcachecheck();
+	
 });
 function calendarcachecheck(){
 	$.getJSON(OC.filePath('calendar', 'ajax/cache', 'status.php'), function(jsondata, status) {

apps/calendar/l10n/bg_BG.php

@@ -1,7 +1,23 @@
 <?php $TRANSLATIONS = array(
+"No calendars found." => "Не са открити календари.",
+"No events found." => "Не са открити събития.",
+"Import failed" => "Грешка при внасяне",
+"New Timezone:" => "Нов часови пояс:",
 "Timezone changed" => "Часовата зона е сменена",
 "Invalid request" => "Невалидна заявка",
 "Calendar" => "Календар",
+"Birthday" => "Роджен ден",
+"Clients" => "Клиенти",
+"Holidays" => "Празници",
+"Ideas" => "Идеи",
+"Journey" => "Пътуване",
+"Meeting" => "Среща",
+"Other" => "Друго",
+"Personal" => "Лично",
+"Projects" => "Проекти",
+"Questions" => "Въпроси",
+"Work" => "Работа",
+"New Calendar" => "Нов календар",
 "Does not repeat" => "Не се повтаря",
 "Daily" => "Дневно",
 "Weekly" => "Седмично",
@@ -9,32 +25,64 @@
 "Bi-Weekly" => "Двуседмично",
 "Monthly" => "Месечно",
 "Yearly" => "Годишно",
+"never" => "никога",
+"Monday" => "Понеделник",
+"Tuesday" => "Вторник",
+"Wednesday" => "Сряда",
+"Thursday" => "Четвъртък",
+"Friday" => "Петък",
+"Saturday" => "Събота",
+"Sunday" => "Неделя",
 "All day" => "Всички дни",
+"Missing fields" => "Липсват полета",
 "Title" => "Заглавие",
 "Week" => "Седмица",
 "Month" => "Месец",
+"List" => "Списък",
 "Today" => "Днес",
 "Calendars" => "Календари",
 "There was a fail, while parsing the file." => "Възникна проблем с разлистването на файла.",
 "Choose active calendars" => "Изберете активен календар",
+"Your calendars" => "Вашите календари",
+"Shared calendars" => "Споделени календари",
+"No shared calendars" => "Няма споделени календари",
+"Share Calendar" => "Споделяне на календар",
 "Download" => "Изтегляне",
 "Edit" => "Промяна",
+"Delete" => "Изтриване",
+"New calendar" => "Нов календар",
 "Edit calendar" => "Промени календар",
 "Displayname" => "Екранно име",
 "Active" => "Активен",
 "Calendar color" => "Цвят на календара",
+"Save" => "Запис",
 "Submit" => "Продължи",
+"Cancel" => "Отказ",
 "Edit an event" => "Промяна на събитие",
+"Export" => "Изнасяне",
+"Share" => "Споделяне",
 "Title of the Event" => "Наименование",
 "Category" => "Категория",
+"Separate categories with commas" => "Отделете категориите със запетаи",
+"Edit categories" => "Редактиране на категориите",
 "All Day Event" => "Целодневно събитие",
 "From" => "От",
 "To" => "До",
+"Advanced options" => "Разширени настройки",
 "Location" => "Локация",
 "Location of the Event" => "Локация",
 "Description" => "Описание",
 "Description of the Event" => "Описание",
 "Repeat" => "Повтори",
+"create a new calendar" => "създаване на нов календар",
+"Please choose a calendar" => "Изберете календар",
+"Name of new calendar" => "Име на новия календар",
+"Import" => "Внасяне",
+"Close Dialog" => "Затваряне на прозореца",
 "Create a new event" => "Ново събитие",
-"Timezone" => "Часова зона"
+"View an event" => "Преглед на събитие",
+"No categories selected" => "Няма избрани категории",
+"Timezone" => "Часова зона",
+"First day of the week" => "Първи ден на седмицата",
+"Groups" => "Групи"
 );

apps/calendar/l10n/ca.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "No tots els calendaris estan en memòria",
+"Everything seems to be completely cached" => "Sembla que tot està en memòria",
 "No calendars found." => "No s'han trobat calendaris.",
 "No events found." => "No s'han trobat events.",
 "Wrong calendar" => "Calendari erroni",
+"The file contained either no events or all events are already saved in your calendar." => "El fitxer no contenia esdeveniments o aquests ja estaven desats en el vostre caledari",
+"events has been saved in the new calendar" => "els esdeveniments s'han desat en el calendari nou",
+"Import failed" => "Ha fallat la importació",
+"events has been saved in your calendar" => "els esdveniments s'han desat en el calendari",
 "New Timezone:" => "Nova zona horària:",
 "Timezone changed" => "La zona horària ha canviat",
 "Invalid request" => "Sol.licitud no vàlida",
 "Calendar" => "Calendari",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "d [MMM ][yyyy ]{'&#8212;' d MMM yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
 "Birthday" => "Aniversari",
 "Business" => "Feina",
 "Call" => "Trucada",
@@ -22,7 +33,9 @@
 "Projects" => "Projectes",
 "Questions" => "Preguntes",
 "Work" => "Feina",
+"by" => "per",
 "unnamed" => "sense nom",
+"New Calendar" => "Calendari nou",
 "Does not repeat" => "No es repeteix",
 "Daily" => "Diari",
 "Weekly" => "Mensual",
@@ -67,8 +80,26 @@
 "by day and month" => "per dia del mes",
 "Date" => "Data",
 "Cal." => "Cal.",
+"Sun." => "Dg.",
+"Mon." => "Dl.",
+"Tue." => "Dm.",
+"Wed." => "Dc.",
+"Thu." => "Dj.",
+"Fri." => "Dv.",
+"Sat." => "Ds.",
+"Jan." => "Gen.",
+"Feb." => "Febr.",
+"Mar." => "Març",
+"Apr." => "Abr.",
+"May." => "Maig",
+"Jun." => "Juny",
+"Jul." => "Jul.",
+"Aug." => "Ag.",
+"Sep." => "Set.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Des.",
 "All day" => "Tot el dia",
-"New Calendar" => "Calendari nou",
 "Missing fields" => "Els camps que falten",
 "Title" => "Títol",
 "From Date" => "Des de la data",
@@ -132,18 +163,17 @@
 "Interval" => "Interval",
 "End" => "Final",
 "occurrences" => "aparicions",
-"Import a calendar file" => "Importa un fitxer de calendari",
-"Please choose the calendar" => "Escolliu el calendari",
 "create a new calendar" => "crea un nou calendari",
+"Import a calendar file" => "Importa un fitxer de calendari",
+"Please choose a calendar" => "Escolliu un calendari",
 "Name of new calendar" => "Nom del nou calendari",
+"Take an available name!" => "Escolliu un nom disponible!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ja hi ha un calendari amb aquest nom. Si continueu, els calendaris es combinaran.",
 "Import" => "Importa",
-"Importing calendar" => "S'està important el calendari",
-"Calendar imported successfully" => "El calendari s'ha importat amb èxit",
 "Close Dialog" => "Tanca el diàleg",
 "Create a new event" => "Crea un nou esdeveniment",
 "View an event" => "Mostra un event",
 "No categories selected" => "No hi ha categories seleccionades",
-"Select category" => "Seleccioneu categoria",
 "of" => "de",
 "at" => "a",
 "Timezone" => "Zona horària",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Primer dia de la setmana",
-"Calendar CalDAV syncing address:" => "Adreça de sincronització del calendari CalDAV:",
+"Cache" => "Memòria de cau",
+"Clear cache for repeating events" => "Neteja la memòria de cau pels esdeveniments amb repetició",
+"Calendar CalDAV syncing addresses" => "Adreça de sincronització del calendari CalDAV",
+"more info" => "més informació",
+"Primary address (Kontact et al)" => "Adreça primària (Kontact et al)",
+"iOS/OS X" => "IOS/OS X",
+"Read only iCalendar link(s)" => "Enllaç(os) iCalendar només de lectura",
 "Users" => "Usuaris",
 "select users" => "seleccioneu usuaris",
 "Editable" => "Editable",

apps/calendar/l10n/de.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Noch sind nicht alle Kalender zwischengespeichert.",
+"Everything seems to be completely cached" => "Es sieht so aus, als wäre alles vollständig zwischengespeichert.",
 "No calendars found." => "Keine Kalender gefunden",
 "No events found." => "Keine Termine gefunden",
 "Wrong calendar" => "Falscher Kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Entweder enthielt die Datei keine Termine oder alle Termine waren schon im Kalender gespeichert.",
+"events has been saved in the new calendar" => "Der Termin wurde im neuen Kalender gespeichert.",
+"Import failed" => "Import fehlgeschlagen",
+"events has been saved in your calendar" => "Der Termin wurde im Kalender gespeichert.",
 "New Timezone:" => "Neue Zeitzone:",
 "Timezone changed" => "Zeitzone geändert",
 "Invalid request" => "Fehlerhafte Anfrage",
 "Calendar" => "Kalender",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d.M",
+"dddd M/d" => "dddd d.M",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d. MMM yyyy",
 "Birthday" => "Geburtstag",
 "Business" => "Geschäftlich",
 "Call" => "Anruf",
@@ -22,7 +33,9 @@
 "Projects" => "Projekte",
 "Questions" => "Fragen",
 "Work" => "Arbeit",
+"by" => "von",
 "unnamed" => "unbenannt",
+"New Calendar" => "Neuer Kalender",
 "Does not repeat" => "einmalig",
 "Daily" => "täglich",
 "Weekly" => "wöchentlich",
@@ -67,8 +80,26 @@
 "by day and month" => "nach Tag und Monat",
 "Date" => "Datum",
 "Cal." => "Kal.",
+"Sun." => "So",
+"Mon." => "Mo",
+"Tue." => "Di",
+"Wed." => "Mi",
+"Thu." => "Do",
+"Fri." => "Fr",
+"Sat." => "Sa",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mär.",
+"Apr." => "Apr.",
+"May." => "Mai",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dez.",
 "All day" => "Ganztags",
-"New Calendar" => "Neuer Kalender",
 "Missing fields" => "fehlende Felder",
 "Title" => "Titel",
 "From Date" => "Startdatum",
@@ -132,18 +163,17 @@
 "Interval" => "Intervall",
 "End" => "Ende",
 "occurrences" => "Termine",
-"Import a calendar file" => "Kalenderdatei Importieren",
-"Please choose the calendar" => "Bitte wählen Sie den Kalender.",
 "create a new calendar" => "Neuen Kalender anlegen",
+"Import a calendar file" => "Kalenderdatei Importieren",
+"Please choose a calendar" => "Wählen Sie bitte einen Kalender.",
 "Name of new calendar" => "Kalendername",
+"Take an available name!" => "Wählen Sie einen verfügbaren Namen.",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ein Kalender mit diesem Namen existiert schon. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
 "Import" => "Importieren",
-"Importing calendar" => "Kalender wird importiert.",
-"Calendar imported successfully" => "Kalender erfolgreich importiert",
 "Close Dialog" => "Dialog schließen",
 "Create a new event" => "Neues Ereignis",
 "View an event" => "Termin öffnen",
 "No categories selected" => "Keine Kategorie ausgewählt",
-"Select category" => "Kategorie auswählen",
 "of" => "von",
 "at" => "um",
 "Timezone" => "Zeitzone",
@@ -152,9 +182,15 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "erster Wochentag",
-"Calendar CalDAV syncing address:" => "Kalender CalDAV Synchronisationsadresse:",
-"Users" => "Nutzer",
-"select users" => "Nutzer auswählen",
+"Cache" => "Zwischenspeicher",
+"Clear cache for repeating events" => "Lösche den Zwischenspeicher für wiederholende Veranstaltungen.",
+"Calendar CalDAV syncing addresses" => "CalDAV-Kalender gleicht Adressen ab.",
+"more info" => "weitere Informationen",
+"Primary address (Kontact et al)" => "Primäre Adresse (Kontakt u.a.)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Nur lesende(r) iCalender-Link(s)",
+"Users" => "Benutzer",
+"select users" => "Benutzer auswählen",
 "Editable" => "editierbar",
 "Groups" => "Gruppen",
 "select groups" => "Gruppen auswählen",

apps/calendar/l10n/el.php

@@ -1,17 +1,28 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Δεν έχει δημιουργηθεί λανθάνουσα μνήμη για όλα τα ημερολόγια",
+"Everything seems to be completely cached" => "Όλα έχουν αποθηκευτεί στη cache",
 "No calendars found." => "Δε βρέθηκαν ημερολόγια.",
 "No events found." => "Δε βρέθηκαν γεγονότα.",
 "Wrong calendar" => "Λάθος ημερολόγιο",
+"The file contained either no events or all events are already saved in your calendar." => "Το αρχείο που περιέχει είτε κανένα γεγονός είτε όλα τα γεγονότα έχουν ήδη αποθηκευτεί στο ημερολόγιό σας.",
+"events has been saved in the new calendar" => "τα συμβάντα αποθηκεύτηκαν σε ένα νέο ημερολόγιο",
+"Import failed" => "Η εισαγωγή απέτυχε",
+"events has been saved in your calendar" => "το συμβάν αποθηκεύτηκε στο ημερολογιό σου",
 "New Timezone:" => "Νέα ζώνη ώρας:",
 "Timezone changed" => "Η ζώνη ώρας άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
 "Calendar" => "Ημερολόγιο",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Γενέθλια",
 "Business" => "Επιχείρηση",
 "Call" => "Κλήση",
 "Clients" => "Πελάτες",
-"Deliverer" => "Παραδώσας",
+"Deliverer" => "Προμηθευτής",
 "Holidays" => "Διακοπές",
 "Ideas" => "Ιδέες",
 "Journey" => "Ταξίδι",
@@ -22,7 +33,9 @@
 "Projects" => "Έργα",
 "Questions" => "Ερωτήσεις",
 "Work" => "Εργασία",
+"by" => "από",
 "unnamed" => "ανώνυμο",
+"New Calendar" => "Νέα Ημερολόγιο",
 "Does not repeat" => "Μη επαναλαμβανόμενο",
 "Daily" => "Καθημερινά",
 "Weekly" => "Εβδομαδιαία",
@@ -67,8 +80,26 @@
 "by day and month" => "κατά ημέρα και μήνα",
 "Date" => "Ημερομηνία",
 "Cal." => "Ημερ.",
+"Sun." => "Κυρ.",
+"Mon." => "Δευ.",
+"Tue." => "Τρί.",
+"Wed." => "Τετ.",
+"Thu." => "Πέμ.",
+"Fri." => "Παρ.",
+"Sat." => "Σάβ.",
+"Jan." => "Ιαν.",
+"Feb." => "Φεβ.",
+"Mar." => "Μάρ.",
+"Apr." => "Απρ.",
+"May." => "Μαΐ.",
+"Jun." => "Ιούν.",
+"Jul." => "Ιούλ.",
+"Aug." => "Αύγ.",
+"Sep." => "Σεπ.",
+"Oct." => "Οκτ.",
+"Nov." => "Νοέ.",
+"Dec." => "Δεκ.",
 "All day" => "Ολοήμερο",
-"New Calendar" => "Νέα Ημερολόγιο",
 "Missing fields" => "Πεδία που λείπουν",
 "Title" => "Τίτλος",
 "From Date" => "Από Ημερομηνία",
@@ -132,18 +163,17 @@
 "Interval" => "Διάστημα",
 "End" => "Τέλος",
 "occurrences" => "περιστατικά",
-"Import a calendar file" => "Εισαγωγή αρχείου ημερολογίου",
-"Please choose the calendar" => "Παρακαλώ επιλέξτε το ημερολόγιο",
 "create a new calendar" => "δημιουργία νέου ημερολογίου",
+"Import a calendar file" => "Εισαγωγή αρχείου ημερολογίου",
+"Please choose a calendar" => "Παρακαλώ επέλεξε ένα ημερολόγιο",
 "Name of new calendar" => "Όνομα νέου ημερολογίου",
+"Take an available name!" => "Επέλεξε ένα διαθέσιμο όνομα!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Ένα ημερολόγιο με αυτό το όνομα υπάρχει ήδη. Εάν θέλετε να συνεχίσετε, αυτά τα 2 ημερολόγια θα συγχωνευθούν.",
 "Import" => "Εισαγωγή",
-"Importing calendar" => "Εισαγωγή ημερολογίου",
-"Calendar imported successfully" => "Το ημερολόγιο εισήχθει επιτυχώς",
 "Close Dialog" => "Κλείσιμο Διαλόγου",
 "Create a new event" => "Δημιουργήστε ένα νέο συμβάν",
 "View an event" => "Εμφάνισε ένα γεγονός",
 "No categories selected" => "Δεν επελέγησαν  κατηγορίες",
-"Select category" => "Επιλέξτε κατηγορία",
 "of" => "του",
 "at" => "στο",
 "Timezone" => "Ζώνη ώρας",
@@ -152,7 +182,13 @@
 "24h" => "24ω",
 "12h" => "12ω",
 "First day of the week" => "Πρώτη μέρα της εβδομάδας",
-"Calendar CalDAV syncing address:" => "Διεύθυνση για το συγχρονισμού του ημερολογίου CalDAV:",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Εκκαθάριση λανθάνουσας μνήμης για επανάληψη γεγονότων",
+"Calendar CalDAV syncing addresses" => "Διευθύνσεις συγχρονισμού ημερολογίου CalDAV",
+"more info" => "περισσότερες πλροφορίες",
+"Primary address (Kontact et al)" => "Κύρια Διεύθυνση(Επαφή και άλλα)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => " iCalendar link(s) μόνο για ανάγνωση",
 "Users" => "Χρήστες",
 "select users" => "επέλεξε χρήστες",
 "Editable" => "Επεξεργάσιμο",

apps/calendar/l10n/fi_FI.php

@@ -2,6 +2,9 @@
 "No calendars found." => "Kalentereita ei löytynyt",
 "No events found." => "Tapahtumia ei löytynyt.",
 "Wrong calendar" => "Väärä kalenteri",
+"The file contained either no events or all events are already saved in your calendar." => "Tiedosto ei joko sisältänyt tapahtumia tai vaihtoehtoisesti kaikki tapahtumat on jo tallennettu kalenteriisi.",
+"Import failed" => "Tuonti epäonnistui",
+"events has been saved in your calendar" => "tapahtumaa on tallennettu kalenteriisi",
 "New Timezone:" => "Uusi aikavyöhyke:",
 "Timezone changed" => "Aikavyöhyke vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
@@ -21,6 +24,7 @@
 "Questions" => "Kysymykset",
 "Work" => "Työ",
 "unnamed" => "nimetön",
+"New Calendar" => "Uusi kalenteri",
 "Does not repeat" => "Ei toistoa",
 "Daily" => "Päivittäin",
 "Weekly" => "Viikottain",
@@ -55,8 +59,26 @@
 "November" => "Marraskuu",
 "December" => "Joulukuu",
 "Date" => "Päivämäärä",
+"Sun." => "Su",
+"Mon." => "Ma",
+"Tue." => "Ti",
+"Wed." => "Ke",
+"Thu." => "To",
+"Fri." => "Pe",
+"Sat." => "La",
+"Jan." => "Tammi",
+"Feb." => "Helmi",
+"Mar." => "Maalis",
+"Apr." => "Huhti",
+"May." => "Touko",
+"Jun." => "Kesä",
+"Jul." => "Heinä",
+"Aug." => "Elo",
+"Sep." => "Syys",
+"Oct." => "Loka",
+"Nov." => "Marras",
+"Dec." => "Joulu",
 "All day" => "Koko päivä",
-"New Calendar" => "Uusi kalenteri",
 "Missing fields" => "Puuttuvat kentät",
 "Title" => "Otsikko",
 "The event ends before it starts" => "Tapahtuma päättyy ennen alkamistaan",
@@ -110,25 +132,24 @@
 "Select months" => "Valitse kuukaudet",
 "Select weeks" => "Valitse viikot",
 "Interval" => "Intervalli",
-"Import a calendar file" => "Tuo kalenteritiedosto",
-"Please choose the calendar" => "Valitse kalenteri",
 "create a new calendar" => "luo uusi kalenteri",
+"Import a calendar file" => "Tuo kalenteritiedosto",
+"Please choose a calendar" => "Valitse kalenteri",
 "Name of new calendar" => "Uuden kalenterin nimi",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Samalla nimellä on jo olemassa kalenteri. Jos jatkat kaikesta huolimatta, kalenterit yhdistetään.",
 "Import" => "Tuo",
-"Importing calendar" => "Tuodaan kalenteria",
-"Calendar imported successfully" => "Kalenteri tuotu onnistuneesti",
 "Close Dialog" => "Sulje ikkuna",
 "Create a new event" => "Luo uusi tapahtuma",
 "View an event" => "Avaa tapahtuma",
 "No categories selected" => "Luokkia ei ole valittu",
-"Select category" => "Valitse luokka",
 "Timezone" => "Aikavyöhyke",
 "Check always for changes of the timezone" => "Tarkista aina aikavyöhykkeen muutokset",
 "Timeformat" => "Ajan esitysmuoto",
 "24h" => "24 tuntia",
 "12h" => "12 tuntia",
 "First day of the week" => "Viikon ensimmäinen päivä",
-"Calendar CalDAV syncing address:" => "Kalenterin CalDAV-synkronointiosoite:",
+"Calendar CalDAV syncing addresses" => "Kalenterin CalDAV-synkronointiosoitteet",
+"iOS/OS X" => "iOS/OS X",
 "Users" => "Käyttäjät",
 "select users" => "valitse käyttäjät",
 "Editable" => "Muoktattava",

apps/calendar/l10n/fr.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Tous les calendriers ne sont pas mis en cache",
+"Everything seems to be completely cached" => "Tout semble être en cache",
 "No calendars found." => "Aucun calendrier n'a été trouvé.",
 "No events found." => "Aucun événement n'a été trouvé.",
 "Wrong calendar" => "Mauvais calendrier",
+"The file contained either no events or all events are already saved in your calendar." => "Soit le fichier ne contient aucun événement soit tous les événements sont déjà enregistrés dans votre calendrier.",
+"events has been saved in the new calendar" => "Les événements ont été enregistrés dans le nouveau calendrier",
+"Import failed" => "Échec de l'import",
+"events has been saved in your calendar" => "Les événements ont été enregistrés dans votre calendrier",
 "New Timezone:" => "Nouveau fuseau horaire :",
 "Timezone changed" => "Fuseau horaire modifié",
 "Invalid request" => "Requête invalide",
 "Calendar" => "Calendrier",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d MMM, yyyy",
 "Birthday" => "Anniversaire",
 "Business" => "Professionnel",
 "Call" => "Appel",
@@ -22,7 +33,9 @@
 "Projects" => "Projets",
 "Questions" => "Questions",
 "Work" => "Travail",
+"by" => "par",
 "unnamed" => "sans-nom",
+"New Calendar" => "Nouveau Calendrier",
 "Does not repeat" => "Pas de répétition",
 "Daily" => "Tous les jours",
 "Weekly" => "Hebdomadaire",
@@ -67,8 +80,26 @@
 "by day and month" => "par jour et mois",
 "Date" => "Date",
 "Cal." => "Cal.",
+"Sun." => "Dim.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Jeu",
+"Fri." => "Ven.",
+"Sat." => "Sam.",
+"Jan." => "Jan.",
+"Feb." => "Fév.",
+"Mar." => "Mars",
+"Apr." => "Avr.",
+"May." => "Mai",
+"Jun." => "Juin",
+"Jul." => "Juil.",
+"Aug." => "Août",
+"Sep." => "Sep.",
+"Oct." => "Oct.",
+"Nov." => "Nov.",
+"Dec." => "Déc.",
 "All day" => "Journée entière",
-"New Calendar" => "Nouveau Calendrier",
 "Missing fields" => "Champs manquants",
 "Title" => "Titre",
 "From Date" => "De la date",
@@ -132,18 +163,17 @@
 "Interval" => "Intervalle",
 "End" => "Fin",
 "occurrences" => "occurrences",
-"Import a calendar file" => "Importer un fichier de calendriers",
-"Please choose the calendar" => "Choisissez le calendrier svp",
 "create a new calendar" => "Créer un nouveau calendrier",
+"Import a calendar file" => "Importer un fichier de calendriers",
+"Please choose a calendar" => "Veuillez sélectionner un calendrier",
 "Name of new calendar" => "Nom pour le nouveau calendrier",
+"Take an available name!" => "Choisissez un nom disponible !",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendrier de ce nom existe déjà. Si vous choisissez de continuer les calendriers seront fusionnés.",
 "Import" => "Importer",
-"Importing calendar" => "Import du calendrier",
-"Calendar imported successfully" => "Calendrier importé avec succès",
 "Close Dialog" => "Fermer la fenêtre",
 "Create a new event" => "Créer un nouvel événement",
 "View an event" => "Voir un événement",
 "No categories selected" => "Aucune catégorie sélectionnée",
-"Select category" => "Sélectionner une catégorie",
 "of" => "de",
 "at" => "à",
 "Timezone" => "Fuseau horaire",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Premier jour de la semaine",
-"Calendar CalDAV syncing address:" => "Adresse de synchronisation du calendrier CalDAV :",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Nettoyer le cache des événements répétitifs",
+"Calendar CalDAV syncing addresses" => "Adresses de synchronisation des calendriers CalDAV",
+"more info" => "plus d'infos",
+"Primary address (Kontact et al)" => "Adresses principales (Kontact et assimilés)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "lien(s) iCalendar en lecture seule",
 "Users" => "Utilisateurs",
 "select users" => "sélectionner les utilisateurs",
 "Editable" => "Modifiable",

apps/calendar/l10n/it.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Non tutti i calendari sono mantenuti completamente in cache",
+"Everything seems to be completely cached" => "Tutto sembra essere mantenuto completamente in cache",
 "No calendars found." => "Nessun calendario trovato.",
 "No events found." => "Nessun evento trovato.",
 "Wrong calendar" => "Calendario sbagliato",
+"The file contained either no events or all events are already saved in your calendar." => "Il file non conteneva alcun evento o tutti gli eventi erano già salvati nel tuo calendario.",
+"events has been saved in the new calendar" => "gli eventi sono stati salvati nel nuovo calendario",
+"Import failed" => "Importazione non riuscita",
+"events has been saved in your calendar" => "gli eventi sono stati salvati nel tuo calendario",
 "New Timezone:" => "Nuovo fuso orario:",
 "Timezone changed" => "Fuso orario cambiato",
 "Invalid request" => "Richiesta non valida",
 "Calendar" => "Calendario",
+"ddd" => "ddd",
+"ddd M/d" => "ddd d/M",
+"dddd M/d" => "dddd d/M",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, d MMM yyyy",
 "Birthday" => "Compleanno",
 "Business" => "Azienda",
 "Call" => "Chiama",
@@ -22,7 +33,9 @@
 "Projects" => "Progetti",
 "Questions" => "Domande",
 "Work" => "Lavoro",
+"by" => "da",
 "unnamed" => "senza nome",
+"New Calendar" => "Nuovo calendario",
 "Does not repeat" => "Non ripetere",
 "Daily" => "Giornaliero",
 "Weekly" => "Settimanale",
@@ -67,8 +80,26 @@
 "by day and month" => "per giorno e mese",
 "Date" => "Data",
 "Cal." => "Cal.",
+"Sun." => "Dom.",
+"Mon." => "Lun.",
+"Tue." => "Mar.",
+"Wed." => "Mer.",
+"Thu." => "Gio.",
+"Fri." => "Ven.",
+"Sat." => "Sab.",
+"Jan." => "Gen.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Mag.",
+"Jun." => "Giu.",
+"Jul." => "Lug.",
+"Aug." => "Ago.",
+"Sep." => "Set.",
+"Oct." => "Ott.",
+"Nov." => "Nov.",
+"Dec." => "Dic.",
 "All day" => "Tutti il giorno",
-"New Calendar" => "Nuovo calendario",
 "Missing fields" => "Campi mancanti",
 "Title" => "Titolo",
 "From Date" => "Dal giorno",
@@ -110,7 +141,7 @@
 "Share" => "Condividi",
 "Title of the Event" => "Titolo dell'evento",
 "Category" => "Categoria",
-"Separate categories with commas" => "Categorie separate con virgole",
+"Separate categories with commas" => "Categorie separate da virgole",
 "Edit categories" => "Modifica le categorie",
 "All Day Event" => "Evento che occupa tutta la giornata",
 "From" => "Da",
@@ -132,18 +163,17 @@
 "Interval" => "Intervallo",
 "End" => "Fine",
 "occurrences" => "occorrenze",
-"Import a calendar file" => "Importa un file di calendario",
-"Please choose the calendar" => "Scegli il calendario",
 "create a new calendar" => "Crea un nuovo calendario",
+"Import a calendar file" => "Importa un file di calendario",
+"Please choose a calendar" => "Scegli un calendario",
 "Name of new calendar" => "Nome del nuovo calendario",
+"Take an available name!" => "Usa un nome disponibile!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Un calendario con questo nome esiste già. Se continui, i due calendari saranno uniti.",
 "Import" => "Importa",
-"Importing calendar" => "Importazione del calendario in corso",
-"Calendar imported successfully" => "Calendario importato correttamente",
 "Close Dialog" => "Chiudi la finestra di dialogo",
 "Create a new event" => "Crea un nuovo evento",
 "View an event" => "Visualizza un evento",
 "No categories selected" => "Nessuna categoria selezionata",
-"Select category" => "Seleziona una categoria",
 "of" => "di",
 "at" => "alle",
 "Timezone" => "Fuso orario",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Primo giorno della settimana",
-"Calendar CalDAV syncing address:" => "Indirizzo sincronizzazione calendario CalDAV:",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Cancella gli eventi che si ripetono dalla cache",
+"Calendar CalDAV syncing addresses" => "Indirizzi di sincronizzazione calendari CalDAV",
+"more info" => "ulteriori informazioni",
+"Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Collegamento(i) iCalendar sola lettura",
 "Users" => "Utenti",
 "select users" => "seleziona utenti",
 "Editable" => "Modificabile",

apps/calendar/l10n/ru.php

@@ -1,11 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Не все календари полностью кешированы",
+"Everything seems to be completely cached" => "Все, вроде бы, закешировано",
 "No calendars found." => "Календари не найдены.",
 "No events found." => "События не найдены.",
 "Wrong calendar" => "Неверный календарь",
+"The file contained either no events or all events are already saved in your calendar." => "Файл либо не собержит событий, либо все события уже есть в календаре",
+"events has been saved in the new calendar" => "события были сохранены в новый календарь",
+"Import failed" => "Ошибка импорта",
+"events has been saved in your calendar" => "события были сохранены в вашем календаре",
 "New Timezone:" => "Новый часовой пояс:",
 "Timezone changed" => "Часовой пояс изменён",
 "Invalid request" => "Неверный запрос",
 "Calendar" => "Календарь",
+"ddd" => "ддд",
+"ddd M/d" => "ддд М/д",
+"dddd M/d" => "дддд М/д",
+"MMMM yyyy" => "ММММ гггг",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "дддд, МММ д, гггг",
 "Birthday" => "День рождения",
 "Business" => "Бизнес",
 "Call" => "Звонить",
@@ -22,6 +34,7 @@
 "Questions" => "Вопросы",
 "Work" => "Работа",
 "unnamed" => "без имени",
+"New Calendar" => "Новый Календарь",
 "Does not repeat" => "Не повторяется",
 "Daily" => "Ежедневно",
 "Weekly" => "Еженедельно",
@@ -66,8 +79,26 @@
 "by day and month" => "по дню и месяцу",
 "Date" => "Дата",
 "Cal." => "Кал.",
+"Sun." => "Вс.",
+"Mon." => "Пн.",
+"Tue." => "Вт.",
+"Wed." => "Ср.",
+"Thu." => "Чт.",
+"Fri." => "Пт.",
+"Sat." => "Сб.",
+"Jan." => "Янв.",
+"Feb." => "Фев.",
+"Mar." => "Мар.",
+"Apr." => "Апр.",
+"May." => "Май.",
+"Jun." => "Июн.",
+"Jul." => "Июл.",
+"Aug." => "Авг.",
+"Sep." => "Сен.",
+"Oct." => "Окт.",
+"Nov." => "Ноя.",
+"Dec." => "Дек.",
 "All day" => "Весь день",
-"New Calendar" => "Новый Календарь",
 "Missing fields" => "Незаполненные поля",
 "Title" => "Название",
 "From Date" => "Дата начала",
@@ -131,25 +162,24 @@
 "Interval" => "Интервал",
 "End" => "Окончание",
 "occurrences" => "повторений",
-"Import a calendar file" => "Импортировать календарь из файла",
-"Please choose the calendar" => "Пожалуйста, выберите календарь",
 "create a new calendar" => "Создать новый календарь",
+"Import a calendar file" => "Импортировать календарь из файла",
+"Please choose a calendar" => "Пожалуйста, выберите календарь",
 "Name of new calendar" => "Название нового календаря",
 "Import" => "Импортировать",
-"Importing calendar" => "Импортируется календарь",
-"Calendar imported successfully" => "Календарь успешно импортирован",
 "Close Dialog" => "Закрыть Сообщение",
 "Create a new event" => "Создать новое событие",
 "View an event" => "Показать событие",
 "No categories selected" => "Категории не выбраны",
-"Select category" => "Выбрать категорию",
+"of" => "из",
+"at" => "на",
 "Timezone" => "Часовой пояс",
 "Check always for changes of the timezone" => "Всегда проверяйте изменение часового пояса",
 "Timeformat" => "Формат времени",
 "24h" => "24ч",
 "12h" => "12ч",
 "First day of the week" => "Первый день недели",
-"Calendar CalDAV syncing address:" => "Адрес синхронизации календаря CalDAV:",
+"more info" => "подробнее",
 "Users" => "Пользователи",
 "select users" => "выбрать пользователей",
 "Editable" => "Редактируемо",

apps/calendar/l10n/sv.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Alla kalendrar är inte fullständigt sparade i cache",
+"Everything seems to be completely cached" => "Allt verkar vara fullständigt sparat i cache",
 "No calendars found." => "Inga kalendrar funna",
 "No events found." => "Inga händelser funna.",
 "Wrong calendar" => "Fel kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Filen innehöll inga händelser eller så är alla händelser redan sparade i kalendern.",
+"events has been saved in the new calendar" => "händelser har sparats i den nya kalendern",
+"Import failed" => "Misslyckad import",
+"events has been saved in your calendar" => "händelse har sparats i din kalender",
 "New Timezone:" => "Ny tidszon:",
 "Timezone changed" => "Tidszon ändrad",
 "Invalid request" => "Ogiltig begäran",
 "Calendar" => "Kalender",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM åååå",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "ddd, MMM d, åååå",
 "Birthday" => "Födelsedag",
 "Business" => "Företag",
 "Call" => "Ringa",
@@ -22,7 +33,9 @@
 "Projects" => "Projekt",
 "Questions" => "Frågor",
 "Work" => "Arbetet",
+"by" => "av",
 "unnamed" => "Namn saknas",
+"New Calendar" => "Ny kalender",
 "Does not repeat" => "Upprepas inte",
 "Daily" => "Dagligen",
 "Weekly" => "Varje vecka",
@@ -67,8 +80,26 @@
 "by day and month" => "efter dag och månad",
 "Date" => "Datum",
 "Cal." => "Kal.",
+"Sun." => "Sön.",
+"Mon." => "Mån.",
+"Tue." => "Tis.",
+"Wed." => "Ons.",
+"Thu." => "Tor.",
+"Fri." => "Fre.",
+"Sat." => "Lör.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Mar.",
+"Apr." => "Apr.",
+"May." => "Maj.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hela dagen",
-"New Calendar" => "Ny kalender",
 "Missing fields" => "Saknade fält",
 "Title" => "Rubrik",
 "From Date" => "Från datum",
@@ -132,18 +163,17 @@
 "Interval" => "Hur ofta",
 "End" => "Slut",
 "occurrences" => "Händelser",
-"Import a calendar file" => "Importera en kalenderfil",
-"Please choose the calendar" => "Välj kalender",
 "create a new calendar" => "skapa en ny kalender",
+"Import a calendar file" => "Importera en kalenderfil",
+"Please choose a calendar" => "Välj en kalender",
 "Name of new calendar" => "Namn på ny kalender",
+"Take an available name!" => "Ta ett ledigt namn!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "En kalender med detta namn finns redan. Om du fortsätter ändå så kommer dessa kalendrar att slås samman.",
 "Import" => "Importera",
-"Importing calendar" => "Importerar kalender",
-"Calendar imported successfully" => "Kalender importerades utan problem",
 "Close Dialog" => "Stäng ",
 "Create a new event" => "Skapa en ny händelse",
 "View an event" => "Visa en händelse",
 "No categories selected" => "Inga kategorier valda",
-"Select category" => "Välj kategori",
 "of" => "av",
 "at" => "på",
 "Timezone" => "Tidszon",
@@ -152,7 +182,13 @@
 "24h" => "24h",
 "12h" => "12h",
 "First day of the week" => "Första dagen av veckan",
-"Calendar CalDAV syncing address:" => "Synkroniseringsadress för CalDAV kalender:",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Töm cache för upprepade händelser",
+"Calendar CalDAV syncing addresses" => "Kalender CalDAV synkroniserar adresser",
+"more info" => "mer info",
+"Primary address (Kontact et al)" => "Primary address (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Read only iCalendar link(s)",
 "Users" => "Användare",
 "select users" => "välj användare",
 "Editable" => "Redigerbar",

apps/calendar/l10n/tr.php

@@ -1,12 +1,23 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Bütün takvimler tamamen  ön belleğe alınmadı",
+"Everything seems to be completely cached" => "Bütün herşey tamamen ön belleğe alınmış görünüyor",
 "No calendars found." => "Takvim yok.",
 "No events found." => "Etkinlik yok.",
 "Wrong calendar" => "Yanlış takvim",
+"The file contained either no events or all events are already saved in your calendar." => "Dosya ya hiçbir etkinlik içermiyor veya bütün etkinlikler takviminizde zaten saklı.",
+"events has been saved in the new calendar" => "Etkinlikler yeni takvimde saklandı",
+"Import failed" => "İçeri aktarma başarısız oldu.",
+"events has been saved in your calendar" => "Etkinlikler takviminizde saklandı",
 "New Timezone:" => "Yeni Zamandilimi:",
 "Timezone changed" => "Zaman dilimi değiştirildi",
 "Invalid request" => "Geçersiz istek",
 "Calendar" => "Takvim",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
 "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "AAA g[ yyyy]{ '&#8212;'[ AAA] g yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
 "Birthday" => "Doğum günü",
 "Business" => "İş",
 "Call" => "Arama",
@@ -22,7 +33,9 @@
 "Projects" => "Projeler",
 "Questions" => "Sorular",
 "Work" => "İş",
+"by" => "hazırlayan",
 "unnamed" => "isimsiz",
+"New Calendar" => "Yeni Takvim",
 "Does not repeat" => "Tekrar etmiyor",
 "Daily" => "Günlük",
 "Weekly" => "Haftalı",
@@ -67,8 +80,26 @@
 "by day and month" => "gün ve aya göre",
 "Date" => "Tarih",
 "Cal." => "Takv.",
+"Sun." => "Paz.",
+"Mon." => "Pzt.",
+"Tue." => "Sal.",
+"Wed." => "Çar.",
+"Thu." => "Per.",
+"Fri." => "Cum.",
+"Sat." => "Cmt.",
+"Jan." => "Oca.",
+"Feb." => "Şbt.",
+"Mar." => "Mar.",
+"Apr." => "Nis",
+"May." => "May.",
+"Jun." => "Haz.",
+"Jul." => "Tem.",
+"Aug." => "Agu.",
+"Sep." => "Eyl.",
+"Oct." => "Eki.",
+"Nov." => "Kas.",
+"Dec." => "Ara.",
 "All day" => "Tüm gün",
-"New Calendar" => "Yeni Takvim",
 "Missing fields" => "Eksik alanlar",
 "Title" => "Başlık",
 "From Date" => "Bu Tarihten",
@@ -132,18 +163,17 @@
 "Interval" => "Aralık",
 "End" => "Son",
 "occurrences" => "olaylar",
-"Import a calendar file" => "Takvim dosyasını içeri aktar",
-"Please choose the calendar" => "Lütfen takvimi seçin",
 "create a new calendar" => "Yeni bir takvim oluştur",
+"Import a calendar file" => "Takvim dosyasını içeri aktar",
+"Please choose a calendar" => "Lütfen takvim seçiniz",
 "Name of new calendar" => "Yeni takvimin adı",
+"Take an available name!" => "Müsait ismi al !",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Bu isimde bir takvim zaten mevcut. Yine de devam ederseniz bu takvimler birleştirilecektir.",
 "Import" => "İçe Al",
-"Importing calendar" => "Takvim içe aktarılıyor",
-"Calendar imported successfully" => "Takvim başarıyla içe aktarıldı",
 "Close Dialog" => "Diyalogu kapat",
 "Create a new event" => "Yeni olay oluştur",
 "View an event" => "Bir olay görüntüle",
 "No categories selected" => "Kategori seçilmedi",
-"Select category" => "Kategori seçin",
 "of" => "nın",
 "at" => "üzerinde",
 "Timezone" => "Zaman dilimi",
@@ -152,7 +182,13 @@
 "24h" => "24s",
 "12h" => "12s",
 "First day of the week" => "Haftanın ilk günü",
-"Calendar CalDAV syncing address:" => "CalDAV Takvim eşzamanlama adresi:",
+"Cache" => "Önbellek",
+"Clear cache for repeating events" => "Tekrar eden etkinlikler için ön belleği temizle.",
+"Calendar CalDAV syncing addresses" => "CalDAV takvimi adresleri senkronize ediyor.",
+"more info" => "daha fazla bilgi",
+"Primary address (Kontact et al)" => "Öncelikli adres",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Sadece okunabilir iCalendar link(ler)i",
 "Users" => "Kullanıcılar",
 "select users" => "kullanıcıları seç",
 "Editable" => "Düzenlenebilir",

apps/calendar/l10n/vi.php

@@ -0,0 +1,135 @@
+<?php $TRANSLATIONS = array(
+"No calendars found." => "Không tìm thấy lịch.",
+"No events found." => "Không tìm thấy sự kiện nào",
+"Wrong calendar" => "Sai lịch",
+"New Timezone:" => "Múi giờ mới :",
+"Timezone changed" => "Thay đổi múi giờ",
+"Invalid request" => "Yêu cầu không hợp lệ",
+"Calendar" => "Lịch",
+"ddd" => "ddd",
+"ddd M/d" => "ddd M/d",
+"dddd M/d" => "dddd M/d",
+"MMMM yyyy" => "MMMM yyyy",
+"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
+"dddd, MMM d, yyyy" => "dddd, MMM d, yyyy",
+"Birthday" => "Ngày sinh nhật",
+"Business" => "Công việc",
+"Call" => "Số điện thoại",
+"Clients" => "Máy trạm",
+"Holidays" => "Ngày lễ",
+"Ideas" => "Ý tưởng",
+"Jubilee" => "Lễ kỷ niệm",
+"Meeting" => "Hội nghị",
+"Other" => "Khác",
+"Personal" => "Cá nhân",
+"Projects" => "Dự án",
+"Questions" => "Câu hỏi",
+"Work" => "Công việc",
+"New Calendar" => "Lịch mới",
+"Does not repeat" => "Không lặp lại",
+"Daily" => "Hàng ngày",
+"Weekly" => "Hàng tuần",
+"Every Weekday" => "Mỗi ngày trong tuần",
+"Bi-Weekly" => "Hai tuần một lần",
+"Monthly" => "Hàng tháng",
+"Yearly" => "Hàng năm",
+"never" => "không thay đổi",
+"by occurrences" => "bởi xuất hiện",
+"by date" => "bởi ngày",
+"by monthday" => "bởi ngày trong tháng",
+"by weekday" => "bởi ngày trong tuần",
+"Monday" => "Thứ 2",
+"Tuesday" => "Thứ 3",
+"Wednesday" => "Thứ 4",
+"Thursday" => "Thứ 5",
+"Friday" => "Thứ ",
+"Saturday" => "Thứ 7",
+"Sunday" => "Chủ nhật",
+"events week of month" => "sự kiện trong tuần của tháng",
+"first" => "đầu tiên",
+"second" => "Thứ hai",
+"third" => "Thứ ba",
+"fourth" => "Thứ tư",
+"fifth" => "Thứ năm",
+"January" => "Tháng 1",
+"February" => "Tháng 2",
+"March" => "Tháng 3",
+"April" => "Tháng 4",
+"May" => "Tháng 5",
+"June" => "Tháng 6",
+"July" => "Tháng 7",
+"August" => "Tháng 8",
+"September" => "Tháng 9",
+"October" => "Tháng 10",
+"November" => "Tháng 11",
+"December" => "Tháng 12",
+"by events date" => "Theo ngày tháng sự kiện",
+"by weeknumber(s)" => "số tuần",
+"by day and month" => "ngày, tháng",
+"Date" => "Ngày",
+"Cal." => "Cal.",
+"All day" => "Tất cả các ngày",
+"Title" => "Tiêu đề",
+"From Date" => "Từ ngày",
+"From Time" => "Từ thời gian",
+"To Date" => "Tới ngày",
+"To Time" => "Tới thời gian",
+"The event ends before it starts" => "Sự kiện này kết thúc trước khi nó bắt đầu",
+"Week" => "Tuần",
+"Month" => "Tháng",
+"List" => "Danh sách",
+"Today" => "Hôm nay",
+"Calendars" => "Lịch",
+"There was a fail, while parsing the file." => "Có một thất bại, trong khi phân tích các tập tin.",
+"Choose active calendars" => "Chọn lịch hoạt động",
+"Your calendars" => "Lịch của bạn",
+"CalDav Link" => "Liên kết CalDav ",
+"Shared calendars" => "Chia sẻ lịch",
+"No shared calendars" => "Không chia sẻ lcihj",
+"Share Calendar" => "Chia sẻ lịch",
+"Download" => "Tải về",
+"Edit" => "Chỉnh sửa",
+"Delete" => "Xóa",
+"shared with you by" => "Chia sẻ bởi",
+"New calendar" => "Lịch mới",
+"Edit calendar" => "sửa Lịch",
+"Displayname" => "Hiển thị tên",
+"Active" => "Kích hoạt",
+"Calendar color" => "Màu lịch",
+"Save" => "Lưu",
+"Submit" => "Submit",
+"Cancel" => "Hủy",
+"Edit an event" => "Sửa sự kiện",
+"Share" => "Chia sẻ",
+"Title of the Event" => "Tên sự kiện",
+"Category" => "Danh mục",
+"All Day Event" => "Sự kiện trong ngày",
+"From" => "Từ",
+"To" => "Tới",
+"Advanced options" => "Tùy chọn nâng cao",
+"Location" => "Nơi",
+"Location of the Event" => "Nơi tổ chức sự kiện",
+"Description" => "Mô tả",
+"Description of the Event" => "Mô tả sự kiện",
+"Repeat" => "Lặp lại",
+"Advanced" => "Nâng cao",
+"Select weekdays" => "Chọn ngày trong tuần",
+"Select days" => "Chọn ngày",
+"and the events day of year." => "và sự kiện của ngày trong năm",
+"and the events day of month." => "và sự kiện của một ngày trong năm",
+"Select months" => "Chọn tháng",
+"Select weeks" => "Chọn tuần",
+"and the events week of year." => "và sự kiện của tuần trong năm.",
+"create a new calendar" => "Tạo lịch mới",
+"Name of new calendar" => "Tên lịch mới",
+"Close Dialog" => "Đóng hộp thoại",
+"Create a new event" => "Tạo một sự kiện mới",
+"View an event" => "Xem một sự kiện",
+"No categories selected" => "Không danh sách nào được chọn",
+"of" => "của",
+"at" => "tại",
+"Timezone" => "Múi giờ",
+"Check always for changes of the timezone" => "Luôn kiểm tra múi giờ",
+"24h" => "24h",
+"12h" => "12h"
+);

apps/calendar/lib/app.php

@@ -396,8 +396,8 @@ class OC_Calendar_App{
 		$last_modified = @$vevent->__get('LAST-MODIFIED');
 		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
 		$staticoutput = array('id'=>(int)$event['id'],
-						'title' => htmlspecialchars(($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed')),
-						'description' => isset($vevent->DESCRIPTION)?htmlspecialchars($vevent->DESCRIPTION->value):'',
+						'title' => ($event['summary']!=NULL || $event['summary'] != '')?$event['summary']: self::$l10n->t('unnamed'),
+						'description' => isset($vevent->DESCRIPTION)?$vevent->DESCRIPTION->value:'',
 						'lastmodified'=>$lastmodified,
 						'allDay'=>$allday);
 		if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)){

apps/calendar/lib/connector_sabre.php

@@ -105,6 +105,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
 		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0;
 		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
+		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
+			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
+		}
 		
 		return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
 	}
@@ -192,6 +195,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 		if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
 		if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null;
 		if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
+		if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
+			$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
+		}
 		
 		OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
 
@@ -206,6 +212,10 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
 	 * @return void
 	 */
 	public function deleteCalendar($calendarId) {
+	    if(preg_match( '=iCal/[1-4]?.*Mac OS X/10.[1-6](.[0-9])?=', $_SERVER['HTTP_USER_AGENT'] )){
+	    	throw new Sabre_DAV_Exception_Forbidden("Action is not possible with OSX 10.6.x", 403);
+		}
+		
 		OC_Calendar_Calendar::deleteCalendar($calendarId);
 	}
 

apps/calendar/settings.php

@@ -14,4 +14,4 @@ $tmpl->assign('calendars', OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(
 
 OCP\Util::addscript('calendar','settings');
 
-return $tmpl->fetchPage();
+$tmpl->printPage();

apps/calendar/templates/calendar.php

@@ -33,6 +33,7 @@
 				?>
 				});
 				</script>
+				<div id="notification" style="display:none;"></div>
 				<div id="controls">
 					<form id="view">
 						<input type="button" value="<?php echo $l->t('Week');?>" id="oneweekview_radio"/>
@@ -41,8 +42,9 @@
 						<img id="loading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
 					</form>
 					<form id="choosecalendar">
-						<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>
-						<input type="button" id="choosecalendar_input" value="<?php echo $l->t("Calendars");?>" onclick="Calendar.UI.Calendar.overview();" />
+						<!--<input type="button" id="today_input" value="<?php echo $l->t("Today");?>"/>-->
+						<a class="settings calendarsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('calendar', 'icon.svg'); ?>" alt="<?php echo $l->t('Settings'); ?>" /></a>
+						<a class="settings generalsettings" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Settings'); ?>" /></a>
 					</form>
 					<form id="datecontrol">
 						<input type="button" value="&nbsp;&lt;&nbsp;" id="datecontrol_left"/>
@@ -50,12 +52,6 @@
 						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
 					</form>
 				</div>
-				<div id="notification" style="display:none;"></div>
-				<div id="calendar_holder">
-				</div>
-				<!-- Dialogs -->
+				<div id="fullcalendar"></div>
 				<div id="dialog_holder"></div>
-				<div id="parsingfail_dialog" title="Parsing Fail">
-					<?php echo $l->t("There was a fail, while parsing the file."); ?>
-				</div>
-				<!-- End of Dialogs -->
+				<div id="appsettings" class="popup topright hidden"></div>

apps/calendar/templates/part.choosecalendar.php

@@ -1,51 +1,52 @@
-<div id="choosecalendar_dialog" title="<?php echo $l->t("Choose active calendars"); ?>">
-<p><b><?php echo $l->t('Your calendars'); ?>:</b></p>
-<table width="100%" style="border: 0;">
-<?php
-$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-for($i = 0; $i < count($option_calendars); $i++){
-	echo "<tr>";
-	$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
-	$tmpl->assign('calendar', $option_calendars[$i]);
-	if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){
-		$shared = false;
-	}else{
-		$shared = true;
+<form id="calendar">
+	<p><b><?php echo $l->t('Your calendars'); ?>:</b></p>
+	<table width="100%" style="border: 0;">
+	<?php
+	$option_calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+	for($i = 0; $i < count($option_calendars); $i++){
+		echo "<tr>";
+		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields');
+		$tmpl->assign('calendar', $option_calendars[$i]);
+		if(OC_Calendar_Share::allUsersSharedwith($option_calendars[$i]['id'], OC_Calendar_Share::CALENDAR) == array()){
+			$shared = false;
+		}else{
+			$shared = true;
+		}
+		$tmpl->assign('shared', $shared);
+		$tmpl->printpage();
+		echo "</tr>";
 	}
-	$tmpl->assign('shared', $shared);
-	$tmpl->printpage();
-	echo "</tr>";
-}
-?>
-<tr>
-	<td colspan="6">
-		<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
-	</td>
-</tr>
-<tr>
-	<td colspan="6">
-		<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
-	</td>
-</tr>
-</table><br>
-<p><b><?php echo $l->t('Shared calendars'); ?>: </b></p>
-<table width="100%" style="border: 0;">
-<?php
-$share = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR);
-$count = count($share);
-for($i = 0; $i < $count; $i++){
-	$share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false);
-	echo '<tr>';
-	$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared');
-	$tmpl->assign('share', $share[$i]);
-	$tmpl->printpage();
-	echo '</tr>';
-}
-?>
-</table>
-<?php
-if($count == 0){
-	echo '<p style="text-align:center;"><b>' . $l->t('No shared calendars') . '</b></p>';
-}
-?>
-</div>
+	?>
+	<tr>
+		<td colspan="6">
+			<a href="#" onclick="Calendar.UI.Calendar.newCalendar(this);"><input type="button" value="<?php echo $l->t('New Calendar') ?>"></a>
+		</td>
+	</tr>
+	<tr>
+		<td colspan="6">
+			<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
+		</td>
+	</tr>
+	</table><br>
+	<p><b><?php echo $l->t('Shared calendars'); ?>: </b></p>
+	<table width="100%" style="border: 0;">
+	<?php
+	$share = OC_Calendar_Share::allSharedwithuser(OCP\USER::getUser(), OC_Calendar_Share::CALENDAR);
+	$count = count($share);
+	for($i = 0; $i < $count; $i++){
+		$share[$i]['calendar'] = OC_Calendar_App::getCalendar($share[$i]['calendarid'], false, false);
+		echo '<tr>';
+		$tmpl = new OCP\Template('calendar', 'part.choosecalendar.rowfields.shared');
+		$tmpl->assign('share', $share[$i]);
+		$tmpl->printpage();
+		echo '</tr>';
+	}
+	?>
+	</table>
+	<?php
+	if($count == 0){
+		echo '<p style="text-align:center;"><b>' . $l->t('No shared calendars') . '</b></p>';
+	}
+	?>
+	</fieldset>
+</form>

apps/calendar/templates/part.choosecalendar.rowfields.php

@@ -11,7 +11,7 @@
   <a href="#" onclick="Calendar.UI.showCalDAVUrl('<?php echo OCP\USER::getUser() ?>', '<?php echo rawurlencode(html_entity_decode($_['calendar']['uri'], ENT_QUOTES, 'UTF-8')) ?>');" title="<?php echo $l->t('CalDav Link') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/public.svg') ?>"></a>
 </td>
 <td width="20px">
-  <a href="?app=calendar&amp;getfile=export.php?calid=<?php echo $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
+  <a href="<?php echo OCP\Util::linkTo('calendar', 'export.php') . '?calid=' . $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
 </td>
 <td width="20px">
   <a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a>

apps/calendar/templates/part.editevent.php

@@ -5,9 +5,9 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/edit.php');">
-		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('?app=calendar&getfile=ajax/event/delete.php');">
-		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='?app=calendar&getfile=export.php?eventid=<?php echo $_['eventid'] ?>';">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/edit.php') ?>');">
+		<input type="button" class="submit" style="float: left;" name="delete" value="<?php echo $l->t("Delete");?>" onclick="Calendar.UI.submitDeleteEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/delete.php') ?>');">
+		<input type="button" class="submit" style="float: right;" name="export" value="<?php echo $l->t("Export");?>" onclick="window.location='<?php echo OCP\Util::linkTo('calendar', 'export.php') ?>?eventid=<?php echo $_['eventid'] ?>';">
 	</span>
 	</form>
 </div>

apps/calendar/templates/part.newevent.php

@@ -3,7 +3,7 @@
 <?php echo $this->inc("part.eventform"); ?>
 	<div style="width: 100%;text-align: center;color: #FF1D1D;" id="errorbox"></div>
 	<span id="actions">
-		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('?app=calendar&getfile=ajax/event/new.php');">
+		<input type="button" class="submit" style="float: left;" value="<?php echo $l->t("Submit");?>" onclick="Calendar.UI.validateEventForm('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/new.php') ?>');">
 	</span>
 	</form>
 </div>

apps/calendar/templates/settings.php

@@ -7,11 +7,16 @@
  * See the COPYING-README file.
  */
 ?>
-<form id="calendar">
-	<fieldset class="personalblock">
-	<legend><?php echo $l->t('Calendar'); ?></legend>
-		<table class="nostyle">
-			<tr><td><label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label></td><td><select style="display: none;" id="timezone" name="timezone">
+<h2 id="title_general"><?php echo $l->t('General'); ?></h2>
+<div id="general">
+	<table class="nostyle">
+		<tr>
+			<td>
+				<label for="timezone" class="bold"><?php echo $l->t('Timezone');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<select style="display: none;" id="timezone" name="timezone">
 				<?php
 				$continent = '';
 				foreach($_['timezones'] as $timezone):
@@ -27,29 +32,58 @@
 					$city=strtr($ex[1], '_', ' ');
 					$continent=$ex[0];
 					echo '<option value="'.$timezone.'"'.($_['timezone'] == $timezone?' selected="selected"':'').'>'.$city.'</option>';
+					var_dump($_['timezone']);
 				endforeach;?>
-			</select><input type="checkbox" name="timezonedetection" id="timezonedetection"><label for="timezonedetection"><?php echo $l->t('Check always for changes of the timezone'); ?></label></td></tr>
-
-			<tr><td><label for="timeformat" class="bold"><?php echo $l->t('Timeformat');?></label></td><td>
+				</select>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<input type="checkbox" name="timezonedetection" id="timezonedetection">
+				&nbsp;
+				<label for="timezonedetection"><?php echo $l->t('Update timezone automatically'); ?></label>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<label for="timeformat" class="bold"><?php echo $l->t('Time format');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
 				<select style="display: none; width: 60px;" id="timeformat" title="<?php echo "timeformat"; ?>" name="timeformat">
 					<option value="24" id="24h"><?php echo $l->t("24h"); ?></option>
 					<option value="ampm" id="ampm"><?php echo $l->t("12h"); ?></option>
 				</select>
-			</td></tr>
-
-			<tr><td><label for="firstday" class="bold"><?php echo $l->t('First day of the week');?></label></td><td>
+			</td>
+		</tr>
+		<tr>
+			<td>
+				<label for="firstday" class="bold"><?php echo $l->t('Start week on');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
 				<select style="display: none;" id="firstday" title="<?php echo "First day"; ?>" name="firstday">
 					<option value="mo" id="mo"><?php echo $l->t("Monday"); ?></option>
 					<option value="su" id="su"><?php echo $l->t("Sunday"); ?></option>
 				</select>
-			</td></tr>
-
-            <tr><td><label for="" class="bold"><?php echo $l->t('Cache');?></label></td><td>
-                <input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
-            </td></tr>
-
-        </table>
-
+			</td>
+		</tr>
+		<tr class="advancedsettings">
+			<td>
+				<label for="" class="bold"><?php echo $l->t('Cache');?></label>
+				&nbsp;&nbsp;
+			</td>
+			<td>
+				<input id="cleancalendarcache" type="button" class="button" value="<?php echo $l->t('Clear cache for repeating events');?>">
+			</td>
+		</tr>
+	</table>
+</div>
+<h2 id="title_urls"><?php echo $l->t('URLs'); ?></h2>
+<div id="urls">
 		<?php echo $l->t('Calendar CalDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
 		<dl>
 		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
@@ -63,5 +97,5 @@
 			<?php } ?>
 		</dd>
 		</dl>
-        </fieldset>
-</form>
+	</div>
+</div>

apps/contacts/ajax/addbook.php

@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-$book = array(
-	'id' => 'new',
-	'displayname' => '',
-);
-$tmpl = new OCP\Template('contacts', 'part.editaddressbook');
-$tmpl->assign('new', true);
-$tmpl->assign('addressbook', $book);
-$tmpl->printPage();

apps/contacts/ajax/addressbook/activate.php

@@ -12,12 +12,12 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-$bookid = $_POST['bookid'];
-$book = OC_Contacts_App::getAddressbook($bookid);// is owner access check
+$id = $_POST['id'];
+$book = OC_Contacts_App::getAddressbook($id);// is owner access check
 
-if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
+if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
 	OCP\Util::writeLog('contacts',
-		'ajax/activation.php: Error activating addressbook: '. $bookid, 
+		'ajax/activation.php: Error activating addressbook: '. $id,
 		OCP\Util::ERROR);
 	OCP\JSON::error(array(
 		'data' => array(
@@ -26,7 +26,7 @@ if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
 }
 
 OCP\JSON::success(array(
-	'active' => OC_Contacts_Addressbook::isActive($bookid),
-	'bookid' => $bookid,
-	'book'   => $book,
+	'active' => OC_Contacts_Addressbook::isActive($id),
+	'id' => $id,
+	'addressbook'   => $book,
 ));

apps/contacts/ajax/addressbook/add.php

@@ -12,7 +12,7 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+require_once  __DIR__.'/../loghandler.php';
 
 debug('name: '.$_POST['name']);
 
@@ -34,4 +34,4 @@ if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
 	bailOut('Error activating addressbook.');
 }
 $addressbook = OC_Contacts_App::getAddressbook($bookid);
-OCP\JSON::success(array('data' => $addressbook));
+OCP\JSON::success(array('data' => array('addressbook' => $addressbook)));

apps/contacts/ajax/addressbook/delete.php

@@ -24,9 +24,12 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
+require_once  __DIR__.'/../loghandler.php';
 
-//$id = $_GET['id'];
 $id = $_POST['id'];
+if(!$id) {
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+}
 OC_Contacts_App::getAddressbook( $id ); // is owner access check
 
 OC_Contacts_Addressbook::delete($id);

apps/contacts/ajax/addressbook/update.php

@@ -11,28 +11,29 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-require_once 'loghandler.php';
-
-$bookid = $_POST['id'];
-OC_Contacts_App::getAddressbook($bookid); // is owner access check
+require_once  __DIR__.'/../loghandler.php';
 
+$id = $_POST['id'];
 $name = trim(strip_tags($_POST['name']));
+$description = trim(strip_tags($_POST['description']));
+if(!$id) {
+	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
+}
+
 if(!$name) {
 	bailOut(OC_Contacts_App::$l10n->t('Cannot update addressbook with an empty name.'));
 }
 
-if(!OC_Contacts_Addressbook::edit($bookid, $name, null)) {
+if(!OC_Contacts_Addressbook::edit($id, $name, $description)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error updating addressbook.'));
 }
 
-if(!OC_Contacts_Addressbook::setActive($bookid, $_POST['active'])) {
+if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
 	bailOut(OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'));
 }
 
-$addressbook = OC_Contacts_App::getAddressbook($bookid);
-$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $addressbook);
+OC_Contacts_App::getAddressbook($id); // is owner access check
+$addressbook = OC_Contacts_App::getAddressbook($id);
 OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
 	'addressbook' => $addressbook,
 ));

apps/contacts/ajax/chooseaddressbook.php

@@ -1,15 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$tmpl = new OCP\Template("contacts", "part.chooseaddressbook");
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page)));

apps/contacts/ajax/contact/add.php

@@ -49,4 +49,10 @@ if(!$id) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'id' => $id, 'aid' => $aid )));
+OCP\JSON::success(array(
+	'data' => array(
+		'id' => $id,
+		'aid' => $aid,
+		'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')
+	)
+));

apps/contacts/ajax/contact/addproperty.php

@@ -25,7 +25,7 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
-require_once 'loghandler.php';
+require_once __DIR__.'/../loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 $name = isset($_POST['name'])?$_POST['name']:null;
@@ -144,4 +144,9 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	bailOut($l10n->t('Error adding contact property: '.$name));
 }
 
-OCP\JSON::success(array('data' => array( 'checksum' => $checksum )));
+OCP\JSON::success(array(
+	'data' => array(
+		'checksum' => $checksum,
+		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'))
+	)
+);

apps/contacts/ajax/contact/delete.php

@@ -23,7 +23,8 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {

apps/contacts/ajax/contact/deleteproperty.php

@@ -24,7 +24,8 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
 
 $id = $_POST['id'];
 $checksum = $_POST['checksum'];
@@ -43,4 +44,9 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	bailOut($l10n->t('Error deleting contact property.'));
 }
 
-OCP\JSON::success(array('data' => array( 'id' => $id )));
+OCP\JSON::success(array(
+	'data' => array(
+		'id' => $id,
+		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
+	)
+));

apps/contacts/ajax/contact/details.php

@@ -20,7 +20,7 @@
  *
  */
 
-require_once 'loghandler.php';
+require_once __DIR__.'/../loghandler.php';
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
@@ -31,7 +31,7 @@ if(is_null($id)) {
 	bailOut(OC_Contacts_App::$l10n->t('Missing ID'));
 }
 $card = OC_Contacts_VCard::find($id);
-$vcard = OC_Contacts_App::getContactVCard( $id );
+$vcard = OC_VObject::parse($card['carddata']);
 if(is_null($vcard)) {
 	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
 }
@@ -53,5 +53,6 @@ if(isset($details['PHOTO'])) {
 $details['id'] = $id;
 $details['displayname'] = $card['fullname'];
 $details['addressbookid'] = $card['addressbookid'];
+$details['lastmodified'] = OC_Contacts_App::lastModified($vcard)->format('U');
 OC_Contacts_App::setLastModifiedHeader($vcard);
 OCP\JSON::success(array('data' => $details));

apps/contacts/ajax/contact/list.php

@@ -37,8 +37,10 @@ $ids = array();
 foreach($active_addressbooks as $addressbook) {
 	$ids[] = $addressbook['id'];
 	if(!isset($contacts_addressbook[$addressbook['id']])) {
-		$contacts_addressbook[$addressbook['id']] = array('contacts' => array('type' => 'book',));
-		$contacts_addressbook[$addressbook['id']]['displayname'] = $addressbook['displayname'];
+		$contacts_addressbook[$addressbook['id']]
+				= array('contacts' => array('type' => 'book',));
+		$contacts_addressbook[$addressbook['id']]['displayname']
+				= $addressbook['displayname'];
 	}
 }
 
@@ -47,24 +49,37 @@ $contacts_alphabet = array();
 // get next 50 for each addressbook.
 foreach($ids as $id) {
 	if($id) {
-		$contacts_alphabet = array_merge($contacts_alphabet, OC_Contacts_VCard::all($id, $start, 50));
+		$contacts_alphabet = array_merge(
+				$contacts_alphabet,
+				OC_Contacts_VCard::all($id, $start, 50)
+		);
 	}
 }
 // Our new array for the contacts sorted by addressbook
 if($contacts_alphabet) {
 	foreach($contacts_alphabet as $contact) {
-		if(!isset($contacts_addressbook[$contact['addressbookid']])) { // It should never execute.
-			$contacts_addressbook[$contact['addressbookid']] = array('contacts' => array('type' => 'book',));
+		// This should never execute.
+		if(!isset($contacts_addressbook[$contact['addressbookid']])) {
+			$contacts_addressbook[$contact['addressbookid']] = array(
+				'contacts' => array('type' => 'book',)
+			);
 		}
 		$display = trim($contact['fullname']);
 		if(!$display) {
 			$vcard = OC_Contacts_App::getContactVCard($contact['id']);
 			if(!is_null($vcard)) {
 				$struct = OC_Contacts_VCard::structureContact($vcard);
-				$display = isset($struct['EMAIL'][0])?$struct['EMAIL'][0]['value']:'[UNKNOWN]';
+				$display = isset($struct['EMAIL'][0])
+					? $struct['EMAIL'][0]['value']
+					: '[UNKNOWN]';
 			}
 		}
-		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array('type' => 'contact', 'id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'displayname' => htmlspecialchars($display));
+		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array(
+					'type' => 'contact',
+					'id' => $contact['id'],
+					'addressbookid' => $contact['addressbookid'],
+					'displayname' => htmlspecialchars($display)
+		);
 	}
 }
 unset($contacts_alphabet);

apps/contacts/ajax/contact/saveproperty.php

@@ -19,7 +19,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once 'loghandler.php';
+
+require_once __DIR__.'/../loghandler.php';
+
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
@@ -56,12 +58,16 @@ if(is_array($value)) {
 $vcard = OC_Contacts_App::getContactVCard( $id );
 $line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
 if(is_null($line)) {
-	bailOut(OC_Contacts_App::$l10n->t('Information about vCard is incorrect. Please reload the page: ').$checksum);
+	bailOut(OC_Contacts_App::$l10n->t(
+		'Information about vCard is incorrect. Please reload the page: ').$checksum
+	);
 }
 $element = $vcard->children[$line]->name;
 
 if($element != $name) {
-	bailOut(OC_Contacts_App::$l10n->t('Something went FUBAR. ').$name.' != '.$element);
+	bailOut(OC_Contacts_App::$l10n->t(
+		'Something went FUBAR. ').$name.' != '.$element
+	);
 }
 
 /* preprocessing value */
@@ -91,11 +97,13 @@ if(!$value) {
 	/* setting value */
 	switch($element) {
 		case 'BDAY':
-			// I don't use setDateTime() because that formats it as YYYYMMDD instead of YYYY-MM-DD
-			// which is what the RFC recommends.
+			// I don't use setDateTime() because that formats it as YYYYMMDD instead
+			// of YYYY-MM-DD which is what the RFC recommends.
 			$vcard->children[$line]->setValue($value);
 			$vcard->children[$line]->parameters = array();
-			$vcard->children[$line]->add(new Sabre_VObject_Parameter('VALUE', 'DATE'));
+			$vcard->children[$line]->add(
+				new Sabre_VObject_Parameter('VALUE', 'DATE')
+			);
 			debug('Setting value:'.$name.' '.$vcard->children[$line]);
 			break;
 		case 'CATEGORIES':
@@ -114,7 +122,10 @@ if(!$value) {
 					debug('Adding parameter: '.$key);
 					foreach($parameter as $val) {
 						debug('Adding parameter: '.$key.'=>'.$val);
-						$vcard->children[$line]->add(new Sabre_VObject_Parameter($key, strtoupper(strip_tags($val))));
+						$vcard->children[$line]->add(new Sabre_VObject_Parameter(
+							$key,
+							strtoupper(strip_tags($val)))
+						);
 					}
 				}
 			}
@@ -134,4 +145,9 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) {
 	exit();
 }
 
-OCP\JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, 'oldchecksum' => $_POST['checksum'] )));
+OCP\JSON::success(array('data' => array(
+	'line' => $line,
+	'checksum' => $checksum,
+	'oldchecksum' => $_POST['checksum'],
+	'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
+)));

apps/contacts/ajax/createaddressbook.php

@@ -1,36 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once 'loghandler.php';
-
-$userid = OCP\USER::getUser();
-$name = trim(strip_tags($_POST['name']));
-if(!$name) {
-	bailOut('Cannot add addressbook with an empty name.');
-}
-$bookid = OC_Contacts_Addressbook::add($userid, $name, null);
-if(!$bookid) {
-	bailOut('Error adding addressbook: '.$name);
-}
-
-if(!OC_Contacts_Addressbook::setActive($bookid, 1)) {
-	bailOut('Error activating addressbook.');
-}
-$addressbook = OC_Contacts_App::getAddressbook($bookid);
-$tmpl = new OCP\Template('contacts', 'part.chooseaddressbook.rowfields');
-$tmpl->assign('addressbook', $addressbook);
-OCP\JSON::success(array(
-	'page' => $tmpl->fetchPage(),
-	'addressbook' => $addressbook,
-));

apps/contacts/ajax/editaddressbook.php

@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-$addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);
-$tmpl = new OCP\Template("contacts", "part.editaddressbook");
-$tmpl->assign('new', false);
-$tmpl->assign('addressbook', $addressbook);
-$tmpl->printPage();

apps/contacts/ajax/savecrop.php

@@ -25,7 +25,7 @@ OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
+OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
 
 require_once 'loghandler.php';
 
@@ -60,45 +60,51 @@ if($data) {
 			'savecrop.php, x: '.$x1.' y: '.$y1.' w: '.$w.' h: '.$h,
 			OCP\Util::DEBUG);
 		if($image->crop($x1, $y1, $w, $h)) {
-			if(($image->width() <= 200 && $image->height() <= 200) || $image->resize(200)) {
-				$card = OC_Contacts_App::getContactVCard($id);
-				if(!$card) {
+			if(($image->width() <= 200 && $image->height() <= 200)
+						|| $image->resize(200)) {
+				$vcard = OC_Contacts_App::getContactVCard($id);
+				if(!$vcard) {
 					OC_Cache::remove($tmpkey);
-					bailOut(OC_Contacts_App::$l10n->t('Error getting contact object.'));
+					bailOut(OC_Contacts_App::$l10n
+						->t('Error getting contact object.'));
 				}
-				if($card->__isset('PHOTO')) {
+				if($vcard->__isset('PHOTO')) {
 					OCP\Util::writeLog('contacts',
 						'savecrop.php: PHOTO property exists.',
 						OCP\Util::DEBUG);
-					$property = $card->__get('PHOTO');
+					$property = $vcard->__get('PHOTO');
 					if(!$property) {
 						OC_Cache::remove($tmpkey);
-						bailOut(OC_Contacts_App::$l10n->t('Error getting PHOTO property.'));
+						bailOut(OC_Contacts_App::$l10n
+							->t('Error getting PHOTO property.'));
 					}
 					$property->setValue($image->__toString());
-					$property->parameters[] = new Sabre_VObject_Parameter('ENCODING', 'b');
-					$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $image->mimeType());
-					$card->__set('PHOTO', $property);
+					$property->parameters[]
+						= new Sabre_VObject_Parameter('ENCODING', 'b');
+					$property->parameters[]
+						= new Sabre_VObject_Parameter('TYPE', $image->mimeType());
+					$vcard->__set('PHOTO', $property);
 				} else {
 					OCP\Util::writeLog('contacts',
 						'savecrop.php: files: Adding PHOTO property.',
 						OCP\Util::DEBUG);
-					$card->addProperty('PHOTO', 
+					$vcard->addProperty('PHOTO',
 						$image->__toString(), array('ENCODING' => 'b',
 						'TYPE' => $image->mimeType()));
 				}
 				$now = new DateTime;
-				$card->setString('REV', $now->format(DateTime::W3C));
-				if(!OC_Contacts_VCard::edit($id, $card)) {
+				$vcard->setString('REV', $now->format(DateTime::W3C));
+				if(!OC_Contacts_VCard::edit($id, $vcard)) {
 					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
 				}
-				$tmpl = new OCP\Template("contacts", "part.contactphoto");
-				$tmpl->assign('id', $id);
-				$tmpl->assign('refresh', true);
-				$tmpl->assign('width', $image->width());
-				$tmpl->assign('height', $image->height());
-				$page = $tmpl->fetchPage();
-				OCP\JSON::success(array('data' => array('page'=>$page)));
+				OCP\JSON::success(array(
+					'data' => array(
+						'id' => $id,
+						'width' => $image->width(),
+						'height' => $image->height(),
+						'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U')
+					)
+				));
 			} else {
 				bailOut(OC_Contacts_App::$l10n->t('Error resizing image'));
 			}

apps/contacts/ajax/uploadphoto.php

@@ -26,7 +26,7 @@ OCP\JSON::checkAppEnabled('contacts');
 OCP\JSON::callCheck();
 
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain');
+OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
 require_once 'loghandler.php';
 $l10n = OC_Contacts_App::$l10n;
 // If it is a Drag'n'Drop transfer it's handled here.

apps/contacts/appinfo/app.php

@@ -18,7 +18,5 @@ OCP\App::addNavigationEntry( array(
   'icon' => OCP\Util::imagePath( 'settings', 'users.svg' ),
   'name' => OC_L10N::get('contacts')->t('Contacts') ));
 
-
-OCP\App::registerPersonal('contacts', 'settings');
 OCP\Util::addscript('contacts', 'loader');
 OC_Search::registerProvider('OC_Search_Provider_Contacts');

apps/contacts/appinfo/remote.php

@@ -36,10 +36,13 @@ $principalBackend = new OC_Connector_Sabre_Principal();
 $carddavBackend   = new OC_Connector_Sabre_CardDAV();
 
 // Root nodes
+$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); 
+$collection->disableListing = true; // Disable listening
+
 $nodes = array( 
-	new Sabre_CalDAV_Principal_Collection($principalBackend),
+	$collection, 
 	new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend),
-);
+	);
 
 // Fire up server
 $server = new Sabre_DAV_Server($nodes);

apps/contacts/css/contacts.css

@@ -14,8 +14,8 @@
 #bottomcontrols { padding: 0; bottom:0px; height:2.8em; width: 20em; margin:0; background:#eee; border-top:1px solid #ccc; position:fixed; -moz-box-shadow: 0 -3px 3px -3px #000; -webkit-box-shadow: 0 -3px 3px -3px #000; box-shadow: 0 -3px 3px -3px #000;}
 #bottomcontrols img { margin-top: 0.35em; }
 #uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
-#contacts_newcontact, #contacts_import, #chooseaddressbook { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
-#chooseaddressbook { float: right; margin: 0.2em 1em 0 0; }
+#contacts_newcontact, #bottomcontrols .settings { float: left; margin: 0.2em 0 0 1em; border: 0 none; border-radius: 0; -moz-box-shadow: none; box-shadow: none; outline: 0 none; }
+#bottomcontrols .settings { float: right; margin: 0.2em 1em 0 0; }
 #actionbar { clear: both; height: 30px;}
 #contacts_deletecard {position:relative; float:left; background:url('%webroot%/core/img/actions/delete.svg') no-repeat center; }
 #contacts_downloadcard {position:relative; float:left; background:url('%webroot%/core/img/actions/download.svg') no-repeat center; }
@@ -125,7 +125,7 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .typelist[type="button"] { float: left; max-width: 10em; border: 0; background-color: #fff; color: #bbb} /* for multiselect */
 .typelist[type="button"]:hover { color: #777; } /* for multiselect */
 .addresslist { clear: both; font-weight: bold; }
-#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; border: thin solid #eee; border-radius: 5px; background-color: #DBDBDB; opacity: 0.9; }
+#ninjahelp { position: absolute; bottom: 0; left: 0; right: 0; padding: 1em; margin: 1em; opacity: 0.9; }
 #ninjahelp .close { position: absolute; top: 5px; right: 5px; height: 20px; width: 20px; }
 #ninjahelp h2, .help-section h3 { width: 100%; font-weight: bold; text-align: center; }
 #ninjahelp h2 { font-size: 1.4em; }
@@ -134,3 +134,13 @@ input[type="checkbox"] { width: 20px; height: 20px; vertical-align: bottom; }
 .help-section dl { width: 100%; float: left; clear: right; margin: 0; padding: 0; cursor: normal; }
 .help-section dt { display: table-cell; clear: left; float: left; width: 35%; margin: 0; padding: 0.2em; text-align: right; text-overflow: ellipsis; vertical-align: text-bottom; font-weight: bold: }
 .help-section dd { display: table-cell; clear: right; float: left; margin: 0; padding: 0.2em; white-space: nowrap; vertical-align: text-bottom; }
+.contacts-settings dl { width: 100%; }
+.addressbooks-settings table { width: 100%; }
+.addressbooks-settings .actions { width: 100%; white-space: nowrap; }
+.addressbooks-settings .actions * { float: left; }
+.addressbooks-settings .actions input.name { width: 5em; }
+.addressbooks-settings .actions input.name { width: 7em; }
+.addressbooks-settings a.action { opacity: 0.2; }
+.addressbooks-settings a.action:hover { opacity: 1; }
+.addressbooks-settings td.active, .addressbooks-settings td.action { width: 20px; }
+

apps/contacts/js/settings.js

@@ -0,0 +1,195 @@
+OC.Contacts = OC.Contacts || {};
+OC.Contacts.Settings = OC.Contacts.Settings || {
+	init:function() {
+		this.Addressbook.adrsettings = $('.addressbooks-settings').first();
+		this.Addressbook.adractions = $('#contacts-settings').find('div.actions');
+		console.log('actions: ' + this.Addressbook.adractions.length);
+	},
+	Addressbook:{
+		showActions:function(act) {
+			this.adractions.children().hide();
+			this.adractions.children('.'+act.join(',.')).show();
+		},
+		doActivate:function(id, tgt) {
+			var active = tgt.is(':checked');
+			console.log('doActivate: ', id, active);
+			$.post(OC.filePath('contacts', 'ajax', 'addressbook/activate.php'), {id: id, active: Number(active)}, function(jsondata) {
+				if (jsondata.status == 'success'){
+					if(!active) {
+						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
+					} else {
+						OC.Contacts.Contacts.update();
+					}
+				} else {
+					console.log('Error:', jsondata.data.message);
+					OC.Contacts.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
+					tgt.checked = !active;
+				}
+			});
+		},
+		doDelete:function(id) {
+			console.log('doDelete: ', id);
+			var check = confirm('Do you really want to delete this address book?');
+			if(check == false){
+				return false;
+			} else {
+				$.post(OC.filePath('contacts', 'ajax', 'addressbook/delete.php'), { id: id}, function(jsondata) {
+					if (jsondata.status == 'success'){
+						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
+						$('.addressbooks-settings tr[data-id="'+id+'"]').remove()
+						OC.Contacts.Contacts.update();
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			}
+		},
+		doEdit:function(id) {
+			console.log('doEdit: ', id);
+			this.showActions(['active', 'name', 'description', 'save', 'cancel']);
+			var name = this.adrsettings.find('[data-id="'+id+'"]').find('.name').text();
+			var description = this.adrsettings.find('[data-id="'+id+'"]').find('.description').text();
+			var active = this.adrsettings.find('[data-id="'+id+'"]').find(':checkbox').is(':checked');
+			console.log('name, desc', name, description);
+			this.adractions.find('.active').prop('checked', active);
+			this.adractions.find('.name').val(name);
+			this.adractions.find('.description').val(description);
+			this.adractions.data('id', id);
+		},
+		doSave:function() {
+			var name = this.adractions.find('.name').val();
+			var description = this.adractions.find('.description').val();
+			var active = this.adractions.find('.active').is(':checked');
+			var id = this.adractions.data('id');
+			console.log('doSave:', id, name, description, active);
+
+			if(name.length == 0) {
+				OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
+				return false;
+			}
+			var url;
+			if (id == 'new'){
+				url = OC.filePath('contacts', 'ajax', 'addressbook/add.php');
+			}else{
+				url = OC.filePath('contacts', 'ajax', 'addressbook/update.php');
+			}
+			self = this;
+			$.post(url, { id: id, name: name, active: Number(active), description: description },
+				function(jsondata){
+					if(jsondata.status == 'success'){
+						self.showActions(['new',]);
+						self.adractions.removeData('id');
+						active = Boolean(Number(jsondata.data.addressbook.active));
+						if(id == 'new') {
+							self.adrsettings.find('table')
+								.append('<tr class="addressbook" data-id="'+jsondata.data.addressbook.id+'" data-uri="'+jsondata.data.addressbook.uri+'">'
+									+ '<td class="active"><input type="checkbox" '+(active ? 'checked="checked"' : '')+' /></td>'
+									+ '<td class="name">'+jsondata.data.addressbook.displayname+'</td>'
+									+ '<td class="description">'+jsondata.data.addressbook.description+'</td>'
+									+ '<td class="action"><a class="svg action globe" title="'+t('contacts', 'Show CardDav link')+'"></a></td>'
+									+ '<td class="action"><a class="svg action cloud" title="'+t('contacts', 'Show read-only VCF link')+'"></a></td>'
+									+ '<td class="action"><a class="svg action download" title="'+t('contacts', 'Download')+'" '
+									+ 'href="'+OC.linkTo('contacts', 'export.php')+'?bookid='+jsondata.data.addressbook.id+'"></a></td>'
+									+ '<td class="action"><a class="svg action edit" title="'+t('contacts', 'Edit')+'"></a></td>'
+									+ '<td class="action"><a class="svg action delete" title="'+t('contacts', 'Delete')+'"></a></td>'
+									+ '</tr>');
+						} else {
+						var row = self.adrsettings.find('tr[data-id="'+id+'"]');
+							row.find('td.active').find('input:checkbox').prop('checked', active);
+							row.find('td.name').text(jsondata.data.addressbook.displayname);
+							row.find('td.description').text(jsondata.data.addressbook.description);
+						}
+						OC.Contacts.Contacts.update();
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+			});
+		},
+		showLink:function(id, row, link) {
+			console.log('row:', row.length);
+			row.next('tr.link').remove();
+			var linkrow = $('<tr class="link"><td colspan="5"><input style="width: 95%;" type="text" value="'+link+'" /></td>'
+				+ '<td colspan="3"><button>'+t('contacts', 'Cancel')+'</button></td></tr>').insertAfter(row);
+			linkrow.find('input').focus().select();
+			linkrow.find('button').click(function() {
+				$(this).parents('tr').first().remove();
+			});
+		},
+		showCardDAV:function(id) {
+			console.log('showCardDAV: ', id);
+			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
+			this.showLink(id, row, totalurl+'/'+encodeURIComponent(oc_current_user));
+		},
+		showVCF:function(id) {
+			console.log('showVCF: ', id);
+			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
+			var link = totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export';
+			console.log(link);
+			this.showLink(id, row, link);
+		}
+	}
+};
+
+
+$(document).ready(function() {
+	OC.Contacts.Settings.init();
+
+	var moreless = $('#contacts-settings').find('.moreless').first();
+	moreless.keydown(function(event) {
+		if(event.which == 13 || event.which == 32) {
+			moreless.click();
+		}
+	});
+	moreless.on('click', function(event) {
+		event.preventDefault();
+		if(OC.Contacts.Settings.Addressbook.adrsettings.is(':visible')) {
+			OC.Contacts.Settings.Addressbook.adrsettings.slideUp();
+			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').hide();
+			moreless.text(t('contacts', 'More...'));
+		} else {
+			OC.Contacts.Settings.Addressbook.adrsettings.slideDown();
+			OC.Contacts.Settings.Addressbook.adrsettings.prev('dt').show();
+			moreless.text(t('contacts', 'Less...'));
+		}
+	});
+
+	OC.Contacts.Settings.Addressbook.adrsettings.keydown(function(event) {
+		if(event.which == 13 || event.which == 32) {
+			OC.Contacts.Settings.Addressbook.adrsettings.click();
+		}
+	});
+
+
+	OC.Contacts.Settings.Addressbook.adrsettings.on('click', function(event){
+		$('.tipsy').remove();
+		var tgt = $(event.target);
+		if(tgt.is('a') || tgt.is(':checkbox')) {
+			var id = tgt.parents('tr').first().data('id');
+			if(!id) {
+				return;
+			}
+			if(tgt.is(':checkbox')) {
+				OC.Contacts.Settings.Addressbook.doActivate(id, tgt);
+			} else if(tgt.is('a')) {
+				if(tgt.hasClass('edit')) {
+					OC.Contacts.Settings.Addressbook.doEdit(id);
+				} else if(tgt.hasClass('delete')) {
+					OC.Contacts.Settings.Addressbook.doDelete(id);
+				} else if(tgt.hasClass('globe')) {
+					OC.Contacts.Settings.Addressbook.showCardDAV(id);
+				} else if(tgt.hasClass('cloud')) {
+					OC.Contacts.Settings.Addressbook.showVCF(id);
+				}
+			}
+		} else if(tgt.is('button')) {
+			event.preventDefault();
+			if(tgt.hasClass('save')) {
+				OC.Contacts.Settings.Addressbook.doSave();
+			} else if(tgt.hasClass('cancel')) {
+				OC.Contacts.Settings.Addressbook.showActions(['new']);
+			} else if(tgt.hasClass('new')) {
+				OC.Contacts.Settings.Addressbook.doEdit('new');
+			}
+		}
+	});
+});

apps/contacts/l10n/ar.php

@@ -1,15 +1,12 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "خطء خلال توقيف كتاب العناوين.",
+"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "There was an error adding the contact." => "خطء خلال اضافة معرفه جديده.",
 "Cannot add empty property." => "لا يمكنك اضافه صفه خاليه.",
 "At least one of the address fields has to be filled out." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Error adding contact property." => "خطء خلال اضافة صفة المعرفه.",
-"Error adding addressbook." => "خطء خلال اضافة كتاب عناوين.",
-"Error activating addressbook." => "خطء خلال تفعيل كتاب العناوين.",
 "Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
 "Error deleting contact property." => "خطء خلال محي الصفه.",
 "Error updating contact property." => "خطء خلال تعديل الصفه.",
-"Error updating addressbook." => "خطء خلال تعديل كتاب العناوين",
 "Contacts" => "المعارف",
 "This is not your addressbook." => "هذا ليس دفتر عناوينك.",
 "Contact could not be found." => "لم يتم العثور على الشخص.",
@@ -25,34 +22,26 @@
 "Fax" => "الفاكس",
 "Video" => "الفيديو",
 "Pager" => "الرنان",
+"Birthday" => "تاريخ الميلاد",
 "Contact" => "معرفه",
 "Add Contact" => "أضف شخص ",
 "Addressbooks" => "كتب العناوين",
-"New Address Book" => "كتاب عناوين جديد",
-"CardDav Link" => "وصلة CardDav",
-"Download" => "انزال",
-"Edit" => "تعديل",
 "Delete" => "حذف",
-"Download contact" => "انزال المعرفه",
-"Delete contact" => "امحي المعرفه",
-"Birthday" => "تاريخ الميلاد",
 "Preferred" => "مفضل",
 "Phone" => "الهاتف",
+"Download contact" => "انزال المعرفه",
+"Delete contact" => "امحي المعرفه",
 "Type" => "نوع",
 "PO Box" => "العنوان البريدي",
 "Extended" => "إضافة",
-"Street" => "شارع",
 "City" => "المدينة",
 "Region" => "المنطقة",
 "Zipcode" => "رقم المنطقة",
 "Country" => "البلد",
-"Add" => "أدخل",
 "Addressbook" => "كتاب العناوين",
-"New Addressbook" => "كتاب عناوين جديد",
-"Edit Addressbook" => "عدل كتاب العناوين",
-"Displayname" => "الاسم المعروض",
-"Active" => "فعال",
+"Download" => "انزال",
+"Edit" => "تعديل",
+"New Address Book" => "كتاب عناوين جديد",
 "Save" => "حفظ",
-"Submit" => "ارسال",
 "Cancel" => "الغاء"
 );

apps/contacts/l10n/ca.php

@@ -1,39 +1,43 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Error en (des)activar la llibreta d'adreces.",
-"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
-"Cannot add empty property." => "No es pot afegir una propietat buida.",
-"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
-"Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
-"Error adding contact property." => "Error en afegir la propietat del contacte.",
+"id is not set." => "no s'ha establert la id.",
+"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
+"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
 "No ID provided" => "No heu facilitat cap ID",
 "Error setting checksum." => "Error en establir la suma de verificació.",
 "No categories selected for deletion." => "No heu seleccionat les categories a eliminar.",
 "No address books found." => "No s'han trobat llibretes d'adreces.",
 "No contacts found." => "No s'han trobat contactes.",
-"Missing ID" => "Falta la ID",
-"Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
-"Cannot add addressbook with an empty name." => "No es pot afegir una llibreta d'adreces amb un nom buit.",
-"Error adding addressbook." => "Error en afegir la llibreta d'adreces.",
-"Error activating addressbook." => "Error en activar la llibreta d'adreces.",
-"No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
-"Error reading contact photo." => "Error en llegir la foto del contacte.",
-"Error saving temporary file." => "Error en desar el fitxer temporal.",
-"The loading photo is not valid." => "La foto carregada no és vàlida.",
-"id is not set." => "no s'ha establert la id.",
+"There was an error adding the contact." => "S'ha produït un error en afegir el contacte.",
+"element name is not set." => "no s'ha establert el nom de l'element.",
+"Could not parse contact: " => "No s'ha pogut processar el contacte:",
+"Cannot add empty property." => "No es pot afegir una propietat buida.",
+"At least one of the address fields has to be filled out." => "Almenys heu d'omplir un dels camps d'adreça.",
+"Trying to add duplicate property: " => "Esteu intentant afegir una propietat duplicada:",
+"Error adding contact property: " => "Error en afegir la propietat del contacte:",
 "Information about vCard is incorrect. Please reload the page." => "La informació de la vCard és incorrecta. Carregueu la pàgina de nou.",
 "Error deleting contact property." => "Error en eliminar la propietat del contacte.",
-"Contact ID is missing." => "falta la ID del contacte.",
-"Missing contact id." => "Falta la id del contacte.",
-"No photo path was submitted." => "No heu tramès el camí de la foto.",
-"File doesn't exist:" => "El fitxer no existeix:",
-"Error loading image." => "Error en carregar la imatge.",
-"element name is not set." => "no s'ha establert el nom de l'element.",
+"Missing ID" => "Falta la ID",
+"Error parsing VCard for ID: \"" => "Error en analitzar la ID de la VCard: \"",
 "checksum is not set." => "no s'ha establert la suma de verificació.",
 "Information about vCard is incorrect. Please reload the page: " => "La informació de la vCard és incorrecta. Carregueu de nou la pàgina:",
 "Something went FUBAR. " => "Alguna cosa ha anat FUBAR.",
 "Error updating contact property." => "Error en actualitzar la propietat del contacte.",
-"Cannot update addressbook with an empty name." => "No es pot actualitzar la llibreta d'adreces amb un nom buit",
-"Error updating addressbook." => "Error en actualitzar la llibreta d'adreces.",
+"No contact ID was submitted." => "No s'ha tramès cap ID de contacte.",
+"Error reading contact photo." => "Error en llegir la foto del contacte.",
+"Error saving temporary file." => "Error en desar el fitxer temporal.",
+"The loading photo is not valid." => "La foto carregada no és vàlida.",
+"Contact ID is missing." => "falta la ID del contacte.",
+"No photo path was submitted." => "No heu tramès el camí de la foto.",
+"File doesn't exist:" => "El fitxer no existeix:",
+"Error loading image." => "Error en carregar la imatge.",
+"Error getting contact object." => "Error en obtenir l'objecte contacte.",
+"Error getting PHOTO property." => "Error en obtenir la propietat PHOTO.",
+"Error saving contact." => "Error en desar el contacte.",
+"Error resizing image" => "Error en modificar la mida de la imatge",
+"Error cropping image" => "Error en retallar la imatge",
+"Error creating temporary image" => "Error en crear la imatge temporal",
+"Error finding image: " => "Error en trobar la imatge:",
 "Error uploading contacts to storage." => "Error en carregar contactes a l'emmagatzemament.",
 "There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El fitxer carregat supera la directiva upload_max_filesize de php.ini",
@@ -41,9 +45,27 @@
 "The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
 "No file was uploaded" => "No s'ha carregat cap fitxer",
 "Missing a temporary folder" => "Falta un fitxer temporal",
+"Couldn't save temporary image: " => "No s'ha pogut desar la imatge temporal: ",
+"Couldn't load temporary image: " => "No s'ha pogut carregar la imatge temporal: ",
+"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
 "Contacts" => "Contactes",
-"Drop a VCF file to import contacts." => "Elimina un fitxer VCF per importar contactes.",
-"Addressbook not found." => "No s'ha trobat la llibreta d'adreces.",
+"Sorry, this functionality has not been implemented yet" => "Aquesta funcionalitat encara no està implementada",
+"Not implemented" => "No implementada",
+"Couldn't get a valid address." => "No s'ha pogut obtenir una adreça vàlida.",
+"Error" => "Error",
+"This property has to be non-empty." => "Aquesta propietat no pot ser buida.",
+"Couldn't serialize elements." => "No s'han pogut serialitzar els elements.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' s'ha cridat sense argument de tipus. Informeu-ne a  bugs.owncloud.org",
+"Edit name" => "Edita el nom",
+"No files selected for upload." => "No s'han seleccionat fitxers per a la pujada.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fitxer que intenteu pujar excedeix la mida màxima de pujada en aquest servidor.",
+"Select type" => "Seleccioneu un tipus",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Heu marcat eliminar alguns contactes, però encara no s'han eliminat. Espereu mentre s'esborren.",
+"Result: " => "Resultat: ",
+" imported, " => " importat, ",
+" failed." => " fallada.",
+"Displayname cannot be empty." => "El nom a mostrar no pot ser buit",
+"Addressbook not found: " => "No s'ha trobat la llibreta d'adreces: ",
 "This is not your addressbook." => "Aquesta no és la vostra llibreta d'adreces",
 "Contact could not be found." => "No s'ha trobat el contacte.",
 "Address" => "Adreça",
@@ -60,25 +82,50 @@
 "Video" => "Vídeo",
 "Pager" => "Paginador",
 "Internet" => "Internet",
+"Birthday" => "Aniversari",
+"Business" => "Negocis",
+"Call" => "Trucada",
+"Clients" => "Clients",
+"Deliverer" => "Emissari",
+"Holidays" => "Vacances",
+"Ideas" => "Idees",
+"Journey" => "Viatge",
+"Jubilee" => "Aniversari",
+"Meeting" => "Reunió",
+"Other" => "Altres",
+"Personal" => "Personal",
+"Projects" => "Projectes",
+"Questions" => "Preguntes",
 "{name}'s Birthday" => "Aniversari de {name}",
 "Contact" => "Contacte",
 "Add Contact" => "Afegeix un contacte",
+"Import" => "Importa",
+"Settings" => "Configuració",
 "Addressbooks" => "Llibretes d'adreces",
-"Configure Address Books" => "Configura les llibretes d'adreces",
-"New Address Book" => "Nova llibreta d'adreces",
-"Import from VCF" => "Importa de VFC",
-"CardDav Link" => "Enllaç CardDav",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"Delete" => "Suprimeix",
-"Download contact" => "Baixa el contacte",
-"Delete contact" => "Suprimeix el contacte",
+"Close" => "Tanca",
+"Keyboard shortcuts" => "Dreceres de teclat",
+"Navigation" => "Navegació",
+"Next contact in list" => "Següent contacte de la llista",
+"Previous contact in list" => "Contacte anterior de la llista",
+"Expand/collapse current addressbook" => "Expandeix/col·lapsa la llibreta d'adreces",
+"Actions" => "Accions",
+"Refresh contacts list" => "Carrega de nou la llista de contactes",
+"Add new contact" => "Afegeix un contacte nou",
+"Add new addressbook" => "Afegeix una llibreta d'adreces nova",
+"Delete current contact" => "Esborra el contacte",
 "Drop photo to upload" => "Elimina la foto a carregar",
+"Delete current photo" => "Elimina la foto actual",
+"Edit current photo" => "Edita la foto actual",
+"Upload new photo" => "Carrega una foto nova",
+"Select photo from ownCloud" => "Selecciona una foto de ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format personalitzat, Nom curt, Nom sencer, Invertit o Invertit amb coma",
 "Edit name details" => "Edita detalls del nom",
+"Delete" => "Suprimeix",
 "Nickname" => "Sobrenom",
 "Enter nickname" => "Escriviu el sobrenom",
-"Birthday" => "Aniversari",
+"Web site" => "Adreça web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Vés a la web",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grups",
 "Separate groups with commas" => "Separeu els grups amb comes",
@@ -94,24 +141,24 @@
 "Edit address details" => "Edita els detalls de l'adreça",
 "Add notes here." => "Afegiu notes aquí.",
 "Add field" => "Afegeix un camp",
-"Profile picture" => "Foto de perfil",
 "Phone" => "Telèfon",
 "Note" => "Nota",
-"Delete current photo" => "Elimina la foto actual",
-"Edit current photo" => "Edita la foto actual",
-"Upload new photo" => "Carrega una foto nova",
-"Select photo from ownCloud" => "Selecciona una foto de ownCloud",
+"Download contact" => "Baixa el contacte",
+"Delete contact" => "Suprimeix el contacte",
+"The temporary image has been removed from cache." => "La imatge temporal ha estat eliminada de la memòria de cau.",
 "Edit address" => "Edita l'adreça",
 "Type" => "Tipus",
 "PO Box" => "Adreça postal",
+"Street address" => "Adreça",
+"Street and number" => "Carrer i número",
 "Extended" => "Addicional",
-"Street" => "Carrer",
+"Apartment number etc." => "Número d'apartament, etc.",
 "City" => "Ciutat",
 "Region" => "Comarca",
+"E.g. state or province" => "p. ex. Estat o província ",
 "Zipcode" => "Codi postal",
+"Postal code" => "Codi postal",
 "Country" => "País",
-"Edit categories" => "Edita categories",
-"Add" => "Afegeix",
 "Addressbook" => "Llibreta d'adreces",
 "Hon. prefixes" => "Prefix honorífic:",
 "Miss" => "Srta",
@@ -132,26 +179,29 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nova llibreta d'adreces",
-"Edit Addressbook" => "Edita la llibreta d'adreces",
-"Displayname" => "Nom a mostrar",
-"Active" => "Actiu",
-"Save" => "Desa",
-"Submit" => "Envia",
-"Cancel" => "Cancel·la",
 "Import a contacts file" => "Importa un fitxer de contactes",
 "Please choose the addressbook" => "Escolliu la llibreta d'adreces",
 "create a new addressbook" => "crea una llibreta d'adreces nova",
 "Name of new addressbook" => "Nom de la nova llibreta d'adreces",
-"Import" => "Importa",
 "Importing contacts" => "S'estan important contactes",
-"Select address book to import to:" => "Seleccioneu la llibreta d'adreces a la que voleu importar:",
-"Select from HD" => "Selecciona de HD",
 "You have no contacts in your addressbook." => "No teniu contactes a la llibreta d'adreces.",
 "Add contact" => "Afegeix un contacte",
 "Configure addressbooks" => "Configura les llibretes d'adreces",
+"Select Address Books" => "Selecccioneu llibretes d'adreces",
+"Enter name" => "Escriviu un nom",
+"Enter description" => "Escriviu una descripció",
 "CardDAV syncing addresses" => "Adreces de sincronització CardDAV",
 "more info" => "més informació",
 "Primary address (Kontact et al)" => "Adreça primària (Kontact i al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Mostra l'enllaç CardDav",
+"Show read-only VCF link" => "Mostra l'enllaç VCF només de lectura",
+"Download" => "Baixa",
+"Edit" => "Edita",
+"New Address Book" => "Nova llibreta d'adreces",
+"Name" => "Nom",
+"Description" => "Descripció",
+"Save" => "Desa",
+"Cancel" => "Cancel·la",
+"More..." => "Més..."
 );

apps/contacts/l10n/cs_CZ.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Chyba při (de)aktivaci adresáře.",
-"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
-"Cannot add empty property." => "Nelze přidat prazdný údaj.",
-"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
-"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
-"Error adding contact property." => "Chyba během přdávání údaje kontaktu.",
+"id is not set." => "id neni nastaveno.",
+"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
+"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
 "No ID provided" => "ID nezadáno",
 "Error setting checksum." => "Chyba při nastavování kontrolního součtu.",
 "No categories selected for deletion." => "Žádné kategorie nebyly vybrány k smazání.",
 "No address books found." => "Žádný adresář nenalezen.",
 "No contacts found." => "Žádné kontakty nenalezeny.",
-"Missing ID" => "Chybí ID",
-"Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
-"Cannot add addressbook with an empty name." => "Nelze přidat adresář s prázdným jménem.",
-"Error adding addressbook." => "Chyba při přidávání adresáře.",
-"Error activating addressbook." => "Chyba při aktivaci adresáře.",
-"No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
-"Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
-"Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
-"The loading photo is not valid." => "Načítaná fotka je vadná.",
-"id is not set." => "id neni nastaveno.",
+"There was an error adding the contact." => "Během přidávání kontaktu nastala chyba.",
+"element name is not set." => "jméno elementu není nastaveno.",
+"Cannot add empty property." => "Nelze přidat prazdný údaj.",
+"At least one of the address fields has to be filled out." => "Musí být uveden nejméně jeden z adresních údajů",
+"Trying to add duplicate property: " => "Pokoušíte se přidat duplicitní atribut: ",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Error deleting contact property." => "Chyba při odstraňování údaje kontaktu.",
-"Contact ID is missing." => "Chybí ID kontaktu.",
-"Missing contact id." => "Chybí id kontaktu.",
-"No photo path was submitted." => "Žádná fotka nebyla nahrána.",
-"File doesn't exist:" => "Soubor neexistuje:",
-"Error loading image." => "Chyba při načítání obrázku.",
-"element name is not set." => "jméno elementu není nastaveno.",
+"Missing ID" => "Chybí ID",
+"Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
 "checksum is not set." => "kontrolní součet není nastaven.",
 "Information about vCard is incorrect. Please reload the page: " => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Something went FUBAR. " => "Něco se pokazilo. ",
 "Error updating contact property." => "Chyba při aktualizaci údaje kontaktu.",
-"Cannot update addressbook with an empty name." => "Nelze aktualizovat adresář s prázdným jménem.",
-"Error updating addressbook." => "Chyba při aktualizaci adresáře.",
+"No contact ID was submitted." => "Nebylo nastaveno ID kontaktu.",
+"Error reading contact photo." => "Chyba při načítání fotky kontaktu.",
+"Error saving temporary file." => "Chyba při ukládání dočasného souboru.",
+"The loading photo is not valid." => "Načítaná fotka je vadná.",
+"Contact ID is missing." => "Chybí ID kontaktu.",
+"No photo path was submitted." => "Žádná fotka nebyla nahrána.",
+"File doesn't exist:" => "Soubor neexistuje:",
+"Error loading image." => "Chyba při načítání obrázku.",
+"Error getting contact object." => "Chyba při převzetí objektu kontakt.",
+"Error getting PHOTO property." => "Chyba při získávání fotky.",
+"Error saving contact." => "Chyba při ukládání kontaktu.",
+"Error resizing image" => "Chyba při změně velikosti obrázku.",
+"Error cropping image" => "Chyba při osekávání obrázku.",
+"Error creating temporary image" => "Chyba při vytváření dočasného obrázku.",
+"Error finding image: " => "Chyba při hledání obrázku:",
 "Error uploading contacts to storage." => "Chyba při nahrávání kontaktů do úložiště.",
 "There is no error, the file uploaded with success" => "Nevyskytla se žádná chyba, soubor byl úspěšně nahrán",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Nahrávaný soubor překračuje nastavení upload_max_filesize directive v php.ini",
@@ -41,9 +43,24 @@
 "The uploaded file was only partially uploaded" => "Nahrávaný soubor se nahrál pouze z části",
 "No file was uploaded" => "Žádný soubor nebyl nahrán",
 "Missing a temporary folder" => "Chybí dočasný adresář",
+"Couldn't save temporary image: " => "Nemohu uložit dočasný obrázek: ",
+"Couldn't load temporary image: " => "Nemohu načíst dočasný obrázek: ",
+"No file was uploaded. Unknown error" => "Soubor nebyl odeslán. Neznámá chyba",
 "Contacts" => "Kontakty",
-"Drop a VCF file to import contacts." => "Pro import kontaktů sem přetáhněte soubor VCF",
-"Addressbook not found." => "Adresář nenalezen.",
+"Sorry, this functionality has not been implemented yet" => "Bohužel, tato funkce nebyla ještě implementována.",
+"Not implemented" => "Neimplementováno",
+"Couldn't get a valid address." => "Nelze získat platnou adresu.",
+"Error" => "Chyba",
+"This property has to be non-empty." => "Tento parametr nemuže zůstat nevyplněn.",
+"Couldn't serialize elements." => "Prvky nelze převést..",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' voláno bez argumentu. Prosím oznamte chybu na bugs.owncloud.org",
+"Edit name" => "Upravit jméno",
+"No files selected for upload." => "Žádné soubory nebyly vybrány k nahrání.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Soubor, který se pokoušíte odeslat, přesahuje maximální povolenou velikost.",
+"Select type" => "Vybrat typ",
+"Result: " => "Výsledek: ",
+" imported, " => "importováno v pořádku,",
+" failed." => "neimportováno.",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
 "Address" => "Adresa",
@@ -60,25 +77,23 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Narozeniny",
 "{name}'s Birthday" => "Narozeniny {name}",
 "Contact" => "Kontakt",
 "Add Contact" => "Přidat kontakt",
+"Import" => "Import",
 "Addressbooks" => "Adresáře",
-"Configure Address Books" => "Nastavit adresáře",
-"New Address Book" => "Nový adresář",
-"Import from VCF" => "Importovat z VCF",
-"CardDav Link" => "CardDav odkaz",
-"Download" => "Stažení",
-"Edit" => "Editovat",
-"Delete" => "Odstranit",
-"Download contact" => "Stáhnout kontakt",
-"Delete contact" => "Odstranit kontakt",
+"Close" => "Zavřít",
 "Drop photo to upload" => "Přetáhněte sem fotku pro její nahrání",
+"Delete current photo" => "Smazat současnou fotku",
+"Edit current photo" => "Upravit současnou fotku",
+"Upload new photo" => "Nahrát novou fotku",
+"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formát vlastní, křestní, celé jméno, obráceně nebo obráceně oddelené čárkami",
 "Edit name details" => "Upravit podrobnosti jména",
+"Delete" => "Odstranit",
 "Nickname" => "Přezdívka",
 "Enter nickname" => "Zadejte přezdívku",
-"Birthday" => "Narozeniny",
 "dd-mm-yyyy" => "dd. mm. yyyy",
 "Groups" => "Skupiny",
 "Separate groups with commas" => "Oddělte skupiny čárkami",
@@ -94,24 +109,19 @@
 "Edit address details" => "Upravit podrobnosti adresy",
 "Add notes here." => "Zde můžete připsat poznámky.",
 "Add field" => "Přidat políčko",
-"Profile picture" => "Profilová fotka",
 "Phone" => "Telefon",
 "Note" => "Poznámka",
-"Delete current photo" => "Smazat současnou fotku",
-"Edit current photo" => "Upravit současnou fotku",
-"Upload new photo" => "Nahrát novou fotku",
-"Select photo from ownCloud" => "Vybrat fotku z ownCloudu",
+"Download contact" => "Stáhnout kontakt",
+"Delete contact" => "Odstranit kontakt",
+"The temporary image has been removed from cache." => "Obrázek byl odstraněn z dočasné paměti.",
 "Edit address" => "Upravit adresu",
 "Type" => "Typ",
 "PO Box" => "PO box",
 "Extended" => "Rozšířené",
-"Street" => "Ulice",
 "City" => "Město",
 "Region" => "Kraj",
 "Zipcode" => "PSČ",
 "Country" => "Země",
-"Edit categories" => "Upravit kategorie",
-"Add" => "Přidat",
 "Addressbook" => "Adresář",
 "Hon. prefixes" => "Tituly před",
 "Miss" => "Slečna",
@@ -132,26 +142,21 @@
 "Esq." => "Esq.",
 "Jr." => "ml.",
 "Sn." => "st.",
-"New Addressbook" => "Nový adresář",
-"Edit Addressbook" => "Editace adresáře",
-"Displayname" => "Zobrazené jméno",
-"Active" => "Aktivní",
-"Save" => "Uložit",
-"Submit" => "Potvrdit",
-"Cancel" => "Storno",
 "Import a contacts file" => "Importovat soubor kontaktů",
 "Please choose the addressbook" => "Prosím zvolte adresář",
 "create a new addressbook" => "vytvořit nový adresář",
 "Name of new addressbook" => "Jméno nového adresáře",
-"Import" => "Import",
 "Importing contacts" => "Importování kontaktů",
-"Select address book to import to:" => "Vyberte adresář do kterého chcete importovat:",
-"Select from HD" => "Vybrat z disku",
 "You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
 "Add contact" => "Přidat kontakt",
 "Configure addressbooks" => "Nastavit adresář",
 "CardDAV syncing addresses" => "Adresa pro synchronizaci pomocí CardDAV:",
 "more info" => "víc informací",
 "Primary address (Kontact et al)" => "Hlavní adresa (Kontakt etc)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Stažení",
+"Edit" => "Editovat",
+"New Address Book" => "Nový adresář",
+"Save" => "Uložit",
+"Cancel" => "Storno"
 );

apps/contacts/l10n/da.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Fejl ved (de)aktivering af adressebogen",
-"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
-"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
-"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
-"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
-"Error adding contact property." => "Fejl ved tilføjelse af egenskab.",
+"id is not set." => "Intet ID medsendt.",
+"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
+"Error updating addressbook." => "Fejl ved opdatering af adressebog",
 "No ID provided" => "Intet ID medsendt",
 "Error setting checksum." => "Kunne ikke sætte checksum.",
 "No categories selected for deletion." => "Der ikke valgt nogle grupper at slette.",
 "No address books found." => "Der blev ikke fundet nogen adressebøger.",
 "No contacts found." => "Der blev ikke fundet nogen kontaktpersoner.",
-"Missing ID" => "Manglende ID",
-"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'en: \"",
-"Cannot add addressbook with an empty name." => "Kan ikke tilføje adressebog uden et navn.",
-"Error adding addressbook." => "Fejl ved tilføjelse af adressebog.",
-"Error activating addressbook." => "Fejl ved aktivering af adressebog.",
-"No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
-"Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
-"Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
-"The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
-"id is not set." => "Intet ID medsendt.",
+"There was an error adding the contact." => "Der opstod en fejl ved tilføjelse af kontaktpersonen.",
+"element name is not set." => "Elementnavnet er ikke medsendt.",
+"Cannot add empty property." => "Kan ikke tilføje en egenskab uden indhold.",
+"At least one of the address fields has to be filled out." => "Der skal udfyldes mindst et adressefelt.",
+"Trying to add duplicate property: " => "Kan ikke tilføje overlappende element.",
 "Information about vCard is incorrect. Please reload the page." => "Informationen om vCard er forkert. Genindlæs siden.",
 "Error deleting contact property." => "Fejl ved sletning af egenskab for kontaktperson.",
-"Contact ID is missing." => "Kontaktperson ID mangler.",
-"Missing contact id." => "Kontaktperson ID mangler.",
-"No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
-"File doesn't exist:" => "Filen eksisterer ikke:",
-"Error loading image." => "Kunne ikke indlæse billede.",
-"element name is not set." => "Element navnet er ikke medsendt.",
+"Missing ID" => "Manglende ID",
+"Error parsing VCard for ID: \"" => "Kunne ikke indlæse VCard med ID'et: \"",
 "checksum is not set." => "Checksum er ikke medsendt.",
 "Information about vCard is incorrect. Please reload the page: " => "Informationen om dette VCard stemmer ikke. Genindlæs venligst siden: ",
 "Something went FUBAR. " => "Noget gik grueligt galt. ",
 "Error updating contact property." => "Fejl ved opdatering af egenskab for kontaktperson.",
-"Cannot update addressbook with an empty name." => "Kan ikke opdatére adressebogen med et tomt navn.",
-"Error updating addressbook." => "Fejl ved opdatering af adressebog",
+"No contact ID was submitted." => "Ingen ID for kontakperson medsendt.",
+"Error reading contact photo." => "Kunne ikke indlæse foto for kontakperson.",
+"Error saving temporary file." => "Kunne ikke gemme midlertidig fil.",
+"The loading photo is not valid." => "Billedet under indlæsning er ikke gyldigt.",
+"Contact ID is missing." => "Kontaktperson ID mangler.",
+"No photo path was submitted." => "Der blev ikke medsendt en sti til fotoet.",
+"File doesn't exist:" => "Filen eksisterer ikke:",
+"Error loading image." => "Kunne ikke indlæse billede.",
+"Error getting contact object." => "Fejl ved indlæsning af kontaktpersonobjektet.",
+"Error getting PHOTO property." => "Fejl ved indlæsning af PHOTO feltet.",
+"Error saving contact." => "Kunne ikke gemme kontaktpersonen.",
+"Error resizing image" => "Kunne ikke ændre billedets størrelse",
+"Error cropping image" => "Kunne ikke beskære billedet",
+"Error creating temporary image" => "Kunne ikke oprette midlertidigt billede",
+"Error finding image: " => "Kunne ikke finde billedet: ",
 "Error uploading contacts to storage." => "Kunne ikke uploade kontaktepersoner til midlertidig opbevaring.",
 "There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Den uploadede fil er større end upload_max_filesize indstillingen i php.ini",
@@ -41,9 +43,24 @@
 "The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
 "No file was uploaded" => "Ingen fil uploadet",
 "Missing a temporary folder" => "Manglende midlertidig mappe.",
+"Couldn't save temporary image: " => "Kunne ikke gemme midlertidigt billede: ",
+"Couldn't load temporary image: " => "Kunne ikke indlæse midlertidigt billede",
+"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
 "Contacts" => "Kontaktpersoner",
-"Drop a VCF file to import contacts." => "Drop en VCF fil for at importere kontaktpersoner.",
-"Addressbook not found." => "Adressebogen blev ikke fundet.",
+"Sorry, this functionality has not been implemented yet" => "Denne funktion er desværre ikke implementeret endnu",
+"Not implemented" => "Ikke implementeret",
+"Couldn't get a valid address." => "Kunne ikke finde en gyldig adresse.",
+"Error" => "Fejl",
+"This property has to be non-empty." => "Dette felt må ikke være tomt.",
+"Couldn't serialize elements." => "Kunne ikke serialisere elementerne.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' kaldet uden typeargument. Indrapporter fejl på bugs.owncloud.org",
+"Edit name" => "Rediger navn",
+"No files selected for upload." => "Der er ikke valgt nogen filer at uploade.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Dr.",
+"Select type" => "Vælg type",
+"Result: " => "Resultat:",
+" imported, " => " importeret ",
+" failed." => " fejl.",
 "This is not your addressbook." => "Dette er ikke din adressebog.",
 "Contact could not be found." => "Kontaktperson kunne ikke findes.",
 "Address" => "Adresse",
@@ -60,25 +77,23 @@
 "Video" => "Video",
 "Pager" => "Personsøger",
 "Internet" => "Internet",
-"{name}'s Birthday" => "{name}'s fødselsdag",
+"Birthday" => "Fødselsdag",
+"{name}'s Birthday" => "{name}s fødselsdag",
 "Contact" => "Kontaktperson",
 "Add Contact" => "Tilføj kontaktperson",
+"Import" => "Importer",
 "Addressbooks" => "Adressebøger",
-"Configure Address Books" => "Konfigurer adressebøger",
-"New Address Book" => "Ny adressebog",
-"Import from VCF" => "Importer fra VCF",
-"CardDav Link" => "CardDav-link",
-"Download" => "Download",
-"Edit" => "Rediger",
-"Delete" => "Slet",
-"Download contact" => "Download kontaktperson",
-"Delete contact" => "Slet kontaktperson",
+"Close" => "Luk",
 "Drop photo to upload" => "Drop foto for at uploade",
+"Delete current photo" => "Slet nuværende foto",
+"Edit current photo" => "Rediger nuværende foto",
+"Upload new photo" => "Upload nyt foto",
+"Select photo from ownCloud" => "Vælg foto fra ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatter som valgfrit, fuldt navn, efternavn først eller efternavn først med komma",
 "Edit name details" => "Rediger navnedetaljer.",
-"Nickname" => "Øgenavn",
-"Enter nickname" => "Indtast øgenavn",
-"Birthday" => "Fødselsdag",
+"Delete" => "Slet",
+"Nickname" => "Kaldenavn",
+"Enter nickname" => "Indtast kaldenavn",
 "dd-mm-yyyy" => "dd-mm-åååå",
 "Groups" => "Grupper",
 "Separate groups with commas" => "Opdel gruppenavne med kommaer",
@@ -93,25 +108,20 @@
 "View on map" => "Vis på kort",
 "Edit address details" => "Rediger adresse detaljer",
 "Add notes here." => "Tilføj noter her.",
-"Add field" => "Tilfæj element",
-"Profile picture" => "Profilbillede",
+"Add field" => "Tilføj element",
 "Phone" => "Telefon",
 "Note" => "Note",
-"Delete current photo" => "Slet nuværende foto",
-"Edit current photo" => "Rediger nuværende foto",
-"Upload new photo" => "Upload nyt foto",
-"Select photo from ownCloud" => "Vælg foto fra ownCloud",
+"Download contact" => "Download kontaktperson",
+"Delete contact" => "Slet kontaktperson",
+"The temporary image has been removed from cache." => "Det midlertidige billede er ikke længere tilgængeligt.",
 "Edit address" => "Rediger adresse",
 "Type" => "Type",
 "PO Box" => "Postboks",
 "Extended" => "Udvidet",
-"Street" => "Vej",
 "City" => "By",
 "Region" => "Region",
 "Zipcode" => "Postnummer",
 "Country" => "Land",
-"Edit categories" => "Rediger grupper",
-"Add" => "Tilføj",
 "Addressbook" => "Adressebog",
 "Hon. prefixes" => "Foranstillede titler",
 "Miss" => "Frøken",
@@ -119,7 +129,7 @@
 "Mr" => "Hr.",
 "Sir" => "Sir",
 "Mrs" => "Fru",
-"Dr" => "Dr",
+"Dr" => "Dr.",
 "Given name" => "Fornavn",
 "Additional names" => "Mellemnavne",
 "Family name" => "Efternavn",
@@ -132,26 +142,21 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Ny adressebog",
-"Edit Addressbook" => "Rediger adressebog",
-"Displayname" => "Vist navn",
-"Active" => "Aktiv",
-"Save" => "Gem",
-"Submit" => "Gem",
-"Cancel" => "Fortryd",
 "Import a contacts file" => "Importer fil med kontaktpersoner",
 "Please choose the addressbook" => "Vælg venligst adressebog",
 "create a new addressbook" => "Opret ny adressebog",
 "Name of new addressbook" => "Navn på ny adressebog",
-"Import" => "Importer",
 "Importing contacts" => "Importerer kontaktpersoner",
-"Select address book to import to:" => "Vælg hvilken adressebog, der skal importeres til:",
-"Select from HD" => "Vælg fra harddisk.",
 "You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
 "Add contact" => "Tilføj kontaktpeson.",
 "Configure addressbooks" => "Konfigurer adressebøger",
 "CardDAV syncing addresses" => "CardDAV synkroniserings adresse",
 "more info" => "mere info",
 "Primary address (Kontact et al)" => "Primær adresse (Kontak m. fl.)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Download",
+"Edit" => "Rediger",
+"New Address Book" => "Ny adressebog",
+"Save" => "Gem",
+"Cancel" => "Fortryd"
 );

apps/contacts/l10n/de.php

@@ -1,39 +1,43 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches fehlgeschlagen",
-"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
-"Cannot add empty property." => "Feld darf nicht leer sein.",
-"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
-"Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
-"Error adding contact property." => "Kontakt ändern fehlgeschlagen",
+"id is not set." => "ID ist nicht angegeben.",
+"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
+"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
 "No ID provided" => "Keine ID angegeben",
 "Error setting checksum." => "Fehler beim Setzen der Prüfsumme.",
 "No categories selected for deletion." => "Keine Kategorien zum Löschen ausgewählt.",
 "No address books found." => "Keine Adressbücher gefunden.",
 "No contacts found." => "Keine Kontakte gefunden.",
-"Missing ID" => "Fehlende ID",
-"Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
-"Cannot add addressbook with an empty name." => "Bitte einen Namen für das Adressbuch angeben.",
-"Error adding addressbook." => "Adressbuch hinzufügen fehlgeschlagen",
-"Error activating addressbook." => "Adressbuchaktivierung fehlgeschlagen",
-"No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
-"Error reading contact photo." => "Fehler beim auslesen des Kontaktfotos.",
-"Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
-"The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
-"id is not set." => "ID ist nicht angegeben.",
+"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen",
+"element name is not set." => "Kein Name für das Element angegeben.",
+"Could not parse contact: " => "Konnte folgenden Kontakt nicht verarbeiten:",
+"Cannot add empty property." => "Feld darf nicht leer sein.",
+"At least one of the address fields has to be filled out." => "Mindestens eines der Adressfelder muss ausgefüllt werden.",
+"Trying to add duplicate property: " => "Versuche, doppelte Eigenschaft hinzuzufügen: ",
+"Error adding contact property: " => "Fehler beim Hinzufügen der Kontakteigenschaft:",
 "Information about vCard is incorrect. Please reload the page." => "Die Information der vCard ist fehlerhaft. Bitte aktualisiere die Seite.",
 "Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen",
-"Contact ID is missing." => "Keine Kontakt-ID angegeben.",
-"Missing contact id." => "Fehlende Kontakt-ID.",
-"No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
-"File doesn't exist:" => "Datei existiert nicht: ",
-"Error loading image." => "Fehler beim Laden des Bildes.",
-"element name is not set." => "Kein Name für das Element angegeben.",
+"Missing ID" => "Fehlende ID",
+"Error parsing VCard for ID: \"" => "Fehler beim Einlesen der VCard für die ID: \"",
 "checksum is not set." => "Keine Prüfsumme angegeben.",
 "Information about vCard is incorrect. Please reload the page: " => "Die Informationen zur vCard sind fehlerhaft. Bitte Seite neu laden: ",
 "Something went FUBAR. " => "Irgendwas ist hier so richtig schief gelaufen. ",
 "Error updating contact property." => "Kontakteigenschaft aktualisieren fehlgeschlagen",
-"Cannot update addressbook with an empty name." => "Adressbuch kann nicht mir leeren Namen aktualisiert werden.",
-"Error updating addressbook." => "Adressbuch aktualisieren fehlgeschlagen",
+"No contact ID was submitted." => "Es wurde keine Kontakt-ID übermittelt.",
+"Error reading contact photo." => "Fehler beim Auslesen des Kontaktfotos.",
+"Error saving temporary file." => "Fehler beim Speichern der temporären Datei.",
+"The loading photo is not valid." => "Das Kontaktfoto ist fehlerhaft.",
+"Contact ID is missing." => "Keine Kontakt-ID angegeben.",
+"No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
+"File doesn't exist:" => "Datei existiert nicht: ",
+"Error loading image." => "Fehler beim Laden des Bildes.",
+"Error getting contact object." => "Fehler beim Abruf des Kontakt-Objektes.",
+"Error getting PHOTO property." => "Fehler beim Abrufen der PHOTO Eigenschaft.",
+"Error saving contact." => "Fehler beim Speichern des Kontaktes",
+"Error resizing image" => "Fehler bei der Größenänderung des Bildes",
+"Error cropping image" => "Fehler beim Zuschneiden des Bildes",
+"Error creating temporary image" => "Fehler beim erstellen des temporären Bildes",
+"Error finding image: " => "Fehler beim Suchen des Bildes: ",
 "Error uploading contacts to storage." => "Übertragen der Kontakte fehlgeschlagen",
 "There is no error, the file uploaded with success" => "Alles bestens, Datei erfolgreich übertragen.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Datei größer als durch die upload_max_filesize Direktive in php.ini erlaubt",
@@ -41,14 +45,32 @@
 "The uploaded file was only partially uploaded" => "Datei konnte nur teilweise übertragen werden",
 "No file was uploaded" => "Keine Datei konnte übertragen werden.",
 "Missing a temporary folder" => "Kein temporärer Ordner vorhanden",
+"Couldn't save temporary image: " => "Konnte das temporäre Bild nicht speichern:",
+"Couldn't load temporary image: " => "Konnte das temporäre Bild nicht laden:",
+"No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler",
 "Contacts" => "Kontakte",
-"Drop a VCF file to import contacts." => "Zieh' eine VCF Datei hierher zum Kontaktimport",
-"Addressbook not found." => "Adressbuch nicht gefunden.",
+"Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung",
+"Not implemented" => "Nicht Verfügbar",
+"Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen",
+"Error" => "Fehler",
+"This property has to be non-empty." => "Dieses Feld darf nicht Leer sein.",
+"Couldn't serialize elements." => "Konnte Elemente nicht serialisieren",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' wurde ohne Argumente aufgerufen, bitte Melde dies auf bugs.owncloud.org",
+"Edit name" => "Name ändern",
+"No files selected for upload." => "Keine Datei(en) zum Hochladen ausgewählt",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die Sie versuchen hochzuladen, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.",
+"Select type" => "Wähle Typ",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Einige zum Löschen markiert Kontakte wurden noch nicht gelöscht. Bitte warten ...",
+"Result: " => "Ergebnis: ",
+" imported, " => " importiert, ",
+" failed." => " fehlgeschlagen.",
+"Displayname cannot be empty." => "Der Anzeigename darf nicht leer sein.",
+"Addressbook not found: " => "Adressbuch nicht gefunden:",
 "This is not your addressbook." => "Dies ist nicht dein Adressbuch.",
 "Contact could not be found." => "Kontakt konnte nicht gefunden werden.",
 "Address" => "Adresse",
 "Telephone" => "Telefon",
-"Email" => "Email",
+"Email" => "E-Mail",
 "Organization" => "Organisation",
 "Work" => "Arbeit",
 "Home" => "Zuhause",
@@ -60,28 +82,55 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Geburtstag",
+"Business" => "Geschäftlich",
+"Call" => "Anruf",
+"Clients" => "Kunden",
+"Deliverer" => "Lieferant",
+"Holidays" => "Feiertage",
+"Ideas" => "Ideen",
+"Journey" => "Reise",
+"Jubilee" => "Jubiläum",
+"Meeting" => "Besprechung",
+"Other" => "Andere",
+"Personal" => "Persönlich",
+"Projects" => "Projekte",
+"Questions" => "Fragen",
 "{name}'s Birthday" => "Geburtstag von {name}",
 "Contact" => "Kontakt",
 "Add Contact" => "Kontakt hinzufügen",
+"Import" => "Importieren",
+"Settings" => "Einstellungen",
 "Addressbooks" => "Adressbücher",
-"Configure Address Books" => "Adressbücher konfigurieren",
-"New Address Book" => "Neues Adressbuch",
-"Import from VCF" => "Import von VCF Datei",
-"CardDav Link" => "CardDav Link",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
+"Close" => "Schließen",
+"Keyboard shortcuts" => "Tastaturbefehle",
+"Navigation" => "Navigation",
+"Next contact in list" => "Nächster Kontakt aus der Liste",
+"Previous contact in list" => "Vorheriger Kontakt aus der Liste",
+"Expand/collapse current addressbook" => "Ausklappen/Einklappen des Adressbuches",
+"Next addressbook" => "Nächstes Adressbuch",
+"Previous addressbook" => "Vorheriges Adressbuch",
+"Actions" => "Aktionen",
+"Refresh contacts list" => "Kontaktliste neu laden",
+"Add new contact" => "Neuen Kontakt hinzufügen",
+"Add new addressbook" => "Neues Adressbuch hinzufügen",
+"Delete current contact" => "Aktuellen Kontakt löschen",
+"Drop photo to upload" => "Zieh' ein Foto hierher zum Hochladen",
+"Delete current photo" => "Derzeitiges Foto löschen",
+"Edit current photo" => "Foto ändern",
+"Upload new photo" => "Neues Foto hochladen",
+"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts oder Rückwärts mit Komma",
+"Edit name details" => "Name ändern",
 "Delete" => "Löschen",
-"Download contact" => "Kontakt herunterladen",
-"Delete contact" => "Kontakt löschen",
-"Drop photo to upload" => "Zieh' ein Foto hierher zum hochladen",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format benutzerdefiniert, Kurzname, Vollname, Rückwärts order Rückwärts mit Komma",
-"Edit name details" => "Namen ändern",
 "Nickname" => "Spitzname",
-"Enter nickname" => "Spitznamen angeben",
-"Birthday" => "Geburtstag",
-"dd-mm-yyyy" => "TT-MM-JJJJ",
+"Enter nickname" => "Spitzname angeben",
+"Web site" => "Webseite",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Webseite aufrufen",
+"dd-mm-yyyy" => "dd.mm.yyyy",
 "Groups" => "Gruppen",
-"Separate groups with commas" => "Gruppen mit Komma trennt",
+"Separate groups with commas" => "Gruppen mit Komma getrennt",
 "Edit groups" => "Gruppen editieren",
 "Preferred" => "Bevorzugt",
 "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.",
@@ -94,24 +143,24 @@
 "Edit address details" => "Adressinformationen ändern",
 "Add notes here." => "Füge hier Notizen ein.",
 "Add field" => "Feld hinzufügen",
-"Profile picture" => "Profil Bild",
 "Phone" => "Telefon",
 "Note" => "Notiz",
-"Delete current photo" => "Derzeitiges Foto löschen",
-"Edit current photo" => "Foto ändern",
-"Upload new photo" => "Neues Foto hochladen",
-"Select photo from ownCloud" => "Foto aus ownCloud auswählen",
+"Download contact" => "Kontakt herunterladen",
+"Delete contact" => "Kontakt löschen",
+"The temporary image has been removed from cache." => "Das temporäre Bild wurde aus dem Cache gelöscht.",
 "Edit address" => "Adresse ändern",
 "Type" => "Typ",
 "PO Box" => "Postfach",
+"Street address" => "Straßenanschrift",
+"Street and number" => "Straße und Nummer",
 "Extended" => "Erweitert",
-"Street" => "Straße",
+"Apartment number etc." => "Wohnungsnummer usw.",
 "City" => "Stadt",
 "Region" => "Region",
+"E.g. state or province" => "Z.B. Staat oder Bezirk",
 "Zipcode" => "Postleitzahl",
+"Postal code" => "PLZ",
 "Country" => "Land",
-"Edit categories" => "Kategorie ändern",
-"Add" => "Hinzufügen",
 "Addressbook" => "Adressbuch",
 "Hon. prefixes" => "Höflichkeitspräfixe",
 "Miss" => "Frau",
@@ -132,26 +181,29 @@
 "Esq." => "Hochwohlgeborenen",
 "Jr." => "Jr.",
 "Sn." => "Senior",
-"New Addressbook" => "Neues Adressbuch",
-"Edit Addressbook" => "Adressbuch editieren",
-"Displayname" => "Anzeigename",
-"Active" => "Aktiv",
-"Save" => "Speichern",
-"Submit" => "Eintragen",
-"Cancel" => "Abbrechen",
 "Import a contacts file" => "Kontaktdatei importieren",
 "Please choose the addressbook" => "Bitte Adressbuch auswählen",
 "create a new addressbook" => "Neues Adressbuch erstellen",
 "Name of new addressbook" => "Name des neuen Adressbuchs",
-"Import" => "Importieren",
 "Importing contacts" => "Kontakte werden importiert",
-"Select address book to import to:" => "Adressbuch, in das importiert werden soll",
-"Select from HD" => "Von der Festplatte auswählen",
 "You have no contacts in your addressbook." => "Du hast keine Kontakte im Adressbuch.",
 "Add contact" => "Kontakt hinzufügen",
 "Configure addressbooks" => "Adressbücher konfigurieren",
+"Select Address Books" => "Wähle Adressbuch",
+"Enter name" => "Name eingeben",
+"Enter description" => "Beschreibung eingeben",
 "CardDAV syncing addresses" => "CardDAV Sync-Adressen",
 "more info" => "mehr Info",
 "Primary address (Kontact et al)" => "primäre Adresse (für Kontact o.ä. Programme)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "CardDav-Link anzeigen",
+"Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen",
+"Download" => "Herunterladen",
+"Edit" => "Bearbeiten",
+"New Address Book" => "Neues Adressbuch",
+"Name" => "Name",
+"Description" => "Beschreibung",
+"Save" => "Speichern",
+"Cancel" => "Abbrechen",
+"More..." => "Mehr..."
 );

apps/contacts/l10n/el.php

@@ -1,39 +1,43 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
-"There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
-"Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
-"At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
-"Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Error adding contact property." => "Σφάλμα προσθήκης ιδιότητας επαφής.",
-"No ID provided" => "Δε δώθηκε ID",
+"id is not set." => "δεν ορίστηκε id",
+"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
+"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
+"No ID provided" => "Δε δόθηκε ID",
 "Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
 "No categories selected for deletion." => "Δε επελέγησαν κατηγορίες για διαγραφή",
 "No address books found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
 "No contacts found." => "Δεν βρέθηκαν επαφές",
+"There was an error adding the contact." => "Σφάλμα κατά την προσθήκη επαφής.",
+"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
+"Could not parse contact: " => "Δε αναγνώστηκε η επαφή",
+"Cannot add empty property." => "Αδύνατη προσθήκη κενής ιδιότητας.",
+"At least one of the address fields has to be filled out." => "Πρέπει να συμπληρωθεί τουλάχιστον ένα από τα παιδία διεύθυνσης.",
+"Trying to add duplicate property: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
+"Error adding contact property: " => "Σφάλμα στη προσθήκη ιδιότητας επαφής",
+"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
+"Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Missing ID" => "Λείπει ID",
 "Error parsing VCard for ID: \"" => "Σφάλμα κατά την ανάγνωση του VCard για το ID:\"",
-"Cannot add addressbook with an empty name." => "Δε μπορεί να προστεθεί βιβλίο διευθύνσεων με κενό όνομα",
-"Error adding addressbook." => "Σφάλμα προσθήκης βιβλίου διευθύνσεων.",
-"Error activating addressbook." => "Σφάλμα ενεργοποίησης βιβλίου διευθύνσεων",
+"checksum is not set." => "δε ορίστηκε checksum ",
+"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα: ",
+"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο. ",
+"Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
 "No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
 "Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
 "Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
 "The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
-"id is not set." => "δεν ορίστηκε id",
-"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
-"Error deleting contact property." => "Σφάλμα διαγραφής ιδιότητας επαφής.",
 "Contact ID is missing." => "Λείπει ID επαφής",
-"Missing contact id." => "Απουσιαζει ID επαφής",
 "No photo path was submitted." => "Δε δόθηκε διαδρομή εικόνας",
 "File doesn't exist:" => "Το αρχείο δεν υπάρχει:",
 "Error loading image." => "Σφάλμα φόρτωσης εικόνας",
-"element name is not set." => "δεν ορίστηκε όνομα στοιχείου",
-"checksum is not set." => "δε ορίστηκε checksum ",
-"Information about vCard is incorrect. Please reload the page: " => "Οι πληροφορίες για τη vCard είναι λανθασμένες.Παρακαλώ ξαναφορτώστε τη σελίδα:",
-"Something went FUBAR. " => "Κάτι χάθηκε στο άγνωστο",
-"Error updating contact property." => "Σφάλμα ενημέρωσης ιδιότητας επαφής.",
-"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
-"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
+"Error getting contact object." => "Σφάλμα κατά τη λήψη αντικειμένου επαφής",
+"Error getting PHOTO property." => "Σφάλμα κατά τη λήψη ιδιοτήτων ΦΩΤΟΓΡΑΦΙΑΣ.",
+"Error saving contact." => "Σφάλμα κατά την αποθήκευση επαφής.",
+"Error resizing image" => "Σφάλμα κατά την αλλαγή μεγέθους εικόνας",
+"Error cropping image" => "Σφάλμα κατά την περικοπή εικόνας",
+"Error creating temporary image" => "Σφάλμα κατά την δημιουργία προσωρινής εικόνας",
+"Error finding image: " => "Σφάλμα κατά την εύρεση της εικόνας: ",
 "Error uploading contacts to storage." => "Σφάλμα κατά την αποθήκευση επαφών",
 "There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο ανέβηκε με επιτυχία ",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Το μέγεθος του αρχείου ξεπερνάει το upload_max_filesize του php.ini",
@@ -41,9 +45,25 @@
 "The uploaded file was only partially uploaded" => "Το αρχείο ανέβηκε μερικώς",
 "No file was uploaded" => "Δεν ανέβηκε κάποιο αρχείο",
 "Missing a temporary folder" => "Λείπει ο προσωρινός φάκελος",
+"Couldn't save temporary image: " => "Δεν ήταν δυνατή η αποθήκευση της προσωρινής εικόνας: ",
+"Couldn't load temporary image: " => "Δεν ήταν δυνατή η φόρτωση της προσωρινής εικόνας: ",
+"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
 "Contacts" => "Επαφές",
-"Drop a VCF file to import contacts." => "Εισάγεται ένα VCF αρχείο για εισαγωγή επαφών",
-"Addressbook not found." => "Δε βρέθηκε βιβλίο διευθύνσεων",
+"Sorry, this functionality has not been implemented yet" => "Λυπούμαστε, αυτή η λειτουργία δεν έχει υλοποιηθεί ακόμα",
+"Not implemented" => "Δεν έχει υλοποιηθεί",
+"Couldn't get a valid address." => "Αδυναμία λήψης έγκυρης διεύθυνσης",
+"Error" => "Σφάλμα",
+"This property has to be non-empty." => "Το πεδίο δεν πρέπει να είναι άδειο.",
+"Couldn't serialize elements." => "Αδύνατο να μπουν σε σειρά τα στοιχεία",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "το 'deleteProperty' καλέστηκε χωρίς  without type argument. Παρακαλώ αναφέρατε στο bugs.owncloud.org",
+"Edit name" => "Αλλαγή ονόματος",
+"No files selected for upload." => "Δεν επιλέχτηκαν αρχεία για μεταφόρτωση",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Το αρχείο που προσπαθείτε να ανεβάσετε υπερβαίνει το μέγιστο μέγεθος για τις προσθήκες αρχείων σε αυτόν τον server.",
+"Select type" => "Επιλογή τύπου",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Κάποιες επαφές σημειώθηκαν προς διαγραφή,δεν έχουν διαγραφεί ακόμα. Παρακαλώ περιμένετε μέχρι να διαγραφούν.",
+"Result: " => "Αποτέλεσμα: ",
+" imported, " => " εισάγεται,",
+" failed." => " απέτυχε.",
 "This is not your addressbook." => "Αυτό δεν είναι το βιβλίο διευθύνσεων σας.",
 "Contact could not be found." => "Η επαφή δεν μπόρεσε να βρεθεί.",
 "Address" => "Διεύθυνση",
@@ -55,30 +75,55 @@
 "Mobile" => "Κινητό",
 "Text" => "Κείμενο",
 "Voice" => "Ομιλία",
-"Message" => "Μήνυμα ",
+"Message" => "Μήνυμα",
 "Fax" => "Φαξ",
 "Video" => "Βίντεο",
 "Pager" => "Βομβητής",
 "Internet" => "Διαδίκτυο",
+"Birthday" => "Γενέθλια",
+"Business" => "Επιχείρηση",
+"Call" => "Κάλεσε",
+"Clients" => "Πελάτες",
+"Deliverer" => "Προμηθευτής",
+"Holidays" => "Διακοπές",
+"Ideas" => "Ιδέες",
+"Journey" => "Ταξίδι",
+"Jubilee" => "Ιωβηλαίο",
+"Meeting" => "Συνάντηση",
+"Other" => "Άλλο",
+"Personal" => "Προσωπικό",
+"Projects" => "Έργα",
+"Questions" => "Ερωτήσεις",
 "{name}'s Birthday" => "{name} έχει Γενέθλια",
 "Contact" => "Επαφή",
 "Add Contact" => "Προσθήκη επαφής",
+"Import" => "Εισαγωγή",
+"Settings" => "Ρυθμίσεις",
 "Addressbooks" => "Βιβλία διευθύνσεων",
-"Configure Address Books" => "Ρυθμίστε το βιβλίο διευθύνσεων ",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"Import from VCF" => "Εισαγωγή από VCF αρχείο",
-"CardDav Link" => "Σύνδεσμος CardDav",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
-"Download contact" => "Λήψη επαφής",
-"Delete contact" => "Διαγραφή επαφής",
+"Close" => "Κλείσιμο  ",
+"Keyboard shortcuts" => "Συντομεύσεις πλητρολογίου",
+"Navigation" => "Πλοήγηση",
+"Next contact in list" => "Επόμενη επαφή στη λίστα",
+"Previous contact in list" => "Προηγούμενη επαφή στη λίστα",
+"Expand/collapse current addressbook" => "Ανάπτυξη/σύμπτυξη τρέχοντος βιβλίου διευθύνσεων",
+"Actions" => "Ενέργειες",
+"Refresh contacts list" => "Ανανέωσε τη λίστα επαφών",
+"Add new contact" => "Προσθήκη νέας επαφής",
+"Add new addressbook" => "Προσθήκη νέου βιβλίου επαφών",
+"Delete current contact" => "Διαγραφή τρέχουσας επαφής",
 "Drop photo to upload" => "Ρίξε μια φωτογραφία για ανέβασμα",
+"Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
+"Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
+"Upload new photo" => "Ανέβασε νέα φωτογραφία",
+"Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Όνομα, Επώνυμο, Αντίστροφο ή Αντίστροφο με κόμμα",
 "Edit name details" => "Αλλάξτε τις λεπτομέρειες ονόματος",
+"Delete" => "Διαγραφή",
 "Nickname" => "Παρατσούκλι",
-"Enter nickname" => "Εισάγεται παρατσούκλι",
-"Birthday" => "Γενέθλια",
+"Enter nickname" => "Εισάγετε παρατσούκλι",
+"Web site" => "Ιστότοπος",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Πήγαινε στον ιστότοπο",
 "dd-mm-yyyy" => "ΗΗ-ΜΜ-ΕΕΕΕ",
 "Groups" => "Ομάδες",
 "Separate groups with commas" => "Διαχώρισε τις ομάδες με κόμμα ",
@@ -94,24 +139,24 @@
 "Edit address details" => "Επεξεργασία λεπτομερειών διεύθυνσης",
 "Add notes here." => "Πρόσθεσε τις σημειώσεις εδώ",
 "Add field" => "Προσθήκη πεδίου",
-"Profile picture" => "Φωτογραφία προφίλ",
 "Phone" => "Τηλέφωνο",
 "Note" => "Σημείωση",
-"Delete current photo" => "Διαγραφή τρέχουσας φωτογραφίας",
-"Edit current photo" => "Επεξεργασία τρέχουσας φωτογραφίας",
-"Upload new photo" => "Ανέβασε νέα φωτογραφία",
-"Select photo from ownCloud" => "Επέλεξε φωτογραφία από το ownCloud",
+"Download contact" => "Λήψη επαφής",
+"Delete contact" => "Διαγραφή επαφής",
+"The temporary image has been removed from cache." => "Η προσωρινή εικόνα αφαιρέθηκε από την κρυφή μνήμη.",
 "Edit address" => "Επεξεργασία διεύθυνσης",
 "Type" => "Τύπος",
 "PO Box" => "Ταχ. Θυρίδα",
+"Street address" => "Διεύθυνση οδού",
+"Street and number" => "Οδός και αριθμός",
 "Extended" => "Εκτεταμένη",
-"Street" => "Οδός",
+"Apartment number etc." => "Αριθμός διαμερίσματος",
 "City" => "Πόλη",
 "Region" => "Περιοχή",
+"E.g. state or province" => "Π.χ. Πολιτεία ή επαρχεία",
 "Zipcode" => "Τ.Κ.",
+"Postal code" => "Ταχυδρομικός Κωδικός",
 "Country" => "Χώρα",
-"Edit categories" => "Επεξεργασία κατηγορίας",
-"Add" => "Προσθήκη",
 "Addressbook" => "Βιβλίο διευθύνσεων",
 "Hon. prefixes" => "προθέματα",
 "Miss" => "Δις",
@@ -132,26 +177,27 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Νέο βιβλίο διευθύνσεων",
-"Edit Addressbook" => "Επεξεργασία βιβλίου διευθύνσεων",
-"Displayname" => "Προβαλόμενο όνομα",
-"Active" => "Ενεργό",
-"Save" => "Αποθήκευση",
-"Submit" => "Καταχώρηση",
-"Cancel" => "Ακύρωση",
 "Import a contacts file" => "Εισαγωγή αρχείου επαφών",
 "Please choose the addressbook" => "Παρακαλώ επέλεξε βιβλίο διευθύνσεων",
 "create a new addressbook" => "Δημιουργία νέου βιβλίου διευθύνσεων",
 "Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
-"Import" => "Εισαγωγή",
 "Importing contacts" => "Εισαγωγή επαφών",
-"Select address book to import to:" => "Επέλεξε σε ποιο βιβλίο διευθύνσεων για εισαγωγή:",
-"Select from HD" => "Επιλογή από HD",
 "You have no contacts in your addressbook." => "Δεν έχεις επαφές στο βιβλίο διευθύνσεων",
 "Add contact" => "Προσθήκη επαφής",
 "Configure addressbooks" => "Ρύθμισε το βιβλίο διευθύνσεων",
+"Select Address Books" => "Επέλεξε βιβλίο διευθύνσεων",
+"Enter name" => "Εισαγωγή ονόματος",
+"Enter description" => "Εισαγωγή περιγραφής",
 "CardDAV syncing addresses" => "συγχρονισμός διευθύνσεων μέσω CardDAV ",
 "more info" => "περισσότερες πληροφορίες",
 "Primary address (Kontact et al)" => "Κύρια διεύθυνση",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Λήψη",
+"Edit" => "Επεξεργασία",
+"New Address Book" => "Νέο βιβλίο διευθύνσεων",
+"Name" => "Όνομα",
+"Description" => "Περιγραφή",
+"Save" => "Αποθήκευση",
+"Cancel" => "Ακύρωση",
+"More..." => "Περισσότερα..."
 );

apps/contacts/l10n/eo.php

@@ -1,46 +1,63 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Eraro dum (mal)aktivigo de adresaro.",
-"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
-"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
-"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
-"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
-"Error adding contact property." => "Eraro dum aldono de kontaktopropraĵo.",
+"id is not set." => "identigilo ne agordiĝis.",
+"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
+"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
 "No ID provided" => "Neniu identigilo proviziĝis.",
 "Error setting checksum." => "Eraro dum agordado de kontrolsumo.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigi.",
 "No address books found." => "Neniu adresaro troviĝis.",
 "No contacts found." => "Neniu kontakto troviĝis.",
-"Missing ID" => "Mankas identigilo",
-"Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
-"Cannot add addressbook with an empty name." => "Ne eblas aldoni adresaron kun malplena nomo.",
-"Error adding addressbook." => "Eraro dum aldono de adresaro.",
-"Error activating addressbook." => "Eraro dum aktivigo de adresaro.",
-"No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
-"Error reading contact photo." => "Eraro dum lego de kontakta foto.",
-"Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
-"The loading photo is not valid." => "La alŝutata foto ne validas.",
-"id is not set." => "identigilo ne agordiĝis.",
+"There was an error adding the contact." => "Eraro okazis dum aldono de kontakto.",
+"element name is not set." => "eronomo ne agordiĝis.",
+"Cannot add empty property." => "Ne eblas aldoni malplenan propraĵon.",
+"At least one of the address fields has to be filled out." => "Almenaŭ unu el la adreskampoj necesas pleniĝi.",
+"Trying to add duplicate property: " => "Provante aldoni duobligitan propraĵon:",
+"Error adding contact property: " => "Eraro aldonante kontakta propraĵo:",
 "Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
 "Error deleting contact property." => "Eraro dum forigo de kontaktopropraĵo.",
-"Contact ID is missing." => "Kontaktidentigilo mankas.",
-"Missing contact id." => "Mankas kontaktidentigilo.",
-"No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
-"File doesn't exist:" => "Dosiero ne ekzistas:",
-"Error loading image." => "Eraro dum ŝargado de bildo.",
-"element name is not set." => "eronomo ne agordiĝis.",
+"Missing ID" => "Mankas identigilo",
+"Error parsing VCard for ID: \"" => "Eraro dum analizo de VCard por identigilo:",
 "checksum is not set." => "kontrolsumo ne agordiĝis.",
 "Information about vCard is incorrect. Please reload the page: " => "Informo pri vCard malĝustas. Bonvolu reŝargi la paĝon:",
 "Something went FUBAR. " => "Io FUBAR-is.",
 "Error updating contact property." => "Eraro dum ĝisdatigo de kontaktopropraĵo.",
-"Cannot update addressbook with an empty name." => "Ne eblas ĝisdatigi adresaron kun malplena nomo.",
-"Error updating addressbook." => "Eraro dum ĝisdatigo de adresaro.",
+"No contact ID was submitted." => "Neniu kontaktidentigilo sendiĝis.",
+"Error reading contact photo." => "Eraro dum lego de kontakta foto.",
+"Error saving temporary file." => "Eraro dum konservado de provizora dosiero.",
+"The loading photo is not valid." => "La alŝutata foto ne validas.",
+"Contact ID is missing." => "Kontaktidentigilo mankas.",
+"No photo path was submitted." => "Neniu vojo al foto sendiĝis.",
+"File doesn't exist:" => "Dosiero ne ekzistas:",
+"Error loading image." => "Eraro dum ŝargado de bildo.",
+"Error getting contact object." => "Eraro dum ekhaviĝis kontakta objekto.",
+"Error getting PHOTO property." => "Eraro dum ekhaviĝis la propraĵon PHOTO.",
+"Error saving contact." => "Eraro dum konserviĝis kontakto.",
+"Error resizing image" => "Eraro dum aligrandiĝis bildo",
+"Error cropping image" => "Eraro dum stuciĝis bildo.",
+"Error creating temporary image" => "Eraro dum kreiĝis provizora bildo.",
+"Error finding image: " => "Eraro dum serĉo de bildo: ",
+"Error uploading contacts to storage." => "Eraro dum alŝutiĝis kontaktoj al konservejo.",
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
 "The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero alŝutiĝis.",
 "Missing a temporary folder" => "Mankas provizora dosierujo.",
+"Couldn't save temporary image: " => "Ne eblis konservi provizoran bildon: ",
+"Couldn't load temporary image: " => "Ne eblis ŝargi provizoran bildon: ",
+"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
 "Contacts" => "Kontaktoj",
-"Drop a VCF file to import contacts." => "Demetu VCF-dosieron por enporti kontaktojn.",
-"Addressbook not found." => "Adresaro ne troviĝis.",
+"Sorry, this functionality has not been implemented yet" => "Pardonu, ĉi tiu funkcio ankoraŭ ne estas realigita.",
+"Not implemented" => "Ne disponebla",
+"Couldn't get a valid address." => "Ne eblis ekhavi validan adreson.",
+"Error" => "Eraro",
+"This property has to be non-empty." => "Ĉi tiu propraĵo devas ne esti malplena.",
+"Edit name" => "Redakti nomon",
+"No files selected for upload." => "Neniu dosiero elektita por alŝuto.",
+"Select type" => "Elektu tipon",
+"Result: " => "Rezulto: ",
+" imported, " => " enportoj, ",
+" failed." => "malsukcesoj.",
+"Addressbook not found: " => "Adresaro ne troviĝis:",
 "This is not your addressbook." => "Ĉi tiu ne estas via adresaro.",
 "Contact could not be found." => "Ne eblis trovi la kontakton.",
 "Address" => "Adreso",
@@ -57,25 +74,43 @@
 "Video" => "Videaĵo",
 "Pager" => "Televokilo",
 "Internet" => "Interreto",
+"Birthday" => "Naskiĝotago",
+"Business" => "Negoco",
+"Clients" => "Klientoj",
+"Ideas" => "Ideoj",
+"Meeting" => "Kunveno",
+"Other" => "Alia",
+"Personal" => "Persona",
+"Projects" => "Projektoj",
+"Questions" => "Demandoj",
 "{name}'s Birthday" => "Naskiĝtago de {name}",
 "Contact" => "Kontakto",
 "Add Contact" => "Aldoni kontakton",
+"Import" => "Enporti",
+"Settings" => "Agordo",
 "Addressbooks" => "Adresaroj",
-"Configure Address Books" => "Agordi adresarojn",
-"New Address Book" => "Nova adresaro",
-"Import from VCF" => "Enporti el VCF",
-"CardDav Link" => "CardDav-ligilo",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
-"Download contact" => "Elŝuti kontakton",
-"Delete contact" => "Forigi kontakton",
+"Close" => "Fermi",
+"Keyboard shortcuts" => "Fulmoklavoj",
+"Navigation" => "Navigado",
+"Next contact in list" => "Sekva kontakto en la listo",
+"Previous contact in list" => "Malsekva kontakto en la listo",
+"Actions" => "Agoj",
+"Add new contact" => "Aldoni novan kontakton",
+"Add new addressbook" => "Aldoni novan adresaron",
+"Delete current contact" => "Forigi la nunan kontakton",
 "Drop photo to upload" => "Demeti foton por alŝuti",
+"Delete current photo" => "Forigi nunan foton",
+"Edit current photo" => "Redakti nunan foton",
+"Upload new photo" => "Alŝuti novan foton",
+"Select photo from ownCloud" => "Elekti foton el ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Propra formo, Mallonga nomo, Longa nomo, Inversa aŭ Inversa kun komo",
 "Edit name details" => "Redakti detalojn de nomo",
+"Delete" => "Forigi",
 "Nickname" => "Kromnomo",
 "Enter nickname" => "Enigu kromnomon",
-"Birthday" => "Naskiĝotago",
+"Web site" => "TTT-ejo",
+"http://www.somesite.com" => "http://www.iuejo.com",
+"Go to web site" => "Iri al TTT-ejon",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Grupoj",
 "Separate groups with commas" => "Disigi grupojn per komoj",
@@ -91,24 +126,22 @@
 "Edit address details" => "Redakti detalojn de adreso",
 "Add notes here." => "Aldoni notojn ĉi tie.",
 "Add field" => "Aldoni kampon",
-"Profile picture" => "Profila bildo",
 "Phone" => "Telefono",
 "Note" => "Noto",
-"Delete current photo" => "Forigi nunan foton",
-"Edit current photo" => "Redakti nunan foton",
-"Upload new photo" => "Alŝuti novan foton",
-"Select photo from ownCloud" => "Elekti foton el ownCloud",
+"Download contact" => "Elŝuti kontakton",
+"Delete contact" => "Forigi kontakton",
+"The temporary image has been removed from cache." => "La provizora bildo estas forigita de la kaŝmemoro.",
 "Edit address" => "Redakti adreson",
 "Type" => "Tipo",
 "PO Box" => "Abonkesto",
+"Street address" => "Stratadreso",
+"Street and number" => "Strato kaj numero",
 "Extended" => "Etendita",
-"Street" => "Strato",
 "City" => "Urbo",
 "Region" => "Regiono",
 "Zipcode" => "Poŝtokodo",
+"Postal code" => "Poŝtkodo",
 "Country" => "Lando",
-"Edit categories" => "Redakti kategoriojn",
-"Add" => "Aldoni",
 "Addressbook" => "Adresaro",
 "Hon. prefixes" => "Honoraj antaŭmetaĵoj",
 "Miss" => "f-ino",
@@ -121,26 +154,29 @@
 "Additional names" => "Pliaj nomoj",
 "Family name" => "Familia nomo",
 "Hon. suffixes" => "Honoraj postmetaĵoj",
-"New Addressbook" => "Nova adresaro",
-"Edit Addressbook" => "Redakti adresaron",
-"Displayname" => "Montronomo",
-"Active" => "Aktiva",
-"Save" => "Konservi",
-"Submit" => "Sendi",
-"Cancel" => "Nuligi",
 "Import a contacts file" => "Enporti kontaktodosieron",
 "Please choose the addressbook" => "Bonvolu elekti adresaron",
 "create a new addressbook" => "krei novan adresaron",
 "Name of new addressbook" => "Nomo de nova adresaro",
-"Import" => "Enporti",
 "Importing contacts" => "Enportante kontaktojn",
-"Select address book to import to:" => "Elektu adresaron kien enporti:",
-"Select from HD" => "Elekti el malmoldisko",
 "You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
 "Add contact" => "Aldoni kontakton",
 "Configure addressbooks" => "Agordi adresarojn",
+"Select Address Books" => "Elektu adresarojn",
+"Enter name" => "Enigu nomon",
+"Enter description" => "Enigu priskribon",
 "CardDAV syncing addresses" => "adresoj por CardDAV-sinkronigo",
 "more info" => "pli da informo",
 "Primary address (Kontact et al)" => "Ĉefa adreso (por Kontakt kaj aliaj)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Montri CardDav-ligilon",
+"Show read-only VCF link" => "Montri nur legeblan VCF-ligilon",
+"Download" => "Elŝuti",
+"Edit" => "Redakti",
+"New Address Book" => "Nova adresaro",
+"Name" => "Nomo",
+"Description" => "Priskribo",
+"Save" => "Konservi",
+"Cancel" => "Nuligi",
+"More..." => "Pli..."
 );

apps/contacts/l10n/es.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Error al (des)activar libreta de direcciones.",
-"There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
-"Cannot add empty property." => "No se puede añadir una propiedad vacía.",
-"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
-"Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
-"Error adding contact property." => "Error al añadir una propiedad del contacto.",
+"id is not set." => "no se ha puesto ninguna ID.",
+"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
+"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
 "No ID provided" => "No se ha proporcionado una ID",
 "Error setting checksum." => "Error al establecer la suma de verificación.",
 "No categories selected for deletion." => "No se seleccionaron categorías para borrar.",
 "No address books found." => "No se encontraron libretas de direcciones.",
 "No contacts found." => "No se encontraron contactos.",
-"Missing ID" => "Falta la ID",
-"Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
-"Cannot add addressbook with an empty name." => "No se puede añadir una libreta de direcciones sin nombre",
-"Error adding addressbook." => "Error al añadir la libreta de direcciones.",
-"Error activating addressbook." => "Error al activar la libreta de direcciones.",
-"No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
-"Error reading contact photo." => "Error leyendo fotografía del contacto.",
-"Error saving temporary file." => "Error al guardar archivo temporal.",
-"The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
-"id is not set." => "no se ha puesto ninguna ID.",
+"There was an error adding the contact." => "Se ha producido un error al añadir el contacto.",
+"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"Cannot add empty property." => "No se puede añadir una propiedad vacía.",
+"At least one of the address fields has to be filled out." => "Al menos uno de los campos de direcciones se tiene que rellenar.",
+"Trying to add duplicate property: " => "Intentando añadir una propiedad duplicada: ",
 "Information about vCard is incorrect. Please reload the page." => "La información sobre el vCard es incorrecta. Por favor vuelve a cargar la página.",
 "Error deleting contact property." => "Error al borrar una propiedad del contacto.",
-"Contact ID is missing." => "Falta la ID del contacto.",
-"Missing contact id." => "Falta la id del contacto.",
-"No photo path was submitted." => "No se ha introducido la ruta de la foto.",
-"File doesn't exist:" => "Archivo inexistente:",
-"Error loading image." => "Error cargando imagen.",
-"element name is not set." => "no se ha puesto ningún nombre de elemento.",
+"Missing ID" => "Falta la ID",
+"Error parsing VCard for ID: \"" => "Error al analizar el VCard para la ID: \"",
 "checksum is not set." => "no se ha puesto ninguna suma de comprobación.",
 "Information about vCard is incorrect. Please reload the page: " => "La información sobre la vCard es incorrecta. Por favor, recarga la página:",
 "Something went FUBAR. " => "Plof. Algo ha fallado.",
 "Error updating contact property." => "Error al actualizar una propiedad del contacto.",
-"Cannot update addressbook with an empty name." => "No se puede actualizar una libreta de direcciones sin nombre.",
-"Error updating addressbook." => "Error al actualizar la libreta de direcciones.",
+"No contact ID was submitted." => "No se ha mandado ninguna ID de contacto.",
+"Error reading contact photo." => "Error leyendo fotografía del contacto.",
+"Error saving temporary file." => "Error al guardar archivo temporal.",
+"The loading photo is not valid." => "La foto que se estaba cargando no es válida.",
+"Contact ID is missing." => "Falta la ID del contacto.",
+"No photo path was submitted." => "No se ha introducido la ruta de la foto.",
+"File doesn't exist:" => "Archivo inexistente:",
+"Error loading image." => "Error cargando imagen.",
+"Error getting contact object." => "Fallo al coger el contacto.",
+"Error getting PHOTO property." => "Fallo al coger las propiedades de la foto .",
+"Error saving contact." => "Fallo al salvar un contacto",
+"Error resizing image" => "Fallo al cambiar de tamaño una foto",
+"Error cropping image" => "Fallo al cortar el tamaño de la foto",
+"Error creating temporary image" => "Fallo al crear la foto temporal",
+"Error finding image: " => "Fallo al encontrar la imagen",
 "Error uploading contacts to storage." => "Error al subir contactos al almacenamiento.",
 "There is no error, the file uploaded with success" => "No hay ningún error, el archivo se ha subido con éxito",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "El archivo subido sobrepasa la directiva upload_max_filesize de php.ini",
@@ -41,9 +43,24 @@
 "The uploaded file was only partially uploaded" => "El archivo se ha subido parcialmente",
 "No file was uploaded" => "No se ha subido ningún archivo",
 "Missing a temporary folder" => "Falta la carpeta temporal",
+"Couldn't save temporary image: " => "Fallo no pudo salvar a una imagen temporal",
+"Couldn't load temporary image: " => "Fallo no pudo cargara de una imagen temporal",
+"No file was uploaded. Unknown error" => "Fallo no se subió el fichero",
 "Contacts" => "Contactos",
-"Drop a VCF file to import contacts." => "Suelta un archivo VCF para importar contactos.",
-"Addressbook not found." => "Libreta de direcciones no encontrada.",
+"Sorry, this functionality has not been implemented yet" => "Perdón esta función no esta aún implementada",
+"Not implemented" => "No esta implementada",
+"Couldn't get a valid address." => "Fallo : no hay dirección valida",
+"Error" => "Fallo",
+"This property has to be non-empty." => "Este campo no puede estar vacío.",
+"Couldn't serialize elements." => "Fallo no podido ordenar los elementos",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "La propiedad de \"borrar\" se llamado sin argumentos envia fallos a\nbugs.owncloud.org",
+"Edit name" => "Edita el Nombre",
+"No files selected for upload." => "No hay ficheros seleccionados para subir",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "El fichero que quieres subir excede el tamaño máximo permitido en este servidor.",
+"Select type" => "Selecciona el tipo",
+"Result: " => "Resultado :",
+" imported, " => "Importado.",
+" failed." => "Fallo.",
 "This is not your addressbook." => "Esta no es tu agenda de contactos.",
 "Contact could not be found." => "No se ha podido encontrar el contacto.",
 "Address" => "Dirección",
@@ -60,25 +77,23 @@
 "Video" => "Vídeo",
 "Pager" => "Localizador",
 "Internet" => "Internet",
+"Birthday" => "Cumpleaños",
 "{name}'s Birthday" => "Cumpleaños de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Añadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Libretas de direcciones",
-"Configure Address Books" => "Configurar libretas de direcciones",
-"New Address Book" => "Nueva libreta de direcciones",
-"Import from VCF" => "Importar desde VCF",
-"CardDav Link" => "Enlace CardDav",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Borrar",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Eliminar contacto",
+"Close" => "Cierra.",
 "Drop photo to upload" => "Suelta una foto para subirla",
+"Delete current photo" => "Eliminar fotografía actual",
+"Edit current photo" => "Editar fotografía actual",
+"Upload new photo" => "Subir nueva fotografía",
+"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, nombre abreviado, nombre completo, al revés o al revés con coma",
 "Edit name details" => "Editar los detalles del nombre",
+"Delete" => "Borrar",
 "Nickname" => "Alias",
 "Enter nickname" => "Introduce un alias",
-"Birthday" => "Cumpleaños",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupos",
 "Separate groups with commas" => "Separa los grupos con comas",
@@ -94,24 +109,19 @@
 "Edit address details" => "Editar detalles de la dirección",
 "Add notes here." => "Añade notas aquí.",
 "Add field" => "Añadir campo",
-"Profile picture" => "Foto del perfil",
 "Phone" => "Teléfono",
 "Note" => "Nota",
-"Delete current photo" => "Eliminar fotografía actual",
-"Edit current photo" => "Editar fotografía actual",
-"Upload new photo" => "Subir nueva fotografía",
-"Select photo from ownCloud" => "Seleccionar fotografía desde ownCloud",
+"Download contact" => "Descargar contacto",
+"Delete contact" => "Eliminar contacto",
+"The temporary image has been removed from cache." => "La foto temporal se ha borrado del cache.",
 "Edit address" => "Editar dirección",
 "Type" => "Tipo",
 "PO Box" => "Código postal",
 "Extended" => "Extendido",
-"Street" => "Calle",
 "City" => "Ciudad",
 "Region" => "Región",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Edit categories" => "Editar categorías",
-"Add" => "Añadir",
 "Addressbook" => "Libreta de direcciones",
 "Hon. prefixes" => "Prefijos honoríficos",
 "Miss" => "Srta",
@@ -132,26 +142,21 @@
 "Esq." => "Don",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nueva libreta de direcciones",
-"Edit Addressbook" => "Editar libreta de direcciones",
-"Displayname" => "Nombre a mostrar",
-"Active" => "Activo",
-"Save" => "Guardar",
-"Submit" => "Aceptar",
-"Cancel" => "Cancelar",
 "Import a contacts file" => "Importar archivo de contactos",
 "Please choose the addressbook" => "Por favor escoge la agenda",
 "create a new addressbook" => "crear una nueva agenda",
 "Name of new addressbook" => "Nombre de la nueva agenda",
-"Import" => "Importar",
 "Importing contacts" => "Importando contactos",
-"Select address book to import to:" => "Selecciona una agenda para importar a:",
-"Select from HD" => "Seleccionar del disco duro",
 "You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
 "Add contact" => "Añadir contacto",
 "Configure addressbooks" => "Configurar agenda",
 "CardDAV syncing addresses" => "Sincronizando direcciones",
 "more info" => "más información",
 "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nueva libreta de direcciones",
+"Save" => "Guardar",
+"Cancel" => "Cancelar"
 );

apps/contacts/l10n/et_EE.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Viga aadressiraamatu (de)aktiveerimisel.",
-"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
-"Cannot add empty property." => "Tühja omadust ei saa lisada.",
-"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
-"Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
-"Error adding contact property." => "Viga konktakti korralikul lisamisel.",
+"id is not set." => "ID on määramata.",
+"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
+"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
 "No ID provided" => "ID-d pole sisestatud",
 "Error setting checksum." => "Viga kontrollsumma määramisel.",
 "No categories selected for deletion." => "Kustutamiseks pole valitud ühtegi kategooriat.",
 "No address books found." => "Ei leitud ühtegi aadressiraamatut.",
 "No contacts found." => "Ühtegi kontakti ei leitud.",
-"Missing ID" => "Puudub ID",
-"Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
-"Cannot add addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa lisada.",
-"Error adding addressbook." => "Viga aadressiraamatu lisamisel.",
-"Error activating addressbook." => "Viga aadressiraamatu aktiveerimisel.",
-"No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
-"Error reading contact photo." => "Viga kontakti foto lugemisel.",
-"Error saving temporary file." => "Viga ajutise faili salvestamisel.",
-"The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
-"id is not set." => "ID on määramata.",
+"There was an error adding the contact." => "Konktakti lisamisel tekkis viga.",
+"element name is not set." => "elemendi nime pole määratud.",
+"Cannot add empty property." => "Tühja omadust ei saa lisada.",
+"At least one of the address fields has to be filled out." => "Vähemalt üks aadressiväljadest peab olema täidetud.",
+"Trying to add duplicate property: " => "Proovitakse lisada topeltomadust: ",
 "Information about vCard is incorrect. Please reload the page." => "Visiitkaardi info pole korrektne. Palun lae leht uuesti.",
 "Error deleting contact property." => "Viga konktaki korralikul kustutamisel.",
-"Contact ID is missing." => "Kontakti ID puudub.",
-"Missing contact id." => "Puuduv kontakti ID.",
-"No photo path was submitted." => "Foto asukohta pole määratud.",
-"File doesn't exist:" => "Faili pole olemas:",
-"Error loading image." => "Viga pildi laadimisel.",
-"element name is not set." => "elemendi nime pole määratud.",
+"Missing ID" => "Puudub ID",
+"Error parsing VCard for ID: \"" => "Viga VCard-ist ID parsimisel: \"",
 "checksum is not set." => "kontrollsummat pole määratud.",
 "Information about vCard is incorrect. Please reload the page: " => "vCard info pole korrektne. Palun lae lehekülg uuesti: ",
 "Something went FUBAR. " => "Midagi läks tõsiselt metsa.",
 "Error updating contact property." => "Viga konktaki korralikul uuendamisel.",
-"Cannot update addressbook with an empty name." => "Tühja nimega aadressiraamatut ei saa uuendada.",
-"Error updating addressbook." => "Viga aadressiraamatu uuendamisel.",
+"No contact ID was submitted." => "Kontakti ID-d pole sisestatud.",
+"Error reading contact photo." => "Viga kontakti foto lugemisel.",
+"Error saving temporary file." => "Viga ajutise faili salvestamisel.",
+"The loading photo is not valid." => "Laetav pilt pole korrektne pildifail.",
+"Contact ID is missing." => "Kontakti ID puudub.",
+"No photo path was submitted." => "Foto asukohta pole määratud.",
+"File doesn't exist:" => "Faili pole olemas:",
+"Error loading image." => "Viga pildi laadimisel.",
+"Error getting contact object." => "Viga kontakti objekti hankimisel.",
+"Error getting PHOTO property." => "Viga PHOTO omaduse hankimisel.",
+"Error saving contact." => "Viga kontakti salvestamisel.",
+"Error resizing image" => "Viga pildi suuruse muutmisel",
+"Error cropping image" => "Viga pildi lõikamisel",
+"Error creating temporary image" => "Viga ajutise pildi loomisel",
+"Error finding image: " => "Viga pildi leidmisel: ",
 "Error uploading contacts to storage." => "Viga kontaktide üleslaadimisel kettale.",
 "There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Üleslaetud fail ületab php.ini failis määratud upload_max_filesize suuruse",
@@ -41,9 +43,21 @@
 "The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
 "No file was uploaded" => "Ühtegi faili ei laetud üles",
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
+"Couldn't save temporary image: " => "Ajutise pildi salvestamine ebaõnnestus: ",
+"Couldn't load temporary image: " => "Ajutise pildi laadimine ebaõnnestus: ",
+"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
 "Contacts" => "Kontaktid",
-"Drop a VCF file to import contacts." => "Lohista siia VCF-fail, millest kontakte importida.",
-"Addressbook not found." => "Aadressiraamatut ei leitud",
+"Sorry, this functionality has not been implemented yet" => "Vabandust, aga see funktsioon pole veel valmis",
+"Not implemented" => "Pole implementeeritud",
+"Couldn't get a valid address." => "Kehtiva aadressi hankimine ebaõnnestus",
+"Error" => "Viga",
+"This property has to be non-empty." => "See omadus ei tohi olla tühi.",
+"Edit name" => "Muuda nime",
+"No files selected for upload." => "Üleslaadimiseks pole faile valitud.",
+"Select type" => "Vali tüüp",
+"Result: " => "Tulemus: ",
+" imported, " => " imporditud, ",
+" failed." => " ebaõnnestus.",
 "This is not your addressbook." => "See pole sinu aadressiraamat.",
 "Contact could not be found." => "Kontakti ei leitud.",
 "Address" => "Aadress",
@@ -60,25 +74,23 @@
 "Video" => "Video",
 "Pager" => "Piipar",
 "Internet" => "Internet",
+"Birthday" => "Sünnipäev",
 "{name}'s Birthday" => "{name} sünnipäev",
 "Contact" => "Kontakt",
 "Add Contact" => "Lisa kontakt",
+"Import" => "Impordi",
 "Addressbooks" => "Aadressiraamatud",
-"Configure Address Books" => "Seadista aadressiraamatut",
-"New Address Book" => "Uus aadressiraamat",
-"Import from VCF" => "Impordi VCF-ist",
-"CardDav Link" => "CardDav link",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
-"Download contact" => "Lae kontakt alla",
-"Delete contact" => "Kustuta kontakt",
+"Close" => "Sule",
 "Drop photo to upload" => "Lohista üleslaetav foto siia",
+"Delete current photo" => "Kustuta praegune foto",
+"Edit current photo" => "Muuda praegust pilti",
+"Upload new photo" => "Lae üles uus foto",
+"Select photo from ownCloud" => "Vali foto ownCloudist",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Kohandatud vorming, Lühike nimi, Täielik nimi, vastupidine või vastupidine komadega",
 "Edit name details" => "Muuda nime üksikasju",
+"Delete" => "Kustuta",
 "Nickname" => "Hüüdnimi",
 "Enter nickname" => "Sisesta hüüdnimi",
-"Birthday" => "Sünnipäev",
 "dd-mm-yyyy" => "dd.mm.yyyy",
 "Groups" => "Grupid",
 "Separate groups with commas" => "Eralda grupid komadega",
@@ -94,24 +106,19 @@
 "Edit address details" => "Muuda aaressi infot",
 "Add notes here." => "Lisa märkmed siia.",
 "Add field" => "Lisa väli",
-"Profile picture" => "Profiili pilt",
 "Phone" => "Telefon",
 "Note" => "Märkus",
-"Delete current photo" => "Kustuta praegune foto",
-"Edit current photo" => "Muuda praegust pilti",
-"Upload new photo" => "Lae üles uus foto",
-"Select photo from ownCloud" => "Vali foto ownCloudist",
+"Download contact" => "Lae kontakt alla",
+"Delete contact" => "Kustuta kontakt",
+"The temporary image has been removed from cache." => "Ajutine pilt on puhvrist eemaldatud.",
 "Edit address" => "Muuda aadressi",
 "Type" => "Tüüp",
 "PO Box" => "Postkontori postkast",
 "Extended" => "Laiendatud",
-"Street" => "Tänav",
 "City" => "Linn",
 "Region" => "Piirkond",
 "Zipcode" => "Postiindeks",
 "Country" => "Riik",
-"Edit categories" => "Muuda kategooriat",
-"Add" => "Lisa",
 "Addressbook" => "Aadressiraamat",
 "Hon. prefixes" => "Eesliited",
 "Miss" => "Preili",
@@ -132,26 +139,21 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Senior.",
-"New Addressbook" => "Uus aadressiraamat",
-"Edit Addressbook" => "Muuda aadressiraamatut",
-"Displayname" => "Näidatav nimi",
-"Active" => "Aktiivne",
-"Save" => "Salvesta",
-"Submit" => "Saada",
-"Cancel" => "Loobu",
 "Import a contacts file" => "Impordi kontaktifail",
 "Please choose the addressbook" => "Palun vali aadressiraamat",
 "create a new addressbook" => "loo uus aadressiraamat",
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
-"Import" => "Impordi",
 "Importing contacts" => "Kontaktide importimine",
-"Select address book to import to:" => "Vali aadressiraamat, millesse importida:",
-"Select from HD" => "Vali kõvakettalt",
 "You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
 "Add contact" => "Lisa kontakt",
 "Configure addressbooks" => "Seadista aadressiraamatuid",
 "CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
 "more info" => "lisainfo",
 "Primary address (Kontact et al)" => "Peamine aadress",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Lae alla",
+"Edit" => "Muuda",
+"New Address Book" => "Uus aadressiraamat",
+"Save" => "Salvesta",
+"Cancel" => "Loobu"
 );

apps/contacts/l10n/eu.php

@@ -1,36 +1,67 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Errore bat egon da helbide-liburua (des)gaitzen",
-"There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
-"Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
-"At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
-"Error adding contact property." => "Errorea kontaktu propietatea gehitzean.",
+"id is not set." => "IDa ez da ezarri.",
+"Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
+"Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
 "No ID provided" => "Ez da IDrik eman",
+"Error setting checksum." => "Errorea kontrol-batura ezartzean.",
 "No categories selected for deletion." => "Ez dira ezabatzeko kategoriak hautatu.",
 "No address books found." => "Ez da helbide libururik aurkitu.",
 "No contacts found." => "Ez da kontakturik aurkitu.",
-"Missing ID" => "ID falta da",
-"Error adding addressbook." => "Errore bat egon da helbide liburua gehitzean.",
-"Error activating addressbook." => "Errore bat egon da helbide-liburua aktibatzen.",
-"Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
-"The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
-"id is not set." => "IDa ez da ezarri.",
+"There was an error adding the contact." => "Errore bat egon da kontaktua gehitzerakoan",
+"element name is not set." => "elementuaren izena ez da ezarri.",
+"Could not parse contact: " => "Ezin izan da kontaktua analizatu:",
+"Cannot add empty property." => "Ezin da propieta hutsa gehitu.",
+"At least one of the address fields has to be filled out." => "Behintzat helbide eremuetako bat bete behar da.",
+"Trying to add duplicate property: " => "Propietate bikoiztuta gehitzen saiatzen ari zara:",
+"Error adding contact property: " => "Errore bat egon da kontaktuaren propietatea gehitzean:",
 "Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
 "Error deleting contact property." => "Errorea kontaktu propietatea ezabatzean.",
+"Missing ID" => "ID falta da",
+"Error parsing VCard for ID: \"" => "Errorea VCard analizatzean hurrengo IDrako: \"",
+"checksum is not set." => "Kontrol-batura ezarri gabe dago.",
+"Information about vCard is incorrect. Please reload the page: " => "vCard honen informazioa ez da zuzena.Mezedez birkargatu orria:",
+"Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
+"No contact ID was submitted." => "Ez da kontaktuaren IDrik eman.",
+"Error reading contact photo." => "Errore bat izan da kontaktuaren argazkia igotzerakoan.",
+"Error saving temporary file." => "Errore bat izan da aldi bateko fitxategia gordetzerakoan.",
+"The loading photo is not valid." => "Kargatzen ari den argazkia ez da egokia.",
 "Contact ID is missing." => "Kontaktuaren IDa falta da.",
-"Missing contact id." => "Kontaktuaren IDa falta da.",
+"No photo path was submitted." => "Ez da argazkiaren bide-izenik eman.",
 "File doesn't exist:" => "Fitxategia ez da existitzen:",
 "Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
-"element name is not set." => "elementuaren izena ez da ezarri.",
-"Error updating contact property." => "Errorea kontaktu propietatea eguneratzean.",
-"Cannot update addressbook with an empty name." => "Ezin da helbide liburua eguneratu izen huts batekin.",
-"Error updating addressbook." => "Errore bat egon da helbide liburua eguneratzen.",
+"Error getting contact object." => "Errore bat izan da kontaktu objetua lortzean.",
+"Error getting PHOTO property." => "Errore bat izan da PHOTO propietatea lortzean.",
+"Error saving contact." => "Errore bat izan da kontaktua gordetzean.",
+"Error resizing image" => "Errore bat izan da irudiaren tamaina aldatzean",
+"Error cropping image" => "Errore bat izan da irudia mozten",
+"Error creating temporary image" => "Errore bat izan da aldi bateko irudia sortzen",
+"Error finding image: " => "Ezin izan da irudia aurkitu:",
 "Error uploading contacts to storage." => "Errore bat egon da kontaktuak biltegira igotzerakoan.",
 "There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Igotako fitxategia php.ini fitxategiko upload_max_filesize direktiba baino handiagoa da",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
 "No file was uploaded" => "Ez da fitxategirik igo",
+"Missing a temporary folder" => "Aldi bateko karpeta falta da",
+"Couldn't save temporary image: " => "Ezin izan da aldi bateko irudia gorde:",
+"Couldn't load temporary image: " => "Ezin izan da aldi bateko irudia kargatu:",
+"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
 "Contacts" => "Kontaktuak",
-"Drop a VCF file to import contacts." => "Askatu VCF fitxategia kontaktuak inportatzeko.",
-"Addressbook not found." => "Helbide liburua ez da aurkitu",
+"Sorry, this functionality has not been implemented yet" => "Barkatu, aukera hau ez da oriandik inplementatu",
+"Not implemented" => "Inplementatu gabe",
+"Couldn't get a valid address." => "Ezin izan da eposta baliagarri bat hartu.",
+"Error" => "Errorea",
+"This property has to be non-empty." => "Propietate hau ezin da hutsik egon.",
+"Couldn't serialize elements." => "Ezin izan dira elementuak serializatu.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' argumenturik gabe deitu da. Mezedez abisatu bugs.owncloud.org-en",
+"Edit name" => "Editatu izena",
+"No files selected for upload." => "Ez duzu igotzeko fitxategirik hautatu.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Igo nahi duzun fitxategia zerbitzariak onartzen duen tamaina baino handiagoa da.",
+"Select type" => "Hautatu mota",
+"Result: " => "Emaitza:",
+" imported, " => " inportatua, ",
+" failed." => "huts egin du.",
 "This is not your addressbook." => "Hau ez da zure helbide liburua.",
 "Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
 "Address" => "Helbidea",
@@ -47,24 +78,46 @@
 "Video" => "Bideoa",
 "Pager" => "Bilagailua",
 "Internet" => "Internet",
+"Birthday" => "Jaioteguna",
+"Call" => "Deia",
+"Clients" => "Bezeroak",
+"Holidays" => "Oporrak",
+"Ideas" => "Ideiak",
+"Journey" => "Bidaia",
+"Meeting" => "Bilera",
+"Other" => "Bestelakoa",
+"Personal" => "Pertsonala",
+"Projects" => "Proiektuak",
+"Questions" => "Galderak",
 "{name}'s Birthday" => "{name}ren jaioteguna",
 "Contact" => "Kontaktua",
 "Add Contact" => "Gehitu kontaktua",
+"Import" => "Inportatu",
+"Settings" => "Ezarpenak",
 "Addressbooks" => "Helbide Liburuak",
-"Configure Address Books" => "Konfiguratu Helbide Liburuak",
-"New Address Book" => "Helbide-liburu berria",
-"Import from VCF" => "VCFtik inportatu",
-"CardDav Link" => "CardDav lotura",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
-"Download contact" => "Deskargatu kontaktua",
-"Delete contact" => "Ezabatu kontaktua",
+"Close" => "Itxi",
+"Keyboard shortcuts" => "Teklatuaren lasterbideak",
+"Navigation" => "Nabigazioa",
+"Next contact in list" => "Hurrengoa kontaktua zerrendan",
+"Previous contact in list" => "Aurreko kontaktua zerrendan",
+"Expand/collapse current addressbook" => "Zabaldu/tolestu uneko helbide-liburua",
+"Actions" => "Ekintzak",
+"Refresh contacts list" => "Gaurkotu kontaktuen zerrenda",
+"Add new contact" => "Gehitu kontaktu berria",
+"Add new addressbook" => "Gehitu helbide-liburu berria",
+"Delete current contact" => "Ezabatu uneko kontaktuak",
 "Drop photo to upload" => "Askatu argazkia igotzeko",
+"Delete current photo" => "Ezabatu oraingo argazkia",
+"Edit current photo" => "Editatu oraingo argazkia",
+"Upload new photo" => "Igo argazki berria",
+"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
 "Edit name details" => "Editatu izenaren zehaztasunak",
+"Delete" => "Ezabatu",
 "Nickname" => "Ezizena",
 "Enter nickname" => "Sartu ezizena",
-"Birthday" => "Jaioteguna",
+"Web site" => "Web orria",
+"http://www.somesite.com" => "http://www.webgunea.com",
+"Go to web site" => "Web orrira joan",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Taldeak",
 "Separate groups with commas" => "Banatu taldeak komekin",
@@ -80,45 +133,42 @@
 "Edit address details" => "Editatu helbidearen zehaztasunak",
 "Add notes here." => "Gehitu oharrak hemen.",
 "Add field" => "Gehitu eremua",
-"Profile picture" => "Profilaren irudia",
 "Phone" => "Telefonoa",
 "Note" => "Oharra",
-"Delete current photo" => "Ezabatu oraingo argazkia",
-"Edit current photo" => "Editatu oraingo argazkia",
-"Upload new photo" => "Igo argazki berria",
-"Select photo from ownCloud" => "Hautatu argazki bat ownCloudetik",
+"Download contact" => "Deskargatu kontaktua",
+"Delete contact" => "Ezabatu kontaktua",
+"The temporary image has been removed from cache." => "Aldi bateko irudia cachetik ezabatu da.",
 "Edit address" => "Editatu helbidea",
 "Type" => "Mota",
 "PO Box" => "Posta kutxa",
+"Street address" => "Kalearen helbidea",
+"Street and number" => "Kalea eta zenbakia",
 "Extended" => "Hedatua",
-"Street" => "Kalea",
+"Apartment number etc." => "Etxe zenbakia eab.",
 "City" => "Hiria",
 "Region" => "Eskualdea",
 "Zipcode" => "Posta kodea",
+"Postal code" => "Posta kodea",
 "Country" => "Herrialdea",
-"Edit categories" => "Editatu kategoriak",
-"Add" => "Gehitu",
 "Addressbook" => "Helbide-liburua",
-"New Addressbook" => "Helbide-liburu berria",
-"Edit Addressbook" => "Editatu helbide-liburua",
-"Displayname" => "Bistaratzeko izena",
-"Active" => "Aktibo",
-"Save" => "Gorde",
-"Submit" => "Bidali",
-"Cancel" => "Ezeztatu",
 "Import a contacts file" => "Inporatu kontaktuen fitxategia",
 "Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
 "create a new addressbook" => "sortu helbide liburu berria",
 "Name of new addressbook" => "Helbide liburuaren izena",
-"Import" => "Inportatu",
 "Importing contacts" => "Kontaktuak inportatzen",
-"Select address book to import to:" => "Hautau helburuko helbide liburua:",
-"Select from HD" => "Hautatu disko gogorretik",
 "You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
 "Add contact" => "Gehitu kontaktua",
 "Configure addressbooks" => "Konfiguratu helbide liburuak",
+"Select Address Books" => "Hautatu helbide-liburuak",
+"Enter name" => "Sartu izena",
+"Enter description" => "Sartu deskribapena",
 "CardDAV syncing addresses" => "CardDAV sinkronizazio helbideak",
 "more info" => "informazio gehiago",
 "Primary address (Kontact et al)" => "Helbide nagusia",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Deskargatu",
+"Edit" => "Editatu",
+"New Address Book" => "Helbide-liburu berria",
+"Save" => "Gorde",
+"Cancel" => "Ezeztatu"
 );

apps/contacts/l10n/fa.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
-"There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
-"Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
-"At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
-"Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
-"Error adding contact property." => "خطا درهنگام افزودن ویژگی",
+"id is not set." => "شناسه تعیین نشده",
+"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
+"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
 "No ID provided" => "هیچ شناسه ای ارائه نشده",
 "Error setting checksum." => "خطا در تنظیم checksum",
 "No categories selected for deletion." => "هیچ گروهی برای حذف شدن در نظر گرفته نشده",
 "No address books found." => "هیچ کتابچه نشانی پیدا نشد",
 "No contacts found." => "هیچ شخصی پیدا نشد",
-"Missing ID" => "نشانی گم شده",
-"Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
-"Cannot add addressbook with an empty name." => "نمیتوانید یک نام خالی را به کتابچه نشانی ها افزود",
-"Error adding addressbook." => "خطا درهنگام افزودن کتابچه نشانی ها",
-"Error activating addressbook." => "خطا درهنگام فعال سازیکتابچه نشانی ها",
-"No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
-"Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
-"Error saving temporary file." => "خطا در ذخیره پرونده موقت",
-"The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"id is not set." => "شناسه تعیین نشده",
+"There was an error adding the contact." => "یک خطا در افزودن اطلاعات شخص مورد نظر",
+"element name is not set." => "نام اصلی تنظیم نشده است",
+"Cannot add empty property." => "نمیتوان یک  خاصیت خالی ایجاد کرد",
+"At least one of the address fields has to be filled out." => "At least one of the address fields has to be filled out. ",
+"Trying to add duplicate property: " => "امتحان کردن برای وارد کردن مشخصات تکراری",
 "Information about vCard is incorrect. Please reload the page." => "اطلاعات درمورد vCard شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
 "Error deleting contact property." => "خطا در هنگام پاک کرد ویژگی",
-"Contact ID is missing." => "اطلاعات شناسه گم شده",
-"Missing contact id." => "شما اطلاعات شناسه را فراموش کرده اید",
-"No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
-"File doesn't exist:" => "پرونده وجود ندارد",
-"Error loading image." => "خطا در بارگزاری تصویر",
-"element name is not set." => "نام اصلی تنظیم نشده است",
+"Missing ID" => "نشانی گم شده",
+"Error parsing VCard for ID: \"" => "خطا در تجزیه کارت ویزا برای شناسه:",
 "checksum is not set." => "checksum تنظیم شده نیست",
 "Information about vCard is incorrect. Please reload the page: " => "اطلاعات کارت ویزا شما غلط است لطفا صفحه را دوباره بارگزاری کنید",
 "Something went FUBAR. " => "چند چیز به FUBAR رفتند",
 "Error updating contact property." => "خطا در هنگام بروزرسانی  اطلاعات شخص مورد نظر",
-"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
-"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
+"No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
+"Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
+"Error saving temporary file." => "خطا در ذخیره پرونده موقت",
+"The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
+"Contact ID is missing." => "اطلاعات شناسه گم شده",
+"No photo path was submitted." => "هیچ نشانی از تصویرارسال نشده",
+"File doesn't exist:" => "پرونده وجود ندارد",
+"Error loading image." => "خطا در بارگزاری تصویر",
+"Error getting contact object." => "خطا در گرفتن اطلاعات شخص",
+"Error getting PHOTO property." => "خطا در دربافت تصویر ویژگی شخصی",
+"Error saving contact." => "خطا در ذخیره سازی اطلاعات",
+"Error resizing image" => "خطا در تغییر دادن اندازه تصویر",
+"Error cropping image" => "خطا در برداشت تصویر",
+"Error creating temporary image" => "خطا در ساخت تصویر  temporary",
+"Error finding image: " => "خطا در پیدا کردن تصویر:",
 "Error uploading contacts to storage." => "خطا در هنگام بارگذاری و ذخیره سازی",
 "There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "حجم آپلود از طریق Php.ini تعیین می شود",
@@ -41,9 +43,24 @@
 "The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
 "No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
 "Missing a temporary folder" => "یک پوشه موقت گم شده",
+"Couldn't save temporary image: " => "قابلیت ذخیره تصویر  موقت وجود ندارد:",
+"Couldn't load temporary image: " => "قابلیت بارگذاری تصویر  موقت وجود ندارد:",
+"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
 "Contacts" => "اشخاص",
-"Drop a VCF file to import contacts." => "یک پرونده VCF را به اینجا بکشید تا اشخاص افزوده شوند",
-"Addressbook not found." => "کتابچه نشانی ها یافت نشد",
+"Sorry, this functionality has not been implemented yet" => "با عرض پوزش،این قابلیت هنوز اجرا نشده است",
+"Not implemented" => "انجام نشد",
+"Couldn't get a valid address." => "Couldn't get a valid address.",
+"Error" => "خطا",
+"This property has to be non-empty." => "این ویژگی باید به صورت غیر تهی عمل کند",
+"Couldn't serialize elements." => "قابلیت مرتب سازی عناصر وجود ندارد",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "پاک کردن ویژگی بدون استدلال انجام شده.لطفا این مورد را گزارش دهید:bugs.owncloud.org",
+"Edit name" => "نام تغییر",
+"No files selected for upload." => "هیچ فایلی برای آپلود انتخاب نشده است",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "حجم فایل بسیار بیشتر از حجم تنظیم شده در تنظیمات سرور است",
+"Select type" => "نوع را انتخاب کنید",
+"Result: " => "نتیجه:",
+" imported, " => "وارد شد،",
+" failed." => "ناموفق",
 "This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
 "Contact could not be found." => "اتصال ویا تماسی یافت نشد",
 "Address" => "نشانی",
@@ -60,25 +77,23 @@
 "Video" => "رسانه تصویری",
 "Pager" => "صفحه",
 "Internet" => "اینترنت",
+"Birthday" => "روزتولد",
 "{name}'s Birthday" => "روز تولد {name} است",
 "Contact" => "اشخاص",
 "Add Contact" => "افزودن اطلاعات شخص مورد نظر",
+"Import" => "وارد کردن",
 "Addressbooks" => "کتابچه ی نشانی ها",
-"Configure Address Books" => "پیکر بندی کتابچه نشانی ها",
-"New Address Book" => "کتابچه نشانه های جدید",
-"Import from VCF" => "وارد شده از VCF",
-"CardDav Link" => "CardDav Link",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"Delete" => "پاک کردن",
-"Download contact" => "دانلود مشخصات اشخاص",
-"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
+"Close" => "بستن",
 "Drop photo to upload" => "تصویر را به اینجا بکشید تا بار گذازی شود",
+"Delete current photo" => "پاک کردن تصویر کنونی",
+"Edit current photo" => "ویرایش تصویر کنونی",
+"Upload new photo" => "بار گذاری یک تصویر جدید",
+"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Format custom, Short name, Full name, Reverse or Reverse with comma",
 "Edit name details" => "ویرایش نام جزئیات",
+"Delete" => "پاک کردن",
 "Nickname" => "نام مستعار",
 "Enter nickname" => "یک نام مستعار وارد کنید",
-"Birthday" => "روزتولد",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "گروه ها",
 "Separate groups with commas" => "جدا کردن گروه ها به وسیله درنگ نما",
@@ -94,24 +109,19 @@
 "Edit address details" => "ویرایش جزئیات نشانی ها",
 "Add notes here." => "اینجا یادداشت ها را بیافزایید",
 "Add field" => "اضافه کردن فیلد",
-"Profile picture" => "تصویر پروفایل",
 "Phone" => "شماره تلفن",
 "Note" => "یادداشت",
-"Delete current photo" => "پاک کردن تصویر کنونی",
-"Edit current photo" => "ویرایش تصویر کنونی",
-"Upload new photo" => "بار گذاری یک تصویر جدید",
-"Select photo from ownCloud" => "انتخاب یک تصویر از ابر های شما",
+"Download contact" => "دانلود مشخصات اشخاص",
+"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
+"The temporary image has been removed from cache." => "تصویر موقت از کش پاک شد.",
 "Edit address" => "ویرایش نشانی",
 "Type" => "نوع",
 "PO Box" => "صندوق پستی",
 "Extended" => "تمدید شده",
-"Street" => "خیابان",
 "City" => "شهر",
 "Region" => "ناحیه",
 "Zipcode" => "کد پستی",
 "Country" => "کشور",
-"Edit categories" => "ویرایش گروه",
-"Add" => "افزودن",
 "Addressbook" => "کتابچه ی نشانی ها",
 "Hon. prefixes" => "پیشوند های محترمانه",
 "Miss" => "خانم",
@@ -132,26 +142,21 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "کتابچه نشانی جدید",
-"Edit Addressbook" => "ویرایش کتابچه نشانی",
-"Displayname" => "نام برای نمایش",
-"Active" => "فعال",
-"Save" => "ذخیره سازی",
-"Submit" => "ارسال",
-"Cancel" => "انصراف",
 "Import a contacts file" => "وارد کردن پرونده حاوی اطلاعات",
 "Please choose the addressbook" => "لطفا یک کتابچه نشانی انتخاب کنید",
 "create a new addressbook" => "یک کتابچه نشانی بسازید",
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
-"Import" => "وارد کردن",
 "Importing contacts" => "وارد کردن اشخاص",
-"Select address book to import to:" => "یک کتابچه نشانی انتخاب کنید تا وارد شود",
-"Select from HD" => "انتخاب از دیسک سخت",
 "You have no contacts in your addressbook." => "شماهیچ شخصی در  کتابچه نشانی خود ندارید",
 "Add contact" => "افزودن اطلاعات شخص مورد نظر",
 "Configure addressbooks" => "پیکربندی کتابچه ی نشانی ها",
 "CardDAV syncing addresses" => "CardDAV syncing addresses ",
 "more info" => "اطلاعات بیشتر",
 "Primary address (Kontact et al)" => "نشانی اولیه",
-"iOS/OS X" => "iOS/OS X "
+"iOS/OS X" => "iOS/OS X ",
+"Download" => "بارگیری",
+"Edit" => "ویرایش",
+"New Address Book" => "کتابچه نشانه های جدید",
+"Save" => "ذخیره سازی",
+"Cancel" => "انصراف"
 );

apps/contacts/l10n/fi_FI.php

@@ -1,28 +1,36 @@
 <?php $TRANSLATIONS = array(
-"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
-"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
-"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
-"Error adding contact property." => "Virhe lisättäessä ominaisuutta yhteystietoon.",
+"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
 "No categories selected for deletion." => "Luokkia ei ole valittu poistettavaksi.",
 "No address books found." => "Osoitekirjoja ei löytynyt.",
 "No contacts found." => "Yhteystietoja ei löytynyt.",
-"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"Cannot add addressbook with an empty name." => "Ilman nimeä olevaa osoitekirjaa ei voi lisätä.",
-"Error adding addressbook." => "Virhe lisättäessä osoitekirjaa.",
-"Error activating addressbook." => "Virhe aktivoitaessa osoitekirjaa.",
-"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
+"There was an error adding the contact." => "Virhe yhteystietoa lisättäessä.",
+"Cannot add empty property." => "Tyhjää ominaisuutta ei voi lisätä.",
+"At least one of the address fields has to be filled out." => "Vähintään yksi osoitekenttä tulee täyttää.",
+"Information about vCard is incorrect. Please reload the page." => "vCardin tiedot eivät kelpaa. Lataa sivu uudelleen.",
 "Error deleting contact property." => "Virhe poistettaessa yhteystiedon ominaisuutta.",
+"Error parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
+"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
+"Error saving temporary file." => "Virhe tallennettaessa tilapäistiedostoa.",
 "File doesn't exist:" => "Tiedostoa ei ole olemassa:",
 "Error loading image." => "Virhe kuvaa ladatessa.",
-"Error updating contact property." => "Virhe päivitettäessä yhteystiedon ominaisuutta.",
-"Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.",
+"Error saving contact." => "Virhe yhteystietoa tallennettaessa.",
+"Error resizing image" => "Virhe asettaessa kuvaa uuteen kokoon",
+"Error cropping image" => "Virhe rajatessa kuvaa",
+"Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
 "There is no error, the file uploaded with success" => "Ei virhettä, tiedosto lähetettiin onnistuneesti",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Lähetetyn tiedoston koko ylittää upload_max_filesize-asetuksen arvon php.ini-tiedostossa",
 "The uploaded file was only partially uploaded" => "Lähetetty tiedosto lähetettiin vain osittain",
 "No file was uploaded" => "Tiedostoa ei lähetetty",
 "Missing a temporary folder" => "Tilapäiskansio puuttuu",
+"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
 "Contacts" => "Yhteystiedot",
-"Addressbook not found." => "Osoitekirjaa ei löytynyt.",
+"Error" => "Virhe",
+"Edit name" => "Muokkaa nimeä",
+"No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.",
+"Result: " => "Tulos: ",
+" imported, " => " tuotu, ",
+" failed." => " epäonnistui.",
+"Addressbook not found: " => "Osoitekirjaa ei löytynyt:",
 "This is not your addressbook." => "Tämä ei ole osoitekirjasi.",
 "Contact could not be found." => "Yhteystietoa ei löytynyt.",
 "Address" => "Osoite",
@@ -39,71 +47,91 @@
 "Video" => "Video",
 "Pager" => "Hakulaite",
 "Internet" => "Internet",
+"Birthday" => "Syntymäpäivä",
+"Business" => "Työ",
+"Other" => "Muu",
+"Questions" => "Kysymykset",
 "{name}'s Birthday" => "Henkilön {name} syntymäpäivä",
 "Contact" => "Yhteystieto",
 "Add Contact" => "Lisää yhteystieto",
+"Import" => "Tuo",
+"Settings" => "Asetukset",
 "Addressbooks" => "Osoitekirjat",
-"Configure Address Books" => "Muokkaa osoitekirjoja",
-"New Address Book" => "Uusi osoitekirja",
-"Import from VCF" => "Tuo VCF-tiedostosta",
-"CardDav Link" => "CardDav-linkki",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
+"Close" => "Sulje",
+"Keyboard shortcuts" => "Pikanäppäimet",
+"Next contact in list" => "Seuraava yhteystieto luettelossa",
+"Previous contact in list" => "Edellinen yhteystieto luettelossa",
+"Actions" => "Toiminnot",
+"Refresh contacts list" => "Päivitä yhteystietoluettelo",
+"Add new contact" => "Lisää uusi yhteystieto",
+"Add new addressbook" => "Lisää uusi osoitekirja",
+"Delete current contact" => "Poista nykyinen yhteystieto",
+"Delete current photo" => "Poista nykyinen valokuva",
+"Edit current photo" => "Muokkaa nykyistä valokuvaa",
+"Upload new photo" => "Lähetä uusi valokuva",
+"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Edit name details" => "Muokkaa nimitietoja",
 "Delete" => "Poista",
-"Download contact" => "Lataa yhteystieto",
-"Delete contact" => "Poista yhteystieto",
 "Nickname" => "Kutsumanimi",
 "Enter nickname" => "Anna kutsumanimi",
-"Birthday" => "Syntymäpäivä",
+"Web site" => "Verkkosivu",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Siirry verkkosivulle",
 "Groups" => "Ryhmät",
 "Separate groups with commas" => "Erota ryhmät pilkuilla",
 "Edit groups" => "Muokkaa ryhmiä",
+"Preferred" => "Ensisijainen",
 "Please specify a valid email address." => "Anna kelvollinen sähköpostiosoite.",
 "Enter email address" => "Anna sähköpostiosoite",
 "Delete email address" => "Poista sähköpostiosoite",
 "Enter phone number" => "Anna puhelinnumero",
 "Delete phone number" => "Poista puhelinnumero",
 "View on map" => "Näytä kartalla",
+"Edit address details" => "Muokkaa osoitetietoja",
 "Add notes here." => "Lisää huomiot tähän.",
 "Add field" => "Lisää kenttä",
-"Profile picture" => "Profiilikuva",
 "Phone" => "Puhelin",
 "Note" => "Huomio",
-"Delete current photo" => "Poista nykyinen valokuva",
-"Edit current photo" => "Muokkaa nykyistä valokuvaa",
-"Upload new photo" => "Lähetä uusi valokuva",
-"Select photo from ownCloud" => "Valitse valokuva ownCloudista",
+"Download contact" => "Lataa yhteystieto",
+"Delete contact" => "Poista yhteystieto",
+"The temporary image has been removed from cache." => "Väliaikainen kuva on poistettu välimuistista.",
 "Edit address" => "Muokkaa osoitetta",
 "Type" => "Tyyppi",
 "PO Box" => "Postilokero",
+"Street address" => "Katuosoite",
+"Street and number" => "Katu ja numero",
 "Extended" => "Laajennettu",
-"Street" => "Katuosoite",
+"Apartment number etc." => "Asunnon numero jne.",
 "City" => "Paikkakunta",
 "Region" => "Alue",
 "Zipcode" => "Postinumero",
+"Postal code" => "Postinumero",
 "Country" => "Maa",
-"Edit categories" => "Muokkaa luokkia",
-"Add" => "Lisää",
 "Addressbook" => "Osoitekirja",
 "Given name" => "Etunimi",
 "Additional names" => "Lisänimet",
 "Family name" => "Sukunimi",
-"New Addressbook" => "Uusi osoitekirja",
-"Edit Addressbook" => "Muokkaa osoitekirjaa",
-"Active" => "Aktiivinen",
-"Save" => "Tallenna",
-"Submit" => "Lähetä",
-"Cancel" => "Peru",
 "Import a contacts file" => "Tuo yhteystiedon sisältävä tiedosto",
 "Please choose the addressbook" => "Valitse osoitekirja",
 "create a new addressbook" => "luo uusi osoitekirja",
 "Name of new addressbook" => "Uuden osoitekirjan nimi",
-"Import" => "Tuo",
 "Importing contacts" => "Tuodaan yhteystietoja",
-"Select address book to import to:" => "Valitse osoitekirja, johon yhteystiedot tuodaan:",
 "You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
 "Add contact" => "Lisää yhteystieto",
 "Configure addressbooks" => "Muokkaa osoitekirjoja",
+"Select Address Books" => "Valitse osoitekirjat",
+"Enter name" => "Anna nimi",
+"Enter description" => "Anna kuvaus",
 "CardDAV syncing addresses" => "CardDAV-synkronointiosoitteet",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Näytä CardDav-linkki",
+"Show read-only VCF link" => "Näytä vain luku -muodossa oleva VCF-linkki",
+"Download" => "Lataa",
+"Edit" => "Muokkaa",
+"New Address Book" => "Uusi osoitekirja",
+"Name" => "Nimi",
+"Description" => "Kuvaus",
+"Save" => "Tallenna",
+"Cancel" => "Peru",
+"More..." => "Lisää..."
 );

apps/contacts/l10n/fr.php

@@ -1,39 +1,43 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Des erreurs se sont produites lors de l'activation/désactivation du carnet d'adresses.",
-"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
-"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
-"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
-"Trying to add duplicate property: " => "Ajout d'une propriété en double:",
-"Error adding contact property." => "Erreur lors de l'ajout du champ.",
+"id is not set." => "L'ID n'est pas défini.",
+"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
+"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
 "No ID provided" => "Aucun ID fourni",
 "Error setting checksum." => "Erreur lors du paramétrage du hachage.",
 "No categories selected for deletion." => "Pas de catégories sélectionnées pour la suppression.",
 "No address books found." => "Pas de carnet d'adresses trouvé.",
 "No contacts found." => "Aucun contact trouvé.",
-"Missing ID" => "ID manquant",
-"Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
-"Cannot add addressbook with an empty name." => "Ne peut être ajouté avec un nom vide.",
-"Error adding addressbook." => "Erreur lors de l'ajout du carnet d'adresses.",
-"Error activating addressbook." => "Erreur lors de l'activation du carnet d'adresses.",
-"No contact ID was submitted." => "Aucun ID de contact envoyé",
-"Error reading contact photo." => "Erreur de lecture de la photo du contact.",
-"Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
-"The loading photo is not valid." => "La photo chargée est invalide.",
-"id is not set." => "L'ID n'est pas défini.",
+"There was an error adding the contact." => "Une erreur s'est produite lors de l'ajout du contact.",
+"element name is not set." => "Le champ Nom n'est pas défini.",
+"Could not parse contact: " => "Impossible de lire le contact :",
+"Cannot add empty property." => "Impossible d'ajouter un champ vide.",
+"At least one of the address fields has to be filled out." => "Au moins un des champs d'adresses doit être complété.",
+"Trying to add duplicate property: " => "Ajout d'une propriété en double:",
+"Error adding contact property: " => "Erreur pendant l'ajout de la propriété du contact :",
 "Information about vCard is incorrect. Please reload the page." => "Les informations relatives à cette vCard sont incorrectes. Veuillez recharger la page.",
 "Error deleting contact property." => "Erreur lors de la suppression du champ.",
-"Contact ID is missing." => "L'ID du contact est manquant.",
-"Missing contact id." => "ID contact manquant.",
-"No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
-"File doesn't exist:" => "Fichier inexistant:",
-"Error loading image." => "Erreur lors du chargement de l'image.",
-"element name is not set." => "Le champ Nom n'est pas défini.",
+"Missing ID" => "ID manquant",
+"Error parsing VCard for ID: \"" => "Erreur lors de l'analyse du VCard pour l'ID: \"",
 "checksum is not set." => "L'hachage n'est pas défini.",
 "Information about vCard is incorrect. Please reload the page: " => "L'informatiion à propos de la vCard est incorrect. Merci de rafraichir la page:",
 "Something went FUBAR. " => "Quelque chose est FUBAR.",
 "Error updating contact property." => "Erreur lors de la mise à jour du champ.",
-"Cannot update addressbook with an empty name." => "Impossible de mettre à jour le carnet d'adresses avec un nom vide.",
-"Error updating addressbook." => "Erreur lors de la mise à jour du carnet d'adresses.",
+"No contact ID was submitted." => "Aucun ID de contact envoyé",
+"Error reading contact photo." => "Erreur de lecture de la photo du contact.",
+"Error saving temporary file." => "Erreur de sauvegarde du fichier temporaire.",
+"The loading photo is not valid." => "La photo chargée est invalide.",
+"Contact ID is missing." => "L'ID du contact est manquant.",
+"No photo path was submitted." => "Le chemin de la photo n'a pas été envoyé.",
+"File doesn't exist:" => "Fichier inexistant:",
+"Error loading image." => "Erreur lors du chargement de l'image.",
+"Error getting contact object." => "Erreur lors de l'obtention de l'objet contact",
+"Error getting PHOTO property." => "Erreur lors de l'obtention des propriétés de la photo",
+"Error saving contact." => "Erreur de sauvegarde du contact",
+"Error resizing image" => "Erreur de redimensionnement de l'image",
+"Error cropping image" => "Erreur lors du rognage de l'image",
+"Error creating temporary image" => "Erreur de création de l'image temporaire",
+"Error finding image: " => "Erreur pour trouver l'image :",
 "Error uploading contacts to storage." => "Erreur lors de l'envoi des contacts vers le stockage.",
 "There is no error, the file uploaded with success" => "Il n'y a pas d'erreur, le fichier a été envoyé avec succes.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Le fichier envoyé dépasse la directive upload_max_filesize dans php.ini",
@@ -41,9 +45,26 @@
 "The uploaded file was only partially uploaded" => "Le fichier envoyé n'a été que partiellement envoyé.",
 "No file was uploaded" => "Pas de fichier envoyé.",
 "Missing a temporary folder" => "Absence de dossier temporaire.",
+"Couldn't save temporary image: " => "Impossible de sauvegarder l'image temporaire :",
+"Couldn't load temporary image: " => "Impossible de charger l'image temporaire :",
+"No file was uploaded. Unknown error" => "Aucun fichier n'a été chargé. Erreur inconnue",
 "Contacts" => "Contacts",
-"Drop a VCF file to import contacts." => "Glisser un fichier VCF pour importer des contacts.",
-"Addressbook not found." => "Carnet d'adresses introuvable.",
+"Sorry, this functionality has not been implemented yet" => "Désolé cette fonctionnalité n'a pas encore été implementée",
+"Not implemented" => "Pas encore implémenté",
+"Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
+"Error" => "Erreur",
+"This property has to be non-empty." => "Cette valeur ne doit pas être vide",
+"Couldn't serialize elements." => "Impossible de sérialiser les éléments",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' a été appelé sans type d'arguments. Merci de rapporter un bug à bugs.owncloud.org",
+"Edit name" => "Éditer le nom",
+"No files selected for upload." => "Aucun fichiers choisis pour être chargés",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Le fichier que vous tenter de charger dépasse la taille maximum de fichier autorisé sur ce serveur.",
+"Select type" => "Sélectionner un type",
+"Result: " => "Résultat :",
+" imported, " => "importé,",
+" failed." => "échoué.",
+"Displayname cannot be empty." => "Le nom d'affichage ne peut pas être vide.",
+"Addressbook not found: " => "Carnet d'adresse introuvable : ",
 "This is not your addressbook." => "Ce n'est pas votre carnet d'adresses.",
 "Contact could not be found." => "Ce contact n'a pu être trouvé.",
 "Address" => "Adresse",
@@ -60,25 +81,52 @@
 "Video" => "Vidéo",
 "Pager" => "Bipeur",
 "Internet" => "Internet",
+"Birthday" => "Anniversaire",
+"Business" => "Business",
+"Call" => "Appel",
+"Clients" => "Clients",
+"Deliverer" => "Livreur",
+"Holidays" => "Vacances",
+"Ideas" => "Idées",
+"Journey" => "Trajet",
+"Jubilee" => "Jubilé",
+"Meeting" => "Rendez-vous",
+"Other" => "Autre",
+"Personal" => "Personnel",
+"Projects" => "Projets",
+"Questions" => "Questions",
 "{name}'s Birthday" => "Anniversaire de {name}",
 "Contact" => "Contact",
 "Add Contact" => "Ajouter un Contact",
+"Import" => "Importer",
+"Settings" => "Paramètres",
 "Addressbooks" => "Carnets d'adresses",
-"Configure Address Books" => "Paramétrer carnet d'adresses",
-"New Address Book" => "Nouveau Carnet d'adresses",
-"Import from VCF" => "Importer depuis VCF",
-"CardDav Link" => "Lien CardDav",
-"Download" => "Télécharger",
-"Edit" => "Modifier",
-"Delete" => "Supprimer",
-"Download contact" => "Télécharger le contact",
-"Delete contact" => "Supprimer le contact",
+"Close" => "Fermer",
+"Keyboard shortcuts" => "Raccourcis clavier",
+"Navigation" => "Navigation",
+"Next contact in list" => "Contact suivant dans la liste",
+"Previous contact in list" => "Contact précédent dans la liste",
+"Expand/collapse current addressbook" => "Dé/Replier le carnet d'adresses courant",
+"Next addressbook" => "Carnet d'adresses suivant",
+"Previous addressbook" => "Carnet d'adresses précédent",
+"Actions" => "Actions",
+"Refresh contacts list" => "Actualiser la liste des contacts",
+"Add new contact" => "Ajouter un nouveau contact",
+"Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
+"Delete current contact" => "Effacer le contact sélectionné",
 "Drop photo to upload" => "Glisser une photo pour l'envoi",
+"Delete current photo" => "Supprimer la photo actuelle",
+"Edit current photo" => "Editer la photo actuelle",
+"Upload new photo" => "Envoyer une nouvelle photo",
+"Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formatage personnalisé, Nom court, Nom complet, Inversé, Inversé avec virgule",
 "Edit name details" => "Editer les noms",
+"Delete" => "Supprimer",
 "Nickname" => "Surnom",
 "Enter nickname" => "Entrer un surnom",
-"Birthday" => "Anniversaire",
+"Web site" => "Page web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Allez à la page web",
 "dd-mm-yyyy" => "jj-mm-aaaa",
 "Groups" => "Groupes",
 "Separate groups with commas" => "Séparer les groupes avec des virgules",
@@ -86,6 +134,7 @@
 "Preferred" => "Préféré",
 "Please specify a valid email address." => "Merci d'entrer une adresse e-mail valide.",
 "Enter email address" => "Entrer une adresse e-mail",
+"Mail to address" => "Envoyer à l'adresse",
 "Delete email address" => "Supprimer l'adresse e-mail",
 "Enter phone number" => "Entrer un numéro de téléphone",
 "Delete phone number" => "Supprimer le numéro de téléphone",
@@ -93,24 +142,24 @@
 "Edit address details" => "Editer les adresses",
 "Add notes here." => "Ajouter des notes ici.",
 "Add field" => "Ajouter un champ.",
-"Profile picture" => "Photo de profil",
 "Phone" => "Téléphone",
 "Note" => "Note",
-"Delete current photo" => "Supprimer la photo actuelle",
-"Edit current photo" => "Editer la photo actuelle",
-"Upload new photo" => "Envoyer une nouvelle photo",
-"Select photo from ownCloud" => "Sélectionner une photo depuis ownCloud",
+"Download contact" => "Télécharger le contact",
+"Delete contact" => "Supprimer le contact",
+"The temporary image has been removed from cache." => "L'image temporaire a été supprimée du cache.",
 "Edit address" => "Editer l'adresse",
 "Type" => "Type",
 "PO Box" => "Boîte postale",
+"Street address" => "Adresse postale",
+"Street and number" => "Rue et numéro",
 "Extended" => "Étendu",
-"Street" => "Rue",
+"Apartment number etc." => "Numéro d'appartement, etc.",
 "City" => "Ville",
 "Region" => "Région",
+"E.g. state or province" => "Ex: état ou province",
 "Zipcode" => "Code postal",
+"Postal code" => "Code postal",
 "Country" => "Pays",
-"Edit categories" => "Editer les catégories",
-"Add" => "Ajouter",
 "Addressbook" => "Carnet d'adresses",
 "Hon. prefixes" => "Préfixe hon.",
 "Miss" => "Mlle",
@@ -123,27 +172,36 @@
 "Additional names" => "Nom supplémentaires",
 "Family name" => "Nom de famille",
 "Hon. suffixes" => "Suffixes hon.",
+"J.D." => "J.D.",
+"M.D." => "Dr.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
 "Ph.D." => "Dr",
-"New Addressbook" => "Nouveau carnet d'adresses",
-"Edit Addressbook" => "Éditer le carnet d'adresses",
-"Displayname" => "Nom",
-"Active" => "Carnet actif",
-"Save" => "Sauvegarder",
-"Submit" => "Envoyer",
-"Cancel" => "Annuler",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
 "Import a contacts file" => "Importer un fichier de contacts",
 "Please choose the addressbook" => "Choisissez le carnet d'adresses SVP",
 "create a new addressbook" => "Créer un nouveau carnet d'adresses",
 "Name of new addressbook" => "Nom du nouveau carnet d'adresses",
-"Import" => "Importer",
 "Importing contacts" => "Importation des contacts",
-"Select address book to import to:" => "Selectionner le carnet d'adresses à importer vers:",
-"Select from HD" => "Selectionner depuis le disque dur",
 "You have no contacts in your addressbook." => "Il n'y a pas de contact dans votre carnet d'adresses.",
 "Add contact" => "Ajouter un contact",
 "Configure addressbooks" => "Paramétrer carnet d'adresses",
+"Select Address Books" => "Choix du carnet d'adresses",
+"Enter name" => "Saisissez le nom",
+"Enter description" => "Saisissez une description",
 "CardDAV syncing addresses" => "Synchronisation des contacts CardDAV",
 "more info" => "Plus d'infos",
 "Primary address (Kontact et al)" => "Adresse principale",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Afficher le lien CardDav",
+"Download" => "Télécharger",
+"Edit" => "Modifier",
+"New Address Book" => "Nouveau Carnet d'adresses",
+"Name" => "Nom",
+"Description" => "Description",
+"Save" => "Sauvegarder",
+"Cancel" => "Annuler",
+"More..." => "Plus…"
 );

apps/contacts/l10n/gl.php

@@ -1,16 +1,65 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Produciuse un erro (des)activando a axenda.",
+"id is not set." => "non se estableceu o id.",
+"Cannot update addressbook with an empty name." => "Non se pode actualizar a libreta de enderezos sen completar o nome.",
+"Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
+"No ID provided" => "Non se proveeu ID",
+"Error setting checksum." => "Erro establecendo a suma de verificación",
+"No categories selected for deletion." => "Non se seleccionaron categorías para borrado.",
+"No address books found." => "Non se atoparon libretas de enderezos.",
+"No contacts found." => "Non se atoparon contactos.",
 "There was an error adding the contact." => "Produciuse un erro engadindo o contacto.",
+"element name is not set." => "non se nomeou o elemento.",
 "Cannot add empty property." => "Non se pode engadir unha propiedade baleira.",
 "At least one of the address fields has to be filled out." => "Polo menos un dos campos do enderezo ten que ser cuberto.",
-"Error adding contact property." => "Produciuse un erro engadindo unha propiedade do contacto.",
-"Error adding addressbook." => "Produciuse un erro engadindo a axenda.",
-"Error activating addressbook." => "Produciuse un erro activando a axenda.",
+"Trying to add duplicate property: " => "Tentando engadir propiedade duplicada: ",
 "Information about vCard is incorrect. Please reload the page." => "A información sobre a vCard é incorrecta. Por favor volva cargar a páxina.",
 "Error deleting contact property." => "Produciuse un erro borrando a propiedade do contacto.",
+"Missing ID" => "ID perdido",
+"Error parsing VCard for ID: \"" => "Erro procesando a VCard para o ID: \"",
+"checksum is not set." => "non se estableceu a suma de verificación.",
+"Information about vCard is incorrect. Please reload the page: " => "A información sobre a vCard é incorrecta. Por favor, recargue a páxina: ",
 "Error updating contact property." => "Produciuse un erro actualizando a propiedade do contacto.",
-"Error updating addressbook." => "Produciuse un erro actualizando a axenda.",
+"No contact ID was submitted." => "Non se enviou ningún ID de contacto.",
+"Error reading contact photo." => "Erro lendo a fotografía do contacto.",
+"Error saving temporary file." => "Erro gardando o ficheiro temporal.",
+"The loading photo is not valid." => "A fotografía cargada non é válida.",
+"Contact ID is missing." => "Falta o ID do contacto.",
+"No photo path was submitted." => "Non se enviou a ruta a unha foto.",
+"File doesn't exist:" => "O ficheiro non existe:",
+"Error loading image." => "Erro cargando imaxe.",
+"Error getting contact object." => "Erro obtendo o obxeto contacto.",
+"Error getting PHOTO property." => "Erro obtendo a propiedade PHOTO.",
+"Error saving contact." => "Erro gardando o contacto.",
+"Error resizing image" => "Erro cambiando o tamaño da imaxe",
+"Error cropping image" => "Erro recortando a imaxe",
+"Error creating temporary image" => "Erro creando a imaxe temporal",
+"Error finding image: " => "Erro buscando a imaxe: ",
+"Error uploading contacts to storage." => "Erro subindo os contactos ao almacén.",
+"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro subeuse con éxito",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "O ficheiro subido supera a directiva upload_max_filesize no php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro subido supera a directiva MAX_FILE_SIZE especificada no formulario HTML",
+"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente subido",
+"No file was uploaded" => "Non se subeu ningún ficheiro",
+"Missing a temporary folder" => "Falta o cartafol temporal",
+"Couldn't save temporary image: " => "Non se puido gardar a imaxe temporal: ",
+"Couldn't load temporary image: " => "Non se puido cargar a imaxe temporal: ",
+"No file was uploaded. Unknown error" => "Non se subeu ningún ficheiro. Erro descoñecido.",
 "Contacts" => "Contactos",
+"Sorry, this functionality has not been implemented yet" => "Sentímolo, esta función aínda non foi implementada.",
+"Not implemented" => "Non implementada.",
+"Couldn't get a valid address." => "Non se puido obter un enderezo de correo válido.",
+"Error" => "Erro",
+"This property has to be non-empty." => "Esta propiedade non pode quedar baldeira.",
+"Couldn't serialize elements." => "Non se puido serializar os elementos.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' chamado sen argumento. Por favor, informe en bugs.owncloud.org",
+"Edit name" => "Editar nome",
+"No files selected for upload." => "Sen ficheiros escollidos para subir.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "O ficheiro que tenta subir supera o tamaño máximo permitido neste servidor.",
+"Select type" => "Seleccione tipo",
+"Result: " => "Resultado: ",
+" imported, " => " importado, ",
+" failed." => " fallou.",
 "This is not your addressbook." => "Esta non é a súa axenda.",
 "Contact could not be found." => "Non se atopou o contacto.",
 "Address" => "Enderezo",
@@ -22,37 +71,91 @@
 "Mobile" => "Móbil",
 "Text" => "Texto",
 "Voice" => "Voz",
+"Message" => "Mensaxe",
 "Fax" => "Fax",
 "Video" => "Vídeo",
 "Pager" => "Paxinador",
+"Internet" => "Internet",
+"Birthday" => "Aniversario",
+"{name}'s Birthday" => "Cumpleanos de {name}",
 "Contact" => "Contacto",
 "Add Contact" => "Engadir contacto",
+"Import" => "Importar",
 "Addressbooks" => "Axendas",
-"New Address Book" => "Nova axenda",
-"CardDav Link" => "Ligazón CardDav",
-"Download" => "Descargar",
-"Edit" => "Editar",
+"Close" => "Pechar",
+"Drop photo to upload" => "Solte a foto a subir",
+"Delete current photo" => "Borrar foto actual",
+"Edit current photo" => "Editar a foto actual",
+"Upload new photo" => "Subir unha nova foto",
+"Select photo from ownCloud" => "Escoller foto desde ownCloud",
+"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizado, Nome corto, Nome completo, Inverso ou Inverso con coma",
+"Edit name details" => "Editar detalles do nome",
 "Delete" => "Eliminar",
+"Nickname" => "Apodo",
+"Enter nickname" => "Introuza apodo",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "Grupos",
+"Separate groups with commas" => "Separe grupos con comas",
+"Edit groups" => "Editar grupos",
+"Preferred" => "Preferido",
+"Please specify a valid email address." => "Por favor indique un enderezo de correo electrónico válido.",
+"Enter email address" => "Introduza enderezo de correo electrónico",
+"Mail to address" => "Correo ao enderezo",
+"Delete email address" => "Borrar enderezo de correo electrónico",
+"Enter phone number" => "Introducir número de teléfono",
+"Delete phone number" => "Borrar número de teléfono",
+"View on map" => "Ver no mapa",
+"Edit address details" => "Editar detalles do enderezo",
+"Add notes here." => "Engadir aquí as notas.",
+"Add field" => "Engadir campo",
+"Phone" => "Teléfono",
+"Note" => "Nota",
 "Download contact" => "Descargar contacto",
 "Delete contact" => "Borrar contacto",
-"Birthday" => "Aniversario",
-"Preferred" => "Preferido",
-"Phone" => "Teléfono",
+"The temporary image has been removed from cache." => "A imaxe temporal foi eliminada da caché.",
+"Edit address" => "Editar enderezo",
 "Type" => "Escribir",
 "PO Box" => "Apartado de correos",
 "Extended" => "Ampliado",
-"Street" => "Rúa",
 "City" => "Cidade",
 "Region" => "Autonomía",
 "Zipcode" => "Código postal",
 "Country" => "País",
-"Add" => "Engadir",
 "Addressbook" => "Axenda",
-"New Addressbook" => "Nova axenda",
-"Edit Addressbook" => "Editar axenda",
-"Displayname" => "Nome a mostrar",
-"Active" => "Activo",
+"Hon. prefixes" => "Prefixos honoríficos",
+"Miss" => "Srta",
+"Ms" => "Sra/Srta",
+"Mr" => "Sr",
+"Sir" => "Sir",
+"Mrs" => "Sra",
+"Dr" => "Dr",
+"Given name" => "Apodo",
+"Additional names" => "Nomes adicionais",
+"Family name" => "Nome familiar",
+"Hon. suffixes" => "Sufixos honorarios",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"Import a contacts file" => "Importar un ficheiro de contactos",
+"Please choose the addressbook" => "Por favor escolla unha libreta de enderezos",
+"create a new addressbook" => "crear unha nova libreta de enderezos",
+"Name of new addressbook" => "Nome da nova libreta de enderezos",
+"Importing contacts" => "Importando contactos",
+"You have no contacts in your addressbook." => "Non ten contactos na súa libreta de enderezos.",
+"Add contact" => "Engadir contacto",
+"Configure addressbooks" => "Configurar libretas de enderezos",
+"CardDAV syncing addresses" => "Enderezos CardDAV a sincronizar",
+"more info" => "máis información",
+"Primary address (Kontact et al)" => "Enderezo primario (Kontact et al)",
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Descargar",
+"Edit" => "Editar",
+"New Address Book" => "Nova axenda",
 "Save" => "Gardar",
-"Submit" => "Enviar",
 "Cancel" => "Cancelar"
 );

apps/contacts/l10n/he.php

@@ -1,22 +1,45 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
-"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
-"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
-"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
-"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
-"Error adding contact property." => "שגיאה בהוספת מאפיין לאיש הקשר.",
+"id is not set." => "מספר מזהה לא נקבע.",
+"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
+"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
 "No ID provided" => "לא צוין מזהה",
 "Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
 "No categories selected for deletion." => "לא נבחור קטגוריות למחיקה.",
 "No address books found." => "לא נמצאו פנקסי כתובות.",
 "No contacts found." => "לא נמצאו אנשי קשר.",
-"Missing ID" => "מזהה חסר",
-"Error adding addressbook." => "שגיאה בהוספת פנקס הכתובות.",
-"Error activating addressbook." => "שגיאה בהפעלת פנקס הכתובות.",
+"There was an error adding the contact." => "אירעה שגיאה בעת הוספת איש הקשר.",
+"element name is not set." => "שם האלמנט לא נקבע.",
+"Cannot add empty property." => "לא ניתן להוסיף מאפיין ריק.",
+"At least one of the address fields has to be filled out." => "יש למלא לפחות אחד משדות הכתובת.",
+"Trying to add duplicate property: " => "ניסיון להוספת מאפיין כפול: ",
 "Information about vCard is incorrect. Please reload the page." => "המידע אודות vCard אינו נכון. נא לטעון מחדש את הדף.",
 "Error deleting contact property." => "שגיאה במחיקת מאפיין של איש הקשר.",
+"Missing ID" => "מזהה חסר",
+"Error parsing VCard for ID: \"" => "שגיאה בפענוח ה VCard עבור מספר המזהה: \"",
+"checksum is not set." => "סיכום ביקורת לא נקבע.",
+"Information about vCard is incorrect. Please reload the page: " => "המידע עבור ה vCard אינו נכון. אנא טען את העמוד: ",
+"Something went FUBAR. " => "משהו לא התנהל כצפוי.",
 "Error updating contact property." => "שגיאה בעדכון המאפיין של איש הקשר.",
-"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
+"No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
+"Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
+"Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
+"The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
+"Contact ID is missing." => "מספר מזהה של אישר הקשר חסר.",
+"No photo path was submitted." => "כתובת התמונה לא נשלחה",
+"File doesn't exist:" => "קובץ לא קיים:",
+"Error loading image." => "שגיאה בטעינת התמונה.",
+"Error getting contact object." => "שגיאה בקבלת אוביאקט איש הקשר",
+"Error getting PHOTO property." => "שגיאה בקבלת מידע של תמונה",
+"Error saving contact." => "שגיאה בשמירת איש הקשר",
+"Error resizing image" => "שגיאה בשינוי גודל התמונה",
+"Error uploading contacts to storage." => "התרשה שגיאה בהעלאת אנשי הקשר לאכסון.",
+"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "גודל הקובץ שהועלה גדול מהערך upload_max_filesize שמוגדר בקובץ php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
+"No file was uploaded" => "שום קובץ לא הועלה",
+"Missing a temporary folder" => "תקיה זמנית חסרה",
 "Contacts" => "אנשי קשר",
 "This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
 "Contact could not be found." => "לא ניתן לאתר איש קשר",
@@ -29,37 +52,88 @@
 "Mobile" => "נייד",
 "Text" => "טקסט",
 "Voice" => "קולי",
+"Message" => "הודעה",
 "Fax" => "פקס",
 "Video" => "וידאו",
 "Pager" => "זימונית",
+"Internet" => "אינטרנט",
+"Birthday" => "יום הולדת",
+"{name}'s Birthday" => "יום ההולדת של {name}",
 "Contact" => "איש קשר",
 "Add Contact" => "הוספת איש קשר",
+"Import" => "יבא",
 "Addressbooks" => "פנקסי כתובות",
-"New Address Book" => "פנקס כתובות חדש",
-"CardDav Link" => "קישור ",
-"Download" => "הורדה",
-"Edit" => "עריכה",
+"Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
+"Delete current photo" => "מחק תמונה נוכחית",
+"Edit current photo" => "ערוך תמונה נוכחית",
+"Upload new photo" => "העלה תמונה חדשה",
+"Select photo from ownCloud" => "בחר תמונה מ ownCloud",
+"Edit name details" => "ערוך פרטי שם",
 "Delete" => "מחיקה",
+"Nickname" => "כינוי",
+"Enter nickname" => "הכנס כינוי",
+"dd-mm-yyyy" => "dd-mm-yyyy",
+"Groups" => "קבוצות",
+"Separate groups with commas" => "הפרד קבוצות עם פסיקים",
+"Edit groups" => "ערוך קבוצות",
+"Preferred" => "מועדף",
+"Please specify a valid email address." => "אנא הזן כתובת דוא\"ל חוקית",
+"Enter email address" => "הזן כתובת דוא\"ל",
+"Mail to address" => "כתובת",
+"Delete email address" => "מחק כתובת דוא\"ל",
+"Enter phone number" => "הכנס מספר טלפון",
+"Delete phone number" => "מחק מספר טלפון",
+"View on map" => "ראה במפה",
+"Edit address details" => "ערוך פרטי כתובת",
+"Add notes here." => "הוסף הערות כאן.",
+"Add field" => "הוסף שדה",
+"Phone" => "טלפון",
+"Note" => "הערה",
 "Download contact" => "הורדת איש קשר",
 "Delete contact" => "מחיקת איש קשר",
-"Birthday" => "יום הולדת",
-"Preferred" => "מועדף",
-"Phone" => "טלפון",
+"Edit address" => "ערוך כתובת",
 "Type" => "סוג",
 "PO Box" => "תא דואר",
 "Extended" => "מורחב",
-"Street" => "רחוב",
 "City" => "עיר",
 "Region" => "אזור",
 "Zipcode" => "מיקוד",
 "Country" => "מדינה",
-"Add" => "הוספה",
 "Addressbook" => "פנקס כתובות",
-"New Addressbook" => "פנקס כתובות חדש",
-"Edit Addressbook" => "עריכת פנקס הכתובות",
-"Displayname" => "שם התצוגה",
-"Active" => "פעיל",
+"Hon. prefixes" => "קידומות שם",
+"Miss" => "גב'",
+"Ms" => "גב'",
+"Mr" => "מר'",
+"Sir" => "אדון",
+"Mrs" => "גב'",
+"Dr" => "ד\"ר",
+"Given name" => "שם",
+"Additional names" => "שמות נוספים",
+"Family name" => "שם משפחה",
+"Hon. suffixes" => "סיומות שם",
+"J.D." => "J.D.",
+"M.D." => "M.D.",
+"D.O." => "D.O.",
+"D.C." => "D.C.",
+"Ph.D." => "Ph.D.",
+"Esq." => "Esq.",
+"Jr." => "Jr.",
+"Sn." => "Sn.",
+"Import a contacts file" => "יבא קובץ אנשי קשר",
+"Please choose the addressbook" => "אנא בחר ספר כתובות",
+"create a new addressbook" => "צור ספר כתובות חדש",
+"Name of new addressbook" => "שם ספר כתובות החדש",
+"Importing contacts" => "מיבא אנשי קשר",
+"You have no contacts in your addressbook." => "איך לך אנשי קשר בספר הכתובות",
+"Add contact" => "הוסף איש קשר",
+"Configure addressbooks" => "הגדר ספרי כתובות",
+"CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
+"more info" => "מידע נוסף",
+"Primary address (Kontact et al)" => "כתובת ראשית",
+"iOS/OS X" => "iOS/OS X",
+"Download" => "הורדה",
+"Edit" => "עריכה",
+"New Address Book" => "פנקס כתובות חדש",
 "Save" => "שמירה",
-"Submit" => "ביצוע",
 "Cancel" => "ביטול"
 );

apps/contacts/l10n/hr.php

@@ -1,6 +1,41 @@
 <?php $TRANSLATIONS = array(
+"Error (de)activating addressbook." => "Pogreška pri (de)aktivaciji adresara.",
+"id is not set." => "id nije postavljen.",
+"Cannot update addressbook with an empty name." => "Ne mogu ažurirati adresar sa praznim nazivom.",
+"Error updating addressbook." => "Pogreška pri ažuriranju adresara.",
+"No ID provided" => "Nema dodijeljenog ID identifikatora",
+"Error setting checksum." => "Pogreška pri postavljanju checksuma.",
+"No categories selected for deletion." => "Niti jedna kategorija nije odabrana za brisanje.",
+"No address books found." => "Nema adresara.",
+"No contacts found." => "Nema kontakata.",
+"There was an error adding the contact." => "Dogodila se pogreška prilikom dodavanja kontakta.",
+"element name is not set." => "naziv elementa nije postavljen.",
+"Cannot add empty property." => "Prazno svojstvo se ne može dodati.",
+"At least one of the address fields has to be filled out." => "Morate ispuniti barem jedno od adresnih polja.",
+"Trying to add duplicate property: " => "Pokušali ste dodati duplo svojstvo:",
 "Information about vCard is incorrect. Please reload the page." => "Informacija o vCard je neispravna. Osvježite stranicu.",
+"Error deleting contact property." => "Pogreška pri brisanju svojstva kontakta.",
+"Missing ID" => "Nedostupan ID identifikator",
+"Error parsing VCard for ID: \"" => "Pogreška pri raščlanjivanju VCard za ID:",
+"checksum is not set." => "checksum nije postavljen.",
+"Information about vCard is incorrect. Please reload the page: " => "Informacije o VCard su pogrešne. Molimo, učitajte ponovno stranicu:",
+"Something went FUBAR. " => "Nešto je otišlo... krivo...",
+"Error updating contact property." => "Pogreška pri ažuriranju svojstva kontakta.",
+"No contact ID was submitted." => "ID kontakta nije podnešen.",
+"Error reading contact photo." => "Pogreška pri čitanju kontakt fotografije.",
+"Error saving temporary file." => "Pogreška pri spremanju privremene datoteke.",
+"The loading photo is not valid." => "Fotografija nije valjana.",
+"Contact ID is missing." => "ID kontakta nije dostupan.",
+"No photo path was submitted." => "Putanja do fotografije nije podnešena.",
 "File doesn't exist:" => "Datoteka ne postoji:",
+"Error loading image." => "Pogreška pri učitavanju slike.",
+"Error uploading contacts to storage." => "Pogreška pri slanju kontakata.",
+"There is no error, the file uploaded with success" => "Nema pogreške, datoteka je poslana uspješno.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Veličina poslane datoteke prelazi veličinu prikazanu u upload_max_filesize direktivi u konfiguracijskoj datoteci php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka prelazi veličinu prikazanu u MAX_FILE_SIZE direktivi u HTML formi",
+"The uploaded file was only partially uploaded" => "Poslana datoteka je parcijalno poslana",
+"No file was uploaded" => "Datoteka nije poslana",
+"Missing a temporary folder" => "Nedostaje privremeni direktorij",
 "Contacts" => "Kontakti",
 "This is not your addressbook." => "Ovo nije vaš adresar.",
 "Contact could not be found." => "Kontakt ne postoji.",
@@ -13,26 +48,27 @@
 "Mobile" => "Mobitel",
 "Text" => "Tekst",
 "Voice" => "Glasovno",
+"Message" => "Poruka",
 "Fax" => "Fax",
 "Video" => "Video",
 "Pager" => "Pager",
+"Internet" => "Internet",
+"Birthday" => "Rođendan",
+"{name}'s Birthday" => "{name} Rođendan",
 "Contact" => "Kontakt",
 "Add Contact" => "Dodaj kontakt",
+"Import" => "Uvezi",
 "Addressbooks" => "Adresari",
-"New Address Book" => "Novi adresar",
-"CardDav Link" => "CardDav poveznica",
-"Download" => "Preuzimanje",
-"Edit" => "Uredi",
-"Delete" => "Obriši",
-"Download contact" => "Preuzmi kontakt",
-"Delete contact" => "Izbriši kontakt",
+"Drop photo to upload" => "Dovucite fotografiju za slanje",
+"Edit current photo" => "Uredi trenutnu sliku",
 "Edit name details" => "Uredi detalje imena",
+"Delete" => "Obriši",
 "Nickname" => "Nadimak",
 "Enter nickname" => "Unesi nadimank",
-"Birthday" => "Rođendan",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Grupe",
 "Edit groups" => "Uredi grupe",
+"Preferred" => "Preferirano",
 "Enter email address" => "Unesi email adresu",
 "Enter phone number" => "Unesi broj telefona",
 "View on map" => "Prikaži na karti",
@@ -41,23 +77,20 @@
 "Add field" => "Dodaj polje",
 "Phone" => "Telefon",
 "Note" => "Bilješka",
-"Edit current photo" => "Uredi trenutnu sliku",
+"Download contact" => "Preuzmi kontakt",
+"Delete contact" => "Izbriši kontakt",
 "Edit address" => "Uredi adresu",
 "Type" => "Tip",
 "PO Box" => "Poštanski Pretinac",
 "Extended" => "Prošireno",
-"Street" => "Ulica",
 "City" => "Grad",
 "Region" => "Regija",
 "Zipcode" => "Poštanski broj",
 "Country" => "Država",
-"Edit categories" => "Uredi kategorije",
-"Add" => "Dodaj",
 "Addressbook" => "Adresar",
-"New Addressbook" => "Novi adresar",
-"Edit Addressbook" => "Uredi adresar",
+"Download" => "Preuzimanje",
+"Edit" => "Uredi",
+"New Address Book" => "Novi adresar",
 "Save" => "Spremi",
-"Submit" => "Pošalji",
-"Cancel" => "Prekini",
-"Import" => "Uvezi"
+"Cancel" => "Prekini"
 );

apps/contacts/l10n/hu_HU.php

@@ -1,39 +1,41 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Címlista (de)aktiválása sikertelen",
-"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
-"Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
-"At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
-"Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
-"Error adding contact property." => "Hiba a kapcsolat-tulajdonság hozzáadásakor",
+"id is not set." => "ID nincs beállítva",
+"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
+"Error updating addressbook." => "Hiba a címlista frissítésekor",
 "No ID provided" => "Nincs ID megadva",
 "Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
 "No categories selected for deletion." => "Nincs kiválasztva törlendő kategória",
 "No address books found." => "Nem található címlista",
 "No contacts found." => "Nem található kontakt",
-"Missing ID" => "Hiányzó ID",
-"Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
-"Cannot add addressbook with an empty name." => "Nem adható hozzá névtelen címlista",
-"Error adding addressbook." => "Hiba a címlista hozzáadásakor",
-"Error activating addressbook." => "Címlista aktiválása sikertelen",
-"No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
-"Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
-"Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
-"The loading photo is not valid." => "A kép érvénytelen",
-"id is not set." => "ID nincs beállítva",
+"There was an error adding the contact." => "Hiba a kapcsolat hozzáadásakor",
+"element name is not set." => "az elem neve nincs beállítva",
+"Cannot add empty property." => "Nem adható hozzá üres tulajdonság",
+"At least one of the address fields has to be filled out." => "Legalább egy címmező kitöltendő",
+"Trying to add duplicate property: " => "Kísérlet dupla tulajdonság hozzáadására: ",
 "Information about vCard is incorrect. Please reload the page." => "A vCardról szóló információ helytelen. Töltsd újra az oldalt.",
 "Error deleting contact property." => "Hiba a kapcsolat-tulajdonság törlésekor",
-"Contact ID is missing." => "Hiányzik a kapcsolat ID",
-"Missing contact id." => "Hiányzik a kontakt ID",
-"No photo path was submitted." => "Nincs fénykép-útvonal megadva",
-"File doesn't exist:" => "A fájl nem létezik:",
-"Error loading image." => "Kép betöltése sikertelen",
-"element name is not set." => "az elem neve nincs beállítva",
+"Missing ID" => "Hiányzó ID",
+"Error parsing VCard for ID: \"" => "VCard elemzése sikertelen a következő ID-hoz: \"",
 "checksum is not set." => "az ellenőrzőösszeg nincs beállítva",
 "Information about vCard is incorrect. Please reload the page: " => "Helytelen információ a vCardról. Töltse újra az oldalt: ",
 "Something went FUBAR. " => "Valami balul sült el.",
 "Error updating contact property." => "Hiba a kapcsolat-tulajdonság frissítésekor",
-"Cannot update addressbook with an empty name." => "Üres névvel nem frissíthető a címlista",
-"Error updating addressbook." => "Hiba a címlista frissítésekor",
+"No contact ID was submitted." => "Nincs ID megadva a kontakthoz",
+"Error reading contact photo." => "A kontakt képének beolvasása sikertelen",
+"Error saving temporary file." => "Ideiglenes fájl mentése sikertelen",
+"The loading photo is not valid." => "A kép érvénytelen",
+"Contact ID is missing." => "Hiányzik a kapcsolat ID",
+"No photo path was submitted." => "Nincs fénykép-útvonal megadva",
+"File doesn't exist:" => "A fájl nem létezik:",
+"Error loading image." => "Kép betöltése sikertelen",
+"Error getting contact object." => "A kontakt-objektum feldolgozása sikertelen",
+"Error getting PHOTO property." => "A PHOTO-tulajdonság  feldolgozása sikertelen",
+"Error saving contact." => "A kontakt mentése sikertelen",
+"Error resizing image" => "Képméretezés sikertelen",
+"Error cropping image" => "Képvágás sikertelen",
+"Error creating temporary image" => "Ideiglenes kép létrehozása sikertelen",
+"Error finding image: " => "A kép nem található",
 "Error uploading contacts to storage." => "Hiba a kapcsolatok feltöltésekor",
 "There is no error, the file uploaded with success" => "Nincs hiba, a fájl sikeresen feltöltődött",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "A feltöltött fájl mérete meghaladja az upload_max_filesize értéket a php.ini-ben",
@@ -41,9 +43,24 @@
 "The uploaded file was only partially uploaded" => "A fájl csak részlegesen lett feltöltve",
 "No file was uploaded" => "Nincs feltöltött fájl",
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
+"Couldn't save temporary image: " => "Ideiglenes kép létrehozása sikertelen",
+"Couldn't load temporary image: " => "Ideiglenes kép betöltése sikertelen",
+"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
 "Contacts" => "Kapcsolatok",
-"Drop a VCF file to import contacts." => "Húzza ide a VCF fájlt a kapcsolatok importálásához",
-"Addressbook not found." => "Címlista nem található",
+"Sorry, this functionality has not been implemented yet" => "Sajnáljuk, ez a funkció még nem támogatott",
+"Not implemented" => "Nem támogatott",
+"Couldn't get a valid address." => "Érvényes cím lekérése sikertelen",
+"Error" => "Hiba",
+"This property has to be non-empty." => "Ezt a tulajdonságot muszáj kitölteni",
+"Couldn't serialize elements." => "Sorbarakás sikertelen",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "A 'deleteProperty' argumentum nélkül lett meghívva. Kérjük, jelezze a hibát.",
+"Edit name" => "Név szerkesztése",
+"No files selected for upload." => "Nincs kiválasztva feltöltendő fájl",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "A feltöltendő fájl mérete meghaladja a megengedett mértéket",
+"Select type" => "Típus kiválasztása",
+"Result: " => "Eredmény: ",
+" imported, " => "  beimportálva,  ",
+" failed." => "  sikertelen",
 "This is not your addressbook." => "Ez nem a te címjegyzéked.",
 "Contact could not be found." => "Kapcsolat nem található.",
 "Address" => "Cím",
@@ -60,25 +77,23 @@
 "Video" => "Video",
 "Pager" => "Személyhívó",
 "Internet" => "Internet",
+"Birthday" => "Születésnap",
 "{name}'s Birthday" => "{name} születésnapja",
 "Contact" => "Kapcsolat",
 "Add Contact" => "Kapcsolat hozzáadása",
+"Import" => "Import",
 "Addressbooks" => "Címlisták",
-"Configure Address Books" => "Címlisták beállítása",
-"New Address Book" => "Új címlista",
-"Import from VCF" => "Importálás VCF-ből",
-"CardDav Link" => "CardDav hivatkozás",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
-"Download contact" => "Kapcsolat letöltése",
-"Delete contact" => "Kapcsolat törlése",
+"Close" => "Bezár",
 "Drop photo to upload" => "Húzza ide a feltöltendő képet",
+"Delete current photo" => "Aktuális kép törlése",
+"Edit current photo" => "Aktuális kép szerkesztése",
+"Upload new photo" => "Új kép feltöltése",
+"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formátum egyedi, Rövid név, Teljes név, Visszafelé vagy Visszafelé vesszővel",
 "Edit name details" => "Név részleteinek szerkesztése",
+"Delete" => "Törlés",
 "Nickname" => "Becenév",
 "Enter nickname" => "Becenév megadása",
-"Birthday" => "Születésnap",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "Csoportok",
 "Separate groups with commas" => "Vesszővel válassza el a csoportokat",
@@ -94,24 +109,19 @@
 "Edit address details" => "Cím részleteinek szerkesztése",
 "Add notes here." => "Megjegyzések",
 "Add field" => "Mező hozzáadása",
-"Profile picture" => "Profilkép",
 "Phone" => "Telefonszám",
 "Note" => "Jegyzet",
-"Delete current photo" => "Aktuális kép törlése",
-"Edit current photo" => "Aktuális kép szerkesztése",
-"Upload new photo" => "Új kép feltöltése",
-"Select photo from ownCloud" => "Kép kiválasztása ownCloud-ból",
+"Download contact" => "Kapcsolat letöltése",
+"Delete contact" => "Kapcsolat törlése",
+"The temporary image has been removed from cache." => "Az ideiglenes kép el lett távolítva a gyorsítótárból",
 "Edit address" => "Cím szerkesztése",
 "Type" => "Típus",
 "PO Box" => "Postafiók",
 "Extended" => "Kiterjesztett",
-"Street" => "Utca",
 "City" => "Város",
 "Region" => "Megye",
 "Zipcode" => "Irányítószám",
 "Country" => "Ország",
-"Edit categories" => "Kategóriák szerkesztése",
-"Add" => "Hozzáad",
 "Addressbook" => "Címlista",
 "Hon. prefixes" => "Előtag",
 "Miss" => "Miss",
@@ -132,26 +142,21 @@
 "Esq." => "Esq.",
 "Jr." => "Ifj.",
 "Sn." => "Id.",
-"New Addressbook" => "Új Címlista",
-"Edit Addressbook" => "Címlista szerkesztése",
-"Displayname" => "Megjelenített név",
-"Active" => "Aktív",
-"Save" => "Mentés",
-"Submit" => "Elküld",
-"Cancel" => "Mégsem",
 "Import a contacts file" => "Kapcsolat-fájl importálása",
 "Please choose the addressbook" => "Válassza ki a címlistát",
 "create a new addressbook" => "Címlista létrehozása",
 "Name of new addressbook" => "Új címlista neve",
-"Import" => "Import",
 "Importing contacts" => "Kapcsolatok importálása",
-"Select address book to import to:" => "Melyik címlistába történjen az importálás:",
-"Select from HD" => "Kiválasztás merevlemezről",
 "You have no contacts in your addressbook." => "Nincsenek kapcsolatok a címlistában",
 "Add contact" => "Kapcsolat hozzáadása",
 "Configure addressbooks" => "Címlisták beállítása",
 "CardDAV syncing addresses" => "CardDAV szinkronizációs címek",
 "more info" => "további információ",
 "Primary address (Kontact et al)" => "Elsődleges cím",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Letöltés",
+"Edit" => "Szerkesztés",
+"New Address Book" => "Új címlista",
+"Save" => "Mentés",
+"Cancel" => "Mégsem"
 );

apps/contacts/l10n/ia.php

@@ -1,15 +1,12 @@
 <?php $TRANSLATIONS = array(
-"Cannot add empty property." => "Non pote adder proprietate vacue.",
 "No address books found." => "Nulle adressario trovate",
 "No contacts found." => "Nulle contactos trovate.",
-"Error adding addressbook." => "Error durante que il addeva le adressario.",
-"Error activating addressbook." => "Error in activar adressario",
+"Cannot add empty property." => "Non pote adder proprietate vacue.",
 "Error saving temporary file." => "Error durante le scriptura in le file temporari",
 "Error loading image." => "Il habeva un error durante le cargamento del imagine.",
 "No file was uploaded" => "Nulle file esseva incargate.",
 "Missing a temporary folder" => "Manca un dossier temporari",
 "Contacts" => "Contactos",
-"Addressbook not found." => "Adressario non trovate.",
 "This is not your addressbook." => "Iste non es tu libro de adresses",
 "Contact could not be found." => "Contacto non poterea esser legite",
 "Address" => "Adresse",
@@ -26,19 +23,18 @@
 "Video" => "Video",
 "Pager" => "Pager",
 "Internet" => "Internet",
+"Birthday" => "Anniversario",
 "Contact" => "Contacto",
 "Add Contact" => "Adder contacto",
+"Import" => "Importar",
 "Addressbooks" => "Adressarios",
-"New Address Book" => "Nove adressario",
-"CardDav Link" => "Ligamine CardDav",
-"Download" => "Discargar",
-"Edit" => "Modificar",
+"Delete current photo" => "Deler photo currente",
+"Edit current photo" => "Modificar photo currente",
+"Upload new photo" => "Incargar nove photo",
+"Select photo from ownCloud" => "Seliger photo ex ownCloud",
 "Delete" => "Deler",
-"Download contact" => "Discargar contacto",
-"Delete contact" => "Deler contacto",
 "Nickname" => "Pseudonymo",
 "Enter nickname" => "Inserer pseudonymo",
-"Birthday" => "Anniversario",
 "Groups" => "Gruppos",
 "Edit groups" => "Modificar gruppos",
 "Preferred" => "Preferite",
@@ -49,24 +45,18 @@
 "View on map" => "Vider in un carta",
 "Add notes here." => "Adder notas hic",
 "Add field" => "Adder campo",
-"Profile picture" => "Imagine de profilo",
 "Phone" => "Phono",
 "Note" => "Nota",
-"Delete current photo" => "Deler photo currente",
-"Edit current photo" => "Modificar photo currente",
-"Upload new photo" => "Incargar nove photo",
-"Select photo from ownCloud" => "Seliger photo ex ownCloud",
+"Download contact" => "Discargar contacto",
+"Delete contact" => "Deler contacto",
 "Edit address" => "Modificar adresses",
 "Type" => "Typo",
 "PO Box" => "Cassa postal",
 "Extended" => "Extendite",
-"Street" => "Strata",
 "City" => "Citate",
 "Region" => "Region",
 "Zipcode" => "Codice postal",
 "Country" => "Pais",
-"Edit categories" => "Modificar categorias",
-"Add" => "Adder",
 "Addressbook" => "Adressario",
 "Hon. prefixes" => "Prefixos honorific",
 "Miss" => "Senioretta",
@@ -77,18 +67,16 @@
 "Additional names" => "Nomines additional",
 "Family name" => "Nomine de familia",
 "Hon. suffixes" => "Suffixos honorific",
-"New Addressbook" => "Nove adressario",
-"Edit Addressbook" => "Modificar adressario",
-"Active" => "Active",
-"Save" => "Salveguardar",
-"Submit" => "Submitter",
-"Cancel" => "Cancellar",
 "Import a contacts file" => "Importar un file de contactos",
 "Please choose the addressbook" => "Per favor selige le adressario",
 "create a new addressbook" => "Crear un nove adressario",
 "Name of new addressbook" => "Nomine del nove gruppo:",
-"Import" => "Importar",
 "Add contact" => "Adder adressario",
 "more info" => "plus info",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "Discargar",
+"Edit" => "Modificar",
+"New Address Book" => "Nove adressario",
+"Save" => "Salveguardar",
+"Cancel" => "Cancellar"
 );

apps/contacts/l10n/it.php

@@ -1,39 +1,43 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "Errore nel (dis)attivare la rubrica.",
-"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
-"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
-"At least one of the address fields has to be filled out." => "Deve essere riempito almeno un indirizzo.",
-"Trying to add duplicate property: " => "P",
-"Error adding contact property." => "Errore durante l'aggiunta della proprietà del contatto.",
+"id is not set." => "ID non impostato.",
+"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
+"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
 "No ID provided" => "Nessun ID fornito",
 "Error setting checksum." => "Errore di impostazione del codice di controllo.",
 "No categories selected for deletion." => "Nessuna categoria selezionata per l'eliminazione.",
 "No address books found." => "Nessuna rubrica trovata.",
 "No contacts found." => "Nessun contatto trovato.",
-"Missing ID" => "ID mancante",
-"Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
-"Cannot add addressbook with an empty name." => "Impossibile aggiungere una rubrica senza nome.",
-"Error adding addressbook." => "Errore durante l'aggiunta della rubrica.",
-"Error activating addressbook." => "Errore durante l'attivazione della rubrica.",
-"No contact ID was submitted." => "Nessun ID di contatto inviato.",
-"Error reading contact photo." => "Errore di lettura della foto del contatto.",
-"Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
-"The loading photo is not valid." => "La foto caricata non è valida.",
-"id is not set." => "ID non impostato.",
+"There was an error adding the contact." => "Si è verificato un errore nell'aggiunta del contatto.",
+"element name is not set." => "il nome dell'elemento non è impostato.",
+"Could not parse contact: " => "Impossibile elaborare il contatto: ",
+"Cannot add empty property." => "Impossibile aggiungere una proprietà vuota.",
+"At least one of the address fields has to be filled out." => "Deve essere inserito almeno un indirizzo.",
+"Trying to add duplicate property: " => "P",
+"Error adding contact property: " => "Errore durante l'aggiunta della proprietà del contatto: ",
 "Information about vCard is incorrect. Please reload the page." => "Informazioni sulla vCard non corrette. Ricarica la pagina.",
 "Error deleting contact property." => "Errore durante l'eliminazione della proprietà del contatto.",
-"Contact ID is missing." => "Manca l'ID del contatto.",
-"Missing contact id." => "ID di contatto mancante.",
-"No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
-"File doesn't exist:" => "Il file non esiste:",
-"Error loading image." => "Errore di caricamento immagine.",
-"element name is not set." => "il nome dell'elemento non è impostato.",
+"Missing ID" => "ID mancante",
+"Error parsing VCard for ID: \"" => "Errore in fase di elaborazione del file VCard per l'ID: \"",
 "checksum is not set." => "il codice di controllo non è impostato.",
 "Information about vCard is incorrect. Please reload the page: " => "Le informazioni della vCard non sono corrette. Ricarica la pagina: ",
 "Something went FUBAR. " => "Qualcosa è andato storto. ",
 "Error updating contact property." => "Errore durante l'aggiornamento della proprietà del contatto.",
-"Cannot update addressbook with an empty name." => "Impossibile aggiornare una rubrica senza nome.",
-"Error updating addressbook." => "Errore durante l'aggiornamento della rubrica.",
+"No contact ID was submitted." => "Nessun ID di contatto inviato.",
+"Error reading contact photo." => "Errore di lettura della foto del contatto.",
+"Error saving temporary file." => "Errore di salvataggio del file temporaneo.",
+"The loading photo is not valid." => "La foto caricata non è valida.",
+"Contact ID is missing." => "Manca l'ID del contatto.",
+"No photo path was submitted." => "Non è stato inviato alcun percorso a una foto.",
+"File doesn't exist:" => "Il file non esiste:",
+"Error loading image." => "Errore di caricamento immagine.",
+"Error getting contact object." => "Errore di recupero dell'oggetto contatto.",
+"Error getting PHOTO property." => "Errore di recupero della proprietà FOTO.",
+"Error saving contact." => "Errore di salvataggio del contatto.",
+"Error resizing image" => "Errore di ridimensionamento dell'immagine",
+"Error cropping image" => "Errore di ritaglio dell'immagine",
+"Error creating temporary image" => "Errore durante la creazione dell'immagine temporanea",
+"Error finding image: " => "Errore durante la ricerca dell'immagine: ",
 "Error uploading contacts to storage." => "Errore di invio dei contatti in archivio.",
 "There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato inviato correttamente",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Il file inviato supera la direttiva upload_max_filesize nel php.ini",
@@ -41,9 +45,27 @@
 "The uploaded file was only partially uploaded" => "Il file è stato inviato solo parzialmente",
 "No file was uploaded" => "Nessun file è stato inviato",
 "Missing a temporary folder" => "Manca una cartella temporanea",
+"Couldn't save temporary image: " => "Impossibile salvare l'immagine temporanea: ",
+"Couldn't load temporary image: " => "Impossibile caricare l'immagine temporanea: ",
+"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
 "Contacts" => "Contatti",
-"Drop a VCF file to import contacts." => "Rilascia un file VCF per importare i contatti.",
-"Addressbook not found." => "Rubrica non trovata.",
+"Sorry, this functionality has not been implemented yet" => "Siamo spiacenti, questa funzionalità non è stata ancora implementata",
+"Not implemented" => "Non implementata",
+"Couldn't get a valid address." => "Impossibile ottenere un indirizzo valido.",
+"Error" => "Errore",
+"This property has to be non-empty." => "Questa proprietà non può essere vuota.",
+"Couldn't serialize elements." => "Impossibile serializzare gli elementi.",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' invocata senza l'argomento di tipo. Segnalalo a bugs.owncloud.org",
+"Edit name" => "Modifica il nome",
+"No files selected for upload." => "Nessun file selezionato per l'invio",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Il file che stai cercando di inviare supera la dimensione massima per l'invio dei file su questo server.",
+"Select type" => "Seleziona il tipo",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione.",
+"Result: " => "Risultato: ",
+" imported, " => " importato, ",
+" failed." => " non riuscito.",
+"Displayname cannot be empty." => "Il nome visualizzato non può essere vuoto.",
+"Addressbook not found: " => "Rubrica non trovata:",
 "This is not your addressbook." => "Questa non è la tua rubrica.",
 "Contact could not be found." => "Il contatto non può essere trovato.",
 "Address" => "Indirizzo",
@@ -60,25 +82,50 @@
 "Video" => "Video",
 "Pager" => "Cercapersone",
 "Internet" => "Internet",
+"Birthday" => "Compleanno",
+"Business" => "Lavoro",
+"Call" => "Chiama",
+"Clients" => "Client",
+"Deliverer" => "Corriere",
+"Holidays" => "Festività",
+"Ideas" => "Idee",
+"Journey" => "Viaggio",
+"Jubilee" => "Anniversario",
+"Meeting" => "Riunione",
+"Other" => "Altro",
+"Personal" => "Personale",
+"Projects" => "Progetti",
+"Questions" => "Domande",
 "{name}'s Birthday" => "Data di nascita di {name}",
 "Contact" => "Contatto",
 "Add Contact" => "Aggiungi contatto",
+"Import" => "Importa",
+"Settings" => "Impostazioni",
 "Addressbooks" => "Rubriche",
-"Configure Address Books" => "Configura rubrica",
-"New Address Book" => "Nuova rubrica",
-"Import from VCF" => "Importa da VCF",
-"CardDav Link" => "Link CardDav",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
-"Download contact" => "Scarica contatto",
-"Delete contact" => "Elimina contatto",
+"Close" => "Chiudi",
+"Keyboard shortcuts" => "Scorciatoie da tastiera",
+"Navigation" => "Navigazione",
+"Next contact in list" => "Contatto successivo in elenco",
+"Previous contact in list" => "Contatto precedente in elenco",
+"Expand/collapse current addressbook" => "Espandi/Contrai la rubrica corrente",
+"Actions" => "Azioni",
+"Refresh contacts list" => "Aggiorna l'elenco dei contatti",
+"Add new contact" => "Aggiungi un nuovo contatto",
+"Add new addressbook" => "Aggiungi una nuova rubrica",
+"Delete current contact" => "Elimina il contatto corrente",
 "Drop photo to upload" => "Rilascia una foto da inviare",
+"Delete current photo" => "Elimina la foto corrente",
+"Edit current photo" => "Modifica la foto corrente",
+"Upload new photo" => "Invia una nuova foto",
+"Select photo from ownCloud" => "Seleziona la foto da ownCloud",
 "Format custom, Short name, Full name, Reverse or Reverse with comma" => "Formato personalizzato, nome breve, nome completo, invertito o invertito con virgola",
 "Edit name details" => "Modifica dettagli del nome",
+"Delete" => "Elimina",
 "Nickname" => "Pseudonimo",
 "Enter nickname" => "Inserisci pseudonimo",
-"Birthday" => "Compleanno",
+"Web site" => "Sito web",
+"http://www.somesite.com" => "http://www.somesite.com",
+"Go to web site" => "Vai al sito web",
 "dd-mm-yyyy" => "gg-mm-aaaa",
 "Groups" => "Gruppi",
 "Separate groups with commas" => "Separa i gruppi con virgole",
@@ -94,24 +141,24 @@
 "Edit address details" => "Modifica dettagli dell'indirizzo",
 "Add notes here." => "Aggiungi qui le note.",
 "Add field" => "Aggiungi campo",
-"Profile picture" => "Immagine del profilo",
 "Phone" => "Telefono",
 "Note" => "Nota",
-"Delete current photo" => "Elimina la foto corrente",
-"Edit current photo" => "Modifica la foto corrente",
-"Upload new photo" => "Invia una nuova foto",
-"Select photo from ownCloud" => "Seleziona la foto da ownCloud",
+"Download contact" => "Scarica contatto",
+"Delete contact" => "Elimina contatto",
+"The temporary image has been removed from cache." => "L'immagine temporanea è stata rimossa dalla cache.",
 "Edit address" => "Modifica indirizzo",
 "Type" => "Tipo",
 "PO Box" => "Casella postale",
+"Street address" => "Indirizzo",
+"Street and number" => "Via e numero",
 "Extended" => "Esteso",
-"Street" => "Via",
+"Apartment number etc." => "Numero appartamento ecc.",
 "City" => "Città",
 "Region" => "Regione",
+"E.g. state or province" => "Ad es. stato o provincia",
 "Zipcode" => "CAP",
+"Postal code" => "CAP",
 "Country" => "Stato",
-"Edit categories" => "Modifica categorie",
-"Add" => "Aggiungi",
 "Addressbook" => "Rubrica",
 "Hon. prefixes" => "Prefissi onorifici",
 "Miss" => "Sig.na",
@@ -132,26 +179,29 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "Nuova rubrica",
-"Edit Addressbook" => "Modifica rubrica",
-"Displayname" => "Nome visualizzato",
-"Active" => "Attiva",
-"Save" => "Salva",
-"Submit" => "Invia",
-"Cancel" => "Annulla",
 "Import a contacts file" => "Importa un file di contatti",
 "Please choose the addressbook" => "Scegli la rubrica",
 "create a new addressbook" => "crea una nuova rubrica",
 "Name of new addressbook" => "Nome della nuova rubrica",
-"Import" => "Importa",
 "Importing contacts" => "Importazione contatti",
-"Select address book to import to:" => "Seleziona la rubrica di destinazione:",
-"Select from HD" => "Seleziona da disco",
 "You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
 "Add contact" => "Aggiungi contatto",
 "Configure addressbooks" => "Configura rubriche",
+"Select Address Books" => "Seleziona rubriche",
+"Enter name" => "Inserisci il nome",
+"Enter description" => "Inserisci una descrizione",
 "CardDAV syncing addresses" => "Indirizzi di sincronizzazione CardDAV",
 "more info" => "altre informazioni",
 "Primary address (Kontact et al)" => "Indirizzo principale (Kontact e altri)",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Show CardDav link" => "Mostra collegamento CardDav",
+"Show read-only VCF link" => "Mostra collegamento VCF in sola lettura",
+"Download" => "Scarica",
+"Edit" => "Modifica",
+"New Address Book" => "Nuova rubrica",
+"Name" => "Nome",
+"Description" => "Descrizione",
+"Save" => "Salva",
+"Cancel" => "Annulla",
+"More..." => "Altro..."
 );

apps/contacts/l10n/ja_JP.php

@@ -1,36 +1,40 @@
 <?php $TRANSLATIONS = array(
 "Error (de)activating addressbook." => "アドレスブックの有効/無効化に失敗しました。",
-"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
-"Cannot add empty property." => "項目の新規追加に失敗しました。",
-"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
-"Error adding contact property." => "連絡先の追加に失敗しました。",
+"id is not set." => "idが設定されていません。",
+"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
+"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
 "No ID provided" => "IDが提供されていません",
 "Error setting checksum." => "チェックサムの設定エラー。",
 "No categories selected for deletion." => "削除するカテゴリが選択されていません。",
 "No address books found." => "アドレスブックが見つかりません。",
 "No contacts found." => "連絡先が見つかりません。",
+"There was an error adding the contact." => "連絡先の追加でエラーが発生しました。",
+"element name is not set." => "要素名が設定されていません。",
+"Cannot add empty property." => "項目の新規追加に失敗しました。",
+"At least one of the address fields has to be filled out." => "住所の項目のうち１つは入力して下さい。",
+"Trying to add duplicate property: " => "重複する属性を追加: ",
+"Error adding contact property: " => "コンタクト属性の追加エラー: ",
+"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
+"Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Error parsing VCard for ID: \"" => "VCardからIDの抽出エラー: \"",
-"Cannot add addressbook with an empty name." => "名前を空白にしたままでアドレスブックを追加することはできません。",
-"Error adding addressbook." => "アドレスブックの追加に失敗しました。",
-"Error activating addressbook." => "アドレスブックの有効化に失敗しました。",
+"checksum is not set." => "チェックサムが設定されていません。",
+"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
+"Error updating contact property." => "連絡先の更新に失敗しました。",
 "No contact ID was submitted." => "連絡先IDは登録されませんでした。",
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
 "The loading photo is not valid." => "写真の読み込みは無効です。",
-"id is not set." => "idが設定されていません。",
-"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
-"Error deleting contact property." => "連絡先の削除に失敗しました。",
 "Contact ID is missing." => "コンタクトIDが見つかりません。",
-"Missing contact id." => "コンタクトIDが設定されていません。",
 "No photo path was submitted." => "写真のパスが登録されていません。",
 "File doesn't exist:" => "ファイルが存在しません:",
 "Error loading image." => "画像の読み込みエラー。",
-"element name is not set." => "要素名が設定されていません。",
-"checksum is not set." => "チェックサムが設定されていません。",
-"Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ",
-"Error updating contact property." => "連絡先の更新に失敗しました。",
-"Cannot update addressbook with an empty name." => "空白の名前でアドレスブックを更新することはできません。",
-"Error updating addressbook." => "アドレスブックの更新に失敗しました。",
+"Error getting contact object." => "コンタクトオブジェクトの取得エラー。",
+"Error getting PHOTO property." => "写真属性の取得エラー。",
+"Error saving contact." => "コンタクトの保存エラー。",
+"Error resizing image" => "画像のリサイズエラー",
+"Error cropping image" => "画像の切り抜きエラー",
+"Error creating temporary image" => "一時画像の生成エラー",
+"Error finding image: " => "画像検索エラー: ",
 "Error uploading contacts to storage." => "ストレージへの連絡先のアップロードエラー。",
 "There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini" => "アップロードファイルは php.ini 内の upload_max_filesize の制限を超えています",
@@ -38,9 +42,24 @@
 "The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
 "No file was uploaded" => "ファイルはアップロードされませんでした",
 "Missing a temporary folder" => "一時保存フォルダが見つかりません",
+"Couldn't save temporary image: " => "一時的な画像の保存ができませんでした: ",
+"Couldn't load temporary image: " => "一時的な画像の読み込みができませんでした: ",
+"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
 "Contacts" => "連絡先",
-"Drop a VCF file to import contacts." => "連絡先をインポートするVCFファイルをドロップしてください。",
-"Addressbook not found." => "アドレスブックが見つかりませんでした。",
+"Sorry, this functionality has not been implemented yet" => "申し訳ありません。この機能はまだ実装されていません",
+"Not implemented" => "未実装",
+"Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
+"Error" => "エラー",
+"This property has to be non-empty." => "この属性は空にできません。",
+"Couldn't serialize elements." => "要素をシリアライズできませんでした。",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' は型の引数無しで呼び出されました。bugs.owncloud.org へ報告してください。",
+"Edit name" => "名前を編集",
+"No files selected for upload." => "アップロードするファイルが選択されていません。",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
+"Select type" => "タイプを選択",
+"Result: " => "結果: ",
+" imported, " => " をインポート、 ",
+" failed." => " は失敗しました。",
 "This is not your addressbook." => "これはあなたの電話帳ではありません。",
 "Contact could not be found." => "連絡先を見つける事ができません。",
 "Address" => "住所",
@@ -57,24 +76,44 @@
 "Video" => "テレビ電話",
 "Pager" => "ポケベル",
 "Internet" => "インターネット",
+"Birthday" => "誕生日",
+"Business" => "ビジネス",
+"Clients" => "顧客",
+"Deliverer" => "運送会社",
+"Holidays" => "休日",
+"Ideas" => "アイデア",
+"Journey" => "旅行",
+"Jubilee" => "記念祭",
+"Meeting" => "打ち合わせ",
+"Other" => "その他",
+"Personal" => "個人",
+"Projects" => "プロジェクト",
+"Questions" => "質問",
 "{name}'s Birthday" => "{name}の誕生日",
 "Contact" => "連絡先",
 "Add Contact" => "連絡先の追加",
+"Import" => "インポート",
+"Settings" => "設定",
 "Addressbooks" => "電話帳",
-"Configure Address Books" => "アドレスブックを設定",
-"New Address Book" => "新規電話帳",
-"Import from VCF" => "VCFからインポート",
-"CardDav Link" => "CardDAVリンク",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"Delete" => "削除",
-"Download contact" => "連絡先のダウンロード",
-"Delete contact" => "連絡先の削除",
+"Close" => "閉じる",
+"Keyboard shortcuts" => "キーボードショートカット",
+"Navigation" => "ナビゲーション",
+"Next contact in list" => "リスト内の次のコンタクト",
+"Previous contact in list" => "リスト内の前のコンタクト",
+"Add new contact" => "新しいコンタクトを追加",
+"Add new addressbook" => "新しいアドレスブックを追加",
+"Delete current contact" => "現在のコンタクトを削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
+"Delete current photo" => "現在の写真を削除",
+"Edit current photo" => "現在の写真を編集",
+"Upload new photo" => "新しい写真をアップロード",
+"Select photo from ownCloud" => "ownCloudから写真を選択",
 "Edit name details" => "名前の詳細を編集",
+"Delete" => "削除",
 "Nickname" => "ニックネーム",
 "Enter nickname" => "ニックネームを入力",
-"Birthday" => "誕生日",
+"Web site" => "ウェブサイト",
+"http://www.somesite.com" => "http://www.somesite.com",
 "dd-mm-yyyy" => "yyyy-mm-dd",
 "Groups" => "グループ",
 "Separate groups with commas" => "コンマでグループを分割",
@@ -90,24 +129,20 @@
 "Edit address details" => "住所の詳細を編集",
 "Add notes here." => "ここにメモを追加。",
 "Add field" => "項目を追加",
-"Profile picture" => "プロフィール写真",
 "Phone" => "電話番号",
 "Note" => "メモ",
-"Delete current photo" => "現在の写真を削除",
-"Edit current photo" => "現在の写真を編集",
-"Upload new photo" => "新しい写真をアップロード",
-"Select photo from ownCloud" => "ownCloudから写真を選択",
+"Download contact" => "連絡先のダウンロード",
+"Delete contact" => "連絡先の削除",
+"The temporary image has been removed from cache." => "一時画像はキャッシュから削除されました。",
 "Edit address" => "住所を編集",
 "Type" => "種類",
 "PO Box" => "私書箱",
 "Extended" => "番地2",
-"Street" => "番地1",
 "City" => "都市",
 "Region" => "都道府県",
 "Zipcode" => "郵便番号",
+"Postal code" => "郵便番号",
 "Country" => "国名",
-"Edit categories" => "カテゴリを編集",
-"Add" => "追加",
 "Addressbook" => "アドレスブック",
 "Miss" => "Miss",
 "Ms" => "Ms",
@@ -127,26 +162,22 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"New Addressbook" => "アドレスブックの新規作成",
-"Edit Addressbook" => "アドレスブックを編集",
-"Displayname" => "表示名",
-"Active" => "アクティブ",
-"Save" => "保存",
-"Submit" => "送信",
-"Cancel" => "取り消し",
 "Import a contacts file" => "コンタクトファイルをインポート",
 "Please choose the addressbook" => "アドレスブックを選択してください",
 "create a new addressbook" => "新しいアドレスブックを作成",
 "Name of new addressbook" => "新しいアドレスブックの名前",
-"Import" => "インポート",
 "Importing contacts" => "コンタクトをインポート",
-"Select address book to import to:" => "インポートするアドレスブックを選択:",
-"Select from HD" => "HDから選択",
 "You have no contacts in your addressbook." => "アドレスブックに連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Configure addressbooks" => "アドレス帳を設定",
+"Enter name" => "名前を入力",
 "CardDAV syncing addresses" => "CardDAV同期アドレス",
 "more info" => "詳細情報",
 "Primary address (Kontact et al)" => "プライマリアドレス（Kontact 他）",
-"iOS/OS X" => "iOS/OS X"
+"iOS/OS X" => "iOS/OS X",
+"Download" => "ダウンロード",
+"Edit" => "編集",
+"New Address Book" => "新規電話帳",
+"Save" => "保存",
+"Cancel" => "取り消し"
 );