diff options
Diffstat (limited to 'apps')
112 files changed, 1606 insertions, 214 deletions
diff --git a/apps/comments/l10n/fr.js b/apps/comments/l10n/fr.js index fa3b4c744b3..10c35d6dced 100644 --- a/apps/comments/l10n/fr.js +++ b/apps/comments/l10n/fr.js @@ -2,6 +2,7 @@ OC.L10N.register( "comments", { "Comments" : "Commentaires", + "Unknown user" : "Utilisateur inconnu", "New comment …" : "Nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", "Post" : "Poster", @@ -22,6 +23,8 @@ OC.L10N.register( "%1$s commented" : "%1$s a commenté", "You commented on %2$s" : "Vous avez commenté %2$s", "%1$s commented on %2$s" : "%1$s a commenté %2$s", + "A (now) deleted user mentioned you in a comment on \"%s\"." : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur \"%s\".", + "%s mentioned you in a comment on \"%s\"." : "%s vous a mentionné⋅e dans un commentaire sur \"%s\".", "Type in a new comment..." : "Écrire un nouveau commentaire...", "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", diff --git a/apps/comments/l10n/fr.json b/apps/comments/l10n/fr.json index 4a01951d96f..0fec452ba73 100644 --- a/apps/comments/l10n/fr.json +++ b/apps/comments/l10n/fr.json @@ -1,5 +1,6 @@ { "translations": { "Comments" : "Commentaires", + "Unknown user" : "Utilisateur inconnu", "New comment …" : "Nouveau commentaire...", "Delete comment" : "Supprimer le commentaire", "Post" : "Poster", @@ -20,6 +21,8 @@ "%1$s commented" : "%1$s a commenté", "You commented on %2$s" : "Vous avez commenté %2$s", "%1$s commented on %2$s" : "%1$s a commenté %2$s", + "A (now) deleted user mentioned you in a comment on \"%s\"." : "Un utilisateur (maintenant supprimé) vous a mentionné dans un commentaire sur \"%s\".", + "%s mentioned you in a comment on \"%s\"." : "%s vous a mentionné⋅e dans un commentaire sur \"%s\".", "Type in a new comment..." : "Écrire un nouveau commentaire...", "No other comments available" : "Aucun autre commentaire", "More comments..." : "Plus de commentaires...", diff --git a/apps/dav/l10n/de.js b/apps/dav/l10n/de.js index f25e1fcd4cc..bd51821511f 100644 --- a/apps/dav/l10n/de.js +++ b/apps/dav/l10n/de.js @@ -1,6 +1,44 @@ OC.L10N.register( "dav", { + "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet", + "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet", + "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet", + "%1$s created calendar %2$s" : "%1$s hat den Kalender %2$s erstellt", + "You created calendar %2$s" : "Du hast den Kalender %2$s erstellt", + "%1$s deleted calendar %2$s" : "%1$s hat den Kalender %2$s entfernt", + "You deleted calendar %2$s" : "Du hast den Kalender %2$s entfernt", + "%1$s updated calendar %2$s" : "%1$s hat den Kalender %2$s aktualisiert", + "You updated calendar %2$s" : "Du hast den Kalender %2$s aktualisiert", + "%1$s shared calendar %2$s with you" : "%1$s hat den Kalender %2$s mit Ihnen geteilt", + "You shared calendar %2$s with %1$s" : "Du hast den Kalender %2$s mit %1$s geteilt", + "%3$s shared calendar %2$s with %1$s" : "%3$s hat den Kalender %2$s mit %1$s geteilt", + "%1$s unshared calendar %2$s from you" : "%1$s teilt den Kalender %2$s nicht mehr mit Ihnen", + "You unshared calendar %2$s from %1$s" : "Du hast den Kalender %2$s nicht mehr mit %1$s geteilt", + "%3$s unshared calendar %2$s from %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit %1$s geteilt", + "%1$s unshared calendar %2$s from themselves" : "%1$s teilt seinen Kalender %2$s nicht mehr", + "You shared calendar %2$s with group %1$s" : "Du hast den Kalender %2$s mit der Gruppe %1$s geteilt", + "%3$s shared calendar %2$s with group %1$s" : "%3$s hat den Kalender %2$s mit der Gruppe %1$s geteilt", + "You unshared calendar %2$s from group %1$s" : "Der Kalender %2$s ist nicht mehr mit der Gruppe %1$s geteilt", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit der Gruppe %1$s geteilt", + "%1$s created event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s erstellt", + "You created event %3$s in calendar %2$s" : "Du hast das Ereignis %3$s in Kalender %2$s erstellt", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s hat das Ereignis %3$s von Kalender %2$s entfernt", + "You deleted event %3$s from calendar %2$s" : "Du hast das Ereignis %3$s von Kalender %2$s entfernt", + "%1$s updated event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s aktualisiert", + "You updated event %3$s in calendar %2$s" : "Du hast das Ereignis %3$s in Kalender %2$s aktualisiert", + "%1$s created todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erstellt", + "You created todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s erstellt", + "%1$s deleted todo %3$s from list %2$s" : "%1$s hat die Aufgabe %3$s von Liste %2$s entfernt", + "You deleted todo %3$s from list %2$s" : "Du hast die Aufgabe %3$s von Liste %2$s entfernt", + "%1$s updated todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s aktualisiert", + "You updated todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s aktualisiert", + "%1$s solved todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erledigt", + "You solved todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s erledigt", + "%1$s reopened todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "You reopened todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "Calendar" : "Kalender", + "Todos" : "Aufgaben", "Contact birthdays" : "Geburtstage von Kontakten", "Personal" : "Persönlich", "Contacts" : "Kontakte", diff --git a/apps/dav/l10n/de.json b/apps/dav/l10n/de.json index 0b7b0ebb7f0..2ecc2e87a5c 100644 --- a/apps/dav/l10n/de.json +++ b/apps/dav/l10n/de.json @@ -1,4 +1,42 @@ { "translations": { + "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet", + "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet", + "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet", + "%1$s created calendar %2$s" : "%1$s hat den Kalender %2$s erstellt", + "You created calendar %2$s" : "Du hast den Kalender %2$s erstellt", + "%1$s deleted calendar %2$s" : "%1$s hat den Kalender %2$s entfernt", + "You deleted calendar %2$s" : "Du hast den Kalender %2$s entfernt", + "%1$s updated calendar %2$s" : "%1$s hat den Kalender %2$s aktualisiert", + "You updated calendar %2$s" : "Du hast den Kalender %2$s aktualisiert", + "%1$s shared calendar %2$s with you" : "%1$s hat den Kalender %2$s mit Ihnen geteilt", + "You shared calendar %2$s with %1$s" : "Du hast den Kalender %2$s mit %1$s geteilt", + "%3$s shared calendar %2$s with %1$s" : "%3$s hat den Kalender %2$s mit %1$s geteilt", + "%1$s unshared calendar %2$s from you" : "%1$s teilt den Kalender %2$s nicht mehr mit Ihnen", + "You unshared calendar %2$s from %1$s" : "Du hast den Kalender %2$s nicht mehr mit %1$s geteilt", + "%3$s unshared calendar %2$s from %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit %1$s geteilt", + "%1$s unshared calendar %2$s from themselves" : "%1$s teilt seinen Kalender %2$s nicht mehr", + "You shared calendar %2$s with group %1$s" : "Du hast den Kalender %2$s mit der Gruppe %1$s geteilt", + "%3$s shared calendar %2$s with group %1$s" : "%3$s hat den Kalender %2$s mit der Gruppe %1$s geteilt", + "You unshared calendar %2$s from group %1$s" : "Der Kalender %2$s ist nicht mehr mit der Gruppe %1$s geteilt", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit der Gruppe %1$s geteilt", + "%1$s created event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s erstellt", + "You created event %3$s in calendar %2$s" : "Du hast das Ereignis %3$s in Kalender %2$s erstellt", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s hat das Ereignis %3$s von Kalender %2$s entfernt", + "You deleted event %3$s from calendar %2$s" : "Du hast das Ereignis %3$s von Kalender %2$s entfernt", + "%1$s updated event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s aktualisiert", + "You updated event %3$s in calendar %2$s" : "Du hast das Ereignis %3$s in Kalender %2$s aktualisiert", + "%1$s created todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erstellt", + "You created todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s erstellt", + "%1$s deleted todo %3$s from list %2$s" : "%1$s hat die Aufgabe %3$s von Liste %2$s entfernt", + "You deleted todo %3$s from list %2$s" : "Du hast die Aufgabe %3$s von Liste %2$s entfernt", + "%1$s updated todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s aktualisiert", + "You updated todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s aktualisiert", + "%1$s solved todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erledigt", + "You solved todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s erledigt", + "%1$s reopened todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "You reopened todo %3$s in list %2$s" : "Du hast die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "Calendar" : "Kalender", + "Todos" : "Aufgaben", "Contact birthdays" : "Geburtstage von Kontakten", "Personal" : "Persönlich", "Contacts" : "Kontakte", diff --git a/apps/dav/l10n/de_DE.js b/apps/dav/l10n/de_DE.js index f25e1fcd4cc..a9c746be4ee 100644 --- a/apps/dav/l10n/de_DE.js +++ b/apps/dav/l10n/de_DE.js @@ -1,6 +1,44 @@ OC.L10N.register( "dav", { + "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet", + "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet", + "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet", + "%1$s created calendar %2$s" : "%1$s hat den Kalender %2$s erstellt", + "You created calendar %2$s" : "Sie haben den Kalender %2$s erstellt", + "%1$s deleted calendar %2$s" : "%1$s hat den Kalender %2$s entfernt", + "You deleted calendar %2$s" : "Sie haben den Kalender %2$s entfernt", + "%1$s updated calendar %2$s" : "%1$s hat den Kalender %2$s aktualisiert", + "You updated calendar %2$s" : "Sie haben den Kalender %2$s aktualisiert", + "%1$s shared calendar %2$s with you" : "%1$s hat den Kalender %2$s mit Ihnen geteilt", + "You shared calendar %2$s with %1$s" : "Sie haben den Kalender %2$s mit %1$s geteilt", + "%3$s shared calendar %2$s with %1$s" : "%3$s hat den Kalender %2$s mit %1$s geteilt", + "%1$s unshared calendar %2$s from you" : "%1$s teilt den Kalender %2$s nicht mehr mit Ihnen", + "You unshared calendar %2$s from %1$s" : "Sie haben den Kalender %2$s nicht mehr mit %1$s geteilt", + "%3$s unshared calendar %2$s from %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit %1$s geteilt", + "%1$s unshared calendar %2$s from themselves" : "%1$s teilt seinen Kalender %2$s nicht mehr", + "You shared calendar %2$s with group %1$s" : "Sie haben den Kalender %2$s mit der Gruppe %1$s geteilt", + "%3$s shared calendar %2$s with group %1$s" : "%3$s hat den Kalender %2$s mit der Gruppe %1$s geteilt", + "You unshared calendar %2$s from group %1$s" : "Der Kalender %2$s ist nicht mehr mit der Gruppe %1$s geteilt", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit der Gruppe %1$s geteilt", + "%1$s created event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s erstellt", + "You created event %3$s in calendar %2$s" : "Sie haben das Ereignis %3$s in Kalender %2$s erstellt", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s hat das Ereignis %3$s von Kalender %2$s entfernt", + "You deleted event %3$s from calendar %2$s" : "Sie haben das Ereignis %3$s von Kalender %2$s entfernt", + "%1$s updated event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s aktualisiert", + "You updated event %3$s in calendar %2$s" : "Sie haben das Ereignis %3$s in Kalender %2$s aktualisiert", + "%1$s created todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erstellt", + "You created todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s erstellt", + "%1$s deleted todo %3$s from list %2$s" : "%1$s hat die Aufgabe %3$s von Liste %2$s entfernt", + "You deleted todo %3$s from list %2$s" : "Sie haben die Aufgabe %3$s von Liste %2$s entfernt", + "%1$s updated todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s aktualisiert", + "You updated todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s aktualisiert", + "%1$s solved todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erledigt", + "You solved todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s erledigt", + "%1$s reopened todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "You reopened todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "Calendar" : "Kalender", + "Todos" : "Aufgaben", "Contact birthdays" : "Geburtstage von Kontakten", "Personal" : "Persönlich", "Contacts" : "Kontakte", diff --git a/apps/dav/l10n/de_DE.json b/apps/dav/l10n/de_DE.json index 0b7b0ebb7f0..b9fc96b73ea 100644 --- a/apps/dav/l10n/de_DE.json +++ b/apps/dav/l10n/de_DE.json @@ -1,4 +1,42 @@ { "translations": { + "A <strong>calendar</strong> was modified" : "Ein <strong>Kalender</strong> wurde bearbeitet", + "A calendar <strong>event</strong> was modified" : "Ein <strong>Ereignis</strong> wurde bearbeitet", + "A calendar <strong>todo</strong> was modified" : "Eine <strong>Aufgabe</strong> wurde bearbeitet", + "%1$s created calendar %2$s" : "%1$s hat den Kalender %2$s erstellt", + "You created calendar %2$s" : "Sie haben den Kalender %2$s erstellt", + "%1$s deleted calendar %2$s" : "%1$s hat den Kalender %2$s entfernt", + "You deleted calendar %2$s" : "Sie haben den Kalender %2$s entfernt", + "%1$s updated calendar %2$s" : "%1$s hat den Kalender %2$s aktualisiert", + "You updated calendar %2$s" : "Sie haben den Kalender %2$s aktualisiert", + "%1$s shared calendar %2$s with you" : "%1$s hat den Kalender %2$s mit Ihnen geteilt", + "You shared calendar %2$s with %1$s" : "Sie haben den Kalender %2$s mit %1$s geteilt", + "%3$s shared calendar %2$s with %1$s" : "%3$s hat den Kalender %2$s mit %1$s geteilt", + "%1$s unshared calendar %2$s from you" : "%1$s teilt den Kalender %2$s nicht mehr mit Ihnen", + "You unshared calendar %2$s from %1$s" : "Sie haben den Kalender %2$s nicht mehr mit %1$s geteilt", + "%3$s unshared calendar %2$s from %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit %1$s geteilt", + "%1$s unshared calendar %2$s from themselves" : "%1$s teilt seinen Kalender %2$s nicht mehr", + "You shared calendar %2$s with group %1$s" : "Sie haben den Kalender %2$s mit der Gruppe %1$s geteilt", + "%3$s shared calendar %2$s with group %1$s" : "%3$s hat den Kalender %2$s mit der Gruppe %1$s geteilt", + "You unshared calendar %2$s from group %1$s" : "Der Kalender %2$s ist nicht mehr mit der Gruppe %1$s geteilt", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s hat den Kalender %2$s nicht mehr mit der Gruppe %1$s geteilt", + "%1$s created event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s erstellt", + "You created event %3$s in calendar %2$s" : "Sie haben das Ereignis %3$s in Kalender %2$s erstellt", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s hat das Ereignis %3$s von Kalender %2$s entfernt", + "You deleted event %3$s from calendar %2$s" : "Sie haben das Ereignis %3$s von Kalender %2$s entfernt", + "%1$s updated event %3$s in calendar %2$s" : "%1$s hat das Ereignis %3$s in Kalender %2$s aktualisiert", + "You updated event %3$s in calendar %2$s" : "Sie haben das Ereignis %3$s in Kalender %2$s aktualisiert", + "%1$s created todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erstellt", + "You created todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s erstellt", + "%1$s deleted todo %3$s from list %2$s" : "%1$s hat die Aufgabe %3$s von Liste %2$s entfernt", + "You deleted todo %3$s from list %2$s" : "Sie haben die Aufgabe %3$s von Liste %2$s entfernt", + "%1$s updated todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s aktualisiert", + "You updated todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s aktualisiert", + "%1$s solved todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s erledigt", + "You solved todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s erledigt", + "%1$s reopened todo %3$s in list %2$s" : "%1$s hat die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "You reopened todo %3$s in list %2$s" : "Sie haben die Aufgabe %3$s in Liste %2$s wiedereröffnet", + "Calendar" : "Kalender", + "Todos" : "Aufgaben", "Contact birthdays" : "Geburtstage von Kontakten", "Personal" : "Persönlich", "Contacts" : "Kontakte", diff --git a/apps/dav/l10n/hu_HU.js b/apps/dav/l10n/hu_HU.js index 14e6d492f83..48e58795674 100644 --- a/apps/dav/l10n/hu_HU.js +++ b/apps/dav/l10n/hu_HU.js @@ -1,6 +1,44 @@ OC.L10N.register( "dav", { + "A <strong>calendar</strong> was modified" : "Egy <strong>naptár</strong> megváltozott", + "A calendar <strong>event</strong> was modified" : "Egy naptár <strong>esemény</strong> megváltozott", + "A calendar <strong>todo</strong> was modified" : "Egy naptár <strong>teendő</strong> megváltozott", + "%1$s created calendar %2$s" : "%1$s létrehozta a naptárt: %2$s", + "You created calendar %2$s" : "Létrehoztad a naptárt: %2$s", + "%1$s deleted calendar %2$s" : "%1$s törölte a naptárt: %2$s", + "You deleted calendar %2$s" : "Törölted a naptárt: %2$s", + "%1$s updated calendar %2$s" : "%1$s frissítette a naptárt: %2$s", + "You updated calendar %2$s" : "Frissítetted a napárt: %2$s", + "%1$s shared calendar %2$s with you" : "%1$s megosztotta veled a napárt: %2$s", + "You shared calendar %2$s with %1$s" : "Megosztottad ezt a napárt: %2$s vele %1$s", + "%3$s shared calendar %2$s with %1$s" : "%3$s megosztotta ezt a napárt: %2$s vele: %1$s", + "%1$s unshared calendar %2$s from you" : "%1$s visszavonta tőled a naptár megosztását: %2$s", + "You unshared calendar %2$s from %1$s" : "Visszavontad a naptár megosztását: %2$s tőle: %1$s", + "%3$s unshared calendar %2$s from %1$s" : "%3$s visszavonta a naptár megosztását: %2$s tőle: %1$s", + "%1$s unshared calendar %2$s from themselves" : "%1$s visszavonta a naptár megosztását: %2$s tőlük", + "You shared calendar %2$s with group %1$s" : "Megosztottad ezt a napárt: %2$s ezzel a csoporttal: %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s megosztotta ezt a napárt: %2$s ezzel a csoporttal: %1$s", + "You unshared calendar %2$s from group %1$s" : "Visszavontad a naptár megosztását: %2$s ettől a csoporttól: %1$s", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s visszavonta a naptár megosztását: %2$s ettől a csoporttól: %1$s", + "%1$s created event %3$s in calendar %2$s" : "%1$s létrehozott egy eseményt: %3$s ebben a naptárban: %2$s", + "You created event %3$s in calendar %2$s" : "Létrehoztál egy eseményt: %3$s ebben a naptárban: %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s törölt egy eseményt: %3$s ebből a naptárból: %2$s", + "You deleted event %3$s from calendar %2$s" : "Töröltél egy eseményt: %3$s ebből a naptárból: %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s frissített egy eseményt: %3$s ebben a naptárban: %2$s", + "You updated event %3$s in calendar %2$s" : "Frissítettél egy eseményt: %3$s ebben a naptárban: %2$s", + "%1$s created todo %3$s in list %2$s" : "%1$s létrehozott egy teendőt: %3$s ebben a listában: %2$s", + "You created todo %3$s in list %2$s" : "Létrehoztál egy teendőt: %3$s ebben a listában: %2$s", + "%1$s deleted todo %3$s from list %2$s" : "%1$s törölt egy teendőt: %3$s ebből a listából: %2$s", + "You deleted todo %3$s from list %2$s" : "Töröltél egy teendőt: %3$s ebből a listából: %2$s", + "%1$s updated todo %3$s in list %2$s" : "%1$s frissített egy teendőt: %3$s ebben a listában: %2$s", + "You updated todo %3$s in list %2$s" : "Frissítettél egy teendőt: %3$s ebben a listában: %2$s", + "%1$s solved todo %3$s in list %2$s" : "%1$s befejezett egy teendőt: %3$s ebben a listában: %2$s", + "You solved todo %3$s in list %2$s" : "Befejeztél egy teendőt: %3$s ebben a listában: %2$s", + "%1$s reopened todo %3$s in list %2$s" : "%1$s újranyitott egy teendőt: %3$s ebben a listában: %2$s", + "You reopened todo %3$s in list %2$s" : "Újranyitotál egy teendőt: %3$s ebben a listában: %2$s", + "Calendar" : "Naptár", + "Todos" : "Teendők", "Contact birthdays" : "Születésnapok", "Personal" : "Személyes", "Contacts" : "Névjegyek", diff --git a/apps/dav/l10n/hu_HU.json b/apps/dav/l10n/hu_HU.json index 220f0376272..217525ea1fa 100644 --- a/apps/dav/l10n/hu_HU.json +++ b/apps/dav/l10n/hu_HU.json @@ -1,4 +1,42 @@ { "translations": { + "A <strong>calendar</strong> was modified" : "Egy <strong>naptár</strong> megváltozott", + "A calendar <strong>event</strong> was modified" : "Egy naptár <strong>esemény</strong> megváltozott", + "A calendar <strong>todo</strong> was modified" : "Egy naptár <strong>teendő</strong> megváltozott", + "%1$s created calendar %2$s" : "%1$s létrehozta a naptárt: %2$s", + "You created calendar %2$s" : "Létrehoztad a naptárt: %2$s", + "%1$s deleted calendar %2$s" : "%1$s törölte a naptárt: %2$s", + "You deleted calendar %2$s" : "Törölted a naptárt: %2$s", + "%1$s updated calendar %2$s" : "%1$s frissítette a naptárt: %2$s", + "You updated calendar %2$s" : "Frissítetted a napárt: %2$s", + "%1$s shared calendar %2$s with you" : "%1$s megosztotta veled a napárt: %2$s", + "You shared calendar %2$s with %1$s" : "Megosztottad ezt a napárt: %2$s vele %1$s", + "%3$s shared calendar %2$s with %1$s" : "%3$s megosztotta ezt a napárt: %2$s vele: %1$s", + "%1$s unshared calendar %2$s from you" : "%1$s visszavonta tőled a naptár megosztását: %2$s", + "You unshared calendar %2$s from %1$s" : "Visszavontad a naptár megosztását: %2$s tőle: %1$s", + "%3$s unshared calendar %2$s from %1$s" : "%3$s visszavonta a naptár megosztását: %2$s tőle: %1$s", + "%1$s unshared calendar %2$s from themselves" : "%1$s visszavonta a naptár megosztását: %2$s tőlük", + "You shared calendar %2$s with group %1$s" : "Megosztottad ezt a napárt: %2$s ezzel a csoporttal: %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s megosztotta ezt a napárt: %2$s ezzel a csoporttal: %1$s", + "You unshared calendar %2$s from group %1$s" : "Visszavontad a naptár megosztását: %2$s ettől a csoporttól: %1$s", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s visszavonta a naptár megosztását: %2$s ettől a csoporttól: %1$s", + "%1$s created event %3$s in calendar %2$s" : "%1$s létrehozott egy eseményt: %3$s ebben a naptárban: %2$s", + "You created event %3$s in calendar %2$s" : "Létrehoztál egy eseményt: %3$s ebben a naptárban: %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s törölt egy eseményt: %3$s ebből a naptárból: %2$s", + "You deleted event %3$s from calendar %2$s" : "Töröltél egy eseményt: %3$s ebből a naptárból: %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s frissített egy eseményt: %3$s ebben a naptárban: %2$s", + "You updated event %3$s in calendar %2$s" : "Frissítettél egy eseményt: %3$s ebben a naptárban: %2$s", + "%1$s created todo %3$s in list %2$s" : "%1$s létrehozott egy teendőt: %3$s ebben a listában: %2$s", + "You created todo %3$s in list %2$s" : "Létrehoztál egy teendőt: %3$s ebben a listában: %2$s", + "%1$s deleted todo %3$s from list %2$s" : "%1$s törölt egy teendőt: %3$s ebből a listából: %2$s", + "You deleted todo %3$s from list %2$s" : "Töröltél egy teendőt: %3$s ebből a listából: %2$s", + "%1$s updated todo %3$s in list %2$s" : "%1$s frissített egy teendőt: %3$s ebben a listában: %2$s", + "You updated todo %3$s in list %2$s" : "Frissítettél egy teendőt: %3$s ebben a listában: %2$s", + "%1$s solved todo %3$s in list %2$s" : "%1$s befejezett egy teendőt: %3$s ebben a listában: %2$s", + "You solved todo %3$s in list %2$s" : "Befejeztél egy teendőt: %3$s ebben a listában: %2$s", + "%1$s reopened todo %3$s in list %2$s" : "%1$s újranyitott egy teendőt: %3$s ebben a listában: %2$s", + "You reopened todo %3$s in list %2$s" : "Újranyitotál egy teendőt: %3$s ebben a listában: %2$s", + "Calendar" : "Naptár", + "Todos" : "Teendők", "Contact birthdays" : "Születésnapok", "Personal" : "Személyes", "Contacts" : "Névjegyek", diff --git a/apps/dav/l10n/it.js b/apps/dav/l10n/it.js index d8b46e18ab9..2265d7eb74b 100644 --- a/apps/dav/l10n/it.js +++ b/apps/dav/l10n/it.js @@ -1,6 +1,44 @@ OC.L10N.register( "dav", { + "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> è stato modificato", + "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> di calendario è stato modificato", + "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stato modificata", + "%1$s created calendar %2$s" : "%1$s ha creato il calendario %2$s", + "You created calendar %2$s" : "Hai creato il calendario %2$s", + "%1$s deleted calendar %2$s" : "%1$s ha eliminato il calendario %2$s", + "You deleted calendar %2$s" : "Hai eliminato il calendario %2$s", + "%1$s updated calendar %2$s" : "%1$s ha aggiornato il calendario %2$s", + "You updated calendar %2$s" : "Hai aggiornato il calendario %2$s", + "%1$s shared calendar %2$s with you" : "%1$s ha condiviso il calendario %2$s con te", + "You shared calendar %2$s with %1$s" : "Hai condiviso il calendario %2$s con %1$s", + "%3$s shared calendar %2$s with %1$s" : "%3$s ha condiviso il calendario %2$s con %1$s", + "%1$s unshared calendar %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te", + "You unshared calendar %2$s from %1$s" : "Hai rimosso la condivisione del calendario %2$s da %1$s", + "%3$s unshared calendar %2$s from %1$s" : "%3$s ha rimosso la condivisione %2$s con %1$s", + "%1$s unshared calendar %2$s from themselves" : "%1$s ha rimosso la condivisione %2$s con se stesso", + "You shared calendar %2$s with group %1$s" : "Hai condiviso il calendario %2$s con il gruppo %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s ha condiviso il calendario %2$s con il gruppo %1$s", + "You unshared calendar %2$s from group %1$s" : "Hai rimosso la condivisione del calendario %2$s con il gruppo %1$s", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s ha rimosso la condivisione %2$s con il gruppo %1$s", + "%1$s created event %3$s in calendar %2$s" : "%1$s ha creato l'evento %3$s nel calendario %2$s", + "You created event %3$s in calendar %2$s" : "Hai creato l'evento %3$s nel calendario %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s ha eliminato l'evento %3$s dal calendario %2$s", + "You deleted event %3$s from calendar %2$s" : "Hai eliminato l'evento %3$s dal calendario %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s ha aggiornato l'evento %3$s nel calendario %2$s", + "You updated event %3$s in calendar %2$s" : "Hai aggiornato l'evento %3$s nel calendario %2$s", + "%1$s created todo %3$s in list %2$s" : "%1$s ha creato la cosa da fare %3$s nell'elenco %2$s", + "You created todo %3$s in list %2$s" : "Hai creato la cosa da fare %3$s nell'elenco %2$s", + "%1$s deleted todo %3$s from list %2$s" : "%1$s ha eliminato la cosa da fare %3$s dall'elenco %2$s", + "You deleted todo %3$s from list %2$s" : "Hai eliminato la cosa da fare %3$s dall'elenco %2$s", + "%1$s updated todo %3$s in list %2$s" : "%1$s ha aggiornato la cosa da fare %3$s nell'elenco %2$s", + "You updated todo %3$s in list %2$s" : "Hai aggiornato la cosa da fare %3$s nell'elenco %2$s", + "%1$s solved todo %3$s in list %2$s" : "%1$s ha risolto la cosa da fare %3$s nell'elenco %2$s", + "You solved todo %3$s in list %2$s" : "Hai risolto la cosa da fare %3$s nell'elenco %2$s", + "%1$s reopened todo %3$s in list %2$s" : "%1$s ha riaperto la cosa da fare %3$s nell'elenco %2$s", + "You reopened todo %3$s in list %2$s" : "Hai riaperto la cosa da fare %3$s nell'elenco %2$s", + "Calendar" : "Calendario", + "Todos" : "Cose da fare", "Contact birthdays" : "Date di nascita dei contatti", "Personal" : "Personale", "Contacts" : "Contatti", diff --git a/apps/dav/l10n/it.json b/apps/dav/l10n/it.json index aa6b9cb8205..d1aa791dabe 100644 --- a/apps/dav/l10n/it.json +++ b/apps/dav/l10n/it.json @@ -1,4 +1,42 @@ { "translations": { + "A <strong>calendar</strong> was modified" : "Un <strong>calendario</strong> è stato modificato", + "A calendar <strong>event</strong> was modified" : "Un <strong>evento</strong> di calendario è stato modificato", + "A calendar <strong>todo</strong> was modified" : "Una <strong>cosa da fare</strong> del calendario è stato modificata", + "%1$s created calendar %2$s" : "%1$s ha creato il calendario %2$s", + "You created calendar %2$s" : "Hai creato il calendario %2$s", + "%1$s deleted calendar %2$s" : "%1$s ha eliminato il calendario %2$s", + "You deleted calendar %2$s" : "Hai eliminato il calendario %2$s", + "%1$s updated calendar %2$s" : "%1$s ha aggiornato il calendario %2$s", + "You updated calendar %2$s" : "Hai aggiornato il calendario %2$s", + "%1$s shared calendar %2$s with you" : "%1$s ha condiviso il calendario %2$s con te", + "You shared calendar %2$s with %1$s" : "Hai condiviso il calendario %2$s con %1$s", + "%3$s shared calendar %2$s with %1$s" : "%3$s ha condiviso il calendario %2$s con %1$s", + "%1$s unshared calendar %2$s from you" : "%1$s ha rimosso la condivisione %2$s con te", + "You unshared calendar %2$s from %1$s" : "Hai rimosso la condivisione del calendario %2$s da %1$s", + "%3$s unshared calendar %2$s from %1$s" : "%3$s ha rimosso la condivisione %2$s con %1$s", + "%1$s unshared calendar %2$s from themselves" : "%1$s ha rimosso la condivisione %2$s con se stesso", + "You shared calendar %2$s with group %1$s" : "Hai condiviso il calendario %2$s con il gruppo %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s ha condiviso il calendario %2$s con il gruppo %1$s", + "You unshared calendar %2$s from group %1$s" : "Hai rimosso la condivisione del calendario %2$s con il gruppo %1$s", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s ha rimosso la condivisione %2$s con il gruppo %1$s", + "%1$s created event %3$s in calendar %2$s" : "%1$s ha creato l'evento %3$s nel calendario %2$s", + "You created event %3$s in calendar %2$s" : "Hai creato l'evento %3$s nel calendario %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s ha eliminato l'evento %3$s dal calendario %2$s", + "You deleted event %3$s from calendar %2$s" : "Hai eliminato l'evento %3$s dal calendario %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s ha aggiornato l'evento %3$s nel calendario %2$s", + "You updated event %3$s in calendar %2$s" : "Hai aggiornato l'evento %3$s nel calendario %2$s", + "%1$s created todo %3$s in list %2$s" : "%1$s ha creato la cosa da fare %3$s nell'elenco %2$s", + "You created todo %3$s in list %2$s" : "Hai creato la cosa da fare %3$s nell'elenco %2$s", + "%1$s deleted todo %3$s from list %2$s" : "%1$s ha eliminato la cosa da fare %3$s dall'elenco %2$s", + "You deleted todo %3$s from list %2$s" : "Hai eliminato la cosa da fare %3$s dall'elenco %2$s", + "%1$s updated todo %3$s in list %2$s" : "%1$s ha aggiornato la cosa da fare %3$s nell'elenco %2$s", + "You updated todo %3$s in list %2$s" : "Hai aggiornato la cosa da fare %3$s nell'elenco %2$s", + "%1$s solved todo %3$s in list %2$s" : "%1$s ha risolto la cosa da fare %3$s nell'elenco %2$s", + "You solved todo %3$s in list %2$s" : "Hai risolto la cosa da fare %3$s nell'elenco %2$s", + "%1$s reopened todo %3$s in list %2$s" : "%1$s ha riaperto la cosa da fare %3$s nell'elenco %2$s", + "You reopened todo %3$s in list %2$s" : "Hai riaperto la cosa da fare %3$s nell'elenco %2$s", + "Calendar" : "Calendario", + "Todos" : "Cose da fare", "Contact birthdays" : "Date di nascita dei contatti", "Personal" : "Personale", "Contacts" : "Contatti", diff --git a/apps/dav/l10n/nl.js b/apps/dav/l10n/nl.js index 0d573861d52..64375fea6fc 100644 --- a/apps/dav/l10n/nl.js +++ b/apps/dav/l10n/nl.js @@ -1,6 +1,34 @@ OC.L10N.register( "dav", { + "A <strong>calendar</strong> was modified" : "Een <strong>agenda</strong> is aangepast", + "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast", + "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast", + "%1$s created calendar %2$s" : "%1$s heeft agenda %2$s gemaakt", + "You created calendar %2$s" : "U heeft agenda %2$s gemaakt", + "%1$s deleted calendar %2$s" : "%1$s heeft agenda %2$s verwijderd.", + "You deleted calendar %2$s" : "U heeft agenda %2$s verwijderd", + "%1$s updated calendar %2$s" : "%1$s heeft agenda %2$s geüpdatet", + "You updated calendar %2$s" : "U heeft agenda %2$s geüpdated", + "%1$s shared calendar %2$s with you" : "%1$s heeft agenda %2$s met u gedeeld", + "You shared calendar %2$s with %1$s" : "U heeft agenda %2$s met %1$s gedeeld", + "%3$s shared calendar %2$s with %1$s" : "%3$s heeft agenda %2$s met %1$s gedeeld", + "%1$s unshared calendar %2$s from you" : "%1$s stopt het delen van agenda %2$s met u", + "You unshared calendar %2$s from %1$s" : "U stopte met delen van agenda %2$s met %1$s ", + "%3$s unshared calendar %2$s from %1$s" : "%3$s stopte met het delen van agenda %2$s met %1$s ", + "%1$s unshared calendar %2$s from themselves" : "%1$s stopte met het delen van agenda %2$s met zichzelf", + "You shared calendar %2$s with group %1$s" : "Je deelde agenda %2$s met groep %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s deelde agenda %2$s met groep %1$s", + "You unshared calendar %2$s from group %1$s" : "Je stopte met delen van agenda %2$s met groep %1$s ", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s stopte met het delen van agenda %2$s met groep %1$s ", + "%1$s created event %3$s in calendar %2$s" : "%1$s creëerde afspraak %3$s in agenda %2$s", + "You created event %3$s in calendar %2$s" : "Je creëerde afspraak %3$s in agenda %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s verwijderde afspraak %3$s uit agenda %2$s", + "You deleted event %3$s from calendar %2$s" : "Je verwijderde afspraak %3$s uit agenda %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s heeft afspraak %3$s in agenda %2$s bijgewerkt", + "You updated event %3$s in calendar %2$s" : "Je hebt afspraak %3$s in agenda %2$s bijgewerkt", + "Calendar" : "Kalender", + "Todos" : "Te doen", "Contact birthdays" : "Verjaardagen", "Personal" : "Persoonlijk", "Contacts" : "Contactpersonen", diff --git a/apps/dav/l10n/nl.json b/apps/dav/l10n/nl.json index 6c3faa5ea6c..ccd6873dfa0 100644 --- a/apps/dav/l10n/nl.json +++ b/apps/dav/l10n/nl.json @@ -1,4 +1,32 @@ { "translations": { + "A <strong>calendar</strong> was modified" : "Een <strong>agenda</strong> is aangepast", + "A calendar <strong>event</strong> was modified" : "Een agenda <strong>gebeurtenis</strong> is aangepast", + "A calendar <strong>todo</strong> was modified" : "Een agenda <strong>Te doen</strong> was aangepast", + "%1$s created calendar %2$s" : "%1$s heeft agenda %2$s gemaakt", + "You created calendar %2$s" : "U heeft agenda %2$s gemaakt", + "%1$s deleted calendar %2$s" : "%1$s heeft agenda %2$s verwijderd.", + "You deleted calendar %2$s" : "U heeft agenda %2$s verwijderd", + "%1$s updated calendar %2$s" : "%1$s heeft agenda %2$s geüpdatet", + "You updated calendar %2$s" : "U heeft agenda %2$s geüpdated", + "%1$s shared calendar %2$s with you" : "%1$s heeft agenda %2$s met u gedeeld", + "You shared calendar %2$s with %1$s" : "U heeft agenda %2$s met %1$s gedeeld", + "%3$s shared calendar %2$s with %1$s" : "%3$s heeft agenda %2$s met %1$s gedeeld", + "%1$s unshared calendar %2$s from you" : "%1$s stopt het delen van agenda %2$s met u", + "You unshared calendar %2$s from %1$s" : "U stopte met delen van agenda %2$s met %1$s ", + "%3$s unshared calendar %2$s from %1$s" : "%3$s stopte met het delen van agenda %2$s met %1$s ", + "%1$s unshared calendar %2$s from themselves" : "%1$s stopte met het delen van agenda %2$s met zichzelf", + "You shared calendar %2$s with group %1$s" : "Je deelde agenda %2$s met groep %1$s", + "%3$s shared calendar %2$s with group %1$s" : "%3$s deelde agenda %2$s met groep %1$s", + "You unshared calendar %2$s from group %1$s" : "Je stopte met delen van agenda %2$s met groep %1$s ", + "%3$s unshared calendar %2$s from group %1$s" : "%3$s stopte met het delen van agenda %2$s met groep %1$s ", + "%1$s created event %3$s in calendar %2$s" : "%1$s creëerde afspraak %3$s in agenda %2$s", + "You created event %3$s in calendar %2$s" : "Je creëerde afspraak %3$s in agenda %2$s", + "%1$s deleted event %3$s from calendar %2$s" : "%1$s verwijderde afspraak %3$s uit agenda %2$s", + "You deleted event %3$s from calendar %2$s" : "Je verwijderde afspraak %3$s uit agenda %2$s", + "%1$s updated event %3$s in calendar %2$s" : "%1$s heeft afspraak %3$s in agenda %2$s bijgewerkt", + "You updated event %3$s in calendar %2$s" : "Je hebt afspraak %3$s in agenda %2$s bijgewerkt", + "Calendar" : "Kalender", + "Todos" : "Te doen", "Contact birthdays" : "Verjaardagen", "Personal" : "Persoonlijk", "Contacts" : "Contactpersonen", diff --git a/apps/encryption/l10n/sk_SK.js b/apps/encryption/l10n/sk_SK.js index af66435d211..798a5939ff9 100644 --- a/apps/encryption/l10n/sk_SK.js +++ b/apps/encryption/l10n/sk_SK.js @@ -23,9 +23,9 @@ OC.L10N.register( "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte migrovať vaše šifrovacie kľúče zo starého šifrovania (ownCloud <= 8,0) na nové. Spustite „occ encryption:migrate“ alebo sa obráťte na správcu", "one-time password for server-side-encryption" : "jednorazové heslo na šifrovanie na strane servera", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.", - "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo prečítať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby vám ho znova zdieľal.", - "The share will expire on %s." : "Zdieľanie vyprší %s.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné rozšifrovať, môže ísť o súbor sprístupnený iným používateľom. Požiadajte majiteľa súboru, aby vám ho sprístupnil ešte raz.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné prečítať, môže ísť o súbor sprístupnený iným používateľom. Požiadajte majiteľa súboru, aby vám ho sprístupnil ešte raz.", + "The share will expire on %s." : "Sprístupnenie vyprší %s.", "Cheers!" : "Pekný deň!", "Encrypt the home storage" : "Šifrovať domáce úložisko", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Zapnutím tejto voľby zašifrujete všetky súbory v hlavnom úložisku, v opačnom prípade zašifrujete iba súbory na externom úložisku.", diff --git a/apps/encryption/l10n/sk_SK.json b/apps/encryption/l10n/sk_SK.json index 11462bf37d9..cf259c2223d 100644 --- a/apps/encryption/l10n/sk_SK.json +++ b/apps/encryption/l10n/sk_SK.json @@ -21,9 +21,9 @@ "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.", "You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please run 'occ encryption:migrate' or contact your administrator" : "Musíte migrovať vaše šifrovacie kľúče zo starého šifrovania (ownCloud <= 8,0) na nové. Spustite „occ encryption:migrate“ alebo sa obráťte na správcu", "one-time password for server-side-encryption" : "jednorazové heslo na šifrovanie na strane servera", - "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo dešifrovať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby ho s vami znovu vyzdieľal.", - "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor sa nepodarilo prečítať, pravdepodobne je zdieľaný. Požiadajte majiteľa súboru, aby vám ho znova zdieľal.", - "The share will expire on %s." : "Zdieľanie vyprší %s.", + "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné rozšifrovať, môže ísť o súbor sprístupnený iným používateľom. Požiadajte majiteľa súboru, aby vám ho sprístupnil ešte raz.", + "Can not read this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Tento súbor nie je možné prečítať, môže ísť o súbor sprístupnený iným používateľom. Požiadajte majiteľa súboru, aby vám ho sprístupnil ešte raz.", + "The share will expire on %s." : "Sprístupnenie vyprší %s.", "Cheers!" : "Pekný deň!", "Encrypt the home storage" : "Šifrovať domáce úložisko", "Enabling this option encrypts all files stored on the main storage, otherwise only files on external storage will be encrypted" : "Zapnutím tejto voľby zašifrujete všetky súbory v hlavnom úložisku, v opačnom prípade zašifrujete iba súbory na externom úložisku.", diff --git a/apps/federatedfilesharing/l10n/de.js b/apps/federatedfilesharing/l10n/de.js index bb16a6d146b..1785e0a0a41 100644 --- a/apps/federatedfilesharing/l10n/de.js +++ b/apps/federatedfilesharing/l10n/de.js @@ -26,6 +26,7 @@ OC.L10N.register( "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "File is already shared with %s" : "Datei wird bereits mit %s geteilt", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen (im Auftrag von {behalf})", diff --git a/apps/federatedfilesharing/l10n/de.json b/apps/federatedfilesharing/l10n/de.json index 65bd8177049..2e11cba1d77 100644 --- a/apps/federatedfilesharing/l10n/de.json +++ b/apps/federatedfilesharing/l10n/de.json @@ -24,6 +24,7 @@ "Sharing %s failed, because this item is already shared with %s" : "Freigabe von %s fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "File is already shared with %s" : "Datei wird bereits mit %s geteilt", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Du hast \"%3$s\" als eine entfernte Freigabe von \"%1$s\" empfangen (im Auftrag von %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Du hast {share} als eine entfernte Freigabe von {user} empfangen (im Auftrag von {behalf})", diff --git a/apps/federatedfilesharing/l10n/de_DE.js b/apps/federatedfilesharing/l10n/de_DE.js index c39efaa61cb..ddf6c2b3ac5 100644 --- a/apps/federatedfilesharing/l10n/de_DE.js +++ b/apps/federatedfilesharing/l10n/de_DE.js @@ -26,6 +26,7 @@ OC.L10N.register( "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "File is already shared with %s" : "Datei wird bereits geteilt mit %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\" (im Auftrag von %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine entfernte Freigabe von {user} (im Auftrag von {behalf})", diff --git a/apps/federatedfilesharing/l10n/de_DE.json b/apps/federatedfilesharing/l10n/de_DE.json index 41cf5815dcb..9d895123b8b 100644 --- a/apps/federatedfilesharing/l10n/de_DE.json +++ b/apps/federatedfilesharing/l10n/de_DE.json @@ -24,6 +24,7 @@ "Sharing %s failed, because this item is already shared with %s" : "Die Freigabe von %s ist fehlgeschlagen, da dieses Objekt schon mit %s geteilt wird", "Not allowed to create a federated share with the same user" : "Das Erstellen einer Federated Cloud Freigabe mit dem gleichen Benutzer ist nicht erlaubt", "File is already shared with %s" : "Datei wird bereits geteilt mit %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "Freigabe von %s fehlgeschlagen, da %s nicht gefunden wurde. Möglicherweise ist der Server nicht erreichbar oder nutzt ein selbst zertifiziertes Zertifikat.", "Could not find share" : "Freigabe konnte nicht gefunden werden", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Sie empfingen \"%3$s\" als eine entfernte Freigabe von \"%1$s\" (im Auftrag von %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Sie empfingen {share} als eine entfernte Freigabe von {user} (im Auftrag von {behalf})", diff --git a/apps/federatedfilesharing/l10n/fr.js b/apps/federatedfilesharing/l10n/fr.js index 91c53ccbd74..d9944c775dd 100644 --- a/apps/federatedfilesharing/l10n/fr.js +++ b/apps/federatedfilesharing/l10n/fr.js @@ -27,6 +27,7 @@ OC.L10N.register( "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", "File is already shared with %s" : "Le fichier est déjà partagé avec %s", "Could not find share" : "Impossible de trouver le partage", + "You received {share} as a remote share from {user}" : "Vous avez reçu {share} comme partage distant de la part de {user}", "Accept" : "Accepter", "Decline" : "Refuser", "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #Nextcloud %s", diff --git a/apps/federatedfilesharing/l10n/fr.json b/apps/federatedfilesharing/l10n/fr.json index 5ca2c376c7d..3af2ca0e44d 100644 --- a/apps/federatedfilesharing/l10n/fr.json +++ b/apps/federatedfilesharing/l10n/fr.json @@ -25,6 +25,7 @@ "Not allowed to create a federated share with the same user" : "Non autorisé à créer un partage fédéré avec le même utilisateur", "File is already shared with %s" : "Le fichier est déjà partagé avec %s", "Could not find share" : "Impossible de trouver le partage", + "You received {share} as a remote share from {user}" : "Vous avez reçu {share} comme partage distant de la part de {user}", "Accept" : "Accepter", "Decline" : "Refuser", "Share with me through my #Nextcloud Federated Cloud ID, see %s" : "Partagez avec moi grâce à mon identifiant Federated Cloud #Nextcloud %s", diff --git a/apps/federatedfilesharing/l10n/it.js b/apps/federatedfilesharing/l10n/it.js index be8844bad83..02195f552e1 100644 --- a/apps/federatedfilesharing/l10n/it.js +++ b/apps/federatedfilesharing/l10n/it.js @@ -26,6 +26,7 @@ OC.L10N.register( "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s", "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente", "File is already shared with %s" : "Il file è già condiviso con %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile o che utilizzi un certificato auto-firmato.", "Could not find share" : "Impossibile trovare la condivisione", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Hai ricevuto \"%3$s\" come condivisione remota da %1$s (per conto di %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Hai ricevuto {share} come condivisione remota da {user} (per conto di {behalf})", diff --git a/apps/federatedfilesharing/l10n/it.json b/apps/federatedfilesharing/l10n/it.json index 184100e6a0a..97b821c1cbd 100644 --- a/apps/federatedfilesharing/l10n/it.json +++ b/apps/federatedfilesharing/l10n/it.json @@ -24,6 +24,7 @@ "Sharing %s failed, because this item is already shared with %s" : "Condivisione di %s non riuscita, poiché l'oggetto è già condiviso con %s", "Not allowed to create a federated share with the same user" : "Non è consentito creare una condivisione federata con lo stesso utente", "File is already shared with %s" : "Il file è già condiviso con %s", + "Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate." : "La condivisione di %s non è riuscita, impossibile trovare %s, è probabile che il server non sia al momento raggiungibile o che utilizzi un certificato auto-firmato.", "Could not find share" : "Impossibile trovare la condivisione", "You received \"%3$s\" as a remote share from %1$s (on behalf of %2$s)" : "Hai ricevuto \"%3$s\" come condivisione remota da %1$s (per conto di %2$s)", "You received {share} as a remote share from {user} (on behalf of {behalf})" : "Hai ricevuto {share} come condivisione remota da {user} (per conto di {behalf})", diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js index 98de7aa374c..ff9700456da 100644 --- a/apps/files/js/breadcrumb.js +++ b/apps/files/js/breadcrumb.js @@ -45,6 +45,7 @@ if (options.getCrumbUrl) { this.getCrumbUrl = options.getCrumbUrl; } + this._detailViews = []; }; /** * @memberof OCA.Files @@ -52,6 +53,7 @@ BreadCrumb.prototype = { $el: null, dir: null, + dirInfo: null, /** * Total width of all breadcrumbs @@ -79,6 +81,20 @@ } }, + setDirectoryInfo: function(dirInfo) { + if (dirInfo !== this.dirInfo) { + this.dirInfo = dirInfo; + this.render(); + } + }, + + /** + * @param {Backbone.View} detailView + */ + addDetailView: function(detailView) { + this._detailViews.push(detailView); + }, + /** * Returns the full URL to the given directory * @@ -122,6 +138,13 @@ } $crumb.addClass('last'); + _.each(this._detailViews, function(view) { + view.render({ + dirInfo: this.dirInfo + }); + $crumb.append(view.$el); + }, this); + // in case svg is not supported by the browser we need to execute the fallback mechanism if (!OC.Util.hasSVGSupport()) { OC.Util.replaceSVG(this.$el); diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 18534db3ee9..c53fa4f3d66 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -473,7 +473,7 @@ * Displays the details view for the given file and * selects the given tab * - * @param {string} fileName file name for which to show details + * @param {string|OCA.Files.FileInfoModel} fileName file name or FileInfoModel for which to show details * @param {string} [tabId] optional tab id to select */ showDetailsView: function(fileName, tabId) { @@ -487,7 +487,7 @@ /** * Update the details view to display the given file * - * @param {string} fileName file name from the current list + * @param {string|OCA.Files.FileInfoModel} fileName file name from the current list or a FileInfoModel object * @param {boolean} [show=true] whether to open the sidebar if it was closed */ _updateDetailsView: function(fileName, show) { @@ -518,13 +518,16 @@ OC.Apps.showAppSidebar(this._detailsView.$el); } - var $tr = this.findFileEl(fileName); - var model = this.getModelForFile($tr); + if (fileName instanceof OCA.Files.FileInfoModel) { + var model = fileName; + } else { + var $tr = this.findFileEl(fileName); + var model = this.getModelForFile($tr); + $tr.addClass('highlighted'); + } this._currentFileModel = model; - $tr.addClass('highlighted'); - this._detailsView.setFileInfo(model); this._detailsView.$el.scrollTop(0); }, @@ -1646,6 +1649,7 @@ // first entry is the root this.dirInfo = result.shift(); + this.breadcrumb.setDirectoryInfo(this.dirInfo); if (this.dirInfo.permissions) { this.setDirectoryPermissions(this.dirInfo.permissions); @@ -2021,7 +2025,7 @@ function updateInList(fileInfo) { self.updateRow(tr, fileInfo); - self._updateDetailsView(fileInfo.name, false); + self._updateDetailsView(fileInfo, false); } // TODO: too many nested blocks, move parts into functions @@ -2954,6 +2958,15 @@ if (this._detailsView) { this._detailsView.addDetailView(detailView); } + }, + + /** + * Register a view to be added to the breadcrumb view + */ + registerBreadCrumbDetailView: function(detailView) { + if (this.breadcrumb) { + this.breadcrumb.addDetailView(detailView); + } } }; diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js index b2aa75c7c15..d9455874cb0 100644 --- a/apps/files/l10n/cs_CZ.js +++ b/apps/files/l10n/cs_CZ.js @@ -124,6 +124,11 @@ OC.L10N.register( "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", "No favorites" : "Žádné oblíbené", "Files and folders you mark as favorite will show up here" : "Zde budou zobrazeny soubory a adresáře označené jako oblíbené", + "Shared with you" : "Sdíleno s vámi", + "Shared with others" : "Sdíleno s ostatními", + "Shared by link" : "Sdíleno pomocí odkazu", + "Tags" : "Značky", + "Deleted files" : "Odstraněné soubory", "Text file" : "Textový soubor", "New text file.txt" : "Nový textový soubor.txt", "Storage not available" : "Úložiště není dostupné", diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json index 6464b07777b..3763a13dd01 100644 --- a/apps/files/l10n/cs_CZ.json +++ b/apps/files/l10n/cs_CZ.json @@ -122,6 +122,11 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.", "No favorites" : "Žádné oblíbené", "Files and folders you mark as favorite will show up here" : "Zde budou zobrazeny soubory a adresáře označené jako oblíbené", + "Shared with you" : "Sdíleno s vámi", + "Shared with others" : "Sdíleno s ostatními", + "Shared by link" : "Sdíleno pomocí odkazu", + "Tags" : "Značky", + "Deleted files" : "Odstraněné soubory", "Text file" : "Textový soubor", "New text file.txt" : "Nový textový soubor.txt", "Storage not available" : "Úložiště není dostupné", diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js index 288bbb863f2..641a0f98c03 100644 --- a/apps/files/l10n/de.js +++ b/apps/files/l10n/de.js @@ -86,14 +86,14 @@ OC.L10N.register( "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf deine <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>", - "You created %1$s" : "%1$s wurde erstellt", + "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" : "%1$s wurde geändert", + "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" : "%1$s wurde gelöscht", + "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht", - "You restored %1$s" : "%1$s wurde wiederhergestellt", + "You restored %1$s" : "Du hast %1$s wiederhergestellt", "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s", "You renamed %2$s to %1$s" : "Du hast %2$s in %1$s umbenannt", "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umebenannt", @@ -102,7 +102,7 @@ OC.L10N.register( "Changed by %2$s" : "Geändert von %2$s", "Deleted by %2$s" : "Gelöscht von %2$s", "Restored by %2$s" : "Wiederhergestellt von %2$s", - "Renamed by %2$s" : "Von %2$s umbenannt", + "Renamed by %2$s" : "Umbenannt von %2$s ", "Moved by %2$s" : "Verschoben von %2$s", "File changes" : "Dateiänderungen", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json index 7fc87a3dfba..8c28265370d 100644 --- a/apps/files/l10n/de.json +++ b/apps/files/l10n/de.json @@ -84,14 +84,14 @@ "Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>" : "Benachrichtigungen über Neues und Änderungen auf deine <strong>favorisierten Dateien</strong> beschränken <em>(nur im Stream)</em>", "A file or folder has been <strong>deleted</strong>" : "Eine Datei oder ein Ordner wurde <strong>gelöscht</strong>", "A file or folder has been <strong>restored</strong>" : "Eine Datei oder ein Ordner wurde <strong>wiederhergestellt</strong>", - "You created %1$s" : "%1$s wurde erstellt", + "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" : "%1$s wurde geändert", + "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" : "%1$s wurde gelöscht", + "You deleted %1$s" : "Du hast %1$s gelöscht", "%2$s deleted %1$s" : "%2$s hat %1$s gelöscht", - "You restored %1$s" : "%1$s wurde wiederhergestellt", + "You restored %1$s" : "Du hast %1$s wiederhergestellt", "%2$s restored %1$s" : "%2$s wiederhergestellt %1$s", "You renamed %2$s to %1$s" : "Du hast %2$s in %1$s umbenannt", "%2$s renamed %3$s to %1$s" : "%2$s hat %3$s in %1$s umebenannt", @@ -100,7 +100,7 @@ "Changed by %2$s" : "Geändert von %2$s", "Deleted by %2$s" : "Gelöscht von %2$s", "Restored by %2$s" : "Wiederhergestellt von %2$s", - "Renamed by %2$s" : "Von %2$s umbenannt", + "Renamed by %2$s" : "Umbenannt von %2$s ", "Moved by %2$s" : "Verschoben von %2$s", "File changes" : "Dateiänderungen", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js index 70b57b18fc7..52022cc5013 100644 --- a/apps/files/l10n/de_DE.js +++ b/apps/files/l10n/de_DE.js @@ -102,7 +102,7 @@ OC.L10N.register( "Changed by %2$s" : "Geändert von %2$s", "Deleted by %2$s" : "Gelöscht von %2$s", "Restored by %2$s" : "Wiederhergestellt von %2$s", - "Renamed by %2$s" : "Von %2$s umbenannt", + "Renamed by %2$s" : "Umbenannt von %2$s", "Moved by %2$s" : "Verschoben von %2$s", "File changes" : "Datei geändert", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json index 9065d0265bc..a17cb51f71d 100644 --- a/apps/files/l10n/de_DE.json +++ b/apps/files/l10n/de_DE.json @@ -100,7 +100,7 @@ "Changed by %2$s" : "Geändert von %2$s", "Deleted by %2$s" : "Gelöscht von %2$s", "Restored by %2$s" : "Wiederhergestellt von %2$s", - "Renamed by %2$s" : "Von %2$s umbenannt", + "Renamed by %2$s" : "Umbenannt von %2$s", "Moved by %2$s" : "Verschoben von %2$s", "File changes" : "Datei geändert", "Upload (max. %s)" : "Hochladen (max. %s)", diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js index 9690963d85a..e9f493c869a 100644 --- a/apps/files/l10n/el.js +++ b/apps/files/l10n/el.js @@ -14,6 +14,7 @@ OC.L10N.register( "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", + "Not enough free space" : "Δεν υπάρχει αρκετός ελεύθερος χώρος.", "Uploading..." : "Μεταφόρτωση...", "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json index 61df9ea9efa..0cc22446e91 100644 --- a/apps/files/l10n/el.json +++ b/apps/files/l10n/el.json @@ -12,6 +12,7 @@ "Upload cancelled." : "Η αποστολή ακυρώθηκε.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}", + "Not enough free space" : "Δεν υπάρχει αρκετός ελεύθερος χώρος.", "Uploading..." : "Μεταφόρτωση...", "..." : "...", "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.", diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js index fd4981ac34a..6e558d462d4 100644 --- a/apps/files/l10n/fr.js +++ b/apps/files/l10n/fr.js @@ -14,6 +14,7 @@ OC.L10N.register( "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", + "Not enough free space" : "Pas assez d'espace disponible", "Uploading..." : "Téléversement en cours…", "..." : "...", "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}", @@ -29,6 +30,7 @@ OC.L10N.register( "Actions" : "Actions", "Download" : "Télécharger", "Rename" : "Renommer", + "Move" : "Déplacer", "Delete" : "Supprimer", "Disconnect storage" : "Déconnecter ce support de stockage", "Unshare" : "Ne plus partager", @@ -117,6 +119,11 @@ OC.L10N.register( "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici", + "Shared with you" : "Partagés avec vous", + "Shared with others" : "Partagés avec d'autres", + "Shared by link" : "Partagés par lien", + "Tags" : "Étiquettes", + "Deleted files" : "Fichiers supprimés", "Text file" : "Fichier texte", "New text file.txt" : "Nouveau fichier texte.txt", "Storage not available" : "Support de stockage non disponible", diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json index fd85017777e..2eb37503398 100644 --- a/apps/files/l10n/fr.json +++ b/apps/files/l10n/fr.json @@ -12,6 +12,7 @@ "Upload cancelled." : "Envoi annulé.", "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle", "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace libre insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles", + "Not enough free space" : "Pas assez d'espace disponible", "Uploading..." : "Téléversement en cours…", "..." : "...", "{hours}:{minutes}:{seconds} hour{plural_s} left" : "{hours}:{minutes}:{seconds} heure{plural_s} restante{plural_s}", @@ -27,6 +28,7 @@ "Actions" : "Actions", "Download" : "Télécharger", "Rename" : "Renommer", + "Move" : "Déplacer", "Delete" : "Supprimer", "Disconnect storage" : "Déconnecter ce support de stockage", "Unshare" : "Ne plus partager", @@ -115,6 +117,11 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Les fichiers que vous essayez d'envoyer dépassent la taille maximale d'envoi permise par ce serveur.", "No favorites" : "Aucun favori", "Files and folders you mark as favorite will show up here" : "Les fichiers et dossiers ajoutés à vos favoris apparaîtront ici", + "Shared with you" : "Partagés avec vous", + "Shared with others" : "Partagés avec d'autres", + "Shared by link" : "Partagés par lien", + "Tags" : "Étiquettes", + "Deleted files" : "Fichiers supprimés", "Text file" : "Fichier texte", "New text file.txt" : "Nouveau fichier texte.txt", "Storage not available" : "Support de stockage non disponible", diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js index 71e7f7a03ad..d0a70ff74ea 100644 --- a/apps/files/l10n/ru.js +++ b/apps/files/l10n/ru.js @@ -53,6 +53,7 @@ OC.L10N.register( "Could not create file \"{file}\" because it already exists" : "Невозможно создать файл \"{file}\" потому что уже имеется", "Could not create folder \"{dir}\" because it already exists" : "Невозможно создать папку \"{dir}\" потому что уже имеется", "Error deleting file \"{fileName}\"." : "Ошибка удаления файла \"{fileName}\".", + "No search results in other folders for '{tag}{filter}{endtag}'" : "Нет результатов поиска в других папках для '{tag}{filter}{endtag}'", "Name" : "Имя", "Size" : "Размер", "Modified" : "Изменён", @@ -122,6 +123,11 @@ OC.L10N.register( "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.", "No favorites" : "Нет избранного", "Files and folders you mark as favorite will show up here" : "Здесь появятся файлы и каталоги, отмеченные как избранные", + "Shared with you" : "Поделились с вами", + "Shared with others" : "Доступные для других", + "Shared by link" : "Доступные по ссылке", + "Tags" : "Метки", + "Deleted files" : "Удалённые файлы", "Text file" : "Текстовый файл", "New text file.txt" : "Новый текстовый документ.txt", "Storage not available" : "Хранилище недоступно", diff --git a/apps/files/l10n/ru.json b/apps/files/l10n/ru.json index 8255c59c601..bc4d3f52b6b 100644 --- a/apps/files/l10n/ru.json +++ b/apps/files/l10n/ru.json @@ -51,6 +51,7 @@ "Could not create file \"{file}\" because it already exists" : "Невозможно создать файл \"{file}\" потому что уже имеется", "Could not create folder \"{dir}\" because it already exists" : "Невозможно создать папку \"{dir}\" потому что уже имеется", "Error deleting file \"{fileName}\"." : "Ошибка удаления файла \"{fileName}\".", + "No search results in other folders for '{tag}{filter}{endtag}'" : "Нет результатов поиска в других папках для '{tag}{filter}{endtag}'", "Name" : "Имя", "Size" : "Размер", "Modified" : "Изменён", @@ -120,6 +121,11 @@ "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.", "No favorites" : "Нет избранного", "Files and folders you mark as favorite will show up here" : "Здесь появятся файлы и каталоги, отмеченные как избранные", + "Shared with you" : "Поделились с вами", + "Shared with others" : "Доступные для других", + "Shared by link" : "Доступные по ссылке", + "Tags" : "Метки", + "Deleted files" : "Удалённые файлы", "Text file" : "Текстовый файл", "New text file.txt" : "Новый текстовый документ.txt", "Storage not available" : "Хранилище недоступно", diff --git a/apps/files_external/js/statusmanager.js b/apps/files_external/js/statusmanager.js index 437e9178d24..ba553f2b6a3 100644 --- a/apps/files_external/js/statusmanager.js +++ b/apps/files_external/js/statusmanager.js @@ -104,7 +104,7 @@ OCA.External.StatusManager = { // In this case the error is because mount point use Login credentials and don't exist in the session message = t('files_external', 'Couldn\'t access. Please logout and login to activate this mount point'); } else { - message = t('files_external', 'Couldn\'t get the information from the ownCloud server: {code} {type}', { + message = t('files_external', 'Couldn\'t get the information from the remote server: {code} {type}', { code: jqxhr.status, type: error }); diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js index a6f1e34b8c6..4bfa143e031 100644 --- a/apps/files_external/l10n/cs_CZ.js +++ b/apps/files_external/l10n/cs_CZ.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Uložit", "Empty response from the server" : "Prázdná odpověď serveru", "Couldn't access. Please logout and login to activate this mount point" : "Nelze připojit. Pro aktivaci tohoto přípojného bodu se prosím odhlašte a znovu přihlašte", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nelze obdržet seznam vzdálených přípojných bodů: {type}", "There was an error with message: " : "Došlo k chybě s tímto hlášením:", "External mount error" : "Chyba vzdáleného úložiště", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Smazat", "Allow users to mount external storage" : "Povolit uživatelům připojení externího úložiště", "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}", "Access granted" : "Přístup povolen", "Global Credentials" : "Globální přihlašovací údaje", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json index f98c2a98d2c..c42f2dea71d 100644 --- a/apps/files_external/l10n/cs_CZ.json +++ b/apps/files_external/l10n/cs_CZ.json @@ -23,7 +23,6 @@ "Save" : "Uložit", "Empty response from the server" : "Prázdná odpověď serveru", "Couldn't access. Please logout and login to activate this mount point" : "Nelze připojit. Pro aktivaci tohoto přípojného bodu se prosím odhlašte a znovu přihlašte", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nelze obdržet seznam vzdálených přípojných bodů: {type}", "There was an error with message: " : "Došlo k chybě s tímto hlášením:", "External mount error" : "Chyba vzdáleného úložiště", @@ -124,6 +123,7 @@ "Delete" : "Smazat", "Allow users to mount external storage" : "Povolit uživatelům připojení externího úložiště", "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nelze obdržet informaci z ownCloud serveru: {code} {type}", "Access granted" : "Přístup povolen", "Global Credentials" : "Globální přihlašovací údaje", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js index 7415ab04c24..834c305dea3 100644 --- a/apps/files_external/l10n/de.js +++ b/apps/files_external/l10n/de.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Speichern", "Empty response from the server" : "Leere Antwort vom Server", "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte abmelden und erneut anmelden, damit von diesem Endpunkt zugegriffen werden kann.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Die gewünschten Informationen konnten nicht vom ownCloud-Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Die Liste der externen Endpunkte konnte nicht empfangen werden: {type}", "There was an error with message: " : "Es ist ein Fehler mit folgender Meldung aufgetreten:", "External mount error" : "Fehler beim Einbinden des externen Speichers", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Löschen", "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden", "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Die gewünschten Informationen konnten nicht vom ownCloud-Server gelesen werden: {code} {type}", "Access granted" : "Zugriff gewährt", "Global Credentials" : "Globale Anmeldeinformationen", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json index 2107e0869b3..5d24d3758b1 100644 --- a/apps/files_external/l10n/de.json +++ b/apps/files_external/l10n/de.json @@ -23,7 +23,6 @@ "Save" : "Speichern", "Empty response from the server" : "Leere Antwort vom Server", "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte abmelden und erneut anmelden, damit von diesem Endpunkt zugegriffen werden kann.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Die gewünschten Informationen konnten nicht vom ownCloud-Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Die Liste der externen Endpunkte konnte nicht empfangen werden: {type}", "There was an error with message: " : "Es ist ein Fehler mit folgender Meldung aufgetreten:", "External mount error" : "Fehler beim Einbinden des externen Speichers", @@ -124,6 +123,7 @@ "Delete" : "Löschen", "Allow users to mount external storage" : "Benutzern erlauben, externen Speicher einzubinden", "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Die gewünschten Informationen konnten nicht vom ownCloud-Server gelesen werden: {code} {type}", "Access granted" : "Zugriff gewährt", "Global Credentials" : "Globale Anmeldeinformationen", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js index 9cd938efa6f..23136291d4a 100644 --- a/apps/files_external/l10n/de_DE.js +++ b/apps/files_external/l10n/de_DE.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Speichern", "Empty response from the server" : "Leere Antwort vom Server erhalten", "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Löschen", "Allow users to mount external storage" : "Erlauben Sie den Benutzern externen Speicher hinzuzufügen", "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen vom entfernten Server gelesen werden: {code} {type}", "Access granted" : "Zugriff gewährt", "Global Credentials" : "Globale Anmeldeinformationen", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json index 5cac03478dc..d17651d3160 100644 --- a/apps/files_external/l10n/de_DE.json +++ b/apps/files_external/l10n/de_DE.json @@ -23,7 +23,6 @@ "Save" : "Speichern", "Empty response from the server" : "Leere Antwort vom Server erhalten", "Couldn't access. Please logout and login to activate this mount point" : "Anmeldung nicht möglich. Bitte melden Sie sich ab und wieder an, damit Sie von diesem Endpunkt zugreifen können.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen aus dem ownCloud -Server gelesen werden: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Konnte die Liste von externen Speichern nicht laden: {type}", "There was an error with message: " : "Ein Fehler ist aufgetreten:", "External mount error" : "Externer Einhängefehler", @@ -124,6 +123,7 @@ "Delete" : "Löschen", "Allow users to mount external storage" : "Erlauben Sie den Benutzern externen Speicher hinzuzufügen", "Allow users to mount the following external storage" : "Benutzern erlauben, den oder die folgenden externen Speicher einzubinden:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Es konnten keine Informationen vom entfernten Server gelesen werden: {code} {type}", "Access granted" : "Zugriff gewährt", "Global Credentials" : "Globale Anmeldeinformationen", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js index 689028634ad..c61795a53f7 100644 --- a/apps/files_external/l10n/el.js +++ b/apps/files_external/l10n/el.js @@ -23,7 +23,6 @@ OC.L10N.register( "Save" : "Αποθήκευση", "Empty response from the server" : "Κενή απάντηση από τον διακομιστή", "Couldn't access. Please logout and login to activate this mount point" : "Αδυναμία πρόσβασης. Παρακαλώ εξέλθετε και εισέλθετε ξανά ώστε να ενεργοποιήσετε το σημείο προσάρτησης", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Αδυναμία λήψης πληροφορίας από τον διακομιστή nextcloud: {code} {type}", "There was an error with message: " : "Υπήρξε σφάλμα στο μήνυμα:", "External mount error" : "Σφάλμα εξωτερικής προσάρτησης", "external-storage" : "εξωτερική-αποθήκευση", @@ -110,6 +109,7 @@ OC.L10N.register( "Delete" : "Διαγραφή", "Allow users to mount external storage" : "Να επιτρέπεται στους χρήστες η σύνδεση εξωτερικού χώρου", "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Αδυναμία λήψης πληροφορίας από τον διακομιστή nextcloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Σημείωση:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json index 082558b5d6a..d640bcb67a4 100644 --- a/apps/files_external/l10n/el.json +++ b/apps/files_external/l10n/el.json @@ -21,7 +21,6 @@ "Save" : "Αποθήκευση", "Empty response from the server" : "Κενή απάντηση από τον διακομιστή", "Couldn't access. Please logout and login to activate this mount point" : "Αδυναμία πρόσβασης. Παρακαλώ εξέλθετε και εισέλθετε ξανά ώστε να ενεργοποιήσετε το σημείο προσάρτησης", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Αδυναμία λήψης πληροφορίας από τον διακομιστή nextcloud: {code} {type}", "There was an error with message: " : "Υπήρξε σφάλμα στο μήνυμα:", "External mount error" : "Σφάλμα εξωτερικής προσάρτησης", "external-storage" : "εξωτερική-αποθήκευση", @@ -108,6 +107,7 @@ "Delete" : "Διαγραφή", "Allow users to mount external storage" : "Να επιτρέπεται στους χρήστες η σύνδεση εξωτερικού χώρου", "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Αδυναμία λήψης πληροφορίας από τον διακομιστή nextcloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Σημείωση:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.", diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js index 74dd60212e2..f357ab6eb2d 100644 --- a/apps/files_external/l10n/en_GB.js +++ b/apps/files_external/l10n/en_GB.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Save", "Empty response from the server" : "Empty response from the server", "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Couldn't get the list of external mount points: {type}", "There was an error with message: " : "There was an error with message: ", "External mount error" : "External mount error", @@ -120,6 +119,7 @@ OC.L10N.register( "Delete" : "Delete", "Allow users to mount external storage" : "Allow users to mount external storage", "Allow users to mount the following external storage" : "Allow users to mount the following external storage", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}", "Global Credentials" : "Global Credentials", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Note:</b> ", diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json index f9f12018483..7a7d7f63f37 100644 --- a/apps/files_external/l10n/en_GB.json +++ b/apps/files_external/l10n/en_GB.json @@ -23,7 +23,6 @@ "Save" : "Save", "Empty response from the server" : "Empty response from the server", "Couldn't access. Please logout and login to activate this mount point" : "Couldn't access. Please logout and login to activate this mount point", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Couldn't get the list of external mount points: {type}", "There was an error with message: " : "There was an error with message: ", "External mount error" : "External mount error", @@ -118,6 +117,7 @@ "Delete" : "Delete", "Allow users to mount external storage" : "Allow users to mount external storage", "Allow users to mount the following external storage" : "Allow users to mount the following external storage", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Couldn't get the information from the ownCloud server: {code} {type}", "Global Credentials" : "Global Credentials", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Note:</b> ", diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js index 4faf23b0e46..ab585fb62cd 100644 --- a/apps/files_external/l10n/es.js +++ b/apps/files_external/l10n/es.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Guardar", "Empty response from the server" : "Respuesta vacía desde el servidor", "Couldn't access. Please logout and login to activate this mount point" : "No se puede acceder. Por favor cierra sesión e iníciala de nuevo para activar este punto de montaje", - "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "No se puede obtener la lista de los puntos de montaje externos: {type}", "There was an error with message: " : "Hubo un error con el mensaje:", "External mount error" : "Error de montaje externo", @@ -125,6 +124,7 @@ OC.L10N.register( "Delete" : "Eliminar", "Allow users to mount external storage" : "Permitir a los usuarios montar un almacenamiento externo", "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}", "Access granted" : "Acceso permitido", "Global Credentials" : "Credenciales Globales", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json index 3f0f504b685..2900c238f1c 100644 --- a/apps/files_external/l10n/es.json +++ b/apps/files_external/l10n/es.json @@ -23,7 +23,6 @@ "Save" : "Guardar", "Empty response from the server" : "Respuesta vacía desde el servidor", "Couldn't access. Please logout and login to activate this mount point" : "No se puede acceder. Por favor cierra sesión e iníciala de nuevo para activar este punto de montaje", - "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "No se puede obtener la lista de los puntos de montaje externos: {type}", "There was an error with message: " : "Hubo un error con el mensaje:", "External mount error" : "Error de montaje externo", @@ -123,6 +122,7 @@ "Delete" : "Eliminar", "Allow users to mount external storage" : "Permitir a los usuarios montar un almacenamiento externo", "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "No se puede obtener información acerca del servidor de OwnCloud: {code} {type}", "Access granted" : "Acceso permitido", "Global Credentials" : "Credenciales Globales", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js index 6fd0f87cf05..8064fe16122 100644 --- a/apps/files_external/l10n/fi_FI.js +++ b/apps/files_external/l10n/fi_FI.js @@ -22,7 +22,6 @@ OC.L10N.register( "Save" : "Tallenna", "Empty response from the server" : "Tyhjä vastaus palvelimelta", "Couldn't access. Please logout and login to activate this mount point" : "Käyttö epäonnistui. Kirjaudu ulos ja takaisin sisään aktivoidaksesi tämän liitospisteen", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", "External mount error" : "Ulkoinen liitosvirhe", @@ -107,6 +106,7 @@ OC.L10N.register( "Delete" : "Poista", "Allow users to mount external storage" : "Salli käyttäjien liittää erillisiä tallennustiloja", "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Access granted" : "Pääsy myönnetty", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Huomio:</b> ", diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json index 3d2d63cff15..e78a8f056cd 100644 --- a/apps/files_external/l10n/fi_FI.json +++ b/apps/files_external/l10n/fi_FI.json @@ -20,7 +20,6 @@ "Save" : "Tallenna", "Empty response from the server" : "Tyhjä vastaus palvelimelta", "Couldn't access. Please logout and login to activate this mount point" : "Käyttö epäonnistui. Kirjaudu ulos ja takaisin sisään aktivoidaksesi tämän liitospisteen", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Erillisten liitospisteiden listauksen noutaminen epäonnistui: {type}", "There was an error with message: " : "Tapahtui virhe viestillä:", "External mount error" : "Ulkoinen liitosvirhe", @@ -105,6 +104,7 @@ "Delete" : "Poista", "Allow users to mount external storage" : "Salli käyttäjien liittää erillisiä tallennustiloja", "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Tietojen saaminen ownCloud-palvelimelta epäonnistui: {code} {type}", "Access granted" : "Pääsy myönnetty", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Huomio:</b> ", diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js index b3328dbc7cd..40865b75add 100644 --- a/apps/files_external/l10n/fr.js +++ b/apps/files_external/l10n/fr.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Enregistrer", "Empty response from the server" : "Réponse vide du serveur", "Couldn't access. Please logout and login to activate this mount point" : "Impossible d'accéder. Veuillez vous déconnecter et vous reconnecter pour activer ce point de montage.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur Nextcloud : {code} {type}", "Couldn't get the list of external mount points: {type}" : "Impossible de récupérer la liste des points de montage externes : {type}", "There was an error with message: " : "Il y a eu une erreur avec le message :", "External mount error" : "Erreur de point de montage externe", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Supprimer", "Allow users to mount external storage" : "Autoriser les utilisateurs à monter des espaces de stockage externes", "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur Nextcloud : {code} {type}", "Access granted" : "Accès autorisé", "Global Credentials" : "Informations d'identification globales", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json index e260de0300c..93b5d28be87 100644 --- a/apps/files_external/l10n/fr.json +++ b/apps/files_external/l10n/fr.json @@ -23,7 +23,6 @@ "Save" : "Enregistrer", "Empty response from the server" : "Réponse vide du serveur", "Couldn't access. Please logout and login to activate this mount point" : "Impossible d'accéder. Veuillez vous déconnecter et vous reconnecter pour activer ce point de montage.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur Nextcloud : {code} {type}", "Couldn't get the list of external mount points: {type}" : "Impossible de récupérer la liste des points de montage externes : {type}", "There was an error with message: " : "Il y a eu une erreur avec le message :", "External mount error" : "Erreur de point de montage externe", @@ -124,6 +123,7 @@ "Delete" : "Supprimer", "Allow users to mount external storage" : "Autoriser les utilisateurs à monter des espaces de stockage externes", "Allow users to mount the following external storage" : "Autoriser les utilisateurs à monter les stockages externes suivants", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossible d'obtenir l'information depuis le serveur Nextcloud : {code} {type}", "Access granted" : "Accès autorisé", "Global Credentials" : "Informations d'identification globales", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js index e6db55f4e39..9a677d94b8d 100644 --- a/apps/files_external/l10n/he.js +++ b/apps/files_external/l10n/he.js @@ -24,7 +24,6 @@ OC.L10N.register( "Save" : "שמירה", "Empty response from the server" : "תגובה ריקה מהשרת", "Couldn't access. Please logout and login to activate this mount point" : "לא ניתן להכנס. יש להתנתק ולהתחבר כדי להפעיל את נקודת העיגון הזו", - "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "לא ניתן היה לקבל את רשימת נקודות העיגון החיצוניות: {type}", "There was an error with message: " : "התרחשה שגיאה עם הודעה: ", "External mount error" : "שגיאת עגינה חיצונית", @@ -117,6 +116,7 @@ OC.L10N.register( "Delete" : "מחיקה", "Allow users to mount external storage" : "מאפשר למשתמשים לחבר אחסון חיצוני", "Allow users to mount the following external storage" : "מאפשר למשתמשים לחבר אחסון חיצוני הבא", + "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>הערה:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>הערה:</b> תמיכת ה- cURL ב- PHP אינה מופעלת או מותקנת. חיבור של %s אינו אפשרי. יש לבקש ממנהל המערכת להתקין אותה.", diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json index 21a72c444fe..f9014235827 100644 --- a/apps/files_external/l10n/he.json +++ b/apps/files_external/l10n/he.json @@ -22,7 +22,6 @@ "Save" : "שמירה", "Empty response from the server" : "תגובה ריקה מהשרת", "Couldn't access. Please logout and login to activate this mount point" : "לא ניתן להכנס. יש להתנתק ולהתחבר כדי להפעיל את נקודת העיגון הזו", - "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "לא ניתן היה לקבל את רשימת נקודות העיגון החיצוניות: {type}", "There was an error with message: " : "התרחשה שגיאה עם הודעה: ", "External mount error" : "שגיאת עגינה חיצונית", @@ -115,6 +114,7 @@ "Delete" : "מחיקה", "Allow users to mount external storage" : "מאפשר למשתמשים לחבר אחסון חיצוני", "Allow users to mount the following external storage" : "מאפשר למשתמשים לחבר אחסון חיצוני הבא", + "Couldn't get the information from the ownCloud server: {code} {type}" : "לא ניתן היה לקבל את המידע משרת ה- ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>הערה:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>הערה:</b> תמיכת ה- cURL ב- PHP אינה מופעלת או מותקנת. חיבור של %s אינו אפשרי. יש לבקש ממנהל המערכת להתקין אותה.", diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js index 3f63c1bdd3b..2e908d61099 100644 --- a/apps/files_external/l10n/hu_HU.js +++ b/apps/files_external/l10n/hu_HU.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Mentés", "Empty response from the server" : "Üres válasz a szervertől", "Couldn't access. Please logout and login to activate this mount point" : "Nem férhető hozzá. Kérlek próbálj meg ki- és bejelentkezni a csatolási pont aktiválásához.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nem lehet letölteni a külső csatolási pontok listáját: {type}", "There was an error with message: " : "Hiba történt ezzel az üzenettel:", "External mount error" : "Külső csatolási hiba", @@ -118,6 +117,7 @@ OC.L10N.register( "Delete" : "Törlés", "Allow users to mount external storage" : "Külső tárolók csatolásának engedélyezése a felhasználók részére", "Allow users to mount the following external storage" : "A felhasználók számára engedélyezett külső tárolók csatolása:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}", "Access granted" : "Hozzáférés biztosítva", "Global Credentials" : "Globális azonosítók", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json index 6c1511234c7..12acb22a326 100644 --- a/apps/files_external/l10n/hu_HU.json +++ b/apps/files_external/l10n/hu_HU.json @@ -23,7 +23,6 @@ "Save" : "Mentés", "Empty response from the server" : "Üres válasz a szervertől", "Couldn't access. Please logout and login to activate this mount point" : "Nem férhető hozzá. Kérlek próbálj meg ki- és bejelentkezni a csatolási pont aktiválásához.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nem lehet letölteni a külső csatolási pontok listáját: {type}", "There was an error with message: " : "Hiba történt ezzel az üzenettel:", "External mount error" : "Külső csatolási hiba", @@ -116,6 +115,7 @@ "Delete" : "Törlés", "Allow users to mount external storage" : "Külső tárolók csatolásának engedélyezése a felhasználók részére", "Allow users to mount the following external storage" : "A felhasználók számára engedélyezett külső tárolók csatolása:", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nem sikerült lekérdezni az információkat az ownCloud szerverről: {code} {type}", "Access granted" : "Hozzáférés biztosítva", "Global Credentials" : "Globális azonosítók", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js index 52258e9f41c..3798024a2b4 100644 --- a/apps/files_external/l10n/id.js +++ b/apps/files_external/l10n/id.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Simpan", "Empty response from the server" : "Tidak ada respon dari server", "Couldn't access. Please logout and login to activate this mount point" : "Tidak dapat mengakses. Log keluar dan log masuk untuk mengaktifkan mount point ini", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Tidak bisa mendapatkan informasi dari server ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Tidak bisa mendapatkan informasi dari mount point eksternal: {type}", "There was an error with message: " : "Terjadi kesalahan dengan pesan:", "External mount error" : "Kesalahan mount eksternal", @@ -120,6 +119,7 @@ OC.L10N.register( "Delete" : "Hapus", "Allow users to mount external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal", "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Tidak bisa mendapatkan informasi dari server ownCloud: {code} {type}", "Access granted" : "Akses diberikan", "Global Credentials" : "Kredensial Global", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json index bb8d647fef6..c091677c498 100644 --- a/apps/files_external/l10n/id.json +++ b/apps/files_external/l10n/id.json @@ -23,7 +23,6 @@ "Save" : "Simpan", "Empty response from the server" : "Tidak ada respon dari server", "Couldn't access. Please logout and login to activate this mount point" : "Tidak dapat mengakses. Log keluar dan log masuk untuk mengaktifkan mount point ini", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Tidak bisa mendapatkan informasi dari server ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Tidak bisa mendapatkan informasi dari mount point eksternal: {type}", "There was an error with message: " : "Terjadi kesalahan dengan pesan:", "External mount error" : "Kesalahan mount eksternal", @@ -118,6 +117,7 @@ "Delete" : "Hapus", "Allow users to mount external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal", "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Tidak bisa mendapatkan informasi dari server ownCloud: {code} {type}", "Access granted" : "Akses diberikan", "Global Credentials" : "Kredensial Global", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js index 406756a593f..2f69656a373 100644 --- a/apps/files_external/l10n/is.js +++ b/apps/files_external/l10n/is.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Vista", "Empty response from the server" : "Tómt svar frá þjóni móttekið", "Couldn't access. Please logout and login to activate this mount point" : "Náði ekki aðgangi. Skráðu þig út og svo aftur inn til að virkja þennan tengipunkt", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Gat ekki fengið lista yfir fjartengda tengipunkta: {type}", "There was an error with message: " : "Það kom upp villa með skilaboðunum: ", "External mount error" : "Villa við tengingu í fjartengdu skráakerfi", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Eyða", "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi", "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}", "Access granted" : "Aðgangur heimilaður", "Global Credentials" : "Víðvær innskráningarauðkenni", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json index 242228ba09a..b83e47d210a 100644 --- a/apps/files_external/l10n/is.json +++ b/apps/files_external/l10n/is.json @@ -23,7 +23,6 @@ "Save" : "Vista", "Empty response from the server" : "Tómt svar frá þjóni móttekið", "Couldn't access. Please logout and login to activate this mount point" : "Náði ekki aðgangi. Skráðu þig út og svo aftur inn til að virkja þennan tengipunkt", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Gat ekki fengið lista yfir fjartengda tengipunkta: {type}", "There was an error with message: " : "Það kom upp villa með skilaboðunum: ", "External mount error" : "Villa við tengingu í fjartengdu skráakerfi", @@ -124,6 +123,7 @@ "Delete" : "Eyða", "Allow users to mount external storage" : "Leyfa notendum að tengja ytri gagnageymslur í skráakerfi", "Allow users to mount the following external storage" : "Leyfa notendum að tengja eftirfarandi ytri gagnageymslu í skráakerfi", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Gat ekki lesið upplýsingar frá ownCloud-þjóninum: {code} {type}", "Access granted" : "Aðgangur heimilaður", "Global Credentials" : "Víðvær innskráningarauðkenni", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js index f3e8043a259..3dcee1e5dd8 100644 --- a/apps/files_external/l10n/it.js +++ b/apps/files_external/l10n/it.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Salva", "Empty response from the server" : "Risposta vuota dal server", "Couldn't access. Please logout and login to activate this mount point" : "Impossibile accedere. Chiudi la sessione e accedi nuovamente per attivare questo punto di mount", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Impossibile ottenere l'elenco dei punti di mount esterni: {type}", "There was an error with message: " : "Si è verificato un errore con il messaggio:", "External mount error" : "Errore di mount esterno", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Elimina", "Allow users to mount external storage" : "Consenti agli utenti di montare archiviazioni esterne", "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente archiviazione esterna", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}", "Access granted" : "Accesso accordato", "Global Credentials" : "Credenziali globali", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json index 5338289f6fa..5ebceca6af6 100644 --- a/apps/files_external/l10n/it.json +++ b/apps/files_external/l10n/it.json @@ -23,7 +23,6 @@ "Save" : "Salva", "Empty response from the server" : "Risposta vuota dal server", "Couldn't access. Please logout and login to activate this mount point" : "Impossibile accedere. Chiudi la sessione e accedi nuovamente per attivare questo punto di mount", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Impossibile ottenere l'elenco dei punti di mount esterni: {type}", "There was an error with message: " : "Si è verificato un errore con il messaggio:", "External mount error" : "Errore di mount esterno", @@ -124,6 +123,7 @@ "Delete" : "Elimina", "Allow users to mount external storage" : "Consenti agli utenti di montare archiviazioni esterne", "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente archiviazione esterna", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Impossibile ottenere le informazioni dal server ownCloud: {code} {type}", "Access granted" : "Accesso accordato", "Global Credentials" : "Credenziali globali", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js index f179b603166..882364dcf1f 100644 --- a/apps/files_external/l10n/ja.js +++ b/apps/files_external/l10n/ja.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "保存", "Empty response from the server" : "サーバーから空の応答がありました", "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}", "Couldn't get the list of external mount points: {type}" : "外部マウントポイントのリストを取得出来ませんでした。: {type}", "There was an error with message: " : "メッセージ付きのエラーが発生しました：", "External mount error" : "外部マウントエラー", @@ -120,6 +119,7 @@ OC.L10N.register( "Delete" : "削除", "Allow users to mount external storage" : "ユーザーに外部ストレージの接続を許可する", "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}", "Global Credentials" : "グローバル認証情報", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>注意:</b> ", diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json index 98d64982b50..e9f1ae142f4 100644 --- a/apps/files_external/l10n/ja.json +++ b/apps/files_external/l10n/ja.json @@ -23,7 +23,6 @@ "Save" : "保存", "Empty response from the server" : "サーバーから空の応答がありました", "Couldn't access. Please logout and login to activate this mount point" : "アクセス出来ませんでした｡このマウントポイントを有効にするには一度ログアウトしてからログインしてください。", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}", "Couldn't get the list of external mount points: {type}" : "外部マウントポイントのリストを取得出来ませんでした。: {type}", "There was an error with message: " : "メッセージ付きのエラーが発生しました：", "External mount error" : "外部マウントエラー", @@ -118,6 +117,7 @@ "Delete" : "削除", "Allow users to mount external storage" : "ユーザーに外部ストレージの接続を許可する", "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud サーバーから情報を取得出来ませんでした。: {code} {type}", "Global Credentials" : "グローバル認証情報", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>注意:</b> ", diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js index 281eaaed27f..31dea1ea3cd 100644 --- a/apps/files_external/l10n/ko.js +++ b/apps/files_external/l10n/ko.js @@ -23,7 +23,6 @@ OC.L10N.register( "Save" : "저장", "Empty response from the server" : "서버에서 빈 응답이 돌아옴", "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", "Couldn't get the list of external mount points: {type}" : "외부 마운트 지점 목록을 가져올 수 없음: {type}", "There was an error with message: " : "오류 메시지: ", "External mount error" : "외부 마운트 오류", @@ -121,6 +120,7 @@ OC.L10N.register( "Delete" : "삭제", "Allow users to mount external storage" : "사용자가 외부 저장소를 마운트하도록 허용", "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", "Access granted" : "접근 부여", "Global Credentials" : "글로벌 자격 증명", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json index f1476453cca..c9e9be6e6cc 100644 --- a/apps/files_external/l10n/ko.json +++ b/apps/files_external/l10n/ko.json @@ -21,7 +21,6 @@ "Save" : "저장", "Empty response from the server" : "서버에서 빈 응답이 돌아옴", "Couldn't access. Please logout and login to activate this mount point" : "접근할 수 없습니다. 이 마운트 지점을 활성화하려면 로그아웃 후 로그인하십시오", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", "Couldn't get the list of external mount points: {type}" : "외부 마운트 지점 목록을 가져올 수 없음: {type}", "There was an error with message: " : "오류 메시지: ", "External mount error" : "외부 마운트 오류", @@ -119,6 +118,7 @@ "Delete" : "삭제", "Allow users to mount external storage" : "사용자가 외부 저장소를 마운트하도록 허용", "Allow users to mount the following external storage" : "사용자가 다음 외부 저장소를 마운트할 수 있도록 허용", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud 서버에서 정보를 가져올 수 없음: {code} {type}", "Access granted" : "접근 부여", "Global Credentials" : "글로벌 자격 증명", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js index f8bc34da266..0845186781d 100644 --- a/apps/files_external/l10n/nb_NO.js +++ b/apps/files_external/l10n/nb_NO.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Lagre", "Empty response from the server" : "Tomt svar fra tjeneren", "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra Nextcloud tjeneren: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Klarte ikke å hente listen over eksterne oppkoblingspunkter: {type}", "There was an error with message: " : "Det oppstod en feil med melding: ", "External mount error" : "Ekstern oppkoblingsfeil", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Slett", "Allow users to mount external storage" : "Tillat at brukere kobler opp eksterne lagre", "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra Nextcloud tjeneren: {code} {type}", "Access granted" : "Tilgang gitt", "Global Credentials" : "Globale pålogginsdetaljer", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json index 2067f056f18..01bf2eecf09 100644 --- a/apps/files_external/l10n/nb_NO.json +++ b/apps/files_external/l10n/nb_NO.json @@ -23,7 +23,6 @@ "Save" : "Lagre", "Empty response from the server" : "Tomt svar fra tjeneren", "Couldn't access. Please logout and login to activate this mount point" : "Fikk ikke tilgang. Vennligst logg ut og inn igjen for å aktivere dette oppkoblingspunktet.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra Nextcloud tjeneren: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Klarte ikke å hente listen over eksterne oppkoblingspunkter: {type}", "There was an error with message: " : "Det oppstod en feil med melding: ", "External mount error" : "Ekstern oppkoblingsfeil", @@ -124,6 +123,7 @@ "Delete" : "Slett", "Allow users to mount external storage" : "Tillat at brukere kobler opp eksterne lagre", "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Klarte ikke å hente informasjon fra Nextcloud tjeneren: {code} {type}", "Access granted" : "Tilgang gitt", "Global Credentials" : "Globale pålogginsdetaljer", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js index 3e30a77e1a2..767ef9e97c3 100644 --- a/apps/files_external/l10n/nl.js +++ b/apps/files_external/l10n/nl.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Bewaren", "Empty response from the server" : "Lege reactie van de server", "Couldn't access. Please logout and login to activate this mount point" : "Geen toegang. Log uit en opnieuw in om dit koppelpunt te activeren", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Kon geen overzicht met externe koppelpunten krijgen: {type}", "There was an error with message: " : "Er was een fout met de volgende melding:", "External mount error" : "Extern koppelpunt fout", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Verwijder", "Allow users to mount external storage" : "Sta gebruikers toe om een externe opslag aan te koppelen", "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}", "Access granted" : "Toegang verleend", "Global Credentials" : "Algemene inloggegevens", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json index 4938c4ac3fe..a12f3208aa1 100644 --- a/apps/files_external/l10n/nl.json +++ b/apps/files_external/l10n/nl.json @@ -23,7 +23,6 @@ "Save" : "Bewaren", "Empty response from the server" : "Lege reactie van de server", "Couldn't access. Please logout and login to activate this mount point" : "Geen toegang. Log uit en opnieuw in om dit koppelpunt te activeren", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Kon geen overzicht met externe koppelpunten krijgen: {type}", "There was an error with message: " : "Er was een fout met de volgende melding:", "External mount error" : "Extern koppelpunt fout", @@ -124,6 +123,7 @@ "Delete" : "Verwijder", "Allow users to mount external storage" : "Sta gebruikers toe om een externe opslag aan te koppelen", "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Kon geen informatie van de ownCloud server krijgen: {code} {type}", "Access granted" : "Toegang verleend", "Global Credentials" : "Algemene inloggegevens", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js index ffe7219ce7e..c9d85abf869 100644 --- a/apps/files_external/l10n/pl.js +++ b/apps/files_external/l10n/pl.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Zapisz", "Empty response from the server" : "Puste odpowiedzi z serwera", "Couldn't access. Please logout and login to activate this mount point" : "Nie można uzyskać dostępu. Należy wylogować się i ponownie zalogować się, aby włączyć ten punkt montowania", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nie udało się uzyskać informacje z serwera ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nie udało się uzyskać listy zewnętrznych punktów montowania: {type}", "There was an error with message: " : "Wystąpił błąd o treści:", "External mount error" : "Błąd przy montowaniu zewnętrznym", @@ -112,6 +111,7 @@ OC.L10N.register( "Delete" : "Usuń", "Allow users to mount external storage" : "Pozwól użytkownikom montować zewnętrzne zasoby dyskowe", "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nie udało się uzyskać informacje z serwera ownCloud: {code} {type}", "Access granted" : "Dostęp uzyskany", "Global Credentials" : "Globalne Poświadczenia", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json index 156332cdee6..8ff63cfb5a4 100644 --- a/apps/files_external/l10n/pl.json +++ b/apps/files_external/l10n/pl.json @@ -23,7 +23,6 @@ "Save" : "Zapisz", "Empty response from the server" : "Puste odpowiedzi z serwera", "Couldn't access. Please logout and login to activate this mount point" : "Nie można uzyskać dostępu. Należy wylogować się i ponownie zalogować się, aby włączyć ten punkt montowania", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Nie udało się uzyskać informacje z serwera ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Nie udało się uzyskać listy zewnętrznych punktów montowania: {type}", "There was an error with message: " : "Wystąpił błąd o treści:", "External mount error" : "Błąd przy montowaniu zewnętrznym", @@ -110,6 +109,7 @@ "Delete" : "Usuń", "Allow users to mount external storage" : "Pozwól użytkownikom montować zewnętrzne zasoby dyskowe", "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Nie udało się uzyskać informacje z serwera ownCloud: {code} {type}", "Access granted" : "Dostęp uzyskany", "Global Credentials" : "Globalne Poświadczenia", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js index 57a9442833d..3d257d7976e 100644 --- a/apps/files_external/l10n/pt_BR.js +++ b/apps/files_external/l10n/pt_BR.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Salvar", "Empty response from the server" : "Resposta vazia a partir do servidor", "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível acessar. Por favor, desconectar e conectar novamente para ativar este ponto de montagem", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Não foi possível obter a lista de pontos de montagem externos: {type}", "There was an error with message: " : "Houve um erro com a mensagem:", "External mount error" : "Erro de montagem externa", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Excluir", "Allow users to mount external storage" : "Permitir que usuários montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}", "Access granted" : "Acesso concedido", "Global Credentials" : "Credenciais Globais", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json index 2135ffc9a68..eaf017b86d1 100644 --- a/apps/files_external/l10n/pt_BR.json +++ b/apps/files_external/l10n/pt_BR.json @@ -23,7 +23,6 @@ "Save" : "Salvar", "Empty response from the server" : "Resposta vazia a partir do servidor", "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível acessar. Por favor, desconectar e conectar novamente para ativar este ponto de montagem", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Não foi possível obter a lista de pontos de montagem externos: {type}", "There was an error with message: " : "Houve um erro com a mensagem:", "External mount error" : "Erro de montagem externa", @@ -124,6 +123,7 @@ "Delete" : "Excluir", "Allow users to mount external storage" : "Permitir que usuários montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível obter as informações do servidor ownCloud: {code} {type}", "Access granted" : "Acesso concedido", "Global Credentials" : "Credenciais Globais", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js index c8028e45b4e..94b1f54d159 100644 --- a/apps/files_external/l10n/pt_PT.js +++ b/apps/files_external/l10n/pt_PT.js @@ -24,7 +24,6 @@ OC.L10N.register( "Save" : "Guardar", "Empty response from the server" : "Resposta vazia a partir do servidor", "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}", "There was an error with message: " : "Houve um erro com a mensagem:", "External mount error" : "Erro de montagem externa", @@ -117,6 +116,7 @@ OC.L10N.register( "Delete" : "Apagar", "Allow users to mount external storage" : "Permitir que os utilizadores montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Nota:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.", diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json index abf7597596a..2ee7375e851 100644 --- a/apps/files_external/l10n/pt_PT.json +++ b/apps/files_external/l10n/pt_PT.json @@ -22,7 +22,6 @@ "Save" : "Guardar", "Empty response from the server" : "Resposta vazia a partir do servidor", "Couldn't access. Please logout and login to activate this mount point" : "Não foi possível aceder. Por favor, faça logout e login para ativar este ponto de montagem", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Não foi possível conseguir a lista de pontos de montagem externos: {type}", "There was an error with message: " : "Houve um erro com a mensagem:", "External mount error" : "Erro de montagem externa", @@ -115,6 +114,7 @@ "Delete" : "Apagar", "Allow users to mount external storage" : "Permitir que os utilizadores montem armazenamento externo", "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Não foi possível recolher a informação do servidor ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Nota:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.", diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js index 07a8b104d06..0192a5b1a6e 100644 --- a/apps/files_external/l10n/ru.js +++ b/apps/files_external/l10n/ru.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Сохранить", "Empty response from the server" : "Пустой ответ от сервера", "Couldn't access. Please logout and login to activate this mount point" : "Не удалось получить доступ. Пожалуйста, выйти и войдите чтобы активировать эту точку монтирования", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера Nextcloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Не удалось получить список внешних точек монтирования: {type}", "There was an error with message: " : "Обнаружена ошибка с сообщением:", "External mount error" : "Ошибка внешнего монтирования", @@ -126,6 +125,7 @@ OC.L10N.register( "Delete" : "Удалить", "Allow users to mount external storage" : "Разрешить пользователями монтировать внешние накопители", "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера Nextcloud: {code} {type}", "Access granted" : "Доступ предоставлен", "Global Credentials" : "Глобальные Учетные данные", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/ru.json b/apps/files_external/l10n/ru.json index 006e7a121ad..ac4235688c7 100644 --- a/apps/files_external/l10n/ru.json +++ b/apps/files_external/l10n/ru.json @@ -23,7 +23,6 @@ "Save" : "Сохранить", "Empty response from the server" : "Пустой ответ от сервера", "Couldn't access. Please logout and login to activate this mount point" : "Не удалось получить доступ. Пожалуйста, выйти и войдите чтобы активировать эту точку монтирования", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера Nextcloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Не удалось получить список внешних точек монтирования: {type}", "There was an error with message: " : "Обнаружена ошибка с сообщением:", "External mount error" : "Ошибка внешнего монтирования", @@ -124,6 +123,7 @@ "Delete" : "Удалить", "Allow users to mount external storage" : "Разрешить пользователями монтировать внешние накопители", "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующие сервисы хранения данных", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Не удалось получить информацию от сервера Nextcloud: {code} {type}", "Access granted" : "Доступ предоставлен", "Global Credentials" : "Глобальные Учетные данные", "ownCloud" : "ownCloud", diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js index 451ac170691..b6d0c1e32bc 100644 --- a/apps/files_external/l10n/sl.js +++ b/apps/files_external/l10n/sl.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Shrani", "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.", "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Couldn't get the list of external mount points: {type}" : "Ni mogoče pridobiti seznama zunanjih priklopnih točk: {type}", "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", @@ -120,6 +119,7 @@ OC.L10N.register( "Delete" : "Izbriši", "Allow users to mount external storage" : "Dovoli uporabnikom priklapljanje zunanje shrambe", "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb.", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Global Credentials" : "Globalne poverilnice", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Opomba:</b> ", diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json index b6f87c62ec5..a0a0a8b2be0 100644 --- a/apps/files_external/l10n/sl.json +++ b/apps/files_external/l10n/sl.json @@ -23,7 +23,6 @@ "Save" : "Shrani", "Empty response from the server" : "S strežnika je prejet odziv brez vsebine.", "Couldn't access. Please logout and login to activate this mount point" : "Dostop ni mogoč. Za priklop točke se odjavite in ponovno prijavite.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Couldn't get the list of external mount points: {type}" : "Ni mogoče pridobiti seznama zunanjih priklopnih točk: {type}", "There was an error with message: " : "Prišlo je do napake s sporočilom:", "External mount error" : "Notranja napaka priklopa", @@ -118,6 +117,7 @@ "Delete" : "Izbriši", "Allow users to mount external storage" : "Dovoli uporabnikom priklapljanje zunanje shrambe", "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb.", + "Couldn't get the information from the ownCloud server: {code} {type}" : "Ni mogoče pridobiti podrobnosti s strežnika ownCloud:{koda} {vrsta}", "Global Credentials" : "Globalne poverilnice", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Opomba:</b> ", diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js index 6d325bcbde2..0bc3e4b9c95 100644 --- a/apps/files_external/l10n/sq.js +++ b/apps/files_external/l10n/sq.js @@ -24,7 +24,6 @@ OC.L10N.register( "Save" : "Ruaje", "Empty response from the server" : "Përgjigje e zbrazët prej shërbyesit", "Couldn't access. Please logout and login to activate this mount point" : "S’fut dot. Ju lutemi, dilni dhe hyni që të aktivizohet kjo pikë montimi", - "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "S’u mor dot lista e pikave të jashtme të montimit: {type}", "There was an error with message: " : "Pati një gabim me këtë mesazh:", "External mount error" : "Gabim i jashtëm montimi", @@ -117,6 +116,7 @@ OC.L10N.register( "Delete" : "Fshije", "Allow users to mount external storage" : "Lejoju përdoruesve të montojnë depozita të jashtme", "Allow users to mount the following external storage" : "Lejoju përdoruesve të montojnë depozitën e jashtme vijuese", + "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Shënim:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Shënim:</b> S’është aktivizuar ose instaluar mbulimi i cURL-ve në PHP. Montimi i %s s’është i mundur. Ju lutemi, kërkojini përgjegjësit të sistemit tuaj ta instalojë.", diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json index c14d9fe4a5c..b572d9826bb 100644 --- a/apps/files_external/l10n/sq.json +++ b/apps/files_external/l10n/sq.json @@ -22,7 +22,6 @@ "Save" : "Ruaje", "Empty response from the server" : "Përgjigje e zbrazët prej shërbyesit", "Couldn't access. Please logout and login to activate this mount point" : "S’fut dot. Ju lutemi, dilni dhe hyni që të aktivizohet kjo pikë montimi", - "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "S’u mor dot lista e pikave të jashtme të montimit: {type}", "There was an error with message: " : "Pati një gabim me këtë mesazh:", "External mount error" : "Gabim i jashtëm montimi", @@ -115,6 +114,7 @@ "Delete" : "Fshije", "Allow users to mount external storage" : "Lejoju përdoruesve të montojnë depozita të jashtme", "Allow users to mount the following external storage" : "Lejoju përdoruesve të montojnë depozitën e jashtme vijuese", + "Couldn't get the information from the ownCloud server: {code} {type}" : "S’u morën dot të dhëna nga shërbyesi ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Shënim:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Shënim:</b> S’është aktivizuar ose instaluar mbulimi i cURL-ve në PHP. Montimi i %s s’është i mundur. Ju lutemi, kërkojini përgjegjësit të sistemit tuaj ta instalojë.", diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js index b0abd276687..f0ddf33ba6c 100644 --- a/apps/files_external/l10n/th_TH.js +++ b/apps/files_external/l10n/th_TH.js @@ -21,7 +21,6 @@ OC.L10N.register( "Save" : "บันทึก", "Empty response from the server" : "ไม่มีการตอบสนองจากเซิร์ฟเวอร์", "Couldn't access. Please logout and login to activate this mount point" : "ไม่สามารถเข้าถึง กรุณออกจากระบบและาเข้าสู่ระบบใหม่เพื่อเปิดใช้งานจุดเชื่อมต่อนี้", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "ไม่สามารถรับรายชื่อของจุดเชื่อมต่อภายนอก: {type}", "There was an error with message: " : "มีข้อความแสดงข้อผิดพลาด", "External mount error" : "การติดจากตั้งภายนอกเกิดข้อผิดพลาด", @@ -114,6 +113,7 @@ OC.L10N.register( "Delete" : "ลบ", "Allow users to mount external storage" : "อนุญาตให้ผู้ใช้ติดตั้งการจัดเก็บข้อมูลภายนอก", "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>หมายเหตุ:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน", diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json index 26c7b598517..44ec19a5844 100644 --- a/apps/files_external/l10n/th_TH.json +++ b/apps/files_external/l10n/th_TH.json @@ -19,7 +19,6 @@ "Save" : "บันทึก", "Empty response from the server" : "ไม่มีการตอบสนองจากเซิร์ฟเวอร์", "Couldn't access. Please logout and login to activate this mount point" : "ไม่สามารถเข้าถึง กรุณออกจากระบบและาเข้าสู่ระบบใหม่เพื่อเปิดใช้งานจุดเชื่อมต่อนี้", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}", "Couldn't get the list of external mount points: {type}" : "ไม่สามารถรับรายชื่อของจุดเชื่อมต่อภายนอก: {type}", "There was an error with message: " : "มีข้อความแสดงข้อผิดพลาด", "External mount error" : "การติดจากตั้งภายนอกเกิดข้อผิดพลาด", @@ -112,6 +111,7 @@ "Delete" : "ลบ", "Allow users to mount external storage" : "อนุญาตให้ผู้ใช้ติดตั้งการจัดเก็บข้อมูลภายนอก", "Allow users to mount the following external storage" : "อนุญาตให้ผู้ใช้ติดตั้งจัดเก็บข้อมูลภายนอกต่อไปนี้", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ไม่สามารถรับข้อมูลจากเซิร์ฟเวอร์ ownCloud: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>หมายเหตุ:</b>", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>หมายเหตุ:</b> การสนับสนุน cURL ใน PHP ไม่ได้เปิดใช้งานหรือติดตั้ง %s เป็นไปไม่ได้ กรุณาขอให้ผู้ดูแลระบบของคุณติดตั้งมัน", diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js index 7802c77126b..dd325f6052e 100644 --- a/apps/files_external/l10n/tr.js +++ b/apps/files_external/l10n/tr.js @@ -25,7 +25,6 @@ OC.L10N.register( "Save" : "Kaydet", "Empty response from the server" : "Sunucudan boş yanıt", "Couldn't access. Please logout and login to activate this mount point" : "Erişilemedi. Lütfen bu bağlama noktasını etkinleştirmek için tekrar oturumu kapatıp açın.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}", "There was an error with message: " : "Şu mesajla bir hata oluştu:", "External mount error" : "Harici bağlama hatası", @@ -120,6 +119,7 @@ OC.L10N.register( "Delete" : "Sil", "Allow users to mount external storage" : "Kullanıcılara harici depolama bağlamalarına izin ver", "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}", "Global Credentials" : "Genel Kimlik Bilgileri", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Not:</b> ", diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json index 96857972105..a3b39387fdf 100644 --- a/apps/files_external/l10n/tr.json +++ b/apps/files_external/l10n/tr.json @@ -23,7 +23,6 @@ "Save" : "Kaydet", "Empty response from the server" : "Sunucudan boş yanıt", "Couldn't access. Please logout and login to activate this mount point" : "Erişilemedi. Lütfen bu bağlama noktasını etkinleştirmek için tekrar oturumu kapatıp açın.", - "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}", "Couldn't get the list of external mount points: {type}" : "Harici bağlama noktalarının listesi alınamadı: {type}", "There was an error with message: " : "Şu mesajla bir hata oluştu:", "External mount error" : "Harici bağlama hatası", @@ -118,6 +117,7 @@ "Delete" : "Sil", "Allow users to mount external storage" : "Kullanıcılara harici depolama bağlamalarına izin ver", "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver", + "Couldn't get the information from the ownCloud server: {code} {type}" : "ownCloud sunucusundan bilgi alınamadı: {code} {type}", "Global Credentials" : "Genel Kimlik Bilgileri", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>Not:</b> ", diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js index 3594ab6bd20..c769b651d87 100644 --- a/apps/files_external/l10n/zh_TW.js +++ b/apps/files_external/l10n/zh_TW.js @@ -19,7 +19,6 @@ OC.L10N.register( "Saved" : "已儲存", "Save" : "儲存", "Couldn't access. Please logout and login to activate this mount point" : "無法存取。請重新登出再登入啟動此掛載點。", - "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}", "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}", "External mount error" : "外部掛載錯誤", "Username" : "使用者名稱", @@ -96,6 +95,7 @@ OC.L10N.register( "Delete" : "刪除", "Allow users to mount external storage" : "允許使用者能自行掛載外部儲存", "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存", + "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>警告:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。", diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json index 49b87c50d3e..c23295d157c 100644 --- a/apps/files_external/l10n/zh_TW.json +++ b/apps/files_external/l10n/zh_TW.json @@ -17,7 +17,6 @@ "Saved" : "已儲存", "Save" : "儲存", "Couldn't access. Please logout and login to activate this mount point" : "無法存取。請重新登出再登入啟動此掛載點。", - "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}", "Couldn't get the list of external mount points: {type}" : "無法得到外部掛載點的列表: {type}", "External mount error" : "外部掛載錯誤", "Username" : "使用者名稱", @@ -94,6 +93,7 @@ "Delete" : "刪除", "Allow users to mount external storage" : "允許使用者能自行掛載外部儲存", "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存", + "Couldn't get the information from the ownCloud server: {code} {type}" : "無法從ownCloud伺服器得到資訊: {code} {type}", "ownCloud" : "ownCloud", "<b>Note:</b> " : "<b>警告:</b> ", "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。", diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php index 7da295afddd..850c2c05977 100644 --- a/apps/files_sharing/appinfo/app.php +++ b/apps/files_sharing/appinfo/app.php @@ -42,7 +42,9 @@ $eventDispatcher->addListener( function() { \OCP\Util::addScript('files_sharing', 'share'); \OCP\Util::addScript('files_sharing', 'sharetabview'); + \OCP\Util::addScript('files_sharing', 'sharebreadcrumbview'); \OCP\Util::addStyle('files_sharing', 'sharetabview'); + \OCP\Util::addStyle('files_sharing', 'sharebreadcrumb'); } ); diff --git a/apps/files_sharing/css/sharebreadcrumb.css b/apps/files_sharing/css/sharebreadcrumb.css new file mode 100644 index 00000000000..792c8a31b7c --- /dev/null +++ b/apps/files_sharing/css/sharebreadcrumb.css @@ -0,0 +1,34 @@ +/** + * @copyright 2016 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author 2016 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +div.crumb span.icon-share, +div.crumb span.icon-public { + display: inline-block; + cursor: pointer; + opacity: 0.2; + margin-right: 6px; +} + +div.crumb span.icon-share.shared, +div.crumb span.icon-public.shared { + opacity: 0.7; +} diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index 5dd75c94fdb..073cc77e5aa 100644 --- a/apps/files_sharing/js/share.js +++ b/apps/files_sharing/js/share.js @@ -36,19 +36,7 @@ var oldCreateRow = fileList._createRow; fileList._createRow = function(fileData) { var tr = oldCreateRow.apply(this, arguments); - var sharePermissions = fileData.permissions; - if (fileData.mountType && fileData.mountType === "external-root"){ - // for external storages we can't use the permissions of the mountpoint - // instead we show all permissions and only use the share permissions from the mountpoint to handle resharing - sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE); - } - if (fileData.type === 'file') { - // files can't be shared with delete permissions - sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE; - - // create permissions don't mean anything for files - sharePermissions = sharePermissions & ~OC.PERMISSION_CREATE; - } + var sharePermissions = OCA.Sharing.Util.getSharePermissions(fileData); tr.attr('data-share-permissions', sharePermissions); if (fileData.shareOwner) { tr.attr('data-share-owner', fileData.shareOwner); @@ -71,6 +59,12 @@ var fileInfo = oldElementToFile.apply(this, arguments); fileInfo.sharePermissions = $el.attr('data-share-permissions') || undefined; fileInfo.shareOwner = $el.attr('data-share-owner') || undefined; + + if( $el.attr('data-share-types')){ + var shareTypes = $el.attr('data-share-types').split(','); + fileInfo.shareTypes = shareTypes; + } + return fileInfo; }; @@ -179,6 +173,9 @@ } }); fileList.registerTabView(shareTab); + + var breadCrumbSharingDetailView = new OCA.Sharing.ShareBreadCrumbView({shareTab: shareTab}); + fileList.registerBreadCrumbDetailView(breadCrumbSharingDetailView); }, /** @@ -242,9 +239,29 @@ text += ', +' + (count - maxRecipients); } return text; + }, + + /** + * @param {Array} fileData + * @returns {String} + */ + getSharePermissions: function(fileData) { + var sharePermissions = fileData.permissions; + if (fileData.mountType && fileData.mountType === "external-root"){ + // for external storages we can't use the permissions of the mountpoint + // instead we show all permissions and only use the share permissions from the mountpoint to handle resharing + sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE); + } + if (fileData.type === 'file') { + // files can't be shared with delete permissions + sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE; + + // create permissions don't mean anything for files + sharePermissions = sharePermissions & ~OC.PERMISSION_CREATE; + } + return sharePermissions; } }; })(); OC.Plugins.register('OCA.Files.FileList', OCA.Sharing.Util); - diff --git a/apps/files_sharing/js/sharebreadcrumbview.js b/apps/files_sharing/js/sharebreadcrumbview.js new file mode 100644 index 00000000000..36bbddfaec4 --- /dev/null +++ b/apps/files_sharing/js/sharebreadcrumbview.js @@ -0,0 +1,103 @@ +/* global Handlebars, OC */ + +/** + * @copyright 2016 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @author 2016 Christoph Wurst <christoph@winzerhof-wurst.at> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +(function() { + 'use strict'; + + var BreadCrumbView = OC.Backbone.View.extend({ + tagName: 'span', + events: { + click: '_onClick' + }, + _dirInfo: undefined, + + /** @type OCA.Sharing.ShareTabView */ + _shareTab: undefined, + + initialize: function(options) { + this._shareTab = options.shareTab; + }, + + render: function(data) { + this._dirInfo = data.dirInfo || null; + + if (this._dirInfo !== null && (this._dirInfo.path !== '/' || this._dirInfo.name !== '')) { + var isShared = data.dirInfo && data.dirInfo.shareTypes && data.dirInfo.shareTypes.length > 0; + this.$el.removeClass('shared icon-public icon-share'); + if (isShared) { + this.$el.addClass('shared'); + if (data.dirInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_LINK) !== -1) { + this.$el.addClass('icon-public'); + } else { + this.$el.addClass('icon-share'); + } + } else { + this.$el.addClass('icon-share'); + } + this.$el.show(); + this.delegateEvents(); + } else { + this.$el.removeClass('shared icon-public icon-share'); + this.$el.hide(); + } + + return this; + }, + _onClick: function(e) { + e.preventDefault(); + + var fileInfoModel = new OCA.Files.FileInfoModel(this._dirInfo); + var self = this; + fileInfoModel.on('change', function() { + self.render({ + dirInfo: self._dirInfo + }); + }); + this._shareTab.on('sharesChanged', function(shareModel) { + var shareTypes = []; + var shares = shareModel.getSharesWithCurrentItem(); + + for(var i = 0; i < shares.length; i++) { + if (shareTypes.indexOf(shares[i].share_type) === -1) { + shareTypes.push(shares[i].share_type); + } + } + + if (shareModel.hasLinkShare()) { + shareTypes.push(OC.Share.SHARE_TYPE_LINK); + } + + // Since the dirInfo isn't updated we need to do this dark hackery + self._dirInfo.shareTypes = shareTypes; + + self.render({ + dirInfo: self._dirInfo + }); + }); + OCA.Files.App.fileList.showDetailsView(fileInfoModel, 'shareTabView'); + } + }); + + OCA.Sharing.ShareBreadCrumbView = BreadCrumbView; +})(); diff --git a/apps/files_sharing/js/sharetabview.js b/apps/files_sharing/js/sharetabview.js index 2c7070aa3d5..7bb1f1229d0 100644 --- a/apps/files_sharing/js/sharetabview.js +++ b/apps/files_sharing/js/sharetabview.js @@ -50,6 +50,10 @@ if (this.model) { this.$el.html(this.template()); + if (_.isUndefined(this.model.get('sharePermissions'))) { + this.model.set('sharePermissions', OCA.Sharing.Util.getSharePermissions(this.model.attributes)); + } + // TODO: the model should read these directly off the passed fileInfoModel var attributes = { itemType: this.model.isDirectory() ? 'folder' : 'file', diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js index eb1479db823..8038c3009c1 100644 --- a/apps/files_sharing/l10n/de_DE.js +++ b/apps/files_sharing/l10n/de_DE.js @@ -120,7 +120,7 @@ OC.L10N.register( "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", - "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "Invalid ownCloud url" : "Ungültige Nextcloud-Adresse", "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten", "Accept" : "Akzeptieren", "Decline" : "Ablehnen", diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json index d9bcb1475a7..27ff3862ce3 100644 --- a/apps/files_sharing/l10n/de_DE.json +++ b/apps/files_sharing/l10n/de_DE.json @@ -118,7 +118,7 @@ "Cancel" : "Abbrechen", "Add remote share" : "Entfernte Freigabe hinzufügen", "No ownCloud installation (7 or higher) found at {remote}" : "Keine OwnCloud-Installation (7 oder höher) auf {remote} gefunden", - "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse", + "Invalid ownCloud url" : "Ungültige Nextcloud-Adresse", "You received \"/%2$s\" as a remote share from %1$s" : "Sie haben \"/%2$s\" als Remotefreigabe von %1$s erhalten", "Accept" : "Akzeptieren", "Decline" : "Ablehnen", diff --git a/apps/files_sharing/lib/Activity.php b/apps/files_sharing/lib/Activity.php index f0d4ca39047..596043765bb 100644 --- a/apps/files_sharing/lib/Activity.php +++ b/apps/files_sharing/lib/Activity.php @@ -72,7 +72,9 @@ class Activity implements IExtension { const SUBJECT_LINK_EXPIRED = 'link_expired'; const SUBJECT_LINK_BY_EXPIRED = 'link_by_expired'; - const SUBJECT_SHARED_EMAIL = 'shared_with_email'; + const SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED = 'file_shared_with_email_downloaded'; + const SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED = 'folder_shared_with_email_downloaded'; + const SUBJECT_SHARED_WITH_BY = 'shared_with_by'; const SUBJECT_UNSHARED_BY = 'unshared_by'; @@ -113,7 +115,7 @@ class Activity implements IExtension { return array( self::TYPE_SHARED => (string) $l->t('A file or folder has been <strong>shared</strong>'), self::TYPE_REMOTE_SHARE => (string) $l->t('A file or folder was shared from <strong>another server</strong>'), - self::TYPE_PUBLIC_LINKS => (string) $l->t('A public shared file or folder was <strong>downloaded</strong>'), + self::TYPE_PUBLIC_LINKS => (string) $l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>'), ); } @@ -246,8 +248,11 @@ class Activity implements IExtension { return (string) $l->t('%2$s shared %1$s with you', $params); case self::SUBJECT_UNSHARED_BY: return (string) $l->t('%2$s removed the share for %1$s', $params); - case self::SUBJECT_SHARED_EMAIL: - return (string) $l->t('You shared %1$s with %2$s', $params); + + case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED: + return (string) $l->t('File %1$s shared by email with %2$s was downloaded', $params); + case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED: + return (string) $l->t('Folder %1$s shared by email with %2$s was downloaded', $params); } return false; @@ -298,8 +303,10 @@ class Activity implements IExtension { case self::SUBJECT_SHARED_WITH_BY: return (string) $l->t('Shared by %2$s', $params); - case self::SUBJECT_SHARED_EMAIL: - return (string) $l->t('Shared with %2$s', $params); + + case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED: + case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED: + return (string) $l->t('Downloaded by %2$s', $params); default: return false; @@ -312,6 +319,7 @@ class Activity implements IExtension { * Currently known types are: * * file => will strip away the path of the file and add a tooltip with it * * username => will add the avatar of the user + * * email => will add a mailto link * * @param string $app * @param string $text @@ -347,10 +355,11 @@ class Activity implements IExtension { 1 => 'username', 2 => '', ]; - case self::SUBJECT_SHARED_EMAIL: + case self::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED: + case self::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED: return array( 0 => 'file', - 1 => '',// 'email' is neither supported nor planned for now + 1 => 'email', ); case self::SUBJECT_SHARED_USER_SELF: diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 5ad7d3a99f1..910cbbdf397 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -32,6 +32,7 @@ namespace OCA\Files_Sharing\Controller; +use OC\Files\Node\Folder; use OC_Files; use OC_Util; use OCA\FederatedFileSharing\FederatedShareProvider; @@ -50,7 +51,6 @@ use OCP\ILogger; use OCP\IUserManager; use OCP\ISession; use OCP\IPreview; -use OCP\Util; use OCA\Files_Sharing\Activity; use \OCP\Files\NotFoundException; use OCP\Files\IRootFolder; @@ -464,13 +464,7 @@ class ShareController extends Controller { // Single file share if ($share->getNode() instanceof \OCP\Files\File) { // Single file download - $event = $this->activityManager->generateEvent(); - $event->setApp('files_sharing') - ->setType(Activity::TYPE_PUBLIC_LINKS) - ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED, [$userFolder->getRelativePath($share->getNode()->getPath())]) - ->setAffectedUser($share->getShareOwner()) - ->setObject('files', $share->getNode()->getId(), $userFolder->getRelativePath($share->getNode()->getPath())); - $this->activityManager->publish($event); + $this->singleFileDownloaded($share, $share->getNode()); } // Directory share else { @@ -491,43 +485,12 @@ class ShareController extends Controller { if ($node instanceof \OCP\Files\File) { // Single file download - $event = $this->activityManager->generateEvent(); - $event->setApp('files_sharing') - ->setType(Activity::TYPE_PUBLIC_LINKS) - ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED, [$userFolder->getRelativePath($node->getPath())]) - ->setAffectedUser($share->getShareOwner()) - ->setObject('files', $node->getId(), $userFolder->getRelativePath($node->getPath())); - $this->activityManager->publish($event); + $this->singleFileDownloaded($share, $share->getNode()); } else if (!empty($files_list)) { - /** @var \OCP\Files\Folder $node */ - - // Subset of files is downloaded - foreach ($files_list as $file) { - $subNode = $node->get($file); - - $event = $this->activityManager->generateEvent(); - $event->setApp('files_sharing') - ->setType(Activity::TYPE_PUBLIC_LINKS) - ->setAffectedUser($share->getShareOwner()) - ->setObject('files', $subNode->getId(), $userFolder->getRelativePath($subNode->getPath())); - - if ($subNode instanceof \OCP\Files\File) { - $event->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED, [$userFolder->getRelativePath($subNode->getPath())]); - } else { - $event->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED, [$userFolder->getRelativePath($subNode->getPath())]); - } - - $this->activityManager->publish($event); - } + $this->fileListDownloaded($share, $files_list); } else { // The folder is downloaded - $event = $this->activityManager->generateEvent(); - $event->setApp('files_sharing') - ->setType(Activity::TYPE_PUBLIC_LINKS) - ->setSubject(Activity::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED, [$userFolder->getRelativePath($node->getPath())]) - ->setAffectedUser($share->getShareOwner()) - ->setObject('files', $node->getId(), $userFolder->getRelativePath($node->getPath())); - $this->activityManager->publish($event); + $this->singleFileDownloaded($share, $share->getNode()); } } @@ -572,4 +535,85 @@ class ShareController extends Controller { exit(); } } + + /** + * create activity for every downloaded file + * + * @param Share\IShare $share + * @param array $files_list + */ + protected function fileListDownloaded(Share\IShare $share, array $files_list) { + foreach ($files_list as $file) { + $subNode = $share->getNode()->get($file); + $this->singleFileDownloaded($share, $subNode); + } + + } + + /** + * create activity if a single file was downloaded from a link share + * + * @param Share\IShare $share + */ + protected function singleFileDownloaded(Share\IShare $share, \OCP\Files\Node $node) { + + $fileId = $node->getId(); + + $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy()); + $userNodeList = $userFolder->getById($fileId); + $userNode = $userNodeList[0]; + $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); + $userPath = $userFolder->getRelativePath($userNode->getPath()); + $ownerPath = $ownerFolder->getRelativePath($node->getPath()); + + $parameters = [$userPath]; + + if ($share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) { + if ($node instanceof \OCP\Files\File) { + $subject = Activity::SUBJECT_SHARED_FILE_BY_EMAIL_DOWNLOADED; + } else { + $subject = Activity::SUBJECT_SHARED_FOLDER_BY_EMAIL_DOWNLOADED; + } + $parameters[] = $share->getSharedWith(); + } else { + if ($node instanceof \OCP\Files\File) { + $subject = Activity::SUBJECT_PUBLIC_SHARED_FILE_DOWNLOADED; + } else { + $subject = Activity::SUBJECT_PUBLIC_SHARED_FOLDER_DOWNLOADED; + } + } + + $this->publishActivity($subject, $parameters, $share->getSharedBy(), $fileId, $userPath); + + if ($share->getShareOwner() !== $share->getSharedBy()) { + $parameters[0] = $ownerPath; + $this->publishActivity($subject, $parameters, $share->getShareOwner(), $fileId, $ownerPath); + } + } + + /** + * publish activity + * + * @param string $subject + * @param array $parameters + * @param string $affectedUser + * @param int $fileId + * @param string $filePath + */ + protected function publishActivity($subject, + array $parameters, + $affectedUser, + $fileId, + $filePath) { + + $event = $this->activityManager->generateEvent(); + $event->setApp('files_sharing') + ->setType(Activity::TYPE_PUBLIC_LINKS) + ->setSubject($subject, $parameters) + ->setAffectedUser($affectedUser) + ->setObject('files', $fileId, $filePath); + $this->activityManager->publish($event); + } + + } diff --git a/apps/files_sharing/tests/ShareTest.php b/apps/files_sharing/tests/ShareTest.php index c1e61152e63..9b60255ed97 100644 --- a/apps/files_sharing/tests/ShareTest.php +++ b/apps/files_sharing/tests/ShareTest.php @@ -71,10 +71,14 @@ class ShareTest extends TestCase { } public function testUnshareFromSelf() { - - \OC_Group::createGroup('testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $groupManager = \OC::$server->getGroupManager(); + $userManager = \OC::$server->getUserManager(); + + $testGroup = $groupManager->createGroup('testGroup'); + $user1 = $userManager->get(self::TEST_FILES_SHARING_API_USER2); + $user2 = $userManager->get(self::TEST_FILES_SHARING_API_USER3); + $testGroup->addUser($user1); + $testGroup->addUser($user2); $share1 = $this->share( \OCP\Share::SHARE_TYPE_USER, diff --git a/apps/files_sharing/tests/SharedMountTest.php b/apps/files_sharing/tests/SharedMountTest.php index 5f769852dc8..72cc891e368 100644 --- a/apps/files_sharing/tests/SharedMountTest.php +++ b/apps/files_sharing/tests/SharedMountTest.php @@ -27,6 +27,8 @@ */ namespace OCA\Files_Sharing\Tests; +use OCP\IGroupManager; +use OCP\IUserManager; /** * Class SharedMountTest @@ -35,6 +37,12 @@ namespace OCA\Files_Sharing\Tests; */ class SharedMountTest extends TestCase { + /** @var IGroupManager */ + private $groupManager; + + /** @var IUserManager */ + private $userManager; + protected function setUp() { parent::setUp(); @@ -48,6 +56,9 @@ class SharedMountTest extends TestCase { // save file with content $this->view->file_put_contents($this->filename, "root file"); $this->view->file_put_contents($this->folder . $this->filename, "file in subfolder"); + + $this->groupManager = \OC::$server->getGroupManager(); + $this->userManager = \OC::$server->getUserManager(); } protected function tearDown() { @@ -172,10 +183,13 @@ class SharedMountTest extends TestCase { * for the other users */ public function testMoveGroupShare () { - \OC_Group::createGroup('testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup = $this->groupManager->createGroup('testGroup'); + $user1 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER1); + $user2 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER2); + $user3 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER3); + $testGroup->addUser($user1); + $testGroup->addUser($user2); + $testGroup->addUser($user3); $fileinfo = $this->view->getFileInfo($this->filename); $share = $this->share( @@ -206,9 +220,9 @@ class SharedMountTest extends TestCase { //cleanup self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $this->shareManager->deleteShare($share); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup->removeUser($user1); + $testGroup->removeUser($user2); + $testGroup->removeUser($user3); } /** @@ -317,10 +331,13 @@ class SharedMountTest extends TestCase { $path = $this->folder; } - \OC_Group::createGroup('testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup = $this->groupManager->createGroup('testGroup'); + $user1 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER1); + $user2 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER2); + $user3 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER3); + $testGroup->addUser($user1); + $testGroup->addUser($user2); + $testGroup->addUser($user3); // Share item with group $share = $this->share( @@ -362,9 +379,9 @@ class SharedMountTest extends TestCase { //cleanup self::loginHelper(self::TEST_FILES_SHARING_API_USER1); $this->shareManager->deleteShare($share); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup->removeUser($user1); + $testGroup->removeUser($user2); + $testGroup->removeUser($user3); } /** @@ -372,10 +389,13 @@ class SharedMountTest extends TestCase { * removed shares by a member of that group */ function testPermissionUpgradeOnUserDeletedGroupShare() { - \OC_Group::createGroup('testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup = $this->groupManager->createGroup('testGroup'); + $user1 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER1); + $user2 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER2); + $user3 = $this->userManager->get(self::TEST_FILES_SHARING_API_USER3); + $testGroup->addUser($user1); + $testGroup->addUser($user2); + $testGroup->addUser($user3); $connection = \OC::$server->getDatabaseConnection(); @@ -419,9 +439,9 @@ class SharedMountTest extends TestCase { //cleanup self::loginHelper(self::TEST_FILES_SHARING_API_USER1); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER1, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER2, 'testGroup'); - \OC_Group::removeFromGroup(self::TEST_FILES_SHARING_API_USER3, 'testGroup'); + $testGroup->removeUser($user1); + $testGroup->removeUser($user2); + $testGroup->removeUser($user3); } } diff --git a/apps/files_sharing/tests/js/sharedbreadcrumviewSpec.js b/apps/files_sharing/tests/js/sharedbreadcrumviewSpec.js new file mode 100644 index 00000000000..b2193f4458b --- /dev/null +++ b/apps/files_sharing/tests/js/sharedbreadcrumviewSpec.js @@ -0,0 +1,224 @@ +/** + * @copyright 2016, Roeland Jago Douma <roeland@famdouma.nl> + * + * @author Roeland Jago Douma <roeland@famdouma.nl> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +describe('OCA.Sharing.ShareBreadCrumbView tests', function() { + var BreadCrumb = OCA.Files.BreadCrumb; + var SharedBreadCrum = OCA.Sharing.ShareBreadCrumbView; + + describe('Rendering', function() { + var bc; + var sbc; + var shareTab; + beforeEach(function() { + bc = new BreadCrumb({ + getCrumbUrl: function(part, index) { + // for testing purposes + return part.dir + '#' + index; + } + }); + shareTab = new OCA.Sharing.ShareTabView(); + sbc = new SharedBreadCrum({ + shareTab: shareTab + }); + bc.addDetailView(sbc); + }); + afterEach(function() { + bc = null; + sbc = null; + shareModel = null; + }); + it('Do not render in root', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/', + type: 'dir', + name: '' + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory(''); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(0); + expect(bc.$el.find('.shared').length).toEqual(0); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Render in dir', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir' + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(1); + expect(bc.$el.find('.shared').length).toEqual(0); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Render shared if dir is shared with user', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_USER] + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(1); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Render shared if dir is shared with group', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_GROUP] + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(1); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Render shared if dir is shared by link', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_LINK] + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(0); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(1); + }); + it('Render shared if dir is shared with remote', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_REMOTE] + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(1); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Render link shared if at least one is a link share', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [ + OC.Share.SHARE_TYPE_USER, + OC.Share.SHARE_TYPE_GROUP, + OC.Share.SHARE_TYPE_LINK, + OC.Share.SHARE_TYPE_EMAIL, + OC.Share.SHARE_TYPE_REMOTE + ] + }); + bc.setDirectoryInfo(dirInfo); + bc.setDirectory('/foo'); + bc.render(); + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(0); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(1); + }); + it('Remove shared status from user share', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_USER] + }); + + bc.setDirectory('/foo'); + bc.setDirectoryInfo(dirInfo); + bc.render(); + + var mock = sinon.createStubInstance(OCA.Files.FileList); + mock.showDetailsView = function() { }; + OCA.Files.App.fileList = mock; + var spy = sinon.spy(mock, 'showDetailsView'); + bc.$el.find('.icon-share').click(); + + expect(spy.calledOnce).toEqual(true); + + var model = sinon.createStubInstance(OC.Share.ShareItemModel); + model.getSharesWithCurrentItem = function() { return [] }; + model.hasLinkShare = function() { return false; }; + + shareTab.trigger('sharesChanged', model); + + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(1); + expect(bc.$el.find('.shared').length).toEqual(0); + expect(bc.$el.find('.icon-public').length).toEqual(0); + }); + it('Add link share to user share', function() { + var dirInfo = new OC.Files.FileInfo({ + id: 42, + path: '/foo', + type: 'dir', + shareTypes: [OC.Share.SHARE_TYPE_USER] + }); + + bc.setDirectory('/foo'); + bc.setDirectoryInfo(dirInfo); + bc.render(); + + var mock = sinon.createStubInstance(OCA.Files.FileList); + mock.showDetailsView = function() { }; + OCA.Files.App.fileList = mock; + var spy = sinon.spy(mock, 'showDetailsView'); + bc.$el.find('.icon-share').click(); + + expect(spy.calledOnce).toEqual(true); + + var model = sinon.createStubInstance(OC.Share.ShareItemModel); + model.getSharesWithCurrentItem = function() { return [ + {share_type: OC.Share.SHARE_TYPE_USER} + ] }; + model.hasLinkShare = function() { return true; }; + + shareTab.trigger('sharesChanged', model); + + expect(bc.$el.hasClass('breadcrumb')).toEqual(true); + expect(bc.$el.find('.icon-share').length).toEqual(0); + expect(bc.$el.find('.shared').length).toEqual(1); + expect(bc.$el.find('.icon-public').length).toEqual(1); + }); + }); +}); diff --git a/apps/sharebymail/appinfo/app.php b/apps/sharebymail/appinfo/app.php index 5ef7b6f18cb..0723b2dcc5f 100644 --- a/apps/sharebymail/appinfo/app.php +++ b/apps/sharebymail/appinfo/app.php @@ -22,3 +22,10 @@ $settings = new \OCA\ShareByMail\Settings(); \OCP\Util::connectHook('\OCP\Config', 'js', $settings, 'announceShareProvider'); + +\OC::$server->getActivityManager()->registerExtension(function() { + return new \OCA\ShareByMail\Activity( + \OC::$server->query('L10NFactory'), + \OC::$server->getActivityManager() + ); +}); diff --git a/apps/sharebymail/lib/Activity.php b/apps/sharebymail/lib/Activity.php new file mode 100644 index 00000000000..0b73d73c04c --- /dev/null +++ b/apps/sharebymail/lib/Activity.php @@ -0,0 +1,269 @@ +<?php +/** + * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCA\ShareByMail; + + +use OCP\Activity\IExtension; +use OCP\Activity\IManager; +use OCP\IL10N; +use OCP\L10N\IFactory; + +class Activity implements IExtension { + + const SHARE_BY_MAIL_APP = 'sharebymail'; + + const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self'; + const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by'; + + /** @var IFactory */ + private $languageFactory; + + /** @var IManager */ + private $activityManager; + + /** + * @param IFactory $languageFactory + * @param IManager $activityManager + */ + public function __construct(IFactory $languageFactory, IManager $activityManager) { + $this->languageFactory = $languageFactory; + $this->activityManager = $activityManager; + } + + /** + * The extension can return an array of additional notification types. + * If no additional types are to be added false is to be returned + * + * @param string $languageCode + * @return array|false Array "stringID of the type" => "translated string description for the setting" + * or Array "stringID of the type" => [ + * 'desc' => "translated string description for the setting" + * 'methods' => [self::METHOD_*], + * ] + * @since 8.0.0 - 8.2.0: Added support to allow limiting notifications to certain methods + */ + public function getNotificationTypes($languageCode) { + return false; + } + + /** + * For a given method additional types to be displayed in the settings can be returned. + * In case no additional types are to be added false is to be returned. + * + * @param string $method + * @return array|false + * @since 8.0.0 + */ + public function getDefaultTypes($method) { + return false; + } + + /** + * A string naming the css class for the icon to be used can be returned. + * If no icon is known for the given type false is to be returned. + * + * @param string $type + * @return string|false + * @since 8.0.0 + */ + public function getTypeIcon($type) { + return false; + } + + /** + * The extension can translate a given message to the requested languages. + * If no translation is available false is to be returned. + * + * @param string $app + * @param string $text + * @param array $params + * @param boolean $stripPath + * @param boolean $highlightParams + * @param string $languageCode + * @return string|false + * @since 8.0.0 + */ + public function translate($app, $text, $params, $stripPath, $highlightParams, $languageCode) { + if ($app !== self::SHARE_BY_MAIL_APP) { + return false; + } + + $l = $this->getL10N($languageCode); + + if ($this->activityManager->isFormattingFilteredObject()) { + $translation = $this->translateShort($text, $l, $params); + if ($translation !== false) { + return $translation; + } + } + + return $this->translateLong($text, $l, $params); + } + + + /** + * The extension can define the type of parameters for translation + * + * Currently known types are: + * * file => will strip away the path of the file and add a tooltip with it + * * username => will add the avatar of the user + * + * @param string $app + * @param string $text + * @return array|false + * @since 8.0.0 + */ + public function getSpecialParameterList($app, $text) { + if ($app === self::SHARE_BY_MAIL_APP) { + switch ($text) { + case self::SUBJECT_SHARED_EMAIL_BY: + return [ + 0 => 'file', + 1 => 'email', + 2 => 'user', + ]; + case self::SUBJECT_SHARED_EMAIL_SELF: + return [ + 0 => 'file', + 1 => 'email', + ]; + } + } + + return false; + } + + /** + * The extension can define the parameter grouping by returning the index as integer. + * In case no grouping is required false is to be returned. + * + * @param array $activity + * @return integer|false + * @since 8.0.0 + */ + public function getGroupParameter($activity) { + if ($activity['app'] === self::SHARE_BY_MAIL_APP) { + switch ($activity['subject']) { + case self::SUBJECT_SHARED_EMAIL_BY: + // Group by file name + return 1; + case self::SUBJECT_SHARED_EMAIL_SELF: + // Group by user/group + return 1; + } + } + + return false; + + } + + /** + * The extension can define additional navigation entries. The array returned has to contain two keys 'top' + * and 'apps' which hold arrays with the relevant entries. + * If no further entries are to be added false is no be returned. + * + * @return array|false + * @since 8.0.0 + */ + public function getNavigation() { + return false; + } + + /** + * The extension can check if a customer filter (given by a query string like filter=abc) is valid or not. + * + * @param string $filterValue + * @return boolean + * @since 8.0.0 + */ + public function isFilterValid($filterValue) { + return false; + } + + /** + * The extension can filter the types based on the filter if required. + * In case no filter is to be applied false is to be returned unchanged. + * + * @param array $types + * @param string $filter + * @return array|false + * @since 8.0.0 + */ + public function filterNotificationTypes($types, $filter) { + return false; + } + + /** + * For a given filter the extension can specify the sql query conditions including parameters for that query. + * In case the extension does not know the filter false is to be returned. + * The query condition and the parameters are to be returned as array with two elements. + * E.g. return array('`app` = ? and `message` like ?', array('mail', 'ownCloud%')); + * + * @param string $filter + * @return array|false + * @since 8.0.0 + */ + public function getQueryForFilter($filter) { + return false; + } + + protected function getL10N($languageCode = null) { + return $this->languageFactory->get(self::SHARE_BY_MAIL_APP, $languageCode); + } + + /** + * @param string $text + * @param IL10N $l + * @param array $params + * @return bool|string + */ + protected function translateLong($text, IL10N $l, array $params) { + + switch ($text) { + case self::SUBJECT_SHARED_EMAIL_SELF: + return (string) $l->t('You shared %1$s with %2$s by mail', $params); + case self::SUBJECT_SHARED_EMAIL_BY: + return (string) $l->t('%3$s shared %1$s with %2$s by mail', $params); + } + + return false; + } + + /** + * @param string $text + * @param IL10N $l + * @param array $params + * @return bool|string + */ + protected function translateShort($text, IL10N $l, array $params) { + switch ($text) { + case self::SUBJECT_SHARED_EMAIL_SELF: + return (string) $l->t('Shared with %2$s', $params); + case self::SUBJECT_SHARED_EMAIL_BY: + return (string) $l->t('Shared with %3$s by %2$s', $params); + } + + return false; + } + +} diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php index e084ce3288f..cb013acd4de 100644 --- a/apps/sharebymail/lib/ShareByMailProvider.php +++ b/apps/sharebymail/lib/ShareByMailProvider.php @@ -23,6 +23,7 @@ namespace OCA\ShareByMail; use OC\HintException; use OC\Share20\Exception\InvalidShare; +use OCP\Activity\IManager; use OCP\Files\Folder; use OCP\Files\IRootFolder; use OCP\Files\Node; @@ -70,6 +71,9 @@ class ShareByMailProvider implements IShareProvider { /** @var IURLGenerator */ private $urlGenerator; + /** @var IManager */ + private $activityManager; + /** * Return the identifier of this provider. * @@ -90,6 +94,7 @@ class ShareByMailProvider implements IShareProvider { * @param ILogger $logger * @param IMailer $mailer * @param IURLGenerator $urlGenerator + * @param IManager $activityManager */ public function __construct( IDBConnection $connection, @@ -99,7 +104,8 @@ class ShareByMailProvider implements IShareProvider { IL10N $l, ILogger $logger, IMailer $mailer, - IURLGenerator $urlGenerator + IURLGenerator $urlGenerator, + IManager $activityManager ) { $this->dbConnection = $connection; $this->secureRandom = $secureRandom; @@ -109,6 +115,7 @@ class ShareByMailProvider implements IShareProvider { $this->logger = $logger; $this->mailer = $mailer; $this->urlGenerator = $urlGenerator; + $this->activityManager = $activityManager; } /** @@ -134,13 +141,66 @@ class ShareByMailProvider implements IShareProvider { } $shareId = $this->createMailShare($share); - + $this->createActivity($share); $data = $this->getRawShare($shareId); return $this->createShareObject($data); } /** + * create activity if a file/folder was shared by mail + * + * @param IShare $share + */ + protected function createActivity(IShare $share) { + + $userFolder = $this->rootFolder->getUserFolder($share->getSharedBy()); + + $this->publishActivity( + Activity::SUBJECT_SHARED_EMAIL_SELF, + [$userFolder->getRelativePath($share->getNode()->getPath()), $share->getSharedWith()], + $share->getSharedBy(), + $share->getNode()->getId(), + $userFolder->getRelativePath($share->getNode()->getPath()) + ); + + if ($share->getShareOwner() !== $share->getSharedBy()) { + $ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner()); + $fileId = $share->getNode()->getId(); + $node = $ownerFolder->getById($fileId); + $ownerPath = $node[0]->getPath(); + $this->publishActivity( + Activity::SUBJECT_SHARED_EMAIL_BY, + [$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()], + $share->getShareOwner(), + $fileId, + $userFolder->getRelativePath($ownerPath) + ); + } + + } + + /** + * publish activity if a file/folder was shared by mail + * + * @param $subject + * @param $parameters + * @param $affectedUser + * @param $fileId + * @param $filePath + */ + protected function publishActivity($subject, $parameters, $affectedUser, $fileId, $filePath) { + $event = $this->activityManager->generateEvent(); + $event->setApp('sharebymail') + ->setType('shared') + ->setSubject($subject, $parameters) + ->setAffectedUser($affectedUser) + ->setObject('files', $fileId, $filePath); + $this->activityManager->publish($event); + + } + + /** * @param IShare $share * @return int * @throws \Exception diff --git a/apps/sharebymail/tests/ActivityTest.php b/apps/sharebymail/tests/ActivityTest.php new file mode 100644 index 00000000000..9bc8c827da9 --- /dev/null +++ b/apps/sharebymail/tests/ActivityTest.php @@ -0,0 +1,68 @@ +<?php +/** + * @copyright Copyright (c) 2016 Bjoern Schiessle <bjoern@schiessle.org> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + + +namespace OCA\ShareByMail\Tests; + + +use OCA\ShareByMail\Activity; + +class ActivityTest extends \Test\TestCase { + + /** + * @var \OCA\ShareByMail\Activity + */ + private $activity; + + protected function setUp() { + parent::setUp(); + $this->activity = new Activity( + $this->getMockBuilder('OCP\L10N\IFactory') + ->disableOriginalConstructor() + ->getMock(), + $this->getMockBuilder('OCP\Activity\IManager') + ->disableOriginalConstructor() + ->getMock() + ); + } + + /** + * @dataProvider dataTestGetSpecialParameterList + * + */ + public function testGetSpecialParameterList($app, $text, $expected) { + $result = $this->activity->getSpecialParameterList($app, $text); + $this->assertSame($expected, $result); + } + + public function dataTestGetSpecialParameterList() { + return [ + ['sharebymail', Activity::SUBJECT_SHARED_EMAIL_SELF, [0 => 'file', 1 => 'email']], + ['sharebymail', Activity::SUBJECT_SHARED_EMAIL_BY, [0 => 'file', 1 => 'email', 2 => 'user']], + ['sharebymail', 'unknown', false], + ['randomApp', Activity::SUBJECT_SHARED_EMAIL_SELF, false], + ['randomApp', Activity::SUBJECT_SHARED_EMAIL_BY, false], + + ]; + } + +} + diff --git a/apps/sharebymail/tests/ShareByMailProviderTest.php b/apps/sharebymail/tests/ShareByMailProviderTest.php index eedce286a03..65eded3eb7d 100644 --- a/apps/sharebymail/tests/ShareByMailProviderTest.php +++ b/apps/sharebymail/tests/ShareByMailProviderTest.php @@ -76,6 +76,9 @@ class ShareByMailProviderTest extends TestCase { /** @var IShare | \PHPUnit_Framework_MockObject_MockObject */ private $share; + /** @var \OCP\Activity\IManager | \PHPUnit_Framework_MockObject_MockObject */ + private $activityManager; + public function setUp() { parent::setUp(); @@ -94,6 +97,7 @@ class ShareByMailProviderTest extends TestCase { $this->mailer = $this->getMockBuilder('\OCP\Mail\IMailer')->getMock(); $this->urlGenerator = $this->getMockBuilder('\OCP\IUrlGenerator')->getMock(); $this->share = $this->getMockBuilder('\OCP\Share\IShare')->getMock(); + $this->activityManager = $this->getMockBuilder('OCP\Activity\IManager')->getMock(); $this->userManager->expects($this->any())->method('userExists')->willReturn(true); } @@ -116,7 +120,8 @@ class ShareByMailProviderTest extends TestCase { $this->l, $this->logger, $this->mailer, - $this->urlGenerator + $this->urlGenerator, + $this->activityManager ] ); @@ -133,7 +138,8 @@ class ShareByMailProviderTest extends TestCase { $this->l, $this->logger, $this->mailer, - $this->urlGenerator + $this->urlGenerator, + $this->activityManager ); } @@ -148,10 +154,11 @@ class ShareByMailProviderTest extends TestCase { $share = $this->getMockBuilder('\OCP\Share\IShare')->getMock(); $share->expects($this->once())->method('getSharedWith')->willReturn('user1'); - $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject']); + $instance = $this->getInstance(['getSharedWith', 'createMailShare', 'getRawShare', 'createShareObject', 'createActivity']); $instance->expects($this->once())->method('getSharedWith')->willReturn([]); $instance->expects($this->once())->method('createMailShare')->with($share)->willReturn(42); + $instance->expects($this->once())->method('createActivity')->with($share); $instance->expects($this->once())->method('getRawShare')->with(42)->willReturn('rawShare'); $instance->expects($this->once())->method('createShareObject')->with('rawShare')->willReturn('shareObject'); @@ -614,7 +621,7 @@ class ShareByMailProviderTest extends TestCase { $userManager = \OC::$server->getUserManager(); $rootFolder = \OC::$server->getRootFolder(); - $provider = $this->getInstance(['sendMailNotification']); + $provider = $this->getInstance(['sendMailNotification', 'createActivity']); $u1 = $userManager->createUser('testFed', md5(time())); $u2 = $userManager->createUser('testFed2', md5(time())); @@ -651,5 +658,5 @@ class ShareByMailProviderTest extends TestCase { $u1->delete(); $u2->delete(); } - + } diff --git a/apps/systemtags/l10n/ru.js b/apps/systemtags/l10n/ru.js index bc0276fe072..bd9385d0bf2 100644 --- a/apps/systemtags/l10n/ru.js +++ b/apps/systemtags/l10n/ru.js @@ -10,6 +10,8 @@ OC.L10N.register( "Please select tags to filter by" : "Выберите метки для фильтра", "No files found for the selected tags" : "Для выбранных меток файлов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You removed system tag %3$s" : "Вы удалили системную метку %3$s", + "%1$s removed system tag %3$s" : "%1$s удалил системную метку %3$s", "You created system tag %2$s" : "Вы создали системную метку %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", "You deleted system tag %2$s" : "Вы удалили системную метку %2$s", diff --git a/apps/systemtags/l10n/ru.json b/apps/systemtags/l10n/ru.json index 9815f5a4570..65ada9bbfb3 100644 --- a/apps/systemtags/l10n/ru.json +++ b/apps/systemtags/l10n/ru.json @@ -8,6 +8,8 @@ "Please select tags to filter by" : "Выберите метки для фильтра", "No files found for the selected tags" : "Для выбранных меток файлов не найдено", "<strong>System tags</strong> for a file have been modified" : "<strong>Системные метки</strong> файла были изменены", + "You removed system tag %3$s" : "Вы удалили системную метку %3$s", + "%1$s removed system tag %3$s" : "%1$s удалил системную метку %3$s", "You created system tag %2$s" : "Вы создали системную метку %2$s", "%1$s created system tag %2$s" : "%1$s создал системную метку %2$s", "You deleted system tag %2$s" : "Вы удалили системную метку %2$s", diff --git a/apps/user_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js index b80aa4366cf..cdcb06de66d 100644 --- a/apps/user_ldap/l10n/hu_HU.js +++ b/apps/user_ldap/l10n/hu_HU.js @@ -2,41 +2,71 @@ OC.L10N.register( "user_ldap", { "Failed to clear the mappings." : "Nem sikerült törölni a hozzárendeléseket.", - "Failed to delete the server configuration" : "Nem sikerült törölni a kiszolgáló konfigurációját", + "Failed to delete the server configuration" : "Nem sikerült törölni a szerver konfigurációját", + "The configuration is invalid: anonymous bind is not allowed." : "A konfiguráció érvénytelen: a névtelen hozzáférés (anonymous bind) nem engedélyezett.", "The configuration is valid and the connection could be established!" : "A konfiguráció érvényes, és a kapcsolat létrehozható!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a szerver beállításait, és az elérési adatokat.", "The configuration is invalid. Please have a look at the logs for further details." : "Érvénytelen konfiguráció. További információkért nézze meg a naplófájlokat!", "No action specified" : "Nincs megadva parancs", "No configuration specified" : "Nincs megadva konfiguráció", "No data specified" : "Nincs adat megadva", - " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be", + " Could not set configuration %s" : "A konfiguráció nem állítható be: %s", + "Action does not exist" : "A művelet nem létezik", + "The Base DN appears to be wrong" : "Úgy tűnik, a címtár gyökere (base DN) hibás", + "Testing configuration…" : "Beállítások ellenőrzése...", "Configuration incorrect" : "Konfiguráió hibás", "Configuration incomplete" : "Konfiguráció nincs befejezve", "Configuration OK" : "Konfiguráció OK", "Select groups" : "Csoportok kiválasztása", "Select object classes" : "Objektumosztályok kiválasztása", - "{nthServer}. Server" : "{nthServer}. Kiszolgáló", - "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?", + "Please check the credentials, they seem to be wrong." : "Kérlek ellenőrizd az azonosítókat, hibásnak tűnnek.", + "Please specify the port, it could not be auto-detected." : "Kérlek add meg a port számát, nem lehetett automatikusan detektálni.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "A címtár gyökerét (base DN) nem sikerült automatikusan felismerni, kérlek, ellenőrizd az azonosítókat, a kiszolgáló nevét és a portot.", + "Could not detect Base DN, please enter it manually." : "Nem sikerült felismerni a címtár gyökerét (base DN), kérlek, add meg kézzel.", + "{nthServer}. Server" : "{nthServer}. Szerver", + "No object found in the given Base DN. Please revise." : "Nem találhatók objektumok a megadott címtár gyökérben (base DN). Kérlek, ellenőrizd.", + "More than 1,000 directory entries available." : "Több mint 1000 címtár bejegyzés érhető el.", + " entries available within the provided Base DN" : "a megadott címtár gyökér alatt elérhető bejegyzések", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Hiba törént. Kérlek, ellenőrizd a címtár gyökerét (base DN), a kapcsolat beállításait és az azonosítókat.", + "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a szerver beállításait?", "Confirm Deletion" : "A törlés megerősítése", + "Mappings cleared successfully!" : "A hozzárendelések sikeresen törölve.", + "Error while clearing the mappings." : "Hiba a leképzések törlése közben.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "A névtelen hozzáférés (anonymous bind) nem engedélyezett. Kérlek, add meg a felhasználó címtár-azonosítóját (DN) és jelszavát.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "A mentés sikertelen. Kérlek győződj meg róla, hogy az adatbázis működik. Töltsd újra a folytatás előtt.", + "Mode switch" : "Üzemmód váltás", "Select attributes" : "Attribútumok kiválasztása", + "User found and settings verified." : "Felhasználó megtalálva, beállítások ellenőrizve.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Beállítások ellenőrizve, de egy felhasználó található. Csak az első léphet be automatikusan. Próbálj egy pontosabb szűrőt.", + "An unspecified error occurred. Please check the settings and the log." : "Meghatározatlan hiba történt. Kérlek ellenőrizd a beállításokat és a naplót.", + "LDAP / AD integration" : "LDAP / AD integráció", "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"], "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"], "Could not find the desired feature" : "A kívánt funkció nem található", "Invalid Host" : "Érvénytelen gépnév", - "Server" : "Kiszolgáló", - "Users" : "Felhasználók", - "Groups" : "Csoportok", "Test Configuration" : "A beállítások tesztelése", "Help" : "Súgó", "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:", + "Only these object classes:" : "Csak ezek az objektumosztályok:", + "Only from these groups:" : "Csak ezekből a csoportokból:", + "Search groups" : "Csoport keresés", + "Available groups" : "Elérhető csoportok", + "Selected groups" : "Kiválasztott csoportok", + "Edit LDAP Query" : "LDAP lekérdezés szerkesztés", + "LDAP Filter:" : "LDAP szűrő:", "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.", + "LDAP / AD Username:" : "LDAP / AD felhasználónév:", + "LDAP / AD Email Address:" : "LDAP / AD e-mail cím:", "Other Attributes:" : "Más attribútumok:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"", - "1. Server" : "1. Kiszolgáló", - "%s. Server:" : "%s. kiszolgáló", + "Verify settings" : "Beállítások ellenőrzése", + "1. Server" : "1. Szerver", + "%s. Server:" : "%s. szerver", + "Delete the current configuration" : "Aktuális konfiguráció törlése", "Host" : "Kiszolgáló", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://", "Port" : "Port", + "Detect Port" : "Port detektálás", "User DN" : "A kapcsolódó felhasználó DN-je", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!", "Password" : "Jelszó", @@ -48,6 +78,10 @@ OC.L10N.register( "Saving" : "Mentés", "Back" : "Vissza", "Continue" : "Folytatás", + "LDAP" : "LDAP", + "Server" : "Szerver", + "Users" : "Felhasználók", + "Groups" : "Csoportok", "Expert" : "Profi", "Advanced" : "Haladó", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.", @@ -55,13 +89,13 @@ OC.L10N.register( "Connection Settings" : "Kapcsolati beállítások", "Configuration Active" : "A beállítás aktív", "When unchecked, this configuration will be skipped." : "Ha nincs kipipálva, ez a beállítás kihagyódik.", - "Backup (Replica) Host" : "Másodkiszolgáló (replika)", - "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.", - "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma", + "Backup (Replica) Host" : "Biztonsági (replika) kiszolgáló", + "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális biztonsági kiszolgálót. Ez a fő LDAP/AD szerver replikája kell legyen.", + "Backup (Replica) Port" : "Biztonsági kiszolgáló (replika) portszáma", "Disable Main Server" : "A fő szerver kihagyása", - "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.", + "Only connect to the replica server." : "Csak a másodlagos (másolati) szerverhez kapcsolódjunk.", "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!", + "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-szerver SSL tanúsítványát a(z) %s szerverre!", "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama", "in seconds. A change empties the cache." : "másodpercen belül. A változtatás törli a gyorsítótár tartalmát.", "Directory Settings" : "Címtár beállítások", @@ -79,20 +113,18 @@ OC.L10N.register( "Group-Member association" : "A csoporttagság attribútuma", "Nested Groups" : "Egymásba ágyazott csoportok", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Amikor be van kapcsolva, akkor azokat a csoportokat is kezelni tudjuk, melyekben a személyek mellett csoportok is vannak. (Csak akkor működik, ha a csoportok \"member\" attribútuma DN-eket tartalmaz.)", - "Paging chunksize" : "Lapméret paging esetén", "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "A lapméret megadásával korlátozható az egy fordulóban kapott találatok száma, akkor is, ha az LDAP-keresés nagyon sok találatot ad, ha ezt az LDAP-kiszolgáló támogatja. (Ha 0-ra állítjuk, akkor ezáltal letiltjuk ezt a lapozó funkciót.)", "Special Attributes" : "Különleges attribútumok", "Quota Field" : "Kvóta mező", "Quota Default" : "Alapértelmezett kvóta", "in bytes" : "bájtban", "Email Field" : "E-mail mező", - "User Home Folder Naming Rule" : "A home könyvtár elérési útvonala", + "User Home Folder Naming Rule" : "Felhasználói Home mappa elnevezési szabály", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!", "Internal Username" : "Belső felhasználónév", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Alapértelmezetten a belső felhasználónév az UUID attribútumból jön létre. Ez biztosítja a felhasználónév egyediségét, ill. azt, hogy a karaktereket nem kell konvertálni benne. A belső felhasználónévben csak a következő karakterek engdélyezettek: [ a-zA-Z0-9_.@- ]. Minden más karakter vagy az ASCII kódtáblában levő megfelelőjére cserélődik ki, vagy ha ilyen nincs, akkor egyszerűen kihagyódik. Ha az így kapott nevek mégis ütköznének, akkor a végükön kiegészülnek egy növekvő sorszámmal. A belső felhasználónév a programon belül azonosítja a felhasználót, valamint alapértelmezetten ez lesz a felhasználó személyes home könyvtárának a neve is. A belső felhasználónév adja a távoli elérések webcímének egy részét is, ilyenek pl. a *DAV szolgáltatások URL-jei. Ezzel a beállítással felülbírálhatjuk az alapértelmezett viselkedést. Ha az ownCloud 5-ös változata előtti viselkedést szeretné elérni, akkor a következő mezőben adja meg a felhasználó megjelenítési nevének attribútumát. Az alapértelmezett viselkedéshez hagyja üresen. A változtatás csak az újonnan létrejövő (újonnan megfeleltetett) LDAP felhasználók esetén érvényesül.", "Internal Username Attribute:" : "A belső felhasználónév attribútuma:", "Override UUID detection" : "Az UUID-felismerés felülbírálása", - "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.", + "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető legyen és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.", "UUID Attribute for Users:" : "A felhasználók UUID attribútuma:", "UUID Attribute for Groups:" : "A csoportok UUID attribútuma:", "Username-LDAP User Mapping" : "Felhasználó - LDAP felhasználó hozzárendelés", diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json index afbbdbb787b..610015a9eed 100644 --- a/apps/user_ldap/l10n/hu_HU.json +++ b/apps/user_ldap/l10n/hu_HU.json @@ -1,40 +1,70 @@ { "translations": { "Failed to clear the mappings." : "Nem sikerült törölni a hozzárendeléseket.", - "Failed to delete the server configuration" : "Nem sikerült törölni a kiszolgáló konfigurációját", + "Failed to delete the server configuration" : "Nem sikerült törölni a szerver konfigurációját", + "The configuration is invalid: anonymous bind is not allowed." : "A konfiguráció érvénytelen: a névtelen hozzáférés (anonymous bind) nem engedélyezett.", "The configuration is valid and the connection could be established!" : "A konfiguráció érvényes, és a kapcsolat létrehozható!", - "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.", + "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a szerver beállításait, és az elérési adatokat.", "The configuration is invalid. Please have a look at the logs for further details." : "Érvénytelen konfiguráció. További információkért nézze meg a naplófájlokat!", "No action specified" : "Nincs megadva parancs", "No configuration specified" : "Nincs megadva konfiguráció", "No data specified" : "Nincs adat megadva", - " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be", + " Could not set configuration %s" : "A konfiguráció nem állítható be: %s", + "Action does not exist" : "A művelet nem létezik", + "The Base DN appears to be wrong" : "Úgy tűnik, a címtár gyökere (base DN) hibás", + "Testing configuration…" : "Beállítások ellenőrzése...", "Configuration incorrect" : "Konfiguráió hibás", "Configuration incomplete" : "Konfiguráció nincs befejezve", "Configuration OK" : "Konfiguráció OK", "Select groups" : "Csoportok kiválasztása", "Select object classes" : "Objektumosztályok kiválasztása", - "{nthServer}. Server" : "{nthServer}. Kiszolgáló", - "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?", + "Please check the credentials, they seem to be wrong." : "Kérlek ellenőrizd az azonosítókat, hibásnak tűnnek.", + "Please specify the port, it could not be auto-detected." : "Kérlek add meg a port számát, nem lehetett automatikusan detektálni.", + "Base DN could not be auto-detected, please revise credentials, host and port." : "A címtár gyökerét (base DN) nem sikerült automatikusan felismerni, kérlek, ellenőrizd az azonosítókat, a kiszolgáló nevét és a portot.", + "Could not detect Base DN, please enter it manually." : "Nem sikerült felismerni a címtár gyökerét (base DN), kérlek, add meg kézzel.", + "{nthServer}. Server" : "{nthServer}. Szerver", + "No object found in the given Base DN. Please revise." : "Nem találhatók objektumok a megadott címtár gyökérben (base DN). Kérlek, ellenőrizd.", + "More than 1,000 directory entries available." : "Több mint 1000 címtár bejegyzés érhető el.", + " entries available within the provided Base DN" : "a megadott címtár gyökér alatt elérhető bejegyzések", + "An error occurred. Please check the Base DN, as well as connection settings and credentials." : "Hiba törént. Kérlek, ellenőrizd a címtár gyökerét (base DN), a kapcsolat beállításait és az azonosítókat.", + "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a szerver beállításait?", "Confirm Deletion" : "A törlés megerősítése", + "Mappings cleared successfully!" : "A hozzárendelések sikeresen törölve.", + "Error while clearing the mappings." : "Hiba a leképzések törlése közben.", + "Anonymous bind is not allowed. Please provide a User DN and Password." : "A névtelen hozzáférés (anonymous bind) nem engedélyezett. Kérlek, add meg a felhasználó címtár-azonosítóját (DN) és jelszavát.", + "Saving failed. Please make sure the database is in Operation. Reload before continuing." : "A mentés sikertelen. Kérlek győződj meg róla, hogy az adatbázis működik. Töltsd újra a folytatás előtt.", + "Mode switch" : "Üzemmód váltás", "Select attributes" : "Attribútumok kiválasztása", + "User found and settings verified." : "Felhasználó megtalálva, beállítások ellenőrizve.", + "Settings verified, but one user found. Only the first will be able to login. Consider a more narrow filter." : "Beállítások ellenőrizve, de egy felhasználó található. Csak az első léphet be automatikusan. Próbálj egy pontosabb szűrőt.", + "An unspecified error occurred. Please check the settings and the log." : "Meghatározatlan hiba történt. Kérlek ellenőrizd a beállításokat és a naplót.", + "LDAP / AD integration" : "LDAP / AD integráció", "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"], "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"], "Could not find the desired feature" : "A kívánt funkció nem található", "Invalid Host" : "Érvénytelen gépnév", - "Server" : "Kiszolgáló", - "Users" : "Felhasználók", - "Groups" : "Csoportok", "Test Configuration" : "A beállítások tesztelése", "Help" : "Súgó", "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:", + "Only these object classes:" : "Csak ezek az objektumosztályok:", + "Only from these groups:" : "Csak ezekből a csoportokból:", + "Search groups" : "Csoport keresés", + "Available groups" : "Elérhető csoportok", + "Selected groups" : "Kiválasztott csoportok", + "Edit LDAP Query" : "LDAP lekérdezés szerkesztés", + "LDAP Filter:" : "LDAP szűrő:", "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.", + "LDAP / AD Username:" : "LDAP / AD felhasználónév:", + "LDAP / AD Email Address:" : "LDAP / AD e-mail cím:", "Other Attributes:" : "Más attribútumok:", "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"", - "1. Server" : "1. Kiszolgáló", - "%s. Server:" : "%s. kiszolgáló", + "Verify settings" : "Beállítások ellenőrzése", + "1. Server" : "1. Szerver", + "%s. Server:" : "%s. szerver", + "Delete the current configuration" : "Aktuális konfiguráció törlése", "Host" : "Kiszolgáló", "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így: ldaps://", "Port" : "Port", + "Detect Port" : "Port detektálás", "User DN" : "A kapcsolódó felhasználó DN-je", "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!", "Password" : "Jelszó", @@ -46,6 +76,10 @@ "Saving" : "Mentés", "Back" : "Vissza", "Continue" : "Folytatás", + "LDAP" : "LDAP", + "Server" : "Szerver", + "Users" : "Felhasználók", + "Groups" : "Csoportok", "Expert" : "Profi", "Advanced" : "Haladó", "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.", @@ -53,13 +87,13 @@ "Connection Settings" : "Kapcsolati beállítások", "Configuration Active" : "A beállítás aktív", "When unchecked, this configuration will be skipped." : "Ha nincs kipipálva, ez a beállítás kihagyódik.", - "Backup (Replica) Host" : "Másodkiszolgáló (replika)", - "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.", - "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma", + "Backup (Replica) Host" : "Biztonsági (replika) kiszolgáló", + "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális biztonsági kiszolgálót. Ez a fő LDAP/AD szerver replikája kell legyen.", + "Backup (Replica) Port" : "Biztonsági kiszolgáló (replika) portszáma", "Disable Main Server" : "A fő szerver kihagyása", - "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.", + "Only connect to the replica server." : "Csak a másodlagos (másolati) szerverhez kapcsolódjunk.", "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét", - "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!", + "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-szerver SSL tanúsítványát a(z) %s szerverre!", "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama", "in seconds. A change empties the cache." : "másodpercen belül. A változtatás törli a gyorsítótár tartalmát.", "Directory Settings" : "Címtár beállítások", @@ -77,20 +111,18 @@ "Group-Member association" : "A csoporttagság attribútuma", "Nested Groups" : "Egymásba ágyazott csoportok", "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Amikor be van kapcsolva, akkor azokat a csoportokat is kezelni tudjuk, melyekben a személyek mellett csoportok is vannak. (Csak akkor működik, ha a csoportok \"member\" attribútuma DN-eket tartalmaz.)", - "Paging chunksize" : "Lapméret paging esetén", "Chunksize used for paged LDAP searches that may return bulky results like user or group enumeration. (Setting it 0 disables paged LDAP searches in those situations.)" : "A lapméret megadásával korlátozható az egy fordulóban kapott találatok száma, akkor is, ha az LDAP-keresés nagyon sok találatot ad, ha ezt az LDAP-kiszolgáló támogatja. (Ha 0-ra állítjuk, akkor ezáltal letiltjuk ezt a lapozó funkciót.)", "Special Attributes" : "Különleges attribútumok", "Quota Field" : "Kvóta mező", "Quota Default" : "Alapértelmezett kvóta", "in bytes" : "bájtban", "Email Field" : "E-mail mező", - "User Home Folder Naming Rule" : "A home könyvtár elérési útvonala", + "User Home Folder Naming Rule" : "Felhasználói Home mappa elnevezési szabály", "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!", "Internal Username" : "Belső felhasználónév", - "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ]. Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Alapértelmezetten a belső felhasználónév az UUID attribútumból jön létre. Ez biztosítja a felhasználónév egyediségét, ill. azt, hogy a karaktereket nem kell konvertálni benne. A belső felhasználónévben csak a következő karakterek engdélyezettek: [ a-zA-Z0-9_.@- ]. Minden más karakter vagy az ASCII kódtáblában levő megfelelőjére cserélődik ki, vagy ha ilyen nincs, akkor egyszerűen kihagyódik. Ha az így kapott nevek mégis ütköznének, akkor a végükön kiegészülnek egy növekvő sorszámmal. A belső felhasználónév a programon belül azonosítja a felhasználót, valamint alapértelmezetten ez lesz a felhasználó személyes home könyvtárának a neve is. A belső felhasználónév adja a távoli elérések webcímének egy részét is, ilyenek pl. a *DAV szolgáltatások URL-jei. Ezzel a beállítással felülbírálhatjuk az alapértelmezett viselkedést. Ha az ownCloud 5-ös változata előtti viselkedést szeretné elérni, akkor a következő mezőben adja meg a felhasználó megjelenítési nevének attribútumát. Az alapértelmezett viselkedéshez hagyja üresen. A változtatás csak az újonnan létrejövő (újonnan megfeleltetett) LDAP felhasználók esetén érvényesül.", "Internal Username Attribute:" : "A belső felhasználónév attribútuma:", "Override UUID detection" : "Az UUID-felismerés felülbírálása", - "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.", + "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető legyen és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.", "UUID Attribute for Users:" : "A felhasználók UUID attribútuma:", "UUID Attribute for Groups:" : "A csoportok UUID attribútuma:", "Username-LDAP User Mapping" : "Felhasználó - LDAP felhasználó hozzárendelés", diff --git a/apps/workflowengine/l10n/ru.js b/apps/workflowengine/l10n/ru.js index 38d55008c98..318981ae5f3 100644 --- a/apps/workflowengine/l10n/ru.js +++ b/apps/workflowengine/l10n/ru.js @@ -18,6 +18,8 @@ OC.L10N.register( "Request remote address" : "Запрос удаленного адреса", "matches IPv4" : "соответствует IPv4", "does not match IPv4" : "не соответствует IPv4", + "matches IPv6" : "соответствует IPv6", + "does not match IPv6" : "не соответствует IPv6", "Request time" : "Время запроса", "between" : "между", "not between" : "не между", diff --git a/apps/workflowengine/l10n/ru.json b/apps/workflowengine/l10n/ru.json index c068568992d..d6d9ea62a06 100644 --- a/apps/workflowengine/l10n/ru.json +++ b/apps/workflowengine/l10n/ru.json @@ -16,6 +16,8 @@ "Request remote address" : "Запрос удаленного адреса", "matches IPv4" : "соответствует IPv4", "does not match IPv4" : "не соответствует IPv4", + "matches IPv6" : "соответствует IPv6", + "does not match IPv6" : "не соответствует IPv6", "Request time" : "Время запроса", "between" : "между", "not between" : "не между", |