diff options
Diffstat (limited to 'apps/dav')
30 files changed, 137 insertions, 41 deletions
diff --git a/apps/dav/l10n/cs.js b/apps/dav/l10n/cs.js index ad5472e5061..f95b7f2e806 100644 --- a/apps/dav/l10n/cs.js +++ b/apps/dav/l10n/cs.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna", "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn", "Contact birthdays" : "Narozeniny kontaktů", + "%1$s via %2$s" : "%1$s prostřednictvím %2$s", "Invitation canceled" : "Pozvánka zrušena", "Hello %s," : "Dobrý den %s,", + "The meeting »%1$s« with %2$s was canceled." : "Setkání „%1$s“ sc%2$s bylo zrušeno.", "Invitation updated" : "Pozvánka aktualizována", + "The meeting »%1$s« with %2$s was updated." : "Setkání „%1$s“ s %2$s bylo zrušeno.", + "%1$s invited you to »%2$s«" : "%1$s vás pozval(a) na „%2$s“", "When:" : "Kdy:", "Where:" : "Kde:", "Description:" : "Popis:", diff --git a/apps/dav/l10n/cs.json b/apps/dav/l10n/cs.json index 19bfb037f8d..87b1c10957a 100644 --- a/apps/dav/l10n/cs.json +++ b/apps/dav/l10n/cs.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "<strong>Událost</strong> v kalendáři byla změněna", "A calendar <strong>todo</strong> was modified" : "<strong>Úkol</strong> v kalendáři byl změněn", "Contact birthdays" : "Narozeniny kontaktů", + "%1$s via %2$s" : "%1$s prostřednictvím %2$s", "Invitation canceled" : "Pozvánka zrušena", "Hello %s," : "Dobrý den %s,", + "The meeting »%1$s« with %2$s was canceled." : "Setkání „%1$s“ sc%2$s bylo zrušeno.", "Invitation updated" : "Pozvánka aktualizována", + "The meeting »%1$s« with %2$s was updated." : "Setkání „%1$s“ s %2$s bylo zrušeno.", + "%1$s invited you to »%2$s«" : "%1$s vás pozval(a) na „%2$s“", "When:" : "Kdy:", "Where:" : "Kde:", "Description:" : "Popis:", diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js index 76d173e1619..7bff721606c 100644 --- a/apps/dav/l10n/de.js +++ b/apps/dav/l10n/de.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet", "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet", "Contact birthdays" : "Geburtstage von Kontakten", + "%1$s via %2$s" : "%1$s über %2$s", "Invitation canceled" : "Einladung abgebrochen", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "Der Termin »%1$s« mit %2$s wurde abgesagt.", "Invitation updated" : "Einladung aktualisiert", + "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.", + "%1$s invited you to »%2$s«" : "%1$s hat Dich zu »%2$s« eingeladen", "When:" : "Wann:", "Where:" : "Wo:", "Description:" : "Beschreibung:", diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json index 5b5e8582af7..7866287945f 100644 --- a/apps/dav/l10n/de.json +++ b/apps/dav/l10n/de.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet", "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet", "Contact birthdays" : "Geburtstage von Kontakten", + "%1$s via %2$s" : "%1$s über %2$s", "Invitation canceled" : "Einladung abgebrochen", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "Der Termin »%1$s« mit %2$s wurde abgesagt.", "Invitation updated" : "Einladung aktualisiert", + "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.", + "%1$s invited you to »%2$s«" : "%1$s hat Dich zu »%2$s« eingeladen", "When:" : "Wann:", "Where:" : "Wo:", "Description:" : "Beschreibung:", diff --git a/apps/dav/l10n/de_DE.js b/apps/dav/l10n/de_DE.js index dce623dea22..de39673f9aa 100644 --- a/apps/dav/l10n/de_DE.js +++ b/apps/dav/l10n/de_DE.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet", "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet", "Contact birthdays" : "Geburtstage von Kontakten", + "%1$s via %2$s" : "%1$s über %2$s", "Invitation canceled" : "Einladung abgebrochen", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "Der Termin »%1$s« mit %2$s wurde abgesagt.", "Invitation updated" : "Einladung aktualisiert", + "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.", + "%1$s invited you to »%2$s«" : "%1$s hat Sie zu »%2$s« eingeladen", "When:" : "Wann:", "Where:" : "Wo:", "Description:" : "Beschreibung:", diff --git a/apps/dav/l10n/de_DE.json b/apps/dav/l10n/de_DE.json index af246a957af..6885245baf4 100644 --- a/apps/dav/l10n/de_DE.json +++ b/apps/dav/l10n/de_DE.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Ein Kalender-<strong>Ereignis</strong> wurde bearbeitet", "A calendar <strong>todo</strong> was modified" : "Eine Kalender-<strong>Aufgabe</strong> wurde bearbeitet", "Contact birthdays" : "Geburtstage von Kontakten", + "%1$s via %2$s" : "%1$s über %2$s", "Invitation canceled" : "Einladung abgebrochen", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "Der Termin »%1$s« mit %2$s wurde abgesagt.", "Invitation updated" : "Einladung aktualisiert", + "The meeting »%1$s« with %2$s was updated." : "Der Termin »%1$s« mit %2$s wurde aktualisiert.", + "%1$s invited you to »%2$s«" : "%1$s hat Sie zu »%2$s« eingeladen", "When:" : "Wann:", "Where:" : "Wo:", "Description:" : "Beschreibung:", diff --git a/apps/dav/l10n/es.js b/apps/dav/l10n/es.js index f194116ad39..b67b8ad104b 100644 --- a/apps/dav/l10n/es.js +++ b/apps/dav/l10n/es.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.", "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada", "Contact birthdays" : "Cumpleaños del contacto", + "%1$s via %2$s" : "%1$s vía %2$s", "Invitation canceled" : "Invitación cancelada", "Hello %s," : "Hola, %s:", + "The meeting »%1$s« with %2$s was canceled." : "La reunión »%1$s« con %2$s se ha cancelado.", "Invitation updated" : "Invitación actualizada", + "The meeting »%1$s« with %2$s was updated." : "La reunión »%1$s« con %2$s se ha actualizado.", + "%1$s invited you to »%2$s«" : "%1$s te ha invitado a »%2$s«", "When:" : "Cuándo:", "Where:" : "Dónde:", "Description:" : "Descripción:", diff --git a/apps/dav/l10n/es.json b/apps/dav/l10n/es.json index 293606f2a2b..223704d7163 100644 --- a/apps/dav/l10n/es.json +++ b/apps/dav/l10n/es.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario fue modificado.", "A calendar <strong>todo</strong> was modified" : "Una <strong>lista de tareas</strong> fue modificada", "Contact birthdays" : "Cumpleaños del contacto", + "%1$s via %2$s" : "%1$s vía %2$s", "Invitation canceled" : "Invitación cancelada", "Hello %s," : "Hola, %s:", + "The meeting »%1$s« with %2$s was canceled." : "La reunión »%1$s« con %2$s se ha cancelado.", "Invitation updated" : "Invitación actualizada", + "The meeting »%1$s« with %2$s was updated." : "La reunión »%1$s« con %2$s se ha actualizado.", + "%1$s invited you to »%2$s«" : "%1$s te ha invitado a »%2$s«", "When:" : "Cuándo:", "Where:" : "Dónde:", "Description:" : "Descripción:", diff --git a/apps/dav/l10n/fr.js b/apps/dav/l10n/fr.js index 04fe4b3f462..076ff784dbc 100644 --- a/apps/dav/l10n/fr.js +++ b/apps/dav/l10n/fr.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Un <strong>événement</strong> de l'agenda a été modifié", "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée", "Contact birthdays" : "Anniversaires des contacts", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Invitation annulée", "Hello %s," : "Bonjour %s,", + "The meeting »%1$s« with %2$s was canceled." : "La réunion «%1$s» avec %2$s a été annulée.", "Invitation updated" : "Invitation mise à jour", + "The meeting »%1$s« with %2$s was updated." : "La réunion «%1$s» avec %2$s a été mise à jour.", + "%1$s invited you to »%2$s«" : "%1$s vous a invité à «%2$s»", "When:" : "Quand :", "Where:" : "Où :", "Description:" : "Description :", diff --git a/apps/dav/l10n/fr.json b/apps/dav/l10n/fr.json index cdfd93830bf..15bc5b1ae20 100644 --- a/apps/dav/l10n/fr.json +++ b/apps/dav/l10n/fr.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Un <strong>événement</strong> de l'agenda a été modifié", "A calendar <strong>todo</strong> was modified" : "Une <strong>liste de tâches</strong> de l'agenda a été modifiée", "Contact birthdays" : "Anniversaires des contacts", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Invitation annulée", "Hello %s," : "Bonjour %s,", + "The meeting »%1$s« with %2$s was canceled." : "La réunion «%1$s» avec %2$s a été annulée.", "Invitation updated" : "Invitation mise à jour", + "The meeting »%1$s« with %2$s was updated." : "La réunion «%1$s» avec %2$s a été mise à jour.", + "%1$s invited you to »%2$s«" : "%1$s vous a invité à «%2$s»", "When:" : "Quand :", "Where:" : "Où :", "Description:" : "Description :", diff --git a/apps/dav/l10n/hu.js b/apps/dav/l10n/hu.js index 8253fe26121..6e3ba357dae 100644 --- a/apps/dav/l10n/hu.js +++ b/apps/dav/l10n/hu.js @@ -55,6 +55,7 @@ OC.L10N.register( "Technical details" : "Technikai adatok", "Remote Address: %s" : "Távoli cím: %s", "Request ID: %s" : "Kérelem azonosító: %s", + "Save" : "Mentés", "Send invitations to attendees" : "Meghívó küldése a résztvevőknek", "Please make sure to properly set up the email settings above." : "Győződj meg róla, hogy a fenti e-mail beállítások helyesek.", "Automatically generate a birthday calendar" : "Születésnapokat tartalmazó naptár automatikus létrehozása", diff --git a/apps/dav/l10n/hu.json b/apps/dav/l10n/hu.json index 9c4ae3e8582..896f0b317cf 100644 --- a/apps/dav/l10n/hu.json +++ b/apps/dav/l10n/hu.json @@ -53,6 +53,7 @@ "Technical details" : "Technikai adatok", "Remote Address: %s" : "Távoli cím: %s", "Request ID: %s" : "Kérelem azonosító: %s", + "Save" : "Mentés", "Send invitations to attendees" : "Meghívó küldése a résztvevőknek", "Please make sure to properly set up the email settings above." : "Győződj meg róla, hogy a fenti e-mail beállítások helyesek.", "Automatically generate a birthday calendar" : "Születésnapokat tartalmazó naptár automatikus létrehozása", diff --git a/apps/dav/l10n/it.js b/apps/dav/l10n/it.js index ede61ea7812..1d2ae26227d 100644 --- a/apps/dav/l10n/it.js +++ b/apps/dav/l10n/it.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario è stato modificato", "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata", "Contact birthdays" : "Date di nascita dei contatti", + "%1$s via %2$s" : "%1$s tramite %2$s", "Invitation canceled" : "Invito annullato", "Hello %s," : "Ciao %s,", + "The meeting »%1$s« with %2$s was canceled." : "L'incontro «%1$s» con %2$s è stato annullato.", "Invitation updated" : "Invito aggiornato", + "The meeting »%1$s« with %2$s was updated." : "L'incontro «%1$s» con %2$s è stato aggiornato.", + "%1$s invited you to »%2$s«" : "%1$s ti ha invitato a «%2$s»", "When:" : "Quando:", "Where:" : "Dove:", "Description:" : "Descrizione:", diff --git a/apps/dav/l10n/it.json b/apps/dav/l10n/it.json index d07eda0ed09..e331e4bfce5 100644 --- a/apps/dav/l10n/it.json +++ b/apps/dav/l10n/it.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> del calendario è stato modificato", "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stata modificata", "Contact birthdays" : "Date di nascita dei contatti", + "%1$s via %2$s" : "%1$s tramite %2$s", "Invitation canceled" : "Invito annullato", "Hello %s," : "Ciao %s,", + "The meeting »%1$s« with %2$s was canceled." : "L'incontro «%1$s» con %2$s è stato annullato.", "Invitation updated" : "Invito aggiornato", + "The meeting »%1$s« with %2$s was updated." : "L'incontro «%1$s» con %2$s è stato aggiornato.", + "%1$s invited you to »%2$s«" : "%1$s ti ha invitato a «%2$s»", "When:" : "Quando:", "Where:" : "Dove:", "Description:" : "Descrizione:", diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js index 55869d7a08f..91df26e7acc 100644 --- a/apps/dav/l10n/nl.js +++ b/apps/dav/l10n/nl.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast", "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast", "Contact birthdays" : "Verjaardagen", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Uitnodiging geannuleerd", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "De vergadering »%1$s« met %2$s is geannuleerd.", "Invitation updated" : "Uitnodiging bijgewerkt", + "The meeting »%1$s« with %2$s was updated." : "De vergadering »%1$s« met %2$s is bijgewerkt.", + "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor »%2$s«", "When:" : "Wanneer:", "Where:" : "Waar:", "Description:" : "Omschrijving:", diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json index d801c5705e0..edc8640ab1c 100644 --- a/apps/dav/l10n/nl.json +++ b/apps/dav/l10n/nl.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast", "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast", "Contact birthdays" : "Verjaardagen", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Uitnodiging geannuleerd", "Hello %s," : "Hallo %s,", + "The meeting »%1$s« with %2$s was canceled." : "De vergadering »%1$s« met %2$s is geannuleerd.", "Invitation updated" : "Uitnodiging bijgewerkt", + "The meeting »%1$s« with %2$s was updated." : "De vergadering »%1$s« met %2$s is bijgewerkt.", + "%1$s invited you to »%2$s«" : "%1$s heeft je uitgenodigd voor »%2$s«", "When:" : "Wanneer:", "Where:" : "Waar:", "Description:" : "Omschrijving:", diff --git a/apps/dav/l10n/pt_BR.js b/apps/dav/l10n/pt_BR.js index d6cf76a4cec..14e16eaa66e 100644 --- a/apps/dav/l10n/pt_BR.js +++ b/apps/dav/l10n/pt_BR.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado", "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada", "Contact birthdays" : "Aniversário dos contatos", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Convite cancelado", "Hello %s," : "Olá %s,", + "The meeting »%1$s« with %2$s was canceled." : "A reunião »%1$s« com %2$s foi cancelada.", "Invitation updated" : "Convite atualizado", + "The meeting »%1$s« with %2$s was updated." : "A reunião »%1$s« com %2$s foi atualizada.", + "%1$s invited you to »%2$s«" : "%1$s convidou você para »%2$s«", "When:" : "Quando:", "Where:" : "Onde:", "Description:" : "Descrição:", diff --git a/apps/dav/l10n/pt_BR.json b/apps/dav/l10n/pt_BR.json index a20dbedf879..6847ce59dce 100644 --- a/apps/dav/l10n/pt_BR.json +++ b/apps/dav/l10n/pt_BR.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Um <strong>evento</strong> do calendário foi modificado", "A calendar <strong>todo</strong> was modified" : "Uma <strong>tarefa</strong> do calendário foi modificada", "Contact birthdays" : "Aniversário dos contatos", + "%1$s via %2$s" : "%1$s via %2$s", "Invitation canceled" : "Convite cancelado", "Hello %s," : "Olá %s,", + "The meeting »%1$s« with %2$s was canceled." : "A reunião »%1$s« com %2$s foi cancelada.", "Invitation updated" : "Convite atualizado", + "The meeting »%1$s« with %2$s was updated." : "A reunião »%1$s« com %2$s foi atualizada.", + "%1$s invited you to »%2$s«" : "%1$s convidou você para »%2$s«", "When:" : "Quando:", "Where:" : "Onde:", "Description:" : "Descrição:", diff --git a/apps/dav/l10n/ru.js b/apps/dav/l10n/ru.js index 086422939b4..af15a91ff99 100644 --- a/apps/dav/l10n/ru.js +++ b/apps/dav/l10n/ru.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "<strong>Событие</strong> календаря была изменено", "A calendar <strong>todo</strong> was modified" : "<strong>Задача</strong> календаря была изменена", "Contact birthdays" : "Дни рождения контакта", + "%1$s via %2$s" : "%1$sчерез %2$s", "Invitation canceled" : "Приглашение отменено", "Hello %s," : "Привет, %s!", + "The meeting »%1$s« with %2$s was canceled." : "Встреча «%1$s» с %2$s отменена.", "Invitation updated" : "Приглашение обновлено", + "The meeting »%1$s« with %2$s was updated." : "Встреча «%1$s» с %2$s обновлена.", + "%1$s invited you to »%2$s«" : "%1$sприглашает вас в »%2$s«", "When:" : "Когда:", "Where:" : "Где:", "Description:" : "Описание:", diff --git a/apps/dav/l10n/ru.json b/apps/dav/l10n/ru.json index c9590a1db4f..8c425f1c661 100644 --- a/apps/dav/l10n/ru.json +++ b/apps/dav/l10n/ru.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "<strong>Событие</strong> календаря была изменено", "A calendar <strong>todo</strong> was modified" : "<strong>Задача</strong> календаря была изменена", "Contact birthdays" : "Дни рождения контакта", + "%1$s via %2$s" : "%1$sчерез %2$s", "Invitation canceled" : "Приглашение отменено", "Hello %s," : "Привет, %s!", + "The meeting »%1$s« with %2$s was canceled." : "Встреча «%1$s» с %2$s отменена.", "Invitation updated" : "Приглашение обновлено", + "The meeting »%1$s« with %2$s was updated." : "Встреча «%1$s» с %2$s обновлена.", + "%1$s invited you to »%2$s«" : "%1$sприглашает вас в »%2$s«", "When:" : "Когда:", "Where:" : "Где:", "Description:" : "Описание:", diff --git a/apps/dav/l10n/sr.js b/apps/dav/l10n/sr.js index 35da4c5850f..81343f9694b 100644 --- a/apps/dav/l10n/sr.js +++ b/apps/dav/l10n/sr.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "<strong>Догађај</strong> из календара је измењен", "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен", "Contact birthdays" : "Рођендани контаката", + "%1$s via %2$s" : "%1$s преко %2$s", "Invitation canceled" : "Позивница отказана", "Hello %s," : "Здраво %s,", + "The meeting »%1$s« with %2$s was canceled." : "Састанак „%1$s“ са %2$s је отказан.", "Invitation updated" : "Позивница ажурирана", + "The meeting »%1$s« with %2$s was updated." : "Састанак „%1$s“ са %2$s је ажуриран.", + "%1$s invited you to »%2$s«" : "%1$s Вас је позвао на „%2$s“", "When:" : "Време:", "Where:" : "Место:", "Description:" : "Опис:", @@ -73,9 +77,9 @@ OC.L10N.register( "Birthday calendars will be generated by a background job." : "Календари рођендана ће бити генерисани као позадински послови.", "Hence they will not be available immediately after enabling but will show up after some time." : "Зато можда неће бити видљиви баш одмах по укључивању, али ће се појавити после неког времена.", "%s via %s" : "%s путем %s", - "The meeting »%s« with %s was canceled." : "Састанак »%s« са %s је отказан.", - "The meeting »%s« with %s was updated." : "Састанак »%s« са %s је ажуриран.", - "%s invited you to »%s«" : "%s Вас је позвао на »%s«", + "The meeting »%s« with %s was canceled." : "Састанак „%s“ са %s је отказан.", + "The meeting »%s« with %s was updated." : "Састанак „%s“ са %s је ажуриран.", + "%s invited you to »%s«" : "%s Вас је позвао на „%s“", "CalDAV server" : "CalDAV сервер" }, "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); diff --git a/apps/dav/l10n/sr.json b/apps/dav/l10n/sr.json index 22dd44cc954..9632e44b33e 100644 --- a/apps/dav/l10n/sr.json +++ b/apps/dav/l10n/sr.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "<strong>Догађај</strong> из календара је измењен", "A calendar <strong>todo</strong> was modified" : "<strong>Подсетник</strong> из календара је измењен", "Contact birthdays" : "Рођендани контаката", + "%1$s via %2$s" : "%1$s преко %2$s", "Invitation canceled" : "Позивница отказана", "Hello %s," : "Здраво %s,", + "The meeting »%1$s« with %2$s was canceled." : "Састанак „%1$s“ са %2$s је отказан.", "Invitation updated" : "Позивница ажурирана", + "The meeting »%1$s« with %2$s was updated." : "Састанак „%1$s“ са %2$s је ажуриран.", + "%1$s invited you to »%2$s«" : "%1$s Вас је позвао на „%2$s“", "When:" : "Време:", "Where:" : "Место:", "Description:" : "Опис:", @@ -71,9 +75,9 @@ "Birthday calendars will be generated by a background job." : "Календари рођендана ће бити генерисани као позадински послови.", "Hence they will not be available immediately after enabling but will show up after some time." : "Зато можда неће бити видљиви баш одмах по укључивању, али ће се појавити после неког времена.", "%s via %s" : "%s путем %s", - "The meeting »%s« with %s was canceled." : "Састанак »%s« са %s је отказан.", - "The meeting »%s« with %s was updated." : "Састанак »%s« са %s је ажуриран.", - "%s invited you to »%s«" : "%s Вас је позвао на »%s«", + "The meeting »%s« with %s was canceled." : "Састанак „%s“ са %s је отказан.", + "The meeting »%s« with %s was updated." : "Састанак „%s“ са %s је ажуриран.", + "%s invited you to »%s«" : "%s Вас је позвао на „%s“", "CalDAV server" : "CalDAV сервер" },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" }
\ No newline at end of file diff --git a/apps/dav/l10n/sv.js b/apps/dav/l10n/sv.js index de6921d8e1f..9a33396878a 100644 --- a/apps/dav/l10n/sv.js +++ b/apps/dav/l10n/sv.js @@ -45,7 +45,10 @@ OC.L10N.register( "Contact birthdays" : "Födelsedagar", "Invitation canceled" : "Inbjudan avbruten", "Hello %s," : "He %s,", + "The meeting »%1$s« with %2$s was canceled." : "Mötet »%1$s« med %2$s avbröts.", "Invitation updated" : "Inbjudan uppdaterad", + "The meeting »%1$s« with %2$s was updated." : "Mötet »%1$s« med %2$s uppdaterades.", + "%1$s invited you to »%2$s«" : "%1$s bjöd in dig till »%2$s«", "When:" : "När", "Where:" : "Var:", "Description:" : "Beskrivning:", diff --git a/apps/dav/l10n/sv.json b/apps/dav/l10n/sv.json index e6070c1a40f..8149e984419 100644 --- a/apps/dav/l10n/sv.json +++ b/apps/dav/l10n/sv.json @@ -43,7 +43,10 @@ "Contact birthdays" : "Födelsedagar", "Invitation canceled" : "Inbjudan avbruten", "Hello %s," : "He %s,", + "The meeting »%1$s« with %2$s was canceled." : "Mötet »%1$s« med %2$s avbröts.", "Invitation updated" : "Inbjudan uppdaterad", + "The meeting »%1$s« with %2$s was updated." : "Mötet »%1$s« med %2$s uppdaterades.", + "%1$s invited you to »%2$s«" : "%1$s bjöd in dig till »%2$s«", "When:" : "När", "Where:" : "Var:", "Description:" : "Beskrivning:", diff --git a/apps/dav/l10n/tr.js b/apps/dav/l10n/tr.js index f53c4fa2620..95ac4daf8d7 100644 --- a/apps/dav/l10n/tr.js +++ b/apps/dav/l10n/tr.js @@ -43,9 +43,13 @@ OC.L10N.register( "A calendar <strong>event</strong> was modified" : "Bir takvim <strong>etkinliği</strong> düzenlendi", "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi", "Contact birthdays" : "Kişi doğum günleri", + "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", "Invitation canceled" : "Çağrı iptal edildi", "Hello %s," : "Merhaba %s,", + "The meeting »%1$s« with %2$s was canceled." : "%2$s ile yapılacak »%1$s« görüşmesi iptal edildi.", "Invitation updated" : "Çağrı güncellendi", + "The meeting »%1$s« with %2$s was updated." : "%2$s ile yapılacak »%1$s« görüşmesi güncellendi.", + "%1$s invited you to »%2$s«" : "%1$s sizi »%2$s« görüşmesine çağırdı", "When:" : "Zaman:", "Where:" : "Yer:", "Description:" : "Açıklama:", @@ -70,7 +74,7 @@ OC.L10N.register( "Send invitations to attendees" : "Katılımcılara çağrıları gönder", "Please make sure to properly set up the email settings above." : "Lütfen yukarıdaki e-posta ayarlarını doğru olarak yaptığınızdan emin olun.", "Automatically generate a birthday calendar" : "Doğum günü takvimi otomatik oluşturulsun", - "Birthday calendars will be generated by a background job." : "Bu seçenek etkinleştirildiğinde, doğum günü takvimi art alan görevi olarak oluşturulur.", + "Birthday calendars will be generated by a background job." : "Bu seçenek etkinleştirildiğinde, doğum günü takvimi arka plan görevi olarak oluşturulur.", "Hence they will not be available immediately after enabling but will show up after some time." : "Etkinleştirildikten hemen sonra görüntülenmez, bir süre sonra görüntülenir.", "%s via %s" : "%s, %s aracılığıyla", "The meeting »%s« with %s was canceled." : "Bu »%s« görüşmesi %s ile yapılacakken iptal edildi.", diff --git a/apps/dav/l10n/tr.json b/apps/dav/l10n/tr.json index d799e074d0b..90fd06867fc 100644 --- a/apps/dav/l10n/tr.json +++ b/apps/dav/l10n/tr.json @@ -41,9 +41,13 @@ "A calendar <strong>event</strong> was modified" : "Bir takvim <strong>etkinliği</strong> düzenlendi", "A calendar <strong>todo</strong> was modified" : "Bir takvim <strong>yapılacak işi</strong> düzenlendi", "Contact birthdays" : "Kişi doğum günleri", + "%1$s via %2$s" : "%1$s, %2$s aracılığıyla", "Invitation canceled" : "Çağrı iptal edildi", "Hello %s," : "Merhaba %s,", + "The meeting »%1$s« with %2$s was canceled." : "%2$s ile yapılacak »%1$s« görüşmesi iptal edildi.", "Invitation updated" : "Çağrı güncellendi", + "The meeting »%1$s« with %2$s was updated." : "%2$s ile yapılacak »%1$s« görüşmesi güncellendi.", + "%1$s invited you to »%2$s«" : "%1$s sizi »%2$s« görüşmesine çağırdı", "When:" : "Zaman:", "Where:" : "Yer:", "Description:" : "Açıklama:", @@ -68,7 +72,7 @@ "Send invitations to attendees" : "Katılımcılara çağrıları gönder", "Please make sure to properly set up the email settings above." : "Lütfen yukarıdaki e-posta ayarlarını doğru olarak yaptığınızdan emin olun.", "Automatically generate a birthday calendar" : "Doğum günü takvimi otomatik oluşturulsun", - "Birthday calendars will be generated by a background job." : "Bu seçenek etkinleştirildiğinde, doğum günü takvimi art alan görevi olarak oluşturulur.", + "Birthday calendars will be generated by a background job." : "Bu seçenek etkinleştirildiğinde, doğum günü takvimi arka plan görevi olarak oluşturulur.", "Hence they will not be available immediately after enabling but will show up after some time." : "Etkinleştirildikten hemen sonra görüntülenmez, bir süre sonra görüntülenir.", "%s via %s" : "%s, %s aracılığıyla", "The meeting »%s« with %s was canceled." : "Bu »%s« görüşmesi %s ile yapılacakken iptal edildi.", diff --git a/apps/dav/l10n/zh_CN.js b/apps/dav/l10n/zh_CN.js index 3eac70bab21..700db581385 100644 --- a/apps/dav/l10n/zh_CN.js +++ b/apps/dav/l10n/zh_CN.js @@ -12,17 +12,17 @@ OC.L10N.register( "You updated calendar {calendar}" : "您更新了日历 {calendar}", "You shared calendar {calendar} as public link" : "您已将日历{calendar}共享为公开链接", "You removed public link for calendar {calendar}" : "您移除了日历{calendar}的公开链接", - "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}", - "You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}", - "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}", - "{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您", - "You unshared calendar {calendar} from {user}" : "您取消分享给 {user} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from {user}" : "{actor} 取消分享给 {uesr} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from themselves" : "{actor} 取消分享日历 {calendar}", - "You shared calendar {calendar} with group {group}" : "您通过组 {group} 分享了日历 {calendar}", - "{actor} shared calendar {calendar} with group {group}" : "{actor} 通过组 {group} 分享了日历 {calendar}", - "You unshared calendar {calendar} from group {group}" : "您取消分享给组 {group} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from group {group}" : "{actor} 取消分享给组 {group} 的日历 {calendar}", + "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历共享 {calendar}", + "You shared calendar {calendar} with {user}" : "您与 {user} 共享了日历 {calendar}", + "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 共享了日历 {calendar}", + "{actor} unshared calendar {calendar} from you" : "{actor} 取消共享 {calendar} 给您", + "You unshared calendar {calendar} from {user}" : "您取消共享给 {user} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from {user}" : "{actor} 取消共享给 {uesr} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from themselves" : "{actor} 取消共享日历 {calendar}", + "You shared calendar {calendar} with group {group}" : "您通过组 {group} 共享了日历 {calendar}", + "{actor} shared calendar {calendar} with group {group}" : "{actor} 通过组 {group} 共享了日历 {calendar}", + "You unshared calendar {calendar} from group {group}" : "您取消共享给组 {group} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from group {group}" : "{actor} 取消共享给组 {group} 的日历 {calendar}", "{actor} created event {event} in calendar {calendar}" : "{actor} 在日历 {calendar} 中创建了事件 {event}", "You created event {event} in calendar {calendar}" : "您在日历 {calendar} 中创建了事件 {event}", "{actor} deleted event {event} from calendar {calendar}" : "{actor} 在日历 {calendar} 中删除了事件 {event}", diff --git a/apps/dav/l10n/zh_CN.json b/apps/dav/l10n/zh_CN.json index b4a920ac431..8493d72c541 100644 --- a/apps/dav/l10n/zh_CN.json +++ b/apps/dav/l10n/zh_CN.json @@ -10,17 +10,17 @@ "You updated calendar {calendar}" : "您更新了日历 {calendar}", "You shared calendar {calendar} as public link" : "您已将日历{calendar}共享为公开链接", "You removed public link for calendar {calendar}" : "您移除了日历{calendar}的公开链接", - "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历分享 {calendar}", - "You shared calendar {calendar} with {user}" : "您与 {user} 分享了日历 {calendar}", - "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 分享了日历 {calendar}", - "{actor} unshared calendar {calendar} from you" : "{actor} 取消分享 {calendar} 给您", - "You unshared calendar {calendar} from {user}" : "您取消分享给 {user} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from {user}" : "{actor} 取消分享给 {uesr} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from themselves" : "{actor} 取消分享日历 {calendar}", - "You shared calendar {calendar} with group {group}" : "您通过组 {group} 分享了日历 {calendar}", - "{actor} shared calendar {calendar} with group {group}" : "{actor} 通过组 {group} 分享了日历 {calendar}", - "You unshared calendar {calendar} from group {group}" : "您取消分享给组 {group} 的日历 {calendar}", - "{actor} unshared calendar {calendar} from group {group}" : "{actor} 取消分享给组 {group} 的日历 {calendar}", + "{actor} shared calendar {calendar} with you" : "{actor} 收到的日历共享 {calendar}", + "You shared calendar {calendar} with {user}" : "您与 {user} 共享了日历 {calendar}", + "{actor} shared calendar {calendar} with {user}" : "{actor} 与 {user} 共享了日历 {calendar}", + "{actor} unshared calendar {calendar} from you" : "{actor} 取消共享 {calendar} 给您", + "You unshared calendar {calendar} from {user}" : "您取消共享给 {user} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from {user}" : "{actor} 取消共享给 {uesr} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from themselves" : "{actor} 取消共享日历 {calendar}", + "You shared calendar {calendar} with group {group}" : "您通过组 {group} 共享了日历 {calendar}", + "{actor} shared calendar {calendar} with group {group}" : "{actor} 通过组 {group} 共享了日历 {calendar}", + "You unshared calendar {calendar} from group {group}" : "您取消共享给组 {group} 的日历 {calendar}", + "{actor} unshared calendar {calendar} from group {group}" : "{actor} 取消共享给组 {group} 的日历 {calendar}", "{actor} created event {event} in calendar {calendar}" : "{actor} 在日历 {calendar} 中创建了事件 {event}", "You created event {event} in calendar {calendar}" : "您在日历 {calendar} 中创建了事件 {event}", "{actor} deleted event {event} from calendar {calendar}" : "{actor} 在日历 {calendar} 中删除了事件 {event}", diff --git a/apps/dav/lib/Connector/Sabre/File.php b/apps/dav/lib/Connector/Sabre/File.php index 49b3debc386..2b3956e2baf 100644 --- a/apps/dav/lib/Connector/Sabre/File.php +++ b/apps/dav/lib/Connector/Sabre/File.php @@ -138,6 +138,8 @@ class File extends Node implements IFile { list($partStorage) = $this->fileView->resolvePath($this->path); $needsPartFile = $this->needsPartFile($partStorage) && (strlen($this->path) > 1); + $view = \OC\Files\Filesystem::getView(); + if ($needsPartFile) { // mark file as partial while uploading (ignored by the scanner) $partFilePath = $this->getPartFileBasePath($this->path) . '.ocTransferId' . rand() . '.part'; @@ -145,11 +147,11 @@ class File extends Node implements IFile { // upload file directly as the final path $partFilePath = $this->path; - $this->emitPreHooks($exists); + if ($view && !$this->emitPreHooks($exists)) { + throw new Exception('Could not write to final file, canceled by hook'); + } } - $view = \OC\Files\Filesystem::getView(); - // the part file and target file might be on a different storage in case of a single file storage (e.g. single file share) /** @var \OC\Files\Storage\Storage $partStorage */ list($partStorage, $internalPartPath) = $this->fileView->resolvePath($partFilePath); @@ -157,9 +159,6 @@ class File extends Node implements IFile { list($storage, $internalPath) = $this->fileView->resolvePath($this->path); try { if (!$needsPartFile) { - if ($view && !$this->emitPreHooks($exists)) { - throw new Exception('Could not write to final file, canceled by hook'); - } $this->changeLock(ILockingProvider::LOCK_EXCLUSIVE); } diff --git a/apps/dav/lib/Upload/AssemblyStream.php b/apps/dav/lib/Upload/AssemblyStream.php index 3ba24bf60fd..1a73669698b 100644 --- a/apps/dav/lib/Upload/AssemblyStream.php +++ b/apps/dav/lib/Upload/AssemblyStream.php @@ -73,9 +73,6 @@ class AssemblyStream implements \Icewind\Streams\File { return strnatcmp($a->getName(), $b->getName()); }); $this->nodes = array_values($nodes); - if (count($this->nodes) > 0) { - $this->currentStream = $this->getStream($this->nodes[0]); - } $this->size = array_reduce($this->nodes, function ($size, IFile $file) { return $size + $file->getSize(); }, 0); @@ -104,7 +101,11 @@ class AssemblyStream implements \Icewind\Streams\File { */ public function stream_read($count) { if (is_null($this->currentStream)) { - return ''; + if ($this->currentNode < count($this->nodes)) { + $this->currentStream = $this->getStream($this->nodes[$this->currentNode]); + } else { + return ''; + } } do { @@ -182,7 +183,7 @@ class AssemblyStream implements \Icewind\Streams\File { * @return bool */ public function stream_eof() { - return $this->pos >= $this->size || $this->currentStream === null; + return $this->pos >= $this->size || ($this->currentNode >= count($this->nodes) && $this->currentNode === null); } /** |