[Pkg-owncloud-commits] [owncloud] 16/22: Imported Upstream version 7.0.2+dfsg
David Prévot
taffit at moszumanska.debian.org
Fri Aug 29 14:48:57 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit e464ebae3235cf2e66f0410c0c93d72ff258bf04
Merge: e0c49d6 a3dcbe5
Author: David Prévot <taffit at debian.org>
Date: Tue Aug 26 10:25:47 2014 -0400
Imported Upstream version 7.0.2+dfsg
apps/activity/l10n/az.php | 1 +
apps/activity/l10n/bg_BG.php | 1 +
apps/activity/l10n/cs_CZ.php | 33 ++---
apps/activity/l10n/de.php | 1 +
apps/activity/l10n/de_DE.php | 1 +
apps/activity/l10n/el.php | 5 +-
apps/activity/l10n/en_GB.php | 1 +
apps/activity/l10n/es.php | 1 +
apps/activity/l10n/eu.php | 1 +
apps/activity/l10n/fi_FI.php | 1 +
apps/activity/l10n/he.php | 43 ++++++-
apps/activity/l10n/it.php | 1 +
apps/activity/l10n/nb_NO.php | 1 +
apps/activity/l10n/nl.php | 3 +-
apps/activity/l10n/pl.php | 1 +
apps/activity/l10n/pt_BR.php | 1 +
apps/activity/l10n/sv.php | 1 +
apps/bookmarks/appinfo/database.xml | 9 --
apps/calendar/lib/app.php | 8 +-
apps/documents/lib/db/member.php | 2 +-
apps/files_pdfviewer/README.md | 4 +
apps/files_pdfviewer/templates/pdf.php | 26 ++--
console.php | 18 ++-
core/command/user/resetpassword.php | 10 ++
core/css/styles.css | 4 +
core/doc/user/_sources/files/deletedfiles.txt | 2 +-
core/doc/user/_sources/files/filesweb.txt | 16 +--
core/doc/user/_sources/files/quota.txt | 6 +-
.../user/_sources/files/server_to_server_using.txt | 2 +-
core/doc/user/_sources/webinterface.txt | 20 +--
core/doc/user/files/deletedfiles.html | 2 +-
core/doc/user/files/filesweb.html | 16 ++-
core/doc/user/files/quota.html | 6 +-
core/doc/user/files/server_to_server_using.html | 2 +-
core/doc/user/webinterface.html | 34 ++---
core/js/apps.js | 139 +++++++++++----------
core/js/share.js | 2 +-
core/js/singleselect.js | 10 +-
core/js/tests/specs/shareSpec.js | 26 ++--
core/templates/untrustedDomain.php | 19 +++
lib/base.php | 7 +-
lib/private/allconfig.php | 7 +-
lib/private/files/objectstore/swift.php | 9 +-
lib/public/iconfig.php | 3 +-
settings/ajax/setsecurity.php | 12 +-
settings/js/admin.js | 18 +++
settings/js/users/groups.js | 24 ----
settings/js/users/users.js | 82 +++++++-----
settings/templates/users/part.setquota.php | 6 +-
version.php | 8 +-
50 files changed, 395 insertions(+), 261 deletions(-)
diff --cc apps/activity/l10n/az.php
index c258adc,0000000..7e2b751
mode 100644,000000..100644
--- a/apps/activity/l10n/az.php
+++ b/apps/activity/l10n/az.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Sizin configləriniz yenilendi.",
+"Activity" => "Fəallıq",
+"A file or folder has been <strong>shared</strong>" => "Fayl və ya direktoriya <strong>yayımlandı</strong>",
+"A new file or folder has been <strong>created</strong>" => "Yeni fayl və ya direktoriya <strong>yaradılmışdır</strong>",
+"A file or folder has been <strong>changed</strong>" => "Fayl və ya direktoriya <strong>dəyişdirilib</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Fayl və ya direktoriya <strong>silinib</strong>",
+"You created %1\$s" => "Siz yaratdınız %1\$s",
+"%2\$s created %1\$s" => "%2\$s yaradılmış %1\$s",
++"%1\$s was created in a public folder" => "%1\$s ictimai qovluqda yaradıldı",
+"You changed %1\$s" => "Siz dəyişdiniz %1\$s",
+"%2\$s changed %1\$s" => "%2\$s dəyişdirildi %1\$s",
+"You deleted %1\$s" => "Siz silindiniz %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s silindi %1\$s",
+"You shared %1\$s with %2\$s" => "Siz yayımladınız %1\$s - i %2\$s ilə",
+"You shared %1\$s with group %2\$s" => "Siz yayımladınız %1\$s qrupu ilə %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s yayımlanıb %1\$s sizinlə",
+"You shared %1\$s via link" => "Siz yayımladınız %1\$s link ilə",
+"Activity notification" => "Fəaliyyət bildirişi",
+"All Activities" => "Bütün fəalliqlar",
+"Activities by you" => "Sizin fəalliqlarınız",
+"Activities by others" => "Digərlərin faəllığı",
+"Shares" => "Yayımlanmalar",
+"Files" => "Fayllar",
+"in %s" => "içinə %s",
+"%s and %s" => "%s və %s",
+", " => ",",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("",""),
+"_%s and %n more_::_%s and %n more_" => array("",""),
+"Hello %s," => "Salam %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Sız elektron məktubu ona görə aldınız ki, aşağıdakı hadısələr %s ünvanında son saatda baş vermişdir",
+"You are receiving this email because in the last day the following things happened at %s" => "Siz elektron məktubu ona görə aldınız ki, keçən gün %s ünvanında aşağıdakı hadisələr baş vermişdir.",
+"You are receiving this email because in the last week the following things happened at %s" => "Siz elektron məktubu ona görə aldınız ki, keçən həftə %s unvanında aşağıdakı hadəsələr baş vermişdir ",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Siz %s istifadəyə başladıqda, baş verən hadısələrin siyahısını burda görəcəksiniz.",
+"No more events to load" => "Yüklənə biləcək digər səbəb yoxdur",
+"Enable RSS feed" => "RSS ötürməsinin işə salinmaslı",
+"Notifications" => "Xəbərdarlıqlar",
+"Mail" => "Məktub",
+"Stream" => "Axın",
+"Notify about my own actions" => "Öz tərəfimdən edilən hər bir iş haqqında məlumat verin",
+"You need to set up your email address before you can receive notification emails." => "Xəbərdarlıq məktubları almazdan öncə, siz mail ünvanınızı təyin etməlisiniz.",
+"Send emails:" => "Məktubları yolla",
+"Hourly" => "Saatlıq",
+"Daily" => "Günlük",
+"Weekly" => "Həftəlik",
+"Activity feed" => "Fəaliyyətin ötürülməsi",
+"Personal activity feed for %s" => "%s üçün şəxsi fəaliyyətin ötürülməsi"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/bg_BG.php
index 229f095,0000000..6322b24
mode 100644,000000..100644
--- a/apps/activity/l10n/bg_BG.php
+++ b/apps/activity/l10n/bg_BG.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Вашите настройки са актуализирани",
+"Activity" => "Активност",
+"A file or folder has been <strong>shared</strong>" => "Файл или папка беше <strong>споделен</strong>",
+"A new file or folder has been <strong>created</strong>" => "Нов файл или папка беше <strong>създаден</strong>",
+"A file or folder has been <strong>changed</strong>" => "Файл или папка беше <strong>променен</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Файл или папка беше <strong>изтрит</strong>",
+"You created %1\$s" => "Ти създаде %1\$s.",
+"%2\$s created %1\$s" => "%2\$s създаде %1\$s.",
++"%1\$s was created in a public folder" => "%1\$s е създаден в публична папка",
+"You changed %1\$s" => "Ти промени %1\$s.",
+"%2\$s changed %1\$s" => "%2\$s промени %1\$s.",
+"You deleted %1\$s" => "Ти изтри %1\$s.",
+"%2\$s deleted %1\$s" => "%2\$s изтри %1\$s.",
+"You shared %1\$s with %2\$s" => "Ти сподели %1\$s с %2\$s.",
+"You shared %1\$s with group %2\$s" => "Ти сподели %1\$s с групата %2\$s.",
+"%2\$s shared %1\$s with you" => "%2\$s сподели %1\$s с теб.",
+"You shared %1\$s via link" => "Ти сподели %1\$s посредством връзка.",
+"Activity notification" => "Известия за активност",
+"All Activities" => "Активност на всички",
+"Activities by you" => "Твоята активност",
+"Activities by others" => "Активността на другите",
+"Shares" => "Споделени Папки",
+"Files" => "Файлове",
+"in %s" => "в %s",
+"%s and %s" => "%s и %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s и <strong class=\"tooltip\" title=\"%s\">още %n</strong>.","%s и <strong class=\"tooltip\" title=\"%s\">още %n</strong>."),
+"_%s and %n more_::_%s and %n more_" => array("%s и %n друга","%s и още %n"),
+"Hello %s," => "Здравей %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Получаваш този имейл, защото през последния час се случиха следните неща в %s.",
+"You are receiving this email because in the last day the following things happened at %s" => "Получаваш този имейл, защото през последния ден се случиха следните неща в%s.",
+"You are receiving this email because in the last week the following things happened at %s" => "Получаваш този имейл, защото през последната седмица се случиха следните неща в %s.",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Тук ще виждаш списък на събития, когато започнеш да ползваш %s.",
+"No more events to load" => "Няма повече известия за зареждане.",
+"Enable RSS feed" => "Разреши RSS източници.",
+"Notifications" => "Известия",
+"Mail" => "Поща",
+"Stream" => "Поток",
+"Notify about my own actions" => "Уведомявай ме за собствените ми действия.",
+"You need to set up your email address before you can receive notification emails." => "Първо трябва да настроиш твоя e-mail адрес преди да започнеш да получаваш известия.",
+"Send emails:" => "Изпрати имейли:",
+"Hourly" => "Всеки час",
+"Daily" => "Ежедневно",
+"Weekly" => "Седмично",
+"Activity feed" => "Поток за Активност",
+"Personal activity feed for %s" => "Личен поток за активност на %s."
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/cs_CZ.php
index e4277a0,0000000..b835d6d
mode 100644,000000..100644
--- a/apps/activity/l10n/cs_CZ.php
+++ b/apps/activity/l10n/cs_CZ.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Vaše nastavení bylo aktualizováno.",
+"Activity" => "Aktivita",
+"A file or folder has been <strong>shared</strong>" => "Soubor nebo složka byla <strong>nasdílena</strong>",
+"A new file or folder has been <strong>created</strong>" => "Byl <strong>vytvořen</strong> nový soubor nebo adresář",
+"A file or folder has been <strong>changed</strong>" => "Soubor nebo adresář byl <strong>změněn</strong>",
- "A file or folder has been <strong>deleted</strong>" => "Soubor nebo adresář byl <strong>vymazán</strong>",
- "You created %1\$s" => "Byl vytvořen %1\$s",
++"A file or folder has been <strong>deleted</strong>" => "Soubor nebo adresář byl <strong>smazán</strong>",
++"You created %1\$s" => "Vytvořili jste %1\$s",
+"%2\$s created %1\$s" => "%2\$s vytvořil(a) %1\$s",
- "You changed %1\$s" => "Byl změněn %1\$s",
- "%2\$s changed %1\$s" => "%2\$s změnil %1\$s",
- "You deleted %1\$s" => "Byl smazán %1\$s",
- "%2\$s deleted %1\$s" => "%2\$s smazal %1\$s",
- "You shared %1\$s with %2\$s" => "Byl sdílen %1\$s s %2\$s",
- "You shared %1\$s with group %2\$s" => "Byl sdílen %1\$s se skupinou %2\$s",
- "%2\$s shared %1\$s with you" => "%2\$s vám sdílel %1\$s",
- "You shared %1\$s via link" => "%1\$s byl nasdílen přes odkaz",
++"%1\$s was created in a public folder" => "%1\$s vytvořen ve veřejném adresáři",
++"You changed %1\$s" => "Změnili jste %1\$s",
++"%2\$s changed %1\$s" => "%2\$s změnil(a) %1\$s",
++"You deleted %1\$s" => "Smazali jste %1\$s",
++"%2\$s deleted %1\$s" => "%2\$s smazal(a) %1\$s",
++"You shared %1\$s with %2\$s" => "Sdílíte %1\$s s %2\$s",
++"You shared %1\$s with group %2\$s" => "Sdílíte %1\$s se skupinou %2\$s",
++"%2\$s shared %1\$s with you" => "%2\$s s vámi sdílí %1\$s",
++"You shared %1\$s via link" => "Sdílíte %1\$s přes odkaz",
+"Activity notification" => "Upozornění na aktivity",
+"All Activities" => "Všechny aktivity",
+"Activities by you" => "Vaše aktivity",
+"Activities by others" => "Aktivity ostatních",
+"Shares" => "Sdílení",
+"Files" => "Soubory",
+"in %s" => "v %s",
+"%s and %s" => "%s a %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s a <strong class=\"tooltip\" title=\"%s\">%n další</strong>","%s a <strong class=\"tooltip\" title=\"%s\">%n další</strong>","%s a <strong class=\"tooltip\" title=\"%s\">%n dalších</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s a %n další","%s a %n další","%s a %n dalších"),
+"Hello %s," => "Ahoj %s,",
- "You are receiving this email because in the last hour the following things happened at %s" => "Tento e-mail dostáváte, protože za uplynulou hodinu došlo v %s k těmto událostem",
- "You are receiving this email because in the last day the following things happened at %s" => "Tento e-mail dostáváte, protože za poslední den došlo v %s k těmto událostem",
- "You are receiving this email because in the last week the following things happened at %s" => "Tento e-mail dostáváte, protože za poslední týden došlo v %s k těmto událostem",
++"You are receiving this email because in the last hour the following things happened at %s" => "Dostali jste tento e-mail, protože za poslední hodinu došlo v %s k následující aktivitě",
++"You are receiving this email because in the last day the following things happened at %s" => "Dostali jste tento e-mail, protože za poslední den došlo v %s k následující aktivitě",
++"You are receiving this email because in the last week the following things happened at %s" => "Dostali jste tento e-mail, protože za poslední týden došlo v %s k následující aktivitě",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Zde uvidíte seznam událostí jakmile začnete používat váš %s.",
+"No more events to load" => "Žádné další události k načtení",
+"Enable RSS feed" => "Povolit RSS kanál",
+"Notifications" => "Upozornění",
+"Mail" => "Pošta",
+"Stream" => "Proud",
- "Notify about my own actions" => "Posílat oznámení o vlastních činnostech",
- "You need to set up your email address before you can receive notification emails." => "Pokud chcete dostávat upozornění e-mailem, musíte nejprve vyplnit vaši e-mailovou adresu.",
- "Send emails:" => "Odeslat e-maily:",
++"Notify about my own actions" => "Posílat oznámení o mých vlastních činnostech",
++"You need to set up your email address before you can receive notification emails." => "Pokud chcete dostávat upozornění e-mailem, musíte nejprve nastavit vaši e-mailovou adresu.",
++"Send emails:" => "Posílat e-maily:",
+"Hourly" => "Každou hodinu",
+"Daily" => "Denně",
+"Weekly" => "Týdně",
+"Activity feed" => "Přehled aktivit",
+"Personal activity feed for %s" => "Přehled aktivit uživatele %s"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --cc apps/activity/l10n/de.php
index 3bb3e2d,0000000..8e31685
mode 100644,000000..100644
--- a/apps/activity/l10n/de.php
+++ b/apps/activity/l10n/de.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Deine Einstellungen wurden aktualisiert.",
+"Activity" => "Aktivität",
+"A file or folder has been <strong>shared</strong>" => "Eine Datei oder Ordner wurde <strong>geteilt</strong>",
+"A new file or folder has been <strong>created</strong>" => "Eine Datei oder Ordner wurde <strong>erstellt</strong>",
+"A file or folder has been <strong>changed</strong>" => "Eine Datei oder Ordner wurde <strong>geändert</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Eine Datei oder Ordner wurde <strong>gelöscht</strong>",
+"You created %1\$s" => "Du hast %1\$s erstellt",
+"%2\$s created %1\$s" => "%2\$s hat %1\$s erstellt",
++"%1\$s was created in a public folder" => "%1\$s wurde in einem öffentlichen Ordner erstellt",
+"You changed %1\$s" => "Du hast %1\$s geändert",
+"%2\$s changed %1\$s" => "%2\$s hat %1\$s geändert",
+"You deleted %1\$s" => "Du hast %1\$s gelöscht",
+"%2\$s deleted %1\$s" => "%2\$s hat %1\$s gelöscht",
+"You shared %1\$s with %2\$s" => "Du hast %1\$s mit %2\$s geteilt",
+"You shared %1\$s with group %2\$s" => "Du hast %1\$s mit der Gruppe %2\$s geteilt",
+"%2\$s shared %1\$s with you" => "%2\$s hat %1\$s mit Dir geteilt",
+"You shared %1\$s via link" => "Du hast %1\$s über einen Link freigegeben",
+"Activity notification" => "Benachrichtigung über die Aktivitäten",
+"All Activities" => "Alle Aktivitäten",
+"Activities by you" => "Aktivitäten von Dir",
+"Activities by others" => "Aktivitäten von Anderen",
+"Shares" => "Freigaben",
+"Files" => "Dateien",
+"in %s" => "unter %s",
+"%s and %s" => "%s und %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s und <strong class=\"tooltip\" title=\"%s\">%n mehr</strong>","%s und <strong class=\"tooltip\" title=\"%s\">%n weitere</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s und %n mehr","%s und %n weitere"),
+"Hello %s," => "Hallo %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Du erhälst diese E-Mail, da in der letzten Stunde folgende Dinge auf %s geschehen sind",
+"You are receiving this email because in the last day the following things happened at %s" => "Du erhälst diese E-Mail, da am letzten Tag folgende Dinge auf %s geschehen sind",
+"You are receiving this email because in the last week the following things happened at %s" => "Du erhälst diese E-Mail, da in der letzten Woche folgende Dinge auf %s geschehen sind",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Du wirst hier eine Liste von Ereignissen sehen, sobald Du deine %s nutzt.",
+"No more events to load" => "Keine weiteren Ereignisse zum Laden",
+"Enable RSS feed" => "RSS-Feed aktivieren",
+"Notifications" => "Benachrichtigungen",
+"Mail" => "Mail",
+"Stream" => "Stream",
+"Notify about my own actions" => "Über eigene Aktivitäten benachrichtigen",
+"You need to set up your email address before you can receive notification emails." => "Sie müssen ihre E-Mail Adresse zum Empfang von Erinnerungsmails einrichten.",
+"Send emails:" => "Sende E-Mails:",
+"Hourly" => "Stündlich",
+"Daily" => "Täglich",
+"Weekly" => "Wöchentlich",
+"Activity feed" => "Feed der Aktivitäten",
+"Personal activity feed for %s" => "Persönlicher Feed der Aktivitäten für %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/de_DE.php
index 49eb4bc,0000000..1cc20a8
mode 100644,000000..100644
--- a/apps/activity/l10n/de_DE.php
+++ b/apps/activity/l10n/de_DE.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Ihre Einstellungen wurden aktualisiert.",
+"Activity" => "Aktivität",
+"A file or folder has been <strong>shared</strong>" => "Eine Datei oder Ordner wurde <strong>geteilt</strong>",
+"A new file or folder has been <strong>created</strong>" => "Eine Datei oder Ordner wurde <strong>erstellt</strong>",
+"A file or folder has been <strong>changed</strong>" => "Eine Datei oder Ordner wurde <strong>geändert</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Eine Datei oder Ordner wurde <strong>gelöscht</strong>",
+"You created %1\$s" => "Sie haben %1\$s erstellt",
+"%2\$s created %1\$s" => "%2\$s hat %1\$s erstellt",
++"%1\$s was created in a public folder" => "%1\$s wurde in einem öffentlichen Ordner erstellt",
+"You changed %1\$s" => "Sie haben %1\$s geändert",
+"%2\$s changed %1\$s" => "%2\$s hat %1\$s geändert",
+"You deleted %1\$s" => "Sie haben %1\$s gelöscht",
+"%2\$s deleted %1\$s" => "%2\$s hat %1\$s gelöscht",
+"You shared %1\$s with %2\$s" => "Sie teilen %1\$s mit %2\$s",
+"You shared %1\$s with group %2\$s" => "Sie teilen %1\$s mit der Gruppe %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s teilt %1\$s mit Ihnen",
+"You shared %1\$s via link" => "Sie haben %1\$s über einen Link geteilt",
+"Activity notification" => "Benachrichtigung über die Aktivitäten",
+"All Activities" => "Alle Aktivitäten",
+"Activities by you" => "Ihre Aktivitäten",
+"Activities by others" => "Aktivitäten von Anderen",
+"Shares" => "Geteiltes",
+"Files" => "Dateien",
+"in %s" => "unter %s",
+"%s and %s" => "%s und %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s und <strong class=\"tooltip\" title=\"%s\">%n mehr</strong>","%s und <strong class=\"tooltip\" title=\"%s\">%n mehrere</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s und %n weiteres","%s und %n weitere"),
+"Hello %s," => "Hallo %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Sie erhalten diese E-Mail, da in der letzten Stunde folgende Dinge auf %s geschehen sind",
+"You are receiving this email because in the last day the following things happened at %s" => "Sie erhalten diese E-Mail, da am letzten Tag folgende Dinge auf %s geschehen sind",
+"You are receiving this email because in the last week the following things happened at %s" => "Sie erhalten diese E-Mail, da in der letzten Woche folgende Dinge auf %s geschehen sind",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Sie werden hier eine Liste von Ereignissen sehen, sobald Sie Ihre %s nutzen.",
+"No more events to load" => "Keine weiteren Ereignisse zum Laden",
+"Enable RSS feed" => "RSS-Feed aktivieren",
+"Notifications" => "Benachrichtigungen",
+"Mail" => "Mail",
+"Stream" => "Stream",
+"Notify about my own actions" => "Über eigene Aktivitäten benachrichtigen",
+"You need to set up your email address before you can receive notification emails." => "Sie müssen ihre E-Mail Adresse zum Empfang von Erinnerungsmails einrichten.",
+"Send emails:" => "Sende E-Mails:",
+"Hourly" => "stündlich",
+"Daily" => "täglich",
+"Weekly" => "wöchentlich",
+"Activity feed" => "Feed der Aktivitäten",
+"Personal activity feed for %s" => "Persönlicher Feed der Aktivitäten für %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/el.php
index ace604b,0000000..ca7059e
mode 100644,000000..100644
--- a/apps/activity/l10n/el.php
+++ b/apps/activity/l10n/el.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Οι ρυθμίσεις σας έχουν ενημερωθεί.",
+"Activity" => "Δραστηριότητα",
+"A file or folder has been <strong>shared</strong>" => "Ένα αρχείο ή φάκελος <strong>διαμοιράστηκε</strong>",
+"A new file or folder has been <strong>created</strong>" => "Ένα νέο αρχείο ή κατάλογος έχουν <strong>δημιουργηθεί</strong>",
+"A file or folder has been <strong>changed</strong>" => "Ένα αρχείο ή κατάλογος έχουν <strong>αλλάξει</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Ένα αρχείο ή κατάλογος έχουν <strong>διαγραφεί</strong>",
+"You created %1\$s" => "Δημιουργήσατε %1\$s",
+"%2\$s created %1\$s" => "Ο %2\$s δημιούργησε %1\$s",
++"%1\$s was created in a public folder" => "Το %1\$s δημιουργήθηκε σε έναν δημόσιο φάκελο",
+"You changed %1\$s" => "Αλλάξατε %1\$s",
+"%2\$s changed %1\$s" => "Ο %2\$s άλλαξε %1\$s",
+"You deleted %1\$s" => "Διαγράψατε %1\$s",
+"%2\$s deleted %1\$s" => "Ο %2\$s διέγραψε %1\$s",
+"You shared %1\$s with %2\$s" => "Διαμοιραστήκατε το %1\$s με %2\$s",
+"You shared %1\$s with group %2\$s" => "Διαμοιραστήκατε %1\$s με την ομάδα %2\$s",
+"%2\$s shared %1\$s with you" => "Ο %2\$s διαμοιράστηκε το %1\$s με εσάς",
- "You shared %1\$s via link" => "Μοιραστήκατε %1\$s μέσω συνδέσμου",
++"You shared %1\$s via link" => "Μοιραστήκατε το %1\$s μέσω συνδέσμου",
+"Activity notification" => "Ειδοποίηση δραστηριότητας",
+"All Activities" => "Όλες οι Δραστηριότητες",
+"Activities by you" => "Δραστηριότητες από εσάς",
+"Activities by others" => "Δραστηριότητες από άλλους",
+"Shares" => "Κοινόχρηστοι φάκελοι",
+"Files" => "Αρχεία",
+"in %s" => "σε %s",
+"%s and %s" => "%s και %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s και <strong class=\"tooltip\" title=\"%s\"> %n περισσότερο</strong>","%s και <strong class=\"tooltip\" title=\"%s\"> %n περισσότερα</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s και %n περισσότερο","%s και %n περισσότερα"),
+"Hello %s," => "Καλωσήρθατε %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Λαμβάνετε αυτό το μήνυμα ηλ. ταχυδρομείου γιατί την τελευταία ώρα τα παρακάτω γεγονότα συνέβησαν στο %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Λαμβάνετε αυτό το μήνυμα ηλ. ταχυδρομείου γιατί την τελευταία ημέρα τα παρακάτω γεγονότα συνέβησαν στο %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Λαμβάνετε αυτό το μήνυμα ηλ. ταχυδρομείου γιατί την τελευταία εβδομάδα τα παρακάτω γεγονότα συνέβησαν στο %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Θα δείτε εδώ μια λίστα από συμβάντα όταν ξεκινήσετε να χρησιμοποιείτε το %s σας.",
+"No more events to load" => "Δεν υπάρχουν άλλα γεγονότα προς φόρτωση",
+"Enable RSS feed" => "Ενεργοποίηση ροής RSS",
+"Notifications" => "Ειδοποιήσεις",
+"Mail" => "Ταχυδρομείο",
+"Stream" => "Ροή",
- "Notify about my own actions" => "Ειδοποίησέ με για τις δράσεις μου",
++"Notify about my own actions" => "Ειδοποίησέ με για τις ενέργειές μου",
+"You need to set up your email address before you can receive notification emails." => "Πρέπει να ρυθμίσετε τη διεύθυνση ηλ. ταχυδρομείου σας για να μπορείτε να λαμβάνετε ειδοποιήσεις μέσω ηλ. ταχυδρομείου.",
+"Send emails:" => "Αποστολή μηνυμάτων ηλ. ταχυδρομείου:",
+"Hourly" => "Ωριαίως",
+"Daily" => "Καθημερινώς",
+"Weekly" => "Εβδομαδιαίως",
+"Activity feed" => "Ροή Δραστηριότητας",
+"Personal activity feed for %s" => "Προσωπική ροή δραστηριότητας για %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/en_GB.php
index ff83618,0000000..52ee363
mode 100644,000000..100644
--- a/apps/activity/l10n/en_GB.php
+++ b/apps/activity/l10n/en_GB.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Your settings have been updated.",
+"Activity" => "Activity",
+"A file or folder has been <strong>shared</strong>" => "A file or folder has been <strong>shared</strong>",
+"A new file or folder has been <strong>created</strong>" => "A new file or folder has been <strong>created</strong>",
+"A file or folder has been <strong>changed</strong>" => "A file or folder has been <strong>changed</strong>",
+"A file or folder has been <strong>deleted</strong>" => "A file or folder has been <strong>deleted</strong>",
+"You created %1\$s" => "You created %1\$s",
+"%2\$s created %1\$s" => "%2\$s created %1\$s",
++"%1\$s was created in a public folder" => "%1\$s was created in a public folder",
+"You changed %1\$s" => "You changed %1\$s",
+"%2\$s changed %1\$s" => "%2\$s changed %1\$s",
+"You deleted %1\$s" => "You deleted %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s deleted %1\$s",
+"You shared %1\$s with %2\$s" => "You shared %1\$s with %2\$s",
+"You shared %1\$s with group %2\$s" => "You shared %1\$s with group %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s shared %1\$s with you",
+"You shared %1\$s via link" => "You shared %1\$s via link",
+"Activity notification" => "Activity notification",
+"All Activities" => "All Activities",
+"Activities by you" => "Activities by you",
+"Activities by others" => "Activities by others",
+"Shares" => "Shares",
+"Files" => "Files",
+"in %s" => "in %s",
+"%s and %s" => "%s and %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s and <strong class=\"tooltip\" title=\"%s\">%n more</strong>","%s and <strong class=\"tooltip\" title=\"%s\">%n more</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s and %n more","%s and %n more"),
+"Hello %s," => "Hello %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "You are receiving this email because the following things happened at %s in the last hour",
+"You are receiving this email because in the last day the following things happened at %s" => "You are receiving this email because the following things happened at %s in the last day",
+"You are receiving this email because in the last week the following things happened at %s" => "You are receiving this email because the following things happened at %s in the last week",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "You will see a list of events here when you start to use your %s.",
+"No more events to load" => "No more events to load",
+"Enable RSS feed" => "Enable RSS feed",
+"Notifications" => "Notifications",
+"Mail" => "Mail",
+"Stream" => "Stream",
+"Notify about my own actions" => "Notify about my own actions",
+"You need to set up your email address before you can receive notification emails." => "You need to set up your email address before you can receive notification emails.",
+"Send emails:" => "Send emails:",
+"Hourly" => "Hourly",
+"Daily" => "Daily",
+"Weekly" => "Weekly",
+"Activity feed" => "Activity feed",
+"Personal activity feed for %s" => "Personal activity feed for %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/es.php
index 687a197,0000000..4a20ffd
mode 100644,000000..100644
--- a/apps/activity/l10n/es.php
+++ b/apps/activity/l10n/es.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Sus ajustes han sido actualizados.",
+"Activity" => "Actividad",
+"A file or folder has been <strong>shared</strong>" => "Se ha <strong>compartido</strong> un archivo o carpeta",
+"A new file or folder has been <strong>created</strong>" => "Ha sido <strong>creado</strong> un nuevo archivo o carpeta",
+"A file or folder has been <strong>changed</strong>" => "Ha sido <strong>modificado</strong> un archivo o carpeta",
+"A file or folder has been <strong>deleted</strong>" => "Ha sido <strong>eliminado</strong> un archivo o carpeta",
+"You created %1\$s" => "Usted ha creado %1\$s",
+"%2\$s created %1\$s" => "%2\$s ha creado %1\$s",
++"%1\$s was created in a public folder" => "%1\$s ha sido creado en una carpeta pública",
+"You changed %1\$s" => "Usted ha modificado %1\$s",
+"%2\$s changed %1\$s" => "%2\$s ha modificado %1\$s",
+"You deleted %1\$s" => "Usted ha eliminado %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s ha eliminado %1\$s",
+"You shared %1\$s with %2\$s" => "Usted ha compartido %1\$s con %2\$s",
+"You shared %1\$s with group %2\$s" => "Usted ha compartido %1\$s con el grupo %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s ha compartido %1\$s con usted",
+"You shared %1\$s via link" => "Ha compartido %1\$s via enlace",
+"Activity notification" => "Notificación de actividad",
+"All Activities" => "Todas las actividades",
+"Activities by you" => "Tus actividades",
+"Activities by others" => "Actividades de otros",
+"Shares" => "Compartidos",
+"Files" => "Archivos",
+"in %s" => "en %s",
+"%s and %s" => "%s y %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s y <strong class=\"tooltip\" title=\"%s\">%n más</strong>","%s y <strong class=\"tooltip\" title=\"%s\">%n más</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s y %n más","%s y %n más"),
+"Hello %s," => "Estimado/a %s:",
+"You are receiving this email because in the last hour the following things happened at %s" => "Está recibiendo este mensaje porque durante la última hora han pasado las siguientes cosas en %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Está recibiendo este mensaje porque durante el último día han pasado las siguientes cosas en %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Está recibiendo este mensaje porque durante la última semana han pasado las siguientes cosas en %s ",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Aquí aparecerá una lista de eventos cuando comience a usar su %s.",
+"No more events to load" => "No hay más eventos por cargar.",
+"Enable RSS feed" => "Habilitar fuente RSS",
+"Notifications" => "Notificaciones",
+"Mail" => "Correo electrónico",
+"Stream" => "Flujo",
+"Notify about my own actions" => "Notificarme mis propias acciones",
+"You need to set up your email address before you can receive notification emails." => "Debe configurar su dirección de correo electrónico antes de poder recibir notificaciones.",
+"Send emails:" => "Enviar mensajes:",
+"Hourly" => "Cada hora",
+"Daily" => "Diariamente",
+"Weekly" => "Semanalmente",
+"Activity feed" => "Alimentador de actividad",
+"Personal activity feed for %s" => "Alimentador de actividad personal para %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/eu.php
index 9897e68,0000000..cba2b69
mode 100644,000000..100644
--- a/apps/activity/l10n/eu.php
+++ b/apps/activity/l10n/eu.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Zure ezarpenak eguneratu dira.",
+"Activity" => "Jarduera",
+"A file or folder has been <strong>shared</strong>" => "Fitxategia edo karpeta <strong>konpartitu</strong> da",
+"A new file or folder has been <strong>created</strong>" => "Fitxategi edo karpeta berri bat <strong>sortu da</strong>",
+"A file or folder has been <strong>changed</strong>" => "Fitxategi edo karpeta bat <strong>aldatu da</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Fitxategi edo karpeta bat <strong>ezabatu da</strong>",
+"You created %1\$s" => "Zuk sortua %1\$s",
+"%2\$s created %1\$s" => "%2\$sk sortua %1\$s",
++"%1\$s was created in a public folder" => "%1\$s sortu da karpeta publiko batean",
+"You changed %1\$s" => "%1\$s aldatu duzu",
+"%2\$s changed %1\$s" => "%2\$sk aldatuta %1\$s",
+"You deleted %1\$s" => "%1\$s ezabatu duzu",
+"%2\$s deleted %1\$s" => "%2\$sk ezabatuta %1\$s",
+"You shared %1\$s with %2\$s" => "Zuk %1\$s elkarbanatu duzu %2\$srekin",
+"You shared %1\$s with group %2\$s" => "Zuk %1\$s elkarbanatu duzu %2\$s taldearekin",
+"%2\$s shared %1\$s with you" => "%2\$sk zurekin %1\$s elkarbanatu du",
+"You shared %1\$s via link" => "Konpartitu duzu %1\$s esteka baten bidez",
+"Activity notification" => "Jarduera jakinarazpenak",
+"All Activities" => "Jarduera guztiak",
+"Activities by you" => "Zure jarduerak",
+"Activities by others" => "Besteen jarduerak",
+"Shares" => "Partekatuak",
+"Files" => "Fitxategiak",
+"in %s" => "%s-an",
+"%s and %s" => "%s eta %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s eta <strong class=\"tooltip\" title=\"%s\">%n gehiago</strong>","%s eta <strong class=\"tooltip\" title=\"%s\">%n gehiago</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s eta %n gehiago","%s eta %n gehiago"),
+"Hello %s," => "Kaixo %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Posta hau jaso duzu azkenengo orduan %sko hurrengo gertaerak direla eta",
+"You are receiving this email because in the last day the following things happened at %s" => "Posta hau jaso duzu azkenengo egunean %sko hurrengo gertaerak direla eta",
+"You are receiving this email because in the last week the following things happened at %s" => "Posta hau jaso duzu azkenengo astean %sko hurrengo gertaerak direla eta",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Gertaeren zerrenda bat ikusiko duzu zure %s erabiltzen hasten zarenean.",
+"No more events to load" => "Ez dago kargatzeko gertaera gehiagorik",
+"Enable RSS feed" => "Gaitu RSS jarioa",
+"Notifications" => "Jakinarazpenak",
+"Mail" => "Posta",
+"Stream" => "Jarioa",
+"Notify about my own actions" => "Notifikatu neure ekintzak",
+"You need to set up your email address before you can receive notification emails." => "Zure epostaren zehaztu behar duzu jakinarazpen epostak jaso aurretik.",
+"Send emails:" => "Bidali epostak:",
+"Hourly" => "Orduro",
+"Daily" => "Egunero",
+"Weekly" => "Astero",
+"Activity feed" => "Jarduera jarioa",
+"Personal activity feed for %s" => "%sen jarduera jario pertsonala"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/fi_FI.php
index a252841,0000000..82de141
mode 100644,000000..100644
--- a/apps/activity/l10n/fi_FI.php
+++ b/apps/activity/l10n/fi_FI.php
@@@ -1,48 -1,0 +1,49 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Asetuksesi on päivitetty.",
+"Activity" => "Toimet",
+"A file or folder has been <strong>shared</strong>" => "Tiedosto tai kansio on <strong>jaettu</strong>",
+"A new file or folder has been <strong>created</strong>" => "Uusi tiedosto tai kansio on <strong>luotu</strong>",
+"A file or folder has been <strong>changed</strong>" => "Tiedostoa tai kansiota on <strong>muutettu</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Tiedosto tai kansio on <strong>poistettu</strong>",
+"You created %1\$s" => "Loit kohteen %1\$s",
+"%2\$s created %1\$s" => "%2\$s loi kohteen %1\$s",
++"%1\$s was created in a public folder" => "%1\$s luotiin julkiseen kansioon",
+"You changed %1\$s" => "Muutit kohdetta %1\$s",
+"%2\$s changed %1\$s" => "%2\$s muutti kohdetta %1\$s",
+"You deleted %1\$s" => "Poistit kohteen %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s poisti kohteen %1\$s",
+"You shared %1\$s with %2\$s" => "Jaoit kohteen %1\$s käyttäjän %2\$s kanssa",
+"You shared %1\$s with group %2\$s" => "Jaoit kohteen %1\$s ryhmän %2\$s kanssa",
+"%2\$s shared %1\$s with you" => "%2\$s jakoi kohteen %1\$s kanssasi",
+"You shared %1\$s via link" => "Jaoit kohteen %1\$s linkin kautta",
+"Activity notification" => "Ilmoitus toiminnasta",
+"All Activities" => "Kaikki toimet",
+"Activities by you" => "Omat toimet",
+"Activities by others" => "Muiden toimet",
+"Shares" => "Jaot",
+"Files" => "Tiedostot",
+"%s and %s" => "%s ja %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s ja <strong class=\"tooltip\" title=\"%s\">%n lisää</strong>","%s ja <strong class=\"tooltip\" title=\"%s\">%n lisää</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s ja %n lisää","%s ja %n lisää"),
+"Hello %s," => "Hei %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Saat tämän sähköpostiviestin, koska seuraavat asiat tapahtuivat kohteessa %s viimeisimmän tunnin aikana.",
+"You are receiving this email because in the last day the following things happened at %s" => "Saat tämän sähköpostiviestin, koska seuraavat asiat tapahtuivat kohteessa %s viimeisimmän vuorokauden aikana.",
+"You are receiving this email because in the last week the following things happened at %s" => "Saat tämän sähköpostiviestin, koska seuraavat asiat tapahtuivat kohteessa %s viime viikon aikana.",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Näet tapahtumaluettelon täällä, kun aloitat %sin käytön.",
+"No more events to load" => "Ei enempää tapahtumia ladattavaksi",
+"Enable RSS feed" => "Käytä RSS-syötettä",
+"Notifications" => "Ilmoitukset",
+"Mail" => "Sähköposti",
+"Notify about my own actions" => "Ilmoita omista toimistani",
+"You need to set up your email address before you can receive notification emails." => "Aseta sähköpostiosoite, jotta voit vastaanottaa sähköposti-ilmoituksia.",
+"Send emails:" => "Lähetä sähköpostit:",
+"Hourly" => "Tunneittain",
+"Daily" => "Päivittäin",
+"Weekly" => "Viikottain",
+"Activity feed" => "Toiminnan syöte",
+"Personal activity feed for %s" => "Käyttäjän %s henkilökohtainen toimintasyöte"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/he.php
index 634893c,0000000..44272da
mode 100644,000000..100644
--- a/apps/activity/l10n/he.php
+++ b/apps/activity/l10n/he.php
@@@ -1,11 -1,0 +1,50 @@@
+<?php
+$TRANSLATIONS = array(
++"Your settings have been updated." => "ההגדרות שלך עודכנו",
+"Activity" => "פעילות",
++"A file or folder has been <strong>shared</strong>" => "קובץ או תיקייה <strong>שותפו<strong/>",
++"A new file or folder has been <strong>created</strong>" => "קובץ או תיקייה חדשים <strong>נוצרו<strong/>",
++"A file or folder has been <strong>changed</strong>" => "קובץ או תיקייה <strong>שונו<strong/>",
++"A file or folder has been <strong>deleted</strong>" => "קובץ או תיקייה <strong>נמחקו<strong/>",
++"You created %1\$s" => "יצרת %1\$s",
++"%2\$s created %1\$s" => "%2\$s נוצרו %1\$s",
++"%1\$s was created in a public folder" => "%1\$s נוצר בתיקייה ציבורית",
++"You changed %1\$s" => "שינית %1\$s",
++"%2\$s changed %1\$s" => "%2\$s שונו %1\$s",
++"You deleted %1\$s" => "מחקת %1\$s",
++"%2\$s deleted %1\$s" => "%2\$s נמחקו %1\$s",
++"You shared %1\$s with %2\$s" => "שיתפת %1\$s עם %2\$s",
++"You shared %1\$s with group %2\$s" => "שיתפת %1\$s עם קבוצת %2\$s",
++"%2\$s shared %1\$s with you" => "%2\$s שיתפו %1\$s אתך",
++"You shared %1\$s via link" => "שיתפת %1\$s על בסיס קישור",
++"Activity notification" => "דיווח פעילות",
++"All Activities" => "כל הפעילויות",
++"Activities by you" => "פעילות שלך",
++"Activities by others" => "פעילות של אחרים",
++"Shares" => "שיתופים",
+"Files" => "קבצים",
++"in %s" => "ב- %s",
++"%s and %s" => "%s ו- %s",
++", " => ",",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("",""),
+"_%s and %n more_::_%s and %n more_" => array("",""),
- "You will see a list of events here when you start to use your %s." => "תיראו פה רשימת אירועים כשתתחילו להשתמתש ב %s",
++"Hello %s," => "שלום %s,",
++"You are receiving this email because in the last hour the following things happened at %s" => "הודעת דואר אלקטרוני זו נשלחת כיוון שבשעה האחרונה אירעו הדברים הבאים ב- %s",
++"You are receiving this email because in the last day the following things happened at %s" => "הודעת דואר אלקטרוני זו נשלחת כיוון שביום האחרון אירעו הדברים הבאים ב- %s",
++"You are receiving this email because in the last week the following things happened at %s" => "הודעת דואר אלקטרוני זו נשלחת כיוון שבשבוע האחרון אירעו הדברים הבאים ב- %s",
++"* %s" => "* %s",
++"You will see a list of events here when you start to use your %s." => "תיראו פה רשימת אירועים כשתתחילו להשתמתש ב %s.",
++"No more events to load" => "אין אירועים נוספים לטעינה",
++"Enable RSS feed" => "לאפשר הזנת RSS",
++"Notifications" => "דיווחים",
++"Mail" => "דואר",
++"Notify about my own actions" => "לדווח על פעילות שלי",
++"You need to set up your email address before you can receive notification emails." => "יש להגדיר כתובת דואר אלקטרוני לפני שניתן יהיה לקבל דיווחים.",
++"Send emails:" => "שליחת הודעות דואר אלקטרוני:",
++"Hourly" => "שעתי",
+"Daily" => "יומי",
- "Weekly" => "שבועי"
++"Weekly" => "שבועי",
++"Activity feed" => "דיווחי פעילות",
++"Personal activity feed for %s" => "הזנת פעילות עצמית עבור %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/it.php
index c2a4e61,0000000..a680cf4
mode 100644,000000..100644
--- a/apps/activity/l10n/it.php
+++ b/apps/activity/l10n/it.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Le tue impostazioni sono state aggiornate.",
+"Activity" => "Attività",
+"A file or folder has been <strong>shared</strong>" => "Un file o una cartella è stato <strong>condiviso</strong>",
+"A new file or folder has been <strong>created</strong>" => "Un nuovo file o cartella è stato <strong>creato</strong>",
+"A file or folder has been <strong>changed</strong>" => "Un file o una cartella è stato <strong>modificato</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Un file o una cartella è stato <strong>eliminato</strong>",
+"You created %1\$s" => "Hai creato %1\$s",
+"%2\$s created %1\$s" => "%2\$s ha creato %1\$s",
++"%1\$s was created in a public folder" => "%1\$s è stato creato in una cartella pubblica",
+"You changed %1\$s" => "Hai modificato %1\$s",
+"%2\$s changed %1\$s" => "%2\$s ha modificato %1\$s",
+"You deleted %1\$s" => "Hai eliminato %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s ha eliminato %1\$s",
+"You shared %1\$s with %2\$s" => "Hai condiviso %1\$s con %2\$s",
+"You shared %1\$s with group %2\$s" => "Hai condiviso %1\$s con il gruppo %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s ha condiviso %1\$s con te",
+"You shared %1\$s via link" => "Hai condiviso %1\$s tramite collegamento",
+"Activity notification" => "Notifica delle attività",
+"All Activities" => "Tutte le attività",
+"Activities by you" => "Le tue attività",
+"Activities by others" => "Attività altrui",
+"Shares" => "Condivisioni",
+"Files" => "File",
+"in %s" => "in %s",
+"%s and %s" => "%s e %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s e <strong class=\"tooltip\" title=\"%s\">%n altro</strong>","%s e <strong class=\"tooltip\" title=\"%s\">%n altri</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s e %n altro","%s e %n altri"),
+"Hello %s," => "Ciao %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Hai ricevuto questa email poiché nell'ultima ora si sono verificati i seguenti eventi su %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Hai ricevuto questa email poiché nell'ultimo giorno si sono verificati i seguenti eventi su %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Hai ricevuto questa email poiché nell'ultima settimana si sono verificati i seguenti eventi su %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Qui vedrai un elenco di eventi quando inizi a utilizzare %s.",
+"No more events to load" => "Non ci sono altri eventi da caricare",
+"Enable RSS feed" => "Abilita fonte RSS",
+"Notifications" => "Notifiche",
+"Mail" => "Posta",
+"Stream" => "Flusso",
+"Notify about my own actions" => "Notificami le mie azioni",
+"You need to set up your email address before you can receive notification emails." => "Devi impostare l'indirizzo del tuo utente prima di poter ricevere le email di notifica.",
+"Send emails:" => "Invio email:",
+"Hourly" => "Ogni ora",
+"Daily" => "Quotidiano",
+"Weekly" => "Settimanale",
+"Activity feed" => "Fonte delle attività",
+"Personal activity feed for %s" => "Fonte delle attività personali per %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/nb_NO.php
index 0ff84cb,0000000..30c540f
mode 100644,000000..100644
--- a/apps/activity/l10n/nb_NO.php
+++ b/apps/activity/l10n/nb_NO.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Dine innstillinger har blit oppdatert",
+"Activity" => "Aktivitet",
+"A file or folder has been <strong>shared</strong>" => "En fil eller mappe ble <strong>delt</strong>",
+"A new file or folder has been <strong>created</strong>" => "En ny fil eller mappe ble <strong>opprettet</strong>",
+"A file or folder has been <strong>changed</strong>" => "En fil eller mappe ble <strong>endret</strong>",
+"A file or folder has been <strong>deleted</strong>" => "En fil eller mappe ble <strong>slettet</strong>",
+"You created %1\$s" => "Du slettet %1\$s",
+"%2\$s created %1\$s" => "%2\$s opprettet %1\$s",
++"%1\$s was created in a public folder" => "%1\$s ble opprettet i en offentlig mappe",
+"You changed %1\$s" => "Du endret %1\$s",
+"%2\$s changed %1\$s" => "%2\$s endret %1\$s",
+"You deleted %1\$s" => "Du slettet %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s slettet %1\$s",
+"You shared %1\$s with %2\$s" => "Du delte %1\$s med %2\$s",
+"You shared %1\$s with group %2\$s" => "Du delte %1\$s med gruppe %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s delte %1\$s med deg",
+"You shared %1\$s via link" => "Du delte %1\$s via lenke",
+"Activity notification" => "Varsel om aktivitet",
+"All Activities" => "Alle aktiviteter",
+"Activities by you" => "Dine aktiviteter",
+"Activities by others" => "Andres aktiviteter",
+"Shares" => "Delinger",
+"Files" => "Filer",
+"in %s" => "i %s",
+"%s and %s" => "%s og %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s og <strong class=\"tooltip\" title=\"%s\">%n til</strong>","%s og <strong class=\"tooltip\" title=\"%s\">%n flere</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s og %n til","%s og %n flere"),
+"Hello %s," => "Hei %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Du mottar denne e-posten fordi følgende har skjedd på %s den siste timen",
+"You are receiving this email because in the last day the following things happened at %s" => "Du mottar denne e-posten fordi følgende har skjedd på %s det siste døgnet",
+"You are receiving this email because in the last week the following things happened at %s" => "Du mottar denne e-posten fordi følgende har skjedd på %s den siste uken",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Du vil se en liste av hendelser her når du begynner å bruke %s.",
+"No more events to load" => "Ingen flere hendelser å laste",
+"Enable RSS feed" => "Aktiver RSS-strøm",
+"Notifications" => "Varsler",
+"Mail" => "E-post",
+"Stream" => "Strøm",
+"Notify about my own actions" => "Varsle meg om mine egne handlinger",
+"You need to set up your email address before you can receive notification emails." => "Du må sette opp e-postadressen din før du kan motta varslinger på e-post.",
+"Send emails:" => "Send e-poster:",
+"Hourly" => "Hver time",
+"Daily" => "Daglig",
+"Weekly" => "Ukentlig",
+"Activity feed" => "Aktivitetsstrøm",
+"Personal activity feed for %s" => "Personlig aktivitetsstrøm for %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/nl.php
index 03202aa,0000000..5c8dda6
mode 100644,000000..100644
--- a/apps/activity/l10n/nl.php
+++ b/apps/activity/l10n/nl.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Uw instellingen zijn bijgewerkt",
+"Activity" => "Activiteit",
+"A file or folder has been <strong>shared</strong>" => "Een bestand of map is <strong>gedeeld</strong>",
+"A new file or folder has been <strong>created</strong>" => "Een nieuw bestand of map is <strong>aangemaakt</strong>",
+"A file or folder has been <strong>changed</strong>" => "Een bestand of map is <strong>gewijzigd</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Een bestand of map is <strong>verwijderd</strong>",
+"You created %1\$s" => "U creëerde %1\$s",
+"%2\$s created %1\$s" => "%2\$s creëerde %1\$s",
++"%1\$s was created in a public folder" => "%1\$s werd gecreëerd in een openbare map",
+"You changed %1\$s" => "U wijzigde %1\$s",
+"%2\$s changed %1\$s" => "%2\$s wijzigde %1\$s",
+"You deleted %1\$s" => "U verwijderde %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s verwijderde %1\$s",
+"You shared %1\$s with %2\$s" => "U deelde %1\$s met %2\$s",
+"You shared %1\$s with group %2\$s" => "U deelde %1\$s met groep %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s deelde %1\$s met u",
+"You shared %1\$s via link" => "U deelde %1\$s via link",
+"Activity notification" => "Activiteitenmelding",
+"All Activities" => "Alle activiteiten",
+"Activities by you" => "Activiteiten van uzelf",
+"Activities by others" => "Activiteiten van anderen",
+"Shares" => "Shares",
+"Files" => "Bestanden",
+"in %s" => "in %s",
+"%s and %s" => "%s en %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s en <strong class=\"tooltip\" title=\"%s\">%n meer</strong>","%s en <strong class=\"tooltip\" title=\"%s\">%n meer</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s en %n meer","%s en %n meer"),
+"Hello %s," => "Hallo %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "U ontvangt dit bericht omdat het afgelopen uur het volgende gebeurde op %s",
+"You are receiving this email because in the last day the following things happened at %s" => "U ontvangt dit bericht omdat de afgelopen dag het volgende gebeurde op %s",
+"You are receiving this email because in the last week the following things happened at %s" => "U ontvangt dit bericht omdat de afgelopen week het volgende gebeurde op %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "U ziet hier een lijst met activiteiten als u gebruik gaat maken van uw %s.",
+"No more events to load" => "Geen activiteiten meer om te laden ",
+"Enable RSS feed" => "Aanzetten RSS kanaal",
+"Notifications" => "Meldingen",
+"Mail" => "E-mail",
+"Stream" => "Stroom",
- "Notify about my own actions" => "Melding over mijn eigen acties",
++"Notify about my own actions" => "Melding over uw eigen acties",
+"You need to set up your email address before you can receive notification emails." => "U moet uw e-mailadres instellen voordat u meldingen kunt ontvangen.",
+"Send emails:" => "Verstuur e-mails:",
+"Hourly" => "Per uur",
+"Daily" => "Dagelijks",
+"Weekly" => "Wekelijks",
+"Activity feed" => "Activiteitenkanaal",
+"Personal activity feed for %s" => "Persoonlijk activiteitenkanaal voor %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/activity/l10n/pl.php
index 73d90a2,0000000..e606247
mode 100644,000000..100644
--- a/apps/activity/l10n/pl.php
+++ b/apps/activity/l10n/pl.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Twoje ustawienia zostały zaktualizowane",
+"Activity" => "Aktywność",
+"A file or folder has been <strong>shared</strong>" => "Plik lub folder stał się <strong>współdzielony</strong>",
+"A new file or folder has been <strong>created</strong>" => "Nowy plik lub folder został <strong>utworzony</strong>",
+"A file or folder has been <strong>changed</strong>" => "Plik lub folder został <strong>zmieniony</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Plik lub folder został <strong>usunięty</strong>",
+"You created %1\$s" => "Utworzyłeś %1\$s",
+"%2\$s created %1\$s" => "%2\$s utworzył %1\$s",
++"%1\$s was created in a public folder" => "%1\$s został utworzony w folderze publicznym",
+"You changed %1\$s" => "Zmieniłeś %1\$s",
+"%2\$s changed %1\$s" => "%2\$s zmienił %1\$s",
+"You deleted %1\$s" => "Usunąłeś %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s usunął %1\$s",
+"You shared %1\$s with %2\$s" => "Współdzielisz %1\$s z %2\$s",
+"You shared %1\$s with group %2\$s" => "Współdzielisz %1\$s z grupą %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s współdzieli %1\$s z Tobą",
+"You shared %1\$s via link" => "Udostępniasz %1\$s przez link",
+"Activity notification" => "Powiadomienie o aktywności",
+"All Activities" => "Wszystkie aktywności",
+"Activities by you" => "Twoje aktywności",
+"Activities by others" => "Aktywności innych",
+"Shares" => "Udziały",
+"Files" => "Pliki",
+"in %s" => "w %s",
+"%s and %s" => "%s oraz %s",
+", " => ", ",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s i <strong class=\"tooltip\" title=\"%s\">%n więcej</strong>","%s i <strong class=\"tooltip\" title=\"%s\">%n więcej</strong>","%s i <strong class=\"tooltip\" title=\"%s\">%n więcej</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s i %n więcej","%s i %n więcej","%s i %n więcej"),
+"Hello %s," => "Witaj %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Otrzymujesz ten email, ponieważ w ostatniej godzinie zdarzyły się następujące rzeczy w %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Otrzymujesz ten email, ponieważ ostatniego dnia zdarzyły się następujące rzeczy w %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Otrzymujesz ten email, ponieważ w ostatnim tygodniu zdarzyły się następujące rzeczy w %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Zobaczysz tutaj listę wydarzeń, gdy zaczniesz korzystać z twojego %s",
+"No more events to load" => "Nie ma już zdarzeń do załadowania",
+"Enable RSS feed" => "Włącz strumień RSS",
+"Notifications" => "Powiadomienia",
+"Mail" => "Poczta",
+"Stream" => "Strumień",
+"Notify about my own actions" => "Powiadamiaj mnie o moich aktywnościach",
+"You need to set up your email address before you can receive notification emails." => "Musisz najpierw ustawić adres email zanim będziesz mógł otrzymywać powiadomienia.",
+"Send emails:" => "Wyślij maile:",
+"Hourly" => "Co godzinę",
+"Daily" => "Codziennie",
+"Weekly" => "Cotygodniowo",
+"Activity feed" => "Strumień aktywności",
+"Personal activity feed for %s" => "Osobisty strumień aktywności dla %s"
+);
+$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --cc apps/activity/l10n/pt_BR.php
index 579438d,0000000..2bc9c54
mode 100644,000000..100644
--- a/apps/activity/l10n/pt_BR.php
+++ b/apps/activity/l10n/pt_BR.php
@@@ -1,50 -1,0 +1,51 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Suas configurações foram atualizadas.",
+"Activity" => "Atividade",
+"A file or folder has been <strong>shared</strong>" => "Um arquivo ou pasta foi <strong>compartilhado</strong> ",
+"A new file or folder has been <strong>created</strong>" => "Um novo arquivo ou pasta foi <strong>criado</strong>",
+"A file or folder has been <strong>changed</strong>" => "Um arquivo ou pasta foi <strong>modificado</strong>",
+"A file or folder has been <strong>deleted</strong>" => "Um arquivo ou pasta foi <strong>excluído</strong>",
+"You created %1\$s" => "Você criou %1\$s",
+"%2\$s created %1\$s" => "%2\$s criou %1\$s",
++"%1\$s was created in a public folder" => "%1\$s foi criado em uma pasta pública",
+"You changed %1\$s" => "Você modificou %1\$s",
+"%2\$s changed %1\$s" => "%2\$s modificou %1\$s",
+"You deleted %1\$s" => "Você eliminou %1\$s ",
+"%2\$s deleted %1\$s" => "%2\$s eliminou %1\$s",
+"You shared %1\$s with %2\$s" => "Você compartilhou %1\$s com %2\$s",
+"You shared %1\$s with group %2\$s" => "Você compartilhou %1\$s com o grupo %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s compartilhou %1\$s com você",
+"You shared %1\$s via link" => "Você compartilhou %1\$s via link",
+"Activity notification" => "Notificação de atividade",
+"All Activities" => "Todas as Atividades",
+"Activities by you" => "Atividades por você",
+"Activities by others" => "Atividades por outros",
+"Shares" => "Compartilhamentos",
+"Files" => "Arquivos",
+"in %s" => "em %s",
+"%s and %s" => "%s e %s",
+", " => ",",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s e <strong class=\"tooltip\" title=\"%s\">mais %n</strong>","%s e <strong class=\"tooltip\" title=\"%s\">mais %n</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s e mais %n","%s e mais %n"),
+"Hello %s," => "Olá %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Você está recebendo este e-mail porque na última hora as seguintes coisas aconteceram em %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Você está recebendo este e-mail porque no último dia as seguintes coisas aconteceram em %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Você está recebendo este e-mail porque na última semana as seguintes coisas aconteceram em %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Você verá uma lista de eventos aqui quando começar a usar o seu %s.",
+"No more events to load" => "Não ha mais eventos para carregar",
+"Enable RSS feed" => "Habilitar alimentação RRS",
+"Notifications" => "Notificações",
+"Mail" => "EMail",
+"Stream" => "Fluxo",
+"Notify about my own actions" => "Notifique sobre minhas próprias ações",
+"You need to set up your email address before you can receive notification emails." => "Você precisa configurar o endereço de e-mail antes que você possa receber e-mails de notificação.",
+"Send emails:" => "Enviar e-mails:",
+"Hourly" => "De hora em hora",
+"Daily" => "Diário",
+"Weekly" => "Semanal",
+"Activity feed" => "Alimentação de atividade",
+"Personal activity feed for %s" => "Alimentação de atividade pessoal para %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --cc apps/activity/l10n/sv.php
index 41720b0,0000000..5050781
mode 100644,000000..100644
--- a/apps/activity/l10n/sv.php
+++ b/apps/activity/l10n/sv.php
@@@ -1,44 -1,0 +1,45 @@@
+<?php
+$TRANSLATIONS = array(
+"Your settings have been updated." => "Dina inställningar har uppdaterats.",
+"Activity" => "Aktivitet",
+"A file or folder has been <strong>shared</strong>" => "En fil eller mapp har <strong>delats</strong>",
+"You created %1\$s" => "Du skapade %1\$s",
+"%2\$s created %1\$s" => "%2\$s skapade %1\$s",
+"You changed %1\$s" => "Du ändrade %1\$s",
+"%2\$s changed %1\$s" => "%2\$s ändrade %1\$s",
+"You deleted %1\$s" => "Du raderade %1\$s",
+"%2\$s deleted %1\$s" => "%2\$s raderade %1\$s",
+"You shared %1\$s with %2\$s" => "Du delade %1\$s med %2\$s",
+"You shared %1\$s with group %2\$s" => "Du delade %1\$s med grupp %2\$s",
+"%2\$s shared %1\$s with you" => "%2\$s delade %1\$s med dig",
+"Activity notification" => "Aktivitet notifiering",
+"All Activities" => "Alla aktiviteter",
+"Activities by you" => "Aktivitet av dig",
+"Activities by others" => "Aktiviteter av andra",
+"Shares" => "Delningar",
+"Files" => "Filer",
++"in %s" => "in %s",
+"%s and %s" => "%s och %s",
+", " => ",",
+"_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_::_%s and <strong class=\_tooltip\_ title=\_%s\_>%n more</strong>_" => array("%s och <strong class=\"tooltip\" title=\"%s\">%n mer</strong>","%s och <strong class=\"tooltip\" title=\"%s\">%n mer</strong>"),
+"_%s and %n more_::_%s and %n more_" => array("%s och %n mer","%s och %n mer"),
+"Hello %s," => "Hej %s,",
+"You are receiving this email because in the last hour the following things happened at %s" => "Du har fått detta e-postmeddelande på grund av att under den senaste timmen har följande hänt på %s",
+"You are receiving this email because in the last day the following things happened at %s" => "Du har fått detta e-postmeddelande på grund av att under det senaste dygnet har följande hänt på %s",
+"You are receiving this email because in the last week the following things happened at %s" => "Du har fått detta e-postmeddelande på grund av att under den senaste veckan har följande hänt på %s",
+"* %s" => "* %s",
+"You will see a list of events here when you start to use your %s." => "Du kommer att se en lista utav evenemang här när du börjar använda din %s",
+"No more events to load" => "Inga fler aktiviteter att ladda.",
+"Enable RSS feed" => "Aktivera RSS-flöde",
+"Notifications" => "Notifieringar",
+"Mail" => "Post",
+"Stream" => "Ström",
+"You need to set up your email address before you can receive notification emails." => "Du måste ställa in din e-postadress innan du kan ta emot e-postmeddelanden.",
+"Send emails:" => "Skicka e-post:",
+"Hourly" => "Timme",
+"Daily" => "Dagligen",
+"Weekly" => "Varje vecka",
+"Activity feed" => "Aktivitetsflöde",
+"Personal activity feed for %s" => "Personligt aktivitetsflöde för %s"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --cc apps/bookmarks/appinfo/database.xml
index 6e45d5e,0000000..923e50c
mode 100644,000000..100644
--- a/apps/bookmarks/appinfo/database.xml
+++ b/apps/bookmarks/appinfo/database.xml
@@@ -1,119 -1,0 +1,110 @@@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<database>
+ <name>*dbname*</name>
+ <create>true</create>
+ <overwrite>false</overwrite>
+ <charset>utf8</charset>
+ <table>
+ <name>*dbprefix*bookmarks</name>
+ <declaration>
+ <field>
+ <name>id</name>
+ <type>integer</type>
+ <autoincrement>1</autoincrement>
+ <default>0</default>
+ <notnull>true</notnull>
+ <length>4</length>
+ </field>
+ <field>
+ <name>url</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>4096</length>
+ </field>
+ <field>
+ <name>title</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>140</length>
+ </field>
+ <field>
+ <name>user_id</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>64</length>
+ </field>
+ <field>
+ <name>description</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>4096</length>
+ </field>
+ <field>
+ <name>public</name>
+ <type>integer</type>
+ <default>0</default>
+ <length>1</length>
+ </field>
+ <field>
+ <name>added</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>false</notnull>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
+ <field>
+ <name>lastmodified</name>
+ <type>integer</type>
+ <default></default>
+ <notnull>false</notnull>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
+ <field>
+ <name>clickcount</name>
+ <type>integer</type>
+ <default>0</default>
+ <notnull>true</notnull>
+ <unsigned>true</unsigned>
+ <length>4</length>
+ </field>
-
- <index>
- <name>id</name>
- <unique>true</unique>
- <field>
- <name>id</name>
- <sorting>descending</sorting>
- </field>
- </index>
+ </declaration>
+ </table>
+
+ <table>
+ <name>*dbprefix*bookmarks_tags</name>
+ <declaration>
+ <field>
+ <name>bookmark_id</name>
+ <type>integer</type>
+ <length>64</length>
+ </field>
+
+ <field>
+ <name>tag</name>
+ <type>text</type>
+ <default></default>
+ <notnull>true</notnull>
+ <length>255</length>
+ </field>
+ <index>
+ <name>bookmark_tag</name>
+ <unique>true</unique>
+ <field>
+ <name>bookmark_id</name>
+ <sorting>ascending</sorting>
+ </field>
+ <field>
+ <name>tag</name>
+ <sorting>ascending</sorting>
+ </field>
+ </index>
+ </declaration>
+ </table>
+</database>
+
diff --cc apps/calendar/lib/app.php
index 8782ce7,0000000..8af0ff3
mode 100644,000000..100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@@ -1,584 -1,0 +1,580 @@@
+<?php
+/**
+ * Copyright (c) 2011 Bart Visscher <bartv at thisnet.nl>
+ * Copyright (c) 2012 Georg Ehrke <georg at owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ * This class manages our app actions
+ */
+OC_Calendar_App::$l10n = OCP\Util::getL10N('calendar');
+OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
+class OC_Calendar_App{
+ const CALENDAR = 'calendar';
+ const EVENT = 'event';
+ /**
+ * @brief language object for calendar app
+ */
+ public static $l10n;
+
+ /**
+ * @brief categories of the user
+ */
+ protected static $categories = null;
+
+ /**
+ * @brief timezone of the user
+ */
+ public static $tz;
+
+ /**
+ * @brief returns informations about a calendar
+ * @param int $id - id of the calendar
+ * @param bool $security - check access rights or not
+ * @param bool $shared - check if the user got access via sharing
+ * @return mixed - bool / array
+ */
+ public static function getCalendar($id, $security = true, $shared = false) {
+ if(! is_numeric($id)) {
+ return false;
+ }
+
+ $calendar = OC_Calendar_Calendar::find($id);
+ // FIXME: Correct arguments to just check for permissions
+ if($security === true && $shared === false) {
+ if(OCP\User::getUser() === $calendar['userid']){
+ return $calendar;
+ }else{
+ return false;
+ }
+ }
+ if($security === true && $shared === true) {
+ if(OCP\Share::getItemSharedWithBySource('calendar', $id)) {
+ return $calendar;
+ }
+ }
+ return $calendar;
+ }
+
+ /**
+ * @brief returns informations about an event
+ * @param int $id - id of the event
+ * @param bool $security - check access rights or not
+ * @param bool $shared - check if the user got access via sharing
+ * @return mixed - bool / array
+ */
+ public static function getEventObject($id, $security = true, $shared = false) {
+ $event = OC_Calendar_Object::find($id);
+ if($shared === true || $security === true) {
+ $permissions = self::getPermissions($id, self::EVENT);
+ OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id.', permissions: '.$permissions, OCP\Util::DEBUG);
+ if(self::getPermissions($id, self::EVENT)) {
+ return $event;
+ }
+ } else {
+ return $event;
+ }
+
+ return false;
+ }
+
+ /**
+ * @brief returns the parsed calendar data
+ * @param int $id - id of the event
+ * @param bool $security - check access rights or not
+ * @return mixed - bool / object
+ */
+ public static function getVCalendar($id, $security = true, $shared = false) {
+ $event_object = self::getEventObject($id, $security, $shared);
+ if($event_object === false) {
+ return false;
+ }
+ $vobject = OC_VObject::parse($event_object['calendardata']);
+ if(is_null($vobject)) {
+ return false;
+ }
+ return $vobject;
+ }
+
+ /**
+ * @brief checks if an event was edited and dies if it was
+ * @param (object) $vevent - vevent object of the event
+ * @param (int) $lastmodified - time of last modification as unix timestamp
+ * @return (bool)
+ */
+ public static function isNotModified($vevent, $lastmodified) {
+ $last_modified = $vevent->__get('LAST-MODIFIED');
+ if($last_modified && $lastmodified != $last_modified->getDateTime()->format('U')) {
+ OCP\JSON::error(array('modified'=>true));
+ exit;
+ }
+ return true;
+ }
+
+ /**
+ * @brief returns the default categories of ownCloud
+ * @return (array) $categories
+ */
+ public static function getDefaultCategories() {
+ return array(
+ (string)self::$l10n->t('Birthday'),
+ (string)self::$l10n->t('Business'),
+ (string)self::$l10n->t('Call'),
+ (string)self::$l10n->t('Clients'),
+ (string)self::$l10n->t('Deliverer'),
+ (string)self::$l10n->t('Holidays'),
+ (string)self::$l10n->t('Ideas'),
+ (string)self::$l10n->t('Journey'),
+ (string)self::$l10n->t('Jubilee'),
+ (string)self::$l10n->t('Meeting'),
+ (string)self::$l10n->t('Other'),
+ (string)self::$l10n->t('Personal'),
+ (string)self::$l10n->t('Projects'),
+ (string)self::$l10n->t('Questions'),
+ (string)self::$l10n->t('Work'),
+ );
+ }
+
+ /**
+ * @brief returns the vcategories object of the user
+ * @return (object) $vcategories
+ */
+ public static function getVCategories() {
+ if (is_null(self::$categories)) {
+ $categories = \OC::$server->getTagManager()->load('event');
+ if($categories->isEmpty('event')) {
+ self::scanCategories();
+ }
+ self::$categories = \OC::$server->getTagManager()
+ ->load('event', self::getDefaultCategories());
+ }
+ return self::$categories;
+ }
+
+ /**
+ * @brief returns the categories of the vcategories object
+ * @return (array) $categories
+ */
+ public static function getCategoryOptions() {
+ $getNames = function($tag) {
+ return $tag['name'];
+ };
+ $categories = self::getVCategories()->getTags();
+ $categories = array_map($getNames, $categories);
+ return $categories;
+ }
+
+ /**
+ * scan events for categories.
+ * @param $events VEVENTs to scan. null to check all events for the current user.
+ */
+ public static function scanCategories($events = null) {
+ if (is_null($events)) {
+ $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+ if(count($calendars) > 0) {
+ $events = array();
+ foreach($calendars as $calendar) {
+ if($calendar['userid'] === OCP\User::getUser()) {
+ $calendar_events = OC_Calendar_Object::all($calendar['id']);
+ $events = $events + $calendar_events;
+ }
+ }
+ }
+ }
+ if(is_array($events) && count($events) > 0) {
+ $vcategories = \OC::$server->getTagManager()->load('event');
+ $getName = function($tag) {
+ return $tag['name'];
+ };
+ $tags = array_map($getName, $vcategories->getTags());
+ $vcategories->delete($tags);
+ foreach($events as $event) {
+ $vobject = OC_VObject::parse($event['calendardata']);
+ if(!is_null($vobject)) {
+ $object = null;
+ if (isset($calendar->VEVENT)) {
+ $object = $calendar->VEVENT;
+ } else
+ if (isset($calendar->VTODO)) {
+ $object = $calendar->VTODO;
+ } else
+ if (isset($calendar->VJOURNAL)) {
+ $object = $calendar->VJOURNAL;
+ }
+ if ($object && isset($object->CATEGORIES)) {
+ $vcategories->addMultiple($object->CATEGORIES->getParts(), true, $event['id']);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * check VEvent for new categories.
+ * @see \OCP\ITags::addMultiple()
+ */
+ public static function loadCategoriesFromVCalendar($id, OC_VObject $calendar) {
+ $object = null;
+ if (isset($calendar->VEVENT)) {
+ $object = $calendar->VEVENT;
+ } else
+ if (isset($calendar->VTODO)) {
+ $object = $calendar->VTODO;
+ } else
+ if (isset($calendar->VJOURNAL)) {
+ $object = $calendar->VJOURNAL;
+ }
+ if ($object && isset($object->CATEGORIES)) {
+ self::getVCategories()->addMultiple($object->CATEGORIES->getParts(), true, $id);
+ }
+ }
+
+ /**
+ * @brief returns the options for the access class of an event
+ * @return array - valid inputs for the access class of an event
+ */
+ public static function getAccessClassOptions() {
+ return OC_Calendar_Object::getAccessClassOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for the repeat rule of an repeating event
+ * @return array - valid inputs for the repeat rule of an repeating event
+ */
+ public static function getRepeatOptions() {
+ return OC_Calendar_Object::getRepeatOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for the end of an repeating event
+ * @return array - valid inputs for the end of an repeating events
+ */
+ public static function getEndOptions() {
+ return OC_Calendar_Object::getEndOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for an monthly repeating event
+ * @return array - valid inputs for monthly repeating events
+ */
+ public static function getMonthOptions() {
+ return OC_Calendar_Object::getMonthOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for an weekly repeating event
+ * @return array - valid inputs for weekly repeating events
+ */
+ public static function getWeeklyOptions() {
+ return OC_Calendar_Object::getWeeklyOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for an yearly repeating event
+ * @return array - valid inputs for yearly repeating events
+ */
+ public static function getYearOptions() {
+ return OC_Calendar_Object::getYearOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for an yearly repeating event which occurs on specific days of the year
+ * @return array - valid inputs for yearly repeating events
+ */
+ public static function getByYearDayOptions() {
+ return OC_Calendar_Object::getByYearDayOptions();
+ }
+
+ /**
+ * @brief returns the options for an yearly repeating event which occurs on specific month of the year
+ * @return array - valid inputs for yearly repeating events
+ */
+ public static function getByMonthOptions() {
+ return OC_Calendar_Object::getByMonthOptions(self::$l10n);
+ }
+
+ /**
+ * @brief returns the options for an yearly repeating event which occurs on specific week numbers of the year
+ * @return array - valid inputs for yearly repeating events
+ */
+ public static function getByWeekNoOptions() {
+ return OC_Calendar_Object::getByWeekNoOptions();
+ }
+
+ /**
+ * @brief returns the options for an yearly or monthly repeating event which occurs on specific days of the month
+ * @return array - valid inputs for yearly or monthly repeating events
+ */
+ public static function getByMonthDayOptions() {
+ return OC_Calendar_Object::getByMonthDayOptions();
+ }
+
+ /**
+ * @brief returns the options for an monthly repeating event which occurs on specific weeks of the month
+ * @return array - valid inputs for monthly repeating events
+ */
+ public static function getWeekofMonth() {
+ return OC_Calendar_Object::getWeekofMonth(self::$l10n);
+ }
+
+ /**
+ * @return (string) $timezone as set by user or the default timezone
+ */
+ public static function getTimezone() {
+ return OCP\Config::getUserValue(OCP\User::getUser(),
+ 'calendar',
+ 'timezone',
+ date_default_timezone_get());
+ }
+
+ /**
+ * @brief Get the permissions for a calendar / an event
+ * @param (int) $id - id of the calendar / event
+ * @param (string) $type - type of the id (calendar/event)
+ * @return (int) $permissions - CRUDS permissions
+ * @param (string) $accessclass - access class (rfc5545, section 3.8.1.3)
+ * @see OCP\Share
+ */
+ public static function getPermissions($id, $type, $accessclass = '') {
+ $permissions_all = OCP\PERMISSION_ALL;
+
+ if($type == self::CALENDAR) {
+ $calendar = self::getCalendar($id, false, false);
+ if($calendar['userid'] == OCP\USER::getUser()) {
+ return $permissions_all;
+ } else {
+ $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
+ if ($sharedCalendar) {
+ return $sharedCalendar['permissions'];
+ }
+ }
+ }
+ elseif($type == self::EVENT) {
+ if(OC_Calendar_Object::getowner($id) == OCP\USER::getUser()) {
+ return $permissions_all;
+ } else {
+ $object = OC_Calendar_Object::find($id);
+ $sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $object['calendarid']);
+ $sharedEvent = OCP\Share::getItemSharedWithBySource('event', $id);
+ $calendar_permissions = 0;
+ $event_permissions = 0;
+ if ($sharedCalendar) {
+ $calendar_permissions = $sharedCalendar['permissions'];
+ }
+ if ($sharedEvent) {
+ $event_permissions = $sharedEvent['permissions'];
+ }
+ if ($accessclass === 'PRIVATE') {
+ return 0;
+ } elseif ($accessclass === 'CONFIDENTIAL') {
+ return OCP\PERMISSION_READ;
+ } else {
+ return max($calendar_permissions, $event_permissions);
+ }
+ }
+ }
+ return 0;
+ }
+
+ /*
+ * @brief Get the permissions for an access class
+ * @param (string) $accessclass - access class (rfc5545, section 3.8.1.3)
+ * @return (int) $permissions - CRUDS permissions
+ * @see OCP\Share
+ */
+ public static function getAccessClassPermissions($accessclass = '') {
+
+ switch($accessclass) {
+ case 'CONFIDENTIAL':
+ return OCP\PERMISSION_READ;
+ case 'PUBLIC':
+ case '':
+ return (OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE);
+ default:
+ return 0;
+ }
+ }
+
+ /**
+ * @brief analyses the parameter for calendar parameter and returns the objects
+ * @param (string) $calendarid - calendarid
+ * @param (int) $start - unixtimestamp of start
+ * @param (int) $end - unixtimestamp of end
+ * @return (array) $events
+ */
+ public static function getrequestedEvents($calendarid, $start, $end) {
+ $events = array();
+ if($calendarid == 'shared_events') {
+ $singleevents = OCP\Share::getItemsSharedWith('event', OC_Share_Backend_Event::FORMAT_EVENT);
+ $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
+ foreach($singleevents as $singleevent) {
+ // Skip this single event if the whole calendar is already shared with the user.
+ $calendarShared = false;
+ foreach ($calendars as $calendar) {
+ if ($singleevent['calendarid'] === $calendar['id']) {
+ $calendarShared = true;
+ break;
+ }
+ }
+ if ($calendarShared === true) {
+ continue;
+ }
+ $singleevent['summary'] .= ' (' . self::$l10n->t('by') . ' ' . OC_Calendar_Object::getowner($singleevent['id']) . ')';
+ $events[] = $singleevent;
+ }
+ }else{
+ if (is_numeric($calendarid)) {
+ $calendar = self::getCalendar($calendarid);
+ OCP\Response::enableCaching(0);
+ OCP\Response::setETagHeader($calendar['ctag']);
+ $events = OC_Calendar_Object::allInPeriod($calendarid, $start, $end, $calendar['userid'] !== OCP\User::getUser());
+ } else {
+ OCP\Util::emitHook('OC_Calendar', 'getEvents', array('calendar_id' => $calendarid, 'events' => &$events));
+ }
+ }
+ return $events;
+ }
+
+ /**
+ * @brief generates the output for an event which will be readable for our js
+ * @param (mixed) $event - event object / array
+ * @param (int) $start - DateTime object of start
+ * @param (int) $end - DateTime object of end
+ * @return (array) $output - readable output
+ */
+ public static function generateEventOutput(array $event, $start, $end) {
+ if(!isset($event['calendardata']) && !isset($event['vevent'])) {
+ return false;
+ }
+ if(!isset($event['calendardata']) && isset($event['vevent'])) {
+ $event['calendardata'] = "BEGIN:VCALENDAR\nVERSION:2.0\nPRODID:ownCloud's Internal iCal System\n"
+ . $event['vevent']->serialize() . "END:VCALENDAR";
+ }
+ try{
+ $object = OC_VObject::parse($event['calendardata']);
+ if(!$object) {
+ \OCP\Util::writeLog('calendar', __METHOD__.' Error parsing event: '.print_r($event, true), \OCP\Util::DEBUG);
+ return array();
+ }
+
+ $output = array();
+
+ if($object->name === 'VEVENT') {
+ $vevent = $object;
+ } elseif(isset($object->VEVENT)) {
+ $vevent = $object->VEVENT;
+ } else {
+ \OCP\Util::writeLog('calendar', __METHOD__.' Object contains not event: '.print_r($event, true), \OCP\Util::DEBUG);
+ return $output;
+ }
+ $id = $event['id'];
+ if(OC_Calendar_Object::getowner($id) !== OCP\USER::getUser()) {
+ // do not show events with private or unknown access class
+ if (isset($vevent->CLASS)
+ && ($vevent->CLASS->value === 'PRIVATE'
+ || $vevent->CLASS->value === ''))
+ {
+ return $output;
+ }
+ $object = OC_Calendar_Object::cleanByAccessClass($id, $object);
+ }
+ $allday = ($vevent->DTSTART->getDateType() == Sabre\VObject\Property\DateTime::DATE)?true:false;
+ $last_modified = @$vevent->__get('LAST-MODIFIED');
+ $lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
+ $staticoutput = array('id'=>(int)$event['id'],
+ 'title' => (!is_null($vevent->SUMMARY) && $vevent->SUMMARY->value != '')? strtr($vevent->SUMMARY->value, array('\,' => ',', '\;' => ';')) : self::$l10n->t('unnamed'),
+ 'description' => isset($vevent->DESCRIPTION)?strtr($vevent->DESCRIPTION->value, array('\,' => ',', '\;' => ';')):'',
+ 'lastmodified'=>$lastmodified,
+ 'allDay'=>$allday);
+ if(OC_Calendar_Object::isrepeating($id) && OC_Calendar_Repeat::is_cached_inperiod($event['id'], $start, $end)) {
+ $cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $end);
+ foreach($cachedinperiod as $cachedevent) {
+ $dynamicoutput = array();
+ if($allday) {
+ $start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
+ $end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
+ $dynamicoutput['start'] = $start_dt->format('Y-m-d');
+ $dynamicoutput['end'] = $end_dt->format('Y-m-d');
+ }else{
+ $start_dt = new DateTime($cachedevent['startdate'], new DateTimeZone('UTC'));
+ $end_dt = new DateTime($cachedevent['enddate'], new DateTimeZone('UTC'));
+ $start_dt->setTimezone(new DateTimeZone(self::$tz));
+ $end_dt->setTimezone(new DateTimeZone(self::$tz));
+ $dynamicoutput['start'] = $start_dt->format('Y-m-d H:i:s');
+ $dynamicoutput['end'] = $end_dt->format('Y-m-d H:i:s');
+ }
+ $output[] = array_merge($staticoutput, $dynamicoutput);
+ }
+ }else{
+ if(OC_Calendar_Object::isrepeating($id) || $event['repeating'] == 1) {
+ $object->expand($start, $end);
+ }
+ foreach($object->getComponents() as $singleevent) {
+ if(!($singleevent instanceof Sabre\VObject\Component\VEvent)) {
+ continue;
+ }
+ $dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz);
+ $output[] = array_merge($staticoutput, $dynamicoutput);
+ }
+ }
+ return $output;
+ }catch(Exception $e) {
+ $uid = 'unknown';
+ if(isset($event['uri'])){
+ $uid = $event['uri'];
+ }
+ \OCP\Util::writeLog('calendar', 'Event (' . $uid . ') contains invalid data: ' . $e->getMessage(),\OCP\Util::WARN);
+ }
+ }
+
+ /**
+ * @brief use to create HTML emails and send them
+ * @param $eventid The event id
+ * @param $location The location
+ * @param $description The description
+ * @param $dtstart The start date
+ * @param $dtend The end date
+ *
+ */
+ public static function sendEmails($eventid, $summary, $location, $description, $dtstart, $dtend) {
+ $user = \OCP\User::getUser();
+ $eventsharees = array();
+ $eventShareesNames = array();
+ $emails = array();
+ $sharedwithByEvent = \OCP\Share::getItemShared('event', $eventid);
+ if (is_array($sharedwithByEvent)) {
+ foreach ($sharedwithByEvent as $share) {
+ if ($share['share_type'] === \OCP\Share::SHARE_TYPE_USER || $share['share_type'] === \OCP\Share::SHARE_TYPE_GROUP) {
+ $eventsharees[] = $share;
+ }
+ }
+ foreach ($eventsharees as $sharee) {
+ $eventShareesNames[] = $sharee['share_with'];
+ }
+ }
+ foreach ($eventShareesNames as $name) {
+ $result = OC_Calendar_Calendar::getUsersEmails($name);
+ $emails[] = $result;
+ }
- $useremail = OC_Calendar_Calendar::getUsersEmails($user);
++ $adminmail = \OCP\Util::getDefaultEmailAddress('no-reply');
+ foreach ($emails as $email) {
+ if($email === null) {
+ continue;
+ }
+
+ $subject = 'Calendar Event Shared';
+
- $headers = 'MIME-Version: 1.0\r\n';
- $headers .= 'Content-Type: text/html; charset=utf-8\r\n';
- $headers .= 'From:' . $useremail;
-
+ $message = '<html><body>';
+ $message .= '<table style="border:1px solid black;" cellpadding="10">';
+ $message .= "<tr style='background: #eee;'><td colspan='2'><strong>" . $user . '</strong><strong> has shared with you an event</strong></td></tr>';
+ $message .= '<tr><td><strong>Summary:</strong> </td><td>' . \OCP\Util::sanitizeHTML($summary) . '</td></tr>';
+ $message .= '<tr><td><strong>Location:</strong> </td><td>' . \OCP\Util::sanitizeHTML($location) . '</td></tr>';
+ $message .= '<tr><td><strong>Description:</strong> </td><td>' . \OCP\Util::sanitizeHTML($description) . '</td></tr>';
+ $message .= '</table>';
+ $message .= '</body></html>';
+
- OCP\Util::sendMail($email, "User", $subject, $message, $useremail, $user, $html = 1, $altbody = '', $ccaddress = '', $ccname = '', $bcc = '');
++ OCP\Util::sendMail($email, \OCP\User::getDisplayName(), $subject, $message, $adminmail, $user, $html=1);
+ }
+ }
+}
diff --cc apps/documents/lib/db/member.php
index a7a75e0,0000000..9d70b84
mode 100644,000000..100644
--- a/apps/documents/lib/db/member.php
+++ b/apps/documents/lib/db/member.php
@@@ -1,130 -1,0 +1,130 @@@
+<?php
+
+/**
+ * ownCloud - Documents App
+ *
+ * @author Victor Dubiniuk
+ * @copyright 2013 Victor Dubiniuk victor.dubiniuk at gmail.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ */
+
+namespace OCA\Documents\Db;
+
+/**
+ * @method boolean getIsGuest()
+ * @method string getEsId()
+ * @method string getToken()
+ * @method int getStatus()
+ */
+
+class Member extends \OCA\Documents\Db{
+
+ const DB_TABLE = '`*PREFIX*documents_member`';
+
+ const ACTIVITY_THRESHOLD = 90; // 1.5 Minutes
+
+ const MEMBER_STATUS_ACTIVE = 1;
+ const MEMBER_STATUS_INACTIVE = 2;
+
+ protected $tableName = '`*PREFIX*documents_member`';
+
+ protected $insertStatement = 'INSERT INTO `*PREFIX*documents_member` (`es_id`, `uid`, `color`, `last_activity`, `is_guest`, `token`)
+ VALUES (?, ?, ?, ?, ?, ?)';
+
+ protected $loadStatement = 'SELECT * FROM `*PREFIX*documents_member` WHERE `member_id`= ?';
+
+ public static function getGuestPostfix(){
- return '(' . Config::getL10n()->t('guest') . ')';
++ return '(' . \OCA\Documents\Config::getL10n()->t('guest') . ')';
+ }
+
+
+ public function updateActivity($memberId){
+ return $this->execute(
+ 'UPDATE ' . $this->tableName . ' SET `last_activity`=?, `status`=? WHERE `member_id`=?',
+ array(
+ time(),
+ self::MEMBER_STATUS_ACTIVE,
+ $memberId
+ )
+ );
+ }
+
+
+ public function getActiveCollection($esId){
+ $result = $this->execute('
+ SELECT `es_id`, `member_id`
+ FROM ' . self::DB_TABLE . '
+ WHERE `es_id`= ?
+ AND `status`=?
+ ',
+ array(
+ $esId,
+ self::MEMBER_STATUS_ACTIVE
+ )
+ );
+ $members = $result->fetchAll();
+ if (!is_array($members)){
+ $members = array();
+ }
+ return $members;
+
+ }
+
+ /**
+ * Mark members as inactive
+ * @param string $esId - session Id
+ * @return array - list of memberId that were marked as inactive
+ */
+ public function updateByTimeout($esId){
+ $time = $this->getInactivityPeriod();
+
+ $result = $this->execute('
+ SELECT `member_id`
+ FROM ' . self::DB_TABLE . '
+ WHERE `es_id`= ?
+ AND `last_activity`<?
+ AND `status`=?
+ ',
+ array(
+ $esId,
+ $time,
+ self::MEMBER_STATUS_ACTIVE
+ )
+ );
+
+ $deactivated = $result->fetchAll();
+ if (is_array($deactivated) && count($deactivated)){
+ $deactivated = array_map(
+ function($x){
+ return ($x['member_id']);
+ }, $deactivated
+ );
+ $this->deactivate($deactivated);
+ } else {
+ $deactivated = array();
+ }
+
+ return $deactivated;
+ }
+
+ /**
+ * Update members to inactive state
+ * @param array $memberIds
+ */
+ public function deactivate($memberIds){
+ $stmt = $this->buildInQuery('member_id', $memberIds);
+ array_unshift($memberIds, self::MEMBER_STATUS_INACTIVE);
+ $this->execute('
+ UPDATE ' . $this->tableName . '
+ SET `status`=?
+ WHERE ' . $stmt,
+ $memberIds
+ );
+ }
+
+ protected function getInactivityPeriod(){
+ return time() - self::ACTIVITY_THRESHOLD;
+ }
+}
diff --cc apps/files_pdfviewer/README.md
index 0d8bc57,0000000..f5f2854
mode 100644,000000..100644
--- a/apps/files_pdfviewer/README.md
+++ b/apps/files_pdfviewer/README.md
@@@ -1,8 -1,0 +1,12 @@@
+files_pdfviewer
+======
+
+This application integrates the [PDF.js](https://mozilla.github.io/pdf.js/) library into ownCloud. Using this application users can view their PDF files online without downloading the file.
+
++[](https://scrutinizer-ci.com/g/owncloud/files_pdfviewer/?branch=master)
++[](https://scrutinizer-ci.com/g/owncloud/files_pdfviewer/?branch=master)
++[](https://travis-ci.org/owncloud/files_pdfviewer)
++
+Maintainers
+===========
+- [Lukas Reschke](https://github.com/LukasReschke)
diff --cc apps/files_pdfviewer/templates/pdf.php
index aac614b,0000000..0b9e6c6
mode 100644,000000..100644
--- a/apps/files_pdfviewer/templates/pdf.php
+++ b/apps/files_pdfviewer/templates/pdf.php
@@@ -1,404 -1,0 +1,404 @@@
+<!DOCTYPE html>
+<!--
+Copyright 2012 Mozilla Foundation
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<html dir="ltr" mozdisallowselectionprint moznomarginboxes>
+ <head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <meta name="google" content="notranslate">
+ <title>PDF.js viewer</title>
+
+
- <link rel="stylesheet" href="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/viewer.css')); ?>"/>
++ <link rel="stylesheet" href="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/viewer.css')); ?>?v=1"/>
+
+ <!-- oC changes-->
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/jquery-1.10.0.min.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/jquery-migrate-1.2.1.min.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('core', 'js/jquery-showpassword.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('core', 'js/jquery-tipsy.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkToRoute('js_config'));?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/oc-dialogs.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/underscore.js')); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/js.js')); ?>"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/jquery-1.10.0.min.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/jquery-migrate-1.2.1.min.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('core', 'js/jquery-showpassword.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('core', 'js/jquery-tipsy.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkToRoute('js_config'));?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/oc-dialogs.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/underscore.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('core', 'js/js.js')); ?>?v=1"></script>
+ <!-- oC changes -->
+
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/compatibility.js')); ?>"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/compatibility.js')); ?>?v=1"></script>
+
+
+
+ <!-- This snippet is used in production, see Makefile -->
+ <link rel="resource" type="application/l10n" href="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/locale/locale.properties')); ?>" />
- <script type="text/javascript" src=<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/l10n.js')); ?>></script>
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/pdf.js')); ?>"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/l10n.js')); ?>?v=1"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/pdf.js')); ?>?v=1"></script>
+
+
+
- <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/viewer.js')); ?>"></script>
++ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', '3rdparty/pdfjs/viewer.js')); ?>?v=1"></script>
+ <script type="text/javascript" src="<?php print_unescaped(OCP\Util::linkTo('files_pdfviewer', 'js/files.php')); ?>?file=<?php print_unescaped(urlencode($_['file'])); ?>&dir=<?php print_unescaped(urlencode($_['dir'])); ?>"></script>
+
+ </head>
+
+ <body tabindex="1">
+ <div id="outerContainer" class="loadingInProgress">
+
+ <div id="sidebarContainer">
+ <div id="toolbarSidebar">
+ <div class="splitToolbarButton toggled">
+ <button id="viewThumbnail" class="toolbarButton group toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
+ <span data-l10n-id="thumbs_label">Thumbnails</span>
+ </button>
+ <button id="viewOutline" class="toolbarButton group" title="Show Document Outline" tabindex="3" data-l10n-id="outline">
+ <span data-l10n-id="outline_label">Document Outline</span>
+ </button>
+ </div>
+ </div>
+ <div id="sidebarContent">
+ <div id="thumbnailView">
+ </div>
+ <div id="outlineView" class="hidden">
+ </div>
+ </div>
+ </div> <!-- sidebarContainer -->
+
+ <div id="mainContainer">
+ <div class="findbar hidden doorHanger hiddenSmallView" id="findbar">
+ <label for="findInput" class="toolbarLabel" data-l10n-id="find_label">Find:</label>
+ <input id="findInput" class="toolbarField" tabindex="41">
+ <div class="splitToolbarButton">
+ <button class="toolbarButton findPrevious" title="" id="findPrevious" tabindex="42" data-l10n-id="find_previous">
+ <span data-l10n-id="find_previous_label">Previous</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button class="toolbarButton findNext" title="" id="findNext" tabindex="43" data-l10n-id="find_next">
+ <span data-l10n-id="find_next_label">Next</span>
+ </button>
+ </div>
+ <input type="checkbox" id="findHighlightAll" class="toolbarField">
+ <label for="findHighlightAll" class="toolbarLabel" tabindex="44" data-l10n-id="find_highlight">Highlight all</label>
+ <input type="checkbox" id="findMatchCase" class="toolbarField">
+ <label for="findMatchCase" class="toolbarLabel" tabindex="45" data-l10n-id="find_match_case_label">Match case</label>
+ <span id="findMsg" class="toolbarLabel"></span>
+ </div> <!-- findbar -->
+
+ <div id="secondaryToolbar" class="secondaryToolbar hidden doorHangerRight">
+ <div id="secondaryToolbarButtonContainer">
+ <button id="secondaryPresentationMode" class="secondaryToolbarButton presentationMode visibleLargeView" title="Switch to Presentation Mode" tabindex="18" data-l10n-id="presentation_mode">
+ <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+ </button>
+
+ <button id="secondaryPrint" class="secondaryToolbarButton print visibleMediumView" title="Print" tabindex="20" data-l10n-id="print">
+ <span data-l10n-id="print_label">Print</span>
+ </button>
+
+ <button id="secondaryDownload" class="secondaryToolbarButton download visibleMediumView" title="Download" tabindex="21" data-l10n-id="download">
+ <span data-l10n-id="download_label">Download</span>
+ </button>
+
+ <a href="#" id="secondaryViewBookmark" class="secondaryToolbarButton bookmark visibleSmallView" title="Current view (copy or open in new window)" tabindex="22" data-l10n-id="bookmark">
+ <span data-l10n-id="bookmark_label">Current View</span>
+ </a>
+
+ <div class="horizontalToolbarSeparator visibleLargeView"></div>
+
+ <button id="firstPage" class="secondaryToolbarButton firstPage" title="Go to First Page" tabindex="23" data-l10n-id="first_page">
+ <span data-l10n-id="first_page_label">Go to First Page</span>
+ </button>
+ <button id="lastPage" class="secondaryToolbarButton lastPage" title="Go to Last Page" tabindex="24" data-l10n-id="last_page">
+ <span data-l10n-id="last_page_label">Go to Last Page</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="pageRotateCw" class="secondaryToolbarButton rotateCw" title="Rotate Clockwise" tabindex="25" data-l10n-id="page_rotate_cw">
+ <span data-l10n-id="page_rotate_cw_label">Rotate Clockwise</span>
+ </button>
+ <button id="pageRotateCcw" class="secondaryToolbarButton rotateCcw" title="Rotate Counterclockwise" tabindex="26" data-l10n-id="page_rotate_ccw">
+ <span data-l10n-id="page_rotate_ccw_label">Rotate Counterclockwise</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="toggleHandTool" class="secondaryToolbarButton handTool" title="Enable hand tool" tabindex="27" data-l10n-id="hand_tool_enable">
+ <span data-l10n-id="hand_tool_enable_label">Enable hand tool</span>
+ </button>
+
+ <div class="horizontalToolbarSeparator"></div>
+
+ <button id="documentProperties" class="secondaryToolbarButton documentProperties" title="Document Properties…" tabindex="28" data-l10n-id="document_properties">
+ <span data-l10n-id="document_properties_label">Document Properties…</span>
+ </button>
+ </div>
+ </div> <!-- secondaryToolbar -->
+
+ <div class="toolbar">
+ <div id="toolbarContainer">
+ <div id="toolbarViewer">
+ <div id="toolbarViewerLeft">
+ <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="4" data-l10n-id="toggle_sidebar">
+ <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
+ </button>
+ <div class="toolbarButtonSpacer"></div>
+ <button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document" tabindex="5" data-l10n-id="findbar">
+ <span data-l10n-id="findbar_label">Find</span>
+ </button>
+ <div class="splitToolbarButton">
+ <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="6" data-l10n-id="previous">
+ <span data-l10n-id="previous_label">Previous</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button class="toolbarButton pageDown" title="Next Page" id="next" tabindex="7" data-l10n-id="next">
+ <span data-l10n-id="next_label">Next</span>
+ </button>
+ </div>
+ <label id="pageNumberLabel" class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
+ <input type="number" id="pageNumber" class="toolbarField pageNumber" value="1" size="4" min="1" tabindex="8">
+ <span id="numPages" class="toolbarLabel"></span>
+ </div>
+ <div id="toolbarViewerRight">
+ <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="12" data-l10n-id="presentation_mode">
+ <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
+ </button>
+
+ <button id="print" class="toolbarButton print hiddenMediumView" title="Print" tabindex="14" data-l10n-id="print">
+ <span data-l10n-id="print_label">Print</span>
+ </button>
+
+ <button id="download" class="toolbarButton download hiddenMediumView" title="Download" tabindex="15" data-l10n-id="download">
+ <span data-l10n-id="download_label">Download</span>
+ </button>
+ <!-- <div class="toolbarButtonSpacer"></div> -->
+ <a href="#" id="viewBookmark" class="toolbarButton bookmark hiddenSmallView" title="Current view (copy or open in new window)" tabindex="16" data-l10n-id="bookmark">
+ <span data-l10n-id="bookmark_label">Current View</span>
+ </a>
+
+ <div class="verticalToolbarSeparator hiddenSmallView"></div>
+
+ <button id="secondaryToolbarToggle" class="toolbarButton" title="Tools" tabindex="17" data-l10n-id="tools">
+ <span data-l10n-id="tools_label">Tools</span>
+ </button>
+ </div>
+ <div class="outerCenter">
+ <div class="innerCenter" id="toolbarViewerMiddle">
+ <div class="splitToolbarButton">
+ <button id="zoomOut" class="toolbarButton zoomOut" title="Zoom Out" tabindex="9" data-l10n-id="zoom_out">
+ <span data-l10n-id="zoom_out_label">Zoom Out</span>
+ </button>
+ <div class="splitToolbarButtonSeparator"></div>
+ <button id="zoomIn" class="toolbarButton zoomIn" title="Zoom In" tabindex="10" data-l10n-id="zoom_in">
+ <span data-l10n-id="zoom_in_label">Zoom In</span>
+ </button>
+ </div>
+ <span id="scaleSelectContainer" class="dropdownToolbarButton">
+ <select id="scaleSelect" title="Zoom" tabindex="11" data-l10n-id="zoom">
+ <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
+ <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
+ <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
+ <option id="pageWidthOption" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
+ <option id="customScaleOption" value="custom"></option>
+ <option value="0.5">50%</option>
+ <option value="0.75">75%</option>
+ <option value="1">100%</option>
+ <option value="1.25">125%</option>
+ <option value="1.5">150%</option>
+ <option value="2">200%</option>
+ </select>
+ </span>
+ </div>
+ </div>
+ </div>
+ <div id="loadingBar">
+ <div class="progress">
+ <div class="glimmer">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <menu type="context" id="viewerContextMenu">
+ <menuitem id="contextFirstPage" label="First Page"
+ data-l10n-id="first_page"></menuitem>
+ <menuitem id="contextLastPage" label="Last Page"
+ data-l10n-id="last_page"></menuitem>
+ <menuitem id="contextPageRotateCw" label="Rotate Clockwise"
+ data-l10n-id="page_rotate_cw"></menuitem>
+ <menuitem id="contextPageRotateCcw" label="Rotate Counter-Clockwise"
+ data-l10n-id="page_rotate_ccw"></menuitem>
+ </menu>
+
+ <div id="viewerContainer" tabindex="0">
+ <div id="viewer"></div>
+ </div>
+
+ <div id="errorWrapper" hidden='true'>
+ <div id="errorMessageLeft">
+ <span id="errorMessage"></span>
+ <button id="errorShowMore" data-l10n-id="error_more_info">
+ More Information
+ </button>
+ <button id="errorShowLess" data-l10n-id="error_less_info" hidden='true'>
+ Less Information
+ </button>
+ </div>
+ <div id="errorMessageRight">
+ <button id="errorClose" data-l10n-id="error_close">
+ Close
+ </button>
+ </div>
+ <div class="clearBoth"></div>
+ <textarea id="errorMoreInfo" hidden='true' readonly="readonly"></textarea>
+ </div>
+ </div> <!-- mainContainer -->
+
+ <div id="overlayContainer" class="hidden">
+ <div id="promptContainer" class="hidden">
+ <div id="passwordContainer" class="prompt doorHanger">
+ <div class="row">
+ <p id="passwordText" data-l10n-id="password_label">Enter the password to open this PDF file:</p>
+ </div>
+ <div class="row">
+ <input type="password" id="password" class="toolbarField" />
+ </div>
+ <div class="buttonRow">
+ <button id="passwordCancel" class="overlayButton"><span data-l10n-id="password_cancel">Cancel</span></button>
+ <button id="passwordSubmit" class="overlayButton"><span data-l10n-id="password_ok">OK</span></button>
+ </div>
+ </div>
+ </div>
+ <div id="documentPropertiesContainer" class="hidden">
+ <div class="doorHanger">
+ <div class="row">
+ <span data-l10n-id="document_properties_file_name">File name:</span> <p id="fileNameField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_file_size">File size:</span> <p id="fileSizeField">-</p>
+ </div>
+ <div class="separator"></div>
+ <div class="row">
+ <span data-l10n-id="document_properties_title">Title:</span> <p id="titleField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_author">Author:</span> <p id="authorField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_subject">Subject:</span> <p id="subjectField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_keywords">Keywords:</span> <p id="keywordsField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_creation_date">Creation Date:</span> <p id="creationDateField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_modification_date">Modification Date:</span> <p id="modificationDateField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_creator">Creator:</span> <p id="creatorField">-</p>
+ </div>
+ <div class="separator"></div>
+ <div class="row">
+ <span data-l10n-id="document_properties_producer">PDF Producer:</span> <p id="producerField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_version">PDF Version:</span> <p id="versionField">-</p>
+ </div>
+ <div class="row">
+ <span data-l10n-id="document_properties_page_count">Page Count:</span> <p id="pageCountField">-</p>
+ </div>
+ <div class="buttonRow">
+ <button id="documentPropertiesClose" class="overlayButton"><span data-l10n-id="document_properties_close">Close</span></button>
+ </div>
+ </div>
+ </div>
+ </div> <!-- overlayContainer -->
+
+ </div> <!-- outerContainer -->
+ <div id="printContainer"></div>
+<div id="mozPrintCallback-shim" hidden>
+ <style scoped>
+#mozPrintCallback-shim {
+ position: fixed;
+ top: 0;
+ left: 0;
+ height: 100%;
+ width: 100%;
+ z-index: 9999999;
+
+ display: block;
+ text-align: center;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+#mozPrintCallback-shim[hidden] {
+ display: none;
+}
+ at media print {
+ #mozPrintCallback-shim {
+ display: none;
+ }
+}
+
+#mozPrintCallback-shim .mozPrintCallback-dialog-box {
+ display: inline-block;
+ margin: -50px auto 0;
+ position: relative;
+ top: 45%;
+ left: 0;
+ min-width: 220px;
+ max-width: 400px;
+
+ padding: 9px;
+
+ border: 1px solid hsla(0, 0%, 0%, .5);
+ border-radius: 2px;
+ box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
+
+ background-color: #474747;
+
+ color: hsl(0, 0%, 85%);
+ font-size: 16px;
+ line-height: 20px;
+}
+#mozPrintCallback-shim .progress-row {
+ clear: both;
+ padding: 1em 0;
+}
+#mozPrintCallback-shim progress {
+ width: 100%;
+}
+#mozPrintCallback-shim .relative-progress {
+ clear: both;
+ float: right;
+}
+#mozPrintCallback-shim .progress-actions {
+ clear: both;
+}
+ </style>
+ <div class="mozPrintCallback-dialog-box">
+ <!-- TODO: Localise the following strings -->
+ Preparing document for printing...
+ <div class="progress-row">
+ <progress value="0" max="100"></progress>
+ <span class="relative-progress">0%</span>
+ </div>
+ <div class="progress-actions">
+ <input type="button" value="Cancel" class="mozPrintCallback-cancel">
+ </div>
+ </div>
+</div>
+
+ </body>
+</html>
+
diff --cc core/doc/user/_sources/files/deletedfiles.txt
index baad672,0000000..a8d7028
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/deletedfiles.txt
+++ b/core/doc/user/_sources/files/deletedfiles.txt
@@@ -1,65 -1,0 +1,65 @@@
+Managing Deleted Files
+======================
+
+ownCloud maintains a copy of deleted files in case you need them again. To
+ensure that individual users do not run out of memory, the Files app manages
+the total memory size of deleted files for each user. When it comes to managing
+deleted files, keep the following in mind:
+
+* The total memory allocation for deleted files can never exceed more that 50%
+ of the currently available free space for each user.
+
+* Once the 50% maximum is reached for deleted files, ownCloud begins to delete files,
+ starting with the oldest versions, until it reaches the memory usage limit again.
+
+You can view all of the deleted files by clicking on the :guilabel:`Deleted
+files` button in Files app on the web interface.
+
+Restoring Files
+---------------
+
+To restore a deleted file:
+
+1. In the Files app, click the :guilabel:`Deleted files` button.
+
+ The Files app shows all deleted files.
+
+ .. figure:: ../images/deleted_files.png
+
- **Deleted files**
++ **Deleted files**
+
+2. Hover the cursor over the file that you want to restore.
+
+ Task options appear for the file.
+
+3. Click the :guilabel:`Restore` button.
+
+ The Files app restores the file to its original location on the server.
+
+Deleting Files
+--------------
+
+To permanently delete a file:
+
+1. In the Files app, click the :guilabel:`Deleted files` button.
+
+ See the **Deleted files** image above.
+
+2. Hover the cursor over the file that you want to delete.
+
+ Task options appear for the file.
+
+3. Click the :guilabel:`Trash can` button.
+
+ The Files app permanently removes the file from the server.
+
+Modifying the Deleted File Age-Out Value
+----------------------------------------
+
+Each time a file is added to the deleted files directory, ownCloud checks the
+age of the deleted files. By default, deleted files remain in the deleted files
+directory for 180 days.
+
+The administrator can adjust the age-out value in the config.php by setting the
+``trashbin_retention_obligation`` value. Files with ages that exceed this value
+are deleted permanently.
diff --cc core/doc/user/_sources/files/filesweb.txt
index 672ce67,0000000..048bb57
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/filesweb.txt
+++ b/core/doc/user/_sources/files/filesweb.txt
@@@ -1,153 -1,0 +1,153 @@@
+Accessing your Files Using the Web Interface
+============================================
+
+You can access your ownCloud files from anywhere using the ownCloud web
+interface. Once accessed, using the Files app you can view (if a common type),
+move, rename, download, share, and delete your files easily.
+
+.. figure:: ../images/oc_filesweb.png
+
- **ownCloud web interface Files app**
++ **ownCloud web interface Files app**
+
+ownCloud version 7 enables you to see file thumbnails next to the filenames.
+Hovering over a file or folder provides the following highlighted list of
+operations:
+
- * :guilabel:`Rename` -- Enables you to rename a file or folder.
++* :guilabel:`Pencil icon` -- Enables you to rename a file or folder.
+* :guilabel:`Download` -- Downloads a file to your system.
+* :guilabel:`Versions` (when enabled; See :doc:`versioncontrol` for details) -- Enables you to revert the file or folder to any available older versions.
+* :guilabel:`Share` -- Enables you to share the file or folder with a group or a specific user. Also enables you to share using a specified link.
+* :guilabel:`Edit` -- When a file is editable, enables you to open the file in the document application as long as that application is enabled for use from the ownCloud server.
- * :guilabel:`Delete` -- Deletes the selected file or folder.
++* :guilabel:`Trash icon` -- Deletes the selected file or folder.
+
+
+Navigating Inside Your ownCloud
+-------------------------------
+
+Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+For added convenience, ownCloud also provides a navigation bar at the top of
+the Files field for quick navigation.
+
+.. figure:: ../images/oc_filesweb_navigate.png
+
- **Navigation bar**
++ **Navigation bar**
+
+The navigation bar functions as a "breadcrumb" locator. It indicates your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.
+
+
+Creating or Uploading Files and Directories
+-------------------------------------------
+
+ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the *New* button in the Files app.
+
+.. figure:: ../images/oc_filesweb_new.png
+
- **New button options**
++ **New button options**
+
+The *New* button provides the following three options from which to choose:
+
+* *Text file* -- Creates a simple text file and adds the file to the current folder in your ownCloud.
+* *Folder* -- Creates a new folder in the current folder.
+* *From link* -- Downloads a file from a provided link path and places it into the current folder.
+
+
+Selecting Files or Folders
+--------------------------
+
+You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected. To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or folder on the list.
+
+If you select multiple files, you can deleted all of the selected files or
+download them as a ZIP file by using the ``Delete`` or ``Download`` buttons at
+the top right side of the Files app field.
+
+.. note:: If the ``Download`` button is not visible, the administrator has
+ disabled this feature. Contact your administrator for further guidance.
+
+
+Filtering the File Application View
+-----------------------------------
+
+ownCloud enables you to view files in the File Application View using filter options located in the Apps Information Field. This feature enables you to quickly and easily view and manage files based on their share status.
+
+You can click on any of the filter options to view the files as follows:
+
+* ``All files`` -- The default view; displays all files in the Application View window.
+
+* ``Shared with you`` -- Displays all files shared with you by another user or group.
+
+* ``Shared with others`` -- Displays all files that you have shared with other users or groups.
+
+* ``Shared by link`` -- Displays all files that are shared by you through the use of a link.
+
+Previewing Files
+----------------
+
+You can display uncompressed text files, OpenDocument files, PDFs, and image
+files from the ownCloud server by clicking on the file name. If ownCloud cannot
+display a file, a download process starts and the file is downloaded to your
+system.
+
+Moving Files
+------------
+
+Using the ownCloud web interface, you can move files and folders by dragging
+and dropping them into any directory. If you want to move a file or folder to
+an upper directory, click and drag them to one of the folders shown in the
+navigation bar.
+
+Sharing Files
+-------------
+
+When enabled by the administrator, you can share any file or folder on ownCloud
+ with a local user, group, or any person online with a public link. By sharing a
+ file or folder, the user or group can download the information directly to their
+ system. Shared files and folders depict a globe icon and the status *Shared* in
+ the file or folder row.
+
+To share a file or folder:
+
+1. Using your cursor, hover over an item in the Files Application View.
+
+2. Locate the **Share** icon in the file or folder row.
+
+3. Click *Share*.
+
+ The Share dialog box opens to show the following options:
+
+ .. figure:: ../images/oc_files_share.png
+
+ **Share dialog box**
+
+4. Choose the desired share option:
+
+ * **User/Group Share** field: Enables you to specify to whom you want to share the file or folder. Once you specify a user or group, a dialog appears providing added sharing options.
+
+ .. figure:: ../images/oc_share_with_options.png
+
+ **Sharing options dialog**
+
+ * **Share link** checkbox: When enabled (checked), provides the following additional share options:
+
+ - **File/Folder URL** field: Specifies the URL to the folder or file that you want to share.
+
+ - **Password Protect** checkbox: When enabled (checked), provides the option of protecting access to the file of folder through the use of a simple alphanumeric password.
+
+ - **Allow Public Upload** checkbox: When enabled (checked), provides the ability for shared users to upload files using the provided link.
+
+ - **Email Link** field: Enables you to alert users of the shared folder by email. You can specify one or more email addresses in this field (separated by spaces) and then click the "Send" button to send emails of the share.
+
+ .. note:: The server must be configured with a mail server or mail server access.
+
- * **Set expiration date** checkbox: When enabled (checked), you can specify a date for which the share expires. You specify the expiration date in the format MM/DD/YYYY. For added convenience, clicking in the "Expiration date" field opens a calendar from which you can specify the date.
++ * **Set expiration date** checkbox: When enabled (checked), you can specify a date for which the share expires. You specify the expiration date in the format MM/DD/YYYY. For added convenience, clicking in the "Expiration date" field opens a calendar from which you can specify the date.
+
- .. figure:: ../images/oc_share_expiration_calendar.png
++ .. figure:: ../images/oc_share_expiration_calendar.png
+
- **Expiration Date Calendar**
++ **Expiration Date Calendar**
diff --cc core/doc/user/_sources/files/quota.txt
index e91c547,0000000..0c4547f
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/quota.txt
+++ b/core/doc/user/_sources/files/quota.txt
@@@ -1,127 -1,0 +1,127 @@@
+Storage Quota
+=============
+
+ownCloud enables you to specify a storage quota for users which is the
+**maximum space** a user is allowed to use for files located in their
+individual home storage.
+
+.. note:: Quota settings **only apply to actual files**, not application
- metadata. Application metadate consumes an added 10% of space for any given
- user. When allocating quotas, you must ensure that there is at least 10% more
++ metadata. Application metadata consumes an added 10% of space for any given
++ user. When allocating quotas, you must ensure that there is at least 10% more
+ space available for each user.
+
+Checking Available Space
+------------------------
+
+You can check available space by accessing the "Personal Settings" page. To
+access your personal settings:
+
+1. Click the Personal Settings dropdown menu to the right of the Search field
+ in the ownCloud Main User Interface.
+
+ .. figure:: ../images/oc_personal_settings_dropdown.png
+
+ Personal Settings menu
+
+2. Select "Personal" from the menu. The Personal Settings window opens.
+ .. figure:: ../images/oc_personal_settings_window.png
+
+The available space of a given user is calculated using the following formula::
+
+ available_space = min(quota, disk_free_space) - used_space
+
+``disk_free_space`` is the space available on the partition on which the home
+storage for a user is located on the server.
+
+.. note:: It is possible that the available space on a partition is less than
+ the user quota.
+
+.. todo:: ??So what do we do in that case??
+
+Available Space and Sharing
+---------------------------
+
+When sharing files or folders, the space that each file or folder (along with
+the folder contents) uses is counted in the quota for the user who is sharing
+the files or folders. For example:
+
+**Example: Available Space and Shared Files**
+
+If user 'A' shares a file with user 'B,' the size of the file is counted
+against the storage quota for user 'A', even if the file is modified or its
+size is increased by user 'B.''
+
+**Example: Available Space and Shared Folders**
+
+If user 'A' shares a folder with user 'B,' the size of the folder (along with
+its contents) is counted against the storage quota for user 'A.' This means
+that any file that is modified or uploaded by user 'B' inside of the shared
+folder counts against the storage quota for user 'A.'
+
+Resharing
+~~~~~~~~~
+
+When resharing a file or a directory, the used space is still counted in the
+quota of the owner who shared it initially.
+
+Public sharing with upload permission
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If user A publicly shares (share with link) a directory D and enables the
+"public upload" permission, people with the link will be able to upload files
+into D and their sizes will be counted in user A's used space.
+
+Excluded from quota
+-------------------
+
+Metadata and cache
+~~~~~~~~~~~~~~~~~~
+
+Application metadata and cached information are excluded from the total used
+space.
+
+Such data could be thumbnails (icon previews, pictures app), temporary files,
+encryption keys, etc.
+
+Some apps are also storing information directly in the database (not as files)
+like the :doc:`calendar <../pim/calendar>` and :doc:`contacts
+<../pim/contacts>` apps. This data is also excluded from the total used space.
+
+
- Deleted files
++Deleted Files
+~~~~~~~~~~~~~
+
+When deleting files, these are moved/copied to the :doc:`trashbin
+<deletedfiles>` at first. These files do not count in the user's used space.
+
+For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB in
+the trashbin, they will still see 6 GB free space. If the user uploads 6 GB of
+files at this point, the :doc:`trashbin app <deletedfiles>` will discard
+deleted files when necessary to make room for the new files.
+
+Version Control
+~~~~~~~~~~~~~~~
+
+The size of older file versions does not count in the used space.
+
+For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB of
+older file versions, they will still see 6 GB free space. If the user uploads 6
+GB of files at this point, the :doc:`versions app <versioncontrol>` will
+discard older versions when necessary to make room for the new files.
+
+See :doc:`versioncontrol` for details about the version expiration behavior.
+
+Encryption
+~~~~~~~~~~
+
+When files are :doc:`encrypted <encryption>`, they take slightly more physical
+space than the original files. Only the original size will be counted in the
+used space.
+
+External storage
+~~~~~~~~~~~~~~~~
+
+When mounting external storage, either as administrator or as user, the space
+available on that storage is not taken into account for the user's quota.
+It is currently not possible to set a quota for external storage.
+
diff --cc core/doc/user/_sources/files/server_to_server_using.txt
index 168e900,0000000..aa25e8c
mode 100644,000000..100644
--- a/core/doc/user/_sources/files/server_to_server_using.txt
+++ b/core/doc/user/_sources/files/server_to_server_using.txt
@@@ -1,62 -1,0 +1,62 @@@
+Using Server-to-Server Sharing
+==============================
+
+ownCloud supports server-to-server sharing. By mounting a share from another
+ownCloud instance, this feature enables you to:
+
+* Seamlessly collaborate and share files from within two ownCloud instances.
+* Combine two private clouds into a single public cloud.
+* Locally synchronize the folder through the client.
+* Eliminate the need to create user accounts on multiple instances.
+
+.. note:: Server-to-server sharing requires that both servers are running
+ versions of ownCloud that support this feature.
+
+For information about managing server-to-server sharing functions for internal
+and external users and groups see the following section.
+
+Sharing Files and Folders Across Servers
+----------------------------------------
+
+Server-to-server sharing is enabled on new or upgraded ownCloud installations
+by default. However, you need to share folders in a particular way for
+server-to-server sharing to function. When sharing files and folders across
+servers, two primary steps are required. These steps include:
+
+1. The originator sharing a file or folder from their server using a link.
+
+2. The receiver(s) of the shared file or folder adding the file or folder to their ownCloud instance.
+
+Sharing From a Server
+~~~~~~~~~~~~~~~~~~~~~
+
+To share a file or folder across servers as an originator:
+
+1. Access the Files app on your server.
+
+2. Select and share a file or folder by link.
+
+ .. figure:: ../images/share_link.png
+
- **Sharing a link**
++ **Sharing a link**
+
+3. (Optional) Specify an alphanumeric password that you want others to use in order to accessing this share.
+
+4. (Optional) Specify an expiration date for the share.
+
+ If set, the ability to access the link expires on the date specified.
+
+3. Send an email to the user or group to indicate the shared link.
+
+Adding a Shared File or Folder to Your ownCloud Instance
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To add a file or folder to your ownCloud:
+
+1. Access the shared link using a browser.
+
+ The links opens the shared folder or file.
+
+ .. figure:: ../images/share_link_adding.png
+
+2. Click "Add to your owncloud" and specify the URL to your ownCloud instance.
diff --cc core/doc/user/_sources/webinterface.txt
index 5286172,0000000..0d7f413
mode 100644,000000..100644
--- a/core/doc/user/_sources/webinterface.txt
+++ b/core/doc/user/_sources/webinterface.txt
@@@ -1,119 -1,0 +1,121 @@@
+The ownCloud Web Interface
+==========================
+
+You can connect to your ownCloud server using any web browser. To access the ownCloud server using a web browser, specify the uniform resource link (URL) address of the server in the browser navigation bar. This can be the URL address of your personal ownCloud setup or a URL address that you have received from your company or your service provider.
+
+.. note:: If you are administering the server yourself, we recommend that you read the `ownCloud Administrators Guide <http://doc.owncloud.org/server/6.0/admin_manual/>`_.
+
+Accessing the ownCloud Web Interface
+------------------------------------
+
+To access the ownCloud web interface:
+
+1. Enter the URL address of the ownCloud server into your browser navigation bar.
+
+ The ownCloud login window opens.
+
+ .. figure:: images/oc_connect.png
+ :scale: 75%
+
+ **ownCloud login window**
+
+2. Enter your valid username and password.
+
+ The username and password combination can be those that you set up yourself
+ when creating your ownCloud server setup or those provided by your company or
+ your service provider.
+
- If you have set up the server yourself, or are administering the server, you
++ If you have set up the server yourself or are administering the server, you
+ can add additional users by configuring a user backend (for example, LDAP).
+
+3. Click the :guilabel:`Log in` button.
+
+ The ownCloud main interface opens.
+
+ .. figure:: images/oc_main_web.png
- :scale: 60%
++ :scale: 90%
+
+ **ownCloud main user interface**
+
+
+Navigating the Main User Interface
+------------------------------------
+
+Once you have accessed the ownCloud Server main web interface you can add files, remove files, and make changes based on the access privileges set by you
+(if you are administering the server) or by your server administrator.
+
+.. figure:: images/oc_main_web_labelled.png
- :scale: 60%
++ :scale: 90%
+
+**Navigating the main user interface**
+
- The ownCloud Maine User Interface contains the following fields and functions:
++The ownCloud Main User Interface contains the following fields and functions:
+
+* **Apps Selection Menu**: Located in the upper left corner of the user
+ interface, this bar contains apps that are configured on the ownCloud server.
+ The icons in this bar enable you to launch the different apps available and
+ navigate between them within the ownCloud user interface.
+
+.. note:: ownCloud supports a number of apps that can be installed and used for
+ various features and functions. Not all apps are installed and enabled by
+ default. For example, the :guilabel:`Apps` button is visible only to
+ administrators. This button allows administrators to enable or disable
+ installed applications.
+
+* **Apps Information** field: Located in the left side bar, this field provides
+ filters and tasks associated with the chosen app. For example, using the
+ Files app, you can use the filters in the apps information field to view only
+ files that have been shared with you, files that you have shared with others,
+ files that you have shared through the use of a link, or an option to delete
+ files. Other app-specific information fields might provide tasks for creating
+ new documents or modifying calendar entries.
+
+* **Application View**: The main, central field in the ownCloud user interface.
+ This field displays the contents or user features of the app selected in the
+ Navigation Bar. By default, this field shows the files and directory
+ ("Files" view) of your user account.
+
+* **Navigation Bar**: Located over the main viewing window (the Application
+ View), this bar provides a type of breadcrumbs navigation that enables you to
+ migrate to higher levels of the folder hierarchy up to the root level (home) of your ownCloud instance.
+
+* **New** button: Located in the Navigation Bar, the :guilabel:`New` button
- ebables you to create new files, new folders, or upload existing files from a
++ enables you to create new files, new folders, or upload existing files from a
+ specified link.
+
- .. note:: You can also drag and drop files from Windows Explorer or your MAC
- OSX Finder into the ownCloud Files Application View to upload them to ownCloud.
++.. note:: You can also drag and drop files from your file manager (e.g. Windows Explorer
++ or your Mac OS X Finder) into the ownCloud Files Application View to upload them to ownCloud.
+
+* **Upload** button: Located next to the :guilabel:`New` button in the
+ Navigation Bar, the :guilabel:`Upload` button enables you to upload files
+ from your system to the ownCloud server. Clicking this button launches a
- Windows Explorer or MAC OSX Finder window with which you can choose files for
- uploading.
++ file picker (e.g. Windows Explorer or Mac OS X Finder) window with which you
++ can choose files for uploading.
+
+* **Search** field: Residing in the upper right hand corner of the Main User
+ Interface window, the Search field enables you to search for files and
+ folders stored in ownCloud. The ownCloud search function provides a full text
+ search. However, for searching to function, administrators must enable the app
+ in the search app settings.
+
+* **Personal Settings** menu: Located to the right of the Search field, the
+ Personal Settings dropdown menu provides access to your personal settings
+ page and the ability to log out of your ownCloud user session. The personal
+ settings page provides access to the following:
+
+ * Server usage and space availability
+ * Password management
+ * Name, email, and profile picture settings
+ * Interface language settings
+ * WebDAV URL for receiving files using WebDAV (see next chapter).
+ * Mozilla Sync information for creating a synchronization to a Mozilla (Firefox) account.
+ * ownCloud Version information
+
++ You can see :doc:`userpreferences` section to learn more about those settings.
++
+In addition to these standard settings, administrators have access to user
+management (:guilabel:`Users`), apps settings (:guilabel:`Apps`), and
+administrative settings (:guilabel:`Admin`) including access to the ownCloud
+log files.
+
+
diff --cc core/doc/user/files/deletedfiles.html
index c3499d5,0000000..faa393b
mode 100644,000000..100644
--- a/core/doc/user/files/deletedfiles.html
+++ b/core/doc/user/files/deletedfiles.html
@@@ -1,223 -1,0 +1,223 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Managing Deleted Files — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Desktop Synchronization" href="sync.html" />
+ <link rel="prev" title="Using Server-to-Server Sharing" href="server_to_server_using.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">New in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Managing Deleted Files</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#restoring-files">Restoring Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#deleting-files">Deleting Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#modifying-the-deleted-file-age-out-value">Modifying the Deleted File Age-Out Value</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="managing-deleted-files">
+<h1>Managing Deleted Files<a class="headerlink" href="#managing-deleted-files" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud maintains a copy of deleted files in case you need them again. To
+ensure that individual users do not run out of memory, the Files app manages
+the total memory size of deleted files for each user. When it comes to managing
+deleted files, keep the following in mind:</p>
+<ul class="simple">
+<li>The total memory allocation for deleted files can never exceed more that 50%
+of the currently available free space for each user.</li>
+<li>Once the 50% maximum is reached for deleted files, ownCloud begins to delete files,
+starting with the oldest versions, until it reaches the memory usage limit again.</li>
+</ul>
+<p>You can view all of the deleted files by clicking on the <em class="guilabel">Deleted
+files</em> button in Files app on the web interface.</p>
+<div class="section" id="restoring-files">
+<h2>Restoring Files<a class="headerlink" href="#restoring-files" title="Permalink to this headline">¶</a></h2>
+<p>To restore a deleted file:</p>
+<ol class="arabic">
+<li><p class="first">In the Files app, click the <em class="guilabel">Deleted files</em> button.</p>
+<p>The Files app shows all deleted files.</p>
+<div class="figure">
+<img alt="../_images/deleted_files.png" src="../_images/deleted_files.png" />
++<p class="caption"><strong>Deleted files</strong></p>
+</div>
- <p><strong>Deleted files</strong></p>
+</li>
+<li><p class="first">Hover the cursor over the file that you want to restore.</p>
+<p>Task options appear for the file.</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Restore</em> button.</p>
+<p>The Files app restores the file to its original location on the server.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="deleting-files">
+<h2>Deleting Files<a class="headerlink" href="#deleting-files" title="Permalink to this headline">¶</a></h2>
+<p>To permanently delete a file:</p>
+<ol class="arabic">
+<li><p class="first">In the Files app, click the <em class="guilabel">Deleted files</em> button.</p>
+<p>See the <strong>Deleted files</strong> image above.</p>
+</li>
+<li><p class="first">Hover the cursor over the file that you want to delete.</p>
+<p>Task options appear for the file.</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Trash can</em> button.</p>
+<p>The Files app permanently removes the file from the server.</p>
+</li>
+</ol>
+</div>
+<div class="section" id="modifying-the-deleted-file-age-out-value">
+<h2>Modifying the Deleted File Age-Out Value<a class="headerlink" href="#modifying-the-deleted-file-age-out-value" title="Permalink to this headline">¶</a></h2>
+<p>Each time a file is added to the deleted files directory, ownCloud checks the
+age of the deleted files. By default, deleted files remain in the deleted files
+directory for 180 days.</p>
+<p>The administrator can adjust the age-out value in the config.php by setting the
+<tt class="docutils literal"><span class="pre">trashbin_retention_obligation</span></tt> value. Files with ages that exceed this value
+are deleted permanently.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/filesweb.html
index 853bd41,0000000..4b2c956
mode 100644,000000..100644
--- a/core/doc/user/files/filesweb.html
+++ b/core/doc/user/files/filesweb.html
@@@ -1,326 -1,0 +1,324 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Accessing your Files Using the Web Interface — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Accessing Files Using WebDAV" href="files.html" />
+ <link rel="prev" title="Files & Synchronization" href="index.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">New in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2 current"><a class="current reference internal" href="">Accessing your Files Using the Web Interface</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#navigating-inside-your-owncloud">Navigating Inside Your ownCloud</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#creating-or-uploading-files-and-directories">Creating or Uploading Files and Directories</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#selecting-files-or-folders">Selecting Files or Folders</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#filtering-the-file-application-view">Filtering the File Application View</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#previewing-files">Previewing Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#moving-files">Moving Files</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-files">Sharing Files</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="accessing-your-files-using-the-web-interface">
+<h1>Accessing your Files Using the Web Interface<a class="headerlink" href="#accessing-your-files-using-the-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can access your ownCloud files from anywhere using the ownCloud web
+interface. Once accessed, using the Files app you can view (if a common type),
+move, rename, download, share, and delete your files easily.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb.png" src="../_images/oc_filesweb.png" />
++<p class="caption"><strong>ownCloud web interface Files app</strong></p>
+</div>
- <p><strong>ownCloud web interface Files app</strong></p>
+<p>ownCloud version 7 enables you to see file thumbnails next to the filenames.
+Hovering over a file or folder provides the following highlighted list of
+operations:</p>
+<ul class="simple">
- <li><em class="guilabel">Rename</em> – Enables you to rename a file or folder.</li>
++<li><em class="guilabel">Pencil icon</em> – Enables you to rename a file or folder.</li>
+<li><em class="guilabel">Download</em> – Downloads a file to your system.</li>
+<li><em class="guilabel">Versions</em> (when enabled; See <a class="reference internal" href="versioncontrol.html"><em>Version Control</em></a> for details) – Enables you to revert the file or folder to any available older versions.</li>
+<li><em class="guilabel">Share</em> – Enables you to share the file or folder with a group or a specific user. Also enables you to share using a specified link.</li>
+<li><em class="guilabel">Edit</em> – When a file is editable, enables you to open the file in the document application as long as that application is enabled for use from the ownCloud server.</li>
- <li><em class="guilabel">Delete</em> – Deletes the selected file or folder.</li>
++<li><em class="guilabel">Trash icon</em> – Deletes the selected file or folder.</li>
+</ul>
+<div class="section" id="navigating-inside-your-owncloud">
+<h2>Navigating Inside Your ownCloud<a class="headerlink" href="#navigating-inside-your-owncloud" title="Permalink to this headline">¶</a></h2>
+<p>Navigating through folders in ownCloud is as simple as clicking on a folder to
+open it and using the back button on your browser to move to a previous level.
+For added convenience, ownCloud also provides a navigation bar at the top of
+the Files field for quick navigation.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_navigate.png" src="../_images/oc_filesweb_navigate.png" />
++<p class="caption"><strong>Navigation bar</strong></p>
+</div>
- <p><strong>Navigation bar</strong></p>
+<p>The navigation bar functions as a “breadcrumb” locator. It indicates your
+current directory and enables you to migrate back to one of the upper
+directories or, using the home icon, to navigate back into your root folder.</p>
+</div>
+<div class="section" id="creating-or-uploading-files-and-directories">
+<h2>Creating or Uploading Files and Directories<a class="headerlink" href="#creating-or-uploading-files-and-directories" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to create new files or folders directly in an ownCloud
+folder by clicking on the <em>New</em> button in the Files app.</p>
+<div class="figure">
+<img alt="../_images/oc_filesweb_new.png" src="../_images/oc_filesweb_new.png" />
++<p class="caption"><strong>New button options</strong></p>
+</div>
- <p><strong>New button options</strong></p>
+<p>The <em>New</em> button provides the following three options from which to choose:</p>
+<ul class="simple">
+<li><em>Text file</em> – Creates a simple text file and adds the file to the current folder in your ownCloud.</li>
+<li><em>Folder</em> – Creates a new folder in the current folder.</li>
+<li><em>From link</em> – Downloads a file from a provided link path and places it into the current folder.</li>
+</ul>
+</div>
+<div class="section" id="selecting-files-or-folders">
+<h2>Selecting Files or Folders<a class="headerlink" href="#selecting-files-or-folders" title="Permalink to this headline">¶</a></h2>
+<p>You can select one or more files or folders by clicking on the small thumbnails
+or icons that represent them. When you select a file or folder, a small
+checkbox is populated with a check to indicate that it is selected. To select
+all files in the current directory, you can click on the checkbox located at
+the top of the Files app field, above the first file or folder on the list.</p>
+<p>If you select multiple files, you can deleted all of the selected files or
+download them as a ZIP file by using the <tt class="docutils literal"><span class="pre">Delete</span></tt> or <tt class="docutils literal"><span class="pre">Download</span></tt> buttons at
+the top right side of the Files app field.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If the <tt class="docutils literal"><span class="pre">Download</span></tt> button is not visible, the administrator has
+disabled this feature. Contact your administrator for further guidance.</p>
+</div>
+</div>
+<div class="section" id="filtering-the-file-application-view">
+<h2>Filtering the File Application View<a class="headerlink" href="#filtering-the-file-application-view" title="Permalink to this headline">¶</a></h2>
+<p>ownCloud enables you to view files in the File Application View using filter options located in the Apps Information Field. This feature enables you to quickly and easily view and manage files based on their share status.</p>
+<p>You can click on any of the filter options to view the files as follows:</p>
+<ul class="simple">
+<li><tt class="docutils literal"><span class="pre">All</span> <span class="pre">files</span></tt> – The default view; displays all files in the Application View window.</li>
+<li><tt class="docutils literal"><span class="pre">Shared</span> <span class="pre">with</span> <span class="pre">you</span></tt> – Displays all files shared with you by another user or group.</li>
+<li><tt class="docutils literal"><span class="pre">Shared</span> <span class="pre">with</span> <span class="pre">others</span></tt> – Displays all files that you have shared with other users or groups.</li>
+<li><tt class="docutils literal"><span class="pre">Shared</span> <span class="pre">by</span> <span class="pre">link</span></tt> – Displays all files that are shared by you through the use of a link.</li>
+</ul>
+</div>
+<div class="section" id="previewing-files">
+<h2>Previewing Files<a class="headerlink" href="#previewing-files" title="Permalink to this headline">¶</a></h2>
+<p>You can display uncompressed text files, OpenDocument files, PDFs, and image
+files from the ownCloud server by clicking on the file name. If ownCloud cannot
+display a file, a download process starts and the file is downloaded to your
+system.</p>
+</div>
+<div class="section" id="moving-files">
+<h2>Moving Files<a class="headerlink" href="#moving-files" title="Permalink to this headline">¶</a></h2>
+<p>Using the ownCloud web interface, you can move files and folders by dragging
+and dropping them into any directory. If you want to move a file or folder to
+an upper directory, click and drag them to one of the folders shown in the
+navigation bar.</p>
+</div>
+<div class="section" id="sharing-files">
+<h2>Sharing Files<a class="headerlink" href="#sharing-files" title="Permalink to this headline">¶</a></h2>
+<dl class="docutils">
+<dt>When enabled by the administrator, you can share any file or folder on ownCloud</dt>
+<dd>with a local user, group, or any person online with a public link. By sharing a
+file or folder, the user or group can download the information directly to their
+system. Shared files and folders depict a globe icon and the status <em>Shared</em> in
+the file or folder row.</dd>
+</dl>
+<p>To share a file or folder:</p>
+<ol class="arabic simple">
+<li>Using your cursor, hover over an item in the Files Application View.</li>
+<li>Locate the <strong>Share</strong> icon in the file or folder row.</li>
+<li>Click <em>Share</em>.</li>
+</ol>
+<blockquote>
+<div><p>The Share dialog box opens to show the following options:</p>
+<div class="figure">
+<img alt="../_images/oc_files_share.png" src="../_images/oc_files_share.png" />
+<p class="caption"><strong>Share dialog box</strong></p>
+</div>
+</div></blockquote>
+<ol class="arabic simple" start="4">
+<li>Choose the desired share option:</li>
+</ol>
+<blockquote>
+<div><ul>
+<li><p class="first"><strong>User/Group Share</strong> field: Enables you to specify to whom you want to share the file or folder. Once you specify a user or group, a dialog appears providing added sharing options.</p>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/oc_share_with_options.png" src="../_images/oc_share_with_options.png" />
+<p class="caption"><strong>Sharing options dialog</strong></p>
+</div>
+</div></blockquote>
+</li>
+<li><p class="first"><strong>Share link</strong> checkbox: When enabled (checked), provides the following additional share options:</p>
+<blockquote>
+<div><ul>
+<li><p class="first"><strong>File/Folder URL</strong> field: Specifies the URL to the folder or file that you want to share.</p>
+</li>
+<li><p class="first"><strong>Password Protect</strong> checkbox: When enabled (checked), provides the option of protecting access to the file of folder through the use of a simple alphanumeric password.</p>
+</li>
+<li><p class="first"><strong>Allow Public Upload</strong> checkbox: When enabled (checked), provides the ability for shared users to upload files using the provided link.</p>
+</li>
+<li><p class="first"><strong>Email Link</strong> field: Enables you to alert users of the shared folder by email. You can specify one or more email addresses in this field (separated by spaces) and then click the “Send” button to send emails of the share.</p>
+<blockquote>
+<div><div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">The server must be configured with a mail server or mail server access.</p>
+</div>
+</div></blockquote>
+</li>
+</ul>
+</div></blockquote>
+</li>
- <li><p class="first"><strong>Set expiration date</strong> checkbox: When enabled (checked), you can specify a date for which the share expires. You specify the expiration date in the format MM/DD/YYYY. For added convenience, clicking in the “Expiration date” field opens a calendar from which you can specify the date.</p>
- <blockquote>
- <div><div class="figure">
++<li><p class="first"><strong>Set expiration date</strong> checkbox: When enabled (checked), you can specify a date for which the share expires. You specify the expiration date in the format MM/DD/YYYY. For added convenience, clicking in the “Expiration date” field opens a calendar from which you can specify the date.</p>
++<div class="figure">
+<img alt="../_images/oc_share_expiration_calendar.png" src="../_images/oc_share_expiration_calendar.png" />
+<p class="caption"><strong>Expiration Date Calendar</strong></p>
+</div>
- </div></blockquote>
+</li>
+</ul>
+</div></blockquote>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/quota.html
index f47ec5a,0000000..1e1b5f7
mode 100644,000000..100644
--- a/core/doc/user/files/quota.html
+++ b/core/doc/user/files/quota.html
@@@ -1,285 -1,0 +1,285 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Storage Quota — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Managing Big Files" href="configuring_big_file_upload.html" />
+ <link rel="prev" title="Encrypting Files" href="encryption.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">New in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2"><a class="reference internal" href="server_to_server_using.html">Using Server-to-Server Sharing</a></li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Files</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Storage Quota</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#checking-available-space">Checking Available Space</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#available-space-and-sharing">Available Space and Sharing</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#excluded-from-quota">Excluded from quota</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="storage-quota">
+<h1>Storage Quota<a class="headerlink" href="#storage-quota" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud enables you to specify a storage quota for users which is the
+<strong>maximum space</strong> a user is allowed to use for files located in their
+individual home storage.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Quota settings <strong>only apply to actual files</strong>, not application
- metadata. Application metadate consumes an added 10% of space for any given
- user. When allocating quotas, you must ensure that there is at least 10% more
++metadata. Application metadata consumes an added 10% of space for any given
++user. When allocating quotas, you must ensure that there is at least 10% more
+space available for each user.</p>
+</div>
+<div class="section" id="checking-available-space">
+<h2>Checking Available Space<a class="headerlink" href="#checking-available-space" title="Permalink to this headline">¶</a></h2>
+<p>You can check available space by accessing the “Personal Settings” page. To
+access your personal settings:</p>
+<ol class="arabic simple">
+<li>Click the Personal Settings dropdown menu to the right of the Search field
+in the ownCloud Main User Interface.</li>
+</ol>
+<blockquote>
+<div><div class="figure">
+<img alt="../_images/oc_personal_settings_dropdown.png" src="../_images/oc_personal_settings_dropdown.png" />
+<p class="caption">Personal Settings menu</p>
+</div>
+</div></blockquote>
+<ol class="arabic" start="2">
+<li><dl class="first docutils">
+<dt>Select “Personal” from the menu. The Personal Settings window opens.</dt>
+<dd><div class="first last figure">
+<img alt="../_images/oc_personal_settings_window.png" src="../_images/oc_personal_settings_window.png" />
+</div>
+</dd>
+</dl>
+</li>
+</ol>
+<p>The available space of a given user is calculated using the following formula:</p>
+<div class="highlight-python"><div class="highlight"><pre><span class="n">available_space</span> <span class="o">=</span> <span class="nb">min</span><span class="p">(</span><span class="n">quota</span><span class="p">,</span> <span class="n">disk_free_space</span><span class="p">)</span> <span class="o">-</span> <span class="n">used_space</span>
+</pre></div>
+</div>
+<p><tt class="docutils literal"><span class="pre">disk_free_space</span></tt> is the space available on the partition on which the home
+storage for a user is located on the server.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">It is possible that the available space on a partition is less than
+the user quota.</p>
+</div>
+<div class="admonition-todo admonition" id="index-0">
+<p class="first admonition-title">Todo</p>
+<p class="last">??So what do we do in that case??</p>
+</div>
+</div>
+<div class="section" id="available-space-and-sharing">
+<h2>Available Space and Sharing<a class="headerlink" href="#available-space-and-sharing" title="Permalink to this headline">¶</a></h2>
+<p>When sharing files or folders, the space that each file or folder (along with
+the folder contents) uses is counted in the quota for the user who is sharing
+the files or folders. For example:</p>
+<p><strong>Example: Available Space and Shared Files</strong></p>
+<p>If user ‘A’ shares a file with user ‘B,’ the size of the file is counted
+against the storage quota for user ‘A’, even if the file is modified or its
+size is increased by user ‘B.’‘</p>
+<p><strong>Example: Available Space and Shared Folders</strong></p>
+<p>If user ‘A’ shares a folder with user ‘B,’ the size of the folder (along with
+its contents) is counted against the storage quota for user ‘A.’ This means
+that any file that is modified or uploaded by user ‘B’ inside of the shared
+folder counts against the storage quota for user ‘A.’</p>
+<div class="section" id="resharing">
+<h3>Resharing<a class="headerlink" href="#resharing" title="Permalink to this headline">¶</a></h3>
+<p>When resharing a file or a directory, the used space is still counted in the
+quota of the owner who shared it initially.</p>
+</div>
+<div class="section" id="public-sharing-with-upload-permission">
+<h3>Public sharing with upload permission<a class="headerlink" href="#public-sharing-with-upload-permission" title="Permalink to this headline">¶</a></h3>
+<p>If user A publicly shares (share with link) a directory D and enables the
+“public upload” permission, people with the link will be able to upload files
+into D and their sizes will be counted in user A’s used space.</p>
+</div>
+</div>
+<div class="section" id="excluded-from-quota">
+<h2>Excluded from quota<a class="headerlink" href="#excluded-from-quota" title="Permalink to this headline">¶</a></h2>
+<div class="section" id="metadata-and-cache">
+<h3>Metadata and cache<a class="headerlink" href="#metadata-and-cache" title="Permalink to this headline">¶</a></h3>
+<p>Application metadata and cached information are excluded from the total used
+space.</p>
+<p>Such data could be thumbnails (icon previews, pictures app), temporary files,
+encryption keys, etc.</p>
+<p>Some apps are also storing information directly in the database (not as files)
+like the <a class="reference internal" href="../pim/calendar.html"><em>calendar</em></a> and <a class="reference internal" href="../pim/contacts.html"><em>contacts</em></a> apps. This data is also excluded from the total used space.</p>
+</div>
+<div class="section" id="deleted-files">
- <h3>Deleted files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h3>
++<h3>Deleted Files<a class="headerlink" href="#deleted-files" title="Permalink to this headline">¶</a></h3>
+<p>When deleting files, these are moved/copied to the <a class="reference internal" href="deletedfiles.html"><em>trashbin</em></a> at first. These files do not count in the user’s used space.</p>
+<p>For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB in
+the trashbin, they will still see 6 GB free space. If the user uploads 6 GB of
+files at this point, the <a class="reference internal" href="deletedfiles.html"><em>trashbin app</em></a> will discard
+deleted files when necessary to make room for the new files.</p>
+</div>
+<div class="section" id="version-control">
+<h3>Version Control<a class="headerlink" href="#version-control" title="Permalink to this headline">¶</a></h3>
+<p>The size of older file versions does not count in the used space.</p>
+<p>For example with a quota of 10 GB, if the user has 4 GB used space and 5 GB of
+older file versions, they will still see 6 GB free space. If the user uploads 6
+GB of files at this point, the <a class="reference internal" href="versioncontrol.html"><em>versions app</em></a> will
+discard older versions when necessary to make room for the new files.</p>
+<p>See <a class="reference internal" href="versioncontrol.html"><em>Version Control</em></a> for details about the version expiration behavior.</p>
+</div>
+<div class="section" id="encryption">
+<h3>Encryption<a class="headerlink" href="#encryption" title="Permalink to this headline">¶</a></h3>
+<p>When files are <a class="reference internal" href="encryption.html"><em>encrypted</em></a>, they take slightly more physical
+space than the original files. Only the original size will be counted in the
+used space.</p>
+</div>
+<div class="section" id="external-storage">
+<h3>External storage<a class="headerlink" href="#external-storage" title="Permalink to this headline">¶</a></h3>
+<p>When mounting external storage, either as administrator or as user, the space
+available on that storage is not taken into account for the user’s quota.
+It is currently not possible to set a quota for external storage.</p>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/files/server_to_server_using.html
index 3c21570,0000000..6fecba5
mode 100644,000000..100644
--- a/core/doc/user/files/server_to_server_using.html
+++ b/core/doc/user/files/server_to_server_using.html
@@@ -1,230 -1,0 +1,230 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>Using Server-to-Server Sharing — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="../_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '../',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="../_static/jquery.js"></script>
+ <script type="text/javascript" src="../_static/underscore.js"></script>
+ <script type="text/javascript" src="../_static/doctools.js"></script>
+ <script type="text/javascript" src="../_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="../index.html" />
+ <link rel="up" title="Files & Synchronization" href="index.html" />
+ <link rel="next" title="Managing Deleted Files" href="deletedfiles.html" />
+ <link rel="prev" title="Version Control" href="versioncontrol.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="../contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="../contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="../index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="../whats_new.html">New in ownCloud 7</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../webinterface.html">The ownCloud Web Interface</a></li>
+<li class="toctree-l1 current"><a class="reference internal" href="index.html">Files & Synchronization</a><ul class="current">
+<li class="toctree-l2"><a class="reference internal" href="filesweb.html">Accessing your Files Using the Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="files.html">Accessing Files Using WebDAV</a></li>
+<li class="toctree-l2"><a class="reference internal" href="versioncontrol.html">Version Control</a></li>
+<li class="toctree-l2 current"><a class="current reference internal" href="">Using Server-to-Server Sharing</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#sharing-files-and-folders-across-servers">Sharing Files and Folders Across Servers</a></li>
+</ul>
+</li>
+<li class="toctree-l2"><a class="reference internal" href="deletedfiles.html">Managing Deleted Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="sync.html">Desktop Synchronization</a></li>
+<li class="toctree-l2"><a class="reference internal" href="encryption.html">Encrypting Files</a></li>
+<li class="toctree-l2"><a class="reference internal" href="quota.html">Storage Quota</a></li>
+<li class="toctree-l2"><a class="reference internal" href="configuring_big_file_upload.html">Managing Big Files</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="../pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="../external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="using-server-to-server-sharing">
+<h1>Using Server-to-Server Sharing<a class="headerlink" href="#using-server-to-server-sharing" title="Permalink to this headline">¶</a></h1>
+<p>ownCloud supports server-to-server sharing. By mounting a share from another
+ownCloud instance, this feature enables you to:</p>
+<ul class="simple">
+<li>Seamlessly collaborate and share files from within two ownCloud instances.</li>
+<li>Combine two private clouds into a single public cloud.</li>
+<li>Locally synchronize the folder through the client.</li>
+<li>Eliminate the need to create user accounts on multiple instances.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">Server-to-server sharing requires that both servers are running
+versions of ownCloud that support this feature.</p>
+</div>
+<p>For information about managing server-to-server sharing functions for internal
+and external users and groups see the following section.</p>
+<div class="section" id="sharing-files-and-folders-across-servers">
+<h2>Sharing Files and Folders Across Servers<a class="headerlink" href="#sharing-files-and-folders-across-servers" title="Permalink to this headline">¶</a></h2>
+<p>Server-to-server sharing is enabled on new or upgraded ownCloud installations
+by default. However, you need to share folders in a particular way for
+server-to-server sharing to function. When sharing files and folders across
+servers, two primary steps are required. These steps include:</p>
+<ol class="arabic simple">
+<li>The originator sharing a file or folder from their server using a link.</li>
+<li>The receiver(s) of the shared file or folder adding the file or folder to their ownCloud instance.</li>
+</ol>
+<div class="section" id="sharing-from-a-server">
+<h3>Sharing From a Server<a class="headerlink" href="#sharing-from-a-server" title="Permalink to this headline">¶</a></h3>
+<p>To share a file or folder across servers as an originator:</p>
+<ol class="arabic">
+<li><p class="first">Access the Files app on your server.</p>
+</li>
+<li><p class="first">Select and share a file or folder by link.</p>
+<div class="figure">
+<img alt="../_images/share_link.png" src="../_images/share_link.png" />
++<p class="caption"><strong>Sharing a link</strong></p>
+</div>
- <p><strong>Sharing a link</strong></p>
+</li>
+<li><p class="first">(Optional) Specify an alphanumeric password that you want others to use in order to accessing this share.</p>
+</li>
+<li><p class="first">(Optional) Specify an expiration date for the share.</p>
+<blockquote>
+<div><p>If set, the ability to access the link expires on the date specified.</p>
+</div></blockquote>
+</li>
+</ol>
+<ol class="arabic simple" start="3">
+<li>Send an email to the user or group to indicate the shared link.</li>
+</ol>
+</div>
+<div class="section" id="adding-a-shared-file-or-folder-to-your-owncloud-instance">
+<h3>Adding a Shared File or Folder to Your ownCloud Instance<a class="headerlink" href="#adding-a-shared-file-or-folder-to-your-owncloud-instance" title="Permalink to this headline">¶</a></h3>
+<p>To add a file or folder to your ownCloud:</p>
+<ol class="arabic">
+<li><p class="first">Access the shared link using a browser.</p>
+<p>The links opens the shared folder or file.</p>
+<div class="figure">
+<img alt="../_images/share_link_adding.png" src="../_images/share_link_adding.png" />
+</div>
+</li>
+<li><p class="first">Click “Add to your owncloud” and specify the URL to your ownCloud instance.</p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc core/doc/user/webinterface.html
index cfc9c00,0000000..d1ac174
mode 100644,000000..100644
--- a/core/doc/user/webinterface.html
+++ b/core/doc/user/webinterface.html
@@@ -1,264 -1,0 +1,268 @@@
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+
+ <title>The ownCloud Web Interface — ownCloud User Manual 7.0 documentation</title>
+
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
+ <link rel="stylesheet" href="_static/style.css" type="text/css" />
+ <link rel="stylesheet" href="_static/bootstrap-sphinx.css" type="text/css" />
+
+ <script type="text/javascript">
+ var DOCUMENTATION_OPTIONS = {
+ URL_ROOT: '',
+ VERSION: '7.0',
+ COLLAPSE_INDEX: false,
+ FILE_SUFFIX: '.html',
+ HAS_SOURCE: true
+ };
+ </script>
+ <script type="text/javascript" src="_static/jquery.js"></script>
+ <script type="text/javascript" src="_static/underscore.js"></script>
+ <script type="text/javascript" src="_static/doctools.js"></script>
+ <script type="text/javascript" src="_static/bootstrap.js"></script>
+ <link rel="top" title="ownCloud User Manual 7.0 documentation" href="index.html" />
+ <link rel="next" title="Files & Synchronization" href="files/index.html" />
+ <link rel="prev" title="New in ownCloud 7" href="whats_new.html" />
+<script type="text/javascript">
+(function () {
+ /**
+ * Patch TOC list.
+ *
+ * Will mutate the underlying span to have a correct ul for nav.
+ *
+ * @param $span: Span containing nested UL's to mutate.
+ * @param minLevel: Starting level for nested lists. (1: global, 2: local).
+ */
+ var patchToc = function ($ul, minLevel) {
+ var findA;
+
+ // Find all a "internal" tags, traversing recursively.
+ findA = function ($elem, level) {
+ var level = level || 0,
+ $items = $elem.find("> li > a.internal, > ul, > li > ul");
+
+ // Iterate everything in order.
+ $items.each(function (index, item) {
+ var $item = $(item),
+ tag = item.tagName.toLowerCase(),
+ pad = 15 + ((level - minLevel) * 10);
+
+ if (tag === 'a' && level >= minLevel) {
+ // Add to existing padding.
+ $item.css('padding-left', pad + "px");
+ console.log(level, $item, 'padding-left', pad + "px");
+ } else if (tag === 'ul') {
+ // Recurse.
+ findA($item, level + 1);
+ }
+ });
+ };
+
+ console.log("HERE");
+ findA($ul);
+ };
+
+ $(document).ready(function () {
+ // Add styling, structure to TOC's.
+ $(".dropdown-menu").each(function () {
+ $(this).find("ul").each(function (index, item){
+ var $item = $(item);
+ $item.addClass('unstyled');
+ });
+ $(this).find("li").each(function () {
+ $(this).parent().append(this);
+ });
+ });
+
+ // Patch in level.
+ patchToc($("ul.globaltoc"), 2);
+ patchToc($("ul.localtoc"), 2);
+
+ // Enable dropdown.
+ $('.dropdown-toggle').dropdown();
+ });
+}());
+</script>
+
+ </head>
+ <body>
+
+
+<div class="container">
+ <div class="content">
+ <div class="page-header">
+ <h1><a href="contents.html">ownCloud User Manual</a></h1>
+
+ </div>
+
+ <div class="row">
+ <div class="span3">
+ <div class="sidebar">
+ <div class="well">
+ <div class="menu-support-container">
+ <ul id="menu-support" class="menu">
+ <ul>
+ <li><a href="contents.html">Overview</a></li>
+ </ul>
+ <ul>
+<li class="toctree-l1"><a class="reference internal" href="index.html">ownCloud 7.0 User Documentation</a></li>
+</ul>
+<ul class="current">
+<li class="toctree-l1"><a class="reference internal" href="whats_new.html">New in ownCloud 7</a></li>
+<li class="toctree-l1 current"><a class="current reference internal" href="">The ownCloud Web Interface</a><ul>
+<li class="toctree-l2"><a class="reference internal" href="#accessing-the-owncloud-web-interface">Accessing the ownCloud Web Interface</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#navigating-the-main-user-interface">Navigating the Main User Interface</a></li>
+</ul>
+</li>
+<li class="toctree-l1"><a class="reference internal" href="files/index.html">Files & Synchronization</a></li>
+<li class="toctree-l1"><a class="reference internal" href="pim/index.html">Contacts & Calendar</a></li>
+<li class="toctree-l1"><a class="reference internal" href="bookmarks.html">Using the Bookmarks App</a></li>
+<li class="toctree-l1"><a class="reference internal" href="documents.html">Documents</a></li>
+<li class="toctree-l1"><a class="reference internal" href="migration.html">User Account Migration</a></li>
+<li class="toctree-l1"><a class="reference internal" href="userpreferences.html">Changing Preferences</a></li>
+<li class="toctree-l1"><a class="reference internal" href="external_storage/google_drive.html">Configuring External Storage</a></li>
+</ul>
+
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+
+
+ <div class="span9">
+ <div class="page-content">
+
+ <div class="section" id="the-owncloud-web-interface">
+<h1>The ownCloud Web Interface<a class="headerlink" href="#the-owncloud-web-interface" title="Permalink to this headline">¶</a></h1>
+<p>You can connect to your ownCloud server using any web browser. To access the ownCloud server using a web browser, specify the uniform resource link (URL) address of the server in the browser navigation bar. This can be the URL address of your personal ownCloud setup or a URL address that you have received from your company or your service provider.</p>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you are administering the server yourself, we recommend that you read the <a class="reference external" href="http://doc.owncloud.org/server/6.0/admin_manual/">ownCloud Administrators Guide</a>.</p>
+</div>
+<div class="section" id="accessing-the-owncloud-web-interface">
+<h2>Accessing the ownCloud Web Interface<a class="headerlink" href="#accessing-the-owncloud-web-interface" title="Permalink to this headline">¶</a></h2>
+<p>To access the ownCloud web interface:</p>
+<ol class="arabic">
+<li><p class="first">Enter the URL address of the ownCloud server into your browser navigation bar.</p>
+<p>The ownCloud login window opens.</p>
+<div class="figure">
+<a class="reference internal image-reference" href="_images/oc_connect.png"><img alt="_images/oc_connect.png" src="_images/oc_connect.png" style="width: 325.5px; height: 321.75px;" /></a>
+</div>
+<p><strong>ownCloud login window</strong></p>
+</li>
+<li><p class="first">Enter your valid username and password.</p>
+<p>The username and password combination can be those that you set up yourself
+when creating your ownCloud server setup or those provided by your company or
+your service provider.</p>
- <p>If you have set up the server yourself, or are administering the server, you
++<p>If you have set up the server yourself or are administering the server, you
+can add additional users by configuring a user backend (for example, LDAP).</p>
+</li>
+<li><p class="first">Click the <em class="guilabel">Log in</em> button.</p>
+<p>The ownCloud main interface opens.</p>
+<div class="figure">
- <a class="reference internal image-reference" href="_images/oc_main_web.png"><img alt="_images/oc_main_web.png" src="_images/oc_main_web.png" style="width: 781.8px; height: 379.8px;" /></a>
++<a class="reference internal image-reference" href="_images/oc_main_web.png"><img alt="_images/oc_main_web.png" src="_images/oc_main_web.png" style="width: 1172.7px; height: 569.7px;" /></a>
+</div>
+<p><strong>ownCloud main user interface</strong></p>
+</li>
+</ol>
+</div>
+<div class="section" id="navigating-the-main-user-interface">
+<h2>Navigating the Main User Interface<a class="headerlink" href="#navigating-the-main-user-interface" title="Permalink to this headline">¶</a></h2>
+<p>Once you have accessed the ownCloud Server main web interface you can add files, remove files, and make changes based on the access privileges set by you
+(if you are administering the server) or by your server administrator.</p>
+<div class="figure">
- <a class="reference internal image-reference" href="_images/oc_main_web_labelled.png"><img alt="_images/oc_main_web_labelled.png" src="_images/oc_main_web_labelled.png" style="width: 783.6px; height: 379.8px;" /></a>
++<a class="reference internal image-reference" href="_images/oc_main_web_labelled.png"><img alt="_images/oc_main_web_labelled.png" src="_images/oc_main_web_labelled.png" style="width: 1175.4px; height: 569.7px;" /></a>
+</div>
+<p><strong>Navigating the main user interface</strong></p>
- <p>The ownCloud Maine User Interface contains the following fields and functions:</p>
++<p>The ownCloud Main User Interface contains the following fields and functions:</p>
+<ul class="simple">
+<li><strong>Apps Selection Menu</strong>: Located in the upper left corner of the user
+interface, this bar contains apps that are configured on the ownCloud server.
+The icons in this bar enable you to launch the different apps available and
+navigate between them within the ownCloud user interface.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
+<p class="last">ownCloud supports a number of apps that can be installed and used for
+various features and functions. Not all apps are installed and enabled by
+default. For example, the <em class="guilabel">Apps</em> button is visible only to
+administrators. This button allows administrators to enable or disable
+installed applications.</p>
+</div>
+<ul class="simple">
+<li><strong>Apps Information</strong> field: Located in the left side bar, this field provides
+filters and tasks associated with the chosen app. For example, using the
+Files app, you can use the filters in the apps information field to view only
+files that have been shared with you, files that you have shared with others,
+files that you have shared through the use of a link, or an option to delete
+files. Other app-specific information fields might provide tasks for creating
+new documents or modifying calendar entries.</li>
+<li><strong>Application View</strong>: The main, central field in the ownCloud user interface.
+This field displays the contents or user features of the app selected in the
+Navigation Bar. By default, this field shows the files and directory
+(“Files” view) of your user account.</li>
+<li><strong>Navigation Bar</strong>: Located over the main viewing window (the Application
+View), this bar provides a type of breadcrumbs navigation that enables you to
+migrate to higher levels of the folder hierarchy up to the root level (home) of your ownCloud instance.</li>
+<li><strong>New</strong> button: Located in the Navigation Bar, the <em class="guilabel">New</em> button
- ebables you to create new files, new folders, or upload existing files from a
++enables you to create new files, new folders, or upload existing files from a
+specified link.</li>
+</ul>
+<div class="admonition note">
+<p class="first admonition-title">Note</p>
- <p class="last">You can also drag and drop files from Windows Explorer or your MAC
- OSX Finder into the ownCloud Files Application View to upload them to ownCloud.</p>
++<p class="last">You can also drag and drop files from your file manager (e.g. Windows Explorer
++or your Mac OS X Finder) into the ownCloud Files Application View to upload them to ownCloud.</p>
+</div>
- <ul class="simple">
- <li><strong>Upload</strong> button: Located next to the <em class="guilabel">New</em> button in the
++<ul>
++<li><p class="first"><strong>Upload</strong> button: Located next to the <em class="guilabel">New</em> button in the
+Navigation Bar, the <em class="guilabel">Upload</em> button enables you to upload files
+from your system to the ownCloud server. Clicking this button launches a
- Windows Explorer or MAC OSX Finder window with which you can choose files for
- uploading.</li>
- <li><strong>Search</strong> field: Residing in the upper right hand corner of the Main User
++file picker (e.g. Windows Explorer or Mac OS X Finder) window with which you
++can choose files for uploading.</p>
++</li>
++<li><p class="first"><strong>Search</strong> field: Residing in the upper right hand corner of the Main User
+Interface window, the Search field enables you to search for files and
+folders stored in ownCloud. The ownCloud search function provides a full text
+search. However, for searching to function, administrators must enable the app
- in the search app settings.</li>
- <li><strong>Personal Settings</strong> menu: Located to the right of the Search field, the
++in the search app settings.</p>
++</li>
++<li><p class="first"><strong>Personal Settings</strong> menu: Located to the right of the Search field, the
+Personal Settings dropdown menu provides access to your personal settings
+page and the ability to log out of your ownCloud user session. The personal
- settings page provides access to the following:<ul>
++settings page provides access to the following:</p>
++<ul class="simple">
+<li>Server usage and space availability</li>
+<li>Password management</li>
+<li>Name, email, and profile picture settings</li>
+<li>Interface language settings</li>
+<li>WebDAV URL for receiving files using WebDAV (see next chapter).</li>
+<li>Mozilla Sync information for creating a synchronization to a Mozilla (Firefox) account.</li>
+<li>ownCloud Version information</li>
+</ul>
++<p>You can see <a class="reference internal" href="userpreferences.html"><em>Changing Preferences</em></a> section to learn more about those settings.</p>
+</li>
+</ul>
+<p>In addition to these standard settings, administrators have access to user
+management (<em class="guilabel">Users</em>), apps settings (<em class="guilabel">Apps</em>), and
+administrative settings (<em class="guilabel">Admin</em>) including access to the ownCloud
+log files.</p>
+</div>
+</div>
+
+
+ </div>
+ </div>
+ </div>
+
+ </div>
+</div>
+ </body>
+</html>
diff --cc version.php
index 5d8ae22,9224b24..89a024f
--- a/version.php
+++ b/version.php
@@@ -1,6 -1,19 +1,6 @@@
-<?php
-
-// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
-// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
-// when updating major/minor version number.
-$OC_Version=array(7, 0, 2, 1);
-
-// The human readable string
-$OC_VersionString='7.0.2';
-
-// The ownCloud edition
-$OC_Edition='';
-
-// The ownCloud channel
-$OC_Channel='git';
-
-// The build number
-$OC_Build='';
-
+<?php
- $OC_Version = array(7,0,2,0);
- $OC_VersionString = '7.0.2 RC1';
++$OC_Version = array(7,0,2,1);
++$OC_VersionString = '7.0.2';
+$OC_Edition = '';
- $OC_Channel = 'testing';
- $OC_Build = '2014-08-21T03:54:07+00:00';
++$OC_Channel = 'stable';
++$OC_Build = '2014-08-26T10:19:47+00:00';
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list