diff options
Diffstat (limited to 'lib')
36 files changed, 146 insertions, 151 deletions
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php index 12b4e96b714..9ff0f12aa91 100644 --- a/lib/l10n/ast.php +++ b/lib/l10n/ast.php @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "La triba de compartición %s nun ye válida pa %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Falló dar permisos a %s, porque los permisos son mayores que los otorgaos a %s", "Setting permissions for %s failed, because the item was not found" => "Falló dar permisos a %s, porque l'elementu nun s'atopó", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Nun pudo afitase la data d'espiración. Los ficheros compartíos nun puen espirar llueu de %s dempués de compartise.", -"Can not set expire date. Expire date is in the past" => "Nun pudo afitase la data d'espiración. La data ta nel pasáu", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "El motor compartíu %s tien d'implementar la interfaz OCP\\Share_Backend", "Sharing backend %s not found" => "Nun s'alcontró'l botón de compartición %s", "Sharing backend for %s not found" => "Nun s'alcontró'l botón de partición pa %s", diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php index fe773693e0b..4a2d04eaace 100644 --- a/lib/l10n/bg_BG.php +++ b/lib/l10n/bg_BG.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Споделянето на тип %s не валидно за %s.", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Неуспешна промяна на правата за достъп за %s, защото промените надвишават правата на достъп дадени на %s.", "Setting permissions for %s failed, because the item was not found" => "Неуспешна промяна на правата за достъп за %s, защото съдържанието не е открито.", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Неуспешно задаване на дата на изтичане. Споделени папки не могат да изтекат по-късно от %s след като са били споделени.", -"Can not set expire date. Expire date is in the past" => "Неуспешноп задаване на дата на изтичане. Датата е в миналото.", +"Cannot set expiration date. Expiration date is in the past" => "Неуспешно задаване на дата на изтичане. Датата на изтичане е в миналото", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.", "Sharing backend %s not found" => "Споделянето на сървърния %s не е открито.", "Sharing backend for %s not found" => "Споделянето на сървъра за %s не е открито.", diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php index 0aa0500b1cf..c46139da321 100644 --- a/lib/l10n/cs_CZ.php +++ b/lib/l10n/cs_CZ.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Sdílení typu %s není korektní pro %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s", "Setting permissions for %s failed, because the item was not found" => "Nastavení práv pro %s selhalo, protože položka nebyla nalezena", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Nelze nastavit datum vypršení platnosti. Sdílení nemůže vypršet později než za %s po zveřejnění.", -"Can not set expire date. Expire date is in the past" => "Nelze nastavit datum vypršení platnosti. Datum vypršení je v minulosti.", +"Cannot set expiration date. Expiration date is in the past" => "Nelze nastavit datum vypršení platnosti. Datum vypršení je v minulosti.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Podpůrná vrstva pro sdílení %s musí obsahovat rozhraní OCP\\Share_Backend", "Sharing backend %s not found" => "Podpůrná vrstva sdílení %s nenalezena", "Sharing backend for %s not found" => "Podpůrná vrstva sdílení pro %s nenalezena", diff --git a/lib/l10n/de.php b/lib/l10n/de.php index 340356049e8..9bb1f76488a 100644 --- a/lib/l10n/de.php +++ b/lib/l10n/de.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", "Setting permissions for %s failed, because the item was not found" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.", -"Can not set expire date. Expire date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.", +"Cannot set expiration date. Expiration date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" => "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" => "Freigabe-Backend für %s nicht gefunden", diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php index f692153eb73..edb1d7a46f3 100644 --- a/lib/l10n/de_DE.php +++ b/lib/l10n/de_DE.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten", "Setting permissions for %s failed, because the item was not found" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.", -"Can not set expire date. Expire date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.", +"Cannot set expiration date. Expiration date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden", "Sharing backend %s not found" => "Freigabe-Backend %s nicht gefunden", "Sharing backend for %s not found" => "Freigabe-Backend für %s nicht gefunden", diff --git a/lib/l10n/el.php b/lib/l10n/el.php index 560c1fb953b..c0bc46d52c5 100644 --- a/lib/l10n/el.php +++ b/lib/l10n/el.php @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s", "Setting permissions for %s failed, because the item was not found" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Δεν μπορείτε να ορίσετε ημερομηνία λήξης. Οι διαμοιρασμοί δεν μπορούν να λήγουν αργότερα από %s αφού διαμοιραστούν", -"Can not set expire date. Expire date is in the past" => "Δεν μπορείτε να ορίσετε ημερομηνία λήξης. Η ημερομηνία λήξης ανήκει στο παρελθόν", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend", "Sharing backend %s not found" => "Το σύστημα διαμοιρασμού %s δεν βρέθηκε", "Sharing backend for %s not found" => "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε", diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php index 59404f7a90b..0553e80d70e 100644 --- a/lib/l10n/en_GB.php +++ b/lib/l10n/en_GB.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Share type %s is not valid for %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting permissions for %s failed, because the permissions exceed permissions granted to %s", "Setting permissions for %s failed, because the item was not found" => "Setting permissions for %s failed, because the item was not found", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Cannot set the expiry date. Shares cannot expire later than %s after they have been shared", -"Can not set expire date. Expire date is in the past" => "Cannot set the expiry date. The expiry date is in the past", +"Cannot set expiration date. Expiration date is in the past" => "Cannot set expiry date. Expiry date is in the past", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Sharing backend %s must implement the interface OCP\\Share_Backend", "Sharing backend %s not found" => "Sharing backend %s not found", "Sharing backend for %s not found" => "Sharing backend for %s not found", diff --git a/lib/l10n/es.php b/lib/l10n/es.php index ed1c4b0e55e..bb0aadeba2e 100644 --- a/lib/l10n/es.php +++ b/lib/l10n/es.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Compartir tipo %s no es válido para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s", "Setting permissions for %s failed, because the item was not found" => "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "No se pudo fijar fecha de caducidad. Los archivos compartidos no pueden caducar luego de %s después de ser compartidos.", -"Can not set expire date. Expire date is in the past" => "No se pudo fijar fecha de caducidad. La fecha está en el pasado", +"Cannot set expiration date. Expiration date is in the past" => "No se puede fijar la fecha de caducidad. La fecha de caducidad está en el pasado.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend", "Sharing backend %s not found" => "El motor compartido %s no se ha encontrado", "Sharing backend for %s not found" => "Motor compartido para %s no encontrado", diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php index 58a5939f659..de5abef91af 100644 --- a/lib/l10n/et_EE.php +++ b/lib/l10n/et_EE.php @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Jagamise tüüp %s ei ole õige %s jaoks", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi", "Setting permissions for %s failed, because the item was not found" => "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Aegumise kuupäeva ei saa määrata. Jagamised ei saa aeguda hiljem kui %s peale jagamist.", -"Can not set expire date. Expire date is in the past" => "Aegumise kuupäeva ei saa määrata. Aegumise kuupäev ei saa olla minevikus.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese", "Sharing backend %s not found" => "Jagamise tagarakendit %s ei leitud", "Sharing backend for %s not found" => "Jagamise tagarakendit %s jaoks ei leitud", diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php index 53d5b31075a..5221b35a307 100644 --- a/lib/l10n/eu.php +++ b/lib/l10n/eu.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "%s elkarbanaketa mota ez da %srentzako egokia", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako", "Setting permissions for %s failed, because the item was not found" => "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Ezin izan da jarri iraungitze data. Konpartitzea ezin da iraungi konpartitu eta %s ondoren.", -"Can not set expire date. Expire date is in the past" => "Ezin da jarri iraungitze data. Iraungitze data iragan da.", +"Cannot set expiration date. Expiration date is in the past" => "Ezin da jarri iraungitze data. Iraungitze data iragan da.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s elkarbanaketa motorra OCP\\Share_Backend interfazea inplementatu behar du ", "Sharing backend %s not found" => "Ez da %s elkarbanaketa motorra aurkitu", "Sharing backend for %s not found" => "Ez da %srako elkarbanaketa motorrik aurkitu", diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php index 3a6e5bcfeb8..b1e0cc6698f 100644 --- a/lib/l10n/fi_FI.php +++ b/lib/l10n/fi_FI.php @@ -59,6 +59,7 @@ $TRANSLATIONS = array( "You need to provide a password to create a public link, only protected links are allowed" => "Anna salasana luodaksesi julkisen linkin. Vain suojatut linkit ovat sallittuja", "Sharing %s failed, because sharing with links is not allowed" => "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu", "Setting permissions for %s failed, because the item was not found" => "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt", +"Cannot set expiration date. Expiration date is in the past" => "Vanhentumispäivää ei voi asettaa. Vanhentumispäivä on jo mennyt", "Sharing backend %s not found" => "Jakamisen taustaosaa %s ei löytynyt", "Sharing backend for %s not found" => "Jakamisen taustaosaa kohteelle %s ei löytynyt", "Sharing %s failed, because the user %s is the original sharer" => "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja", @@ -91,6 +92,8 @@ $TRANSLATIONS = array( "PHP %s or higher is required." => "PHP %s tai sitä uudempi vaaditaan.", "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.", "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP:n \"Safe Mode\" on käytössä. ownCloud vaatii toimiakseen \"Safe Moden\" poistamisen käytöstä.", +"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes -asetus on käytössä. ownCloud vaatii toimiakseen kyseisen asetuksen poistamisen käytöstä.", +"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes -asetus on vanhennettu ja pääosin hyödytön, joten se tulisi poistaa käytöstä. Pyydä palvelimen ylläpitäjää poistamaan asetus käytöstä php.ini-tiedoston avulla tai http-palvelimen asetuksista.", "PHP modules have been installed, but they are still listed as missing?" => "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?", "Please ask your server administrator to restart the web server." => "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.", "PostgreSQL >= 9 required" => "PostgreSQL >= 9 vaaditaan", diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php index 41f93a41366..26ded2e51b1 100644 --- a/lib/l10n/gl.php +++ b/lib/l10n/gl.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Non se admite a compartición do tipo %s para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s", "Setting permissions for %s failed, because the item was not found" => "Non é posíbel estabelecer permisos para %s, non se atopa o elemento", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Non é posíbel estabelecer a data de caducidade. As comparticións non poden caducar máis aló de %s após de seren compartida", -"Can not set expire date. Expire date is in the past" => "Non é posíbel estabelecer a data de caducidade. A data de caducidade está no pasado.", +"Cannot set expiration date. Expiration date is in the past" => "Non é posíbel estabelecer a data de caducidade. A data de caducidade está no pasado.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" => "Non se atopou a infraestrutura de compartición %s", "Sharing backend for %s not found" => "Non se atopou a infraestrutura de compartición para %s", diff --git a/lib/l10n/it.php b/lib/l10n/it.php index 95ebe375172..08d356b9f62 100644 --- a/lib/l10n/it.php +++ b/lib/l10n/it.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Il tipo di condivisione %s non è valido per %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s", "Setting permissions for %s failed, because the item was not found" => "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Impossibile impostare la data di scadenza. Le condivisioni non possono scadere più tardi di %s dalla loro attivazione.", -"Can not set expire date. Expire date is in the past" => "Impossibile impostare la data di scadenza. La data di scadenza è già passata.", +"Cannot set expiration date. Expiration date is in the past" => "Impossibile impostare la data di scadenza. La data di scadenza è nel passato.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend", "Sharing backend %s not found" => "Motore di condivisione %s non trovato", "Sharing backend for %s not found" => "Motore di condivisione di %s non trovato", diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php index 96d7fc0a41b..13b70541ad4 100644 --- a/lib/l10n/ja.php +++ b/lib/l10n/ja.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "%s の共有方法は、%s には適用できません。", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s の権限設定に失敗しました。%s に許可されている権限を越えています。", "Setting permissions for %s failed, because the item was not found" => "%s の権限設定に失敗しました。アイテムが存在しません。", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。", -"Can not set expire date. Expire date is in the past" => "有効期限を設定できません。有効期限が過去を示しています。", +"Cannot set expiration date. Expiration date is in the past" => "有効期限を設定できません。有効期限が過去を示しています。", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s のバックエンドの共有には、OCP\\Share_Backend インターフェースを実装しなければなりません。", "Sharing backend %s not found" => "共有バックエンド %s が見つかりません", "Sharing backend for %s not found" => "%s のための共有バックエンドが見つかりません", diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php index d5051e5da21..7b5aff3217f 100644 --- a/lib/l10n/nl.php +++ b/lib/l10n/nl.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Delen van type %s is niet geldig voor %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies", "Setting permissions for %s failed, because the item was not found" => "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Kon vervaldatum niet installen. Shares kunnen niet langer dan %s vervallen na het moment van delen", -"Can not set expire date. Expire date is in the past" => "Kon vervaldatum niet instellen. De vervaldatum ligt in het verleden", +"Cannot set expiration date. Expiration date is in the past" => "Kon vervaldatum niet instellen. De vervaldatum ligt in het verleden", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Het share-backend %s moet de OCP\\Share_Backend interface implementeren", "Sharing backend %s not found" => "Het share-backend %s is niet gevonden", "Sharing backend for %s not found" => "Het share-backend voor %s is niet gevonden", diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php index dc5954c6854..877c3fcdbe8 100644 --- a/lib/l10n/pl.php +++ b/lib/l10n/pl.php @@ -67,8 +67,6 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Typ udziału %s nie jest właściwy dla %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s", "Setting permissions for %s failed, because the item was not found" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Nie można ustawić daty wygaśnięcia. Udział nie może wygasać później niż %s od momentu udostępnienia.", -"Can not set expire date. Expire date is in the past" => "Nie można ustawić daty wygaśnięcia. Termin ustalony jest w przeszłości", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend", "Sharing backend %s not found" => "Zaplecze %s do współdzielenia nie zostało znalezione", "Sharing backend for %s not found" => "Zaplecze do współdzielenia %s nie zostało znalezione", diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php index 8067e9a4ade..16ca7965402 100644 --- a/lib/l10n/pt_BR.php +++ b/lib/l10n/pt_BR.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "Tipo de compartilhamento %s não é válido para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s", "Setting permissions for %s failed, because the item was not found" => "Definir permissões para %s falhou, porque o item não foi encontrado", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Não pode ser definida data de expiração. Compartilhamentos não podem ter data de expiração %s após serem compartilhados", -"Can not set expire date. Expire date is in the past" => "Não pode ser definida data de expiração. Data de expiração já passou", +"Cannot set expiration date. Expiration date is in the past" => "Não é possível definir a data de validade. Data de expiração está no passado", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend", "Sharing backend %s not found" => "Compartilhamento backend %s não encontrado", "Sharing backend for %s not found" => "Compartilhamento backend para %s não encontrado", diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php index a2b8068acee..49977bb2d4f 100644 --- a/lib/l10n/pt_PT.php +++ b/lib/l10n/pt_PT.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "O tipo de partilha %s não é válido para %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s", "Setting permissions for %s failed, because the item was not found" => "Definir permissões para %s falhou, porque o item não foi encontrado", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Não é possível definir data de expiração. Acções não podem expirar mais tarde que,%s após eles terem sido compartilhadas", -"Can not set expire date. Expire date is in the past" => "Não é possível definir data de expiração. A data de vencimento está no passado", +"Cannot set expiration date. Expiration date is in the past" => "Não é possivel definir data de expiração. A data de expiração está no passado", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Partilhar backend %s tem de implementar o interface OCP\\Share_Backend", "Sharing backend %s not found" => "Partilha backend %s não foi encontrado", "Sharing backend for %s not found" => "Partilha backend para %s não foi encontrado", diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php index 50f72f47b24..c8514fc3f9e 100644 --- a/lib/l10n/ru.php +++ b/lib/l10n/ru.php @@ -64,11 +64,10 @@ $TRANSLATIONS = array( "Sharing %s failed, because %s is not a member of the group %s" => "Не удалось установить общий доступ для %s, %s не является членом группы %s", "You need to provide a password to create a public link, only protected links are allowed" => "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки", "Sharing %s failed, because sharing with links is not allowed" => "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается", -"Share type %s is not valid for %s" => "Такой втд общего доступа как %s не допустим для %s", +"Share type %s is not valid for %s" => "Такой тип общего доступа как %s не допустим для %s", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s", "Setting permissions for %s failed, because the item was not found" => "Не удалось произвести настройку прав доступа для %s , элемент не был найден.", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Не могу установить дату истечения. Шары не могут истечь позже чем %s после того, как они были расшарены", -"Can not set expire date. Expire date is in the past" => "Не могу установить дату истечения. Дата истечения находится в прошлом.", +"Cannot set expiration date. Expiration date is in the past" => "Невозможно установить дату окончания. Дата окончания в прошлом.", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Бэкенд для опубликования %s должен реализовывать интерфейс OCP\\Share_Backend", "Sharing backend %s not found" => "Бэкэнд для общего доступа %s не найден", "Sharing backend for %s not found" => "Бэкэнд для общего доступа к %s не найден", diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php index 479244a5c61..39d80a30b3d 100644 --- a/lib/l10n/tr.php +++ b/lib/l10n/tr.php @@ -67,8 +67,7 @@ $TRANSLATIONS = array( "Share type %s is not valid for %s" => "%s paylaşım türü %s için geçerli değil", "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı", "Setting permissions for %s failed, because the item was not found" => "%s için izinler öge bulunamadığından ayarlanamadı", -"Can not set expire date. Shares can not expire later then %s after they where shared" => "Son kullanma tarihi ayarlanamıyor. Paylaşımların süreleri, paylaşıldıkları konumdan %s sonra dolamaz.", -"Can not set expire date. Expire date is in the past" => "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte", +"Cannot set expiration date. Expiration date is in the past" => "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte", "Sharing backend %s must implement the interface OCP\\Share_Backend" => "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli", "Sharing backend %s not found" => "Paylaşım arka ucu %s bulunamadı", "Sharing backend for %s not found" => "%s için paylaşım arka ucu bulunamadı", diff --git a/lib/private/appframework/utility/controllermethodreflector.php b/lib/private/appframework/utility/controllermethodreflector.php index d5cf2f52eb2..c49dd80091e 100644 --- a/lib/private/appframework/utility/controllermethodreflector.php +++ b/lib/private/appframework/utility/controllermethodreflector.php @@ -62,6 +62,7 @@ class ControllerMethodReflector { } else { $this->types = array_combine($matches['var'], $matches['type']); } + // get method parameters foreach ($reflection->getParameters() as $param) { if($param->isOptional()) { diff --git a/lib/private/defaults.php b/lib/private/defaults.php index a439bf0d6db..dfd114cd2fe 100644 --- a/lib/private/defaults.php +++ b/lib/private/defaults.php @@ -18,6 +18,8 @@ class OC_Defaults { private $defaultTitle; private $defaultBaseUrl; private $defaultSyncClientUrl; + private $defaultiOSClientUrl; + private $defaultAndroidClientUrl; private $defaultDocBaseUrl; private $defaultDocVersion; private $defaultSlogan; @@ -28,18 +30,20 @@ class OC_Defaults { $this->l = OC_L10N::get('lib'); $version = OC_Util::getVersion(); - $this->defaultEntity = "ownCloud"; /* e.g. company name, used for footers and copyright notices */ - $this->defaultName = "ownCloud"; /* short name, used when referring to the software */ - $this->defaultTitle = "ownCloud"; /* can be a longer name, for titles */ - $this->defaultBaseUrl = "https://owncloud.org"; - $this->defaultSyncClientUrl = "https://owncloud.org/sync-clients/"; - $this->defaultDocBaseUrl = "http://doc.owncloud.org"; - $this->defaultDocVersion = $version[0] . ".0"; // used to generate doc links - $this->defaultSlogan = $this->l->t("web services under your control"); - $this->defaultLogoClaim = ""; - $this->defaultMailHeaderColor = "#1d2d44"; /* header color of mail notifications */ - - if (class_exists("OC_Theme")) { + $this->defaultEntity = 'ownCloud'; /* e.g. company name, used for footers and copyright notices */ + $this->defaultName = 'ownCloud'; /* short name, used when referring to the software */ + $this->defaultTitle = 'ownCloud'; /* can be a longer name, for titles */ + $this->defaultBaseUrl = 'https://owncloud.org'; + $this->defaultSyncClientUrl = 'https://owncloud.org/sync-clients/'; + $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/owncloud/id543672169?mt=8'; + $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.owncloud.android'; + $this->defaultDocBaseUrl = 'http://doc.owncloud.org'; + $this->defaultDocVersion = $version[0] . '.0'; // used to generate doc links + $this->defaultSlogan = $this->l->t('web services under your control'); + $this->defaultLogoClaim = ''; + $this->defaultMailHeaderColor = '#1d2d44'; /* header color of mail notifications */ + + if (class_exists('OC_Theme')) { $this->theme = new OC_Theme(); } } @@ -79,6 +83,30 @@ class OC_Defaults { } /** + * Returns the URL to the App Store for the iOS Client + * @return string URL + */ + public function getiOSClientUrl() { + if ($this->themeExist('getiOSClientUrl')) { + return $this->theme->getiOSClientUrl(); + } else { + return $this->defaultiOSClientUrl; + } + } + + /** + * Returns the URL to Google Play for the Android Client + * @return string URL + */ + public function getAndroidClientUrl() { + if ($this->themeExist('getAndroidClientUrl')) { + return $this->theme->getAndroidClientUrl(); + } else { + return $this->defaultAndroidClientUrl; + } + } + + /** * Returns the documentation URL * @return string URL */ @@ -158,7 +186,7 @@ class OC_Defaults { if ($this->themeExist('getShortFooter')) { $footer = $this->theme->getShortFooter(); } else { - $footer = "<a href=\"". $this->getBaseUrl() . "\" target=\"_blank\">" .$this->getEntity() . "</a>". + $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank">' .$this->getEntity() . '</a>'. ' – ' . $this->getSlogan(); } diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php index 3e23f5c2c94..8c7acc339ae 100644 --- a/lib/private/files/node/folder.php +++ b/lib/private/files/node/folder.php @@ -27,22 +27,19 @@ class Folder extends Node implements \OCP\Files\Folder { /** * @param string $path - * @throws \OCP\Files\NotFoundException * @return string */ public function getRelativePath($path) { if ($this->path === '' or $this->path === '/') { return $this->normalizePath($path); } - if (strpos($path, $this->path) !== 0) { - throw new NotFoundException(); + if ($path === $this->path) { + return '/'; + } else if (strpos($path, $this->path . '/') !== 0) { + return null; } else { $path = substr($path, strlen($this->path)); - if (strlen($path) === 0) { - return '/'; - } else { - return $this->normalizePath($path); - } + return $this->normalizePath($path); } } @@ -295,15 +292,29 @@ class Folder extends Node implements \OCP\Files\Folder { * @return \OC\Files\Node\Node[] */ public function getById($id) { - $nodes = $this->root->getById($id); - $result = array(); - foreach ($nodes as $node) { - $pathPart = substr($node->getPath(), 0, strlen($this->getPath()) + 1); - if ($this->path === '/' or $pathPart === $this->getPath() . '/') { - $result[] = $node; + $mounts = $this->root->getMountsIn($this->path); + $mounts[] = $this->root->getMount($this->path); + // reverse the array so we start with the storage this view is in + // which is the most likely to contain the file we're looking for + $mounts = array_reverse($mounts); + + $nodes = array(); + foreach ($mounts as $mount) { + /** + * @var \OC\Files\Mount\Mount $mount + */ + if ($mount->getStorage()) { + $cache = $mount->getStorage()->getCache(); + $internalPath = $cache->getPathById($id); + if (is_string($internalPath)) { + $fullPath = $mount->getMountPoint() . $internalPath; + if (!is_null($path = $this->getRelativePath($fullPath))) { + $nodes[] = $this->get($path); + } + } } } - return $result; + return $nodes; } public function getFreeSpace() { diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php index 70135285b0d..18e7a6b681a 100644 --- a/lib/private/files/node/root.php +++ b/lib/private/files/node/root.php @@ -162,39 +162,13 @@ class Root extends Folder implements Emitter { if ($this->view->file_exists($fullPath)) { return $this->createNode($fullPath); } else { - throw new NotFoundException(); + throw new NotFoundException($path); } } else { throw new NotPermittedException(); } } - /** - * search file by id - * - * An array is returned because in the case where a single storage is mounted in different places the same file - * can exist in different places - * - * @param int $id - * @throws \OCP\Files\NotFoundException - * @return Node[] - */ - public function getById($id) { - $result = Cache::getById($id); - if (is_null($result)) { - throw new NotFoundException(); - } else { - list($storageId, $internalPath) = $result; - $nodes = array(); - $mounts = $this->mountManager->findByStorageId($storageId); - foreach ($mounts as $mount) { - $nodes[] = $this->get($mount->getMountPoint() . $internalPath); - } - return $nodes; - } - - } - //most operations cant be done on the root /** diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php index 63570d70cff..a8b420e978a 100644 --- a/lib/private/files/storage/local.php +++ b/lib/private/files/storage/local.php @@ -208,22 +208,7 @@ if (\OC_Util::runningOnWindows()) { } public function fopen($path, $mode) { - if ($return = fopen($this->datadir . $path, $mode)) { - switch ($mode) { - case 'r': - break; - case 'r+': - case 'w+': - case 'x+': - case 'a+': - break; - case 'w': - case 'x': - case 'a': - break; - } - } - return $return; + return fopen($this->datadir . $path, $mode); } public function hash($type, $path, $raw = false) { diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php index c4a8dc1961c..0760d842eaf 100644 --- a/lib/private/files/storage/mappedlocal.php +++ b/lib/private/files/storage/mappedlocal.php @@ -79,7 +79,7 @@ class MappedLocal extends \OC\Files\Storage\Common { $logicalPath = $this->mapper->physicalToLogic($physicalPath); $dh = opendir($physicalPath); - if(is_resource($dh)) { + if (is_resource($dh)) { while (($file = readdir($dh)) !== false) { if ($file === '.' or $file === '..') { continue; @@ -87,9 +87,9 @@ class MappedLocal extends \OC\Files\Storage\Common { $logicalFilePath = $this->mapper->physicalToLogic($physicalPath . '/' . $file); - $file= $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); + $file = $this->mapper->stripRootFolder($logicalFilePath, $logicalPath); $file = $this->stripLeading($file); - $files[]= $file; + $files[] = $file; } } @@ -245,28 +245,15 @@ class MappedLocal extends \OC\Files\Storage\Common { } public function fopen($path, $mode) { - if ($return = fopen($this->buildPath($path), $mode)) { - switch ($mode) { - case 'r': - break; - case 'r+': - case 'w+': - case 'x+': - case 'a+': - break; - case 'w': - case 'x': - case 'a': - break; - } - } - return $return; + return fopen($this->buildPath($path), $mode); } /** * @param string $dir + * @param bool $isLogicPath + * @return bool */ - private function delTree($dir, $isLogicPath=true) { + private function delTree($dir, $isLogicPath = true) { $dirRelative = $dir; if ($isLogicPath) { $dir = $this->buildPath($dir); @@ -380,7 +367,7 @@ class MappedLocal extends \OC\Files\Storage\Common { /** * @param string $path */ - private function cleanMapper($path, $isLogicPath = true, $recursive=true) { + private function cleanMapper($path, $isLogicPath = true, $recursive = true) { $fullPath = $path; if ($isLogicPath) { $fullPath = $this->datadir . $path; diff --git a/lib/private/files/view.php b/lib/private/files/view.php index e08cb20f73d..85af4a9abef 100644 --- a/lib/private/files/view.php +++ b/lib/private/files/view.php @@ -781,6 +781,9 @@ class View { return false; } $defaultRoot = Filesystem::getRoot(); + if ($defaultRoot === null) { + return false; + } if ($this->fakeRoot === $defaultRoot) { return true; } diff --git a/lib/private/group/database.php b/lib/private/group/database.php index b7148f38fe3..8d6ea1f50a5 100644 --- a/lib/private/group/database.php +++ b/lib/private/group/database.php @@ -185,7 +185,7 @@ class OC_Group_Database extends OC_Group_Backend { public function groupExists($gid) { $query = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` = ?'); $result = $query->execute(array($gid))->fetchOne(); - if ($result) { + if ($result !== false) { return true; } return false; diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php index 368fa3851d7..bea7ad193bf 100644 --- a/lib/private/group/manager.php +++ b/lib/private/group/manager.php @@ -126,7 +126,7 @@ class Manager extends PublicEmitter implements IGroupManager { * @return \OC\Group\Group */ public function createGroup($gid) { - if (!$gid) { + if ($gid === '' || is_null($gid)) { return false; } else if ($group = $this->get($gid)) { return $group; diff --git a/lib/private/mail.php b/lib/private/mail.php index 81bcb3d8deb..82107c32dc7 100644 --- a/lib/private/mail.php +++ b/lib/private/mail.php @@ -74,16 +74,16 @@ class OC_Mail { $toaddress = self::buildAsciiEmail($toaddress); $mailo->AddAddress($toaddress, $toname); - if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname); - if($bcc<>'') $mailo->AddBCC($bcc); + if($ccaddress != '') $mailo->AddCC($ccaddress, $ccname); + if($bcc != '') $mailo->AddBCC($bcc); $mailo->AddReplyTo($fromaddress, $fromname); - $mailo->WordWrap = 50; - if($html==1) $mailo->IsHTML(true); else $mailo->IsHTML(false); + $mailo->WordWrap = 78; + $mailo->IsHTML($html == 1); $mailo->Subject = $subject; - if($altbody=='') { + if($altbody == '') { $mailo->Body = $mailtext.OC_MAIL::getfooter(); $mailo->AltBody = ''; }else{ diff --git a/lib/private/share/share.php b/lib/private/share/share.php index 7fd5cd70e1d..646511fd64d 100644 --- a/lib/private/share/share.php +++ b/lib/private/share/share.php @@ -926,7 +926,7 @@ class Share extends \OC\Share\Constants { } /** - * validate expire date if it meets all constraints + * validate expiration date if it meets all constraints * * @param string $expireDate well formate date string, e.g. "DD-MM-YYYY" * @param string $shareTime timestamp when the file was shared @@ -956,16 +956,16 @@ class Share extends \OC\Share\Constants { $maxDays = \OCP\Config::getAppValue('core', 'shareapi_expire_after_n_days', '7'); $maxDate->add(new \DateInterval('P' . $maxDays . 'D')); if ($date > $maxDate) { - $warning = 'Can not set expire date. Shares can not expire later then ' . $maxDays . ' after they where shared'; - $warning_t = $l->t('Can not set expire date. Shares can not expire later then %s after they where shared', array($maxDays)); + $warning = 'Cannot set expiration date. Shares cannot expire later than ' . $maxDays . ' after they have been shared'; + $warning_t = $l->t('Cannot set expiration date. Shares cannot expire later than %s after they have been shared', array($maxDays)); \OCP\Util::writeLog('OCP\Share', $warning, \OCP\Util::WARN); throw new \Exception($warning_t); } } if ($date < $today) { - $message = 'Can not set expire date. Expire date is in the past'; - $message_t = $l->t('Can not set expire date. Expire date is in the past'); + $message = 'Cannot set expiration date. Expiration date is in the past'; + $message_t = $l->t('Cannot set expiration date. Expiration date is in the past'); \OCP\Util::writeLog('OCP\Share', $message, \OCP\Util::WARN); throw new \Exception($message_t); } @@ -1018,10 +1018,10 @@ class Share extends \OC\Share\Constants { $result = false; - // only use default expire date for link shares + // only use default expiration date for link shares if ((int) $item['share_type'] === self::SHARE_TYPE_LINK) { - // calculate expire date + // calculate expiration date if (!empty($item['expiration'])) { $userDefinedExpire = new \DateTime($item['expiration']); $expires = $userDefinedExpire->getTimestamp(); @@ -1030,7 +1030,7 @@ class Share extends \OC\Share\Constants { } - // get default expire settings + // get default expiration settings $defaultSettings = Helper::getDefaultExpireSetting(); $expires = Helper::calculateExpireDate($defaultSettings, $item['stime'], $expires); @@ -1114,7 +1114,7 @@ class Share extends \OC\Share\Constants { * * Resharing is allowed by default if not configured */ - private static function isResharingAllowed() { + public static function isResharingAllowed() { if (!isset(self::$isResharingAllowed)) { if (\OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes') == 'yes') { self::$isResharingAllowed = true; @@ -1388,7 +1388,8 @@ class Share extends \OC\Share\Constants { } if ($mounts[$row['storage']]) { $path = $mounts[$row['storage']]->getMountPoint().$row['path']; - $row['path'] = substr($path, $root); + $relPath = substr($path, $root); // path relative to data/user + $row['path'] = rtrim($relPath, '/'); } } } diff --git a/lib/private/user.php b/lib/private/user.php index a8431af97fd..5efe205ced9 100644 --- a/lib/private/user.php +++ b/lib/private/user.php @@ -337,7 +337,7 @@ class OC_User { * Checks if the user is logged in */ public static function isLoggedIn() { - if (\OC::$session->get('user_id') && self::$incognitoMode === false) { + if (\OC::$session->get('user_id') !== null && self::$incognitoMode === false) { return self::userExists(\OC::$session->get('user_id')); } return false; diff --git a/lib/private/user/session.php b/lib/private/user/session.php index 8c9b3e264e3..6abf8fb80d2 100644 --- a/lib/private/user/session.php +++ b/lib/private/user/session.php @@ -106,7 +106,7 @@ class Session implements IUserSession, Emitter { return $this->activeUser; } else { $uid = $this->session->get('user_id'); - if ($uid) { + if ($uid !== null) { $this->activeUser = $this->manager->get($uid); return $this->activeUser; } else { diff --git a/lib/public/defaults.php b/lib/public/defaults.php index 34b68903ee8..9af31245ff4 100644 --- a/lib/public/defaults.php +++ b/lib/public/defaults.php @@ -66,6 +66,22 @@ class Defaults { } /** + * link to the iOS client + * @return string + */ + public function getiOSClientUrl() { + return $this->defaults->getiOSClientUrl(); + } + + /** + * link to the Android client + * @return string + */ + public function getAndroidClientUrl() { + return $this->defaults->getAndroidClientUrl(); + } + + /** * base URL to the documentation of your ownCloud instance * @return string */ diff --git a/lib/public/share.php b/lib/public/share.php index c0939dce53f..e6519dd3e3a 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -330,6 +330,15 @@ class Share extends \OC\Share\Constants { public static function checkPasswordProtectedShare(array $linkItem) { return \OC\Share\Share::checkPasswordProtectedShare($linkItem); } + + /** + * Check if resharing is allowed + * + * @return boolean true if allowed or false + */ + public static function isResharingAllowed() { + return \OC\Share\Share::isResharingAllowed(); + } } /** diff --git a/lib/repair/innodb.php b/lib/repair/innodb.php index 6f7fcfcd4c9..6b795a749e9 100644 --- a/lib/repair/innodb.php +++ b/lib/repair/innodb.php @@ -43,7 +43,7 @@ class InnoDB extends BasicEmitter implements \OC\RepairStep { private function getAllMyIsamTables($connection) { $dbName = \OC::$server->getConfig()->getSystemValue("dbname"); $result = $connection->fetchArray( - "SELECT table_name FROM information_schema.tables WHERE table_schema = ? AND engine = 'MyISAM'", + "SELECT table_name FROM information_schema.tables WHERE table_schema = ? AND engine = 'MyISAM' AND TABLE_NAME LIKE \"*PREFIX*%\"", array($dbName) ); |