diff options
author | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 18:20:00 +0400 |
---|---|---|
committer | Michael Gapczynski <mtgap@owncloud.com> | 2012-08-14 18:22:13 +0400 |
commit | 4c7fd8cd0191871e48704f693f48554d4ee7a726 (patch) | |
tree | a66a930783de938deaa3d2362dcf779e5c2b45af /apps/contacts | |
parent | 64ef1e21819979d7fdc406d2628bc175b16fe554 (diff) | |
parent | 62e4f55f721971dacd06649cecefe0487626aa75 (diff) |
Merge branch 'master' into share_api
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
Diffstat (limited to 'apps/contacts')
-rw-r--r-- | apps/contacts/ajax/contact/addproperty.php | 2 | ||||
-rw-r--r-- | apps/contacts/ajax/contact/deleteproperty.php | 2 | ||||
-rw-r--r-- | apps/contacts/ajax/contact/saveproperty.php | 6 | ||||
-rw-r--r-- | apps/contacts/appinfo/remote.php | 9 | ||||
-rw-r--r-- | apps/contacts/js/contacts.js | 2 | ||||
-rw-r--r-- | apps/contacts/l10n/ca.php | 3 | ||||
-rw-r--r-- | apps/contacts/l10n/de.php | 29 | ||||
-rw-r--r-- | apps/contacts/l10n/eo.php | 8 | ||||
-rw-r--r-- | apps/contacts/l10n/es.php | 29 | ||||
-rw-r--r-- | apps/contacts/l10n/fi_FI.php | 7 | ||||
-rw-r--r-- | apps/contacts/l10n/fr.php | 2 | ||||
-rw-r--r-- | apps/contacts/l10n/it.php | 3 | ||||
-rw-r--r-- | apps/contacts/l10n/ja_JP.php | 27 | ||||
-rw-r--r-- | apps/contacts/l10n/ms_MY.php | 22 | ||||
-rw-r--r-- | apps/contacts/templates/index.php | 8 | ||||
-rw-r--r-- | apps/contacts/templates/part.selectaddressbook.php | 7 |
16 files changed, 135 insertions, 31 deletions
diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php index df064367ef1..1412cad1cbc 100644 --- a/apps/contacts/ajax/contact/addproperty.php +++ b/apps/contacts/ajax/contact/addproperty.php @@ -147,6 +147,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) { OCP\JSON::success(array( 'data' => array( 'checksum' => $checksum, - 'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U')) + 'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U')) ) ); diff --git a/apps/contacts/ajax/contact/deleteproperty.php b/apps/contacts/ajax/contact/deleteproperty.php index d7545ff1fbf..b76eb19462c 100644 --- a/apps/contacts/ajax/contact/deleteproperty.php +++ b/apps/contacts/ajax/contact/deleteproperty.php @@ -47,6 +47,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) { OCP\JSON::success(array( 'data' => array( 'id' => $id, - 'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U'), + 'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'), ) )); diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php index 799038b6f1d..fd541b7361e 100644 --- a/apps/contacts/ajax/contact/saveproperty.php +++ b/apps/contacts/ajax/contact/saveproperty.php @@ -148,6 +148,6 @@ if(!OC_Contacts_VCard::edit($id, $vcard)) { OCP\JSON::success(array('data' => array( 'line' => $line, 'checksum' => $checksum, - 'oldchecksum' => $_POST['checksum'] - 'lastmodified' => OC_Contacts_VCard::lastModified($vcard)->format('U') -)); + 'oldchecksum' => $_POST['checksum'], + 'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'), +))); diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php index fd5604aec6f..9eee55583a4 100644 --- a/apps/contacts/appinfo/remote.php +++ b/apps/contacts/appinfo/remote.php @@ -36,10 +36,13 @@ $principalBackend = new OC_Connector_Sabre_Principal(); $carddavBackend = new OC_Connector_Sabre_CardDAV(); // Root nodes -$nodes = array( - new Sabre_CalDAV_Principal_Collection($principalBackend), +$collection = new Sabre_CalDAV_Principal_Collection($principalBackend); +$collection->disableListing = true; // Disable listening + +$nodes = array( + $collection, new Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend), -); + ); // Fire up server $server = new Sabre_DAV_Server($nodes); diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js index 67bfa9847ee..35637de050d 100644 --- a/apps/contacts/js/contacts.js +++ b/apps/contacts/js/contacts.js @@ -1220,7 +1220,7 @@ OC.Contacts={ }, loadPhoto:function(){ var self = this; - var refreshstr = ''; //'&refresh='+Math.random(); + var refreshstr = '&refresh='+Math.random(); $('#phototools li a').tipsy('hide'); var wrapper = $('#contacts_details_photo_wrapper'); wrapper.addClass('loading').addClass('wait'); diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php index 925d78b6844..72550522d5b 100644 --- a/apps/contacts/l10n/ca.php +++ b/apps/contacts/l10n/ca.php @@ -59,6 +59,7 @@ "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.", +"Error loading profile picture." => "Error en carregar la imatge de perfil.", "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: ", @@ -108,6 +109,8 @@ "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", +"Next addressbook" => "Llibreta d'adreces següent", +"Previous addressbook" => "Llibreta d'adreces anterior", "Actions" => "Accions", "Refresh contacts list" => "Carrega de nou la llista de contactes", "Add new contact" => "Afegeix un contacte nou", diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php index 5fa5bb4f9dd..a47b61d5075 100644 --- a/apps/contacts/l10n/de.php +++ b/apps/contacts/l10n/de.php @@ -2,13 +2,13 @@ "Error (de)activating addressbook." => "(De-)Aktivierung des Adressbuches 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", +"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.", -"There was an error adding the contact." => "Erstellen des Kontakts fehlgeschlagen", +"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.", @@ -16,7 +16,7 @@ "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", +"Error deleting contact property." => "Kontakteigenschaft löschen fehlgeschlagen.", "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.", @@ -33,15 +33,15 @@ "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 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", -"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist", +"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", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Datei größer, als die MAX_FILE_SIZE Direktive erlaubt, die im HTML Formular spezifiziert ist", "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", @@ -50,17 +50,18 @@ "No file was uploaded. Unknown error" => "Keine Datei hochgeladen. Unbekannter Fehler", "Contacts" => "Kontakte", "Sorry, this functionality has not been implemented yet" => "Diese Funktion steht leider noch nicht zur Verfügung", -"Not implemented" => "Nicht Verfügbar", +"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.", +"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", +"'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.", +"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Die Datei, die du hochladen willst, überschreitet die maximale Größe für Datei-Uploads auf diesem Server.", +"Error loading profile picture." => "Fehler beim Laden des Profilbildes.", "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 ...", +"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.", @@ -119,7 +120,7 @@ "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", +"Select photo from ownCloud" => "Foto aus der 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", @@ -134,7 +135,7 @@ "Edit groups" => "Gruppen editieren", "Preferred" => "Bevorzugt", "Please specify a valid email address." => "Bitte eine gültige E-Mail-Adresse angeben.", -"Enter email address" => "E-Mail-Adresse angeben.", +"Enter email address" => "E-Mail-Adresse angeben", "Mail to address" => "E-Mail an diese Adresse schreiben", "Delete email address" => "E-Mail-Adresse löschen", "Enter phone number" => "Telefonnummer angeben", @@ -194,7 +195,7 @@ "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)", +"Primary address (Kontact et al)" => "primäre Adresse (für Kontakt o.ä. Programme)", "iOS/OS X" => "iOS/OS X", "Show CardDav link" => "CardDav-Link anzeigen", "Show read-only VCF link" => "Schreibgeschützten VCF-Link anzeigen", diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php index 29ac52b1fe7..33c0106d5a4 100644 --- a/apps/contacts/l10n/eo.php +++ b/apps/contacts/l10n/eo.php @@ -39,6 +39,8 @@ "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 exceeds the upload_max_filesize directive in php.ini" => "La alŝutita dosiero transpasas la preskribon upload_max_filesize en php.ini", +"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La alŝutita dosiero transpasas la preskribon MAX_FILE_SIZE kiu specifiĝis en la HTML-formularo", "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.", @@ -53,6 +55,7 @@ "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.", +"The file you are trying to upload exceed the maximum size for file uploads on this server." => "La dosiero, kiun vi provas alŝuti, transpasas la maksimuman grandon por dosieraj alŝutoj en ĉi tiu servilo.", "Select type" => "Elektu tipon", "Result: " => "Rezulto: ", " imported, " => " enportoj, ", @@ -76,7 +79,9 @@ "Internet" => "Interreto", "Birthday" => "Naskiĝotago", "Business" => "Negoco", +"Call" => "Voko", "Clients" => "Klientoj", +"Holidays" => "Ferioj", "Ideas" => "Ideoj", "Meeting" => "Kunveno", "Other" => "Alia", @@ -94,7 +99,10 @@ "Navigation" => "Navigado", "Next contact in list" => "Sekva kontakto en la listo", "Previous contact in list" => "Malsekva kontakto en la listo", +"Next addressbook" => "Sekva adresaro", +"Previous addressbook" => "Malsekva adresaro", "Actions" => "Agoj", +"Refresh contacts list" => "Refreŝigi la kontaktoliston", "Add new contact" => "Aldoni novan kontakton", "Add new addressbook" => "Aldoni novan adresaron", "Delete current contact" => "Forigi la nunan kontakton", diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php index e9ee24d5297..ebc38dfb3ee 100644 --- a/apps/contacts/l10n/es.php +++ b/apps/contacts/l10n/es.php @@ -78,12 +78,32 @@ "Pager" => "Localizador", "Internet" => "Internet", "Birthday" => "Cumpleaños", +"Business" => "Negocio", +"Call" => "Llamada", +"Clients" => "Clientes", +"Holidays" => "Vacaciones", +"Ideas" => "Ideas", +"Journey" => "Jornada", +"Meeting" => "Reunión", +"Other" => "Otro", +"Personal" => "Personal", +"Projects" => "Proyectos", +"Questions" => "Preguntas", "{name}'s Birthday" => "Cumpleaños de {name}", "Contact" => "Contacto", "Add Contact" => "Añadir contacto", "Import" => "Importar", +"Settings" => "Configuración", "Addressbooks" => "Libretas de direcciones", "Close" => "Cierra.", +"Keyboard shortcuts" => "Atajos de teclado", +"Navigation" => "Navegación", +"Next contact in list" => "Siguiente contacto en la lista", +"Previous contact in list" => "Anterior contacto en la lista", +"Actions" => "Acciones", +"Refresh contacts list" => "Refrescar la lista de contactos", +"Add new contact" => "Añadir un nuevo contacto", +"Delete current contact" => "Eliminar contacto actual", "Drop photo to upload" => "Suelta una foto para subirla", "Delete current photo" => "Eliminar fotografía actual", "Edit current photo" => "Editar fotografía actual", @@ -94,6 +114,7 @@ "Delete" => "Borrar", "Nickname" => "Alias", "Enter nickname" => "Introduce un alias", +"Web site" => "Sitio Web", "dd-mm-yyyy" => "dd-mm-yyyy", "Groups" => "Grupos", "Separate groups with commas" => "Separa los grupos con comas", @@ -121,6 +142,7 @@ "City" => "Ciudad", "Region" => "Región", "Zipcode" => "Código postal", +"Postal code" => "Código postal", "Country" => "País", "Addressbook" => "Libreta de direcciones", "Hon. prefixes" => "Prefijos honoríficos", @@ -150,6 +172,8 @@ "You have no contacts in your addressbook." => "No hay contactos en tu agenda.", "Add contact" => "Añadir contacto", "Configure addressbooks" => "Configurar agenda", +"Enter name" => "Introducir nombre", +"Enter description" => "Introducir descripción", "CardDAV syncing addresses" => "Sincronizando direcciones", "more info" => "más información", "Primary address (Kontact et al)" => "Dirección primaria (Kontact et al)", @@ -157,6 +181,9 @@ "Download" => "Descargar", "Edit" => "Editar", "New Address Book" => "Nueva libreta de direcciones", +"Name" => "Nombre", +"Description" => "Descripción", "Save" => "Guardar", -"Cancel" => "Cancelar" +"Cancel" => "Cancelar", +"More..." => "Más..." ); diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php index 6aab4ed3472..069b08144e5 100644 --- a/apps/contacts/l10n/fi_FI.php +++ b/apps/contacts/l10n/fi_FI.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( "Error updating addressbook." => "Virhe päivitettäessä osoitekirjaa.", +"Error setting checksum." => "Virhe asettaessa tarkistussummaa.", "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.", @@ -11,6 +12,7 @@ "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.", +"No photo path was submitted." => "Kuvan polkua ei annettu.", "File doesn't exist:" => "Tiedostoa ei ole olemassa:", "Error loading image." => "Virhe kuvaa ladatessa.", "Error saving contact." => "Virhe yhteystietoa tallennettaessa.", @@ -22,11 +24,14 @@ "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", +"Couldn't save temporary image: " => "Väliaikaiskuvan tallennus epäonnistui:", +"Couldn't load temporary image: " => "Väliaikaiskuvan lataus epäonnistui:", "No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe", "Contacts" => "Yhteystiedot", "Error" => "Virhe", "Edit name" => "Muokkaa nimeä", "No files selected for upload." => "Tiedostoja ei ole valittu lähetettäväksi.", +"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Jotkin yhteystiedot on merkitty poistettaviksi, mutta niitä ei ole vielä poistettu. Odota hetki, että kyseiset yhteystiedot poistetaan.", "Result: " => "Tulos: ", " imported, " => " tuotu, ", " failed." => " epäonnistui.", @@ -61,6 +66,8 @@ "Keyboard shortcuts" => "Pikanäppäimet", "Next contact in list" => "Seuraava yhteystieto luettelossa", "Previous contact in list" => "Edellinen yhteystieto luettelossa", +"Next addressbook" => "Seuraava osoitekirja", +"Previous addressbook" => "Edellinen osoitekirja", "Actions" => "Toiminnot", "Refresh contacts list" => "Päivitä yhteystietoluettelo", "Add new contact" => "Lisää uusi yhteystieto", diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php index 9b4822bd976..93299380d22 100644 --- a/apps/contacts/l10n/fr.php +++ b/apps/contacts/l10n/fr.php @@ -60,6 +60,7 @@ "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", +"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Certains contacts sont marqués pour être supprimés mais sont encore présents, veuillez attendre que l'opération se termine.", "Result: " => "Résultat :", " imported, " => "importé,", " failed." => "échoué.", @@ -196,6 +197,7 @@ "Primary address (Kontact et al)" => "Adresse principale", "iOS/OS X" => "iOS/OS X", "Show CardDav link" => "Afficher le lien CardDav", +"Show read-only VCF link" => "Afficher les liens VCF en lecture seule", "Download" => "Télécharger", "Edit" => "Modifier", "New Address Book" => "Nouveau Carnet d'adresses", diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php index 31f950ff80c..e1af39fe91a 100644 --- a/apps/contacts/l10n/it.php +++ b/apps/contacts/l10n/it.php @@ -59,6 +59,7 @@ "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.", +"Error loading profile picture." => "Errore durante il caricamento dell'immagine di profilo.", "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: ", @@ -108,6 +109,8 @@ "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", +"Next addressbook" => "Rubrica successiva", +"Previous addressbook" => "Rubrica precedente", "Actions" => "Azioni", "Refresh contacts list" => "Aggiorna l'elenco dei contatti", "Add new contact" => "Aggiungi un nuovo contatto", diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php index 074a725b48b..4f7800e1dbc 100644 --- a/apps/contacts/l10n/ja_JP.php +++ b/apps/contacts/l10n/ja_JP.php @@ -10,15 +10,18 @@ "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." => "住所の項目のうち1つは入力して下さい。", "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の抽出エラー: \"", "checksum is not set." => "チェックサムが設定されていません。", "Information about vCard is incorrect. Please reload the page: " => "vCardの情報が正しくありません。ページを再読み込みしてください: ", +"Something went FUBAR. " => "何かがFUBARへ移動しました。", "Error updating contact property." => "連絡先の更新に失敗しました。", "No contact ID was submitted." => "連絡先IDは登録されませんでした。", "Error reading contact photo." => "連絡先写真の読み込みエラー。", @@ -60,6 +63,8 @@ "Result: " => "結果: ", " imported, " => " をインポート、 ", " failed." => " は失敗しました。", +"Displayname cannot be empty." => "表示名は空にできません。", +"Addressbook not found: " => "連絡先が見つかりません:", "This is not your addressbook." => "これはあなたの電話帳ではありません。", "Contact could not be found." => "連絡先を見つける事ができません。", "Address" => "住所", @@ -78,6 +83,7 @@ "Internet" => "インターネット", "Birthday" => "誕生日", "Business" => "ビジネス", +"Call" => "電話", "Clients" => "顧客", "Deliverer" => "運送会社", "Holidays" => "休日", @@ -100,6 +106,11 @@ "Navigation" => "ナビゲーション", "Next contact in list" => "リスト内の次のコンタクト", "Previous contact in list" => "リスト内の前のコンタクト", +"Expand/collapse current addressbook" => "現在の連絡帳を展開する/折りたたむ", +"Next addressbook" => "次の連絡先", +"Previous addressbook" => "前の連絡先", +"Actions" => "アクション", +"Refresh contacts list" => "連絡先リストを再読込する", "Add new contact" => "新しいコンタクトを追加", "Add new addressbook" => "新しいアドレスブックを追加", "Delete current contact" => "現在のコンタクトを削除", @@ -114,6 +125,7 @@ "Enter nickname" => "ニックネームを入力", "Web site" => "ウェブサイト", "http://www.somesite.com" => "http://www.somesite.com", +"Go to web site" => "Webサイトへ移動", "dd-mm-yyyy" => "yyyy-mm-dd", "Groups" => "グループ", "Separate groups with commas" => "コンマでグループを分割", @@ -137,9 +149,13 @@ "Edit address" => "住所を編集", "Type" => "種類", "PO Box" => "私書箱", -"Extended" => "番地2", +"Street address" => "住所1", +"Street and number" => "番地", +"Extended" => "住所2", +"Apartment number etc." => "アパート名等", "City" => "都市", "Region" => "都道府県", +"E.g. state or province" => "例:東京都、大阪府", "Zipcode" => "郵便番号", "Postal code" => "郵便番号", "Country" => "国名", @@ -170,14 +186,21 @@ "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)" => "プライマリアドレス(Kontact 他)", "iOS/OS X" => "iOS/OS X", +"Show CardDav link" => "CarDavリンクを表示", +"Show read-only VCF link" => "読み取り専用のVCFリンクを表示", "Download" => "ダウンロード", "Edit" => "編集", "New Address Book" => "新規電話帳", +"Name" => "名前", +"Description" => "説明", "Save" => "保存", -"Cancel" => "取り消し" +"Cancel" => "取り消し", +"More..." => "もっと..." ); diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php index 2fd386f5a81..8153c4d9366 100644 --- a/apps/contacts/l10n/ms_MY.php +++ b/apps/contacts/l10n/ms_MY.php @@ -61,6 +61,7 @@ "Result: " => "Hasil: ", " imported, " => " import, ", " failed." => " gagal.", +"Addressbook not found: " => "Buku alamat tidak ditemui:", "This is not your addressbook." => "Ini bukan buku alamat anda.", "Contact could not be found." => "Hubungan tidak dapat ditemui", "Address" => "Alamat", @@ -78,12 +79,25 @@ "Pager" => "Alat Kelui", "Internet" => "Internet", "Birthday" => "Hari lahir", +"Business" => "Perniagaan", +"Clients" => "klien", +"Holidays" => "Hari kelepasan", +"Ideas" => "Idea", +"Journey" => "Perjalanan", +"Jubilee" => "Jubli", +"Meeting" => "Mesyuarat", +"Other" => "Lain", +"Personal" => "Peribadi", +"Projects" => "Projek", "{name}'s Birthday" => "Hari Lahir {name}", "Contact" => "Hubungan", "Add Contact" => "Tambah kenalan", "Import" => "Import", +"Settings" => "Tetapan", "Addressbooks" => "Senarai Buku Alamat", "Close" => "Tutup", +"Next addressbook" => "Buku alamat seterusnya", +"Previous addressbook" => "Buku alamat sebelumnya", "Drop photo to upload" => "Letak foto disini untuk muatnaik", "Delete current photo" => "Padam foto semasa", "Edit current photo" => "Ubah foto semasa", @@ -150,6 +164,9 @@ "You have no contacts in your addressbook." => "Anda tidak mempunyai sebarang kenalan didalam buku alamat.", "Add contact" => "Letak kenalan", "Configure addressbooks" => "Konfigurasi buku alamat", +"Select Address Books" => "Pilih Buku Alamat", +"Enter name" => "Masukkan nama", +"Enter description" => "Masukkan keterangan", "CardDAV syncing addresses" => "alamat selarian CardDAV", "more info" => "maklumat lanjut", "Primary address (Kontact et al)" => "Alamat utama", @@ -157,6 +174,9 @@ "Download" => "Muat naik", "Edit" => "Sunting", "New Address Book" => "Buku Alamat Baru", +"Name" => "Nama", +"Description" => "Keterangan", "Save" => "Simpan", -"Cancel" => "Batal" +"Cancel" => "Batal", +"More..." => "Lagi..." ); diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index 024b1d150f8..744381026ab 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -13,9 +13,9 @@ <div id="bottomcontrols"> <button class="svg" id="contacts_newcontact" title="<?php echo $l->t('Add Contact'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('contacts', 'contact-new.svg'); ?>" alt="<?php echo $l->t('Add Contact'); ?>" /></button> <button class="svg import tip" title="<?php echo $l->t('Import'); ?>"> - <img class="svg" src="core/img/actions/upload.svg" alt="<?php echo $l->t('Import'); ?>" /> + <img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/upload.svg') ?>" alt="<?php echo $l->t('Import'); ?>" /> </button> - <button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="core/img/actions/settings.svg" alt="<?php echo $l->t('Addressbooks'); ?>" /></button> + <button class="svg settings tip" title="<?php echo $l->t('Settings'); ?>"><img class="svg" src="<?php echo OCP\Util::imagePath('core', 'actions/settings.svg') ?>" alt="<?php echo $l->t('Addressbooks'); ?>" /></button> <form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target"> <input class="float" id="import_upload_start" type="file" accept="text/directory,text/vcard,text/x-vcard" name="importfile" /> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> @@ -69,6 +69,6 @@ <div id="dialog_holder"></div> <!-- End of Dialogs --> <menu type="context" id="addressbookmenu"> - <menuitem label="Delete" icon="core/img/actions/delete.svg" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem> - <menuitem label="Rename" icon="core/img/actions/rename.svg" onclick="alert('Can\'t do that')"></menuitem> + <menuitem label="Delete" icon="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" onclick="alert('Really? ' + $(this).attr('data-id'))"></menuitem> + <menuitem label="Rename" icon="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>" onclick="alert('Can\'t do that')"></menuitem> </menu> diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php index c54ddaf2e67..812a3b891ff 100644 --- a/apps/contacts/templates/part.selectaddressbook.php +++ b/apps/contacts/templates/part.selectaddressbook.php @@ -1,4 +1,11 @@ <div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>"> +<script type="text/javascript"> +$(document).ready(function() { + $('input.name,input.desc').on('focus', function(e) { + $('#book_new').prop('checked', true); + }); +}); +</script> <form> <table style="width: 100%"> <?php foreach($_['addressbooks'] as $idx => $addressbook) { ?> |